From 10da5038a25ddc675bef796c45500d516174b384 Mon Sep 17 00:00:00 2001 From: LysiX Date: Tue, 9 Jan 2024 11:01:43 -0800 Subject: [PATCH] complete overshell animations --- _ark/dx/ui/dx_overshell_macros.dta | 542 +++++++++++++++++++++++++++ _ark/ui/modifiers_screen.dta | 13 +- _ark/ui/options/options.dta | 13 +- _ark/ui/options/options_console.dta | 13 +- _ark/ui/options/options_gameplay.dta | 13 +- _ark/ui/overshell_sliders.dta | 30 +- 6 files changed, 612 insertions(+), 12 deletions(-) diff --git a/_ark/dx/ui/dx_overshell_macros.dta b/_ark/dx/ui/dx_overshell_macros.dta index f501d0a0..54ff668d 100644 --- a/_ark/dx/ui/dx_overshell_macros.dta +++ b/_ark/dx/ui/dx_overshell_macros.dta @@ -729,4 +729,546 @@ {{$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_MOD_OPEN_ANIM +( + {set $modpos_add 450} + {thread_task kTaskUISeconds + (script + {{options_background_panel find cornertrim_01.mesh} set_showing FALSE} + {{options_background_panel find cornertrim_05.mesh} set_showing FALSE} + {modifiers_panel set_local_pos $modx $mody {+ $modz $modpos_add}} + {{options_background_panel find tour_solo_lower3rd.grp} set_local_pos $opl3x $opl3y {+ $opl3z $modpos_add}} + {{options_background_panel find genre_corners.grp} set_local_pos $opgcx $opgcy {+ $opgcz $modpos_add}} + {{options_background_panel find bubble13.grp} set_local_pos $opbgx $opbgy {+ $opbgz $modpos_add}} + {$task sleep 0.005} + {cond + ({== $modpos_add 450} + {set $modpos_add 404} + {$task loop} + ) + ({== $modpos_add 404} + {set $modpos_add 360} + {$task loop} + ) + ({== $modpos_add 360} + {set $modpos_add 319} + {$task loop} + ) + ({== $modpos_add 319} + {set $modpos_add 280} + {$task loop} + ) + ({== $modpos_add 280} + {set $modpos_add 244} + {$task loop} + ) + ({== $modpos_add 244} + {set $modpos_add 211} + {$task loop} + ) + ({== $modpos_add 211} + {set $modpos_add 180} + {$task loop} + ) + ({== $modpos_add 180} + {set $modpos_add 151} + {$task loop} + ) + ({== $modpos_add 151} + {set $modpos_add 125} + {$task loop} + ) + ({== $modpos_add 125} + {set $modpos_add 101} + {$task loop} + ) + ({== $modpos_add 101} + {set $modpos_add 80} + {$task loop} + ) + ({== $modpos_add 80} + {set $modpos_add 61} + {$task loop} + ) + ({== $modpos_add 61} + {set $modpos_add 45} + {$task loop} + ) + ({== $modpos_add 45} + {set $modpos_add 31} + {$task loop} + ) + ({== $modpos_add 31} + {set $modpos_add 20} + {$task loop} + ) + ({== $modpos_add 20} + {set $modpos_add 11} + {$task loop} + ) + ({== $modpos_add 11} + {set $modpos_add 5} + {$task loop} + ) + ({== $modpos_add 5} + {set $modpos_add 0} + {$task loop} + ) + } + ) + } +) ; close anim doesnt work for system menus + +#define OS_CONSOLE_OPEN_ANIM +( + {set $modpos_add 450} + {thread_task kTaskUISeconds + (script + {{options_background_panel find cornertrim_01.mesh} set_showing FALSE} + {{options_background_panel find cornertrim_05.mesh} set_showing FALSE} + {options_console_panel set_local_pos $conx $cony {+ $conz $modpos_add}} + {{options_background_panel find tour_solo_lower3rd.grp} set_local_pos $opl3x $opl3y {+ $opl3z $modpos_add}} + {{options_background_panel find genre_corners.grp} set_local_pos $opgcx $opgcy {+ $opgcz $modpos_add}} + {{options_background_panel find bubble13.grp} set_local_pos $opbgx $opbgy {+ $opbgz $modpos_add}} + {$task sleep 0.005} + {cond + ({== $modpos_add 450} + {set $modpos_add 404} + {$task loop} + ) + ({== $modpos_add 404} + {set $modpos_add 360} + {$task loop} + ) + ({== $modpos_add 360} + {set $modpos_add 319} + {$task loop} + ) + ({== $modpos_add 319} + {set $modpos_add 280} + {$task loop} + ) + ({== $modpos_add 280} + {set $modpos_add 244} + {$task loop} + ) + ({== $modpos_add 244} + {set $modpos_add 211} + {$task loop} + ) + ({== $modpos_add 211} + {set $modpos_add 180} + {$task loop} + ) + ({== $modpos_add 180} + {set $modpos_add 151} + {$task loop} + ) + ({== $modpos_add 151} + {set $modpos_add 125} + {$task loop} + ) + ({== $modpos_add 125} + {set $modpos_add 101} + {$task loop} + ) + ({== $modpos_add 101} + {set $modpos_add 80} + {$task loop} + ) + ({== $modpos_add 80} + {set $modpos_add 61} + {$task loop} + ) + ({== $modpos_add 61} + {set $modpos_add 45} + {$task loop} + ) + ({== $modpos_add 45} + {set $modpos_add 31} + {$task loop} + ) + ({== $modpos_add 31} + {set $modpos_add 20} + {$task loop} + ) + ({== $modpos_add 20} + {set $modpos_add 11} + {$task loop} + ) + ({== $modpos_add 11} + {set $modpos_add 5} + {$task loop} + ) + ({== $modpos_add 5} + {set $modpos_add 0} + {$task loop} + ) + } + ) + } +) ; close anim doesnt work for system menus + +#define OS_SD_OPEN_ANIM +( + {set $modpos_add 450} + {thread_task kTaskUISeconds + (script + {{options_background_panel find cornertrim_01.mesh} set_showing FALSE} + {{options_background_panel find cornertrim_05.mesh} set_showing FALSE} + {options_savedata_panel set_local_pos $sdx $sdy {+ $sdz $modpos_add}} + {{options_background_panel find tour_solo_lower3rd.grp} set_local_pos $opl3x $opl3y {+ $opl3z $modpos_add}} + {{options_background_panel find genre_corners.grp} set_local_pos $opgcx $opgcy {+ $opgcz $modpos_add}} + {{options_background_panel find bubble13.grp} set_local_pos $opbgx $opbgy {+ $opbgz $modpos_add}} + {$task sleep 0.005} + {cond + ({== $modpos_add 450} + {set $modpos_add 404} + {$task loop} + ) + ({== $modpos_add 404} + {set $modpos_add 360} + {$task loop} + ) + ({== $modpos_add 360} + {set $modpos_add 319} + {$task loop} + ) + ({== $modpos_add 319} + {set $modpos_add 280} + {$task loop} + ) + ({== $modpos_add 280} + {set $modpos_add 244} + {$task loop} + ) + ({== $modpos_add 244} + {set $modpos_add 211} + {$task loop} + ) + ({== $modpos_add 211} + {set $modpos_add 180} + {$task loop} + ) + ({== $modpos_add 180} + {set $modpos_add 151} + {$task loop} + ) + ({== $modpos_add 151} + {set $modpos_add 125} + {$task loop} + ) + ({== $modpos_add 125} + {set $modpos_add 101} + {$task loop} + ) + ({== $modpos_add 101} + {set $modpos_add 80} + {$task loop} + ) + ({== $modpos_add 80} + {set $modpos_add 61} + {$task loop} + ) + ({== $modpos_add 61} + {set $modpos_add 45} + {$task loop} + ) + ({== $modpos_add 45} + {set $modpos_add 31} + {$task loop} + ) + ({== $modpos_add 31} + {set $modpos_add 20} + {$task loop} + ) + ({== $modpos_add 20} + {set $modpos_add 11} + {$task loop} + ) + ({== $modpos_add 11} + {set $modpos_add 5} + {$task loop} + ) + ({== $modpos_add 5} + {set $modpos_add 0} + {$task loop} + ) + } + ) + } +) ; close anim doesnt work for system menus + +#define OS_GP_OPEN_ANIM +( + {set $modpos_add 450} + {thread_task kTaskUISeconds + (script + {{options_background_panel find cornertrim_01.mesh} set_showing FALSE} + {{options_background_panel find cornertrim_05.mesh} set_showing FALSE} + {options_gameplay_panel set_local_pos $gpx $gpy {+ $gpz $modpos_add}} + {{options_background_panel find tour_solo_lower3rd.grp} set_local_pos $opl3x $opl3y {+ $opl3z $modpos_add}} + {{options_background_panel find genre_corners.grp} set_local_pos $opgcx $opgcy {+ $opgcz $modpos_add}} + {{options_background_panel find bubble13.grp} set_local_pos $opbgx $opbgy {+ $opbgz $modpos_add}} + {$task sleep 0.005} + {cond + ({== $modpos_add 450} + {set $modpos_add 404} + {$task loop} + ) + ({== $modpos_add 404} + {set $modpos_add 360} + {$task loop} + ) + ({== $modpos_add 360} + {set $modpos_add 319} + {$task loop} + ) + ({== $modpos_add 319} + {set $modpos_add 280} + {$task loop} + ) + ({== $modpos_add 280} + {set $modpos_add 244} + {$task loop} + ) + ({== $modpos_add 244} + {set $modpos_add 211} + {$task loop} + ) + ({== $modpos_add 211} + {set $modpos_add 180} + {$task loop} + ) + ({== $modpos_add 180} + {set $modpos_add 151} + {$task loop} + ) + ({== $modpos_add 151} + {set $modpos_add 125} + {$task loop} + ) + ({== $modpos_add 125} + {set $modpos_add 101} + {$task loop} + ) + ({== $modpos_add 101} + {set $modpos_add 80} + {$task loop} + ) + ({== $modpos_add 80} + {set $modpos_add 61} + {$task loop} + ) + ({== $modpos_add 61} + {set $modpos_add 45} + {$task loop} + ) + ({== $modpos_add 45} + {set $modpos_add 31} + {$task loop} + ) + ({== $modpos_add 31} + {set $modpos_add 20} + {$task loop} + ) + ({== $modpos_add 20} + {set $modpos_add 11} + {$task loop} + ) + ({== $modpos_add 11} + {set $modpos_add 5} + {$task loop} + ) + ({== $modpos_add 5} + {set $modpos_add 0} + {$task loop} + ) + } + ) + } +) ; close anim doesnt work for system menus + +#define OS_SLD_OPEN_ANIM +( + {set $modpos_add 450} + {thread_task kTaskUISeconds + (script + {{options_background_panel find cornertrim_01.mesh} set_showing FALSE} + {{options_background_panel find cornertrim_05.mesh} set_showing FALSE} + {options_milo_panel set_local_pos $sldx $sldy {+ $sldz $modpos_add}} + {options_color_panel set_local_pos $sldx $sldy {+ $sldz $modpos_add}} + {{options_background_panel find tour_solo_lower3rd.grp} set_local_pos $opl3x $opl3y {+ $opl3z $modpos_add}} + {{options_background_panel find genre_corners.grp} set_local_pos $opgcx $opgcy {+ $opgcz $modpos_add}} + {{options_background_panel find bubble13.grp} set_local_pos $opbgx $opbgy {+ $opbgz $modpos_add}} + {$task sleep 0.005} + {cond + ({== $modpos_add 450} + {set $modpos_add 404} + {$task loop} + ) + ({== $modpos_add 404} + {set $modpos_add 360} + {$task loop} + ) + ({== $modpos_add 360} + {set $modpos_add 319} + {$task loop} + ) + ({== $modpos_add 319} + {set $modpos_add 280} + {$task loop} + ) + ({== $modpos_add 280} + {set $modpos_add 244} + {$task loop} + ) + ({== $modpos_add 244} + {set $modpos_add 211} + {$task loop} + ) + ({== $modpos_add 211} + {set $modpos_add 180} + {$task loop} + ) + ({== $modpos_add 180} + {set $modpos_add 151} + {$task loop} + ) + ({== $modpos_add 151} + {set $modpos_add 125} + {$task loop} + ) + ({== $modpos_add 125} + {set $modpos_add 101} + {$task loop} + ) + ({== $modpos_add 101} + {set $modpos_add 80} + {$task loop} + ) + ({== $modpos_add 80} + {set $modpos_add 61} + {$task loop} + ) + ({== $modpos_add 61} + {set $modpos_add 45} + {$task loop} + ) + ({== $modpos_add 45} + {set $modpos_add 31} + {$task loop} + ) + ({== $modpos_add 31} + {set $modpos_add 20} + {$task loop} + ) + ({== $modpos_add 20} + {set $modpos_add 11} + {$task loop} + ) + ({== $modpos_add 11} + {set $modpos_add 5} + {$task loop} + ) + ({== $modpos_add 5} + {set $modpos_add 0} + {$task loop} + ) + } + ) + } +) + +#define OS_SLD_CLOSE_ANIM +( + {set $modpos_add 5} + {thread_task kTaskUISeconds + (script + {{options_background_panel find cornertrim_01.mesh} set_showing FALSE} + {{options_background_panel find cornertrim_05.mesh} set_showing FALSE} + {options_milo_panel set_local_pos $sldx $sldy {+ $sldz $modpos_add}} + {options_color_panel set_local_pos $sldx $sldy {+ $sldz $modpos_add}} + {{options_background_panel find tour_solo_lower3rd.grp} set_local_pos $opl3x $opl3y {+ $opl3z $modpos_add}} + {{options_background_panel find genre_corners.grp} set_local_pos $opgcx $opgcy {+ $opgcz $modpos_add}} + {{options_background_panel find bubble13.grp} set_local_pos $opbgx $opbgy {+ $opbgz $modpos_add}} + {$task sleep 0.005} + {cond + ({== $modpos_add 450} + {synth play button_toggle} + {ui pop_screen} + ) + ({== $modpos_add 404} + {set $modpos_add 450} + {$task loop} + ) + ({== $modpos_add 360} + {set $modpos_add 404} + {$task loop} + ) + ({== $modpos_add 319} + {set $modpos_add 360} + {$task loop} + ) + ({== $modpos_add 280} + {set $modpos_add 319} + {$task loop} + ) + ({== $modpos_add 244} + {set $modpos_add 280} + {$task loop} + ) + ({== $modpos_add 211} + {set $modpos_add 244} + {$task loop} + ) + ({== $modpos_add 180} + {set $modpos_add 211} + {$task loop} + ) + ({== $modpos_add 151} + {set $modpos_add 180} + {$task loop} + ) + ({== $modpos_add 125} + {set $modpos_add 151} + {$task loop} + ) + ({== $modpos_add 101} + {set $modpos_add 125} + {$task loop} + ) + ({== $modpos_add 80} + {set $modpos_add 101} + {$task loop} + ) + ({== $modpos_add 61} + {set $modpos_add 80} + {$task loop} + ) + ({== $modpos_add 45} + {set $modpos_add 61} + {$task loop} + ) + ({== $modpos_add 31} + {set $modpos_add 45} + {$task loop} + ) + ({== $modpos_add 20} + {set $modpos_add 31} + {$task loop} + ) + ({== $modpos_add 11} + {set $modpos_add 20} + {$task loop} + ) + ({== $modpos_add 5} + {set $modpos_add 11} + {$task loop} + ) + } + ) + } ) \ No newline at end of file diff --git a/_ark/ui/modifiers_screen.dta b/_ark/ui/modifiers_screen.dta index 2a510db1..90d99e10 100644 --- a/_ark/ui/modifiers_screen.dta +++ b/_ark/ui/modifiers_screen.dta @@ -17,7 +17,18 @@ {memcardmgr add_sink $this - (save_load_all_complete_msg)}) + (save_load_all_complete_msg)} + {unless $mod_first_entry + {{options_background_panel find tour_solo_lower3rd.grp} get_local_pos $opl3x $opl3y $opl3z} + {{options_background_panel find genre_corners.grp} get_local_pos $opgcx $opgcy $opgcz} + {{options_background_panel find bubble13.grp} get_local_pos $opbgx $opbgy $opbgz} + {modifiers_panel get_local_pos $modx $mody $modz} + {set $mod_first_entry TRUE} + } + {if $mod_os_entered + OS_MOD_OPEN_ANIM + } + ) (exit {profile_mgr remove_sink $this profile_changed_msg} {memcardmgr remove_sink $this save_load_all_complete_msg}) diff --git a/_ark/ui/options/options.dta b/_ark/ui/options/options.dta index 5ae2865e..8e65aa27 100644 --- a/_ark/ui/options/options.dta +++ b/_ark/ui/options/options.dta @@ -1168,7 +1168,18 @@ {modifier_mgr is_feature_enabled modifier_saving_feature}} {profile_mgr get_all_unlocked}} {$this disable save.btn} - {$this enable save.btn}}) + {$this enable save.btn}} + {unless $sd_first_entry + {{options_background_panel find tour_solo_lower3rd.grp} get_local_pos $opl3x $opl3y $opl3z} + {{options_background_panel find genre_corners.grp} get_local_pos $opgcx $opgcy $opgcz} + {{options_background_panel find bubble13.grp} get_local_pos $opbgx $opbgy $opbgz} + {options_savedata_panel get_local_pos $sdx $sdy $sdz} + {set $sd_first_entry TRUE} + } + {if $mod_os_entered + OS_SD_OPEN_ANIM + } + ) (SELECT_MSG {switch $component diff --git a/_ark/ui/options/options_console.dta b/_ark/ui/options/options_console.dta index bf59fb84..6cfa08f7 100644 --- a/_ark/ui/options/options_console.dta +++ b/_ark/ui/options/options_console.dta @@ -14,7 +14,18 @@ add_sink $this (save_load_all_complete_msg)} - {$this update_all}) + {$this update_all} + {unless $console_first_entry + {{options_background_panel find tour_solo_lower3rd.grp} get_local_pos $opl3x $opl3y $opl3z} + {{options_background_panel find genre_corners.grp} get_local_pos $opgcx $opgcy $opgcz} + {{options_background_panel find bubble13.grp} get_local_pos $opbgx $opbgy $opbgz} + {options_console_panel get_local_pos $conx $cony $conz} + {set $console_first_entry TRUE} + } + {if $mod_os_entered + OS_CONSOLE_OPEN_ANIM + } + ) (exit {memcardmgr remove_sink $this save_load_all_complete_msg}) (save_load_all_complete_msg diff --git a/_ark/ui/options/options_gameplay.dta b/_ark/ui/options/options_gameplay.dta index ec523702..eabce5de 100644 --- a/_ark/ui/options/options_gameplay.dta +++ b/_ark/ui/options/options_gameplay.dta @@ -11,7 +11,18 @@ add_sink $this (signin_changed)} - {$this update_lefty_check}) + {$this update_lefty_check} + {unless $gp_first_entry + {{options_background_panel find tour_solo_lower3rd.grp} get_local_pos $opl3x $opl3y $opl3z} + {{options_background_panel find genre_corners.grp} get_local_pos $opgcx $opgcy $opgcz} + {{options_background_panel find bubble13.grp} get_local_pos $opbgx $opbgy $opbgz} + {options_gameplay_panel get_local_pos $gpx $gpy $gpz} + {set $gp_first_entry TRUE} + } + {if $mod_os_entered + OS_GP_OPEN_ANIM + } + ) (exit {platform_mgr remove_sink $this signin_changed}) (SIGNIN_CHANGED_MSG diff --git a/_ark/ui/overshell_sliders.dta b/_ark/ui/overshell_sliders.dta index 019f95cb..40995cd1 100644 --- a/_ark/ui/overshell_sliders.dta +++ b/_ark/ui/overshell_sliders.dta @@ -36,6 +36,14 @@ {$this disable background_music.btn} } {$this update_all_from_profile} + {unless $sld_first_entry + {{options_background_panel find tour_solo_lower3rd.grp} get_local_pos $opl3x $opl3y $opl3z} + {{options_background_panel find genre_corners.grp} get_local_pos $opgcx $opgcy $opgcz} + {{options_background_panel find bubble13.grp} get_local_pos $opbgx $opbgy $opbgz} + {options_milo_panel get_local_pos $sldx $sldy $sldz} + {set $sld_first_entry TRUE} + } + OS_SLD_OPEN_ANIM ) (display_trackspeed_msg ($tspd) @@ -133,9 +141,8 @@ {if_else {== $action kAction_Cancel} {do - {ui goto_screen overshell_main_screen} - {synth play button_toggle} - {ui pop_screen}} + OS_SLD_CLOSE_ANIM + } kDataUnhandled}}) (set_speeds {do @@ -224,7 +231,7 @@ ; {profile_mgr get_vocal_cue_volume}}) })} {new - AutoloadScreen + BandScreen options_milo_screen (panels options_background_panel options_milo_panel) (focus options_milo_panel) @@ -266,6 +273,14 @@ {vocal_track.btn set_localized {localize {sprintf "gemcolor_%i" $slot3_color}}} ;update text for button 3 {crowd.btn set_localized {localize {sprintf "gemcolor_%i" $slot4_color}}} ;update text for button 4 {sfx.btn set_localized {localize {sprintf "gemcolor_%i" $slot5_color}}} ;update text for button 5 + {unless $sld_first_entry + {{options_background_panel find tour_solo_lower3rd.grp} get_local_pos $opl3x $opl3y $opl3z} + {{options_background_panel find genre_corners.grp} get_local_pos $opgcx $opgcy $opgcz} + {{options_background_panel find bubble13.grp} get_local_pos $opbgx $opbgy $opbgz} + {options_color_panel get_local_pos $sldx $sldy $sldz} + {set $sld_first_entry TRUE} + } + OS_SLD_OPEN_ANIM ) (exit) (TRANSITION_COMPLETE_MSG @@ -354,9 +369,8 @@ {if_else {== $action kAction_Cancel} {do - {ui goto_screen overshell_track_screen} - {synth play button_toggle} - {ui pop_screen}} + OS_SLD_CLOSE_ANIM + } kDataUnhandled}}) (on_slider_change ($component) @@ -416,7 +430,7 @@ ) } {new - AutoloadScreen + BandScreen options_color_screen (panels options_background_panel options_color_panel) (focus options_color_panel)