whammy fx and track muting modifiers

hmxmilohax · May 11, 2024 · 26b31a6 · 26b31a6
1 parent dfc4000
commit 26b31a6
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 2 deletions.
diff --git a/_ark/ps4/dx/overshell/dx_controller_states.dta b/_ark/ps4/dx/overshell/dx_controller_states.dta
@@ -110,9 +110,11 @@
       CLEAR_INVALID_SLOT_DTAS
       {$overshell update_all}
       {$this trigger_select_effects }
-      {set $slot_to FALSE}
+   )
+   (exit
       {set $slot_changed FALSE}
-   ) 
+      {set $slot_to FALSE}
+   )
    (on_cancel 
       {set $slot_changed FALSE}
       {$this show_state kState_RB4DXSlotOverride}

diff --git a/_ark/ps4/dx/overshell/dx_states.dta b/_ark/ps4/dx/overshell/dx_states.dta
@@ -104,6 +104,12 @@
          {if_else $nomiss "No Miss Sounds: ON" "No Miss Sounds: OFF"}
          {if_else $nood "No OD: ON" "No OD: OFF"}
          {if_else $practiceod "OD in Practice: ON" "OD in Practice: OFF"}
+         {if_else $nowhammyfx "Whammy FX: OFF" "Whammy FX: ON"}
+         {switch $trackmuting
+            (vanilla "Track Muting: Partial")
+            (off "Track Muting: Off")
+            (on "Track Muting: On")
+         }
       )
    }
 )
@@ -118,6 +124,37 @@
          {
             ($objId UIListCom)get_data_in_column token }}  
       {switch $list_data 
+         (("Track Muting: Partial" "Track Muting: Off" "Track Muting: On")
+            {set $trackmuting
+               {switch $trackmuting
+                  (vanilla on)
+                  (on off)
+                  (off vanilla)
+               }
+            }
+            {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"}
+               )
+               (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"}
+               )
+               (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"}
+               )
+            }
+            {if_else {$this in_song}
+               {$this show_state kState_RB4DXInGameWarn}
+               RB4DXGP_DATA
+            }
+            {$this trigger_select_effects }
+         )
          (("No Miss Sounds: ON" "No Miss Sounds: OFF")
             {set $nomiss {! $nomiss}}
             {if_else $nomiss
@@ -129,6 +166,24 @@
             {$this show_state kState_RB4DXDelayedEffectWarn}
             {$this trigger_select_effects }
          )
+         (("Whammy FX: OFF" "Whammy FX: ON")
+            {set $nowhammyfx {! $nowhammyfx}}
+            {if_else $nowhammyfx
+               {do
+                  {write_file "data:/GoldHEN/RB4DX/nowhammyfx.dta" $dx_write_nul}
+                  {set_elem {find $syscfg beatmatcher watcher pitch_bend_range} 1 0}
+               }
+               {do
+                  {file_delete "data:/GoldHEN/RB4DX/nowhammyfx.dta"}
+                  {set_elem {find $syscfg beatmatcher watcher pitch_bend_range} 1 1}
+               }
+            }
+            {if_else {$this in_song}
+               {$this show_state kState_RB4DXInGameWarn}
+               RB4DXGP_DATA
+            }
+            {$this trigger_select_effects }
+         )
          (("No OD: ON" "No OD: OFF")
             {set $nood {! $nood}}
             {if_else $nood

diff --git a/_ark/ps4/dx/ui/dx_hooks.dta b/_ark/ps4/dx/ui/dx_hooks.dta
@@ -4,4 +4,18 @@
 {set_elem {find $syscfg gamemodes practice enable_overdrive} 1 TRUE}
 {if $practiceod
    {set_elem {find $syscfg gamemodes practice allow_overdrive_phrases} 1 TRUE}
+}
+{switch $trackmuting
+   (vanilla 
+      {set_elem {find $syscfg beatmatcher audio mute_volume} 1 -16.0}
+   )
+   (off 
+      {set_elem {find $syscfg beatmatcher audio mute_volume} 1 0.0}
+   )
+   (on 
+      {set_elem {find $syscfg beatmatcher audio mute_volume} 1 -96.0}
+   )
+}
+{if $nowhammyfx
+   {set_elem {find $syscfg beatmatcher watcher pitch_bend_range} 1 0}
 }
diff --git a/_ark/ps4/dx/ui/dx_init.dta b/_ark/ps4/dx/ui/dx_init.dta
@@ -6,8 +6,22 @@
 {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 $crowdmeter {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/crowd_meter.entity_ps4"}}
 {set $noui {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/hud.scene_ps4"}}
+{set $trackmuting
+	{cond
+		({file_exists "trackmutingoff.dta"}
+			off
+		)
+		({file_exists "trackmutingon.dta"}
+			on
+		)
+		({&& {! {file_exists "trackmutingoff.dta"}} {! {file_exists "trackmutingon.dta"}}}
+			vanilla
+		)
+	}
+}
 {set $voxslt
 	{cond
 		({file_exists "voxgtr.dta"}

diff --git a/dependencies/features.md b/dependencies/features.md
@@ -20,6 +20,8 @@
 * `Controller settings` menu to override controller slots (i.e. changing pad to guitar)
 * No shine patch that flattens out the highway, possibly helping with visibility
 * No flames optional patch
+* No whammy effect modifier
+* No track muting modifier
 * No miss sfx modifier
 * Calibration Mode patch that shrinks the hit window to help perfect your calibration numbers