move behavior menus out of track theme menu

hmxmilohax · Jan 30, 2024 · 395d5c5 · 395d5c5
1 parent 9be9476
commit 395d5c5
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 70 deletions.
diff --git a/_ark/ui/eng/locale_updates.dta b/_ark/ui/eng/locale_updates.dta
@@ -1098,9 +1098,10 @@
 (os_tex1 "Customize Track Theme")
 (os_sus "Sustains")
 (os_lanes "lanes")
-(os_hw_behavior "Highway Behavior")
-(os_strk_behavior "Streak Behavior")
-(os_warn_behavior "Low Health Behavior")
+(os_trkbhvr "Track Behavior")
+(os_hwbhvr "Highway Behavior")
+(os_strkbhvr "Streak Behavior")
+(os_warnbhvr "Low Health Behavior")
 (os_font "Font")
 (os_score "Score")
 (os_solobox "Solo Box")

diff --git a/_ark/ui/overshell_textures.dta b/_ark/ui/overshell_textures.dta
@@ -8,15 +8,12 @@
     #endif
     (focus sel_section.lst)
     (enter
-        {sel_section.lst set_data (#ifndef HX_EE os_hw #endif os_strk os_spotlight #ifdef HX_EE os_hw_behavior #endif os_gems os_smashers os_flames os_sus #ifndef HX_EE os_lanes os_font #endif os_score os_solobox os_stars os_bre os_rails os_odbar os_multi_ring os_voxtrk)}
+        {sel_section.lst set_data (#ifndef HX_EE os_hw #endif os_strk os_spotlight os_gems os_smashers os_flames os_sus #ifndef HX_EE os_lanes os_font #endif os_score os_solobox os_stars os_bre os_rails os_odbar os_multi_ring os_voxtrk)}
         {title.lbl set_localized {localize os_tex1}}
         {full_selection.mesh set_showing FALSE})
     (exit)
     (SELECT_MSG
     {switch {$component selected_sym}
-         (os_hw_behavior
-            {os_change_screen overshell_hw_behavior}
-         )
          (os_sus
             {os_change_screen overshell_sustains}
          )
@@ -125,13 +122,7 @@
     #endif
     (focus sel_section.lst)
     (enter
-        {if_else {== $dx_tracked_texture_loader "highway"}
-         {sel_section.lst set_data (os_spotlightall os_spotlightgtr os_spotlightbass os_spotlightdrum os_hw_behavior)}
-         {if_else {== $dx_tracked_texture_loader "streak"}
-            {sel_section.lst set_data (os_spotlightall os_spotlightgtr os_spotlightbass os_spotlightdrum os_strk_behavior)}
-            {sel_section.lst set_data (os_spotlightall os_spotlightgtr os_spotlightbass os_spotlightdrum)}
-         }
-        }
+      {sel_section.lst set_data (os_spotlightall os_spotlightgtr os_spotlightbass os_spotlightdrum)}
         {switch $dx_tracked_texture_loader
          (highway
             {title.lbl set_localized {localize os_hwheader}}
@@ -143,7 +134,8 @@
             {title.lbl set_localized {localize os_strkheader}}
          )
         }
-        {full_selection.mesh set_showing FALSE})
+        {full_selection.mesh set_showing FALSE}
+    )
     (exit)
     (SELECT_MSG
     {switch {$component selected_sym}
@@ -163,12 +155,6 @@
             {set $dx_tracked_instrument drum}
             {os_change_screen overshell_texload}
          )
-         (os_hw_behavior
-            {os_change_screen overshell_hw_behavior}
-         )
-         (os_strk_behavior
-            {os_change_screen overshell_strk_behavior}
-         )
       })
     (update_helpbar
             {helpbar

diff --git a/_ark/ui/overshell_track.dta b/_ark/ui/overshell_track.dta
@@ -8,7 +8,7 @@
     #endif
     (focus sel_section.lst)
     (enter
-        {sel_section.lst set_data (os_trkpreset os_angle #ifndef HX_EE os_clr #endif)}
+        {sel_section.lst set_data (os_trkpreset os_trkbhvr os_angle #ifndef HX_EE os_clr #endif)}
         {title.lbl set_localized {localize os_trkset}}
         {full_selection.mesh set_showing FALSE})
     (exit)
@@ -21,6 +21,9 @@
             {os_change_screen overshell_trkpreset}
             #endif
          )
+         (os_trkbhvr
+            {os_change_screen overshell_trkbhvr}
+         )
          (os_angle
             {os_change_screen overshell_angle}
          )
@@ -276,6 +279,87 @@
    (panels overshell_sustains_panel practice_mode_panel practice_lower3rd_panel)
    (focus overshell_sustains_panel)}
 ;
+#define TRACK_BEHAVIOR_DATA
+((
+   os_hwbhvr
+   #ifndef HX_EE
+   os_strkbhvr
+   os_warnbhvr
+   {switch $fctype
+      (ring os_fc_ring)
+      (glow os_fc_glow)
+      (both os_fc_both)
+   }
+   #endif
+   {if_else $smasherbracket os_smasherbracket1 os_smasherbracket0}
+))
+{new
+    UIPanel
+    overshell_trkbhvr_panel
+    #ifdef HX_EE
+    (file practice/practice_sel_section_og.milo)
+    #else
+    (file "practice/practice_sel_section.milo")
+    #endif
+    (focus sel_section.lst)
+    (enter
+        {$this lst_reset}
+        {title.lbl set_localized {localize os_trkbhvr}}
+        {full_selection.mesh set_showing FALSE})
+    (lst_reset
+      {sel_section.lst set_data TRACK_BEHAVIOR_DATA}
+         {if $hwpos
+      {sel_section.lst set_selected $hwpos}
+    })
+    (exit)
+    (SELECT_MSG
+    {switch {$component selected_sym}
+         ((os_smasherbracket0 os_smasherbracket1)
+            {set $smasherbracket {! $smasherbracket}}
+            {set $hwpos {sel_section.lst selected_sym}}
+            {$this lst_reset}
+         )
+         (os_hwbhvr
+            {os_change_screen overshell_hwbhvr}
+         )
+         (os_strkbhvr
+            {os_change_screen overshell_strkbhvr}
+         )
+         (os_warnbhvr
+            {os_change_screen overshell_warnbhvr}
+         )
+         ((os_fc_ring os_fc_glow os_fc_both)
+            {set $fctype {switch $fctype
+               (ring glow)
+               (glow both)
+               (both ring)
+            }}
+            {set $hwpos {sel_section.lst selected_sym}}
+            {$this lst_reset}
+         )
+      })
+    (update_helpbar
+            {helpbar
+                set_config
+                ((cancel helpbar_back)
+                    (confirm helpbar_select))})
+    (SCROLL_MSG)
+    (BUTTON_DOWN_MSG
+        {if_else
+         #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif
+         {do
+         {synth play button_toggle}
+         {os_back_screen overshell_track}
+         TRUE}
+         kDataUnhandled})
+    (TRANSITION_COMPLETE_MSG
+        {$this update_helpbar})}
+{new
+   BandScreen
+   overshell_trkbhvr_screen
+   (panels overshell_trkbhvr_panel practice_mode_panel practice_lower3rd_panel)
+   (focus overshell_trkbhvr_panel)}
+;
 #define HW_BEHAVIOR_DATA
 ((
    {if_else $nogemdividers os_gemdiv0 os_gemdiv1}
@@ -285,19 +369,10 @@
       (rb2 os_hwalpha_rb2)
       (rb1 os_hwalpha_rb1)
    }
-   {if_else $smasherbracket os_smasherbracket1 os_smasherbracket0}
-   #ifndef HX_EE
-   os_warn_behavior
-   {switch $fctype
-      (ring os_fc_ring)
-      (glow os_fc_glow)
-      (both os_fc_both)
-   }
-   #endif
 ))
 {new
     UIPanel
-    overshell_hw_behavior_panel
+    overshell_hwbhvr_panel
     #ifdef HX_EE
     (file practice/practice_sel_section_og.milo)
     #else
@@ -306,7 +381,7 @@
     (focus sel_section.lst)
     (enter
         {$this lst_reset}
-        {title.lbl set_localized {localize os_hw_behavior}}
+        {title.lbl set_localized {localize os_hwbhvr}}
         {full_selection.mesh set_showing FALSE})
     (lst_reset
       {sel_section.lst set_data HW_BEHAVIOR_DATA}
@@ -332,23 +407,6 @@
             {set $hwpos {sel_section.lst selected_sym}}
             {$this lst_reset}
          )
-         ((os_smasherbracket0 os_smasherbracket1)
-            {set $smasherbracket {! $smasherbracket}}
-            {set $hwpos {sel_section.lst selected_sym}}
-            {$this lst_reset}
-         )
-         (os_warn_behavior
-            {os_change_screen overshell_warn_behavior}
-         )
-         ((os_fc_ring os_fc_glow os_fc_both)
-            {set $fctype {switch $fctype
-               (ring glow)
-               (glow both)
-               (both ring)
-            }}
-            {set $hwpos {sel_section.lst selected_sym}}
-            {$this lst_reset}
-         )
       })
     (update_helpbar
             {helpbar
@@ -361,20 +419,16 @@
          #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif
          {do
          {synth play button_toggle}
-         #ifdef HX_EE
-         {os_back_screen overshell_tex}
-         #else
-         {os_back_screen overshell_instrument_sel}
-         #endif
+         {os_back_screen overshell_trkbhvr}
          TRUE}
          kDataUnhandled})
     (TRANSITION_COMPLETE_MSG
         {$this update_helpbar})}
 {new
    BandScreen
-   overshell_hw_behavior_screen
-   (panels overshell_hw_behavior_panel practice_mode_panel practice_lower3rd_panel)
-   (focus overshell_hw_behavior_panel)}
+   overshell_hwbhvr_screen
+   (panels overshell_hwbhvr_panel practice_mode_panel practice_lower3rd_panel)
+   (focus overshell_hwbhvr_panel)}
 ;
 #define STRK_BEHAVIOR_DATA
 ((
@@ -383,7 +437,7 @@
 ))
 {new
     UIPanel
-    overshell_strk_behavior_panel
+    overshell_strkbhvr_panel
     #ifdef HX_EE
     (file practice/practice_sel_section_og.milo)
     #else
@@ -392,7 +446,7 @@
     (focus sel_section.lst)
     (enter
         {$this lst_reset}
-        {title.lbl set_localized {localize os_strk_behavior}}
+        {title.lbl set_localized {localize os_strkbhvr}}
         {full_selection.mesh set_showing FALSE})
     (lst_reset
       {sel_section.lst set_data STRK_BEHAVIOR_DATA}
@@ -423,15 +477,15 @@
         {if
         {== $action kAction_Cancel}
         {synth play button_toggle}
-         {os_back_screen overshell_instrument_sel}}
+         {os_back_screen overshell_trkbhvr}}
          kDataUnhandled)
     (TRANSITION_COMPLETE_MSG
         {$this update_helpbar})}
 {new
    BandScreen
-   overshell_strk_behavior_screen
-   (panels overshell_strk_behavior_panel practice_mode_panel practice_lower3rd_panel)
-   (focus overshell_strk_behavior_panel)}
+   overshell_strkbhvr_screen
+   (panels overshell_strkbhvr_panel practice_mode_panel practice_lower3rd_panel)
+   (focus overshell_strkbhvr_panel)}
 ;
 #define WARN_BEHAVIOR_DATA
 ((
@@ -440,7 +494,7 @@
 ))
 {new
     UIPanel
-    overshell_warn_behavior_panel
+    overshell_warnbhvr_panel
     #ifdef HX_EE
     (file practice/practice_sel_section_og.milo)
     #else
@@ -449,7 +503,7 @@
     (focus sel_section.lst)
     (enter
         {$this lst_reset}
-        {title.lbl set_localized {localize os_warn_behavior}}
+        {title.lbl set_localized {localize os_warnbhvr}}
         {full_selection.mesh set_showing FALSE})
     (lst_reset
       {sel_section.lst set_data WARN_BEHAVIOR_DATA}
@@ -526,15 +580,15 @@
         {if
         {== $action kAction_Cancel}
         {synth play button_toggle}
-         {os_back_screen overshell_hw_behavior}}
+         {os_back_screen overshell_trkbhvr}}
          kDataUnhandled)
     (TRANSITION_COMPLETE_MSG
         {$this update_helpbar})}
 {new
    BandScreen
-   overshell_warn_behavior_screen
-   (panels overshell_warn_behavior_panel practice_mode_panel practice_lower3rd_panel)
-   (focus overshell_warn_behavior_panel)}
+   overshell_warnbhvr_screen
+   (panels overshell_warnbhvr_panel practice_mode_panel practice_lower3rd_panel)
+   (focus overshell_warnbhvr_panel)}
 ;
 {new
     UIPanel