incomplete but theoretically functional extra weapon hotkey

Author: pawnishoovy

Data/Base.rte/GUIs/SettingsGUI.ini

@@ -2522,6 +2522,36 @@ Anchor = Left, Top
 ToolTip = None
 Text = [InputKey]
 
+[LabelInputName31]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName31
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey31]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey31
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
 [CollectionBoxInputCapture]
 ControlType = COLLECTIONBOX
 Parent = root

Data/Base.rte/GUIs/SettingsPauseGUI.ini

@@ -2523,6 +2523,36 @@ Anchor = Left, Top
 ToolTip = None
 Text = [InputKey]
 
+[LabelInputName31]
+ControlType = LABEL
+Parent = CollectionBoxScrollingMappingBox
+X = 215
+Y = 380
+Width = 110
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelInputName31
+Anchor = Left, Top
+ToolTip = None
+Text = InputName
+HAlignment = right
+VAlignment = middle
+
+[ButtonInputKey31]
+ControlType = BUTTON
+Parent = CollectionBoxScrollingMappingBox
+X = 330
+Y = 380
+Width = 95
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonInputKey31
+Anchor = Left, Top
+ToolTip = None
+Text = [InputKey]
+
 [CollectionBoxInputCapture]
 ControlType = COLLECTIONBOX
 Parent = root

Data/Browncoats.rte/Actors/Turrets/Thunderer/ThundererGun.lua

@@ -1,5 +1,5 @@
 function OnFire(self)
-	CameraMan:AddScreenShake(7, self.Pos);
+	CameraMan:AddScreenShake(12, self.Pos);
 
 	local shot = self.Shot:Clone();
 	shot.Pos = self.MuzzlePos;

Source/Lua/LuaBindingsSystem.cpp

@@ -80,6 +80,7 @@ LuaBindingRegisterFunctionDefinitionForType(SystemLuaBindings, Controller) {
 	                           luabind::value("WEAPON_CHANGE_PREV", ControlState::WEAPON_CHANGE_PREV),
 	                           luabind::value("WEAPON_PICKUP", ControlState::WEAPON_PICKUP),
 	                           luabind::value("WEAPON_DROP", ControlState::WEAPON_DROP),
+	                           luabind::value("WEAPON_PRIMARY_HOTKEY", ControlState::WEAPON_PRIMARY_HOTKEY),
 	                           luabind::value("ACTOR_NEXT", ControlState::ACTOR_NEXT),
 	                           luabind::value("ACTOR_PREV", ControlState::ACTOR_PREV),
 	                           luabind::value("ACTOR_BRAIN", ControlState::ACTOR_BRAIN),

Source/System/Constants.h

@@ -219,6 +219,7 @@ namespace RTE {
 		INPUT_WEAPON_PICKUP,
 		INPUT_WEAPON_DROP,
 		INPUT_WEAPON_RELOAD,
+		INPUT_WEAPON_PRIMARY_HOTKEY,
 		INPUT_START,
 		INPUT_BACK,
 		INPUT_R_UP,
@@ -253,6 +254,7 @@ namespace RTE {
 	    "Pick Up Device", // INPUT_WEAPON_PICKUP
 	    "Drop Device", // INPUT_WEAPON_DROP
 	    "Reload Weapon", // INPUT_WEAPON_RELOAD
+	    "Primary Weapon Hotkey", // INPUT_WEAPON_PRIMARY_HOTKEY
 	    "Start", // INPUT_START
 	    "Back", // INPUT_BACK
 	    "Analog Aim Up", // INPUT_R_UP

Source/System/Controller.cpp

@@ -26,6 +26,7 @@ void Controller::Clear() {
 	m_WeaponPickupIgnore = false;
 	m_WeaponDropIgnore = false;
 	m_WeaponReloadIgnore = false;
+	m_WeaponPrimaryHotkeyIgnore = false;
 	m_MouseMovement.Reset();
 	m_AnalogCursorAngleLimits = {{0, 0}, false};
 	m_ReleaseTimer.Reset();
@@ -251,6 +252,8 @@ void Controller::UpdatePlayerInput(std::array<bool, ControlState::CONTROLSTATECO
 		m_WeaponDropIgnore = false;
 	} else if (g_UInputMan.ElementReleased(m_Player, InputElements::INPUT_WEAPON_RELOAD)) {
 		m_WeaponReloadIgnore = false;
+	} else if (g_UInputMan.ElementReleased(m_Player, InputElements::INPUT_WEAPON_PRIMARY_HOTKEY)) {
+		m_WeaponPrimaryHotkeyIgnore = false;
 	}
 
 	m_ControlStates[ControlState::HOLD_RIGHT] = g_UInputMan.ElementHeld(m_Player, InputElements::INPUT_L_RIGHT) || g_UInputMan.ElementHeld(m_Player, InputElements::INPUT_AIM_RIGHT);
@@ -351,6 +354,10 @@ void Controller::UpdatePlayerPieMenuInput(std::array<bool, ControlState::CONTROL
 			m_ControlStates[ControlState::WEAPON_RELOAD] = true;
 			m_WeaponReloadIgnore = true;
 		}
+		if (!m_WeaponPrimaryHotkeyIgnore && g_UInputMan.ElementPressed(m_Player, InputElements::INPUT_WEAPON_PRIMARY_HOTKEY)) {
+			m_ControlStates[ControlState::WEAPON_PRIMARY_HOTKEY] = true;
+			m_WeaponPrimaryHotkeyIgnore = true;
+		}
 	}
 
 	// PIE MENU ACTIVE

Source/System/Controller.h

@@ -41,6 +41,7 @@ namespace RTE {
 		WEAPON_CHANGE_PREV,
 		WEAPON_PICKUP,
 		WEAPON_DROP,
+		WEAPON_PRIMARY_HOTKEY,
 		ACTOR_NEXT,
 		ACTOR_PREV,
 		ACTOR_BRAIN,
@@ -329,6 +330,7 @@ namespace RTE {
 		bool m_WeaponPickupIgnore;
 		bool m_WeaponDropIgnore;
 		bool m_WeaponReloadIgnore;
+		bool m_WeaponPrimaryHotkeyIgnore;
 
 		Timer m_ReleaseTimer; //!< Timer for measuring release delays.
 		Timer m_JoyAccelTimer; //!< Timer for measuring analog joystick-controlled cursor acceleration.

Source/System/InputScheme.cpp

@@ -59,6 +59,7 @@ int InputScheme::ReadProperty(const std::string_view& propName, Reader& reader)
 	MatchProperty("WeaponPickup", { reader >> m_InputMappings[InputElements::INPUT_WEAPON_PICKUP]; });
 	MatchProperty("WeaponDrop", { reader >> m_InputMappings[InputElements::INPUT_WEAPON_DROP]; });
 	MatchProperty("WeaponReload", { reader >> m_InputMappings[InputElements::INPUT_WEAPON_RELOAD]; });
+	MatchProperty("WeaponPrimaryHotkey", { reader >> m_InputMappings[InputElements::INPUT_WEAPON_PRIMARY_HOTKEY]; });
 	MatchProperty("Start", { reader >> m_InputMappings[InputElements::INPUT_START]; });
 	MatchProperty("Back", { reader >> m_InputMappings[InputElements::INPUT_BACK]; });
 	MatchProperty("RightUp", { reader >> m_InputMappings[InputElements::INPUT_R_UP]; });
@@ -222,6 +223,7 @@ void InputScheme::SetPreset(InputPreset schemePreset) {
 			m_InputMappings[InputElements::INPUT_WEAPON_DROP].SetKey(SDL_SCANCODE_G);
 			m_InputMappings[InputElements::INPUT_WEAPON_CHANGE_PREV].SetKey(SDL_SCANCODE_1);
 			m_InputMappings[InputElements::INPUT_WEAPON_CHANGE_NEXT].SetKey(SDL_SCANCODE_2);
+			m_InputMappings[InputElements::INPUT_WEAPON_PRIMARY_HOTKEY].SetMouseButton(MOUSE_MIDDLE);
 			break;
 		case InputPreset::PresetGenericDPad:
 			// TODO: Don't have any SNES style controllers to test with so no idea what would work or make sense here.