fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb

Browse Source
This commit is contained in:
allylikesfrogs
2023-05-04 15:17:32 -07:00
parent 041c7cd30d 58b588733c
commit 5d7ef08d32
5 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/GameUIController.cs
View File

@@ -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());

6
Assets/Scripts/PlayerBehavior.cs
View File

@@ -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)

8
Assets/Scripts/StateController.cs
View File

@@ -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)