From c13cbb367a8591b3ffc3f9827b992e765b4b4a14 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Sun, 2 Mar 2025 12:30:20 -0800
Subject: [PATCH 1/2] Added clearer win/lose screens

---
 Globals/StageProducer.cs                      |  8 +-
 .../BattleDirector/scripts/BattleDirector.cs  | 16 +++-
 scenes/UI/LoseScreen.tscn                     | 83 +++++++++++++++++++
 scenes/UI/RewardSelectionUI.tscn              |  9 +-
 scenes/UI/scripts/LoseScreen.cs               | 35 ++++++++
 scenes/UI/scripts/RewardSelect.cs             |  8 +-
 6 files changed, 148 insertions(+), 11 deletions(-)
 create mode 100644 scenes/UI/LoseScreen.tscn
 create mode 100644 scenes/UI/scripts/LoseScreen.cs

diff --git a/Globals/StageProducer.cs b/Globals/StageProducer.cs
index 4c9ab37b..7d6e126a 100644
--- a/Globals/StageProducer.cs
+++ b/Globals/StageProducer.cs
@@ -10,7 +10,7 @@ public partial class StageProducer : Node
     public static RandomNumberGenerator GlobalRng = new RandomNumberGenerator();
     private ulong _seed;
     private ulong _lastRngState;
-    private bool _isInitialized = false;
+    public static bool IsInitialized;
 
     private Stages _curStage = Stages.Title; //TODO: State Machine kinda deal?
     private Node _curScene;
@@ -34,7 +34,7 @@ public void StartGame()
         PlayerStats = new PlayerStats();
 
         CurRoom = Map.GetRooms()[0];
-        _isInitialized = true;
+        IsInitialized = true;
     }
 
     public static void ChangeCurRoom(MapGrid.Room room)
@@ -53,7 +53,7 @@ public void TransitionStage(Stages nextStage, int nextRoomIdx = -1)
         switch (nextStage)
         {
             case Stages.Title:
-                _isInitialized = false;
+                IsInitialized = false;
                 GetTree().ChangeSceneToFile("res://scenes/SceneTransitions/TitleScreen.tscn");
                 break;
             case Stages.Battle:
@@ -73,7 +73,7 @@ public void TransitionStage(Stages nextStage, int nextRoomIdx = -1)
                 break;
             case Stages.Map:
                 GetTree().ChangeSceneToFile("res://scenes/Maps/cartographer.tscn");
-                if (!_isInitialized)
+                if (!IsInitialized)
                 {
                     StartGame();
                 }
diff --git a/scenes/BattleDirector/scripts/BattleDirector.cs b/scenes/BattleDirector/scripts/BattleDirector.cs
index 751e08de..b1c6a4ca 100644
--- a/scenes/BattleDirector/scripts/BattleDirector.cs
+++ b/scenes/BattleDirector/scripts/BattleDirector.cs
@@ -200,9 +200,7 @@ private void CheckBattleStatus(PuppetTemplate puppet)
     {
         if (puppet == Player)
         {
-            GD.Print("Player is Dead");
-            Audio.StreamPaused = true;
-            GetNode<StageProducer>("/root/StageProducer").TransitionStage(Stages.Title);
+            LostBattle();
             return;
         }
 
@@ -215,12 +213,22 @@ private void CheckBattleStatus(PuppetTemplate puppet)
         }
     }
 
+    private void LostBattle()
+    {
+        GD.Print("Player is Dead");
+        Audio.StreamPaused = true;
+        AddChild(GD.Load<PackedScene>("res://scenes/UI/LoseScreen.tscn").Instantiate());
+        GetTree().Paused = true;
+    }
+
     private void ShowRewardSelection(int amount)
     {
         string type = "Note";
         if (StageProducer.Config.RoomType == Stages.Boss)
             type = "Relic";
-        RewardSelect.CreateSelection(this, Player.Stats, amount, type).Selected += EndBattle;
+        var rewardSelect = RewardSelect.CreateSelection(this, Player.Stats, amount, type);
+        rewardSelect.GetNode<Label>("%TopLabel").Text = "You win!";
+        rewardSelect.Selected += EndBattle;
     }
 
     #endregion
diff --git a/scenes/UI/LoseScreen.tscn b/scenes/UI/LoseScreen.tscn
new file mode 100644
index 00000000..fd2f9410
--- /dev/null
+++ b/scenes/UI/LoseScreen.tscn
@@ -0,0 +1,83 @@
+[gd_scene load_steps=2 format=3 uid="uid://hjho5n2f8rkf"]
+
+[ext_resource type="Script" path="res://scenes/UI/scripts/LoseScreen.cs" id="1_13iue"]
+
+[node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("buttons")]
+process_mode = 2
+script = ExtResource("1_13iue")
+buttons = [NodePath("MarginContainer2/VBoxContainer/MarginContainer/Restart"), NodePath("MarginContainer2/VBoxContainer/MarginContainer2/Title"), NodePath("MarginContainer2/VBoxContainer/MarginContainer3/Quit")]
+
+[node name="ColorRect" type="ColorRect" parent="."]
+offset_right = 640.0
+offset_bottom = 360.0
+color = Color(0.24, 0.24, 0.24, 0.854902)
+
+[node name="MarginContainer2" type="MarginContainer" parent="."]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 200
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 200
+theme_override_constants/margin_bottom = 20
+
+[node name="ColorRect" type="ColorRect" parent="MarginContainer2"]
+layout_mode = 2
+color = Color(0.172833, 0.172833, 0.172833, 0.945)
+
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer2"]
+layout_mode = 2
+
+[node name="TopLabel" type="Label" parent="MarginContainer2/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_font_sizes/font_size = 20
+text = "Game Over!"
+horizontal_alignment = 1
+
+[node name="HSeparator" type="HSeparator" parent="MarginContainer2/VBoxContainer"]
+layout_mode = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="MarginContainer2/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="Restart" type="Button" parent="MarginContainer2/VBoxContainer/MarginContainer"]
+layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer3/Quit")
+focus_neighbor_bottom = NodePath("../../MarginContainer2/Title")
+text = "Restart"
+
+[node name="MarginContainer2" type="MarginContainer" parent="MarginContainer2/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="Title" type="Button" parent="MarginContainer2/VBoxContainer/MarginContainer2"]
+layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer/Restart")
+focus_neighbor_bottom = NodePath("../../MarginContainer3/Quit")
+text = "Quit To Title"
+
+[node name="MarginContainer3" type="MarginContainer" parent="MarginContainer2/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="Quit" type="Button" parent="MarginContainer2/VBoxContainer/MarginContainer3"]
+layout_mode = 2
+focus_neighbor_top = NodePath("../../MarginContainer2/Title")
+focus_neighbor_bottom = NodePath("../../MarginContainer/Restart")
+text = "Quit Game"
diff --git a/scenes/UI/RewardSelectionUI.tscn b/scenes/UI/RewardSelectionUI.tscn
index 155dc204..aebade12 100644
--- a/scenes/UI/RewardSelectionUI.tscn
+++ b/scenes/UI/RewardSelectionUI.tscn
@@ -24,7 +24,7 @@ grow_vertical = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme_override_constants/margin_left = 50
-theme_override_constants/margin_top = 50
+theme_override_constants/margin_top = 20
 theme_override_constants/margin_right = 50
 theme_override_constants/margin_bottom = 50
 
@@ -34,6 +34,13 @@ layout_mode = 2
 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/PanelContainer"]
 layout_mode = 2
 
+[node name="TopLabel" type="Label" parent="MarginContainer/PanelContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_font_sizes/font_size = 20
+text = "Rewards!"
+horizontal_alignment = 1
+
 [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3
diff --git a/scenes/UI/scripts/LoseScreen.cs b/scenes/UI/scripts/LoseScreen.cs
new file mode 100644
index 00000000..8b3b61ae
--- /dev/null
+++ b/scenes/UI/scripts/LoseScreen.cs
@@ -0,0 +1,35 @@
+using System;
+using FunkEngine;
+using Godot;
+
+public partial class LoseScreen : CanvasLayer
+{
+    [Export]
+    private Button[] buttons;
+
+    public override void _Ready()
+    {
+        buttons[0].Pressed += Restart;
+        buttons[1].Pressed += QuitToMainMenu;
+        buttons[2].Pressed += Quit;
+        buttons[0].GrabFocus();
+    }
+
+    private void Restart()
+    {
+        GetTree().Paused = false;
+        StageProducer.IsInitialized = false;
+        GetNode<StageProducer>("/root/StageProducer").TransitionStage(Stages.Map);
+    }
+
+    private void Quit()
+    {
+        GetNode<StageProducer>("/root/StageProducer").TransitionStage(Stages.Quit);
+    }
+
+    private void QuitToMainMenu()
+    {
+        GetTree().Paused = false;
+        GetNode<StageProducer>("/root/StageProducer").TransitionStage(Stages.Title);
+    }
+}
diff --git a/scenes/UI/scripts/RewardSelect.cs b/scenes/UI/scripts/RewardSelect.cs
index ecf6757d..b002c41f 100644
--- a/scenes/UI/scripts/RewardSelect.cs
+++ b/scenes/UI/scripts/RewardSelect.cs
@@ -49,6 +49,8 @@ public override void _Process(double delta)
 
     private void GenerateRelicChoices(int amount = 1)
     {
+        if (amount < 1)
+            GD.PushError("Error: In RewardSelect: amount < 1");
         //should probably change this so that the amount of relics offered can be changed when BD calls it
         //i.e less options when killing trash mobs/basic/weak enemies
         _rChoices = Scribe.GetRandomRelics(_player.CurRelics, amount);
@@ -59,12 +61,14 @@ private void GenerateRelicChoices(int amount = 1)
             button.Display(relic.Texture, relic.Tooltip, relic.Name);
             button.Pressed += () => OnRelicSelected(relic);
             ButtonContainer.AddChild(button);
-            button.GrabFocus();
         }
+        ButtonContainer.GetChild<Button>(0).GrabFocus();
     }
 
     private void GenerateNoteChoices(int amount = 1)
     {
+        if (amount < 1)
+            GD.PushError("Error: In RewardSelect: amount < 1");
         //should probably change this so that the amount of relics offered can be changed when BD calls it
         //i.e less options when killing trash mobs/basic/weak enemies
         _nChoices = Scribe.GetRandomRewardNotes(amount);
@@ -75,8 +79,8 @@ private void GenerateNoteChoices(int amount = 1)
             button.Display(note.Texture, note.Tooltip, note.Name);
             button.Pressed += () => OnNoteSelected(note);
             ButtonContainer.AddChild(button);
-            button.GrabFocus();
         }
+        ButtonContainer.GetChild<Button>(0).GrabFocus();
     }
 
     public static RewardSelect CreateSelection(

From 6bd4acc2dd10dc7ff9ade5e350335eb5864e34ad Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Sun, 2 Mar 2025 12:50:23 -0800
Subject: [PATCH 2/2] Added end win screen

---
 scenes/BattleDirector/scripts/BattleDirector.cs   |  2 +-
 scenes/Maps/scripts/Cartographer.cs               | 14 ++++++++++++++
 scenes/UI/{LoseScreen.tscn => EndScreen.tscn}     |  7 ++++---
 scenes/UI/scripts/{LoseScreen.cs => EndScreen.cs} |  4 +++-
 4 files changed, 22 insertions(+), 5 deletions(-)
 rename scenes/UI/{LoseScreen.tscn => EndScreen.tscn} (93%)
 rename scenes/UI/scripts/{LoseScreen.cs => EndScreen.cs} (90%)

diff --git a/scenes/BattleDirector/scripts/BattleDirector.cs b/scenes/BattleDirector/scripts/BattleDirector.cs
index b1c6a4ca..d5a6bfa4 100644
--- a/scenes/BattleDirector/scripts/BattleDirector.cs
+++ b/scenes/BattleDirector/scripts/BattleDirector.cs
@@ -217,7 +217,7 @@ private void LostBattle()
     {
         GD.Print("Player is Dead");
         Audio.StreamPaused = true;
-        AddChild(GD.Load<PackedScene>("res://scenes/UI/LoseScreen.tscn").Instantiate());
+        AddChild(GD.Load<PackedScene>("res://scenes/UI/EndScreen.tscn").Instantiate());
         GetTree().Paused = true;
     }
 
diff --git a/scenes/Maps/scripts/Cartographer.cs b/scenes/Maps/scripts/Cartographer.cs
index 545c9b88..10d72539 100644
--- a/scenes/Maps/scripts/Cartographer.cs
+++ b/scenes/Maps/scripts/Cartographer.cs
@@ -17,6 +17,10 @@ public override void _Ready()
     {
         DrawMap();
         GetViewport().GuiFocusChanged += UpdateFocus;
+        if (StageProducer.CurRoom.Type == Stages.Boss && StageProducer.CurRoom.Children.Length == 0)
+        {
+            WinStage();
+        }
     }
 
     public override void _Process(double delta)
@@ -123,4 +127,14 @@ private void EnterStage(int roomIdx, Button button)
         tween.Finished += () =>
             GetNode<StageProducer>("/root/StageProducer").TransitionFromRoom(roomIdx);
     }
+
+    private void WinStage()
+    {
+        GD.Print("Player is Dead");
+        EndScreen es = GD.Load<PackedScene>("res://scenes/UI/EndScreen.tscn")
+            .Instantiate<EndScreen>();
+        AddChild(es);
+        es.TopLabel.Text = "You Win!";
+        GetTree().Paused = true;
+    }
 }
diff --git a/scenes/UI/LoseScreen.tscn b/scenes/UI/EndScreen.tscn
similarity index 93%
rename from scenes/UI/LoseScreen.tscn
rename to scenes/UI/EndScreen.tscn
index fd2f9410..f9761b5d 100644
--- a/scenes/UI/LoseScreen.tscn
+++ b/scenes/UI/EndScreen.tscn
@@ -1,11 +1,12 @@
 [gd_scene load_steps=2 format=3 uid="uid://hjho5n2f8rkf"]
 
-[ext_resource type="Script" path="res://scenes/UI/scripts/LoseScreen.cs" id="1_13iue"]
+[ext_resource type="Script" path="res://scenes/UI/scripts/EndScreen.cs" id="1_37m3y"]
 
-[node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("buttons")]
+[node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("buttons", "TopLabel")]
 process_mode = 2
-script = ExtResource("1_13iue")
+script = ExtResource("1_37m3y")
 buttons = [NodePath("MarginContainer2/VBoxContainer/MarginContainer/Restart"), NodePath("MarginContainer2/VBoxContainer/MarginContainer2/Title"), NodePath("MarginContainer2/VBoxContainer/MarginContainer3/Quit")]
+TopLabel = NodePath("MarginContainer2/VBoxContainer/TopLabel")
 
 [node name="ColorRect" type="ColorRect" parent="."]
 offset_right = 640.0
diff --git a/scenes/UI/scripts/LoseScreen.cs b/scenes/UI/scripts/EndScreen.cs
similarity index 90%
rename from scenes/UI/scripts/LoseScreen.cs
rename to scenes/UI/scripts/EndScreen.cs
index 8b3b61ae..d61f0837 100644
--- a/scenes/UI/scripts/LoseScreen.cs
+++ b/scenes/UI/scripts/EndScreen.cs
@@ -2,11 +2,13 @@
 using FunkEngine;
 using Godot;
 
-public partial class LoseScreen : CanvasLayer
+public partial class EndScreen : CanvasLayer
 {
     [Export]
     private Button[] buttons;
 
+    [Export] public Label TopLabel;
+
     public override void _Ready()
     {
         buttons[0].Pressed += Restart;