UI/UX and behavior fixes (#8)

* Present custom score to win as an int * Fix intro skip. Toggle game mode with back btn
PNone · Jan 3, 2023 · fba9983 · fba9983
1 parent d0c9a3a
commit fba9983
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/HohimBrueh/Assets/Scripts/Controllers/GameController.cs b/HohimBrueh/Assets/Scripts/Controllers/GameController.cs
@@ -18,7 +18,7 @@ public class GameController : MonoBehaviour
     public static bool charactersBounceEachOther = false;
     public static bool weirdBounceTrajectories = false;
     public static bool onlyBounceBeforeRecover = true;
-    public static bool allowTeamMode = false;
+    public static bool allowTeamMode = true;
     public static bool allowCustomScoreToWin = false;
     public static float customScoreToWin = 10f;
 
@@ -227,7 +227,7 @@ void Update()
             if (assignedPlayers == 0 && allowTeamMode)
             {
 
-                if (Input.GetKeyDown(KeyCode.F5))
+                if (Input.GetKeyDown(KeyCode.F5) || Input.GetKeyDown(KeyCode.JoystickButton6)) // Controller back button
                 {
                     isTeamMode = !isTeamMode;
                     joinGameModeText.text = isTeamMode ? "TEAM" : "FREE  FOR  ALL";
@@ -698,10 +698,10 @@ public void OnGUI()
             charactersBounceEachOther = GUILayout.Toggle(charactersBounceEachOther, "Characters Bounce Each Other");
             weirdBounceTrajectories = GUILayout.Toggle(weirdBounceTrajectories, "Weird Bounce Trajectories");
             onlyBounceBeforeRecover = GUILayout.Toggle(onlyBounceBeforeRecover, "Only Bounce Before Recover");
-            allowTeamMode = GUILayout.Toggle(allowTeamMode, "Allow Team Deathmatch (F5 to toggle mode)");
+            allowTeamMode = GUILayout.Toggle(allowTeamMode, "Allow Team Deathmatch (F5/back to toggle mode)");
             allowCustomScoreToWin = GUILayout.Toggle(allowCustomScoreToWin, "Use Custom Score To Win");
             customScoreToWin = GUILayout.HorizontalScrollbar(customScoreToWin, 1.0f, 1.0f, 100.0f);
-            GUILayout.Label($"Custom score to win is {customScoreToWin}");
+            GUILayout.Label($"Custom score to win is {(int)customScoreToWin}");
             GUILayout.EndArea();
         }
     }

diff --git a/HohimBrueh/Assets/Scripts/Controllers/IntroAnimController.cs b/HohimBrueh/Assets/Scripts/Controllers/IntroAnimController.cs
@@ -79,14 +79,14 @@ void Update()
         InputReader.GetInput(input);
         if (cameraPosM == 1f)
         {
-            if (input.start && !input.wasStart)
+            if (Input.GetKeyDown(KeyCode.JoystickButton7)) // Start button
             {
                 UnityEngine.SceneManagement.SceneManager.LoadScene("JoinScreen");
             }
         }
         else
         {
-            if (input.start && !input.wasStart)
+            if (Input.GetKeyDown(KeyCode.JoystickButton7)) // Start button
             {
                 animator.CrossFade(animator.GetCurrentAnimatorStateInfo(-1).shortNameHash, 0f, 0, 0.95f);
                 cameraPanning = true;