fix keybinds

XtraCube · XtraCube · commit b56e751a3e0c · 2025-10-04T14:17:58.000-04:00
diff --git a/LaunchpadReloaded/Buttons/BaseLaunchpadButton.cs b/LaunchpadReloaded/Buttons/BaseLaunchpadButton.cs
@@ -1,6 +1,7 @@
 ﻿using LaunchpadReloaded.Features;
 using LaunchpadReloaded.Utilities;
 using MiraAPI.Hud;
+using MiraAPI.Keybinds;
 using MiraAPI.LocalSettings;
 using MiraAPI.PluginLoading;
 using UnityEngine;
@@ -16,6 +17,8 @@ public abstract class BaseLaunchpadButton : CustomActionButton
 
     public abstract bool AffectedByHack { get; }
 
+    public override BaseKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
+
     public override bool CanUse()
     {
         var buttonTimer = !TimerAffectedByPlayer || PlayerControl.LocalPlayer.ButtonTimerEnabled();
@@ -33,6 +36,8 @@ public abstract class BaseLaunchpadButton<T> : CustomActionButton<T> where T : M
 
     public abstract bool AffectedByHack { get; }
 
+    public override BaseKeybind Keybind => MiraGlobalKeybinds.PrimaryAbility;
+
     public override void ResetTarget()
     {
         SetOutline(false);
diff --git a/LaunchpadReloaded/Buttons/Crewmate/CallButton.cs b/LaunchpadReloaded/Buttons/Crewmate/CallButton.cs
@@ -21,7 +21,7 @@ public class CallButton : BaseLaunchpadButton
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Call", KeyboardKeyCode.C);
+    public override BaseKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;
 
     public override bool Enabled(RoleBehaviour? role)
     {
diff --git a/LaunchpadReloaded/Buttons/Crewmate/FreezeButton.cs b/LaunchpadReloaded/Buttons/Crewmate/FreezeButton.cs
@@ -24,8 +24,6 @@ public class FreezeButton : BaseLaunchpadButton<DeadBody>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Freeze", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is CoronerRole;
diff --git a/LaunchpadReloaded/Buttons/Crewmate/GambleButton.cs b/LaunchpadReloaded/Buttons/Crewmate/GambleButton.cs
@@ -24,8 +24,6 @@ public class GambleButton : BaseLaunchpadButton<PlayerControl>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Gamble", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role) => role is GamblerRole;
 
     public override PlayerControl? GetTarget()
diff --git a/LaunchpadReloaded/Buttons/Crewmate/InstinctButton.cs b/LaunchpadReloaded/Buttons/Crewmate/InstinctButton.cs
@@ -22,8 +22,6 @@ public class InstinctButton : BaseLaunchpadButton
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Instinct", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is LpDetectiveRole;
diff --git a/LaunchpadReloaded/Buttons/Crewmate/InvestigateButton.cs b/LaunchpadReloaded/Buttons/Crewmate/InvestigateButton.cs
@@ -22,7 +22,7 @@ public class InvestigateButton : BaseLaunchpadButton<DeadBody>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Investigate", KeyboardKeyCode.V);
+    public override BaseKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;
 
     public override bool Enabled(RoleBehaviour? role)
     {
diff --git a/LaunchpadReloaded/Buttons/Crewmate/ReviveButton.cs b/LaunchpadReloaded/Buttons/Crewmate/ReviveButton.cs
@@ -31,7 +31,7 @@ public class ReviveButton : BaseLaunchpadButton<DeadBody>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Revive", KeyboardKeyCode.F);
+    public override BaseKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;
 
     public override bool Enabled(RoleBehaviour? role) => role is MedicRole;
 
diff --git a/LaunchpadReloaded/Buttons/Crewmate/SealButton.cs b/LaunchpadReloaded/Buttons/Crewmate/SealButton.cs
@@ -24,8 +24,6 @@ public class SealButton : BaseLaunchpadButton<Vent>
     public override bool AffectedByHack => false;
     public override float Distance => 1f;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Seal", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is SealerRole;
diff --git a/LaunchpadReloaded/Buttons/Crewmate/ShootButton.cs b/LaunchpadReloaded/Buttons/Crewmate/ShootButton.cs
@@ -22,8 +22,6 @@ public class ShootButton : BaseLaunchpadButton<PlayerControl>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Shoot", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role) => role is SheriffRole;
 
     public override PlayerControl? GetTarget()
diff --git a/LaunchpadReloaded/Buttons/Crewmate/ZoomButton.cs b/LaunchpadReloaded/Buttons/Crewmate/ZoomButton.cs
@@ -25,8 +25,6 @@ public class ZoomButton : BaseLaunchpadButton
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Zoom", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is CaptainRole;
diff --git a/LaunchpadReloaded/Buttons/DragButton.cs b/LaunchpadReloaded/Buttons/DragButton.cs
@@ -27,8 +27,6 @@ public class DragButton : BaseLaunchpadButton<DeadBody>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Drag", KeyboardKeyCode.V);
-
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is JanitorRole || OptionGroupSingleton<MedicOptions>.Instance.DragBodies && role is MedicRole;
diff --git a/LaunchpadReloaded/Buttons/Impostor/DeadlockButton.cs b/LaunchpadReloaded/Buttons/Impostor/DeadlockButton.cs
@@ -21,8 +21,6 @@ public class DeadlockButton : BaseLaunchpadButton
     public override LoadableAsset<Sprite> Sprite => LaunchpadAssets.DeadlockButton;
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => false;
-
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Deadlock", KeyboardKeyCode.F);
     
     public override bool Enabled(RoleBehaviour? role) => role is HitmanRole;
 
diff --git a/LaunchpadReloaded/Buttons/Impostor/DigButton.cs b/LaunchpadReloaded/Buttons/Impostor/DigButton.cs
@@ -22,8 +22,6 @@ public class DigButton : BaseLaunchpadButton
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => false;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Dig Vent", KeyboardKeyCode.F);
-
     private float _ventDist = OptionGroupSingleton<BurrowerOptions>.Instance.VentDist;
 
     public override bool Enabled(RoleBehaviour? role)
diff --git a/LaunchpadReloaded/Buttons/Impostor/DissectButton.cs b/LaunchpadReloaded/Buttons/Impostor/DissectButton.cs
@@ -23,7 +23,7 @@ public class DissectButton : BaseLaunchpadButton<DeadBody>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => false;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Dissect", KeyboardKeyCode.V);
+    public override BaseKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;
 
     public override bool Enabled(RoleBehaviour? role)
     {
diff --git a/LaunchpadReloaded/Buttons/Impostor/HackButton.cs b/LaunchpadReloaded/Buttons/Impostor/HackButton.cs
@@ -21,8 +21,6 @@ public class HackButton : BaseLaunchpadButton
     public override LoadableAsset<Sprite> Sprite => LaunchpadAssets.HackButton;
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => false;
-
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Hack", KeyboardKeyCode.F);
     public override bool Enabled(RoleBehaviour? role) => role is HackerRole;
     public override bool CanUse() => base.CanUse() && !HackerUtilities.AnyPlayerHacked();
 
diff --git a/LaunchpadReloaded/Buttons/Impostor/HideButton.cs b/LaunchpadReloaded/Buttons/Impostor/HideButton.cs
@@ -26,7 +26,7 @@ public class HideButton : BaseLaunchpadButton<DeadBody>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Hide", KeyboardKeyCode.F);
+    public override BaseKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;
 
     private static Vent VentTarget => HudManager.Instance.ImpostorVentButton.currentTarget;
 
diff --git a/LaunchpadReloaded/Buttons/Impostor/InjectButton.cs b/LaunchpadReloaded/Buttons/Impostor/InjectButton.cs
@@ -25,8 +25,6 @@ public class InjectButton : BaseLaunchpadButton<PlayerControl>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => false;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Inject", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role) => role is SurgeonRole;
 
     private PlayerControl? _injectedPlayer;
diff --git a/LaunchpadReloaded/Buttons/Impostor/SwapButton.cs b/LaunchpadReloaded/Buttons/Impostor/SwapButton.cs
@@ -20,8 +20,6 @@ public class SwapButton : BaseLaunchpadButton
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Swap", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is SwapshifterRole;
diff --git a/LaunchpadReloaded/Buttons/Modifiers/VendettaMarkButton.cs b/LaunchpadReloaded/Buttons/Modifiers/VendettaMarkButton.cs
@@ -24,8 +24,6 @@ public class VendettaMarkButton : BaseLaunchpadButton<PlayerControl>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => true;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Mark", KeyboardKeyCode.F);
-
     protected override void OnClick()
     {
         Target!.RpcAddModifier<VendettaMarkModifier>(PlayerControl.LocalPlayer.PlayerId);
diff --git a/LaunchpadReloaded/Buttons/Neutral/CollectButton.cs b/LaunchpadReloaded/Buttons/Neutral/CollectButton.cs
@@ -23,8 +23,6 @@ public class CollectButton : BaseLaunchpadButton<DeadBody>
     public override bool TimerAffectedByPlayer => true;
     public override bool AffectedByHack => false;
 
-    public override BaseKeybind? Keybind { get; } = new MiraKeybind("Collect", KeyboardKeyCode.F);
-
     public override bool Enabled(RoleBehaviour? role)
     {
         return role is ReaperRole;

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class CallButton : BaseLaunchpadButton`
`21`	`21`	`public override bool TimerAffectedByPlayer => true;`
`22`	`22`	`public override bool AffectedByHack => true;`
`23`	`23`
`24`		`- public override BaseKeybind? Keybind { get; } = new MiraKeybind("Call", KeyboardKeyCode.C);`
	`24`	`+ public override BaseKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;`
`25`	`25`
`26`	`26`	`public override bool Enabled(RoleBehaviour? role)`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ public class FreezeButton : BaseLaunchpadButton<DeadBody>`
`24`	`24`	`public override bool TimerAffectedByPlayer => true;`
`25`	`25`	`public override bool AffectedByHack => true;`
`26`	`26`
`27`		`- public override BaseKeybind? Keybind { get; } = new MiraKeybind("Freeze", KeyboardKeyCode.F);`
`28`		`-`
`29`	`27`	`public override bool Enabled(RoleBehaviour? role)`
`30`	`28`	`{`
`31`	`29`	`return role is CoronerRole;`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ public class InstinctButton : BaseLaunchpadButton`
`22`	`22`	`public override bool TimerAffectedByPlayer => true;`
`23`	`23`	`public override bool AffectedByHack => true;`
`24`	`24`
`25`		`- public override BaseKeybind? Keybind { get; } = new MiraKeybind("Instinct", KeyboardKeyCode.F);`
`26`		`-`
`27`	`25`	`public override bool Enabled(RoleBehaviour? role)`
`28`	`26`	`{`
`29`	`27`	`return role is LpDetectiveRole;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class InvestigateButton : BaseLaunchpadButton<DeadBody>`
`22`	`22`	`public override bool TimerAffectedByPlayer => true;`
`23`	`23`	`public override bool AffectedByHack => true;`
`24`	`24`
`25`		`- public override BaseKeybind? Keybind { get; } = new MiraKeybind("Investigate", KeyboardKeyCode.V);`
	`25`	`+ public override BaseKeybind Keybind => MiraGlobalKeybinds.SecondaryAbility;`
`26`	`26`
`27`	`27`	`public override bool Enabled(RoleBehaviour? role)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ public class SealButton : BaseLaunchpadButton<Vent>`
`24`	`24`	`public override bool AffectedByHack => false;`
`25`	`25`	`public override float Distance => 1f;`
`26`	`26`
`27`		`- public override BaseKeybind? Keybind { get; } = new MiraKeybind("Seal", KeyboardKeyCode.F);`
`28`		`-`
`29`	`27`	`public override bool Enabled(RoleBehaviour? role)`
`30`	`28`	`{`
`31`	`29`	`return role is SealerRole;`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ public class ZoomButton : BaseLaunchpadButton`
`25`	`25`	`public override bool TimerAffectedByPlayer => true;`
`26`	`26`	`public override bool AffectedByHack => true;`
`27`	`27`
`28`		`- public override BaseKeybind? Keybind { get; } = new MiraKeybind("Zoom", KeyboardKeyCode.F);`
`29`		`-`
`30`	`28`	`public override bool Enabled(RoleBehaviour? role)`
`31`	`29`	`{`
`32`	`30`	`return role is CaptainRole;`