From aec8c36a94a1440aed207a94a8c8c91df70ae68f Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 5 Mar 2023 18:42:00 -0500 Subject: [PATCH] "Final round" --- namedropper/Assets/RoundIntro.cs | 3 ++- namedropper/Assets/Scripts/Game.cs | 2 +- namedropper/Assets/Scripts/GameManager.cs | 12 ++++++++++++ namedropper/Assets/Scripts/TopicSelect.cs | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/namedropper/Assets/RoundIntro.cs b/namedropper/Assets/RoundIntro.cs index 3e02e2d..0ab6670 100644 --- a/namedropper/Assets/RoundIntro.cs +++ b/namedropper/Assets/RoundIntro.cs @@ -11,7 +11,8 @@ public class RoundIntro : MonoBehaviour // Start is called before the first frame update void Start() { - _roundNumber.text = "Round " + GameManager.Instance.Round.ToString(); + _roundNumber.text = GameManager.Instance.GetRoundName(); + _topic.text = GameDataManager.Instance.CurrentTopic.Topic; Invoke("StartGame", 3f); diff --git a/namedropper/Assets/Scripts/Game.cs b/namedropper/Assets/Scripts/Game.cs index 3d99861..1558bbb 100644 --- a/namedropper/Assets/Scripts/Game.cs +++ b/namedropper/Assets/Scripts/Game.cs @@ -113,7 +113,7 @@ public class Game : MonoBehaviour } } - RoundNumber.text = "Round " + GameManager.Instance.Round.ToString(); + RoundNumber.text = GameManager.Instance.GetRoundName(); Topic.text = GameDataManager.Instance.CurrentTopic.Topic; ActivatePlayers(false); diff --git a/namedropper/Assets/Scripts/GameManager.cs b/namedropper/Assets/Scripts/GameManager.cs index 24e8d95..7e7d848 100644 --- a/namedropper/Assets/Scripts/GameManager.cs +++ b/namedropper/Assets/Scripts/GameManager.cs @@ -22,6 +22,18 @@ public class GameManager public static int PLAYER_SKIN = 5; //0 == puck, 1 == pancake, 2 == gummybear, 3==pig, 4==ball w/ bear, 5==pop public static int MAX_PLAYER_SKIN = 5; + public string GetRoundName() + { + if (Round == 3) + { + return "Final round!"; + } + else + { + return "Round " + GameManager.Instance.Round.ToString(); + } + } + public GameManager() { Reset(); diff --git a/namedropper/Assets/Scripts/TopicSelect.cs b/namedropper/Assets/Scripts/TopicSelect.cs index 1442cda..a9ea10f 100644 --- a/namedropper/Assets/Scripts/TopicSelect.cs +++ b/namedropper/Assets/Scripts/TopicSelect.cs @@ -26,7 +26,7 @@ public class TopicSelect : MonoBehaviour void InitRound() { - _title.text = "Round " + GameManager.Instance.Round; + _title.text = GameManager.Instance.GetRoundName(); if (WORST_PLAYER_PICKS) {