Native Hotkey for Manual Swap

README.md

@@ -1,7 +1,10 @@
 # Bizhawk Shuffler 2
 * written by authorblues, inspired by [Brossentia's Bizhawk Shuffler](https://github.com/brossentia/BizHawk-Shuffler), based on slowbeef's original project
 * [tested on Bizhawk v2.6.3-v2.9.1](https://github.com/TASVideos/BizHawk/releases/)  
-* [click here to download the latest version](https://github.com/authorblues/bizhawk-shuffler-2/archive/refs/heads/main.zip)
+* [click here to download the latest version](https://github.com/edzwoo/bizhawk-shuffler-2/archive/refs/heads/main.zip)
+
+## Hotkey for Manual Swap
+* This fork adds a manual swap on input as well as additional hotkey combinations
 
 ## Additional Resources
 * **[Setup Instructions](https://github.com/authorblues/bizhawk-shuffler-2/wiki/Setup-Instructions)**

shuffler-src/setupform.lua

@@ -221,7 +221,7 @@ end
 function module.initial_setup(callback)
 	local setup_window, resume, start_btn
 	local seed_text, min_text, max_text
-	local mode_combo, hk_complete, plugin_label
+	local mode_combo, hk_complete, hk_swap, plugin_label 
 	local plugin_btn, seed_btn
 	local immutable_inputs
 	local plugin_window = -1
@@ -268,6 +268,47 @@ function module.initial_setup(callback)
 		'Alt+Shift+D',
 		'Backslash (above Enter)',
 		'RightCtrl',
+		'F1',
+		'F2',
+		'F3',
+		'F4',
+		'F5',
+		'F6',
+		'F7',
+		'F8',
+		'F9',
+		'F10',
+		'F11',
+		'F12',
+		'F13',
+		'F14',
+		'F15',
+	}
+	-- Additional for swap
+	local HOTKEY_OPTIONS_SWAP = {
+		'Ctrl+Shift+Delete',
+		'Ctrl+Shift+End',
+		'Ctrl+Shift+D',
+		'Alt+Shift+End',
+		'Alt+Shift+Delete',
+		'Alt+Shift+D',
+		'Backslash (above Enter)',
+		'RightCtrl',
+		'F1',
+		'F2',
+		'F3',
+		'F4',
+		'F5',
+		'F6',
+		'F7',
+		'F8',
+		'F9',
+		'F10',
+		'F11',
+		'F12',
+		'F13',
+		'F14',
+		'F15',
 	}
 	local function invert_table(t)
 		local keys = {}
@@ -337,6 +378,7 @@ function module.initial_setup(callback)
 		config.max_swap = math.max(a, b)
 
 		config.hk_complete = (forms.gettext(hk_complete) or 'Ctrl+Shift+End'):match("[^%s]+")
+		config.hk_swap = (forms.gettext(hk_swap) or 'Ctrl+Shift+Delete'):match("[^%s]+")
 	end
 
 	function main_cleanup()
@@ -404,6 +446,11 @@ function module.initial_setup(callback)
 	forms.settext(hk_complete, config.hk_complete or 'Ctrl+Shift+End')
 	y = y + 30
 
+	hk_swap = forms.dropdown(setup_window, HOTKEY_OPTIONS_SWAP, 10, y, 150, 20)
+	forms.label(setup_window, "Hotkey: Swap Game", 165, y+3, 150, 20)
+	forms.settext(hk_swap, config.hk_swap or 'Ctrl+Shift+Delete')
+	y = y + 30
+
 	output_files_combo = forms.dropdown(setup_window, OUTPUT_FILE_MODES, 10, y, 150, 20)
 	forms.label(setup_window, "Output info files for OBS", 165, y+3, 150, 20)
 	forms.settext(output_files_combo, OUTPUT_FILE_MODES[config.output_files] or OUTPUT_FILE_MODES[OUTPUT_FILE_MODES_DEFAULT])

shuffler.lua

@@ -714,8 +714,11 @@ while true do
 		-- mark the game as complete if the hotkey is pressed (and some time buffer)
 		-- the time buffer should hopefully prevent somebody from attempting to
 		-- press the hotkey and the game swapping, marking the wrong game complete
-		if current_input[config.hk_complete] and not prev_input[config.hk_complete] and
-			frames_since_restart > math.min(3, config.min_swap/2) * 60 then mark_complete() end
+		if current_input[config.hk_complete] and not prev_input[config.hk_complete] and frames_since_restart > math.min(3, config.min_swap/2) * 60 then
+			mark_complete() 
+		elseif current_input[config.hk_swap] and not prev_input[config.hk_swap] then
+			swap_game()
+		end
 		prev_input = current_input
 
 		-- time to swap!