settings refactor

hmxmilohax · Sep 7, 2024 · 74e612b · 74e612b
1 parent 5c8d5c0
commit 74e612b
Show file tree

Hide file tree

Showing 9 changed files with 165 additions and 72 deletions.
diff --git a/_ark/ps4/config/include/joypad.dta b/_ark/ps4/config/include/joypad.dta
@@ -5,29 +5,29 @@
    (disable FALSE))
 #define VOX_SLOT_OVERRIDE
 (
-   {if_else {file_exists "voxgtr.dta"} 
+   {if_else {file_exists "settings/controller/type/voxgtr.dta"} 
       kControllerGuitar
-      {if_else {file_exists "voxdrum.dta"}
+      {if_else {file_exists "settings/controller/type/voxdrum.dta"}
       kControllerDrum
       kControllerVocals
       }
    }
 )
 #define GTR_SLOT_OVERRIDE
 (
-   {if_else {file_exists "gtrvox.dta"} 
+   {if_else {file_exists "settings/controller/type/gtrvox.dta"} 
       kControllerVocals
-      {if_else {file_exists "gtrdrum.dta"}
+      {if_else {file_exists "settings/controller/type/gtrdrum.dta"}
       kControllerDrum
       kControllerGuitar
       }
    }
 )
 #define DRUM_SLOT_OVERRIDE
 (
-   {if_else {file_exists "drumvox.dta"} 
+   {if_else {file_exists "settings/controller/type/drumvox.dta"} 
       kControllerVocals
-      {if_else {file_exists "drumgtr.dta"}
+      {if_else {file_exists "settings/controller/type/drumgtr.dta"}
       kControllerGuitar
       kControllerDrum
       }

diff --git a/_ark/ps4/config/include/rnd.dta b/_ark/ps4/config/include/rnd.dta
@@ -1,5 +1,5 @@
 (title "Rock Band")
-(max_partial_framerate_scenes {if_else {file_exists "60fpsbg.dta"} 0 1})
+(max_partial_framerate_scenes {if_else {file_exists "settings/visuals/60fpsbg.dta"} 0 1})
 (multi_threaded_rendering_enabled FALSE)
 (use_lod FALSE)
 (use_gbuffer_vertex_normals FALSE)

diff --git a/_ark/ps4/config/rb_venues.dta b/_ark/ps4/config/rb_venues.dta
@@ -1,18 +1,18 @@
 (venues 
-   (big_club_toys {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_toys/big_club_toys.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_standard {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_standard/big_club_standard.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_industrial {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_industrial/big_club_industrial.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_gym {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_gym/big_club_gym.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_arcade {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_arcade_full_crowd/big_club_arcade_full_crowd.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_arcade_terry {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_arcade/big_club_arcade.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_boat {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_boat/big_club_boat.scene} kLargeClub kRBEntitlementInvalid) 
-   (big_club_desert {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_desert/big_club_desert.scene} kLargeClub kRBEntitlementInvalid) 
-   (small_club_vwhall {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_vwhall/small_club_vwhall.scene} kSmallClub kRBEntitlementInvalid) 
-   (small_club_basement {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_basement/small_club_basement.scene} kSmallClub kRBEntitlementInvalid) 
-   (small_club_industrial {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_industrial/small_club_industrial.scene} kSmallClub kRBEntitlementInvalid) 
-   (small_club_roadhouse {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_roadhouse/small_club_roadhouse.scene} kSmallClub kRBEntitlementInvalid) 
-   (small_club_trashed {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_trashed/small_club_trashed.scene} kSmallClub kRBEntitlementInvalid) 
-   (arena {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/arena/arena_standard/arena_standard.scene} kArena kRBEntitlementInvalid))
+   (big_club_toys {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_toys/big_club_toys.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_standard {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_standard/big_club_standard.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_industrial {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_industrial/big_club_industrial.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_gym {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_gym/big_club_gym.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_arcade {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_arcade_full_crowd/big_club_arcade_full_crowd.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_arcade_terry {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_arcade/big_club_arcade.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_boat {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_boat/big_club_boat.scene} kLargeClub kRBEntitlementInvalid) 
+   (big_club_desert {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/big_club/big_club_desert/big_club_desert.scene} kLargeClub kRBEntitlementInvalid) 
+   (small_club_vwhall {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_vwhall/small_club_vwhall.scene} kSmallClub kRBEntitlementInvalid) 
+   (small_club_basement {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_basement/small_club_basement.scene} kSmallClub kRBEntitlementInvalid) 
+   (small_club_industrial {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_industrial/small_club_industrial.scene} kSmallClub kRBEntitlementInvalid) 
+   (small_club_roadhouse {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_roadhouse/small_club_roadhouse.scene} kSmallClub kRBEntitlementInvalid) 
+   (small_club_trashed {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/small_club/small_club_trashed/small_club_trashed.scene} kSmallClub kRBEntitlementInvalid) 
+   (arena {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/arena/arena_standard/arena_standard.scene} kArena kRBEntitlementInvalid))
 (locked_venues)
 (default_venue big_club_standard)
-(practice_venue_scene {if_else {file_exists "blackbg.dta"} ui/shared/fake_bg.scene venue/practice_mode/big_club_practice.scene})
+(practice_venue_scene {if_else {file_exists "settings/visuals/blackbg.dta"} ui/shared/fake_bg.scene venue/practice_mode/big_club_practice.scene})
diff --git a/_ark/ps4/dx/macros/dx_controller_macros.dta b/_ark/ps4/dx/macros/dx_controller_macros.dta
@@ -1,6 +1,6 @@
 #define WRITE_SLOT_DTA
 (
-   {write_file {sprint "data:/GoldHEN/RB4DX/" $slot_changed $slot_to ".dta"} $dx_write_nul}
+   {write_file {sprint "data:/GoldHEN/RB4DX/settings/controller/type/" $slot_changed $slot_to ".dta"} $dx_write_nul}
 )
 
 #define SET_SLOT_VAR
@@ -22,23 +22,23 @@
 (
    {switch $slot_changed
       (gtr
-         {file_delete "data:/GoldHEN/RB4DX/gtrdrum.dta"}
-         {file_delete "data:/GoldHEN/RB4DX/gtrvox.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtrdrum.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtrvox.dta"}
       )
       (drum
-         {file_delete "data:/GoldHEN/RB4DX/drumgtr.dta"}
-         {file_delete "data:/GoldHEN/RB4DX/drumvox.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drumgtr.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drumvox.dta"}
       )
       (vox
-         {file_delete "data:/GoldHEN/RB4DX/voxgtr.dta"}
-         {file_delete "data:/GoldHEN/RB4DX/voxdrum.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/voxgtr.dta"}
+         {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/voxdrum.dta"}
       )
    }
 )
 
 #define CLEAR_INVALID_SLOT_DTAS
 (
-   {file_delete "data:/GoldHEN/RB4DX/voxvox.dta"}
-   {file_delete "data:/GoldHEN/RB4DX/drumdrum.dta"}
-   {file_delete "data:/GoldHEN/RB4DX/gtrgtr.dta"}
+   {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/voxvox.dta"}
+   {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/drumdrum.dta"}
+   {file_delete "data:/GoldHEN/RB4DX/settings/controller/type/gtrgtr.dta"}
 )
diff --git a/_ark/ps4/dx/overshell/dx_controller_states.dta b/_ark/ps4/dx/overshell/dx_controller_states.dta
@@ -4,6 +4,7 @@
       {$this setup_confirm_actions a 
       (
          "Change instrument type"
+         ;"Change instrument bindings"
       )
    }
    ) 
@@ -15,6 +16,9 @@
          ("Change instrument type"
             {$this show_state kState_RB4DXSlotOverride}
          )
+         ("Change instrument bindings"
+            {$this show_state kState_RB4DXBindingOverride}
+         )
       }
    ) 
    (on_cancel 

diff --git a/_ark/ps4/dx/overshell/dx_states.dta b/_ark/ps4/dx/overshell/dx_states.dta
@@ -144,11 +144,11 @@
             {set $nood {! $nood}}
             {if_else $nood
                {do
-                  {write_file "data:/GoldHEN/RB4DX/nood.dta" $dx_write_nul}
+                  {write_file "data:/GoldHEN/RB4DX/settings/gameplay/nood.dta" $dx_write_nul}
                   {set_elem {find $syscfg gamemodes defaults allow_overdrive_phrases} 1 FALSE}
                }
                {do
-                  {file_delete "data:/GoldHEN/RB4DX/nood.dta"}
+                  {file_delete "data:/GoldHEN/RB4DX/settings/gameplay/nood.dta"}
                   {set_elem {find $syscfg gamemodes defaults allow_overdrive_phrases} 1 TRUE}
                }
             }
@@ -162,11 +162,11 @@
             {set $practiceod {! $practiceod}}
             {if_else $practiceod
                {do
-                  {write_file "data:/GoldHEN/RB4DX/practiceod.dta" $dx_write_nul}
+                  {write_file "data:/GoldHEN/RB4DX/settings/gameplay/practiceod.dta" $dx_write_nul}
                   {set_elem {find $syscfg gamemodes practice allow_overdrive_phrases} 1 TRUE}
                }
                {do
-                  {file_delete "data:/GoldHEN/RB4DX/practiceod.dta"}
+                  {file_delete "data:/GoldHEN/RB4DX/settings/gameplay/practiceod.dta"}
                   {set_elem {find $syscfg gamemodes practice allow_overdrive_phrases} 1 FALSE}
                }
             }
@@ -275,18 +275,18 @@
             {switch $trackmuting
                (vanilla 
                   {set_elem {find $syscfg beatmatcher audio mute_volume} 1 -16.0}
-                  {file_delete "data:/GoldHEN/RB4DX/trackmutingoff.dta"}
-                  {file_delete "data:/GoldHEN/RB4DX/trackmutingon.dta"}
+                  {file_delete "data:/GoldHEN/RB4DX/settings/sfx/trackmutingoff.dta"}
+                  {file_delete "data:/GoldHEN/RB4DX/settings/sfx/trackmutingon.dta"}
                )
                (off 
                   {set_elem {find $syscfg beatmatcher audio mute_volume} 1 0.0}
-                  {write_file "data:/GoldHEN/RB4DX/trackmutingoff.dta" $dx_write_nul}
-                  {file_delete "data:/GoldHEN/RB4DX/trackmutingon.dta"}
+                  {write_file "data:/GoldHEN/RB4DX/settings/sfx/trackmutingoff.dta" $dx_write_nul}
+                  {file_delete "data:/GoldHEN/RB4DX/settings/sfx/trackmutingon.dta"}
                )
                (on 
                   {set_elem {find $syscfg beatmatcher audio mute_volume} 1 -96.0}
-                  {write_file "data:/GoldHEN/RB4DX/trackmutingon.dta" $dx_write_nul}
-                  {file_delete "data:/GoldHEN/RB4DX/trackmutingoff.dta"}
+                  {write_file "data:/GoldHEN/RB4DX/settings/sfx/trackmutingon.dta" $dx_write_nul}
+                  {file_delete "data:/GoldHEN/RB4DX/settings/sfx/trackmutingoff.dta"}
                )
             }
             {if_else {$this in_song}
@@ -299,9 +299,9 @@
             {set $nomiss {! $nomiss}}
             {if_else $nomiss
                {do
-                  {write_file "data:/GoldHEN/RB4DX/nomiss.dta" $dx_write_nul}
+                  {write_file "data:/GoldHEN/RB4DX/settings/sfx/nomiss.dta" $dx_write_nul}
                }
-               {file_delete "data:/GoldHEN/RB4DX/nomiss.dta"}
+               {file_delete "data:/GoldHEN/RB4DX/settings/sfx/nomiss.dta"}
             }
             {$this show_state kState_RB4DXDelayedEffectWarn}
             {$this trigger_select_effects }
@@ -310,11 +310,11 @@
             {set $nowhammyfx {! $nowhammyfx}}
             {if_else $nowhammyfx
                {do
-                  {write_file "data:/GoldHEN/RB4DX/nowhammyfx.dta" $dx_write_nul}
+                  {write_file "data:/GoldHEN/RB4DX/settings/sfx/nowhammyfx.dta" $dx_write_nul}
                   {set_elem {find $syscfg beatmatcher watcher pitch_bend_range} 1 0}
                }
                {do
-                  {file_delete "data:/GoldHEN/RB4DX/nowhammyfx.dta"}
+                  {file_delete "data:/GoldHEN/RB4DX/settings/sfx/nowhammyfx.dta"}
                   {set_elem {find $syscfg beatmatcher watcher pitch_bend_range} 1 1}
                }
             }
@@ -363,17 +363,17 @@
          (("Black Venue: ON" "Black Venue: OFF")
             {set $blackbg {! $blackbg}}
             {if_else $blackbg
-               {write_file "data:/GoldHEN/RB4DX/blackbg.dta" $dx_write_nul}
-               {file_delete "data:/GoldHEN/RB4DX/blackbg.dta"}
+               {write_file "data:/GoldHEN/RB4DX/settings/visuals/blackbg.dta" $dx_write_nul}
+               {file_delete "data:/GoldHEN/RB4DX/settings/visuals/blackbg.dta"}
             }
             {$this show_state kState_RB4DXDelayedEffectWarn}
             {$this trigger_select_effects }
          )
          (("60 FPS Venues: ON" "60 FPS Venues: OFF")
             {set $60fpsbg {! $60fpsbg}}
             {if_else $60fpsbg
-               {write_file "data:/GoldHEN/RB4DX/60fpsbg.dta" $dx_write_nul}
-               {file_delete "data:/GoldHEN/RB4DX/60fpsbg.dta"}
+               {write_file "data:/GoldHEN/RB4DX/settings/visuals/60fpsbg.dta" $dx_write_nul}
+               {file_delete "data:/GoldHEN/RB4DX/settings/visuals/60fpsbg.dta"}
             }
             {$this show_state kState_RB4DXDelayedEffectWarn}
             {$this trigger_select_effects }

diff --git a/_ark/ps4/dx/ui/dx_init.dta b/_ark/ps4/dx/ui/dx_init.dta
@@ -1,4 +1,4 @@
-{set $dx_write_nul {array ()}}
+#include init_dev.dta
 {set $speedmod 100}
 {set $dx_initialized TRUE}
 {set $calibrationmode FALSE}
@@ -20,61 +20,69 @@
    {file_delete "data:/GoldHEN/RB4DX/drunkmode.ini"}
 }
 {set $autoplayexists {file_exists "data:/GoldHEN/plugins/RB4DX-Autoplay.prx"}}
-{set $nood {file_exists "nood.dta"}}
-{set $practiceod {file_exists "practiceod.dta"}}
-{set $blackbg {file_exists "blackbg.dta"}}
-{set $60fpsbg {file_exists "60fpsbg.dta"}}
-{set $nomiss {file_exists "nomiss.dta"}}
-{set $nowhammyfx {file_exists "nowhammyfx.dta"}}
 {set $notifycolored {file_exists "notifycolored.ini"}}
+
+;gp settings
+{set $nood {file_exists "settings/gameplay/nood.dta"}}
+{set $practiceod {file_exists "settings/gameplay/practiceod.dta"}}
+
+;visual settings
+{set $blackbg {file_exists "settings/visuals/blackbg.dta"}}
+{set $60fpsbg {file_exists "settings/visuals/60fpsbg.dta"}}
+
+;sfx settings
+{set $nomiss {file_exists "settings/sfx/nomiss.dta"}}
+{set $nowhammyfx {file_exists "settings/sfx/nowhammyfx.dta"}}
 {set $trackmuting
    {cond
-      ({file_exists "trackmutingoff.dta"}
+      ({file_exists "settings/sfx/trackmutingoff.dta"}
          off
       )
-      ({file_exists "trackmutingon.dta"}
+      ({file_exists "settings/sfx/trackmutingon.dta"}
          on
       )
-      ({&& {! {file_exists "trackmutingoff.dta"}} {! {file_exists "trackmutingon.dta"}}}
+      ({&& {! {file_exists "settings/sfx/trackmutingoff.dta"}} {! {file_exists "settings/sfx/trackmutingon.dta"}}}
          vanilla
       )
    }
 }
+
+;controller type
 {set $voxslt
    {cond
-      ({file_exists "voxgtr.dta"}
+      ({file_exists "settings/controller/type/voxgtr.dta"}
          gtr
       )
-      ({file_exists "voxdrum.dta"}
+      ({file_exists "settings/controller/type/voxdrum.dta"}
          drum
       )
-      ({&& {! {file_exists "voxdrum.dta"}} {! {file_exists "voxgtr.dta"}}}
+      ({&& {! {file_exists "settings/controller/type/voxdrum.dta"}} {! {file_exists "settings/controller/type/voxgtr.dta"}}}
          vox
       )
    }
 }
 {set $gtrslt
    {cond
-      ({file_exists "gtrvox.dta"}
+      ({file_exists "settings/controller/type/gtrvox.dta"}
          vox
       )
-      ({file_exists "gtrdrum.dta"}
+      ({file_exists "settings/controller/type/gtrdrum.dta"}
          drum
       )
-      ({&& {! {file_exists "gtrdrum.dta"}} {! {file_exists "gtrvox.dta"}}}
+      ({&& {! {file_exists "settings/controller/type/gtrdrum.dta"}} {! {file_exists "settings/controller/type/gtrvox.dta"}}}
          gtr
       )
    }
 }
 {set $drmslt
    {cond
-      ({file_exists "drumgtr.dta"}
+      ({file_exists "settings/controller/type/drumgtr.dta"}
          gtr
       )
-      ({file_exists "drumvox.dta"}
+      ({file_exists "settings/controller/type/drumvox.dta"}
          vox
       )
-      ({&& {! {file_exists "drumvox.dta"}} {! {file_exists "drumgtr.dta"}}}
+      ({&& {! {file_exists "settings/controller/type/drumvox.dta"}} {! {file_exists "settings/controller/type/drumgtr.dta"}}}
          drum
       )
    }