lrb: slot switch and vsync options

hmxmilohax · May 27, 2024 · b98c2a5 · b98c2a5
1 parent 29424ad
commit b98c2a5
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 28 deletions.
diff --git a/lrb/_ark/config/band.dta b/lrb/_ark/config/band.dta
@@ -278,33 +278,33 @@
       (wii_rodrums wii_rodrums)
       (none joypad))
    (instrument_mapping
-      (ro_guitar kControllerGuitar)
-      (ro_guitar_xbox kControllerGuitar)
-      (strat_xbox kControllerGuitar)
-      (strat_xbox_rb2 kControllerGuitar)
-      (hx_guitar_ps3 kControllerGuitar)
-      (ps3_rb2_guitar kControllerGuitar)
-      (ro_guitar_ps3 kControllerGuitar)
-      (wii_guitar kControllerGuitar)
-      (wii_roguitar kControllerGuitar)
-      (midi kControllerDrum)
-      (hx_drums_xbox kControllerDrum)
-      (hx_drums_xbox_rb2 kControllerDrum)
-      (ps3_rb2_drums kControllerDrum)
-      (hx_drums_ps3 kControllerDrum)
-      (hx_drums_ps3_rb2 kControllerDrum)
-      (hx_drums_ps3_ghwt kControllerDrum)
-      (hx_drums_ps3_konami kControllerDrum)
-      (wii_drums kControllerDrum)
-      (wii_rodrums kControllerDrum)
-      (hx_xbox kControllerVocals)
-      (digital kControllerVocals)
-      (analog kControllerVocals)
-      (dualshock kControllerVocals)
-      (stagekit_xbox kControllerVocals)
-      (wii_remote kControllerVocals)
-      (wii_classic kControllerVocals)
-      (gamecube kControllerVocals)
+      (ro_guitar $dx_guitar_slot)
+      (ro_guitar_xbox $dx_guitar_slot)
+      (strat_xbox $dx_guitar_slot)
+      (strat_xbox_rb2 $dx_guitar_slot)
+      (hx_guitar_ps3 $dx_guitar_slot)
+      (ps3_rb2_guitar $dx_guitar_slot)
+      (ro_guitar_ps3 $dx_guitar_slot)
+      (wii_guitar $dx_guitar_slot)
+      (wii_roguitar $dx_guitar_slot)
+      (midi $dx_drum_slot)
+      (hx_drums_xbox $dx_drum_slot)
+      (hx_drums_xbox_rb2 $dx_drum_slot)
+      (ps3_rb2_drums $dx_drum_slot)
+      (hx_drums_ps3 $dx_drum_slot)
+      (hx_drums_ps3_rb2 $dx_drum_slot)
+      (hx_drums_ps3_ghwt $dx_drum_slot)
+      (hx_drums_ps3_konami $dx_drum_slot)
+      (wii_drums $dx_drum_slot)
+      (wii_rodrums $dx_drum_slot)
+      (hx_xbox $dx_pad_slot)
+      (digital $dx_pad_slot)
+      (analog $dx_pad_slot)
+      (dualshock $dx_pad_slot)
+      (stagekit_xbox $dx_pad_slot)
+      (wii_remote $dx_pad_slot)
+      (wii_classic $dx_pad_slot)
+      (gamecube $dx_pad_slot)
       (none kControllerNone)))
 (spew
    #include spew.dta)

diff --git a/lrb/_ark/dx/dx_init.dta b/lrb/_ark/dx/dx_init.dta
@@ -1,2 +1,10 @@
+; instrumment mapping fallbacks in case the config is outdated or broken
+{set $dx_pad_slot kControllerVocals}
+{set $dx_guitar_slot kControllerGuitar}
+{set $dx_drum_slot kControllerDrum}
+
+{rnd set_sync 1}
+
 {set $emulatefps 24}
-#ifndef _SHIP {tour toggle_all_unlock} #endif
+#ifndef _SHIP {tour toggle_all_unlock} #endif
+#ifdef _SHIP INIT_DTA_READER #endif
diff --git a/lrb/_ark/dx/dx_macros.dta b/lrb/_ark/dx/dx_macros.dta
@@ -7,6 +7,26 @@
             {elem {find $entry venue_fps} 1}
          }
       }
+      {if {== {elem $entry 0} {basename vsync}}
+         {rnd set_sync
+            {elem {find $entry vsync} 1}
+         }
+      }
+      {if {== {elem $entry 0} {basename pad_slot}}
+         {set $dx_pad_slot
+            {elem {find $entry pad_slot} 1}
+         }
+      }
+      {if {== {elem $entry 0} {basename guitar_slot}}
+         {set $dx_guitar_slot
+            {elem {find $entry guitar_slot} 1}
+         }
+      }
+      {if {== {elem $entry 0} {basename drum_slot}}
+         {set $dx_drum_slot
+            {elem {find $entry drum_slot} 1}
+         }
+      }
    }
 )
 

diff --git a/lrb/platform/ps3/USRDIR/config.dta b/lrb/platform/ps3/USRDIR/config.dta
@@ -4,4 +4,18 @@
 ; Venue FPS (Default: 24, can go up to 60)
 (venue_fps
    (venue_fps 60)
+)
+; Vsync (0: Uncapped FPS, 1: 60FPS)
+(vsync
+   (vsync 1)
+)
+; Instrument slot mapping (Options: kControllerVocals, kControllerGuitar, kControllerDrum)
+(pad_slot
+   (pad_slot kControllerVocals)
+)
+(guitar_slot
+   (guitar_slot kControllerGuitar)
+)
+(drum_slot
+   (drum_slot kControllerDrum)
 )
diff --git a/lrb/platform/xbox/config.dta b/lrb/platform/xbox/config.dta
@@ -4,4 +4,18 @@
 ; Venue FPS (Default: 24, can go up to 60)
 (venue_fps
    (venue_fps 24)
+)
+; Vsync (0: Uncapped FPS, 1: 60FPS)
+(vsync
+   (vsync 1)
+)
+; Instrument slot mapping (Options: kControllerVocals, kControllerGuitar, kControllerDrum)
+(pad_slot
+   (pad_slot kControllerVocals)
+)
+(guitar_slot
+   (guitar_slot kControllerGuitar)
+)
+(drum_slot
+   (drum_slot kControllerDrum)
 )