Skip to content

Commit 513c1ca

Browse files
committed
dsda: raven defaults and mnemonics
rename controller so all 3 games can share binds
1 parent 971fc61 commit 513c1ca

File tree

3 files changed

+26
-7
lines changed

3 files changed

+26
-7
lines changed

Assets/defctrl.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,8 @@
685685
"P2 Joystick Button 2": "X",
686686
"P2 Joystick Button 3": "C"
687687
},
688-
"Doom Input Format": {
689-
"P1 Fire": "Ctrl,WMouse L",
688+
"Doom Controller": {
689+
"P1 Fire": "WMouse L",
690690
"P1 Use": "Space",
691691
"P1 Forward": "W",
692692
"P1 Backward": "S",
@@ -701,6 +701,16 @@
701701
"P1 Weapon Select 5": "Number5",
702702
"P1 Weapon Select 6": "Number6",
703703
"P1 Weapon Select 7": "Number7",
704+
"P1 Inventory Left": "LeftBracket",
705+
"P1 Inventory Right": "RightBracket",
706+
"P1 Use Artifact": "Enter",
707+
"P1 Look Up": "PageDown",
708+
"P1 Look Down": "Delete",
709+
"P1 Look Center": "End",
710+
"P1 Fly Up": "PageUp",
711+
"P1 Fly Down": "Insert",
712+
"P1 Fly Center": "Home",
713+
"P1 Jump": "Slash",
704714
"Change Gamma": "F11",
705715
"Automap Toggle": "Tab",
706716
"Automap +": "KeypadAdd",

src/BizHawk.Emulation.Common/Base Implementations/Bk2MnemonicLookup.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -856,16 +856,25 @@ public static string LookupAxis(string button, string systemId)
856856
["Backward"] = 'v',
857857
["Change Gamma"] = 'G',
858858
["End Player"] = 'E',
859-
["Fire"] = 'F',
860-
["Forward"] = '^',
861-
["Jump"] = 'J',
859+
["Fire"] = 'F',
860+
["Fly Up"] = 'u',
861+
["Fly Down"] = 'p',
862+
["Fly Center"] = 'c',
863+
["Forward"] = '^',
864+
["Inventory Left"] = 'L',
865+
["Inventory Right"] = 'R',
866+
["Jump"] = 'J',
867+
["Look Up"] = 'U',
868+
["Look Down"] = 'D',
869+
["Look Center"] = 'C',
862870
["Run"] = 'R',
863871
["Strafe"] = 'S',
864872
["Strafe Left"] = '<',
865873
["Strafe Right"] = '>',
866874
["Turn Left"] = '{',
867875
["Turn Right"] = '}',
868-
["Use"] = 'U',
876+
["Use"] = 'U',
877+
["Use Artifact"] = 'A',
869878
["Weapon Select 1"] = '1',
870879
["Weapon Select 2"] = '2',
871880
["Weapon Select 3"] = '3',

src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.Controller.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public partial class DSDA
88
{
99
public static ControllerDefinition CreateControllerDefinition(DoomSyncSettings settings)
1010
{
11-
var controller = new ControllerDefinition($"{settings.InputFormat} Input Format");
11+
var controller = new ControllerDefinition($"Doom Controller");
1212
var longtics = settings.TurningResolution == TurningResolution.Longtics;
1313

1414
for (int i = 0; i < 4; i++)

0 commit comments

Comments
 (0)