From a6d97044514049b4ed6c3d8e2c2f9cee98909fae Mon Sep 17 00:00:00 2001 From: LysiX Date: Fri, 5 Jan 2024 17:03:59 -0800 Subject: [PATCH] overshell animations opening the non list menus currently doesn't animate, don't merge to main until that is completed --- _ark/dx/ui/dx_funcs.dta | 25 +++ _ark/dx/ui/dx_overshell_macros.dta | 235 +++++++++++++++++++++++++++++ _ark/ui/overshell.dta | 34 +++-- _ark/ui/overshell_textures.dta | 87 ++++++----- _ark/ui/overshell_track.dta | 35 ++--- 5 files changed, 345 insertions(+), 71 deletions(-) diff --git a/_ark/dx/ui/dx_funcs.dta b/_ark/dx/ui/dx_funcs.dta index 5144ffa8..8a924e47 100644 --- a/_ark/dx/ui/dx_funcs.dta +++ b/_ark/dx/ui/dx_funcs.dta @@ -13,4 +13,29 @@ } {func get_track_1_panel {{get_track_panel} find track_1} +} + +;overshell change screen functions +{func os_change_screen ($next) ;for moving forward, flip from right to left + {set $os_next_screen {sprint $next "_screen"}} + {set $os_next_panel {sprint $next "_panel"}} + {thread_task kTaskUISeconds + (script + OS_CHANGE_CURRENT_ANIM + {ui push_screen $os_next_screen} + OS_CHANGE_NEXT_ANIM + ) + } +} +{func os_back_screen ($next) ;for moving backward, flip from left to right + {set $os_next_screen {sprint $next "_screen"}} + {set $os_next_panel {sprint $next "_panel"}} + {thread_task kTaskUISeconds + (script + OS_BACK_CURRENT_ANIM + OS_BACK_NEXT_ANIM + {ui goto_screen $os_next_screen} + {ui pop_screen} + ) + } } \ No newline at end of file diff --git a/_ark/dx/ui/dx_overshell_macros.dta b/_ark/dx/ui/dx_overshell_macros.dta index c1d45af9..f501d0a0 100644 --- a/_ark/dx/ui/dx_overshell_macros.dta +++ b/_ark/dx/ui/dx_overshell_macros.dta @@ -494,4 +494,239 @@ {set $track_fade_start 74} {set $track_fade_length 15} {set $multioptimized FALSE} +) + +#define OS_OPEN_ANIM +( + {thread_task kTaskUISeconds + (script + {all.grp set_local_pos $osx $osy {+ $osz 450}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 450}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 404}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 404}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 360}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 360}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 319}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 319}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 280}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 280}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 244}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 244}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 211}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 211}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 180}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 180}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 151}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 151}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 125}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 125}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 101}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 101}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 80}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 80}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 61}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 61}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 45}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 45}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 31}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 31}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 20}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 20}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 11}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 11}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 5}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 5}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy $osz} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y $osl3z} + ) + } +) + +#define OS_CLOSE_ANIM +( + {thread_task kTaskUISeconds + (script + {all.grp set_local_pos $osx $osy {+ $osz 5}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 5}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 11}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 11}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 20}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 20}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 31}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 31}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 45}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 45}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 61}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 61}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 80}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 80}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 101}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 101}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 125}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 125}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 151}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 151}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 180}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 180}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 211}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 211}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 244}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 244}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 280}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 280}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 319}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 319}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 360}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 360}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 404}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 404}} + {$task sleep 0.005} + {all.grp set_local_pos $osx $osy {+ $osz 450}} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} set_local_pos $osl3x $osl3y {+ $osl3z 450}} + {if_else {exists $modifier_exit} + {ui goto_screen $modifier_exit} + {ui goto_screen splash_screen}} + {ui pop_screen} + ) + } +) + +#define OS_CHANGE_CURRENT_ANIM +( + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 9}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 18}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 27}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 36}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 45}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 54}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 63}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 72}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 81}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 85.5}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {- $oszrot 90}} + {$task sleep 0.005} +) + +#define OS_CHANGE_NEXT_ANIM +( + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 90}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 85.5}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 81}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 72}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 63}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 54}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 45}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 36}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 27}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 18}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {+ $oszrot 9}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot} +) + +#define OS_BACK_CURRENT_ANIM +( + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 9}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 18}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 27}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 36}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 45}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 54}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 63}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 72}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 81}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 85.5}} + {$task sleep 0.005} + {all.grp set_local_rot $osxrot $osyrot {+ $oszrot 90}} + {$task sleep 0.005} +) + +#define OS_BACK_NEXT_ANIM +( + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 90}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 85.5}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 81}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 72}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 63}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 54}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 45}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 36}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 27}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 18}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot {- $oszrot 9}} + {$task sleep 0.005} + {{$os_next_panel find all.grp} set_local_rot $osxrot $osyrot $oszrot} ) \ No newline at end of file diff --git a/_ark/ui/overshell.dta b/_ark/ui/overshell.dta index 8b6291f1..e5676553 100644 --- a/_ark/ui/overshell.dta +++ b/_ark/ui/overshell.dta @@ -10,12 +10,23 @@ (enter {sel_section.lst set_data (os_mod #ifndef HX_EE os_sys #endif os_spd os_trkset #ifndef HX_EE os_cam #endif)} {title.lbl set_localized {localize os_dxsettings}} - {full_selection.mesh set_showing FALSE}) + {full_selection.mesh set_showing FALSE} + {unless $os_first_entry + {all.grp get_local_pos $osxpos $osypos $oszpos} + {all.grp get_local_rot $osxrot $osyrot $oszrot} + ;{all.grp get_local_scale $osxscl $osyscl $oszscl} + ;{title.lbl get_local_scale $oslblx $oslbly $oslblz} + ;{sel_section.lst get_local_scale $oslsx $oslsy $oslsz} + {{practice_lower3rd_panel find #ifdef HX_EE tour_solo_lower3rd.grp #else practice_tour_solo_lower3rd.grp #endif} get_local_pos $osl3x $osl3y $osl3z} + {set $os_first_entry TRUE} + } + OS_OPEN_ANIM + ) (exit) (SELECT_MSG {switch {$component selected_sym} (os_sys - {ui push_screen overshell_system_screen} + {os_change_screen overshell_system} ) (os_spd {ui push_screen options_milo_screen} @@ -25,10 +36,10 @@ {ui push_screen modifiers_screen} ) (os_trkset - {ui push_screen overshell_track_screen} + {os_change_screen overshell_track} ) (os_cam - {ui push_screen overshell_cam_sfx_screen} + {os_change_screen overshell_cam_sfx} ) }) (update_helpbar @@ -42,10 +53,7 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {if_else {exists $modifier_exit} - {ui goto_screen $modifier_exit} - {ui goto_screen splash_screen}} - {ui pop_screen} + OS_CLOSE_ANIM TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG @@ -114,10 +122,9 @@ {if {== $action kAction_Cancel} {synth play button_toggle} - {ui goto_screen overshell_main_screen} - {set $mod_os_entered FALSE} - {ui pop_screen}} - kDataUnhandled) + {set $mod_os_entered FALSE} + {os_back_screen overshell_main}} + kDataUnhandled) (TRANSITION_COMPLETE_MSG {$this update_helpbar})} {new @@ -187,8 +194,7 @@ {if {== $action kAction_Cancel} {synth play button_toggle} - {ui goto_screen overshell_main_screen} - {ui pop_screen}} + {os_back_screen overshell_main}} kDataUnhandled) (TRANSITION_COMPLETE_MSG {$this update_helpbar})} diff --git a/_ark/ui/overshell_textures.dta b/_ark/ui/overshell_textures.dta index e2e49c56..7d2853e9 100644 --- a/_ark/ui/overshell_textures.dta +++ b/_ark/ui/overshell_textures.dta @@ -15,74 +15,74 @@ (SELECT_MSG {switch {$component selected_sym} (os_hw_behavior - {ui push_screen overshell_hw_behavior_screen} + {os_change_screen overshell_hw_behavior} ) (os_sus - {ui push_screen overshell_sustains_screen} + {os_change_screen overshell_sustains} ) (os_lanes {set $dx_tracked_texture_loader lanes} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_gems {set $dx_tracked_texture_loader gems} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_smashers {set $dx_tracked_texture_loader smashers} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_font {set $dx_tracked_texture_loader font} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_score {set $dx_tracked_texture_loader score} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_stars {set $dx_tracked_texture_loader stars} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_bre {set $dx_tracked_texture_loader bre} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_flames {set $dx_tracked_texture_loader flames} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_rails {set $dx_tracked_texture_loader rails} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_hw {set $dx_tracked_texture_loader highway} - {ui push_screen overshell_instrument_sel_screen} + {os_change_screen overshell_instrument_sel} ) (os_strk {set $dx_tracked_texture_loader streak} #ifdef HX_EE {set $dx_tracked_instrument bass} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} #else - {ui push_screen overshell_instrument_sel_screen} + {os_change_screen overshell_instrument_sel} #endif ) (os_spotlight {set $dx_tracked_texture_loader spotlight} - {ui push_screen overshell_instrument_sel_screen} + {os_change_screen overshell_instrument_sel} ) (os_odbar {set $dx_tracked_texture_loader odbar} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_multi_ring {set $dx_tracked_texture_loader multiring} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_voxtrk - {ui push_screen overshell_voxtrk_screen} + {os_change_screen overshell_voxtrk} ) }) (update_helpbar @@ -96,8 +96,11 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_trkpreset_screen} - {ui pop_screen} + #ifdef HX_EE + {os_back_screen overshell_track} + #else + {os_back_screen overshell_trkpreset} + #endif TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG @@ -142,25 +145,25 @@ {switch {$component selected_sym} (os_spotlightall {set $dx_tracked_instrument all} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_spotlightgtr {set $dx_tracked_instrument guitar} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_spotlightbass {set $dx_tracked_instrument bass} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_spotlightdrum {set $dx_tracked_instrument drum} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_hw_behavior - {ui push_screen overshell_hw_behavior_screen} + {os_change_screen overshell_hw_behavior} ) (os_strk_behavior - {ui push_screen overshell_strk_behavior_screen} + {os_change_screen overshell_strk_behavior} ) }) (update_helpbar @@ -174,8 +177,7 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_trkpreset_screen} - {ui pop_screen} + {os_back_screen overshell_tex} TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG @@ -204,19 +206,19 @@ {switch {$component selected_sym} (os_voxarrow {set $dx_tracked_texture_loader voxarrow} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_voxhw {set $dx_tracked_texture_loader voxhw} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_voxnotes {set $dx_tracked_texture_loader voxnotes} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) (os_voxod {set $dx_tracked_texture_loader voxod} - {ui push_screen overshell_texload_screen} + {os_change_screen overshell_texload} ) } ) @@ -231,8 +233,7 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_tex_screen} - {ui pop_screen} + {os_back_screen overshell_tex} TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG @@ -530,8 +531,13 @@ {set $voxnotes {$component selected_sym}} ) } - {ui goto_screen overshell_track_screen} - {ui pop_screen} + {if_else {|| {== $dx_tracked_texture_loader voxarrow} {== $dx_tracked_texture_loader voxhw} {== $dx_tracked_texture_loader voxnotes} {== $dx_tracked_texture_loader voxod}} + {os_back_screen overshell_voxtrk} + {if_else {|| {== $dx_tracked_texture_loader highway} {== $dx_tracked_texture_loader spotlight} #ifndef HX_EE {== $dx_tracked_texture_loader streak} #endif} + {os_back_screen overshell_instrument_sel} + {os_back_screen overshell_tex} + } + } ) (update_helpbar {helpbar @@ -601,8 +607,13 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_track_screen} - {ui pop_screen} + {if_else {|| {== $dx_tracked_texture_loader voxarrow} {== $dx_tracked_texture_loader voxhw} {== $dx_tracked_texture_loader voxnotes} {== $dx_tracked_texture_loader voxod}} + {os_back_screen overshell_voxtrk} + {if_else {|| {== $dx_tracked_texture_loader highway} {== $dx_tracked_texture_loader spotlight} #ifndef HX_EE {== $dx_tracked_texture_loader streak} #endif} + {os_back_screen overshell_instrument_sel} + {os_back_screen overshell_tex} + } + } TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG diff --git a/_ark/ui/overshell_track.dta b/_ark/ui/overshell_track.dta index c635990f..16d46e1c 100644 --- a/_ark/ui/overshell_track.dta +++ b/_ark/ui/overshell_track.dta @@ -16,13 +16,13 @@ {switch {$component selected_sym} (os_trkpreset #ifdef HX_EE - {ui push_screen overshell_tex_screen} + {os_change_screen overshell_tex} #else - {ui push_screen overshell_trkpreset_screen} + {os_change_screen overshell_trkpreset} #endif ) (os_angle - {ui push_screen overshell_angle_screen} + {os_change_screen overshell_angle} ) (os_clr {ui push_screen options_color_screen} @@ -39,8 +39,7 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_main_screen} - {ui pop_screen} + {os_back_screen overshell_main} TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG @@ -69,7 +68,7 @@ (SELECT_MSG {switch {$component selected_sym} (os_tex - {ui push_screen overshell_tex_screen} + {os_change_screen overshell_tex} ) (os_rb2prst {if_else $texrunonce @@ -211,8 +210,7 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_track_screen} - {ui pop_screen} + {os_back_screen overshell_track} TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG @@ -253,8 +251,7 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_tex_screen} - {ui pop_screen} + {os_back_screen overshell_tex} TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG @@ -325,7 +322,7 @@ {$this lst_reset} ) (os_warn_behavior - {ui push_screen overshell_warn_behavior_screen} + {os_change_screen overshell_warn_behavior} ) ((os_fc_ring os_fc_glow os_fc_both) {set $fctype {switch $fctype @@ -348,8 +345,11 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_track_screen} - {ui pop_screen} + #ifdef HX_EE + {os_back_screen overshell_tex} + #else + {os_back_screen overshell_instrument_sel} + #endif TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG @@ -407,8 +407,7 @@ {if {== $action kAction_Cancel} {synth play button_toggle} - {ui goto_screen overshell_hw_behavior_screen} - {ui pop_screen}} + {os_back_screen overshell_instrument_sel}} kDataUnhandled) (TRANSITION_COMPLETE_MSG {$this update_helpbar})} @@ -511,8 +510,7 @@ {if {== $action kAction_Cancel} {synth play button_toggle} - {ui goto_screen overshell_hw_behavior_screen} - {ui pop_screen}} + {os_back_screen overshell_hw_behavior}} kDataUnhandled) (TRANSITION_COMPLETE_MSG {$this update_helpbar})} @@ -683,8 +681,7 @@ #ifdef HX_EE {== $button kPad_Tri} #else {== $action kAction_Cancel} #endif {do {synth play button_toggle} - {ui goto_screen overshell_track_screen} - {ui pop_screen} + {os_back_screen overshell_track} TRUE} kDataUnhandled}) (TRANSITION_COMPLETE_MSG