rearranged menus, new features, update screensaver

* rearranged dx settings menu * new sync difficulty speeds, precision mode, track curvature settings * screensaver on song select screen
hmxmilohax · May 28, 2024 · 117bd48 · 117bd48
1 parent a0e0ec5
commit 117bd48
Show file tree

Hide file tree

Showing 6 changed files with 337 additions and 136 deletions.
diff --git a/_ark/ps4/dx/macros/dx_overshell_macros.dta b/_ark/ps4/dx/macros/dx_overshell_macros.dta
@@ -28,18 +28,18 @@
 )
 #define SET_TRACK_SPEEDS
 (
-	{set_elem {find $syscfg track_graphics view_times drum easy} 1 {* 2.4 {/ $speedmod 100}}}
-	{set_elem {find $syscfg track_graphics view_times drum medium} 1 {* 2.0 {/ $speedmod 100}}}
-	{set_elem {find $syscfg track_graphics view_times drum hard} 1 {* 1.6 {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times drum easy} 1 {* {if_else $syncspeeds 1.2 2.4} {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times drum medium} 1 {* {if_else $syncspeeds 1.2 2.0} {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times drum hard} 1 {* {if_else $syncspeeds 1.2 1.6} {/ $speedmod 100}}}
 	{set_elem {find $syscfg track_graphics view_times drum expert} 1 {* 1.2 {/ $speedmod 100}}}
 
-	{set_elem {find $syscfg track_graphics view_times bass easy} 1 {* 2.4 {/ $speedmod 100}}}
-	{set_elem {find $syscfg track_graphics view_times bass medium} 1 {* 2.0 {/ $speedmod 100}}}
-	{set_elem {find $syscfg track_graphics view_times bass hard} 1 {* 1.6 {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times bass easy} 1 {* {if_else $syncspeeds 1.2 2.4} {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times bass medium} 1 {* {if_else $syncspeeds 1.2 2.0} {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times bass hard} 1 {* {if_else $syncspeeds 1.2 1.6} {/ $speedmod 100}}}
 	{set_elem {find $syscfg track_graphics view_times bass expert} 1 {* 1.2 {/ $speedmod 100}}}
 
-	{set_elem {find $syscfg track_graphics view_times guitar easy} 1 {* 2.4 {/ $speedmod 100}}}
-	{set_elem {find $syscfg track_graphics view_times guitar medium} 1 {* 2.0 {/ $speedmod 100}}}
-	{set_elem {find $syscfg track_graphics view_times guitar hard} 1 {* 1.6 {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times guitar easy} 1 {* {if_else $syncspeeds 1.2 2.4} {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times guitar medium} 1 {* {if_else $syncspeeds 1.2 2.0} {/ $speedmod 100}}}
+	{set_elem {find $syscfg track_graphics view_times guitar hard} 1 {* {if_else $syncspeeds 1.2 1.6} {/ $speedmod 100}}}
 	{set_elem {find $syscfg track_graphics view_times guitar expert} 1 {* 1.2 {/ $speedmod 100}}}
 )
diff --git a/_ark/ps4/dx/overshell/dx_slider_states.dta b/_ark/ps4/dx/overshell/dx_slider_states.dta
@@ -0,0 +1,66 @@
+(kState_RB4DXSongSpeed
+   (view confirm_action) 
+   (enter 
+      {$this setup_confirm_actions {sprintf "Song Speed: %d%%" $speedmod} ("+" "Reset" "-")}
+   )
+   (SELECT_MSG 
+      {local $list_data 
+         {
+            ($objId UIListCom)get_data_in_column token }}  
+      {switch $list_data 
+         ("+"
+            {set $speedmod {+ $speedmod 5}}
+            {$this setup_confirm_actions {sprintf "Song Speed: %d%%" $speedmod} ("+" "Reset" "-")}
+         )
+         ("Reset"
+            {set $speedmod 100}
+            {$this setup_confirm_actions {sprintf "Song Speed: %d%%" $speedmod} ("+" "Reset" "-")}
+         )
+         ("-"
+            {unless {< {- $speedmod 5} 100}
+               {set $speedmod {- $speedmod 5}}
+            }
+            {$this setup_confirm_actions {sprintf "Song Speed: %d%%" $speedmod} ("+" "Reset" "-")}
+         )
+
+         })
+   (on_cancel 
+      {set_elem {find $syscfg beatmatcher watcher slop} 1 $speedmod}
+      {write_file "data:/GoldHEN/RB4DX/speedmod.ini" {array ({/ $speedmod 100})}}
+      SET_TRACK_SPEEDS
+      {$this show_state kState_RB4DXMain}
+      {$this trigger_cancel_effects })
+)
+
+(kState_RB4DXTrackCurve
+   (view confirm_action) 
+   (enter 
+      {$this setup_confirm_actions {sprintf "Track Curve: %.2fX" {+ {* $track_curve -2} 3}} ("+" "Reset" "-")}
+   )
+   (SELECT_MSG 
+      {local $list_data 
+         {
+            ($objId UIListCom)get_data_in_column token }}  
+      {switch $list_data 
+         ("-"
+            {unless {> {+ $track_curve 0.05} 1.5}
+               {set $track_curve {+ $track_curve 0.05}}
+            }
+            {$this setup_confirm_actions {sprintf "Track Curve: %.2fX" {+ {* $track_curve -2} 3}} ("+" "Reset" "-")}
+         )
+         ("Reset"
+            {set $track_curve 1}
+            {$this setup_confirm_actions {sprintf "Track Curve: %.2fX" {+ {* $track_curve -2} 3}} ("+" "Reset" "-")}
+         )
+         ("+"
+            {unless {< {- $track_curve 0.05} 0.45}
+               {set $track_curve {- $track_curve 0.05}}
+            }
+            {$this setup_confirm_actions {sprintf "Track Curve: %.2fX" {+ {* $track_curve -2} 3}} ("+" "Reset" "-")}
+         )
+
+         })
+   (on_cancel 
+      {$this show_state kState_RB4DXVisSettings}
+      {$this trigger_cancel_effects })
+)