Completed scene input response migration

Tetro48 · Dec 6, 2023 · d74033f · d74033f
1 parent 8e9afba
commit d74033f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/scene/highscores.lua b/scene/highscores.lua
@@ -203,13 +203,13 @@ function HighscoreScene:back()
 end
 
 function HighscoreScene:onInputRelease(e)
-	if e.input == "menu_up" or e.scancode == "up" then
+	if e.input == "menu_up" then
 		self.das_up = nil
-	elseif e.input == "menu_down" or e.scancode == "down" then
+	elseif e.input == "menu_down" then
 		self.das_down = nil
-	elseif e.input == "menu_right" or e.scancode == "right" then
+	elseif e.input == "menu_right" then
 		self.das_right = nil
-	elseif e.input == "menu_left" or e.scancode == "left" then
+	elseif e.input == "menu_left" then
 		self.das_left = nil
 	end
 end

diff --git a/scene/input_config.lua b/scene/input_config.lua
@@ -68,10 +68,10 @@ function ConfigScene:onInputPress(e)
 	if e.input == "menu_decide" or e.scancode == "return" then
 		playSE("main_decide")
 		scene = menu_screens[self.menu_state]()
-	elseif e.input == "menu_up" or e.scancode == "up" then
+	elseif e.input == "menu_up" then
 		self:changeOption(-1)
 		playSE("cursor")
-	elseif e.input == "menu_down" or e.scancode == "down" then
+	elseif e.input == "menu_down" then
 		self:changeOption(1)
 		playSE("cursor")
 	elseif config.input and (

diff --git a/scene/mode_select.lua b/scene/mode_select.lua
@@ -439,7 +439,7 @@ end
 function ModeSelectScene:onInputRelease(e)
 	if e.input == "menu_up" then
 		self.das_up = nil
-	elseif e.input == "menu_down" or e.scancode == "down" then
+	elseif e.input == "menu_down" then
 		self.das_down = nil
 	elseif e.input then
 		self.secret_inputs[e.input] = false

diff --git a/scene/replay.lua b/scene/replay.lua
@@ -233,13 +233,13 @@ function ReplayScene:onInputPress(e)
 		pitchBGM(1)
 	elseif e.input == "hold" then
 		self.show_invisible = not self.show_invisible
-	elseif e.input == "left" then
+	elseif e.input == "menu_left" then
 		self.replay_speed = self.replay_speed - 1
 		if self.replay_speed < 1 then
 			self.replay_speed = 1
 		end
 		pitchBGM(self.replay_speed)
-	elseif e.input == "right" then
+	elseif e.input == "menu_right" then
 		self.replay_speed = self.replay_speed + 1
 		if self.replay_speed > 99 then
 			self.replay_speed = 99

diff --git a/scene/replay_select.lua b/scene/replay_select.lua
@@ -555,13 +555,13 @@ function ReplaySelectScene:onInputPress(e)
 end
 
 function ReplaySelectScene:onInputRelease(e)
-	if e.input == "up" or e.scancode == "up" then
+	if e.input == "menu_up" then
 		self.das_up = nil
-	elseif e.input == "down" or e.scancode == "down" then
+	elseif e.input == "menu_down" then
 		self.das_down = nil
-	elseif e.input == "right" or e.scancode == "right" then
+	elseif e.input == "menu_right" then
 		self.das_right = nil
-	elseif e.input == "left" or e.scancode == "left" then
+	elseif e.input == "menu_left" then
 		self.das_left = nil
 	end
 end

diff --git a/scene/resource_pack_scene.lua b/scene/resource_pack_scene.lua
@@ -316,12 +316,12 @@ function ResourcePackScene:onInputPress(e)
 		dividend = 1
 	end
 	local prev_right_selection_index = self.right_selection_index
-	if e.input == "up" or e.input == "down" then
+	if e.input == "menu_up" or e.input == "menu_down" then
 		if self.selection_type == 0 then
 			self.selection_type = 1
 			return
 		end
-		local inc_or_dec = (e.input == "down" and 1 or -1)
+		local inc_or_dec = (e.input == "menu_down" and 1 or -1)
 		if self.selection_type == 1 then
 			if self.left_selection_index + inc_or_dec > dividend then
 				self.selection_type = 3
@@ -334,11 +334,11 @@ function ResourcePackScene:onInputPress(e)
 				return
 			end
 			self.right_selection_index = math.max(self.right_selection_index + inc_or_dec, 1)
-		elseif self.selection_type > 2 and e.input == "up" then
+		elseif self.selection_type > 2 and e.input == "menu_up" then
 			self.selection_type = self.selection_type - 2
 		end
 	end
-	if e.input == "left" then
+	if e.input == "menu_left" then
 		if self.selection_type == 0 then
 			self.selection_type = 1
 			return
@@ -347,7 +347,7 @@ function ResourcePackScene:onInputPress(e)
 			self.selection_type = self.selection_type - 1
 		end
 	end
-	if e.input == "right" then
+	if e.input == "menu_right" then
 		if self.selection_type == 0 then
 			self.selection_type = 1
 			return

diff --git a/scene/revamped_mode_select.lua b/scene/revamped_mode_select.lua
@@ -451,16 +451,16 @@ function ModeSelectScene:onInputPress(e)
         end
     elseif e.input == "menu_decide" then
         self:indirectStartMode()
-    elseif e.input == "up" or e.scancode == "up" then
+    elseif e.input == "menu_up" then
         self.das_up = true
         self.das_down = nil
-    elseif e.input == "down" or e.scancode == "down" then
+    elseif e.input == "menu_down" then
         self.das_down = true
         self.das_up = nil
-    elseif e.input == "left" or e.scancode == "left" then
+    elseif e.input == "menu_left" then
         self.das_left = true
         self.das_right = nil
-    elseif e.input == "right" or e.scancode == "right" then
+    elseif e.input == "menu_right" then
         self.das_right = true
         self.das_left = nil
     elseif e.input then
@@ -469,13 +469,13 @@ function ModeSelectScene:onInputPress(e)
 end
 
 function ModeSelectScene:onInputRelease(e)
-	if e.input == "up" or e.scancode == "up" then
+	if e.input == "menu_up" then
 		self.das_up = nil
-	elseif e.input == "down" or e.scancode == "down" then
+	elseif e.input == "menu_down" then
 		self.das_down = nil
-    elseif e.input == "left" or e.scancode == "left" then
+    elseif e.input == "menu_left" then
         self.das_left = nil
-    elseif e.input == "right" or e.scancode == "right" then
+    elseif e.input == "menu_right" then
         self.das_right = nil
 	elseif e.input then
 		self.secret_inputs[e.input] = false