Fixed not displaying Tutorials;

Fixed opening Spawn and Context menu at the same time;
nanos-world · Jul 30, 2022 · b37ef56 · b37ef56
1 parent 47b293d
commit b37ef56
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Client/ContextMenu.lua b/Client/ContextMenu.lua
@@ -1,6 +1,8 @@
 ContextMenuOpened = ContextMenuOpened or false
 
 Input.Bind("ContextMenu", InputEvent.Pressed, function()
+	if (SpawnMenuOpened) then return end
+
 	if (ContextMenuOpened) then
 		MainHUD:CallEvent("ToggleContextMenuVisibility", false)
 

diff --git a/Client/SpawnMenu.lua b/Client/SpawnMenu.lua
@@ -13,6 +13,8 @@ ToolGunsTutorials = ToolGunsTutorials or {}
 -- WORKAROUND used for weapons Patterns
 SelectedOption = SelectedOption or ""
 
+SpawnMenuOpened = SpawnMenuOpened or false
+
 -- Configures the Highlight colors to be used
 Client.SetHighlightColor(Color(0, 20, 0, 1.20), 0, HighlightMode.Always) -- Index 0
 Client.SetOutlineColor(Color(0, 0, 300), 2) -- Index 2
@@ -58,13 +60,19 @@ Package.Subscribe("Load", function()
 end)
 
 Input.Bind("SpawnMenu", InputEvent.Released, function()
+	if (ContextMenuOpened) then return end
+
 	MainHUD:CallEvent("ToggleSpawnMenuVisibility", false)
+	SpawnMenuOpened = false
 	Client.SetMouseEnabled(false)
 	Client.SetChatVisibility(true)
 end)
 
 Input.Bind("SpawnMenu", InputEvent.Pressed, function()
+	if (ContextMenuOpened) then return end
+
 	MainHUD:CallEvent("ToggleSpawnMenuVisibility", true)
+	SpawnMenuOpened = true
 	Client.SetMouseEnabled(true)
 	Client.SetChatVisibility(false)
 	MainHUD:BringToFront()

diff --git a/Client/UI/index.html b/Client/UI/index.html
@@ -19,10 +19,10 @@
 	</head>
 	<body>
 		<div id="tutorials">
-			<div id="tutorial-title">
+			<div id="tutorial_title">
 				Tool
 			</div>
-			<div id="tutorial-body">
+			<div id="tutorial_body">
 				<!-- <span class="tutorial"><img src="..." class="tutorial-key"> Attach Something</span> -->
 				<!-- <span class="tutorial"><img src="..." class="tutorial-key"> Do Another Thing</span> -->
 			</div>

diff --git a/Package.toml b/Package.toml
@@ -5,7 +5,7 @@
     # contributors
     author =               "nanos™"
     # version
-    version =              "2.11.4"
+    version =              "2.11.5"
     # image URL
     image =                "https://i.imgur.com/aoEa4N4.jpg"
     # package type: 'script' (normal package), 'game-mode' (unique package - can only load one at a time), 'library' (doesn't start a Lua VM) or 'loading-screen' (special package for loading screen)