From d927886380b99f53d59e3ccdf921e9bcb91ed03a Mon Sep 17 00:00:00 2001
From: MaddoScientisto <maddo.science@gmail.com>
Date: Sat, 22 Mar 2025 17:47:24 +0100
Subject: [PATCH] Bugfixes

---
 Scenes/HUD/OptionsMenu.tscn    |  5 +++--
 Scenes/Interactable/Chest.tscn |  2 +-
 Scenes/test.tscn               |  2 +-
 Scripts/Actors/Boss.cs         |  9 ++++++++-
 Scripts/Enemy.cs               |  2 +-
 Scripts/UI/OptionsMenu.cs      | 15 +++++++++++++++
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/Scenes/HUD/OptionsMenu.tscn b/Scenes/HUD/OptionsMenu.tscn
index ca2cf5f5..aeee29bc 100644
--- a/Scenes/HUD/OptionsMenu.tscn
+++ b/Scenes/HUD/OptionsMenu.tscn
@@ -13,7 +13,7 @@ font_size = 20
 outline_size = 4
 outline_color = Color(0, 0, 0, 1)
 
-[node name="OptionsMenu" type="VBoxContainer" node_paths=PackedStringArray("ResolutionsList", "VSyncToggle")]
+[node name="OptionsMenu" type="VBoxContainer" node_paths=PackedStringArray("ResolutionsList", "VSyncToggle", "FullScreenToggle")]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -22,6 +22,7 @@ grow_vertical = 2
 script = ExtResource("1_mpohc")
 ResolutionsList = NodePath("ScrollContainer/HBoxContainer/HFlowContainer/Resolution/ResolutionsList")
 VSyncToggle = NodePath("ScrollContainer/HBoxContainer/HFlowContainer/VsyncCheckbox")
+FullScreenToggle = NodePath("ScrollContainer/HBoxContainer/HFlowContainer/FullScreenCheck")
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
 layout_mode = 2
@@ -76,7 +77,7 @@ layout_mode = 2
 size_flags_vertical = 0
 text = "VSync"
 
-[node name="CheckBox2" type="CheckBox" parent="ScrollContainer/HBoxContainer/HFlowContainer"]
+[node name="FullScreenCheck" type="CheckBox" parent="ScrollContainer/HBoxContainer/HFlowContainer"]
 layout_mode = 2
 size_flags_vertical = 0
 text = "Full Screen"
diff --git a/Scenes/Interactable/Chest.tscn b/Scenes/Interactable/Chest.tscn
index be316e25..68003e62 100644
--- a/Scenes/Interactable/Chest.tscn
+++ b/Scenes/Interactable/Chest.tscn
@@ -117,6 +117,6 @@ shape = SubResource("CircleShape2D_7lp3q")
 [node name="Health" type="Node2D" parent="DamageReceiver"]
 script = ExtResource("3_s8kek")
 ResourceName = "Health"
-MaxResource = 8.0
+_maxResource = 8.0
 
 [connection signal="area_entered" from="DamageReceiver" to="DamageReceiver" method="_on_damage_hitbox_area_entered"]
diff --git a/Scenes/test.tscn b/Scenes/test.tscn
index 2a8f0b32..fb65ae38 100644
--- a/Scenes/test.tscn
+++ b/Scenes/test.tscn
@@ -1090,7 +1090,7 @@ position = Vector2(-1120, 80)
 curve = SubResource("Curve2D_gd7x4")
 
 [node name="Vertical Box" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("84_bwt6v")]
-position = Vector2(-967, 182)
+position = Vector2(-969, 184)
 
 [node name="HorizontalForceField2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("66_nxn3h")]
 position = Vector2(-432, 143)
diff --git a/Scripts/Actors/Boss.cs b/Scripts/Actors/Boss.cs
index 14570e14..482bfcef 100644
--- a/Scripts/Actors/Boss.cs
+++ b/Scripts/Actors/Boss.cs
@@ -14,7 +14,7 @@ public partial class Boss : Enemy, IActivable, IScriptHost
     //[Export] private Array<BossPhase> Phases;
     [Export] public BossScript BossScript { get; private set; }
     //[Export] private PackedScene BossHudPrefab;
-    [Export] public Vector2 BossPhaseAnimationStartingPosition = new Vector2(180, 10);
+    [Export] public Vector2 BossPhaseAnimationStartingPosition = new(180, 10);
     
     private int currentPhaseIndex = 0;
 
@@ -108,6 +108,12 @@ public partial class Boss : Enemy, IActivable, IScriptHost
         }
     }
 
+    protected override void ActivateDefeatScript()
+    {
+        GameManager.Instance.ClearBullets();
+        base.ActivateDefeatScript();
+    }
+
     protected override void Explode()
     {
         if (_bossHud is not null)
@@ -122,6 +128,7 @@ public partial class Boss : Enemy, IActivable, IScriptHost
     
     private void StartPhase(BossPhase phase)
     {
+        GameManager.Instance.ClearBullets();
         if (phase.PlayAnimation)
         {
             _waiting = true;
diff --git a/Scripts/Enemy.cs b/Scripts/Enemy.cs
index 9203d7bb..6f9d551a 100644
--- a/Scripts/Enemy.cs
+++ b/Scripts/Enemy.cs
@@ -283,7 +283,7 @@ public partial class Enemy : CharacterBody2D
 		}
 	}
 	
-	protected void ActivateDefeatScript()
+	protected virtual void ActivateDefeatScript()
 	{
 		if (DefeatScript is not IActivable target)
 		{
diff --git a/Scripts/UI/OptionsMenu.cs b/Scripts/UI/OptionsMenu.cs
index 01358a28..9f96ab6c 100644
--- a/Scripts/UI/OptionsMenu.cs
+++ b/Scripts/UI/OptionsMenu.cs
@@ -36,6 +36,21 @@ public partial class OptionsMenu : MenuBase
         VSyncToggle.Toggled += VSyncToggleOnToggled;
         
         FullScreenToggle.SetPressed(DisplayServer.WindowGetMode() is DisplayServer.WindowMode.Fullscreen);
+        
+        FullScreenToggle.Toggled += FullScreenToggleOnToggled;
+    }
+
+    private void FullScreenToggleOnToggled(bool toggledon)
+    {
+        switch (toggledon)
+        {
+            case true:
+                DisplayServer.WindowSetMode(DisplayServer.WindowMode.Fullscreen);
+                break;
+            case false:
+                DisplayServer.WindowSetMode(DisplayServer.WindowMode.Windowed);
+                break;
+        }
     }
 
     private void VSyncToggleOnToggled(bool toggledOn)