Addd Winner Takes All Toggle (#14)

PNone · Feb 26, 2023 · 60af804 · 60af804
1 parent 142044b
commit 60af804
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/HohimBrueh/Assets/Scripts/Controllers/GameController.cs b/HohimBrueh/Assets/Scripts/Controllers/GameController.cs
@@ -22,6 +22,7 @@ public class GameController : MonoBehaviour
     public static bool onlyBounceBeforeRecover = true;
     public static bool allowTeamMode = true;
     public static bool randomizeMaps = false;
+    public static bool winnerTakesAll = true;
     public static bool allowCustomScoreToWin = false;
     public static float customScoreToWin = 10f;
 
@@ -714,6 +715,7 @@ public void OnGUI()
             onlyBounceBeforeRecover = GUILayout.Toggle(onlyBounceBeforeRecover, "Only Bounce Before Recover");
             allowTeamMode = GUILayout.Toggle(allowTeamMode, "Allow Team Deathmatch (F5/back to toggle mode)");
             randomizeMaps = GUILayout.Toggle(randomizeMaps, "Randomize Map Order");
+            winnerTakesAll = GUILayout.Toggle(winnerTakesAll, "Only Winners Get Points");
             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 {(int)customScoreToWin}");

diff --git a/HohimBrueh/Assets/Scripts/UI/ScoreScreenController.cs b/HohimBrueh/Assets/Scripts/UI/ScoreScreenController.cs
@@ -102,7 +102,7 @@ void Update()
         if (!haveUpdatedScores)
         {
             haveUpdatedScores = true;
-            if (GameController.isTeamMode)
+            if (GameController.isTeamMode && GameController.winnerTakesAll)
             {
                 foreach (var player in GameController.activePlayers)
                 {
@@ -114,6 +114,23 @@ void Update()
             }
             foreach (var psd in playerScoreDisplays)
             {
+                if (!GameController.winnerTakesAll) 
+                {
+                    if (GameController.isTeamMode)
+                    {
+                        foreach (var activePlayer in GameController.activePlayers) 
+                        {
+                            if (activePlayer.team == psd.player.team)
+                            {
+                                psd.player.roundWins += activePlayer.score;
+                            }
+                        }
+                    }
+                    else 
+                    {
+                        psd.player.roundWins += psd.player.score;
+                    }
+                }
                 if (GameController.isTeamMode)
                 {
                     if (psd.player.team == GameController.lastWinningPlayer.team)
@@ -128,7 +145,10 @@ void Update()
                 {
                     if (psd.player == GameController.lastWinningPlayer)
                     {
-                        psd.player.roundWins++;
+                        if (GameController.winnerTakesAll) 
+                        {
+                            psd.player.roundWins++;
+                        }
                         if (GameController.isShowDown)
                             psd.TemorarilyDisplay("WINNER!", 10f);
                         else