Merge pull request #153 from Project-Funk-Engine/SteamFixes

LifeHckr · web-flow · commit e7dc06a90d63 · 2025-04-16T17:06:25.000-07:00
Steam fixes
diff --git a/Globals/StageProducer.cs b/Globals/StageProducer.cs
@@ -212,4 +212,16 @@ private BattleConfig MakeBattleConfig(Stages nextRoom, int nextRoomIdx)
         CurRoom = nextRoomIdx;
         return result;
     }
+
+    //Putting this here in an autoload.
+    public override void _Input(InputEvent @event)
+    {
+        //Consume controller input, if window out of focus.
+        //This handles ui_input, other scenes need to consume their own.
+        if (!GetWindow().HasFocus())
+        {
+            GetViewport().SetInputAsHandled();
+            return;
+        }
+    }
 }
diff --git a/Scenes/BattleDirector/Scripts/BattleDirector.cs b/Scenes/BattleDirector/Scripts/BattleDirector.cs
@@ -257,7 +257,7 @@ private void OnBattleLost()
         Audio.StreamPaused = true;
         SaveSystem.ClearSave();
         AddChild(GD.Load<PackedScene>(EndScreen.LoadPath).Instantiate());
-        GetTree().Paused = true;
+        ProcessMode = ProcessModeEnum.Disabled;
     }
 
     private void ShowRewardSelection(int amount)
diff --git a/Scenes/Maps/Scripts/Cartographer.cs b/Scenes/Maps/Scripts/Cartographer.cs
@@ -144,6 +144,6 @@ private void WinStage()
         EndScreen es = GD.Load<PackedScene>(EndScreen.LoadPath).Instantiate<EndScreen>();
         AddChild(es);
         es.TopLabel.Text = Tr("BATTLE_ROOM_WIN");
-        GetTree().Paused = true;
+        ProcessMode = ProcessModeEnum.Disabled;
     }
 }
diff --git a/Scenes/UI/EndScreen.tscn b/Scenes/UI/EndScreen.tscn
@@ -6,7 +6,7 @@
 [ext_resource type="Theme" uid="uid://d37e3tpsbxwak" path="res://Scenes/UI/Assets/GeneralTheme.tres" id="4_1vt77"]
 
 [node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("_buttons", "TopLabel")]
-process_mode = 2
+process_mode = 3
 script = ExtResource("1_37m3y")
 _buttons = [NodePath("MarginContainer2/MarginContainer/VBoxContainer/MarginContainer/Restart"), NodePath("MarginContainer2/MarginContainer/VBoxContainer/MarginContainer2/Title"), NodePath("MarginContainer2/MarginContainer/VBoxContainer/MarginContainer3/Quit")]
 TopLabel = NodePath("MarginContainer2/MarginContainer/VBoxContainer/TopLabel")
diff --git a/Scenes/UI/Options/Scripts/HowToPlay.cs b/Scenes/UI/Options/Scripts/HowToPlay.cs
@@ -41,6 +41,11 @@ public void ReturnToPrev()
 
     public override void _Input(InputEvent @event)
     {
+        if (!GetWindow().HasFocus())
+        {
+            GetViewport().SetInputAsHandled();
+            return;
+        }
         if (@event.IsActionPressed("ui_cancel"))
         {
             ReturnToPrev();
diff --git a/Scenes/UI/Options/Scripts/OptionsMenu.cs b/Scenes/UI/Options/Scripts/OptionsMenu.cs
@@ -50,6 +50,11 @@ public override void _Ready()
 
     public override void _Input(InputEvent @event)
     {
+        if (!GetWindow().HasFocus())
+        {
+            GetViewport().SetInputAsHandled();
+            return;
+        }
         if (@event.IsActionPressed("ui_cancel"))
         {
             ReturnToPrev();
diff --git a/Scenes/UI/Remapping/ControlSettings.cs b/Scenes/UI/Remapping/ControlSettings.cs
@@ -131,11 +131,19 @@ private void GetCurrentSelection()
                 OnControllerButtonPressed();
                 GetNode<Button>("Panel/ControllerButton").GrabFocus();
                 break;
+            default:
+                _closeButton.GrabFocus();
+                break;
         }
     }
 
     public override void _Input(InputEvent @event)
     {
+        if (!GetWindow().HasFocus())
+        {
+            GetViewport().SetInputAsHandled();
+            return;
+        }
         if (@event.IsActionPressed("ui_cancel"))
         {
             ReturnToPrev();
@@ -179,7 +187,7 @@ private void ControllerConnectionChanged(long id, bool connected)
         _controllerButton.Visible = Input.GetConnectedJoypads().Count > 0;
         if (
             (string)SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey) == "CONTROLLER"
-            && !_closeButton.Visible
+            && !_controllerButton.Visible
         )
         {
             OnArrowButtonPressed();
diff --git a/Scenes/UI/RewardSelectionUI.tscn b/Scenes/UI/RewardSelectionUI.tscn
@@ -7,7 +7,7 @@
 [ext_resource type="Texture2D" uid="uid://burj10os057fx" path="res://Scenes/UI/Assets/UI_CrystalFrameInset.png" id="4_gufce"]
 
 [node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("ButtonContainer", "_description", "_acceptButton", "_skipButton")]
-process_mode = 2
+process_mode = 3
 script = ExtResource("1_1m6an")
 ButtonContainer = NodePath("MarginContainer/PanelContainer/VBoxContainer/ScrollContainer/CenterContainer/HBoxContainer")
 _description = NodePath("MarginContainer/PanelContainer/VBoxContainer/DescBox/DescMargin/Description")
diff --git a/Scenes/UI/Scripts/Inventory.cs b/Scenes/UI/Scripts/Inventory.cs
@@ -45,6 +45,11 @@ private void AddDisplayButtons(IDisplayable[] displayables, Node parentNode)
 
     public override void _Input(InputEvent @event)
     {
+        if (!GetWindow().HasFocus())
+        {
+            GetViewport().SetInputAsHandled();
+            return;
+        }
         if (_tabs.CurrentTab == 0) //Godot 4.4 changed neighbor behaviour
         {
             if (_notes.GetChildCount() > 0)
diff --git a/Scenes/UI/Scripts/MenuModule.cs b/Scenes/UI/Scripts/MenuModule.cs
@@ -11,6 +11,16 @@ public partial class MenuModule : CanvasLayer, IFocusableMenu
 
     private Control _lastFocused { get; set; }
 
+    public override void _Ready()
+    {
+        Input.JoyConnectionChanged += (device, connected) =>
+        {
+            if (!connected)
+                OpenPauseMenu(); //Pause on disconnection
+        };
+        GetTree().GetRoot().FocusExited += OpenPauseMenu;
+    }
+
     public void ResumeFocus()
     {
         CurSceneNode.ProcessMode = ProcessModeEnum.Inherit;
@@ -37,11 +47,14 @@ public void ReturnToPrev()
 
     public override void _Input(InputEvent @event)
     {
+        if (!GetWindow().HasFocus())
+        {
+            GetViewport().SetInputAsHandled();
+            return;
+        }
         if (@event.IsActionPressed("Pause"))
         {
-            var pauseMenu = GD.Load<PackedScene>(PauseMenu.LoadPath).Instantiate<PauseMenu>();
-            AddChild(pauseMenu);
-            pauseMenu.OpenMenu(this);
+            OpenPauseMenu();
         }
         if (@event.IsActionPressed("Inventory"))
         {
@@ -50,4 +63,13 @@ public override void _Input(InputEvent @event)
             invenMenu.OpenMenu(this);
         }
     }
+
+    private void OpenPauseMenu()
+    {
+        if (CurSceneNode.ProcessMode == ProcessModeEnum.Disabled)
+            return;
+        var pauseMenu = GD.Load<PackedScene>(PauseMenu.LoadPath).Instantiate<PauseMenu>();
+        AddChild(pauseMenu);
+        pauseMenu.OpenMenu(this);
+    }
 }
diff --git a/Scenes/UI/Scripts/PauseMenu.cs b/Scenes/UI/Scripts/PauseMenu.cs
@@ -29,6 +29,11 @@ private void OpenOptions()
 
     public override void _Input(InputEvent @event)
     {
+        if (!GetWindow().HasFocus())
+        {
+            GetViewport().SetInputAsHandled();
+            return;
+        }
         if (@event.IsActionPressed("ui_cancel"))
         {
             ReturnToPrev();
diff --git a/Scenes/UI/Scripts/RewardSelect.cs b/Scenes/UI/Scripts/RewardSelect.cs
@@ -98,7 +98,7 @@ Stages type
         var rewardUI = GD.Load<PackedScene>(LoadPath).Instantiate<RewardSelect>();
         parent.AddChild(rewardUI);
         rewardUI.Initialize(playerStats, amount, type);
-        parent.GetTree().Paused = true;
+        parent.ProcessMode = ProcessModeEnum.Disabled;
 
         return rewardUI;
     }
diff --git a/Scenes/UI/TitleScreen/Scripts/TitleScreen.cs b/Scenes/UI/TitleScreen/Scripts/TitleScreen.cs
@@ -14,6 +14,11 @@ public partial class TitleScreen : Control, IFocusableMenu
     private Control _focused;
     public IFocusableMenu Prev { get; set; }
 
+    public override void _EnterTree()
+    {
+        BgAudioPlayer.LiveInstance.PlayLevelMusic();
+    }
+
     public override void _Ready()
     {
         TweenLight();
@@ -59,9 +64,4 @@ private void TweenLight()
         tween.SetLoops(-1);
         tween.Play();
     }
-
-    public override void _EnterTree()
-    {
-        BgAudioPlayer.LiveInstance.PlayLevelMusic();
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ private void OnBattleLost()`
`257`	`257`	`Audio.StreamPaused = true;`
`258`	`258`	`SaveSystem.ClearSave();`
`259`	`259`	`AddChild(GD.Load<PackedScene>(EndScreen.LoadPath).Instantiate());`
`260`		`- GetTree().Paused = true;`
	`260`	`+ ProcessMode = ProcessModeEnum.Disabled;`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`private void ShowRewardSelection(int amount)`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,6 @@ private void WinStage()`
`144`	`144`	`EndScreen es = GD.Load<PackedScene>(EndScreen.LoadPath).Instantiate<EndScreen>();`
`145`	`145`	`AddChild(es);`
`146`	`146`	`es.TopLabel.Text = Tr("BATTLE_ROOM_WIN");`
`147`		`- GetTree().Paused = true;`
	`147`	`+ ProcessMode = ProcessModeEnum.Disabled;`
`148`	`148`	`}`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,11 @@ public void ReturnToPrev()`
`41`	`41`
`42`	`42`	`public override void _Input(InputEvent @event)`
`43`	`43`	`{`
	`44`	`+ if (!GetWindow().HasFocus())`
	`45`	`+ {`
	`46`	`+ GetViewport().SetInputAsHandled();`
	`47`	`+ return;`
	`48`	`+ }`
`44`	`49`	`if (@event.IsActionPressed("ui_cancel"))`
`45`	`50`	`{`
`46`	`51`	`ReturnToPrev();`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ public override void _Ready()`
`50`	`50`
`51`	`51`	`public override void _Input(InputEvent @event)`
`52`	`52`	`{`
	`53`	`+ if (!GetWindow().HasFocus())`
	`54`	`+ {`
	`55`	`+ GetViewport().SetInputAsHandled();`
	`56`	`+ return;`
	`57`	`+ }`
`53`	`58`	`if (@event.IsActionPressed("ui_cancel"))`
`54`	`59`	`{`
`55`	`60`	`ReturnToPrev();`
Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,19 @@ private void GetCurrentSelection()`
`131`	`131`	`OnControllerButtonPressed();`
`132`	`132`	`GetNode<Button>("Panel/ControllerButton").GrabFocus();`
`133`	`133`	`break;`
	`134`	`+ default:`
	`135`	`+ _closeButton.GrabFocus();`
	`136`	`+ break;`
`134`	`137`	`}`
`135`	`138`	`}`
`136`	`139`
`137`	`140`	`public override void _Input(InputEvent @event)`
`138`	`141`	`{`
	`142`	`+ if (!GetWindow().HasFocus())`
	`143`	`+ {`
	`144`	`+ GetViewport().SetInputAsHandled();`
	`145`	`+ return;`
	`146`	`+ }`
`139`	`147`	`if (@event.IsActionPressed("ui_cancel"))`
`140`	`148`	`{`
`141`	`149`	`ReturnToPrev();`
`@@ -179,7 +187,7 @@ private void ControllerConnectionChanged(long id, bool connected)`
`179`	`187`	`_controllerButton.Visible = Input.GetConnectedJoypads().Count > 0;`
`180`	`188`	`if (`
`181`	`189`	`(string)SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.InputKey) == "CONTROLLER"`
`182`		`- && !_closeButton.Visible`
	`190`	`+ && !_controllerButton.Visible`
`183`	`191`	`)`
`184`	`192`	`{`
`185`	`193`	`OnArrowButtonPressed();`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,11 @@ private void AddDisplayButtons(IDisplayable[] displayables, Node parentNode)`
`45`	`45`
`46`	`46`	`public override void _Input(InputEvent @event)`
`47`	`47`	`{`
	`48`	`+ if (!GetWindow().HasFocus())`
	`49`	`+ {`
	`50`	`+ GetViewport().SetInputAsHandled();`
	`51`	`+ return;`
	`52`	`+ }`
`48`	`53`	`if (_tabs.CurrentTab == 0) //Godot 4.4 changed neighbor behaviour`
`49`	`54`	`{`
`50`	`55`	`if (_notes.GetChildCount() > 0)`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,16 @@ public partial class MenuModule : CanvasLayer, IFocusableMenu`
`11`	`11`
`12`	`12`	`private Control _lastFocused { get; set; }`
`13`	`13`
	`14`	`+ public override void _Ready()`
	`15`	`+ {`
	`16`	`+ Input.JoyConnectionChanged += (device, connected) =>`
	`17`	`+ {`
	`18`	`+ if (!connected)`
	`19`	`+ OpenPauseMenu(); //Pause on disconnection`
	`20`	`+ };`
	`21`	`+ GetTree().GetRoot().FocusExited += OpenPauseMenu;`
	`22`	`+ }`
	`23`	`+`
`14`	`24`	`public void ResumeFocus()`
`15`	`25`	`{`
`16`	`26`	`CurSceneNode.ProcessMode = ProcessModeEnum.Inherit;`
`@@ -37,11 +47,14 @@ public void ReturnToPrev()`
`37`	`47`
`38`	`48`	`public override void _Input(InputEvent @event)`
`39`	`49`	`{`
	`50`	`+ if (!GetWindow().HasFocus())`
	`51`	`+ {`
	`52`	`+ GetViewport().SetInputAsHandled();`
	`53`	`+ return;`
	`54`	`+ }`
`40`	`55`	`if (@event.IsActionPressed("Pause"))`
`41`	`56`	`{`
`42`		`- var pauseMenu = GD.Load<PackedScene>(PauseMenu.LoadPath).Instantiate<PauseMenu>();`
`43`		`- AddChild(pauseMenu);`
`44`		`- pauseMenu.OpenMenu(this);`
	`57`	`+ OpenPauseMenu();`
`45`	`58`	`}`
`46`	`59`	`if (@event.IsActionPressed("Inventory"))`
`47`	`60`	`{`
`@@ -50,4 +63,13 @@ public override void _Input(InputEvent @event)`
`50`	`63`	`invenMenu.OpenMenu(this);`
`51`	`64`	`}`
`52`	`65`	`}`
	`66`	`+`
	`67`	`+ private void OpenPauseMenu()`
	`68`	`+ {`
	`69`	`+ if (CurSceneNode.ProcessMode == ProcessModeEnum.Disabled)`
	`70`	`+ return;`
	`71`	`+ var pauseMenu = GD.Load<PackedScene>(PauseMenu.LoadPath).Instantiate<PauseMenu>();`
	`72`	`+ AddChild(pauseMenu);`
	`73`	`+ pauseMenu.OpenMenu(this);`
	`74`	`+ }`
`53`	`75`	`}`