diff --git a/Assets/Scenes/GrenouilleVillage.unity b/Assets/Scenes/GrenouilleVillage.unity index 02889ff..811845f 100644 --- a/Assets/Scenes/GrenouilleVillage.unity +++ b/Assets/Scenes/GrenouilleVillage.unity @@ -4084,7 +4084,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 0 m_Sprite: {fileID: -1673959225, guid: 111317b79023e9049b71c547d53ef9e6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -12555,6 +12555,10 @@ PrefabInstance: propertyPath: m_Name value: PauseMenuCanvas objectReference: {fileID: 0} + - target: {fileID: 8821204668943251022, guid: 61b4d0c72b1ea48faba56ca6894ff8e2, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -28752,6 +28756,10 @@ PrefabInstance: propertyPath: m_Name value: VictoryCanvas objectReference: {fileID: 0} + - target: {fileID: 2022929438250013585, guid: d86665a294cc74268b853c002652a71b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5836789532023543602, guid: d86665a294cc74268b853c002652a71b, type: 3} propertyPath: m_Pivot.x value: 0 @@ -32835,7 +32843,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: -881579896, guid: 111317b79023e9049b71c547d53ef9e6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -50602,6 +50610,10 @@ PrefabInstance: propertyPath: m_Name value: GameUICanvas objectReference: {fileID: 0} + - target: {fileID: 4891107602615669430, guid: eb9e81404697848cc9b0a55dc9b8fc06, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -50795,7 +50807,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 0 m_Sprite: {fileID: 1217129368, guid: a17f1a7e2dee65a4cb7885eb9f6f26c8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -52984,6 +52996,10 @@ PrefabInstance: propertyPath: m_Name value: DeathUICanvas objectReference: {fileID: 0} + - target: {fileID: 5297949573892466759, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6607851273471338787, guid: 5c01392b93aff45aab4a1981fa6d8f09, type: 3} propertyPath: m_Pivot.x value: 0 @@ -53745,6 +53761,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 28376358} m_Modifications: + - target: {fileID: 772069231170148905, guid: 2d503ba81ca60ea4bacbbadf11a13b22, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].x + value: -0.091196135 + objectReference: {fileID: 0} + - target: {fileID: 772069231170148905, guid: 2d503ba81ca60ea4bacbbadf11a13b22, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].y + value: 0.08536951 + objectReference: {fileID: 0} - target: {fileID: 4989164602663394393, guid: 2d503ba81ca60ea4bacbbadf11a13b22, type: 3} propertyPath: m_RootOrder value: -1 diff --git a/Assets/Scenes/TransitionToTambourine.unity b/Assets/Scenes/TransitionToTambourine.unity index f2d0dd5..0881452 100644 --- a/Assets/Scenes/TransitionToTambourine.unity +++ b/Assets/Scenes/TransitionToTambourine.unity @@ -532,7 +532,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: You found the tambourine! + m_text: "The next phase of the journey made Claude\u2019s heart stop" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2} m_sharedMaterial: {fileID: 55571796086095593, guid: 6854b27dee6494bd1bab796422f6a3b1, type: 2} @@ -622,6 +622,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dialogMessages: + - "The next phase of the journey made Claude\u2019s heart stop" + - 'as he hurtled into the earth down a perilous drop. ' + - If not for his friend, Sir Jacques, by his side, + - the musical frog feared he might not have survived. + - When his eyes finally adjusted to the darkness around + - Claude was hanging from spider silk deep underground. + - With the jingling zills of his prized tambourine + - Claude navigated the caves and their dangers unseen, + - Though he wished to stop and succumb to the dread + - Claude valiantly faced the Rolling Caverns ahead. - 'You found the tambourine! ' - Press K to throw a tambourine in the direction you're facing. - If it hits an enemy or projectile, it will pin them in place! @@ -629,6 +639,16 @@ MonoBehaviour: - Then, you can throw Sir Jacques to grapple from it! backgroundImageObject: {fileID: 619461775} images: + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} + - {fileID: 21300000, guid: 3b742807e5921dd40af8e69f60ffcb2e, type: 3} - {fileID: 21300000, guid: 7705e2bf46e60499da80ed915e40a608, type: 3} - {fileID: 0} - {fileID: 21300000, guid: 70dfc04fb0d3745cdbe4beba30a5bb63, type: 3} diff --git a/Assets/Scripts/GameUIController.cs b/Assets/Scripts/GameUIController.cs index 070dba7..3d308bf 100644 --- a/Assets/Scripts/GameUIController.cs +++ b/Assets/Scripts/GameUIController.cs @@ -19,9 +19,9 @@ public class GameUIController : MonoBehaviour this.trumpetUI = trumpetBackground.transform.GetChild(0).gameObject; this.tambourineUI = tambourineBackground.transform.GetChild(0).gameObject; this.clarinetUI = clarinetBackground.transform.GetChild(0).gameObject; + } - - // TODO: This can be probably be combined with the update methods + void Start() { this.trumpetBackground.SetActive(StateController.Instance.HasTrumpet()); this.tambourineBackground.SetActive(StateController.Instance.HasTambourine()); this.clarinetBackground.SetActive(StateController.Instance.HasClarinet()); diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index e2938d5..38741de 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -83,7 +83,7 @@ public class PlayerBehavior : MonoBehaviour { AttemptGrapple(); } - if (playerInput.actions["Grapple"].WasReleasedThisFrame()) + if (playerInput.actions["Grapple"].WasReleasedThisFrame() && grapplingRope.isGrappling) { LetGoOfGrapple(); } @@ -315,6 +315,10 @@ public class PlayerBehavior : MonoBehaviour // this.stateController.SetDeathCanvasActive(true); + if (grapplingRope.isGrappling) { + LetGoOfGrapple(); + } + // destroy all tambourines GameObject[] currentTambourines = GameObject.FindGameObjectsWithTag("tambourine"); foreach (GameObject tambourine in currentTambourines) diff --git a/Assets/Scripts/StateController.cs b/Assets/Scripts/StateController.cs index 4213d96..43e2099 100644 --- a/Assets/Scripts/StateController.cs +++ b/Assets/Scripts/StateController.cs @@ -59,24 +59,24 @@ public class StateController : MonoBehaviour public bool HasTrumpet() { - return this.itemProgression >= UnlockedItems.Trumpet - 1; + return this.itemProgression >= UnlockedItems.Trumpet; } public bool HasTambourine() { - return this.itemProgression >= UnlockedItems.Tambourine - 1; + return this.itemProgression >= UnlockedItems.Tambourine; } public bool HasClarinet() { - return this.itemProgression >= UnlockedItems.Clarinet - 1; + return this.itemProgression >= UnlockedItems.Clarinet; } public bool HasCymbal() { - return this.itemProgression >= UnlockedItems.Cymbal - 1; + return this.itemProgression >= UnlockedItems.Cymbal; } void OnSceneLoaded(Scene scene, LoadSceneMode mode)