fix(vanilla): bug where pressing double escape in menu screens hides ui

MSUTeam · May 10, 2022 · 2f2fa09 · 2f2fa09
1 parent 93f1026
commit 2f2fa09
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/msu/hooks/entity/tactical/actor.nut b/msu/hooks/entity/tactical/actor.nut
@@ -62,7 +62,7 @@
 		}
 	}
 
-	local getActionPointsMax = o.getActionPointsMax;
+	local getActionPointsMax = o.getActionPointsMax; // VANILLAFIX http://battlebrothersgame.com/forums/topic/getactionpointsmax-of-actor-should-return-a-floored-value/
 	o.getActionPointsMax = function()
 	{
 		return ::Math.floor(getActionPointsMax());

diff --git a/msu/hooks/states/tactical_state.nut b/msu/hooks/states/tactical_state.nut
@@ -77,4 +77,11 @@
 		}
 		return onMouseInput(_mouse);
 	}
+
+	local toggleMenuScreen = o.toggleMenuScreen; // VANILLAFIX https://steamcommunity.com/app/365360/discussions/1/3276942370896011321/
+	o.toggleMenuScreen = function()
+	{
+		if (this.m.TacticalMenuScreen.isAnimating()) return false;
+		return toggleMenuScreen();
+	}
 });
diff --git a/msu/hooks/states/world_state.nut b/msu/hooks/states/world_state.nut
@@ -188,6 +188,13 @@
 		return properties;
 	}
 
+	local toggleMenuScreen = o.toggleMenuScreen; // VANILLAFIX https://steamcommunity.com/app/365360/discussions/1/3276942370896011321/
+	o.toggleMenuScreen = function()
+	{
+		if (this.m.WorldMenuScreen.isAnimating()) return false;
+		return toggleMenuScreen();
+	}
+
 	local onBeforeSerialize = o.onBeforeSerialize;
 	o.onBeforeSerialize = function( _out )
 	{

diff --git a/msu/vanilla_mod/vanilla_keybinds.nut b/msu/vanilla_mod/vanilla_keybinds.nut
@@ -57,7 +57,7 @@ local function isCampfireScreen()
 	if (::MSU.isKindOf(this, "world_state"))
 	{
 		if (isCampfireScreen.call(this)) return;
-		if (this.toggleMenuScreen())
+		if (!this.m.WorldMenuScreen.isAnimating() && this.toggleMenuScreen())
 		{
 			return true;
 		}