diff --git a/_ark/config/beatmatcher.dta b/_ark/config/beatmatcher.dta index c29c43a31a..6396011c9b 100644 --- a/_ark/config/beatmatcher.dta +++ b/_ark/config/beatmatcher.dta @@ -28,6 +28,16 @@ {stagekit_left_right kStageSweepLeft_medium kStageSweepRight_medium}} #endif) (beat + {if {modifier_mgr is_modifier_active mod_auto_play} + {beatmatch foreach_active_player $player + {if {== {$player instrument} vocals} + {{{{{get_track_panel} find vocals} find vocals_mics} find arrow_1.mesh} set_showing FALSE} + {{{{{get_track_panel} find vocals} find vocals_mics} find arrow_2.mesh} set_showing FALSE} + {{{{{get_track_panel} find vocals} find vocals_mics} find arrow_3.mesh} set_showing FALSE} + {{{{{get_track_panel} find vocals} find vocals_mics} find label.lbl} set_showing FALSE} + } + } + } #ifdef HX_WII {unless $stagekit diff --git a/_ark/config/macros.dta b/_ark/config/macros.dta index 2cbf208261..5c32c2a441 100644 --- a/_ark/config/macros.dta +++ b/_ark/config/macros.dta @@ -787,6 +787,8 @@ #define dxState_MiloMesh (69101) #define dxState_MiloAO (69102) #define kState_ConfirmPlayaShowExit (69103) +#define dxState_RebootThemeWarn (69104) +#define kState_ReadyToPlayaShowWait (69105) #define kOverrideFlow_None (0) #define kOverrideFlow_SongSettings diff --git a/_ark/config/midi_parsers.dta b/_ark/config/midi_parsers.dta index d829d6b769..d07ff11fa5 100644 --- a/_ark/config/midi_parsers.dta +++ b/_ark/config/midi_parsers.dta @@ -2557,7 +2557,7 @@ (directed_guitar_cam {random_elem (directed_guitar_cam_pr directed_guitar_cam_pt)}) - (directed_vocal_cam + ((directed_vocals_cam directed_vocal_cam) {random_elem (directed_vocals_cam_pr directed_vocals_cam_pt)}) (directed_crowd_b @@ -2667,4 +2667,4 @@ (finish_loading {if $banddirector - {$banddirector midi_harvest_dircuts}}) \ No newline at end of file + {$banddirector midi_harvest_dircuts}}) diff --git a/_ark/config/modifiers.dta b/_ark/config/modifiers.dta index 4f5bed78b0..8b7b919663 100644 --- a/_ark/config/modifiers.dta +++ b/_ark/config/modifiers.dta @@ -3,10 +3,10 @@ (mod_no_fail_band custom_location save_value use_save_value) ;vanilla (mod_auto_vocals custom_location) ;vanilla (mod_drum_surface_navigation default_enabled save_value use_save_value) ;vanilla - (mod_drum_fills default_enabled save_value delayed_effect use_save_value) ;vanilla + (mod_drum_fills save_value delayed_effect use_save_value) ;vanilla, dx diasbles by default (mod_static_fills) ; no drum fills allowed, auto activate drum player - (mod_doublespeed save_value use_save_value) ;vanilla - dx added use_save_value - (mod_independent_track_speeds save_value use_save_value) ; vanilla + (mod_doublespeed save_value use_save_value custom_location) ;vanilla - dx added use_save_value (and removes it lol) + (mod_independent_track_speeds default_enabled save_value use_save_value) ; vanilla, dx enables by default (mod_synced_track_speeds) ; use the same track speed for all difficulties (enable_popup_help default_enabled save_value use_save_value) ; vanilla (mod_chord_numbers) ; vanilla diff --git a/_ark/config/scoring.dta b/_ark/config/scoring.dta index 012d7489a2..c234e6da92 100644 --- a/_ark/config/scoring.dta +++ b/_ark/config/scoring.dta @@ -232,9 +232,9 @@ (range 0.4 0.9) (free_ride 0.4) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -243,9 +243,9 @@ (range 0.25 0.9) (free_ride 0.4) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -254,9 +254,9 @@ (range 0.2 0.75) (free_ride 0.4) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.1) (initial_display_level 0.8333)) @@ -265,9 +265,9 @@ (range 5.0e-2 0.8) (free_ride 0.4) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -276,9 +276,9 @@ (range 5.0e-2 0.8) (free_ride 0.4) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -287,9 +287,9 @@ (range 0.4 0.85) (free_ride 0.4) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333))) @@ -299,9 +299,9 @@ (range 0.6 0.9) (free_ride 0.1) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -310,9 +310,9 @@ (range 0.6 0.95) (free_ride 0.1) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -321,9 +321,9 @@ (range 0.3 0.75) (free_ride 0.1) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.1) (initial_display_level 0.8333)) @@ -332,9 +332,9 @@ (range 0.3 0.8) (free_ride 0.1) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -343,9 +343,9 @@ (range 0.3 0.8) (free_ride 0.1) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -354,9 +354,9 @@ (range 0.4 0.85) (free_ride 0.1) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333))) @@ -366,9 +366,9 @@ (range 0.65 0.9) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -377,9 +377,9 @@ (range 0.7 0.95) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -388,9 +388,9 @@ (range 0.35 0.75) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.1) (initial_display_level 0.8333)) @@ -399,9 +399,9 @@ (range 0.45 0.8) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -410,9 +410,9 @@ (range 0.45 0.8) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -421,9 +421,9 @@ (range 0.45 0.85) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333))) @@ -433,9 +433,9 @@ (range 0.65 0.9) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -444,9 +444,9 @@ (range 0.75 0.95) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -455,9 +455,9 @@ (range 0.4 0.75) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.13) (initial_display_level 0.8333)) @@ -466,9 +466,9 @@ (range 0.45 0.8) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -477,9 +477,9 @@ (range 0.45 0.8) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333)) @@ -488,9 +488,9 @@ (range 0.45 0.85) (free_ride 0.0) (great_level 0.95) - (okay_level 0.66) - (bad_level 0.33) - (warning_level 0.15) + (okay_level {if_else $dx_fail_flash 0.66 0}) + (bad_level {if_else $dx_fail_flash 0.33 -1}) + (warning_level {if_else $dx_fail_flash 0.15 -1}) (lose_level 1.0e-2) (phrase_weight 0.2) (initial_display_level 0.8333))) diff --git a/_ark/config/synth.dta b/_ark/config/synth.dta index 42e9c0d017..81f72d00e1 100644 --- a/_ark/config/synth.dta +++ b/_ark/config/synth.dta @@ -75,8 +75,10 @@ ({do {dx_store_meta_info "lightupthenight" "Light Up the Night" "The Protomen" "none"} rb4_shellmusic_multi_lightupthenight} 0.0) ({do {dx_store_meta_info "o335947165_rudeboys_dutchr" "RudeBoys" "Dutch ReBelle" "disrespect"} rb4_shellmusic_multi_rudeboys} 0.0) ({do {dx_store_meta_info "welcometoparadise" "Welcome to Paradise" "Green Day" "hear me whining"} gdrb_shellmusic_multi_welcometoparadise} 0.0) - ({do {dx_store_meta_info "psychobillyfreakoutrhh" "Psychobilly Freakout" "The Reverend Horton Heat" "none"} gh2dx_shellmusic_multi_psychobilly} 0.0) ; https://rhythmverse.co/songfile/2fe493405a61498285749b5e751bb107 + ({do {dx_store_meta_info "PsychobillyFreakoutRHH_rb" "Psychobilly Freakout" "Reverend Horton Heat" "none"} gh2dx_shellmusic_multi_psychobilly} 0.0) ; https://rhythmverse.co/songfile/2fe493405a61498285749b5e751bb107 ({do {dx_store_meta_info "IWANNATAKEYOUFORARIDE_rb3" "I Wanna Take You for a Ride" "Marvel vs. Capcom 2: New Age of Heroes" "insert coin"} sekrit} 0.0) ; https://rhythmverse.co/songfile/e1caa4dff20a47b8b0fbd559c1785afa + ({do {dx_store_meta_info "panicattack" "Panic Attack" "Dream Theater" "to feel like you're in danger"} rb3dx_shellmusic_multi_panicattack} 0.0) + ({do {dx_store_meta_info "igetby" "I Get By" "Honest Bob and The Factory-to-Dealer Incentives" "wait on another bright idea"} rb1_shellmusic_multi_igetby} 0.0) ) (scenes #include metamusic_scenes.dta) diff --git a/_ark/config/track_graphics.dta b/_ark/config/track_graphics.dta index 5976e5a9ea..c6f372f933 100644 --- a/_ark/config/track_graphics.dta +++ b/_ark/config/track_graphics.dta @@ -371,114 +371,102 @@ (star 'gem_starpower_%s') (dot 'dot_top_hopo2_%s')) (tail_glow_width - {switch $dx_sustain - (none 0.25) - (rb3 0.25) - (rb2 1.7) - (rb4 0.25) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 1.7) + ({has_substr {sprint $dx_sustain} "rb4"} 0.25) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 0.25 } ) (tail_glow_tight_width - {switch $dx_sustain - (none 1.2) - (rb3 1.2) - (rb2 2) - (rb4 1.2) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 2) + ({has_substr {sprint $dx_sustain} "rb4"} 1.2) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 1.2 } ) (sparkle_len 1000) (tail_pulse_rate - {switch $dx_sustain - (none 32) - (rb3 32) - (rb2 64) - (rb4 32) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 64) + ({has_substr {sprint $dx_sustain} "rb4"} 32) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 32 } ) (tail_pulse_smoothing - {switch $dx_sustain - (none 0.3) - (rb3 0.3) - (rb2 0.5) - (rb4 0.3) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 0.5) + ({has_substr {sprint $dx_sustain} "rb4"} 0.3) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 0.3 } ) (tail_offset_x - {switch $dx_sustain - (none 0.1) - (rb3 0.1) - (rb2 0) - (rb4 0.1) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 0) + ({has_substr {sprint $dx_sustain} "rb4"} 0.1) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 0.1 } ) (tail_min_alpha - {switch $dx_sustain - (none 0.3) - (rb3 0.3) - (rb2 0.5) - (rb4 0.3) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 0.5) + ({has_substr {sprint $dx_sustain} "rb4"} 0.3) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 0.3 } ) (tail_max_alpha 1) (tail_alpha_smoothing 0.25) (tail_fade_distance - {switch $dx_sustain - (none 30) - (rb3 30) - (rb2 20) - (rb4 40) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 20) + ({has_substr {sprint $dx_sustain} "rb4"} 40) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 30 } ) (tail_min_freq - {switch $dx_sustain - (none 15) - (rb3 15) - (rb2 20) - (rb4 15) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 20) + ({has_substr {sprint $dx_sustain} "rb4"} 15) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 15 } ) (tail_max_freq - {switch $dx_sustain - (none 4.5) - (rb3 4.5) - (rb2 4.5) - (rb4 9) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 4.5) + ({has_substr {sprint $dx_sustain} "rb4"} 9) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 4.5 } ) (tail_min_amp ; width - {switch $dx_sustain - (none 0.15) - (rb3 0.15) - (rb2 0.25) - (rb4 0.4) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 0.25) + ({has_substr {sprint $dx_sustain} "rb4"} 0.4) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 0.15 } ) (tail_max_amp - {switch $dx_sustain - (none 0.9) - (rb3 0.9) - (rb2 1.5) - (rb4 1.4) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 1.5) + ({has_substr {sprint $dx_sustain} "rb4"} 1.4) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 0.9 } ) (tail_max_length - {switch $dx_sustain - (none 400) - (rb3 400) - (rb2 400) - (rb4 400) - (empty 0) + {cond + ({has_substr {sprint $dx_sustain} "rb2"} 400) + ({has_substr {sprint $dx_sustain} "rb4"} 400) + ({has_substr {sprint $dx_sustain} "[no sustains]"} 0) + 400 } ) (parts diff --git a/_ark/dx/countdown/dx_countdown.dta b/_ark/dx/countdown/dx_countdown.dta index 5bd00e3ab9..f7cc1b283b 100644 --- a/_ark/dx/countdown/dx_countdown.dta +++ b/_ark/dx/countdown/dx_countdown.dta @@ -62,7 +62,14 @@ kDataUnhandled } #endif - {set $dx_current_checked_instrument {$player instrument}} + {if_else + {|| + {== {{$player get_user} get_track_icon} $dx_icon_harmony_2} + {== {{$player get_user} get_track_icon} $dx_icon_harmony_3} + } + {set $dx_current_checked_instrument harm} + {set $dx_current_checked_instrument {$player instrument}} + } #ifdef RB3DX {if {== $dx_current_checked_instrument vocals} {if $dx_countdown_enabled @@ -82,8 +89,26 @@ } } } + {if {== $dx_current_checked_instrument harm} + {if $dx_countdown_enabled + {unless $delay_tracked_harm + {foreach $entry $harm_note_tracker + {if {== {elem $entry 0} {sprint "delay_" $current_tracked_beat_harm}} + {set $tracked_beat_no_notes_start_harm {elem $entry 1}} + {set $tracked_beat_no_notes_end_harm {elem $entry 2}} + {set $delay_tracked_harm TRUE} + } + } + } + {if $delay_tracked_harm + {if {>= {dx_get_current_beat} $tracked_beat_no_notes_start_harm} + {dx_check_beat {- $tracked_beat_no_notes_end_harm {dx_get_current_beat}}} + } + } + } + } #endif - {if {&& $dx_countdown_enabled {! {== $dx_current_checked_instrument vocals}}} + {if {&& $dx_countdown_enabled {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}}} {switch $dx_current_checked_slot (0 {set $dx_current_search_tracker {sprint "delay_" $current_tracked_beat_0}}) (1 {set $dx_current_search_tracker {sprint "delay_" $current_tracked_beat_1}}) @@ -170,7 +195,7 @@ } {switch $dx_current_checked_instrument ((guitar real_guitar) - {if {>= {dx_get_current_beat} $tracked_beat_no_notes_start_guitar} + {if {&& {<= {dx_get_current_beat} $dx_final_note} {>= {dx_get_current_beat} $tracked_beat_no_notes_start_guitar}} {unless $dx_log_stopper {set $dx_log_stopper TRUE} {dx_log_writer countdown {sprint "Current Beat: " {dx_get_current_beat} " matches " $dx_current_checked_instrument " break start: " $tracked_beat_no_notes_start_guitar ", counting down to end of " $dx_current_checked_instrument " break at: " $tracked_beat_no_notes_end_guitar}} @@ -179,7 +204,7 @@ } ) ((bass real_bass) - {if {>= {dx_get_current_beat} $tracked_beat_no_notes_start_bass} + {if {&& {<= {dx_get_current_beat} $dx_final_note} {>= {dx_get_current_beat} $tracked_beat_no_notes_start_bass}} {unless $dx_log_stopper {set $dx_log_stopper TRUE} {dx_log_writer countdown {sprint "Current Beat: " {dx_get_current_beat} " matches " $dx_current_checked_instrument " break start: " $tracked_beat_no_notes_start_bass ", counting down to end of " $dx_current_checked_instrument " break at: " $tracked_beat_no_notes_end_bass}} @@ -188,7 +213,7 @@ } ) ((keys real_keys) - {if {>= {dx_get_current_beat} $tracked_beat_no_notes_start_keys} + {if {&& {<= {dx_get_current_beat} $dx_final_note} {>= {dx_get_current_beat} $tracked_beat_no_notes_start_keys}} {unless $dx_log_stopper {set $dx_log_stopper TRUE} {dx_log_writer countdown {sprint "Current Beat: " {dx_get_current_beat} " matches " $dx_current_checked_instrument " break start: " $tracked_beat_no_notes_start_keys ", counting down to end of " $dx_current_checked_instrument " break at: " $tracked_beat_no_notes_end_keys}} @@ -197,7 +222,7 @@ } ) ((drum real_drum) - {if {>= {dx_get_current_beat} $tracked_beat_no_notes_start_drum} + {if {&& {<= {dx_get_current_beat} $dx_final_note} {>= {dx_get_current_beat} $tracked_beat_no_notes_start_drum}} {unless $dx_log_stopper {set $dx_log_stopper TRUE} {dx_log_writer countdown {sprint "Current Beat: " {dx_get_current_beat} " matches " $dx_current_checked_instrument " break start: " $tracked_beat_no_notes_start_drum ", counting down to end of " $dx_current_checked_instrument " break at: " $tracked_beat_no_notes_end_drum}} diff --git a/_ark/dx/countdown/dx_countdown_funcs.dta b/_ark/dx/countdown/dx_countdown_funcs.dta index 793cf6739f..1bf849a4ff 100644 --- a/_ark/dx/countdown/dx_countdown_funcs.dta +++ b/_ark/dx/countdown/dx_countdown_funcs.dta @@ -20,6 +20,8 @@ ({int {/ {- $tracked_beat_no_notes_end_drum {dx_get_current_beat}} 4}}) #define SOLO_PERCENT_VOX_INT ({int {/ {- $tracked_beat_no_notes_end_vocals {dx_get_current_beat}} 4}}) +#define SOLO_PERCENT_HARM_INT +({int {/ {- $tracked_beat_no_notes_end_harm {dx_get_current_beat}} 4}}) #define SOLO_PERCENT_KEYS_INT ({int {/ {- $tracked_beat_no_notes_end_keys {dx_get_current_beat}} 4}}) #ifdef RB3DX @@ -43,14 +45,15 @@ ;{sprintf "Executed dx_countdown_var_reset - time: %.4fms" {time {set $current_beat FALSE} {set $startingbpm FALSE} - {set $dx_bpm_counter_for_countdown FALSE} {set $solo_box_up_0 FALSE} {set $solo_box_up_1 FALSE} {set $solo_box_up_2 FALSE} {set $solo_box_up_3 FALSE} {set $solo_box_up_vocals FALSE} - {set $delay_tracked_0 FALSE} {set $delay_tracked_1 FALSE} {set $delay_tracked_2 FALSE} {set $delay_tracked_3 FALSE} {set $delay_tracked_vocals FALSE} - {set $current_tracked_beat_0 FALSE} {set $current_tracked_beat_1 FALSE} {set $current_tracked_beat_2 FALSE} {set $current_tracked_beat_3 FALSE} {set $current_tracked_beat_vocals FALSE} + {set $dx_bpm_counter_for_countdown FALSE} {set $solo_box_up_0 FALSE} {set $solo_box_up_1 FALSE} {set $solo_box_up_2 FALSE} {set $solo_box_up_3 FALSE} {set $solo_box_up_vocals FALSE} {set $solo_box_up_harm FALSE} + {set $delay_tracked_0 FALSE} {set $delay_tracked_1 FALSE} {set $delay_tracked_2 FALSE} {set $delay_tracked_3 FALSE} {set $delay_tracked_vocals FALSE} {set $delay_tracked_harm FALSE} + {set $current_tracked_beat_0 FALSE} {set $current_tracked_beat_1 FALSE} {set $current_tracked_beat_2 FALSE} {set $current_tracked_beat_3 FALSE} {set $current_tracked_beat_vocals FALSE} {set $current_tracked_beat_harm FALSE} {set $tracked_beat_no_notes_start_guitar FALSE} {set $tracked_beat_no_notes_end_guitar FALSE} {set $first_guitar_gem_tracked FALSE} {set $tracked_beat_no_notes_start_bass FALSE} {set $tracked_beat_no_notes_end_bass FALSE} {set $first_bass_gem_tracked FALSE} {set $tracked_beat_no_notes_start_drum FALSE} {set $tracked_beat_no_notes_end_drum FALSE} {set $first_drum_gem_tracked FALSE} {set $tracked_beat_no_notes_start_keys FALSE} {set $tracked_beat_no_notes_end_keys FALSE} {set $first_keys_gem_tracked FALSE} {set $tracked_beat_no_notes_start_vocals FALSE} {set $tracked_beat_no_notes_end_vocals FALSE} {set $first_vocals_gem_tracked FALSE} + {set $tracked_beat_no_notes_start_harm FALSE} {set $tracked_beat_no_notes_end_harm FALSE} {set $first_harm_gem_tracked FALSE} } ;} ;} @@ -75,6 +78,9 @@ {resize $vocals_note_tracker 0} ;resize the array {push_back $vocals_note_tracker (none none)} ;push_back a new state into the array + + {resize $harm_note_tracker 0} ;resize the array + {push_back $harm_note_tracker (none none)} ;push_back a new state into the array {set $dx_final_note 0} } ; } @@ -97,8 +103,14 @@ } {set $solo_box_up_vocals TRUE} } + {if {== $dx_current_checked_instrument harm} + {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE} + {{PLAYER_FEEDBACK_VOX find solo_start.trig} trigger} + } + {set $solo_box_up_harm TRUE} + } #endif - {if {!= $dx_current_checked_instrument vocals} + {if {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}} {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE} {{PLAYER_FEEDBACK_00 find solo_start.trig} trigger} } @@ -136,8 +148,15 @@ {set $delay_tracked_vocals FALSE} {set $current_tracked_beat_vocals {+ $current_tracked_beat_vocals 1}} } + {if {== $dx_current_checked_instrument harm} + {PLAYER_FEEDBACK_VOX set_showing TRUE} + {{PLAYER_FEEDBACK_VOX find points.lbl} #ifdef RB3DX set_token_fmt dx_points #else set_localized dx_points #endif} + {set $solo_box_up_harm FALSE} + {set $delay_tracked_harm FALSE} + {set $current_tracked_beat_harm {+ $current_tracked_beat_harm 1}} + } #endif - {if {!= $dx_current_checked_instrument vocals} + {if {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}} {{PLAYER_FEEDBACK_00 find points.lbl} #ifdef RB3DX set_token_fmt dx_points #else set_localized dx_points #endif} {switch $dx_current_checked_slot (0 @@ -174,12 +193,12 @@ ; {sprintf "Executed dx_clean_solo_box - time: %.4fms" ; {time #ifdef RB3DX - {if {== $dx_current_checked_instrument vocals} + {if {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}} {PLAYER_FEEDBACK_VOX set_showing TRUE} {{PLAYER_FEEDBACK_VOX find points.lbl} #ifdef RB3DX set_token_fmt dx_points #else set_localized dx_points #endif} } #endif - {if {!= $dx_current_checked_instrument vocals} + {if {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}} {PLAYER_FEEDBACK_00 set_showing TRUE} {{PLAYER_FEEDBACK_00 find points.lbl} #ifdef RB3DX set_token_fmt dx_points #else set_localized dx_points #endif} } @@ -194,7 +213,7 @@ ; {sprintf "Executed dx_hide_solo_box - time: %.4fms" ; {time #ifdef RB3DX - {if {== $dx_current_checked_instrument vocals} + {if {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}} {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE} {PLAYER_FEEDBACK_VOX set_showing TRUE} {PLAYER_FEEDBACK_VOX end_solo} @@ -206,7 +225,7 @@ } } #endif - {if {!= $dx_current_checked_instrument vocals} + {if {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}} {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE} {PLAYER_FEEDBACK_00 set_showing TRUE} {PLAYER_FEEDBACK_00 end_solo} @@ -227,7 +246,7 @@ ;{dx_log_writer countdown ; {sprintf "Executed dx_final_percent_report - time: %.4fms" ; {time - {if {!= $dx_current_checked_instrument vocals} + {if {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}} {PLAYER_FEEDBACK_00 set_showing FALSE} {PLAYER_FEEDBACK_00 end_solo} {{PLAYER_FEEDBACK_00 find solo_end.trig} trigger} @@ -360,8 +379,13 @@ {{PLAYER_FEEDBACK_VOX find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_VOX_INT} #else set_text {sprintf "%d" SOLO_PERCENT_VOX_INT} #endif} } } + {if {== $dx_current_checked_instrument harm} + {if {== {PLAYER_FEEDBACK_VOX get in_solo} FALSE} + {{PLAYER_FEEDBACK_VOX find SOLO_PERCENT_LABEL} #ifdef RB3DX set_token_fmt solo_countdown {localize_separated_int SOLO_PERCENT_HARM_INT} #else set_text {sprintf "%d" SOLO_PERCENT_HARM_INT} #endif} + } + } #endif - {if {!= $dx_current_checked_instrument vocals} + {if {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}} {if {== {PLAYER_FEEDBACK_00 get in_solo} FALSE} {switch $dx_current_checked_instrument ((guitar real_guitar) @@ -394,7 +418,7 @@ {script_task kTaskSeconds (delay 0.75) (script - {unless {== $dx_current_checked_instrument vocals} + {unless {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}} ; bring track out when countdown begins ; unless statements prevent track from repeatedly popping out if it's already invisible {switch $dx_current_checked_slot @@ -439,8 +463,6 @@ {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get star_power_meter} find power_meter.grp} set showing FALSE} {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get streak_meter} find draw.grp} set showing FALSE} {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get streak_meter} find streak_meter.grp} set showing FALSE} - {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get streak_meter} find peak_state_sm_mesh.mesh} set showing FALSE} - {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get streak_meter} find peak_state_sm_mesh_counter.mesh} set showing FALSE} {{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} find overdrive_plane.mesh} set showing FALSE} {{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} find rig.grp} set_local_pos 99 99 99} ) @@ -457,7 +479,7 @@ {&& {== $dx_hide_on_countdown single} {== $dx_num_gem_tracks 1}} {&& {== $dx_hide_on_countdown multi} {>= $dx_num_gem_tracks 1}} } - {unless {== $dx_current_checked_instrument vocals} + {unless {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}} {switch $dx_current_checked_slot (0 {set $track_out_0 FALSE}) (1 {set $track_out_1 FALSE}) @@ -481,8 +503,6 @@ {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get star_power_meter} find power_meter.grp} set showing TRUE} {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get streak_meter} find draw.grp} set showing TRUE} {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get streak_meter} find streak_meter.grp} set showing TRUE} - {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get streak_meter} find peak_state_sm_mesh.mesh} set showing TRUE} - {{{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} get streak_meter} find peak_state_sm_mesh_counter.mesh} set showing TRUE} {{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} find overdrive_plane.mesh} set showing TRUE} {{{{get_track_panel} find {sprint "track_" $dx_current_checked_slot}} find rig.grp} set_local_pos 0 0 0} ) @@ -505,8 +525,11 @@ {if {== $dx_current_checked_instrument vocals} {if $solo_box_up_vocals {dx_restore_solo_box}} } + {if {== $dx_current_checked_instrument harm} + {if $solo_box_up_harm {dx_restore_solo_box}} + } #endif - {if {!= $dx_current_checked_instrument vocals} + {if {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}} {switch $dx_current_checked_slot (0 {if $solo_box_up_0 {dx_restore_solo_box}} @@ -532,8 +555,11 @@ {if {== $dx_current_checked_instrument vocals} {if $solo_box_up_vocals {dx_hide_solo_box}} } + {if {== $dx_current_checked_instrument harm} + {if $solo_box_up_harm {dx_hide_solo_box}} + } #endif - {if {!= $dx_current_checked_instrument vocals} + {if {! {|| {== $dx_current_checked_instrument vocals} {== $dx_current_checked_instrument harm}}} {switch $dx_current_checked_slot (0 {if $solo_box_up_0 {dx_hide_solo_box} {dx_restore_everything}} diff --git a/_ark/dx/countdown/dx_countdown_midi_parsers.dta b/_ark/dx/countdown/dx_countdown_midi_parsers.dta index 837ce4f16b..5eefda0aeb 100644 --- a/_ark/dx/countdown/dx_countdown_midi_parsers.dta +++ b/_ark/dx/countdown/dx_countdown_midi_parsers.dta @@ -10,13 +10,14 @@ (mp.up FALSE) (idle) (allowed_notes - (96 97 98 99 100)) + (96 97 98 99 100 103 120) + ) (midi {unless $first_guitar_gem_tracked {set $first_guitar_gem_tracked TRUE} {set $tracked_break_num_guitar 0} {set $first_guitar_gem_beat {int $mp.start}} - {if {> $first_guitar_gem_beat 10} + {if {> $first_guitar_gem_beat 16} {push_back $guitar_note_tracker ("delay_0" 0 $first_guitar_gem_beat)} {set $guitar_note_tracker {array $guitar_note_tracker}} {set $tracked_break_num_guitar 1} @@ -46,13 +47,14 @@ (mp.up FALSE) (idle) (allowed_notes - (96 97 98 99 100)) + (24 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 96 97 98 99 100 103) + ) (midi {unless $first_drum_gem_tracked {set $first_drum_gem_tracked TRUE} {set $tracked_break_num_drum 0} {set $first_drum_gem_beat {int $mp.start}} - {if {> $first_drum_gem_beat 10} + {if {> $first_drum_gem_beat 16} {push_back $drum_note_tracker ("delay_0" 0 $first_drum_gem_beat)} {set $drum_note_tracker {array $drum_note_tracker}} {set $tracked_break_num_drum 1} @@ -82,13 +84,14 @@ (mp.up FALSE) (idle) (allowed_notes - (96 97 98 99 100)) + (96 97 98 99 100 103 120) + ) (midi {unless $first_bass_gem_tracked {set $first_bass_gem_tracked TRUE} {set $tracked_break_num_bass 0} {set $first_bass_gem_beat {int $mp.start}} - {if {> $first_bass_gem_beat 10} + {if {> $first_bass_gem_beat 16} {push_back $bass_note_tracker ("delay_0" 0 $first_bass_gem_beat)} {set $bass_note_tracker {array $bass_note_tracker}} {set $tracked_break_num_bass 1} @@ -118,14 +121,15 @@ (mp.up FALSE) (idle) (allowed_notes - (96 97 98 99 100)) + (96 97 98 99 100 103 120) + ) (midi {$this rt_compute_space} {unless $first_keys_gem_tracked {set $first_keys_gem_tracked TRUE} {set $tracked_break_num_keys 0} {set $first_keys_gem_beat {int $mp.start}} - {if {> $first_keys_gem_beat 10} + {if {> $first_keys_gem_beat 16} {push_back $keys_note_tracker ("delay_0" 0 $first_keys_gem_beat)} {set $keys_note_tracker {array $keys_note_tracker}} {set $tracked_break_num_keys 1} @@ -156,10 +160,7 @@ (mp.up FALSE) (idle) (allowed_notes - {if_else {== $dx_vocal_type solo} - (36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 96) - (36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84) - } + (105 106) ) (midi {$this rt_compute_space} @@ -167,7 +168,7 @@ {set $first_vocals_gem_tracked TRUE} {set $tracked_break_num_vocals 0} {set $first_vocals_gem_beat {int $mp.start}} - {if {> $first_vocals_gem_beat 10} + {if {> $first_vocals_gem_beat 16} {push_back $vocals_note_tracker ("delay_0" 0 $first_vocals_gem_beat)} {set $vocals_note_tracker {array $vocals_note_tracker}} {set $tracked_break_num_vocals 1} @@ -185,4 +186,42 @@ {if {> $dx_final_note_vocals $dx_final_note} {set $dx_final_note $dx_final_note_vocals}} ) } +{new + MidiParser + harm_timer + (track_name 'HARM1') + (inverted FALSE) + (up FALSE) + (append_length TRUE) + (compress TRUE) + ;(message_type midi_parser) + (mp.up FALSE) + (idle) + (allowed_notes + (105 106) + ) + (midi + {$this rt_compute_space} + {unless $first_harm_gem_tracked + {set $first_harm_gem_tracked TRUE} + {set $tracked_break_num_harm 0} + {set $first_harm_gem_beat {int $mp.start}} + {if {> $first_harm_gem_beat 16} + {push_back $harm_note_tracker ("delay_0" 0 $first_harm_gem_beat)} + {set $harm_note_tracker {array $harm_note_tracker}} + {set $tracked_break_num_harm 1} + } + } + {if {&& {>= $mp.prev_end 16} {< $mp.prev_end 10000}} + {set $harm_tracked_start {int $mp.start}} + {set $harm_tracked_prev_end {int {- $harm_tracked_start $mp.prev_end}}} + {push_back $harm_note_tracker ({sprint "delay_" $tracked_break_num_harm} $harm_tracked_prev_end $harm_tracked_start)} + {set $harm_note_tracker {array $harm_note_tracker}} + {set $tracked_break_num_harm {+ $tracked_break_num_harm 1}} + {dx_log_writer countdown {sprint "Harmonies Tracker array: " $harm_note_tracker}} + } + {set $dx_final_note_harm {int $mp.end}} + {if {> $dx_final_note_harm $dx_final_note} {set $dx_final_note $dx_final_note_harm}} + ) +} #endif \ No newline at end of file diff --git a/_ark/dx/countdown/dx_countdown_ui_init.dta b/_ark/dx/countdown/dx_countdown_ui_init.dta index 78cf825ad3..820ea1564e 100644 --- a/_ark/dx/countdown/dx_countdown_ui_init.dta +++ b/_ark/dx/countdown/dx_countdown_ui_init.dta @@ -24,4 +24,8 @@ {set $vocals_note_tracker {array ()}} {resize $vocals_note_tracker 0} {push_back $vocals_note_tracker (none none)} + + {set $harm_note_tracker {array ()}} + {resize $harm_note_tracker 0} + {push_back $harm_note_tracker (none none)} } \ No newline at end of file diff --git a/_ark/dx/custom_textures/_additional_textures/logo-aprilfools-rb3e.png b/_ark/dx/custom_textures/_additional_textures/logo-aprilfools-rb3e.png new file mode 100644 index 0000000000..b4cf4113f7 Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-aprilfools-rb3e.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/logo-aprilfools.png b/_ark/dx/custom_textures/_additional_textures/logo-aprilfools.png new file mode 100644 index 0000000000..e708ca2b44 Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-aprilfools.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/logo-christmas-rb3e.png b/_ark/dx/custom_textures/_additional_textures/logo-christmas-rb3e.png new file mode 100644 index 0000000000..84595098f5 Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-christmas-rb3e.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/logo-christmas.png b/_ark/dx/custom_textures/_additional_textures/logo-christmas.png new file mode 100644 index 0000000000..ad7ab501f6 Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-christmas.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/logo-halloween-rb3e.png b/_ark/dx/custom_textures/_additional_textures/logo-halloween-rb3e.png new file mode 100644 index 0000000000..c93b2594ac Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-halloween-rb3e.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/logo-halloween.png b/_ark/dx/custom_textures/_additional_textures/logo-halloween.png new file mode 100644 index 0000000000..32341b3bcd Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-halloween.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/logo-pride-rb3e.png b/_ark/dx/custom_textures/_additional_textures/logo-pride-rb3e.png new file mode 100644 index 0000000000..4294f09522 Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-pride-rb3e.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/logo-pride.png b/_ark/dx/custom_textures/_additional_textures/logo-pride.png new file mode 100644 index 0000000000..821bc51a2d Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-pride.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/rb3dx-rb3e_logo.png b/_ark/dx/custom_textures/_additional_textures/logo-standard-rb3e.png similarity index 100% rename from _ark/dx/custom_textures/_additional_textures/rb3dx-rb3e_logo.png rename to _ark/dx/custom_textures/_additional_textures/logo-standard-rb3e.png diff --git a/_ark/dx/custom_textures/_additional_textures/rb3dx_logo.png b/_ark/dx/custom_textures/_additional_textures/logo-standard.png similarity index 100% rename from _ark/dx/custom_textures/_additional_textures/rb3dx_logo.png rename to _ark/dx/custom_textures/_additional_textures/logo-standard.png diff --git a/_ark/dx/custom_textures/_additional_textures/logo-valentines-rb3e.png b/_ark/dx/custom_textures/_additional_textures/logo-valentines-rb3e.png new file mode 100644 index 0000000000..da13624a92 Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-valentines-rb3e.png differ diff --git a/_ark/dx/custom_textures/_additional_textures/logo-valentines.png b/_ark/dx/custom_textures/_additional_textures/logo-valentines.png new file mode 100644 index 0000000000..38d382050b Binary files /dev/null and b/_ark/dx/custom_textures/_additional_textures/logo-valentines.png differ diff --git a/_ark/dx/custom_textures/font/comic sans.png b/_ark/dx/custom_textures/font/comic sans.png index 7555a7395d..ce130c7207 100644 Binary files a/_ark/dx/custom_textures/font/comic sans.png and b/_ark/dx/custom_textures/font/comic sans.png differ diff --git a/_ark/dx/custom_textures/gems/gems_default/rock band 3 (bi).png b/_ark/dx/custom_textures/gems/gems_default/rock band 3 (bi).png new file mode 100644 index 0000000000..5f59bfe149 Binary files /dev/null and b/_ark/dx/custom_textures/gems/gems_default/rock band 3 (bi).png differ diff --git a/_ark/dx/custom_textures/gems/gems_default/rock band 3 (enby).png b/_ark/dx/custom_textures/gems/gems_default/rock band 3 (enby).png new file mode 100644 index 0000000000..359a5fdba9 Binary files /dev/null and b/_ark/dx/custom_textures/gems/gems_default/rock band 3 (enby).png differ diff --git a/_ark/dx/custom_textures/gems/gems_default/rock band 3 (trans).png b/_ark/dx/custom_textures/gems/gems_default/rock band 3 (trans).png new file mode 100644 index 0000000000..f277f15598 Binary files /dev/null and b/_ark/dx/custom_textures/gems/gems_default/rock band 3 (trans).png differ diff --git a/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (bi).png b/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (bi).png new file mode 100644 index 0000000000..d65f5631ce Binary files /dev/null and b/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (bi).png differ diff --git a/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (enby).png b/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (enby).png new file mode 100644 index 0000000000..5ae651dde0 Binary files /dev/null and b/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (enby).png differ diff --git a/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (trans).png b/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (trans).png new file mode 100644 index 0000000000..580d858953 Binary files /dev/null and b/_ark/dx/custom_textures/gems/gems_emissive/rock band 3 (trans).png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/0/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/0/rock band 3.png index 6117cf7f8d..34637be1a2 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/0/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/0/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/1/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/1/rock band 3.png index 4e8a7dc7ab..ae0f1382e6 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/1/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/1/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/10/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/10/rock band 3.png index 3244716237..bee5f808a8 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/10/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/10/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/2/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/2/rock band 3.png index 65cb31922f..5c438780d4 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/2/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/2/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/3/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/3/rock band 3.png index b7faf3c874..dd84c7a98f 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/3/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/3/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/4/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/4/rock band 3.png index 5dc24a5273..b1a2358fc6 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/4/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/4/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/5/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/5/rock band 3.png index 7d60bf212a..084d933f65 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/5/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/5/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/6/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/6/rock band 3.png index 78bb05e7cb..49e9f2ef0f 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/6/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/6/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/7/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/7/rock band 3.png index 4a116f8140..cbcefaadfc 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/7/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/7/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/8/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/8/rock band 3.png index 9248feb19e..6967d7d2ec 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/8/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/8/rock band 3.png differ diff --git a/_ark/dx/custom_textures/gold_star_transitions/9/rock band 3.png b/_ark/dx/custom_textures/gold_star_transitions/9/rock band 3.png index d9cea2d798..607dd41ab9 100644 Binary files a/_ark/dx/custom_textures/gold_star_transitions/9/rock band 3.png and b/_ark/dx/custom_textures/gold_star_transitions/9/rock band 3.png differ diff --git a/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_bg/yarg.png b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_bg/yarg.png new file mode 100644 index 0000000000..8d2ba80e8c Binary files /dev/null and b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_bg/yarg.png differ diff --git a/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_bg_vox/yarg.png b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_bg_vox/yarg.png new file mode 100644 index 0000000000..92087be0d8 Binary files /dev/null and b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_bg_vox/yarg.png differ diff --git a/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_glow/yarg.png b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_glow/yarg.png new file mode 100644 index 0000000000..a4ebf134c0 Binary files /dev/null and b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_glow/yarg.png differ diff --git a/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_lens/yarg.png b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_lens/yarg.png new file mode 100644 index 0000000000..8674c0d034 Binary files /dev/null and b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_lens/yarg.png differ diff --git a/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_lens_vox/yarg.png b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_lens_vox/yarg.png new file mode 100644 index 0000000000..c2ab2afcb6 Binary files /dev/null and b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_lens_vox/yarg.png differ diff --git a/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_meter/yarg.png b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_meter/yarg.png new file mode 100644 index 0000000000..1b3ed4962e Binary files /dev/null and b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_meter/yarg.png differ diff --git a/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_plate/yarg.png b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_plate/yarg.png new file mode 100644 index 0000000000..0d9988cfa2 Binary files /dev/null and b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_plate/yarg.png differ diff --git a/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_plate_fc/yarg.png b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_plate_fc/yarg.png new file mode 100644 index 0000000000..53cfd0f3ec Binary files /dev/null and b/_ark/dx/custom_textures/multiplier_ring/multiplier_ring_plate_fc/yarg.png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_blue/rock band 3 (bi).png b/_ark/dx/custom_textures/strikeline/strikeline_blue/rock band 3 (bi).png new file mode 100644 index 0000000000..bab197f375 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_blue/rock band 3 (bi).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_blue/rock band 3 (trans).png b/_ark/dx/custom_textures/strikeline/strikeline_blue/rock band 3 (trans).png new file mode 100644 index 0000000000..938a3e570f Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_blue/rock band 3 (trans).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_drums/lego rock band.png b/_ark/dx/custom_textures/strikeline/strikeline_drums/lego rock band.png index 593c2459f1..50c003d2eb 100644 Binary files a/_ark/dx/custom_textures/strikeline/strikeline_drums/lego rock band.png and b/_ark/dx/custom_textures/strikeline/strikeline_drums/lego rock band.png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_drums/rock band 1.png b/_ark/dx/custom_textures/strikeline/strikeline_drums/rock band 1.png index cceb7dd6b7..0aba61becc 100644 Binary files a/_ark/dx/custom_textures/strikeline/strikeline_drums/rock band 1.png and b/_ark/dx/custom_textures/strikeline/strikeline_drums/rock band 1.png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 1.png b/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 1.png index bb55be05bc..09788958bb 100644 Binary files a/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 1.png and b/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 1.png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 3 (bi).png b/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 3 (bi).png new file mode 100644 index 0000000000..adad2912d4 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 3 (bi).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 3 (trans).png b/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 3 (trans).png new file mode 100644 index 0000000000..2e8ffc3ede Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_green/rock band 3 (trans).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 1.png b/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 1.png index 28f4750f17..112ae42e90 100644 Binary files a/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 1.png and b/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 1.png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (bi).png b/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (bi).png new file mode 100644 index 0000000000..2b28d38400 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (bi).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (enby).png b/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (enby).png new file mode 100644 index 0000000000..0337b98881 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (enby).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (trans).png b/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (trans).png new file mode 100644 index 0000000000..f21b5b03cd Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_guitar/rock band 3 (trans).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_orange/rock band 3 (bi).png b/_ark/dx/custom_textures/strikeline/strikeline_orange/rock band 3 (bi).png new file mode 100644 index 0000000000..bab197f375 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_orange/rock band 3 (bi).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_orange/rock band 3 (trans).png b/_ark/dx/custom_textures/strikeline/strikeline_orange/rock band 3 (trans).png new file mode 100644 index 0000000000..72e5557f54 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_orange/rock band 3 (trans).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_red/rock band 3 (bi).png b/_ark/dx/custom_textures/strikeline/strikeline_red/rock band 3 (bi).png new file mode 100644 index 0000000000..adad2912d4 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_red/rock band 3 (bi).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_red/rock band 3 (trans).png b/_ark/dx/custom_textures/strikeline/strikeline_red/rock band 3 (trans).png new file mode 100644 index 0000000000..0d2be7f079 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_red/rock band 3 (trans).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_yellow/rock band 3 (bi).png b/_ark/dx/custom_textures/strikeline/strikeline_yellow/rock band 3 (bi).png new file mode 100644 index 0000000000..c506fe92b7 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_yellow/rock band 3 (bi).png differ diff --git a/_ark/dx/custom_textures/strikeline/strikeline_yellow/rock band 3 (trans).png b/_ark/dx/custom_textures/strikeline/strikeline_yellow/rock band 3 (trans).png new file mode 100644 index 0000000000..7141401002 Binary files /dev/null and b/_ark/dx/custom_textures/strikeline/strikeline_yellow/rock band 3 (trans).png differ diff --git a/_ark/dx/custom_textures/sustains/[no sustains].png b/_ark/dx/custom_textures/sustains/[no sustains].png new file mode 100644 index 0000000000..d9670f9428 Binary files /dev/null and b/_ark/dx/custom_textures/sustains/[no sustains].png differ diff --git a/_ark/dx/custom_textures/sustains/festival (beta).png b/_ark/dx/custom_textures/sustains/festival (beta).png new file mode 100644 index 0000000000..1e15683036 Binary files /dev/null and b/_ark/dx/custom_textures/sustains/festival (beta).png differ diff --git a/_ark/dx/custom_textures/sustains/festival (pad).png b/_ark/dx/custom_textures/sustains/festival (pad).png new file mode 100644 index 0000000000..f230b3ff2c Binary files /dev/null and b/_ark/dx/custom_textures/sustains/festival (pad).png differ diff --git a/_ark/dx/custom_textures/sustains/festival (pro).png b/_ark/dx/custom_textures/sustains/festival (pro).png new file mode 100644 index 0000000000..0afc2308d2 Binary files /dev/null and b/_ark/dx/custom_textures/sustains/festival (pro).png differ diff --git a/_ark/dx/custom_textures/sustains/rb2 (bi).png b/_ark/dx/custom_textures/sustains/rb2 (bi).png new file mode 100644 index 0000000000..672ad3c2ea Binary files /dev/null and b/_ark/dx/custom_textures/sustains/rb2 (bi).png differ diff --git a/_ark/dx/custom_textures/sustains/rb2 (enby).png b/_ark/dx/custom_textures/sustains/rb2 (enby).png new file mode 100644 index 0000000000..7b805df50a Binary files /dev/null and b/_ark/dx/custom_textures/sustains/rb2 (enby).png differ diff --git a/_ark/dx/custom_textures/sustains/rb2 (trans).png b/_ark/dx/custom_textures/sustains/rb2 (trans).png new file mode 100644 index 0000000000..1e9d710ec5 Binary files /dev/null and b/_ark/dx/custom_textures/sustains/rb2 (trans).png differ diff --git a/_ark/dx/game/dx_game_funcs.dta b/_ark/dx/game/dx_game_funcs.dta index b08e9c1404..84357a8d9e 100644 --- a/_ark/dx/game/dx_game_funcs.dta +++ b/_ark/dx/game/dx_game_funcs.dta @@ -226,6 +226,7 @@ { {beatmatch active_player $i} set_crowd_rating_active {|| + {modifier_mgr is_modifier_active mod_brutalmode} ; force on crowd meter if on brutal mode {== $dx_crowd_meter_state dx_on} {== $dx_crowd_meter_state dx_off} } diff --git a/_ark/dx/game/dx_game_handles.dta b/_ark/dx/game/dx_game_handles.dta index 88a7a11aff..fdb80adb0d 100644 --- a/_ark/dx/game/dx_game_handles.dta +++ b/_ark/dx/game/dx_game_handles.dta @@ -37,8 +37,10 @@ {set $dx_already_restarted FALSE} ; dx - track resets for no BRE modifier {set $dx_mtvup FALSE} ;we have to make sure and turn off mtv overlay when it is unloaded or it can crash in places where we call it (overshell) {dx_send_leader_song_speed} + #ifndef HX_WII DX_CURRENT_SONG_CLEAR DX_JSON_CLEAR + #endif {set $dx_current_free_cam "Free camera: off"} } } diff --git a/_ark/dx/locale/dx_locale_updates.dta b/_ark/dx/locale/dx_locale_updates.dta index 92089cdcfe..eab0e0afbf 100644 --- a/_ark/dx/locale/dx_locale_updates.dta +++ b/_ark/dx/locale/dx_locale_updates.dta @@ -292,12 +292,13 @@ (os_high_score_off "Report Solo Highscore: OFF") (os_high_score_on_desc "Notify when you beat your saved score in single player") (os_high_score_off_desc "Notify when you beat your saved score in single player") - +(high_song_count_warn "High song counts, especially with multiple players, have been known to cause instability issues after prolonged play-time. It is recommended to:\nStick to music video venues\nTurn off song transition cutscenes\nAvoid very long, 10 min+ songs\nOr lower your song count\nYou have been warned.\n\nTo disable this warning go to Deluxe Settings > Advanced > Functional Options > High Song Count Warning") ;venue options (os_menu_backgrounds "Menu Backgrounds...") (os_menu_backgrounds_desc "Change the visual backgrounds for the menus") (os_venue "Select Venue...") (os_venue_desc "Choose where to rock or focus up with no venue") +(os_venue_desc_report "Current Selected Venue:\n%s") (os_venue_intro_on "Venue Intro: ON") (os_venue_intro_on_desc "Plays the establishing shot before the song starts") (os_venue_intro_off "Venue Intro: OFF") @@ -328,6 +329,7 @@ ;track theme (leave_customizer "[Leave Customizer]") (realtime_customize "[Enter Customizer]") +(restart_customizer "[Restart Song]") ;graphics (os_venuefps_60 "Venue FPS: 60") (os_venuefps_60_desc "Increases the venue FPS to 60 (not recommended on console)") @@ -380,6 +382,10 @@ (os_audio_ambience_on_desc "Toggles background ambience in the music library") (os_audio_ambience_off "Menu Ambience: OFF") (os_audio_ambience_off_desc "Toggles background ambience in the music library") +(os_scroll_sound_on "Scrolling Feedback: ON") +(os_scroll_sound_on_desc "Toggles sound effect when scrolling on UI Lists") +(os_scroll_sound_off "Scrolling Feedback: OFF") +(os_scroll_sound_off_desc "Toggles background ambience in the music library") (os_whammy_fx_on "Whammy SFX: ON") (os_whammy_fx_on_desc "Toggles the pitch bending effect when using the whammy bar on guitar and bass") (os_whammy_fx_off "Whammy SFX: OFF") @@ -427,7 +433,11 @@ (os_vis_off "Crowd Meter: HIDDEN") (os_vis_off_desc "Hide the crowd meter") (os_vis_disabled "Crowd Meter: DISABLED") -(os_vis_disabled_desc "Hide and disable the crowd meter, turns off the low health warning but breaks things like crowd sing-alongs") +(os_vis_disabled_desc "Hide and disable the crowd meter, enabling crowd sing-alongs on at all times") +(os_fail_flash_on "Fail Flash: On") +(os_fail_flash_on_desc "Track will repeatedly flash red when performing poorly") +(os_fail_flash_off "Fail Flash: Off") +(os_fail_flash_off_desc "Track will not flash red when performing poorly") (os_score "Score & Stars...") (os_solo_box_pos "Solo Box...") (os_solo_box_pos_desc "Placement of the Solo Box") @@ -4564,7 +4574,10 @@ (os_reboot_desc "Completely reboot Rock Band 3 Deluxe.") (reboot_warning "Are you sure you want to reboot the game?") #endif - +(overshell_reboot "Reboot Game") +(reboot_theme_warning_rb3e "Default theme wont load properly until game reboot if you have already played a song.\nReboot now?") +(reboot_theme_warning "Default theme wont load properly until game reboot if you have already played a song.\n Reboot Suggested") +(refresh_library "Refresh Library") (os_button_remapper "Pad Button Remap") (os_button_remapper_desc "Remap in game buttons for pad play") (mapped_button_0 "L2/LT") @@ -4583,12 +4596,15 @@ (mapped_button_13 "Dpad Right") (mapped_button_14 "Dpad Down") (mapped_button_15 "Dpad Left") +(localize_it "Hello! ¡Hola! Bonjour! Hallo! Ciao!\nDo you speak another language?\nWant to help translate Deluxe text to your native language?\nJoin the MiloHax discord to help join the fight against English oppressors!\nRock Band 3 supported languages: Spanish, French, German, Italian.") (dx_play_a_show_welcome "Welcome to Play a Show!") (dx_play_a_show "Play a Show") (dx_play_a_show_info "Vote on which songs to play!\nVoting ends when all players have voted!") +(play_a_show_welcome_text + "Welcome to Play a Show!\nGrab your axe and give the crowd a great opener!") (dx_play_a_show_setlist_count "\nSetlist: %i Song") (dx_play_a_show_setlist_counts diff --git a/_ark/dx/opensource/3rs.png b/_ark/dx/opensource/3rs.png new file mode 100644 index 0000000000..fdd49ea8c2 Binary files /dev/null and b/_ark/dx/opensource/3rs.png differ diff --git a/_ark/dx/opensource/a7x.png b/_ark/dx/opensource/a7xmegapack.png similarity index 100% rename from _ark/dx/opensource/a7x.png rename to _ark/dx/opensource/a7xmegapack.png diff --git a/_ark/dx/opensource/c3legacy.png b/_ark/dx/opensource/c3legacy.png new file mode 100644 index 0000000000..3f0e1f5baa Binary files /dev/null and b/_ark/dx/opensource/c3legacy.png differ diff --git a/_ark/dx/opensource/ccc.png b/_ark/dx/opensource/ccc.png new file mode 100644 index 0000000000..3f0e1f5baa Binary files /dev/null and b/_ark/dx/opensource/ccc.png differ diff --git a/_ark/dx/opensource/clonehero.png b/_ark/dx/opensource/ch.png similarity index 100% rename from _ark/dx/opensource/clonehero.png rename to _ark/dx/opensource/ch.png diff --git a/_ark/dx/opensource/cth1.png b/_ark/dx/opensource/cth1.png new file mode 100644 index 0000000000..6b6e3dda6a Binary files /dev/null and b/_ark/dx/opensource/cth1.png differ diff --git a/_ark/dx/opensource/cth1r.png b/_ark/dx/opensource/cth1r.png new file mode 100644 index 0000000000..a23355de4e Binary files /dev/null and b/_ark/dx/opensource/cth1r.png differ diff --git a/_ark/dx/opensource/cth2.png b/_ark/dx/opensource/cth2.png new file mode 100644 index 0000000000..28ec92f4af Binary files /dev/null and b/_ark/dx/opensource/cth2.png differ diff --git a/_ark/dx/opensource/cth.png b/_ark/dx/opensource/cth3.png similarity index 100% rename from _ark/dx/opensource/cth.png rename to _ark/dx/opensource/cth3.png diff --git a/_ark/dx/opensource/gamechanger.png b/_ark/dx/opensource/gamechanger.png new file mode 100644 index 0000000000..684dcaf221 Binary files /dev/null and b/_ark/dx/opensource/gamechanger.png differ diff --git a/_ark/dx/opensource/linosrb.png b/_ark/dx/opensource/linosrb.png new file mode 100644 index 0000000000..fdd49ea8c2 Binary files /dev/null and b/_ark/dx/opensource/linosrb.png differ diff --git a/_ark/dx/opensource/onyxite.png b/_ark/dx/opensource/onyxite.png new file mode 100644 index 0000000000..ebdb4f827f Binary files /dev/null and b/_ark/dx/opensource/onyxite.png differ diff --git a/_ark/dx/opensource/paramore.png b/_ark/dx/opensource/paramoremegapack.png similarity index 100% rename from _ark/dx/opensource/paramore.png rename to _ark/dx/opensource/paramoremegapack.png diff --git a/_ark/dx/opensource/rbpj.png b/_ark/dx/opensource/pearljam.png similarity index 100% rename from _ark/dx/opensource/rbpj.png rename to _ark/dx/opensource/pearljam.png diff --git a/_ark/dx/opensource/rb4rivals.png b/_ark/dx/opensource/rb4_rivals.png similarity index 100% rename from _ark/dx/opensource/rb4rivals.png rename to _ark/dx/opensource/rb4_rivals.png diff --git a/_ark/dx/opensource/singstarguitar.png b/_ark/dx/opensource/ssg.png similarity index 100% rename from _ark/dx/opensource/singstarguitar.png rename to _ark/dx/opensource/ssg.png diff --git a/_ark/dx/opensource/tbrbcdlc.png b/_ark/dx/opensource/tbrbcdlc.png new file mode 100644 index 0000000000..dc2015c074 Binary files /dev/null and b/_ark/dx/opensource/tbrbcdlc.png differ diff --git a/_ark/dx/opensource/ugc.png b/_ark/dx/opensource/ugc.png index 8c20f79f01..a50965a176 100644 Binary files a/_ark/dx/opensource/ugc.png and b/_ark/dx/opensource/ugc.png differ diff --git a/_ark/dx/opensource/ugc_c3.png b/_ark/dx/opensource/ugc_c3.png new file mode 100644 index 0000000000..3f0e1f5baa Binary files /dev/null and b/_ark/dx/opensource/ugc_c3.png differ diff --git a/_ark/dx/opensource/ugc_lost.png b/_ark/dx/opensource/ugc_lost.png index 8c20f79f01..7063b3e99c 100644 Binary files a/_ark/dx/opensource/ugc_lost.png and b/_ark/dx/opensource/ugc_lost.png differ diff --git a/_ark/dx/opensource/rv.png b/_ark/dx/opensource/ugc_rv.png similarity index 100% rename from _ark/dx/opensource/rv.png rename to _ark/dx/opensource/ugc_rv.png diff --git a/_ark/dx/opensource/zgsb.png b/_ark/dx/opensource/zgsb.png new file mode 100644 index 0000000000..58aca83df3 Binary files /dev/null and b/_ark/dx/opensource/zgsb.png differ diff --git a/_ark/dx/overshell/dx_advanced_states.dta b/_ark/dx/overshell/dx_advanced_states.dta index 104ec4bf33..0ee0831b0c 100644 --- a/_ark/dx/overshell/dx_advanced_states.dta +++ b/_ark/dx/overshell/dx_advanced_states.dta @@ -231,11 +231,11 @@ ) #define DX_PRINT_MENU_COLOR_G ( - {if_else {&& $dx_list_item_selected {!= $dx_list_pos 1} {!= $dx_list_pos 0}} os_blnk {sprintf {localize os_menu_color_g} {int {+ 0.5 {* $dx_menu_color_g 100}}}}} + {if_else {&& $dx_list_item_selected {!= $dx_list_pos 2} {!= $dx_list_pos 0}} os_blnk {sprintf {localize os_menu_color_g} {int {+ 0.5 {* $dx_menu_color_g 100}}}}} ) #define DX_PRINT_MENU_COLOR_B ( - {if_else {&& $dx_list_item_selected {!= $dx_list_pos 1} {!= $dx_list_pos 0}} os_blnk {sprintf {localize os_menu_color_b} {int {+ 0.5 {* $dx_menu_color_b 100}}}}} + {if_else {&& $dx_list_item_selected {!= $dx_list_pos 3} {!= $dx_list_pos 0}} os_blnk {sprintf {localize os_menu_color_b} {int {+ 0.5 {* $dx_menu_color_b 100}}}}} ) #define DX_MENU_COLOR_DATA ( diff --git a/_ark/dx/overshell/dx_hud_states.dta b/_ark/dx/overshell/dx_hud_states.dta index d9b16a1db9..b205272a21 100644 --- a/_ark/dx/overshell/dx_hud_states.dta +++ b/_ark/dx/overshell/dx_hud_states.dta @@ -11,6 +11,7 @@ (dx_disabled os_vis_disabled) } } + {push_back $options {if_else $dx_fail_flash os_fail_flash_on os_fail_flash_off}} {push_back $options os_score} {push_back $options os_solo_box_pos} {push_back $options os_song_timer} @@ -99,6 +100,16 @@ {dx_state_pos_tracker} DX_INGAME_HUD_DATA ) + ((os_fail_flash_on os_fail_flash_off) + {set $dx_fail_flash {! $dx_fail_flash}} + {if_else $dx_fail_flash + {set $dx_tracked_changed os_fail_flash_on} + {set $dx_tracked_changed os_fail_flash_off} + } + {dx_state_pos_tracker} + DX_INGAME_HUD_DATA + {set $previous_state dxState_InGameHUD} + ) ((os_song_rings_on os_song_rings_off) {set $dx_song_select_rings {! $dx_song_select_rings}} {if_else $dx_song_select_rings diff --git a/_ark/dx/overshell/dx_main_states.dta b/_ark/dx/overshell/dx_main_states.dta index 429504abbd..f2dc7eeafa 100644 --- a/_ark/dx/overshell/dx_main_states.dta +++ b/_ark/dx/overshell/dx_main_states.dta @@ -3,7 +3,10 @@ {do ($options {array 0}) - {push_back $options os_set_speeds} + {if_else {$this in_game} + {push_back $options os_track_speeds} + {push_back $options os_set_speeds} + } {push_back $options os_venue_options} {push_back $options os_track_theme} #ifndef HX_WII @@ -33,7 +36,11 @@ (SELECT_MSG {switch {$component selected_sym} (os_set_speeds - {$this show_state dxState_SetSpeeds}) + {$this show_state dxState_SetSpeeds} + ) + (os_track_speeds + {$this show_state dxState_TrackSpeeds} + ) (os_venue_options {$this show_state dxState_VenueOptions}) (os_track_theme @@ -79,7 +86,9 @@ ($options {array 0}) {push_back $options {if_else $dx_60fps os_venuefps_60 os_venuefps_30}} - {push_back $options {if_else $dx_vsync os_vsync_on os_vsync_off}} + {if {== $dx_detected_platform platform_rpcs3} + {push_back $options {if_else $dx_vsync os_vsync_on os_vsync_off}} + } {push_back $options {if_else $dx_force_lod os_force_high_lod_on os_force_high_lod_off}} {push_back $options {if_else $dx_postfx os_postfx_on os_postfx_off}} {if $dx_postfx @@ -102,34 +111,30 @@ (SELECT_MSG {switch {$component selected_sym} ((os_venuefps_60 os_venuefps_30) - {set $dx_60fps {! $dx_60fps}} - {if $dx_60fps - {set $post_proc_needs_reset TRUE} - } - {dx_postfx_setter} - {if_else $dx_60fps - {do - {set $dx_tracked_changed os_venuefps_60} - {set $emulatefps 60} - } - {do - {set $dx_tracked_changed os_venuefps_30} - {set $emulatefps 30} - } - } {dx_state_pos_tracker} DX_GRAPHICS_DATA + DX_OS_CLOSE_MSG {set $previous_state dxState_Graphics} {if_else {== $dx_detected_platform platform_rpcs3} {do - {$this show_state dxState_GraphicsWarn} - } - {do + {set $dx_60fps {! $dx_60fps}} + {if $dx_60fps + {set $post_proc_needs_reset TRUE} + } + {dx_postfx_setter} {if_else $dx_60fps - {$this show_state dxState_60FPSWarn} - {$this show_state dxState_GraphicsWarn} + {do + {set $dx_tracked_changed os_venuefps_60} + {set $emulatefps 60} + } + {do + {set $dx_tracked_changed os_venuefps_30} + {set $emulatefps 30} + } } + {$this show_state dxState_GraphicsWarn} } + {$this show_state dxState_60FPSWarn} } ) ((os_vsync_on os_vsync_off) @@ -144,29 +149,26 @@ {set $previous_state dxState_Graphics} ) ((os_force_high_lod_on os_force_high_lod_off) - {set $dx_force_lod {! $dx_force_lod}} - {if $dx_force_lod - {set $post_proc_needs_reset TRUE} - } - {dx_postfx_setter} - {if_else $dx_force_lod - {set $dx_tracked_changed os_force_high_lod_on} - {set $dx_tracked_changed os_force_high_lod_off} - } {dx_state_pos_tracker} DX_GRAPHICS_DATA + DX_OS_CLOSE_MSG {set $previous_state kState_Graphics} {if_else {== $dx_detected_platform platform_rpcs3} {do - {$this show_state dxState_GraphicsWarn} - } - {do + {set $dx_force_lod {! $dx_force_lod}} + {if $dx_force_lod + {set $post_proc_needs_reset TRUE} + } + {dx_postfx_setter} {if_else $dx_force_lod - {$this show_state dxState_HighLODWarn} - {$this show_state dxState_GraphicsWarn} + {set $dx_tracked_changed os_force_high_lod_on} + {set $dx_tracked_changed os_force_high_lod_off} } + {$this show_state dxState_GraphicsWarn} } + {$this show_state dxState_HighLODWarn} } + ) ((os_postfx_on os_postfx_off) {dx_set_postfx {! $dx_postfx}} @@ -267,6 +269,7 @@ {array 0}) {push_back $options os_fcaudio} {push_back $options {if_else $dx_song_select_noise os_audio_ambience_on os_audio_ambience_off}} + {push_back $options {if_else $dx_scroll_sound os_scroll_sound_on os_scroll_sound_off}} {push_back $options {if_else $dx_whammy_fx os_whammy_fx_on os_whammy_fx_off}} {push_back $options {if_else $dx_instrument_fx os_audio_instsfx_on os_audio_instsfx_off}} {push_back $options {if_else $dx_jurgen_sound os_jurgen_sound_on os_jurgen_sound_off}} @@ -311,6 +314,16 @@ DX_AUDIO_SFX_DATA {set $previous_state dxState_AudioSFX} ) + ((os_scroll_sound_on os_scroll_sound_off) + {set $dx_scroll_sound {! $dx_scroll_sound}} + {if_else $dx_scroll_sound + {set $dx_tracked_changed os_scroll_sound_on} + {set $dx_tracked_changed os_scroll_sound_off} + } + {dx_state_pos_tracker} + DX_AUDIO_SFX_DATA + {set $previous_state dxState_AudioSFX} + ) ((os_whammy_fx_on os_whammy_fx_off) {set $dx_whammy_fx {! $dx_whammy_fx}} {if_else $dx_whammy_fx diff --git a/_ark/dx/overshell/dx_overshell_funcs.dta b/_ark/dx/overshell/dx_overshell_funcs.dta index 72fc5e8cd9..a0b1b59b14 100644 --- a/_ark/dx/overshell/dx_overshell_funcs.dta +++ b/_ark/dx/overshell/dx_overshell_funcs.dta @@ -253,6 +253,7 @@ (5 {do {set $current_list options.lst}}) (6 {do {set $current_list options_audio.lst}}) (7 {do {set $current_list game_options.lst}}) + game_options.lst } {$current_list set circular $options_circular} {$current_list set display_num $current_slots} @@ -273,6 +274,16 @@ ;{unless $in_state ; DX_OS_CLOSE_MSG ;} + {set $actually_show_checks FALSE} + {handle + ($this + update_auto_vocals_enabled + {modifier_mgr is_modifier_active mod_auto_vocals})} + {do + ($no_fail_enabled + {modifier_mgr is_modifier_active mod_no_fail_band}) + {handle + ($this update_no_fail_enabled $no_fail_enabled)}} {switch $current_slots (1 options_end_game) (2 options_end_game) @@ -281,6 +292,7 @@ (5 options) (6 options_audio) (7 game_options) + game_options } ; } ; } @@ -301,20 +313,20 @@ {set $options_circular TRUE} {set $options_circular FALSE} } - {if {>= $num_of_slots 6} - {set $num_of_slots 6} + {if {>= $num_of_slots 7} + {set $num_of_slots 7} } {set $current_slots $num_of_slots} - {unless {$this in_game} ;in game overshell does not need to account for same slot size animation transitions + ;{unless {$this in_game} ;in game overshell does not need to account for same slot size animation transitions {if {== $current_slots $previous_num_slot} - {if_else {< $current_slots 6} + {if_else {<= $current_slots 6} {set $num_of_slots {+ $num_of_slots 1}} {set $num_of_slots {- $num_of_slots 1}} } } {set $previous_num_slot $num_of_slots} {set $current_slots $num_of_slots} - } + ;} ;$options {set $options_list_data {array $options}} ; } diff --git a/_ark/dx/overshell/dx_speed_states.dta b/_ark/dx/overshell/dx_speed_states.dta index 05bb65ce74..fab3fd12b7 100644 --- a/_ark/dx/overshell/dx_speed_states.dta +++ b/_ark/dx/overshell/dx_speed_states.dta @@ -505,7 +505,10 @@ } ) (on_cancel - {$this show_state dxState_SetSpeeds} + {if_else {$this in_game} + {$this show_state dxState_DeluxeSettings} + {$this show_state dxState_SetSpeeds} + } ) ) diff --git a/_ark/dx/overshell/dx_texture_states.dta b/_ark/dx/overshell/dx_texture_states.dta index 4ff715ed84..ee6e967746 100644 --- a/_ark/dx/overshell/dx_texture_states.dta +++ b/_ark/dx/overshell/dx_texture_states.dta @@ -4,12 +4,18 @@ ($options {array 0}) {if_else $dx_customizer - {push_back $options leave_customizer} - {push_back $options realtime_customize} - } - {if $dx_debug - {push_back $options os_milo} + {do + {push_back $options leave_customizer} + {push_back $options restart_customizer} + } + {if_else {$this in_game} + kDataUnhandled + {push_back $options realtime_customize} + } } + ;{if $dx_debug + ; {push_back $options os_milo} + ;} {push_back $options os_fretboard} {push_back $options os_spotlight} {push_back $options os_emissive} @@ -45,13 +51,18 @@ {$this iterate Mesh $m {$m set_showing FALSE}} {choose_character.mesh set_showing TRUE} {unless $dx_moved_once + #ifdef RB3E + {set $list_move_down_number 0} + #else + {set $list_move_down_number 250} + #endif {if_else {&& {user_mgr get_user_from_slot 2} ;check if user on slot 2 exists {== {{user_mgr get_user_from_slot 2} get_track_type} kTrackVocals} } {$this iterate UIList $l - {$l set_local_pos_index 2 {- {$l get_local_pos_index 2} 250}} ;move vocal type menu straight down + {$l set_local_pos_index 2 {- {$l get_local_pos_index 2} $list_move_down_number}} ;move vocal type menu straight down } {$this iterate UIList $l {$l set_local_pos_index 0 {+ {$l get_local_pos_index 0} 200}} ;move 5l type menu up and to the right @@ -64,6 +75,9 @@ ) (SELECT_MSG {switch {$component selected_sym} + (restart_customizer + {session end_game kRestart} + ) (realtime_customize {$this show_state dxState_CustomizerWarn} ) @@ -78,7 +92,7 @@ {== {{user_mgr get_user_from_slot 2} get_track_type} kTrackVocals} } {$this iterate UIList $l - {$l set_local_pos_index 2 {+ {$l get_local_pos_index 2} 250}} + {$l set_local_pos_index 2 {+ {$l get_local_pos_index 2} $list_move_down_number}} } {$this iterate UIList $l {$l set_local_pos_index 0 {- {$l get_local_pos_index 0} 200}} @@ -149,8 +163,11 @@ {$this show_state dxState_DTATextureLoader}) (os_sus {set $dx_tracked_texture_loader sustains} + {set $dx_tracked_texture_category FALSE} + {set $dx_choose_char_scale_x 0.4} + {set $dx_choose_char_scale_y 0.15} {set $dx_texture_array (#include ../custom_textures/sustains/_list.dta)} - {$this show_state dxState_SustainSelection}) + {$this show_state dxState_DTATextureLoader}) (os_score_box {set $dx_tracked_texture_loader scoreboard_frame} {set $dx_tracked_texture_category score} @@ -284,7 +301,7 @@ {array 0}) ;we dont actually use this but might be a good idea later to pull from a pool somehow {set $dx_available_textures - (overdrive scoreboard_frame score_star_frame font solo_box bre_shield strikeline_guitar flames_spark rails_track gem_mash_green_emmisive od_bar_background highways streaks multiplier_ring_plate_fc crowd_meter_frame gems_default keyboard_lanes vocal_highway_bg vocal_arrow vocal_note_tube vocal_overdrive_now_bar) + (overdrive scoreboard_frame score_star_frame font solo_box bre_shield strikeline_guitar flames_spark rails_track gem_mash_green_emmisive od_bar_background highways streaks multiplier_ring_plate_fc crowd_meter_frame gems_default keyboard_lanes vocal_highway_bg vocal_arrow vocal_note_tube vocal_overdrive_now_bar sustains) } ;we track if this texture is in a subfolder or not via a category {if_else $dx_tracked_texture_category @@ -528,6 +545,9 @@ {set $dx_vocal_overdrive_needs_reset TRUE} {set $dx_vocal_overdrive {$component selected_sym}} {set $dx_local_vocal_overdrive {$component selected_sym}}) + (sustains + {set $dx_sustain_needs_reset TRUE} + {set $dx_sustain {$component selected_sym}}) } ;$dx_refresh_beatmatch when set to true, will pause beatmatcher before applying the texture. ;otherwise, in-game customizer audio will desync and become hellish diff --git a/_ark/dx/overshell/dx_track_theme_states.dta b/_ark/dx/overshell/dx_track_theme_states.dta index 692f1425f1..05e675d7e6 100644 --- a/_ark/dx/overshell/dx_track_theme_states.dta +++ b/_ark/dx/overshell/dx_track_theme_states.dta @@ -200,6 +200,9 @@ } ) } + {if {== {$component selected_sym} default} + {$this show_state dxState_RebootThemeWarn} + } ) (exit {dx_state_pos_tracker} diff --git a/_ark/dx/overshell/dx_venue_states.dta b/_ark/dx/overshell/dx_venue_states.dta index c1646e7e22..febb367ce2 100644 --- a/_ark/dx/overshell/dx_venue_states.dta +++ b/_ark/dx/overshell/dx_venue_states.dta @@ -26,8 +26,16 @@ (SELECT_MSG {switch {$component selected_sym} (os_menu_backgrounds + {dx_state_pos_tracker} + DX_VENUE_OPTIONS_DATA + {set $previous_state dxState_MenuBG} + {set $dx_tracked_changed FALSE} {$this show_state dxState_MenuBG}) (os_venue + {dx_state_pos_tracker} + DX_VENUE_OPTIONS_DATA + {set $previous_state dxState_SelectVenue} + {set $dx_tracked_changed FALSE} {$this show_state dxState_SelectVenue}) ((os_venue_intro_on os_venue_intro_off) {set $dx_venue_intro {! $dx_venue_intro}} @@ -72,7 +80,13 @@ } {set $in_state FALSE} DX_VENUE_OPTIONS_DATA - {set $previous_state dxState_VenueOptions} + {if + {&& + {!= {$component selected_sym} os_menu_backgrounds} + {!= {$component selected_sym} os_venue} + } + {set $previous_state dxState_VenueOptions} + } ) (exit {dx_state_pos_tracker} @@ -82,7 +96,22 @@ {$this show_state dxState_DeluxeSettings} ) ) - +#define BLACK_SONG_LOAD_BG +( + {set $dx_forced_song_load_bg none} + #ifdef HX_XBOX {set $dx_xbox_show_fallback TRUE} #endif + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 3 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 4 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 5 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 6 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 1 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 2 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 3 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 4 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 5 (TRUE ())} +) #define DX_DEFAULT_MAIN_BG ( {set $dx_forced_main_menu_bg FALSE} @@ -140,16 +169,16 @@ #define DX_DEFAULT_SONG_SELECT_BG ( {set $dx_forced_song_select_bg FALSE} - {set_elem {find $syscfg vignettes backdrops sv4} 1 - {quote - {cond - ({campaign has_reached_campaign_level campaignlevel_jet} ("sv4_c" "sv4_e")) - ({campaign has_reached_campaign_level campaignlevel_bus} ("sv4_b")) - ({campaign has_reached_campaign_level campaignlevel_van} ("sv4_a")) - (TRUE ("sv4_d")) - } + {set_elem {find $syscfg vignettes backdrops sv4} 1 + {quote + {cond + ({campaign has_reached_campaign_level campaignlevel_jet} ("sv4_c" "sv4_e")) + ({campaign has_reached_campaign_level campaignlevel_bus} ("sv4_b")) + ({campaign has_reached_campaign_level campaignlevel_van} ("sv4_a")) + (TRUE ("sv4_d")) } } + } ) #define DX_MENUBG_DATA ( @@ -180,27 +209,9 @@ {unless {$this in_game} {ui goto_screen meta_loading_main_screen}} {if_else $dx_black_menu {do - {set $dx_forced_song_load_bg (TRUE ())} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 3 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 4 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 5 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 6 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 1 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 2 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 3 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 4 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 5 $dx_forced_song_load_bg} + BLACK_SONG_LOAD_BG } {do - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 {quote ({'||' {meta_performer festival_reward} {!= {gamemode get game_screen} game_screen}} ())}} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 {quote ({== {meta_performer get_venue_class} video} ("tv3_b"))}} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 3 {quote ({== {meta_performer get_venue_class} festival} ("tv3_f"))}} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 4 {quote ({== {meta_performer get_venue_class} arena} ("tv3_e"))}} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 5 {quote ({== {meta_performer get_venue_class} big_club} ("tv3_b" "tv3_d"))}} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 6 {quote ({== {meta_performer get_venue_class} small_club} ("tv3_a" "tv3_b" "tv3_c"))}} - {set $dx_forced_song_load_bg FALSE} DX_DEFAULT_MAIN_BG DX_DEFAULT_SONG_SELECT_BG DX_DEFAULT_SONG_LOAD_BG @@ -215,18 +226,37 @@ {set $previous_state dxState_MenuBG} ) (os_main_menu + {dx_state_pos_tracker} + DX_MENUBG_DATA + {set $previous_state dxState_MainMenuBG} + {set $dx_tracked_changed FALSE} {$this show_state dxState_MainMenuBG} ) (os_song_select + {dx_state_pos_tracker} + DX_MENUBG_DATA + {set $previous_state dxState_SongSelectMenuBG} + {set $dx_tracked_changed FALSE} {$this show_state dxState_SongSelectMenuBG} ) (os_load_song + {dx_state_pos_tracker} + DX_MENUBG_DATA + {set $previous_state dxState_SongLoadBG} + {set $dx_tracked_changed FALSE} {$this show_state dxState_SongLoadBG} ) } {set $in_state FALSE} DX_MENUBG_DATA - {set $previous_state dxState_MenuBG} + {if + {&& + {!= {$component selected_sym} os_main_menu} + {!= {$component selected_sym} os_song_select} + {!= {$component selected_sym} os_load_song} + } + {set $previous_state dxState_MenuBG} + } ) (exit {dx_state_pos_tracker} @@ -339,12 +369,15 @@ {unless {== {$component selected_sym} default} {set_elem {find $syscfg vignettes backdrops sv4} 1 $dx_forced_song_select_bg} } - {unless {$this in_game} {ui goto_screen meta_loading_main_screen}} - ) - (exit - {dx_state_pos_tracker} + {if {== {ui current_screen} song_select_screen} + {dx_state_pos_tracker} + {set $dx_tracked_changed {$component selected_sym}} + {$this show_state dxState_SongSelectMenuBG} + {ui goto_screen meta_loading_continue_screen} + } ) (on_cancel + {dx_state_pos_tracker} {$this show_state dxState_MenuBG} ) ) @@ -441,12 +474,15 @@ {unless {== {$component selected_sym} default} {set_elem {find $syscfg vignettes backdrops sv3} 1 $dx_forced_main_menu_bg} } - {unless {$this in_game} {ui goto_screen meta_loading_main_screen}} - ) - (exit - {dx_state_pos_tracker} + {if {== {ui current_screen} main_hub_screen} + {dx_state_pos_tracker} + {set $dx_tracked_changed {$component selected_sym}} + {$this show_state dxState_MainMenuBG} + {ui goto_screen meta_loading_main_screen} + } ) (on_cancel + {dx_state_pos_tracker} {$this show_state dxState_MenuBG} ) ) @@ -514,10 +550,6 @@ (other_transitions {set $dx_forced_song_load_bg (TRUE ("tv1_a" "tv5_a" "tv6_a" "tv11_a"))} ) - (none - {set $dx_forced_song_load_bg (TRUE ())} - #ifdef HX_XBOX {set $dx_xbox_show_fallback TRUE} #endif - ) (tv1_a {set $dx_forced_song_load_bg (TRUE ("tv1_a"))} ) @@ -564,6 +596,10 @@ {set $dx_forced_song_load_bg (TRUE ("tv11_a"))} ) } + {if {== {$component selected_sym} none} + {set $dx_black_menu FALSE} + BLACK_SONG_LOAD_BG + } {unless {== {$component selected_sym} default} {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 $dx_forced_song_load_bg} {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 $dx_forced_song_load_bg} @@ -577,15 +613,14 @@ {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 4 $dx_forced_song_load_bg} {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 5 $dx_forced_song_load_bg} } - {unless {== {$component selected_sym} none} - #ifdef HX_XBOX {set $dx_xbox_show_fallback FALSE} #else kDataUnhandled #endif + #ifdef HX_XBOX + {if {!= {$component selected_sym} none} + {set $dx_xbox_show_fallback FALSE} } - {if {== {ui current_screen} song_select_screen} {ui goto_screen meta_loading_main_screen}} - ) - (exit - {dx_state_pos_tracker} + #endif ) (on_cancel + {dx_state_pos_tracker} {$this show_state dxState_MenuBG} ) ) diff --git a/_ark/dx/overshell/dx_warning_states.dta b/_ark/dx/overshell/dx_warning_states.dta index 2c0180b59f..41ae5d346f 100644 --- a/_ark/dx/overshell/dx_warning_states.dta +++ b/_ark/dx/overshell/dx_warning_states.dta @@ -373,6 +373,28 @@ ) ) +(dxState_RebootThemeWarn + (view confirm_action) + (enter + {handle + ($this set_confirm_actions #ifdef RB3E reboot_theme_warning_rb3e #else reboot_theme_warning #endif (#ifdef RB3E overshell_reboot #else overshell_continue #endif overshell_cancel)) + } + ) + (SELECT_MSG + {switch {$component selected_sym} + (overshell_continue + {dx_settings_dta_writer} + #ifdef RB3E {rb3e_relaunch_game} #endif + {$this show_state dxState_TrackThemeLoader} + ) + } + {$this show_state dxState_TrackThemeLoader} + ) + (on_cancel + {$this show_state dxState_TrackThemeLoader} + ) +) + (dxState_RebootWarn (view confirm_action) (enter @@ -505,12 +527,29 @@ (dxState_60FPSWarn (view confirm_action) (enter + DX_OS_CLOSE_MSG {handle ($this set_confirm_actions 60fps_warning (overshell_continue overshell_cancel))}) (SELECT_MSG {switch {$component selected_sym} (overshell_continue {overshell update_all} + {set $dx_60fps {! $dx_60fps}} + {if $dx_60fps + {set $post_proc_needs_reset TRUE} + } + {dx_postfx_setter} + {if_else $dx_60fps + {do + {set $dx_tracked_changed os_venuefps_60} + {set $emulatefps 60} + } + {do + {set $dx_tracked_changed os_venuefps_30} + {set $emulatefps 30} + } + } + {set $in_state FALSE} {$this show_state dxState_Graphics} {ui goto_screen meta_loading_main_screen} ) @@ -526,12 +565,23 @@ (dxState_HighLODWarn (view confirm_action) (enter + DX_OS_CLOSE_MSG {handle ($this set_confirm_actions highlod_warning (overshell_continue overshell_cancel))}) (SELECT_MSG {switch {$component selected_sym} (overshell_continue + {set $dx_force_lod {! $dx_force_lod}} + {if $dx_force_lod + {set $post_proc_needs_reset TRUE} + } + {dx_postfx_setter} {overshell update_all} + {set $in_state FALSE} + {if_else $dx_force_lod + {set $dx_tracked_changed os_force_high_lod_on} + {set $dx_tracked_changed os_force_high_lod_off} + } {$this show_state dxState_Graphics} {ui goto_screen meta_loading_main_screen} ) diff --git a/_ark/dx/read_write/dx_paths.dta b/_ark/dx/read_write/dx_paths.dta index 863a66ef1f..b0be9a7f7e 100644 --- a/_ark/dx/read_write/dx_paths.dta +++ b/_ark/dx/read_write/dx_paths.dta @@ -1,7 +1,7 @@ #define DX_SETTINGS_FILE_PATH ( #ifdef HX_XBOX "GAME:/dx_settings.dta" #endif - #ifdef HX_WII "dx_settings.dta" #endif + #ifdef HX_WII "gen/dx_settings.dtb" #endif #ifdef HX_PS3 #ifdef REGION_EUROPE "GD:/dev_hdd0/game/BLES00986/USRDIR/dx_settings.dta" diff --git a/_ark/dx/read_write/dx_read_write_funcs.dta b/_ark/dx/read_write/dx_read_write_funcs.dta index 525bbe2c3e..43c9b03087 100644 --- a/_ark/dx/read_write/dx_read_write_funcs.dta +++ b/_ark/dx/read_write/dx_read_write_funcs.dta @@ -170,10 +170,12 @@ ;{dx_log_writer info {sprint "Macro: dx_values_dta_writer"}} ;{dx_log_writer info ; {sprintf "Executed dx_values_dta_writer - time: %.4fms" - {time + ;{time DX_VALUES_POPULATION - {write_file DX_VALUES_FILE_PATH $dx_values} - } + {if {! {session is_in_game}} + {write_file DX_VALUES_FILE_PATH $dx_values} + } + ;} ; } ;} } diff --git a/_ark/dx/read_write/dx_reader_macros.dta b/_ark/dx/read_write/dx_reader_macros.dta index 7df92084e9..d326a2f5f5 100644 --- a/_ark/dx/read_write/dx_reader_macros.dta +++ b/_ark/dx/read_write/dx_reader_macros.dta @@ -226,6 +226,11 @@ ; {elem {find $entry dx_nice_sound} 1} ; } ;} + {if {== {elem $entry 0} {basename dx_scroll_sound}} + {set $dx_scroll_sound + {elem {find $entry dx_scroll_sound} 1} + } + } {if {== {elem $entry 0} {basename dx_song_select_noise}} {set $dx_song_select_noise {elem {find $entry dx_song_select_noise} 1} @@ -241,6 +246,11 @@ {elem {find $entry dx_instrument_fx} 1} } } + {if {== {elem $entry 0} {basename dx_fail_flash}} + {set $dx_fail_flash + {elem {find $entry dx_fail_flash} 1} + } + } {if {== {elem $entry 0} {basename dx_year_on_mtv}} {set $dx_year_on_mtv {elem {find $entry dx_year_on_mtv} 1} diff --git a/_ark/dx/read_write/dx_writer_macros.dta b/_ark/dx/read_write/dx_writer_macros.dta index 13452c4c46..96416d9800 100644 --- a/_ark/dx/read_write/dx_writer_macros.dta +++ b/_ark/dx/read_write/dx_writer_macros.dta @@ -34,8 +34,10 @@ {dx_setting_saver dx_settings dx_jurgen_sound $dx_jurgen_sound} ;{dx_setting_saver dx_settings dx_nice_sound $dx_nice_sound} {dx_setting_saver dx_settings dx_song_select_noise $dx_song_select_noise} + {dx_setting_saver dx_settings dx_scroll_sound $dx_scroll_sound} {dx_setting_saver dx_settings dx_whammy_fx_enabled $dx_whammy_fx} {dx_setting_saver dx_settings dx_instrument_fx $dx_instrument_fx} + {dx_setting_saver dx_settings dx_fail_flash $dx_fail_flash} {dx_setting_saver dx_settings dx_long_mtv_delay $dx_long_mtv_delay} {dx_setting_saver dx_settings dx_set_postfx $dx_postfx} {dx_setting_saver dx_settings dx_currentsong_prefix $dx_currentsong_prefix} diff --git a/_ark/dx/song_updates/official_additional_metadata.dta b/_ark/dx/song_updates/official_additional_metadata.dta index d62592b8b4..4474aa199d 100644 --- a/_ark/dx/song_updates/official_additional_metadata.dta +++ b/_ark/dx/song_updates/official_additional_metadata.dta @@ -1632,7 +1632,7 @@ (needyoutonight (author "Harmonix")) (nooneknows (author "Harmonix")) (ohmygod (author "Harmonix")) -(onearmedscissor (author "Harmonix")) +(onearmedscissors (author "Harmonix")) (outerspacemuffs (author "Harmonix")) (oyemiamor (author "Harmonix")) (plush (author "Harmonix")) @@ -2642,4 +2642,20 @@ (youregonnagofarkid (author "Harmonix, RhythmAuthors")) (yourethebest (author "Harmonix, RhythmAuthors")) (youshouldbedancing2 (author "Harmonix, RhythmAuthors")) -(zombie (author "Harmonix, RhythmAuthors")) \ No newline at end of file +(zombie (author "Harmonix, RhythmAuthors")) + +; Rock Band Rivals +(alonetime (author "Harmonix, RhythmAuthors")) +(bethany (author "Harmonix, RhythmAuthors")) +(blackcorridor (author "Harmonix, RhythmAuthors")) +(blackstreak (author "Harmonix, RhythmAuthors")) +(casablanca (author "Harmonix, RhythmAuthors")) +(closercloser (author "Harmonix, RhythmAuthors")) +(constantdisaster (author "Harmonix, RhythmAuthors")) +(crossthatline (author "Harmonix, RhythmAuthors")) +(good (author "Harmonix, RhythmAuthors")) +(historyrepeats (author "Harmonix, RhythmAuthors")) +(hourofrats (author "Harmonix, RhythmAuthors")) +(hurryupandwait (author "Harmonix, RhythmAuthors")) +(irecognize (author "Harmonix, RhythmAuthors")) +(meangirls (author "Harmonix, RhythmAuthors")) \ No newline at end of file diff --git a/_ark/dx/song_updates/rb3_plus_strings.dta b/_ark/dx/song_updates/rb3_plus_strings.dta index b3258f7299..93f7afe96d 100644 --- a/_ark/dx/song_updates/rb3_plus_strings.dta +++ b/_ark/dx/song_updates/rb3_plus_strings.dta @@ -12,6 +12,20 @@ (real_guitar_tuning (0 0 0 0 0 0)) (real_bass_tuning (0 0 0 0)) (strings_author "RK, Carl Mylo") +)(areyougonnabemygirl + (upgrade_version 1) (extra_authoring disc_update) + (rank + (drum 300) + (guitar 285) + (bass 285) + (vocals 235) + (real_guitar 410) + (real_bass 270) + (band 300) + ) + (real_guitar_tuning (0 0 0 0 0 0)) + (real_bass_tuning (0 0 0 0)) + (strings_author "RK") )(ballroomblitz (upgrade_version 1) (extra_authoring disc_update) (rank @@ -2179,6 +2193,7 @@ (real_keys 0) (real_guitar 395) (real_bass 295) + (band 329) ) (real_guitar_tuning (-2 0 0 0 0 0)) (real_bass_tuning (-2 0 0 0)) @@ -2284,8 +2299,6 @@ ) (real_guitar_tuning (0 0 0 0 0 0)) (real_bass_tuning (0 0 0 0)) - (vocal_tonic_note 5) - (song_tonality 0) (strings_author "AddyMills") )(UGC_5006800 (upgrade_version 1) (extra_authoring disc_update) @@ -2302,8 +2315,6 @@ ) (real_guitar_tuning (0 0 0 0 0 0)) (real_bass_tuning (0 0 0 0)) - (vocal_tonic_note 5) - (song_tonality 0) (strings_author "AddyMills") )(UGC_5010012 (upgrade_version 1) (extra_authoring disc_update) diff --git a/_ark/dx/song_updates/songs_updates.dta b/_ark/dx/song_updates/songs_updates.dta index 660ad67285..242b466149 100644 --- a/_ark/dx/song_updates/songs_updates.dta +++ b/_ark/dx/song_updates/songs_updates.dta @@ -7242,6 +7242,26 @@ missing_song_data (author "Harmonix" ) + (upgrade_version 1) + (extra_authoring disc_update) + (rank + (drum 300) + (guitar 285) + (bass 285) + (vocals 235) + (real_guitar 410) + (real_bass 270) + (band 300) + ) + (real_guitar_tuning + (0 0 0 0 0 0) + ) + (real_bass_tuning + (0 0 0 0) + ) + (strings_author + "RK" + ) (song_id 1) (song_length 215922) (solo @@ -7253,7 +7273,6 @@ missing_song_data (rating 2) (year_released 2003) (alternate_path 1) - (extra_authoring disc_update) (album_art 1) (album_name "Get Born" @@ -40870,7 +40889,7 @@ missing_song_data "Harmonix" ) ) -(onearmedscissor +(onearmedscissors (author "Harmonix" ) @@ -43538,6 +43557,7 @@ missing_song_data (real_keys 0) (real_guitar 395) (real_bass 295) + (band 329) ) (real_guitar_tuning (-2 0 0 0 0 0) @@ -46719,6 +46739,76 @@ missing_song_data "Harmonix, RhythmAuthors" ) ) +(alonetime + (author + "Harmonix, RhythmAuthors" + ) +) +(bethany + (author + "Harmonix, RhythmAuthors" + ) +) +(blackcorridor + (author + "Harmonix, RhythmAuthors" + ) +) +(blackstreak + (author + "Harmonix, RhythmAuthors" + ) +) +(casablanca + (author + "Harmonix, RhythmAuthors" + ) +) +(closercloser + (author + "Harmonix, RhythmAuthors" + ) +) +(constantdisaster + (author + "Harmonix, RhythmAuthors" + ) +) +(crossthatline + (author + "Harmonix, RhythmAuthors" + ) +) +(good + (author + "Harmonix, RhythmAuthors" + ) +) +(historyrepeats + (author + "Harmonix, RhythmAuthors" + ) +) +(hourofrats + (author + "Harmonix, RhythmAuthors" + ) +) +(hurryupandwait + (author + "Harmonix, RhythmAuthors" + ) +) +(irecognize + (author + "Harmonix, RhythmAuthors" + ) +) +(meangirls + (author + "Harmonix, RhythmAuthors" + ) +) (abbeyroadmedley (author "Harmonix" diff --git a/_ark/dx/track/callbacks/dx_track_callback_macros.dta b/_ark/dx/track/callbacks/dx_track_callback_macros.dta index f0a9c19ce1..404d683164 100644 --- a/_ark/dx/track/callbacks/dx_track_callback_macros.dta +++ b/_ark/dx/track/callbacks/dx_track_callback_macros.dta @@ -28,7 +28,15 @@ {if {session_mgr is_local} ;check for online {if {modifier_mgr is_modifier_active mod_perfection} ;restart song/section if perfection modifier is enabled {script_task kTaskSeconds (delay 0.5) - (script {session end_game kRestart}) + (script + {if_else {gamemode in_mode trainer} + {{gamemode get game_panel} restart_section} + {do + {dx_countdown_var_reset} + {session end_game kRestart} + } + } + ) } } } diff --git a/_ark/dx/track/dx_track_panel_handles.dta b/_ark/dx/track/dx_track_panel_handles.dta index d8e317865c..48798f023b 100644 --- a/_ark/dx/track/dx_track_panel_handles.dta +++ b/_ark/dx/track/dx_track_panel_handles.dta @@ -20,55 +20,51 @@ (dx_set_player_names ;scrub ps3 names because it looks like shit {beatmatch foreach_active_player $player - {if {get_user_name_from_player $player} - {set $dx_current_player_name {get_user_name_from_player $player}} - #ifdef HX_PS3 - {search_replace $dx_current_player_name " (1)" "" $dx_current_player_name} - {search_replace $dx_current_player_name " (2)" "" $dx_current_player_name} - {search_replace $dx_current_player_name " (3)" "" $dx_current_player_name} - {search_replace $dx_current_player_name " (4)" "" $dx_current_player_name} - {search_replace $dx_current_player_name " (5)" "" $dx_current_player_name} - {search_replace $dx_current_player_name " (6)" "" $dx_current_player_name} - {search_replace $dx_current_player_name " (7)" "" $dx_current_player_name} - {search_replace $dx_current_player_name "*" "" $dx_current_player_name} - #endif - {set $dx_current_player_name_sanitized $dx_current_player_name} - {unless {== {$player instrument} vocals} - {if_else {&& $author_finder_is_enabled $dx_diff_popups} - {do - ;set up yarg diff rings on player intro icon - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set alt_style_enabled TRUE} - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set alt_font_resource_name instruments_icons_rings} - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set markup TRUE} - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set width 100} - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set height 100} - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set alt_text_size 3.3} - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set alt_z_offset 0} - {if {! $got_playericon_pos} - {set $got_playericon_pos TRUE} - {set $player_icon_pos {{{DX_FIND_LANED_TRACK find player_intro} find icon.lbl} get_local_pos_index 0}} - } - {{{DX_FIND_LANED_TRACK find player_intro} find icon.lbl} set_local_pos_index 0 {+ $player_icon_pos 0.01}} - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set_token_fmt - {sprint $dx_current_player_name_sanitized - "\n\n" - {switch {$player instrument} - (guitar {switch $guitarrankvar DX_INS_DIFF_MAP}) - (bass {switch $bassrankvar DX_INS_DIFF_MAP}) - (drum {switch $drumrankvar DX_INS_DIFF_MAP}) - (keys {switch $keysrankvar DX_INS_DIFF_MAP}) - (real_guitar {switch $real_guitarrankvar DX_INS_DIFF_MAP}) - (real_bass {switch $real_bassrankvar DX_INS_DIFF_MAP}) - (real_drum {switch $drumrankvar DX_INS_DIFF_MAP}) - (real_keys {switch $real_keysrankvar DX_INS_DIFF_MAP}) - } - } + {set $dx_current_player_name {get_user_name_from_player $player}} + #ifdef HX_PS3 + {search_replace $dx_current_player_name " (1)" "" $dx_current_player_name} + {search_replace $dx_current_player_name " (2)" "" $dx_current_player_name} + {search_replace $dx_current_player_name " (3)" "" $dx_current_player_name} + {search_replace $dx_current_player_name " (4)" "" $dx_current_player_name} + {search_replace $dx_current_player_name " (5)" "" $dx_current_player_name} + {search_replace $dx_current_player_name " (6)" "" $dx_current_player_name} + {search_replace $dx_current_player_name " (7)" "" $dx_current_player_name} + {search_replace $dx_current_player_name "*" "" $dx_current_player_name} + #endif + {set $dx_current_player_name_sanitized $dx_current_player_name} + {if_else {&& {!= {$player instrument} vocals} {! $dx_author_finder_failed} {! $dx_path_failed} $dx_author_finder_is_enabled $dx_diff_popups} + {do + ;set up yarg diff rings on player intro icon + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set alt_style_enabled TRUE} + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set alt_font_resource_name instruments_icons_rings} + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set markup TRUE} + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set width 100} + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set height 100} + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set alt_text_size 3.3} + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set alt_z_offset 0} + {if {! $got_playericon_pos} + {set $got_playericon_pos TRUE} + {set $player_icon_pos {{{DX_FIND_LANED_TRACK find player_intro} find icon.lbl} get_local_pos_index 0}} + } + {{{DX_FIND_LANED_TRACK find player_intro} find icon.lbl} set_local_pos_index 0 {+ $player_icon_pos 0.01}} + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set_token_fmt + {sprint $dx_current_player_name_sanitized + "\n\n" + {switch {$player instrument} + (guitar {switch $guitarrankvar DX_INS_DIFF_MAP}) + (bass {switch $bassrankvar DX_INS_DIFF_MAP}) + (drum {switch $drumrankvar DX_INS_DIFF_MAP}) + (keys {switch $keysrankvar DX_INS_DIFF_MAP}) + (real_guitar {switch $real_guitarrankvar DX_INS_DIFF_MAP}) + (real_bass {switch $real_bassrankvar DX_INS_DIFF_MAP}) + (real_drum {switch $drumrankvar DX_INS_DIFF_MAP}) + (real_keys {switch $real_keysrankvar DX_INS_DIFF_MAP}) } } - ;dont put rings at all - {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set_token_fmt {sprint $dx_current_player_name_sanitized}} } } + ;dont put rings at all + {{{DX_FIND_LANED_TRACK find player_intro} find player_name.lbl} set_token_fmt {sprint $dx_current_player_name_sanitized}} } } ) @@ -77,12 +73,6 @@ {{coop_track_panel find fcframe.tex} iterate_refs $ref {$ref set diffuse_tex streak_meter_plate.tex}} ;apply the fc texture to the ring material {{coop_track_panel find multframe.tex} iterate_refs $ref {$ref set diffuse_tex streak_meter_plate.tex}} ;apply the fc texture to the ring material {{coop_track_panel find streak_meter_plate.tex} iterate_refs $ref {$ref set diffuse_tex streak_meter_plate.tex}} ;apply the fc texture to the ring material - {if {exists fcframe.tex} - {delete fcframe.tex} - } - {if {exists multframe.tex} - {delete multframe.tex} - } {{coop_track_panel find dx_star_base.tex} iterate_refs $ref {$ref set diffuse_tex score_star_frame.tex}} ;apply the fc texture to the ring material {{coop_track_panel find score_star_frame.tex} iterate_refs $ref {$ref set diffuse_tex score_star_frame.tex}} ;apply the fc texture to the ring material {{coop_track_panel find dx_star_gold_0.tex} iterate_refs $ref {$ref set diffuse_tex score_star_frame.tex}} ;apply the fc texture to the ring material @@ -96,6 +86,13 @@ {{coop_track_panel find dx_star_gold_8.tex} iterate_refs $ref {$ref set diffuse_tex score_star_frame.tex}} ;apply the fc texture to the ring material {{coop_track_panel find dx_star_gold_9.tex} iterate_refs $ref {$ref set diffuse_tex score_star_frame.tex}} ;apply the fc texture to the ring material {{coop_track_panel find dx_star_gold_10.tex} iterate_refs $ref {$ref set diffuse_tex score_star_frame.tex}} ;apply the fc texture to the ring material + #ifdef THIS_IS_DISABLED + {if {exists fcframe.tex} + {delete fcframe.tex} + } + {if {exists multframe.tex} + {delete multframe.tex} + } {if {exists dx_star_base.tex} {delete dx_star_base.tex} } @@ -132,6 +129,7 @@ {if {exists dx_star_gold_10.tex} {delete dx_star_gold_10.tex} } + #endif } ) (dx_set_failed_pos @@ -258,10 +256,14 @@ {dx_track_fc_reset} {dx_show_track_username} {dx_dim_remote_players} - #ifdef HX_PS3 + {if {== $dx_crowd_meter_state dx_disabled} {adjust_crowd_rating 1}} ;max out crowd meter when it's disabled for crowd audio + #ifndef HX_WII ;scrub player names on ps3 {$this dx_set_player_names} #endif + {if $dx_auto_endurance + {fake_win 5} + } } ) ) \ No newline at end of file diff --git a/_ark/dx/track/dx_track_texture_handles.dta b/_ark/dx/track/dx_track_texture_handles.dta index b598aaaf1e..fe95d19033 100644 --- a/_ark/dx/track/dx_track_texture_handles.dta +++ b/_ark/dx/track/dx_track_texture_handles.dta @@ -308,17 +308,14 @@ {dx_custom_texture_setter FALSE solo_box vox_slider_bkgrnd.tex $dx_solo_box} } - {if $dx_solo_box - {if_else {== $dx_solo_box none} - {beatmatch foreach_active_player $player - {unless {== {$player instrument} vocals} - {{{DX_FIND_LANED_TRACK find player_feedback} find tamb_Background.mesh} set_local_scale 2.64 2.64 2.64} - } - } - {beatmatch foreach_active_player $player - {unless {== {$player instrument} vocals} - {{{DX_FIND_LANED_TRACK find player_feedback} find tamb_Background.mesh} set_local_scale 3.5 3 4} - } + {beatmatch foreach_active_player $player + {unless {== {$player instrument} vocals} + {cond + ({has_substr {sprint $dx_solo_box} "none"} {{{DX_FIND_LANED_TRACK find player_feedback} find tamb_Background.mesh} set_local_scale 2.64 2.64 2.64}) + ({has_substr {sprint $dx_solo_box} "rb3"} {{{DX_FIND_LANED_TRACK find player_feedback} find tamb_Background.mesh} set_local_scale 2.64 2.64 2.64}) + ({has_substr {sprint $dx_solo_box} "circular"} {{{DX_FIND_LANED_TRACK find player_feedback} find tamb_Background.mesh} set_local_scale 2.64 2.64 2.64}) + ({has_substr {sprint $dx_solo_box} "yarg"} {{{DX_FIND_LANED_TRACK find player_feedback} find tamb_Background.mesh} set_local_scale 2.64 2.64 2.64}) + (else {{{DX_FIND_LANED_TRACK find player_feedback} find tamb_Background.mesh} set_local_scale 3.5 3 4}) } } } @@ -337,13 +334,6 @@ {if {! {exists dx_star_base.tex}} {new Tex dx_star_base.tex} } - - ;crap workaround because this always needs to run - {if {== $dx_stars none} {set $dx_stars 'rock band 3'}} - {dx_custom_texture_setter stars score_star_frame dx_star_base.tex $dx_stars} - {dx_custom_texture_setter stars score_star_frame score_star_frame.tex $dx_stars} - {{coop_track_panel find dx_star_base.tex} iterate_refs $ref {$ref set diffuse_tex dx_star_base.tex}} ;apply the fc texture to the ring material - {{coop_track_panel find score_star_frame.tex} iterate_refs $ref {$ref set diffuse_tex dx_star_base.tex}} ;apply the fc texture to the ring material {if {! {exists dx_star_gold_0.tex}} {new Tex dx_star_gold_0.tex} } @@ -377,20 +367,28 @@ {if {! {exists dx_star_gold_10.tex}} {new Tex dx_star_gold_10.tex} } - {dx_custom_texture_setter gold_star_transitions 0 dx_star_gold_0.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 1 dx_star_gold_1.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 2 dx_star_gold_2.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 3 dx_star_gold_3.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 4 dx_star_gold_4.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 5 dx_star_gold_5.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 6 dx_star_gold_6.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 7 dx_star_gold_7.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 8 dx_star_gold_8.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 9 dx_star_gold_9.tex $dx_stars} - {dx_custom_texture_setter gold_star_transitions 10 dx_star_gold_10.tex $dx_stars} - {if {== $dx_stars 'rock band 3'} {set $dx_stars none}} {if $dx_stars_needs_reset + ;crap workaround because this always needs to run + {if {== $dx_stars none} {set $dx_stars 'rock band 3'}} + {dx_custom_texture_setter stars score_star_frame dx_star_base.tex $dx_stars} + {dx_custom_texture_setter stars score_star_frame score_star_frame.tex $dx_stars} + {{coop_track_panel find dx_star_base.tex} iterate_refs $ref {$ref set diffuse_tex dx_star_base.tex}} ;apply the fc texture to the ring material + {{coop_track_panel find score_star_frame.tex} iterate_refs $ref {$ref set diffuse_tex dx_star_base.tex}} ;apply the fc texture to the ring material + {dx_custom_texture_setter gold_star_transitions 0 dx_star_gold_0.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 1 dx_star_gold_1.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 2 dx_star_gold_2.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 3 dx_star_gold_3.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 4 dx_star_gold_4.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 5 dx_star_gold_5.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 6 dx_star_gold_6.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 7 dx_star_gold_7.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 8 dx_star_gold_8.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 9 dx_star_gold_9.tex $dx_stars} + {dx_custom_texture_setter gold_star_transitions 10 dx_star_gold_10.tex $dx_stars} + {if {== $dx_stars 'rock band 3'} {set $dx_stars none}} + + {dx_custom_texture_setter stars score_meter_wipe score_meter_wipe.tex $dx_stars} {dx_custom_texture_setter stars score_star_frame score_star_frame.tex $dx_stars} {if {exists dx_star_base.tex} diff --git a/_ark/dx/ui/band/dx_manage_band_handles.dta b/_ark/dx/ui/band/dx_manage_band_handles.dta index 4782bf6a7f..75b73fb84c 100644 --- a/_ark/dx/ui/band/dx_manage_band_handles.dta +++ b/_ark/dx/ui/band/dx_manage_band_handles.dta @@ -1,47 +1 @@ -;usage {dx_play_a_cutscene campaign_rewardvignette_win_screen meta_loading_continue_screen} -;accepted vignette names are the screens themselves -;createband_rewardvignette_created_screen -;campaign_rewardvignette_firstgig_screen -;campaign_rewardvignette_van_screen -;campaign_rewardvignette_bus_screen -;campaign_rewardvignette_festival_replay_screen -;campaign_rewardvignette_jet_screen -;campaign_rewardvignette_win_screen -{func dx_play_a_cutscene - ($vignette $destination) - {manage_band_panel set_profile {profile_mgr get_primary_profile}} - {dx_cutscene_viewer_screen set vignette $vignette} - {dx_cutscene_viewer_screen set dx_destination $destination} - {ui abstract_wipe} - {ui goto_screen dx_cutscene_viewer_screen} - {overshell leave_options} -} - -#define DX_MANAGE_BAND_HANDLES -( - (force_vignette - ($vignette $destination) - {$this set_state kManageBand_VignetteViewer} - {$this queue_reward_vignette $vignette} - {ui abstract_wipe} - {ui goto_screen $destination} - ) -) - -#define DX_CUTSCENE_SCREEN -( - {new - BandScreen - dx_cutscene_viewer_screen - (panels meta manage_band_panel) - (focus manage_band_panel) - (vignette "") - (dx_destination "") - (TRANSITION_COMPLETE_MSG - {manage_band_panel force_vignette [vignette] [dx_destination]}) - (enter - {dx_cutscene_viewer_screen set_showing FALSE} - {closet_mgr set_no_user_mode FALSE} - ) - } -) \ No newline at end of file +;nolongerempty \ No newline at end of file diff --git a/_ark/dx/ui/dx_funcs.dta b/_ark/dx/ui/dx_funcs.dta index e245e3e99e..ef62148572 100644 --- a/_ark/dx/ui/dx_funcs.dta +++ b/_ark/dx/ui/dx_funcs.dta @@ -11,6 +11,19 @@ {set $metaverb $verb} } } +{func + dx_fixup_bns ($speed) + ; Multiply by 20 to avoid loss of value with `round` + ; 0 to 2.5 -> 0 to 50, to keep a 0.05 step at the end + {set $speed {* $speed 20}} + ; Apply breakneck speed multiplier and clamp to max speed + {set $speed {* $speed 1.5}} + {if {> $speed 250} {set $speed 250}} + ; Round and restore to 0.05 step + {set $speed {round $speed}} + {set $speed {/ $speed 20}} + $speed +} #include ../track/beatmatch/dx_bot_funcs.dta #include ../track/beatmatch/dx_beatmatch_funcs.dta #include ../world/dx_camera_funcs.dta diff --git a/_ark/dx/ui/dx_ui_init.dta b/_ark/dx/ui/dx_ui_init.dta index ad7e80b86e..30e684cbc1 100644 --- a/_ark/dx/ui/dx_ui_init.dta +++ b/_ark/dx/ui/dx_ui_init.dta @@ -10,6 +10,8 @@ {set $dx_diff_popups TRUE} #endif {set $dx_high_score_report TRUE} +{set $highscore_tracker ()} +{resize $highscore_tracker 0} {set $dx_vsync TRUE} #ifdef _SHIP DX_LOG_CLEAR @@ -19,6 +21,7 @@ DX_CURRENT_SONG_CLEAR {resize $dx_playlist_array 0} {write_file DX_PLAYLIST_DTA_PATH $dx_playlist_array} #endif +{set $actually_show_checks TRUE} ;init overshell checkboxes {set $dx_play_a_show_active_instruments ()} {resize $dx_play_a_show_active_instruments 0} ;rb4 loosly @@ -310,6 +313,7 @@ DX_CURRENT_SONG_CLEAR {set $dx_jurgen_sound FALSE} {set $dx_nice_sound TRUE} {set $dx_song_select_noise FALSE} +{set $dx_scroll_sound TRUE} {set $dx_instrument_fx TRUE} {set $dx_whammy_fx TRUE} @@ -453,6 +457,7 @@ DX_CURRENT_SONG_CLEAR ;in game hud {set $dx_crowd_meter_state dx_on} {set $dx_score_meter_visibility TRUE} +{set $dx_fail_flash TRUE} ;currentsong formatting defauts @@ -467,7 +472,7 @@ DX_CURRENT_SONG_CLEAR {set $dx_game_origin_mtv_line FALSE} {set $dx_author_mtv_line TRUE} {set $dx_song_key_mtv_line FALSE} - +{set $dx_stars_needs_reset TRUE} ;set controller reassignments {set $dx_joypad_type_guitar kControllerGuitar} {set $dx_joypad_type_keys kControllerKeys} @@ -512,6 +517,8 @@ DX_CURRENT_SONG_CLEAR {set $dx_time_remaining down} {set $dx_current_intro_movie deluxe} {set $dx_splash_screen TRUE} +{set $dx_seasonal_logos TRUE} +{set $dx_season standard} {set $dx_additional_parts TRUE} {set $dx_venue_intro TRUE} @@ -537,9 +544,13 @@ DX_CURRENT_SONG_CLEAR {set $dx_instrument_icons rb3} -#ifdef _SHIP -{if {file_exists DX_SETTINGS_FILE_PATH} {dx_settings_dta_reader}} +{if {file_exists DX_SETTINGS_FILE_PATH} + {if {> {size {read_file DX_SETTINGS_FILE_PATH}} 0} + {dx_settings_dta_reader} + } +} +#ifdef _SHIP {if {file_exists DX_MODIFIER_FILE_PATH} {dx_modifier_dta_reader}} {if {file_exists DX_VALUES_FILE_PATH} {dx_values_dta_reader}} @@ -562,6 +573,20 @@ DX_CURRENT_SONG_CLEAR } } #endif + +; force vsync on after settings load if not on rpcs3, just in case +{if {! {== $dx_detected_platform platform_rpcs3}} + {set $dx_vsync TRUE} + {rnd set_sync 1} +} +#ifdef HX_WII +{set $dx_instrument_icons rb3} +{set $dx_song_select_rings FALSE} +{set $dx_diff_popups FALSE} +{set $dx_author_finder_is_enabled FALSE} +{set $dx_force_lod FALSE} +#endif + ;instrument icons, implement individual ones later {switch $dx_instrument_icons (rb3 @@ -608,11 +633,25 @@ DX_CURRENT_SONG_CLEAR {if $dx_ps3hw {set $dx_author_finder_is_enabled FALSE} } +{if {== {sprint $dx_forced_song_load_bg} "(1 ())"} + {set $dx_forced_song_load_bg none} +} -{if $dx_black_menu - {set $dx_forced_song_load_bg (TRUE ())} +{if {== $dx_forced_song_load_bg none} + #ifdef HX_XBOX {set $dx_xbox_show_fallback TRUE} #endif + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 3 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 4 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 5 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 6 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 1 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 2 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 3 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 4 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 5 (TRUE ())} } -{if $dx_forced_song_load_bg +{if {&& $dx_forced_song_load_bg {!= $dx_forced_song_load_bg none}} {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 $dx_forced_song_load_bg} {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 $dx_forced_song_load_bg} {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 3 $dx_forced_song_load_bg} @@ -625,6 +664,7 @@ DX_CURRENT_SONG_CLEAR {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 4 $dx_forced_song_load_bg} {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 5 $dx_forced_song_load_bg} } + {if $dx_forced_main_menu_bg {set_elem {find $syscfg vignettes backdrops sv3} 1 $dx_forced_main_menu_bg} } @@ -632,13 +672,6 @@ DX_CURRENT_SONG_CLEAR {set_elem {find $syscfg vignettes backdrops sv4} 1 $dx_forced_song_select_bg} } -#ifdef HX_XBOX -{if_else {== {sprint $dx_forced_song_load_bg} "(1 ())"} - {set $dx_xbox_show_fallback TRUE} - {set $dx_xbox_show_fallback FALSE} -} -#endif - {switch $dx_fctype (ring {set $dx_fc_ring TRUE} {set $dx_fc_glow FALSE}) (glow {set $dx_fc_ring FALSE} {set $dx_fc_glow TRUE}) @@ -760,4 +793,7 @@ DX_CURRENT_SONG_CLEAR (dx_play_a_show_chosen_vote) ) } +#endif +#ifdef HX_WII +{set $dx_debug 1} #endif \ No newline at end of file diff --git a/_ark/dx/ui/endgame/dx_endgame_macros.dta b/_ark/dx/ui/endgame/dx_endgame_macros.dta index ca3e5e51e1..6412602f4e 100644 --- a/_ark/dx/ui/endgame/dx_endgame_macros.dta +++ b/_ark/dx/ui/endgame/dx_endgame_macros.dta @@ -17,6 +17,7 @@ {session_mgr is_leader_local} ;set venue only if host of the lobby $dx_venue_swap } + {world_panel unload} {dx_venue_setter} } } @@ -38,6 +39,7 @@ {session_mgr is_leader_local} ;set venue only if host of the lobby $dx_character_swap } + {world_panel unload} {prefab_mgr assign_prefabs_to_slots} {char_sync update_char_cache} } @@ -87,6 +89,9 @@ ) (dx_endgame_enter {dx_presence_manager} + {if {meta_performer is_set_complete} + {world_panel unload} + } {$this dx_auto_endgame} {$this dx_swap_venue_mid_setlist} {$this dx_swap_char_mid_setlist} @@ -247,6 +252,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } } {do @@ -279,6 +294,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } } {do @@ -311,6 +336,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } } {do @@ -343,6 +378,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } } {do @@ -375,6 +420,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } } {do @@ -443,6 +498,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } {modifier_mgr is_modifier_active mod_chmode} } @@ -466,6 +531,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } {modifier_mgr is_modifier_active mod_fastermode} } @@ -492,6 +567,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } {modifier_mgr is_modifier_active mod_brutalmode} } @@ -515,6 +600,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } {modifier_mgr is_modifier_active mod_precision} } @@ -538,6 +633,16 @@ {== {$user get_track_icon} "k"} {== {$user get_track_icon} "D"} {== {$user get_track_icon} "d"} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_bass} + {== {$user get_track_icon} $dx_icon_drum} + {== {$user get_track_icon} $dx_icon_vocals} + {== {$user get_track_icon} $dx_icon_keys} + {== {$user get_track_icon} $dx_icon_guitar} + {== {$user get_track_icon} $dx_icon_real_keys} + {== {$user get_track_icon} $dx_icon_real_guitar} + {== {$user get_track_icon} $dx_icon_real_bass} + {== {$user get_track_icon} $dx_icon_drum_pro} } {modifier_mgr is_modifier_active mod_calibration} } diff --git a/_ark/dx/ui/main/dx_main_handles.dta b/_ark/dx/ui/main/dx_main_handles.dta index 2b6bb0774e..5dc04d8388 100644 --- a/_ark/dx/ui/main/dx_main_handles.dta +++ b/_ark/dx/ui/main/dx_main_handles.dta @@ -1,6 +1,18 @@ #define DX_MAIN_HANDLES ( (dx_main_on_enter + ;correct bns to new speed system + {if {modifier_mgr is_modifier_active mod_doublespeed} + {modifier_mgr toggle_modifier_enabled mod_doublespeed} + {set $trackspeed_guitar {dx_fixup_bns $trackspeed_guitar}} + {set $trackspeed_bass {dx_fixup_bns $trackspeed_bass}} + {set $trackspeed_drum {dx_fixup_bns $trackspeed_drum}} + {set $trackspeed_keys {dx_fixup_bns $trackspeed_keys}} + {set $trackspeed_real_keys {dx_fixup_bns $trackspeed_real_keys}} + {set $trackspeed_real_guitar {dx_fixup_bns $trackspeed_real_guitar}} + {set $trackspeed_real_bass {dx_fixup_bns $trackspeed_real_bass}} + {dx_settings_dta_writer} + } {if_else {== $dx_vsync 0} {rnd set_sync 0} {rnd set_sync 1} @@ -28,6 +40,12 @@ {mb_musicstore.btn set markup TRUE} {mb_musicstore.btn set alt_style_enabled TRUE} {mb_musicstore.btn set alt_font_resource_name {mb_musicstore.btn get resource_name}} + {set $localize_num {random_int 0 100}} + {if {== $localize_num 42} + {ui_event_mgr trigger_event error_message + (dummy init localize_it) + } + } } } ) diff --git a/_ark/dx/ui/seldiff/dx_seldiff_handles.dta b/_ark/dx/ui/seldiff/dx_seldiff_handles.dta index 2de35c9237..b446bffdb9 100644 --- a/_ark/dx/ui/seldiff/dx_seldiff_handles.dta +++ b/_ark/dx/ui/seldiff/dx_seldiff_handles.dta @@ -1,107 +1,14 @@ #define DX_SEL_DIFF_HANDLES ( - (dx_play_info - {if {! {exists play_play_text.lbl}} - {if {! {exists play_color.color}} - {new UIColor play_color.color} - {play_color.color set color {pack_color 1 1 1}} - } - {new BandLabel play_play_text.lbl} - {play_play_text.lbl set resource_name "pentatonic_outline"} - {play_play_text.lbl set_showing TRUE} - {play_play_text.lbl set_local_scale 1 1 1} - {play_play_text.lbl set_local_pos -220 0 162} - {play_play_text.lbl set text_size 40} - {play_play_text.lbl set fit_type 2} - {play_play_text.lbl set alignment kTopLeft} - {play_play_text.lbl set width 500} - {play_play_text.lbl set height 40} - {play_play_text.lbl set alpha 1} - {play_play_text.lbl set color_override play_color.color} - {career.grp add_object play_play_text.lbl} - {career.grp set_showing TRUE} - } - {play_play_text.lbl set text_token dx_play_a_show_info} - ) - (dx_play_countdown - {if {! {exists play_countdown_text.lbl}} - {if {! {exists play_color.color}} - {new UIColor play_color.color} - {play_color.color set color {pack_color 1 1 1}} - } - {new BandLabel play_countdown_text.lbl} - {play_countdown_text.lbl set resource_name "pentatonic_outline"} - {play_countdown_text.lbl set_showing TRUE} - {play_countdown_text.lbl set_local_scale 1 1 1} - {play_countdown_text.lbl set_local_pos 400 0 162} - {play_countdown_text.lbl set text_size 20} - {play_countdown_text.lbl set fit_type 2} - {play_countdown_text.lbl set alignment kTopRight} - {play_countdown_text.lbl set width 150} - {play_countdown_text.lbl set height 40} - {play_countdown_text.lbl set alpha 1} - {play_countdown_text.lbl set color_override play_color.color} - {career.grp add_object play_countdown_text.lbl} - {career.grp set_showing TRUE} - } - {$this dx_play_countdown_set_time {localize play_a_show_waiting} 0} - ) (dx_play_countdown_set_time ($words $int) - {if_else $int - {do - {play_countdown_text.lbl set_showing TRUE} - {play_countdown_text.lbl set text_token {sprintf "%s: %i" $words $int}} - } - {do - {play_countdown_text.lbl set_showing FALSE} - } - } {if $int + {play_countdown_text.lbl set_showing TRUE} + {play_countdown_text.lbl set text_token {sprintf "%s: %i" $words $int}} {synth play metronome_lo.cue} } - ) - (dx_play_header - {if {! {exists play_header.lbl}} - {new BandLabel play_header.lbl} - {play_header.lbl set resource_name "pentatonic_outline"} - {play_header.lbl set_showing TRUE} - {play_header.lbl set_local_scale 1 1 1} - {play_header.lbl set_local_pos -277 0 220} - {play_header.lbl set text_token {sprint " "}} - {play_header.lbl set text_size 20} - {play_header.lbl set fit_type 2} - {play_header.lbl set alignment kTopLeft} - {play_header.lbl set width 500} - {play_header.lbl set height 40} - {play_header.lbl set alpha 1} - {play_header.lbl set color_override play_color.color} - {career.grp add_object play_header.lbl} - {career.grp set_showing TRUE} - } - {play_header.lbl set text_token {sprint " "}} - ) - (dx_play_set_count - {if {! {exists play_header.lbl}} - {new BandLabel total.lbl} - {total.lbl set resource_name "pentatonic_outline"} - {total.lbl set_showing TRUE} - {total.lbl set_local_scale 1 1 1} - {total.lbl set_local_pos 400 0 162} - {total.lbl set text_size 40} - {total.lbl set fit_type 2} - {total.lbl set alignment kTopRight} - {total.lbl set width 500} - {total.lbl set height 40} - {total.lbl set alpha 1} - {total.lbl set color_override play_color.color} - {career.grp add_object total.lbl} - {career.grp set_showing TRUE} - } - {switch {size $dx_playlist_array} - (0 {total.lbl set text_token {sprint " "}}) - (1 {total.lbl set text_token {sprintf {localize dx_play_a_show_setlist_count} {size $dx_playlist_array}}}) - {total.lbl set text_token {sprintf {localize dx_play_a_show_setlist_counts} {size $dx_playlist_array}}} + {if {! $int} + {play_countdown_text.lbl set_showing FALSE} } ) (dx_update_set_count @@ -112,7 +19,7 @@ } ) (lbl_maker - ($label $x $y $align $content) + ($label $x $y $text_size $align $content) {new BandLabel $label} {$label set resource_name "pentatonic_outline"} {$label set alt_style_enabled TRUE} @@ -122,7 +29,7 @@ {$label set_local_scale 1 1 1} {$label set_local_pos $x 0 $y} {$label set set_token_fmt $content} - {$label set text_size 30} + {$label set text_size $text_size} {$label set alt_text_size 25} {$label set alt_z_offset -4} {$label set fit_type 2} @@ -130,7 +37,7 @@ {$label set width 600} {$label set height 40} {$label set alpha 1} - ;{$label set color_override play_color.color} + {$label set color_override play_color.color} {career.grp add_object $label} ) (dx_generate_lines_info @@ -139,36 +46,68 @@ {play_color.color set color {pack_color 1 1 1}} } {career.grp set_showing TRUE} + {if {! {exists play_play_text.lbl}} + {$this lbl_maker play_play_text.lbl -220 162 40 kTopLeft {sprint dx_play_a_show_info}} + } + {if {! {exists play_countdown_text.lbl}} + {$this lbl_maker play_countdown_text.lbl 400 162 20 kTopRight {sprint " "}} + {$this dx_play_countdown_set_time {localize play_a_show_waiting} 0} + } + {if {! {exists play_header.lbl}} + {$this lbl_maker play_header.lbl -277 220 20 kTopLeft {sprint " "}} + } + {if {! {exists total.lbl}} + {$this lbl_maker total.lbl 400 162 40 kTopRight {sprint "content1"}} + } {if {! {exists line1.lbl}} - {$this lbl_maker line1.lbl -220 110 kTopLeft {sprint "content1"}} + {$this lbl_maker line1.lbl -220 110 30 kTopLeft {sprint "content1"}} } {if {! {exists line2.lbl}} - {$this lbl_maker line2.lbl -220 85 kTopLeft {sprint "content2"}} + {$this lbl_maker line2.lbl -220 85 30 kTopLeft {sprint "content2"}} } {if {! {exists line3.lbl}} - {$this lbl_maker line3.lbl -220 60 kTopLeft {sprint "content3"}} + {$this lbl_maker line3.lbl -220 60 30 kTopLeft {sprint "content3"}} } {if {! {exists line4.lbl}} - {$this lbl_maker line4.lbl -220 35 kTopLeft {sprint "content4"}} + {$this lbl_maker line4.lbl -220 35 30 kTopLeft {sprint "content4"}} } {if {! {exists line5.lbl}} - {$this lbl_maker line5.lbl -220 10 kTopLeft {sprint "content5"}} + {$this lbl_maker line5.lbl -220 10 30 kTopLeft {sprint "content5"}} } {if {! {exists inst1.lbl}} - {$this lbl_maker inst1.lbl -230 110 kTopRight {sprint "content1"}} + {$this lbl_maker inst1.lbl -230 110 30 kTopRight {sprint "content1"}} } {if {! {exists inst2.lbl}} - {$this lbl_maker inst2.lbl -230 85 kTopRight {sprint "content2"}} + {$this lbl_maker inst2.lbl -230 85 30 kTopRight {sprint "content2"}} } {if {! {exists inst3.lbl}} - {$this lbl_maker inst3.lbl -230 60 kTopRight {sprint "content3"}} + {$this lbl_maker inst3.lbl -230 60 30 kTopRight {sprint "content3"}} } {if {! {exists inst4.lbl}} - {$this lbl_maker inst4.lbl -230 35 kTopRight {sprint "content4"}} + {$this lbl_maker inst4.lbl -230 35 30 kTopRight {sprint "content4"}} } {if {! {exists inst5.lbl}} - {$this lbl_maker inst5.lbl -230 10 kTopRight {sprint "content5"}} + {$this lbl_maker inst5.lbl -230 10 30 kTopRight {sprint "content5"}} } + {line1.lbl set alt_font_resource_name pentatonic_outline} + {line2.lbl set alt_font_resource_name pentatonic_outline} + {line3.lbl set alt_font_resource_name pentatonic_outline} + {line4.lbl set alt_font_resource_name pentatonic_outline} + {line1.lbl set alt_italics 0.1} + {line2.lbl set alt_italics 0.1} + {line3.lbl set alt_italics 0.1} + {line4.lbl set alt_italics 0.1} + {{dx_play_a_show_panel find career_description.lbl} set_showing FALSE} + {{dx_play_a_show_panel find inst1.lbl} set_token_fmt {sprint "1 . "}} + {{dx_play_a_show_panel find inst2.lbl} set_token_fmt {sprint "2. "}} + {{dx_play_a_show_panel find inst3.lbl} set_token_fmt {sprint "3. "}} + {{dx_play_a_show_panel find inst4.lbl} set_token_fmt {sprint "4. "}} + {{dx_play_a_show_panel find inst5.lbl} set_token_fmt {sprint "5. "}} + {if {! $gotthislabelpreview} + {set $gotthislabelpreview {song_preview.lbl get_local_pos_index 2}} + } + {song_preview.lbl set_local_pos_index 2 {- $gotthislabelpreview 15}} + {play_play_text.lbl set text_token dx_play_a_show_info} ) (dx_check_for_inst_genre {if {! $play_a_show_found_genre_part} @@ -269,185 +208,73 @@ {set $play_a_show_found_tempo_part FALSE} {set $play_a_show_found_fem_part FALSE} {set $play_a_show_found_ugc_part FALSE} + {if {session_mgr is_local} + ;start the flow with a random songs + {set $num {random_int 0 {{song_select_panel find song.lst} num_data}}} + {song_select_panel highlight_node_at_ix $num} - {set $num {random_int 0 {{song_select_panel find song.lst} num_data}}} - {song_select_panel highlight_node_at_ix $num} + ;hopefully find a song + {set $random_genre_song {song_select_panel pick_a_song}} + {set $random_year_song {song_select_panel pick_a_song}} + {set $random_length_song {song_select_panel pick_a_song}} + {set $random_song {song_select_panel pick_a_song}} + {set $random_tempo_song {song_select_panel pick_a_song}} + {set $random_fem_song {song_select_panel pick_a_song}} + {set $random_ugc_song {song_select_panel pick_a_song}} + ;run checks on the songs x num of times + {foreach $entry $numtimes + {$this dx_check_for_inst_genre} + {$this dx_check_for_inst_year} + {$this dx_check_for_inst_length} + {$this dx_check_for_inst_song} + {$this dx_check_for_inst_tempo} + {$this dx_check_for_inst_fem} + {$this dx_check_for_inst_ugc} + } + ;go back to the top of the song list + {{song_select_panel find song.lst} set_selected_simulate_scroll 1} - ;hopefully find a song - {set $random_genre_song {song_select_panel pick_a_song}} - {set $random_year_song {song_select_panel pick_a_song}} - {set $random_length_song {song_select_panel pick_a_song}} - {set $random_song {song_select_panel pick_a_song}} - {set $random_tempo_song {song_select_panel pick_a_song}} - {set $random_fem_song {song_select_panel pick_a_song}} - {set $random_ugc_song {song_select_panel pick_a_song}} - {foreach $entry $numtimes - {$this dx_check_for_inst_genre} - {$this dx_check_for_inst_year} - {$this dx_check_for_inst_length} - {$this dx_check_for_inst_song} - {$this dx_check_for_inst_tempo} - {$this dx_check_for_inst_fem} - {$this dx_check_for_inst_ugc} + ;populate found metadata + {set $random_genre {{song_mgr get_meta_data $random_genre_song} genre}} + {set $random_year {int {{song_mgr get_meta_data $random_year_song} year_released}}} + {set $random_length {{song_mgr get_meta_data $random_length_song} length_ms}} + {set $random_song_title {{song_mgr get_meta_data $random_song} title}} + {set $random_tempo {{song_mgr get_meta_data $random_tempo_song} anim_tempo}} + {set $random_fem {{song_mgr get_meta_data $random_fem_song} vocal_gender}} + {set $random_ugc {{song_mgr get_meta_data $random_ugc_song} is_ugc}} } - {{song_select_panel find song.lst} set_selected_simulate_scroll 1} - {set $random_genre {{song_mgr get_meta_data $random_genre_song} genre}} - {set $random_year {int {{song_mgr get_meta_data $random_year_song} year_released}}} - {set $random_length {{song_mgr get_meta_data $random_length_song} length_ms}} - {set $random_song_title {{song_mgr get_meta_data $random_song} title}} - {set $random_tempo {{song_mgr get_meta_data $random_tempo_song} anim_tempo}} - {set $random_fem {{song_mgr get_meta_data $random_fem_song} vocal_gender}} - {set $random_ugc {{song_mgr get_meta_data $random_ugc_song} is_ugc}} - - {line1.lbl set alt_font_resource_name pentatonic_outline} - {line2.lbl set alt_font_resource_name pentatonic_outline} - {line3.lbl set alt_font_resource_name pentatonic_outline} - {line4.lbl set alt_font_resource_name pentatonic_outline} - {line1.lbl set alt_italics 0.1} - {line2.lbl set alt_italics 0.1} - {line3.lbl set alt_italics 0.1} - {line4.lbl set alt_italics 0.1} ) - (dx_pick_a_show - - {set $availarray (genre year tempo song length year song genre genre length song year ugc fem year genre song tempo length song)} - {set $avail2array ()} - {set $avail3array ()} - {set $avail4array ()} - {resize $avail2array 0} - {resize $avail3array 0} - {resize $avail4array 0} - {set $line1eval {random_elem $availarray}} - {foreach $entry $availarray - {if {&& {!= $entry ""} {!= $entry $line1eval}} - {push_back $avail2array $entry} - } - } - {set $line2eval {random_elem $avail2array}} - {foreach $entry $avail2array - {if {&& {!= $entry ""} {!= $entry $line1eval} {!= $entry $line2eval}} - {push_back $avail3array $entry} - } - } - {set $line3eval {random_elem $avail3array}} - {foreach $entry $avail3array - {if {&& {!= $entry ""} {!= $entry $line1eval} {!= $entry $line2eval} {!= $entry $line3eval}} - {push_back $avail4array $entry} - } - } - {set $line4eval {random_elem $avail4array}} - {resize $avail2array 0} - {resize $avail3array 0} - {resize $avail4array 0} - - {switch $line1eval - (genre - {cond - ({! $play_a_show_found_genre_part} - {set $dx_play_a_show_line1 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line1 {sprintf {localize play_a_show_genre} {localize $random_genre}}} - } - ) - (year - {cond - ({! $play_a_show_found_year_part} - {set $dx_play_a_show_line1 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line1 {sprintf {localize play_a_show_year} $random_year}} - } - ) - (length - {cond - ({! $play_a_show_found_length_part} - {set $dx_play_a_show_line1 {localize play_a_show_missing_inst}} - ) - {if_else {> $random_length 420000} - {set $dx_play_a_show_line1 {localize play_a_show_really_long}} - {if_else {> $random_length 240000} - {set $dx_play_a_show_line1 {localize play_a_show_long}} - {if_else {> $random_length 120000} - {set $dx_play_a_show_line1 {localize play_a_show_short}} - {set $dx_play_a_show_line1 {localize play_a_show_really_short}} - } - } - } - } - ) - (song - {cond - ({! $play_a_show_found_song_part} - {line1.lbl set_token_fmt {localize play_a_show_missing_inst}} - ) - {if $play_a_show_found_song_part - {line1.lbl set_song_and_artist_name_from_sym $random_song 0} - {line1.lbl set alt_font_resource_name pentatonic_outline} - {line1.lbl set alt_italics 0.1} - } - } - ) - (tempo - {cond - ({! $play_a_show_found_tempo_part} - {set $dx_play_a_show_line1 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line1 - {switch $random_tempo - (16 {localize play_a_show_slow}) - (32 {localize play_a_show_med}) - (64 {localize play_a_show_fast}) - (112 {localize play_a_show_fast}) - } - } - } - ) - (fem - {cond - ({! $play_a_show_found_fem_part} - {set $dx_play_a_show_line1 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line1 {localize play_a_show_woman}} - } - ) - (ugc - {cond - ({! $play_a_show_found_ugc_part} - {set $dx_play_a_show_line1 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line1 {localize play_a_show_community}} - } - ) - } - - {switch $line2eval + (set_line + ($lineeval $line) + {switch $lineeval (genre {cond ({! $play_a_show_found_genre_part} - {set $dx_play_a_show_line2 {localize play_a_show_missing_inst}} + {set $dx_play_a_show_line {localize play_a_show_missing_inst}} ) - {set $dx_play_a_show_line2 {sprintf {localize play_a_show_genre} {localize $random_genre}}} + {set $dx_play_a_show_line {sprintf {localize play_a_show_genre} {localize $random_genre}}} } ) (year {cond ({! $play_a_show_found_year_part} - {set $dx_play_a_show_line2 {localize play_a_show_missing_inst}} + {set $dx_play_a_show_line {localize play_a_show_missing_inst}} ) - {set $dx_play_a_show_line2 {sprintf {localize play_a_show_year} $random_year}} + {set $dx_play_a_show_line {sprintf {localize play_a_show_year} $random_year}} } ) (length {cond ({! $play_a_show_found_length_part} - {set $dx_play_a_show_line2 {localize play_a_show_missing_inst}} + {set $dx_play_a_show_line {localize play_a_show_missing_inst}} ) {if_else {> $random_length 420000} - {set $dx_play_a_show_line2 {localize play_a_show_really_long}} + {set $dx_play_a_show_line {localize play_a_show_really_long}} {if_else {> $random_length 240000} - {set $dx_play_a_show_line2 {localize play_a_show_long}} + {set $dx_play_a_show_line {localize play_a_show_long}} {if_else {> $random_length 120000} - {set $dx_play_a_show_line2 {localize play_a_show_short}} - {set $dx_play_a_show_line2 {localize play_a_show_really_short}} + {set $dx_play_a_show_line {localize play_a_show_short}} + {set $dx_play_a_show_line {localize play_a_show_really_short}} } } } @@ -456,21 +283,21 @@ (song {cond ({! $play_a_show_found_song_part} - {line2.lbl set_token_fmt {localize play_a_show_missing_inst}} + {{sprint "line" $line ".lbl"} set_token_fmt {localize play_a_show_missing_inst}} ) {if $play_a_show_found_song_part - {line2.lbl set_song_and_artist_name_from_sym $random_song 0} - {line2.lbl set alt_font_resource_name pentatonic_outline} - {line2.lbl set alt_italics 0.1} + {{sprint "line" $line ".lbl"} set_song_and_artist_name_from_sym $random_song 0} + {{sprint "line" $line ".lbl"} set alt_font_resource_name pentatonic_outline} + {{sprint "line" $line ".lbl"} set alt_italics 0.1} } } ) (tempo {cond ({! $play_a_show_found_tempo_part} - {set $dx_play_a_show_line2 {localize play_a_show_missing_inst}} + {set $dx_play_a_show_line {localize play_a_show_missing_inst}} ) - {set $dx_play_a_show_line2 + {set $dx_play_a_show_line {switch $random_tempo (16 {localize play_a_show_slow}) (32 {localize play_a_show_med}) @@ -483,230 +310,84 @@ (fem {cond ({! $play_a_show_found_fem_part} - {set $dx_play_a_show_line2 {localize play_a_show_missing_inst}} + {set $dx_play_a_show_line {localize play_a_show_missing_inst}} ) - {set $dx_play_a_show_line2 {localize play_a_show_woman}} + {set $dx_play_a_show_line {localize play_a_show_woman}} } ) (ugc {cond ({! $play_a_show_found_ugc_part} - {set $dx_play_a_show_line2 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line2 {localize play_a_show_community}} - } - ) - } - - {switch $line3eval - (genre - {cond - ({! $play_a_show_found_genre_part} - {set $dx_play_a_show_line3 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line3 {sprintf {localize play_a_show_genre} {localize $random_genre}}} - } - ) - (year - {cond - ({! $play_a_show_found_year_part} - {set $dx_play_a_show_line3 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line3 {sprintf {localize play_a_show_year} $random_year}} - } - ) - (length - {cond - ({! $play_a_show_found_length_part} - {set $dx_play_a_show_line3 {localize play_a_show_missing_inst}} - ) - {if_else {> $random_length 420000} - {set $dx_play_a_show_line3 {localize play_a_show_really_long}} - {if_else {> $random_length 240000} - {set $dx_play_a_show_line3 {localize play_a_show_long}} - {if_else {> $random_length 120000} - {set $dx_play_a_show_line3 {localize play_a_show_short}} - {set $dx_play_a_show_line3 {localize play_a_show_really_short}} - } - } - } - } - ) - (song - {cond - ({! $play_a_show_found_song_part} - {line3.lbl set_token_fmt {localize play_a_show_missing_inst}} - ) - {if $play_a_show_found_song_part - {line3.lbl set_song_and_artist_name_from_sym $random_song 0} - {line3.lbl set alt_font_resource_name pentatonic_outline} - {line3.lbl set alt_italics 0.1} - } - } - ) - (tempo - {cond - ({! $play_a_show_found_tempo_part} - {set $dx_play_a_show_line3 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line3 - {switch $random_tempo - (16 {localize play_a_show_slow}) - (32 {localize play_a_show_med}) - (64 {localize play_a_show_fast}) - (112 {localize play_a_show_fast}) - } - } - } - ) - (fem - {cond - ({! $play_a_show_found_fem_part} - {set $dx_play_a_show_line3 {localize play_a_show_missing_inst}} + {set $dx_play_a_show_line {localize play_a_show_missing_inst}} ) - {set $dx_play_a_show_line3 {localize play_a_show_woman}} + {set $dx_play_a_show_line {localize play_a_show_community}} } ) - (ugc - {cond - ({! $play_a_show_found_ugc_part} - {set $dx_play_a_show_line3 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line3 {localize play_a_show_community}} - } + (refresh + {set $dx_play_a_show_line {localize play_a_show_refresh}} ) } - - {switch $line4eval - (genre - {cond - ({! $play_a_show_found_genre_part} - {set $dx_play_a_show_line4 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line4 {sprintf {localize play_a_show_genre} {localize $random_genre}}} - } - ) - (year - {cond - ({! $play_a_show_found_year_part} - {set $dx_play_a_show_line4 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line4 {sprintf {localize play_a_show_year} $random_year}} - } - ) - (length - {cond - ({! $play_a_show_found_length_part} - {set $dx_play_a_show_line4 {localize play_a_show_missing_inst}} - ) - {if_else {> $random_length 420000} - {set $dx_play_a_show_line4 {localize play_a_show_really_long}} - {if_else {> $random_length 240000} - {set $dx_play_a_show_line4 {localize play_a_show_long}} - {if_else {> $random_length 120000} - {set $dx_play_a_show_line4 {localize play_a_show_short}} - {set $dx_play_a_show_line4 {localize play_a_show_really_short}} - } - } - } - } - ) - (song - {cond - ({! $play_a_show_found_song_part} - {line4.lbl set_token_fmt {localize play_a_show_missing_inst}} - ) - {if $play_a_show_found_song_part - {line4.lbl set_song_and_artist_name_from_sym $random_song 0} - {line4.lbl set alt_font_resource_name pentatonic_outline} - {line4.lbl set alt_italics 0.1} - } - } - ) - (tempo - {cond - ({! $play_a_show_found_tempo_part} - {set $dx_play_a_show_line4 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line4 - {switch $random_tempo - (16 {localize play_a_show_slow}) - (32 {localize play_a_show_med}) - (64 {localize play_a_show_fast}) - (112 {localize play_a_show_fast}) - } - } - - } - ) - (fem - {cond - ({! $play_a_show_found_fem_part} - {set $dx_play_a_show_line4 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line4 {localize play_a_show_woman}} - } - ) - (ugc - {cond - ({! $play_a_show_found_ugc_part} - {set $dx_play_a_show_line4 {localize play_a_show_missing_inst}} - ) - {set $dx_play_a_show_line4 {localize play_a_show_community}} - } - ) + {if_else {== $lineeval song} + {{dx_play_a_show_panel find {sprint "line" $line ".lbl"}} set_song_and_artist_name_from_sym $random_song 0} + {{dx_play_a_show_panel find {sprint "line" $line ".lbl"}} set_token_fmt {sprint $dx_play_a_show_line}} } - ) - (dx_play_a_show_info - {set $dx_play_a_show_num_votes 0} - {set $slot1_voted FALSE} - {set $slot2_voted FALSE} - {set $slot3_voted FALSE} - {set $slot4_voted FALSE} - {set $slot1_vote FALSE} - {set $slot2_vote FALSE} - {set $slot3_vote FALSE} - {set $slot4_vote FALSE} - {{dx_play_a_show_panel find career.grp} set_showing TRUE} - {{dx_play_a_show_panel find career_description.lbl} set_showing FALSE} - ;{{dx_play_a_show_panel find career_bg.mesh} set_showing FALSE} - ;{{dx_play_a_show_panel find career.pic} set_showing FALSE} - ;{{dx_play_a_show_panel find career_frame.mesh} set_showing FALSE} - ;{if {! $got_career_desc_pos} - ; {set $got_career_desc_pos TRUE} - ; {set $dx_original_career_desc_pos {{dx_play_a_show_panel find career_description.lbl} get_local_pos_index 2}} - ; {set $dx_original_career_desc_posx {{dx_play_a_show_panel find career_description.lbl} get_local_pos_index 0}} - ; {set $dx_original_career_desc_posz {{dx_play_a_show_panel find career_description.lbl} get_local_pos_index 1}} - ;} - ;{{dx_play_a_show_panel find career_description.lbl} set_local_pos_index 2 {- $dx_original_career_desc_pos 30}} - ;{{dx_play_a_show_panel find career_description.lbl} set_local_pos_index 0 {- $dx_original_career_desc_posx 55}} - ;{{dx_play_a_show_panel find career_description.lbl} set_local_pos_index 1 {+ $dx_original_career_desc_posz 30}} - {$this dx_refesh_songs} - {$this dx_pick_a_show} - {set $dx_play_a_show_line5 {localize play_a_show_refresh}} - {{dx_play_a_show_panel find inst1.lbl} set_token_fmt {sprint "1 . "}} - {{dx_play_a_show_panel find inst2.lbl} set_token_fmt {sprint "2. "}} - {{dx_play_a_show_panel find inst3.lbl} set_token_fmt {sprint "3. "}} - {{dx_play_a_show_panel find inst4.lbl} set_token_fmt {sprint "4. "}} - {{dx_play_a_show_panel find inst5.lbl} set_token_fmt {sprint "5. "}} - {if_else {== $line1eval song} - {{dx_play_a_show_panel find line1.lbl} set_song_and_artist_name_from_sym $random_song 0} - {{dx_play_a_show_panel find line1.lbl} set_token_fmt {sprint $dx_play_a_show_line1}} + (dx_pick_a_show + {set $availarray (genre year tempo song length year song genre genre length song year ugc year genre song tempo length song)} + {set $avail2array ()} + {set $avail3array ()} + {set $avail4array ()} + {resize $avail2array 0} + {resize $avail3array 0} + {resize $avail4array 0} + {set $line1eval {random_elem $availarray}} + {foreach $entry $availarray + {if {&& {!= $entry ""} {!= $entry $line1eval}} + {push_back $avail2array $entry} + } } - {if_else {== $line2eval song} - {{dx_play_a_show_panel find line2.lbl} set_song_and_artist_name_from_sym $random_song 0} - {{dx_play_a_show_panel find line2.lbl} set_token_fmt {sprint $dx_play_a_show_line2}} + {set $line2eval {random_elem $avail2array}} + {foreach $entry $avail2array + {if {&& {!= $entry ""} {!= $entry $line1eval} {!= $entry $line2eval}} + {push_back $avail3array $entry} + } } - {if_else {== $line3eval song} - {{dx_play_a_show_panel find line3.lbl} set_song_and_artist_name_from_sym $random_song 0} - {{dx_play_a_show_panel find line3.lbl} set_token_fmt {sprint $dx_play_a_show_line3}} + {set $line3eval {random_elem $avail3array}} + {foreach $entry $avail3array + {if {&& {!= $entry ""} {!= $entry $line1eval} {!= $entry $line2eval} {!= $entry $line3eval}} + {push_back $avail4array $entry} + } } - {if_else {== $line4eval song} - {{dx_play_a_show_panel find line4.lbl} set_song_and_artist_name_from_sym $random_song 0} - {{dx_play_a_show_panel find line4.lbl} set_token_fmt {sprint $dx_play_a_show_line4}} + {set $line4eval {random_elem $avail4array}} + {set $line5eval refresh} + {resize $avail2array 0} + {resize $avail3array 0} + {resize $avail4array 0} + {$this set_line $line1eval 1} + {$this set_line $line2eval 2} + {$this set_line $line3eval 3} + {$this set_line $line4eval 4} + {$this set_line $line5eval 5} + {unless {session_mgr is_local} + {if {is_leader_local} + {session send_msg_to_all + {'`' + ( + {do + {$this set_line {',' $line1eval} 1} + {$this set_line {',' $line2eval} 2} + {$this set_line {',' $line3eval} 3} + {$this set_line {',' $line4eval} 4} + {$this set_line {',' $line5eval} 5} + } + ) + kNetReliable + } + } + } } - {{dx_play_a_show_panel find line5.lbl} set_token_fmt {sprint $dx_play_a_show_line5}} + ) + (handle_album_art {if {! $current_voted_song} {$this update_preview_song $current_voted_song "dx/custom_textures/_additional_textures/blank_album_art_keep.png" 0} {{dx_play_a_show_panel find song_preview.lbl} set_token_fmt dx_play_a_show_welcome} @@ -736,15 +417,34 @@ {$this update_preview_song $current_voted_song "dx/custom_textures/_additional_textures/blank_album_art_keep.png" 0} } #endif - {$this dx_update_set_count} } } + ) + (dx_play_a_show_info + {set $dx_play_a_show_num_votes 0} + {set $slot1_voted FALSE} + {set $slot2_voted FALSE} + {set $slot3_voted FALSE} + {set $slot4_voted FALSE} + {set $slot1_vote FALSE} + {set $slot2_vote FALSE} + {set $slot3_vote FALSE} + {set $slot4_vote FALSE} + + {$this dx_refesh_songs} + {$this dx_pick_a_show} + {$this handle_album_art} + {$this dx_update_set_count} + {$this format_vote vote} {if $playintrotext {set $playintrotext FALSE} {play_header.lbl set text_token {sprint " "}} } {set $votingallowed TRUE} + {set $dx_play_a_show_required_votes 0} + {overshell begin_override_flow kOverrideFlow_None} + {overshell begin_override_flow kOverrideFlow_SongSettings} ) (calc_highest_vote {set $vote_check_array ()} @@ -791,42 +491,34 @@ } {$this dx_play_a_show_send_voted} ) + (store_voted_song + ($song) + {set $current_voted_song $song} + {meta_performer set_song $song} + {push_back $dx_playlist_array $song} + ) #define DX_PLAY_SONG_PICKER ( (genre - {set $current_voted_song $random_genre_song} - {meta_performer set_song $random_genre_song} - {push_back $dx_playlist_array $random_genre_song} + {$this store_voted_song $random_genre_song} ) (year - {set $current_voted_song $random_year_song} - {meta_performer set_song $random_year_song} - {push_back $dx_playlist_array $random_year_song} + {$this store_voted_song $random_year_song} ) (length - {set $current_voted_song $random_length_song} - {meta_performer set_song $random_length_song} - {push_back $dx_playlist_array $random_length_song} + {$this store_voted_song $random_length_song} ) (song - {set $current_voted_song $random_song} - {meta_performer set_song $random_song} - {push_back $dx_playlist_array $random_song} + {$this store_voted_song $random_song} ) (tempo - {set $current_voted_song $random_tempo_song} - {meta_performer set_song $random_tempo_song} - {push_back $dx_playlist_array $random_tempo_song} + {$this store_voted_song $random_tempo_song} ) (fem - {set $current_voted_song $random_fem_song} - {meta_performer set_song $random_fem_song} - {push_back $dx_playlist_array $random_fem_song} + {$this store_voted_song $random_fem_song} ) (ugc - {set $current_voted_song $random_ugc_song} - {meta_performer set_song $random_ugc_song} - {push_back $dx_playlist_array $random_ugc_song} + {$this store_voted_song $random_ugc_song} ) ) (hold_up @@ -849,38 +541,15 @@ } ) (dx_play_a_show_send_voted - {if {exists dx_send_vote} - {delete dx_send_vote} - } - {{dx_play_a_show_panel find inst1.lbl} set text_token {sprint {if_else {== $dx_play_a_show_vote 1} {sprint "j"} {sprint ""}} " 1 . "}} - {{dx_play_a_show_panel find inst2.lbl} set text_token {sprint {if_else {== $dx_play_a_show_vote 2} {sprint "j"} {sprint ""}} " 2. "}} - {{dx_play_a_show_panel find inst3.lbl} set text_token {sprint {if_else {== $dx_play_a_show_vote 3} {sprint "j"} {sprint ""}} " 3. "}} - {{dx_play_a_show_panel find inst4.lbl} set text_token {sprint {if_else {== $dx_play_a_show_vote 4} {sprint "j"} {sprint ""}} " 4. "}} - {{dx_play_a_show_panel find inst5.lbl} set text_token {sprint {if_else {== $dx_play_a_show_vote 5} {sprint "j"} {sprint ""}} " 5. "}} + {$this format_vote band} {play_header.lbl set text_token {sprint " "}} {$this update_preview_song $current_voted_song "dx/custom_textures/_additional_textures/blank_album_art_keep.png" 0} {song_preview.lbl set text_token {localize play_a_show_pick_songs}} {switch $dx_play_a_show_vote - (1 - {switch $line1eval - DX_PLAY_SONG_PICKER - } - ) - (2 - {switch $line2eval - DX_PLAY_SONG_PICKER - } - ) - (3 - {switch $line3eval - DX_PLAY_SONG_PICKER - } - ) - (4 - {switch $line4eval - DX_PLAY_SONG_PICKER - } - ) + (1 {switch $line1eval DX_PLAY_SONG_PICKER}) + (2 {switch $line2eval DX_PLAY_SONG_PICKER}) + (3 {switch $line3eval DX_PLAY_SONG_PICKER}) + (4 {switch $line4eval DX_PLAY_SONG_PICKER}) (5 {$this dx_refesh_songs} {$this update_preview_song $current_voted_song "dx/custom_textures/_additional_textures/blank_album_art_keep.png" 0} @@ -899,77 +568,64 @@ {delete dx_send_vote3} } {$this dx_play_countdown_set_time {localize play_a_show_submitting} 3} - {script_task - kTaskSeconds - (name dx_send_vote1) - (delay 1) - (script - {$this dx_play_countdown_set_time {localize play_a_show_submitting} 2}) + {script_task kTaskSeconds (name dx_send_vote1) (delay 1) + (script {$this dx_play_countdown_set_time {localize play_a_show_submitting} 2}) } - {script_task - kTaskSeconds - (name dx_send_vote2) - (delay 2) - (script - {$this dx_play_countdown_set_time {localize play_a_show_submitting} 1}) + {script_task kTaskSeconds (name dx_send_vote2) (delay 2) + (script {$this dx_play_countdown_set_time {localize play_a_show_submitting} 1}) } - {script_task - kTaskSeconds - (name dx_send_vote3) - (delay 3) - (script + {script_task kTaskSeconds (name dx_send_vote3) (delay 3) + (script {$this dx_play_countdown_set_time {localize play_a_show_submitting} 0} {unless {== $dx_play_a_show_vote 5} {synth play career_rankup.cue}} - {$this dx_play_a_show_report_vote}) + {$this dx_play_a_show_info} + ) } ) - (dx_slot_voted - {{dx_play_a_show_panel find inst1.lbl} set text_token - {sprint - {if_else {&& $slot1_voted {== $slot1_vote 1}} {sprint "" $slot1_voted_icon ""} {sprint ""}} - {if_else {&& $slot2_voted {== $slot2_vote 1}} {sprint "" $slot2_voted_icon ""} {sprint ""}} - {if_else {&& $slot3_voted {== $slot3_vote 1}} {sprint "" $slot3_voted_icon ""} {sprint ""}} - {if_else {&& $slot4_voted {== $slot4_vote 1}} {sprint "" $slot4_voted_icon ""} {sprint ""}} - " 1 . " - } - } - {{dx_play_a_show_panel find inst2.lbl} set text_token - {sprint - {if_else {&& $slot1_voted {== $slot1_vote 2}} {sprint "" $slot1_voted_icon ""} {sprint ""}} - {if_else {&& $slot2_voted {== $slot2_vote 2}} {sprint "" $slot2_voted_icon ""} {sprint ""}} - {if_else {&& $slot3_voted {== $slot3_vote 2}} {sprint "" $slot3_voted_icon ""} {sprint ""}} - {if_else {&& $slot4_voted {== $slot4_vote 2}} {sprint "" $slot4_voted_icon ""} {sprint ""}} - " 2. " - } - } - {{dx_play_a_show_panel find inst3.lbl} set text_token - {sprint - {if_else {&& $slot1_voted {== $slot1_vote 3}} {sprint "" $slot1_voted_icon ""} {sprint ""}} - {if_else {&& $slot2_voted {== $slot2_vote 3}} {sprint "" $slot2_voted_icon ""} {sprint ""}} - {if_else {&& $slot3_voted {== $slot3_vote 3}} {sprint "" $slot3_voted_icon ""} {sprint ""}} - {if_else {&& $slot4_voted {== $slot4_vote 3}} {sprint "" $slot4_voted_icon ""} {sprint ""}} - " 3. " - } - } - {{dx_play_a_show_panel find inst4.lbl} set text_token - {sprint - {if_else {&& $slot1_voted {== $slot1_vote 4}} {sprint "" $slot1_voted_icon ""} {sprint ""}} - {if_else {&& $slot2_voted {== $slot2_vote 4}} {sprint "" $slot2_voted_icon ""} {sprint ""}} - {if_else {&& $slot3_voted {== $slot3_vote 4}} {sprint "" $slot3_voted_icon ""} {sprint ""}} - {if_else {&& $slot4_voted {== $slot4_vote 4}} {sprint "" $slot4_voted_icon ""} {sprint ""}} - " 4. " - } - } - {{dx_play_a_show_panel find inst5.lbl} set text_token - {sprint - {if_else {&& $slot1_voted {== $slot1_vote 5}} {sprint "" $slot1_voted_icon ""} {sprint ""}} - {if_else {&& $slot2_voted {== $slot2_vote 5}} {sprint "" $slot2_voted_icon ""} {sprint ""}} - {if_else {&& $slot3_voted {== $slot3_vote 5}} {sprint "" $slot3_voted_icon ""} {sprint ""}} - {if_else {&& $slot4_voted {== $slot4_vote 5}} {sprint "" $slot4_voted_icon ""} {sprint ""}} - " 5. " - } + (format_vote + ($type) + {set $lines (1 2 3 4 5)} + {switch $type + (vote + {foreach $line $lines + {{dx_play_a_show_panel find {sprint "inst" $line ".lbl"}} set text_token + {sprint + {if_else {&& $slot1_voted {== $slot1_vote $line}} {sprint "" $slot1_voted_icon ""} {sprint ""}} + {if_else {&& $slot2_voted {== $slot2_vote $line}} {sprint "" $slot2_voted_icon ""} {sprint ""}} + {if_else {&& $slot3_voted {== $slot3_vote $line}} {sprint "" $slot3_voted_icon ""} {sprint ""}} + {if_else {&& $slot4_voted {== $slot4_vote $line}} {sprint "" $slot4_voted_icon ""} {sprint ""}} + {if_else {== $line 1} {sprint " "} {sprint ""}} $line {if_else {== $line 1} {sprint " . "} {sprint ". "}} + } + } + } + ) + (band + {foreach $line $lines + {{dx_play_a_show_panel find {sprint "inst" $line ".lbl"}} set text_token + {sprint + {if_else {== $dx_play_a_show_vote $line} + {sprint "j"} + {sprint ""} + } + {if_else {== $line 1} + {sprint " "} + {sprint ""} + } + $line + {if_else {== $line 1} + {sprint " . "} + {sprint ". "} + } + } + } + } + ) } + ) + (dx_slot_voted + {$this format_vote vote} {if {== $dx_play_a_show_num_votes $dx_play_a_show_required_votes} + {$this dx_play_countdown_set_time {localize play_a_show_lock_in} 3} {if {exists dx_hold_vote1} {delete dx_hold_vote1} } @@ -979,58 +635,19 @@ {if {exists dx_hold_vote3} {delete dx_hold_vote3} } - {$this dx_play_countdown_set_time {localize play_a_show_lock_in} 3} - {script_task - kTaskSeconds - (name dx_hold_vote1) - (delay 1) + {script_task kTaskSeconds (name dx_hold_vote1) (delay 1) (script {$this dx_play_countdown_set_time {localize play_a_show_lock_in} 2}) } - {script_task - kTaskSeconds - (name dx_hold_vote2) - (delay 2) + {script_task kTaskSeconds (name dx_hold_vote2) (delay 2) (script {$this dx_play_countdown_set_time {localize play_a_show_lock_in} 1}) } - {script_task - kTaskSeconds - (name dx_hold_vote3) - (delay 3) + {script_task kTaskSeconds (name dx_hold_vote3) (delay 3) (script {$this dx_play_countdown_set_time {localize play_a_show_lock_in} 0} - {$this calc_highest_vote}) - } - } - ) - (dx_play_a_show_report_vote - {if_else {== $dx_play_a_show_vote 5} - {do - {$this update_preview_song $current_voted_song "dx/custom_textures/_additional_textures/blank_album_art_keep.png" 0} - {song_preview.lbl set text_token {localize play_a_show_refreshed}} - } - {if $current_voted_song - {play_header.lbl set text_token {localize play_a_show_bandvote}} - #ifdef HX_XBOX - {if_else {file_exists {song_mgr song_file_path {meta_performer song} "_keep.png_xbox"}} - {$this update_preview_song $current_voted_song {song_mgr song_file_path {meta_performer song} "_keep.png"} 0} - {$this update_preview_song $current_voted_song "dx/custom_textures/_additional_textures/blank_album_art_keep.png" 0} - } - #endif - #ifdef HX_PS3 - {if_else {file_exists {song_mgr song_file_path {meta_performer song} "_keep.png_ps3"}} - {$this update_preview_song $current_voted_song {song_mgr song_file_path {meta_performer song} "_keep.png"} 0} - {$this update_preview_song $current_voted_song "dx/custom_textures/_additional_textures/blank_album_art_keep.png" 0} - } - #endif - #ifdef HX_WII - {if_else {file_exists {song_mgr song_file_path {meta_performer song} "_keep.png_wii"}} - {$this update_preview_song $current_voted_song {song_mgr song_file_path {meta_performer song} "_keep.png"} 0} - {$this update_preview_song $current_voted_song "dx/custom_textures/_additional_textures/blank_album_art_keep.png" 0} - } - #endif + {$this calc_highest_vote} + ) } } - {$this dx_play_a_show_info} ) (dx_play_a_show_recieve_song {if_else {> {size $dx_playlist_array} 0} @@ -1042,11 +659,6 @@ } {do {dx_passive_messenger_symbol "no songs queued"} - ;{ui sync_screen main_hub_screen 0} - ;{if {! $dx_play_a_show_warn} - ; {set $dx_play_a_show_warn TRUE} - ; {dx_modal_messenger_symbol "Play a show is a highly alpha feature and requires the usage of an external tool to generate a playlist. this is placeholder text that should be updated later"} - ;} } } ) diff --git a/_ark/dx/ui/song_select/dx_song_select_funcs.dta b/_ark/dx/ui/song_select/dx_song_select_funcs.dta index 0cd678cf1e..48644faa22 100644 --- a/_ark/dx/ui/song_select/dx_song_select_funcs.dta +++ b/_ark/dx/ui/song_select/dx_song_select_funcs.dta @@ -29,7 +29,7 @@ {unless $rb3e_checked_song_count {set $rb3e_checked_song_count TRUE} {if {> {{song_select_panel find song.lst} num_data} $high_song_count} - {dx_modal_messenger_symbol 'High song counts, especially with multiple players, have been known to cause instability issues after prolonged play-time. It is recommended to:\nStick to music video venues\nTurn off song transition cutscenes\nAvoid very long, 10 min+ songs\nOr lower your song count\nYou have been warned.\n\nTo disable this warning go to Deluxe Settings > Advanced > Functional Options > High Song Count Warning'} + {dx_modal_messenger_symbol high_song_count_warn} } } } @@ -99,7 +99,10 @@ {unless [waiting_for_sort] {song.lst set_scroll_user $user} - {song.lst scroll -10}}) ; dx scroll the list up by 10 slots when pressing left dpad + {song.lst set_selected_simulate_scroll {- {song.lst selected_pos} 1}} + {set $pause_scroll_sound TRUE} + {song.lst set_selected_simulate_scroll {- {song.lst selected_pos} 9}} + {set $pause_scroll_sound FALSE}}) ; dx scroll the list up by 10 slots when pressing left dpad ) #define DX_SONG_LIST_RIGHT_ACTION ( @@ -110,5 +113,8 @@ {unless [waiting_for_sort] {song.lst set_scroll_user $user} - {song.lst scroll 10}}) ; dx scroll the list down by 10 slots when pressing right dpad + {song.lst set_selected_simulate_scroll {+ {song.lst selected_pos} 1}} + {set $pause_scroll_sound TRUE} + {song.lst set_selected_simulate_scroll {+ {song.lst selected_pos} 9}} + {set $pause_scroll_sound FALSE}}) ; dx scroll the list down by 10 slots when pressing right dpad ) \ No newline at end of file diff --git a/_ark/dx/ui/splash/dx_splash_handles.dta b/_ark/dx/ui/splash/dx_splash_handles.dta index aed6821b92..90a60ef338 100644 --- a/_ark/dx/ui/splash/dx_splash_handles.dta +++ b/_ark/dx/ui/splash/dx_splash_handles.dta @@ -4,8 +4,6 @@ ( "milohax bad!" "Hey bud, listen up!" - "Kimbey #1!" - "Saturday, the 28th of January, 2023!" "Arby's, we have The Meats!" "Welcome to the future of Rock Band 3!" "THIS IS ROCK BAND 3!" @@ -25,6 +23,7 @@ #endif #endif "Yes, you can turn off lanes." + "The hit window shrinks!" "Also try Amplitude!" "NAME THE TIME, NAME THE PLACE!" "Also Try Guitar Freaks!" @@ -120,7 +119,6 @@ "Team DLC doesn't use the U-word!" "Chad Warden!" "BALLIIIIN'!!!" - "Now with 100% more Kimbey!" "You have won uppies!" "Full Combo!" "Hey mami, you sexy!" @@ -302,11 +300,22 @@ DX_INTERNAL_SPLASH_TEXT } #endif - #ifdef RB3E - {{{{sv8_panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/rb3dx-rb3e_logo.png"} - #else - {{{{sv8_panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/rb3dx_logo.png"} - #endif + ; set main menu logo based on season + {if_else $dx_seasonal_logos + {do + {get_date_time $year $month $day $hour $minute $second} + {cond + ({&& {== $month 2} {>= $day 7} {<= $day 17}} {set $dx_season valentines}) + ({&& {== $month 4} {== $day 1}} {set $dx_season aprilfools}) + ({== $month 6} {set $dx_season pride}) + ({== $month 10} {set $dx_season halloween}) + ({== $month 12} {set $dx_season christmas}) + (else {set $dx_season standard}) + } + } + {set $dx_season standard} + } + {{{{sv8_panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap {sprint "dx/custom_textures/_additional_textures/logo-" $dx_season #ifdef RB3E "-rb3e" #endif ".png"}} {if {== $dx_splash_beta_egg TRUE} {{{{sv8_panel find sv8_a} find cityscape_ao} find logo.mesh} set_showing FALSE} } diff --git a/_ark/dx/ui/tour/dx_tour_handles.dta b/_ark/dx/ui/tour/dx_tour_handles.dta new file mode 100644 index 0000000000..e69de29bb2 diff --git a/_ark/dx/world/dx_camera_funcs.dta b/_ark/dx/world/dx_camera_funcs.dta index 5060d9ba69..f77e770eec 100644 --- a/_ark/dx/world/dx_camera_funcs.dta +++ b/_ark/dx/world/dx_camera_funcs.dta @@ -75,6 +75,9 @@ ;{dx_log_writer insane ; {sprintf "Executed dx_camera_shake_setter - time: %.4fms" ; {time + #ifdef HX_WII + {notify "dx camera shake crashes debug heads up"} + #else {unless $dx_camera_shake ;{$char iterate CharHair $hair {$hair reset 35}} {$world iterate WorldDir $wd @@ -98,6 +101,7 @@ } } } + #endif ; } ; } ;} @@ -150,25 +154,27 @@ ; } ;} } +#ifdef TEMP_DISABLED {func dx_restore_online_transitions {cond - ({&& {session_mgr is_local} $dx_black_menu} + ({&& {session_mgr is_local} {== $dx_forced_song_load_bg none}} {do - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 3 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 4 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 5 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 6 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 1 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 2 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 3 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 4 $dx_forced_song_load_bg} - {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 5 $dx_forced_song_load_bg} + #ifdef HX_XBOX {set $dx_xbox_show_fallback TRUE} #endif + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 3 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 4 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 5 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 6 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 1 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 2 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 3 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 4 (TRUE ())} + {set_elem {find $syscfg vignettes interstitials meta_loading_outro song_select_screen} 5 (TRUE ())} } ) - ({&& {session_mgr is_local} $dx_forced_song_load_bg {! $dx_black_menu}} + ({&& {session_mgr is_local} $dx_forced_song_load_bg {!= $dx_forced_song_load_bg none}} {do {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 1 $dx_forced_song_load_bg} {set_elem {find $syscfg vignettes interstitials preloading_screen #ifdef HX_WII pregame_screen #else game_screen #endif} 2 $dx_forced_song_load_bg} @@ -201,6 +207,7 @@ ) } } +#endif {func dx_sv_menu_logo_set ($panel) @@ -219,17 +226,13 @@ (420 {{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/the_game_logo.png"}) (666 {{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/milohax-harm_logo.png"}) {switch $dx_main_logo_number - (1 {{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/rb3dx_logo.png"}) + (1 {{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap {sprint "dx/custom_textures/_additional_textures/logo-" $dx_season ".png"}}) (2 {{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/rb3enhanced_logo.png"}) (3 {{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/ashcentral_logo.png"}) kDataUnhandled } } - ;#ifdef RB3E - ;{{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/rb3dx-rb3e_logo.png"} - ;#else - ;{{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap "dx/custom_textures/_additional_textures/rb3dx_logo.png"} - ;#endif + ;{{{{$panel find sv8_a} find cityscape_ao} find logo.tex} set_bitmap {sprint "dx/custom_textures/_additional_textures/logo-" $dx_season #ifdef RB3E "-rb3e" #endif ".png"}} {{{{$panel find sv8_a} find cityscape_ao} find logo.mesh} set_local_pos_index 0 -750} {{{{$panel find sv8_a} find cityscape_ao} find logo.mesh} set_local_rot_index 2 -30} {{{{$panel find sv8_a} find cityscape_ao} find logo.mesh} set_local_scale_index 0 .45} diff --git a/_ark/dx_settings.dta b/_ark/dx_settings.dta new file mode 100644 index 0000000000..fa3080d4ca --- /dev/null +++ b/_ark/dx_settings.dta @@ -0,0 +1,2 @@ +;do not commit to this file +;you can use this to load a regular dx_settings.dta for debugging \ No newline at end of file diff --git a/_ark/sfx/streams/rb1_shellmusic_multi_igetby.mogg b/_ark/sfx/streams/rb1_shellmusic_multi_igetby.mogg new file mode 100644 index 0000000000..ea79aee714 Binary files /dev/null and b/_ark/sfx/streams/rb1_shellmusic_multi_igetby.mogg differ diff --git a/_ark/sfx/streams/rb3dx_shellmusic_multi_panicattack.mogg b/_ark/sfx/streams/rb3dx_shellmusic_multi_panicattack.mogg new file mode 100644 index 0000000000..f649ae59bc Binary files /dev/null and b/_ark/sfx/streams/rb3dx_shellmusic_multi_panicattack.mogg differ diff --git a/_ark/songs/beforeiforget/beforeiforget_update.mid b/_ark/songs/beforeiforget/beforeiforget_update.mid index 9f6504a304..6599aef854 100644 Binary files a/_ark/songs/beforeiforget/beforeiforget_update.mid and b/_ark/songs/beforeiforget/beforeiforget_update.mid differ diff --git a/_ark/songs/updates/areyougonnabemygirl/areyougonnabemygirl_update.mid b/_ark/songs/updates/areyougonnabemygirl/areyougonnabemygirl_update.mid index a0d03dcdbb..064d1fbb33 100644 Binary files a/_ark/songs/updates/areyougonnabemygirl/areyougonnabemygirl_update.mid and b/_ark/songs/updates/areyougonnabemygirl/areyougonnabemygirl_update.mid differ diff --git a/_ark/songs/updates/thembones/thembones_update.mid b/_ark/songs/updates/thembones/thembones_update.mid index b085d190b7..6a1fa90605 100644 Binary files a/_ark/songs/updates/thembones/thembones_update.mid and b/_ark/songs/updates/thembones/thembones_update.mid differ diff --git a/_ark/songs/updates/ugc_5001220/ugc_5001220_update.mid b/_ark/songs/updates/ugc_5001220/ugc_5001220_update.mid index 712bf20d9d..b8566d4377 100644 Binary files a/_ark/songs/updates/ugc_5001220/ugc_5001220_update.mid and b/_ark/songs/updates/ugc_5001220/ugc_5001220_update.mid differ diff --git a/_ark/ui/band/manage_band.dta b/_ark/ui/band/manage_band.dta index 4f04540e93..100e4e9ab4 100644 --- a/_ark/ui/band/manage_band.dta +++ b/_ark/ui/band/manage_band.dta @@ -4,7 +4,6 @@ manage_band_panel (file "manage_band.milo") - DX_MANAGE_BAND_HANDLES (reward_vignettes ((vignetteviewer_rv1 createband_rewardvignette_created_screen) (vignetteviewer_rv2 campaign_rewardvignette_firstgig_screen) @@ -279,5 +278,4 @@ (enter {dialog_panel set_ok cannot_launch_when_online}) (SELECT_MSG - {ui pop_screen})} -DX_CUTSCENE_SCREEN \ No newline at end of file + {ui pop_screen})} \ No newline at end of file diff --git a/_ark/ui/calibration/calibration.dta b/_ark/ui/calibration/calibration.dta index 0b57298ece..1f71f3066e 100644 --- a/_ark/ui/calibration/calibration.dta +++ b/_ark/ui/calibration/calibration.dta @@ -22,8 +22,13 @@ (file cal_background.milo) (parent {ui current_screen}) - (enter) - (exit) + (enter {rnd set_sync 1}) + (exit + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (BUTTON_DOWN_MSG {switch $action @@ -131,6 +136,7 @@ 0.5 {profile_mgr get_excess_audio_lag}}}})}}) (enter + {rnd set_sync 1} {$this init_panel} {$this set_focus @@ -143,6 +149,12 @@ {button_press_xbox.mesh set showing TRUE} #endif {overshell set_allows_button_pulse FALSE}) + (exit + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (init_panel {$this add_sink cal_background_panel} {$this set_state init} @@ -333,6 +345,7 @@ (selected_mode '') (calibration_user '') (enter + {rnd set_sync 1} {$this add_sink cal_background_panel} {cal_mode.lst set_provider calibration_modes_provider} {if @@ -352,7 +365,12 @@ [selected_mode] FALSE}) (exit - {calibration_modes_provider cleanup}) + {calibration_modes_provider cleanup} + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (unload) (controllers_changed {if_else @@ -406,7 +424,14 @@ (panels dialog_panel) (focus dialog_panel) (enter + {rnd set_sync 1} {dialog_panel set_ok cal_need_calbert}) + (exit + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (SELECT_MSG {ui pop_screen})} {new @@ -472,6 +497,7 @@ #define CAL_MANUAL_PANEL_CONTENTS ((file cal_manual.milo) (enter + {rnd set_sync 1} {$this add_sink cal_background_panel} {if_else [is_video] @@ -507,6 +533,12 @@ {$this set_focus ""}) + (exit + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (BUTTON_DOWN_MSG {switch $action @@ -586,6 +618,7 @@ cal_complete_panel (file cal_complete.milo) (enter + {rnd set_sync 1} {acc_mgr earn_accomplishment_for_all acc_calibrate} {$this set_focus ''} {$this add_sink cal_background_panel} @@ -613,6 +646,12 @@ {'+' 0.5 {profile_mgr get_excess_video_lag}}}})}) + (exit + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (BUTTON_DOWN_MSG {switch $action @@ -648,8 +687,14 @@ "cal_quick.milo") (focus audio_lag.sld) (enter + {rnd set_sync 1} {$this update_all_from_profile}) - (exit) + (exit + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (SCROLL_SELECT_MSG {unless $selected @@ -733,9 +778,16 @@ [failure_message] $message}) (enter + {rnd set_sync 1} {dialog_panel set_ok [failure_message]}) + (exit + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (SELECT_MSG {[return_screen] set_state @@ -763,7 +815,14 @@ [numbers_screen] $screen}) (enter + {rnd set_sync 1} {dialog_panel set_custom lag_info_failure retry cal_numbers opt1.btn}) + (exit + {if_else {== $dx_vsync 0} + {rnd set_sync 0} + {rnd set_sync 1} + } + ) (SELECT_MSG {switch $component diff --git a/_ark/ui/endgame/endgame.dta b/_ark/ui/endgame/endgame.dta index f9c8faf079..9065a75434 100644 --- a/_ark/ui/endgame/endgame.dta +++ b/_ark/ui/endgame/endgame.dta @@ -220,6 +220,8 @@ {$this can_restart} {is_leader_local} $dx_restart_allowed} + {outro_vignette_loader unload} + {world_panel load} {if_else {gamemode in_mode tour} {ui push_screen tour_confirm_restart_screen} diff --git a/_ark/ui/game.dta b/_ark/ui/game.dta index ffcce2aa9e..b736e22512 100644 --- a/_ark/ui/game.dta +++ b/_ark/ui/game.dta @@ -17,12 +17,17 @@ (audition_cam_toggle {audition_cycle_free_camera}) DX_GAME_PANEL_HANDLES + #ifdef HX_WII (enter {dx_trainer_checker} {unless $dx_skip_game_setup {$this dx_on_game_enter} } ) + (exit + {$this dx_on_game_exit} + ) + #endif (reset {$this dx_on_game_reset} {active_events_parser @@ -215,6 +220,12 @@ ((disable_screen_saver TRUE) PAUSE_ON_MIC_DISCONNECT (enter + #ifndef HX_WII + {dx_trainer_checker} + {unless $dx_skip_game_setup + {$this dx_on_game_enter} + } + #endif {$this set_showing TRUE} {set [delayed_mic_check] @@ -241,7 +252,9 @@ {handle ($this my_enter)}) (exit + #ifndef HX_WII {$this dx_on_game_exit} + #endif {platform_mgr remove_sink $this ui_changed} {platform_mgr remove_sink $this microphones_changed} {synth stop_playback_all_mics} @@ -269,7 +282,7 @@ {set [chosen_vignette] ''} - {if {!= {sprint $dx_forced_song_load_bg} "(1 ())"} ;if we turned off song transitions, we cant run outro_vignette_loader or it will crash + {if {!= $dx_forced_song_load_bg none} ;if we turned off song transitions, we cant run outro_vignette_loader or it will crash {if {meta_performer is_set_complete} {meta_performer upload_debug_stats} diff --git a/_ark/ui/loading/loading.dta b/_ark/ui/loading/loading.dta index d95fb1a360..c7c5044fc1 100644 --- a/_ark/ui/loading/loading.dta +++ b/_ark/ui/loading/loading.dta @@ -10,6 +10,9 @@ (enter {$this dx_loading_enter} {$this dx_load_tip_and_author_finder} + {if $dx_prep_show_flow + {set $dx_prep_show_flow FALSE} + } {set $current_solo_highscore FALSE} {foreach $entry $highscore_tracker {if {== {elem $entry 0} {meta_performer song}} diff --git a/_ark/ui/locale/esl/locale_updates_keep.dta b/_ark/ui/locale/esl/locale_updates_keep.dta index 848bf1d975..91b4e13fdf 100644 --- a/_ark/ui/locale/esl/locale_updates_keep.dta +++ b/_ark/ui/locale/esl/locale_updates_keep.dta @@ -302,6 +302,10 @@ (os_venuefps_30 "FPS del Escenario: 30") (os_venuefps_30_desc "Bloquea los FPS del Escenario a 30 (vanilla)") (60fps_warning "ADVERTENCIA\n\nLos 60FPS de los Escenarios ¡NO SON RECOMENDADOS EN CONSOLA!") +(os_vsync_on "VSync: Si") +(os_vsync_on_desc "VSync está activado por defecto (Vanilla)") +(os_vsync_off "VSync: No") +(os_vsync_off_desc "VSync está desactivado (esto es increible)") (os_force_high_lod_on "Nivel de Detalle: Alto") (os_force_high_lod_on_desc "Fuerza el nivel de detalle alto en los personajes (no recomendado en consola)") (os_force_high_lod_off "Nivel de Detalle: Normal") @@ -351,6 +355,10 @@ (os_od_ready_on_desc "Alterna un indicador de \q¡Éxtasis Listo!\q cuando este listo para activarse, similar a Guitar Hero y YARG") (os_od_ready_off "Indic. \q¡Éxtasis Listo!\q: No") (os_od_ready_off_desc "Alterna un indicador de \q¡Éxtasis Listo!\q cuando este listo para activarse, similar a Guitar Hero y YARG") +(os_diff_on "Indic. de Dificultad: Si") +(os_diff_on_desc "Muestra la dificultad de la canción al iniciar con un anillo para cada instrumento, algo parecido a RB4") +(os_diff_off "Indic. de Dificultad: No") +(os_diff_off_desc "No mostrara la dificultad de la canción con un anillo al iniciar") (os_countdown_on "Cuenta Regresiva: Sí") (os_countdown_on_desc "Muestra una cuenta regresiva durante las pausas largas\nsimilar a Clone Hero y Rock Band 4.") (os_countdown_off "Cuenta Regresiva: No") @@ -395,6 +403,14 @@ (os_player_icons_on_desc "Muestra tu icono de jugador en el menú del juego") (os_player_icons_off "Icono del jugador: No") (os_player_icons_off_desc "Oculta tu icono de jugador en el menú del juego") +(os_song_rings_on "Difi. Sel. de Canciones: Anillo") +(os_song_rings_off "Difi. Sel. de Canciones: Puntos") +(os_song_rings_on_desc "Usa el estilo de anillo de YARG en la selección de canciones") +(os_song_rings_off_desc "Oh te gusta los clásicos puntos de dificultad") +(os_high_score_on "Aviso de punt. más alta: Si") +(os_high_score_off "Aviso de punt. más alta: No") +(os_high_score_on_desc "Aviso cuando superes tu puntuación guardada en un solitario") +(os_high_score_off_desc "Aviso cuando superes tu puntuación guardada en un solitario") ;functional options (os_prompt_save_on "Auto-guardado de Conf. Dx: Sí") (os_prompt_save_off "Auto-guardado de Conf. Dx: No") diff --git a/_ark/ui/main/main_hub.dta b/_ark/ui/main/main_hub.dta index a489958aef..3b8ef1226a 100644 --- a/_ark/ui/main/main_hub.dta +++ b/_ark/ui/main/main_hub.dta @@ -127,7 +127,8 @@ {overshell update_all} {$this dx_main_on_enter} {set $got_meta FALSE} - {campaign clear_current_goal}) + {campaign clear_current_goal} + {$this set_state kMainHubState_Main}) #ifndef HX_WII (poll {if {&& {! $got_meta} {content_mgr refresh_done}} diff --git a/_ark/ui/net/join_invite.dta b/_ark/ui/net/join_invite.dta new file mode 100644 index 0000000000..9fc844c564 --- /dev/null +++ b/_ark/ui/net/join_invite.dta @@ -0,0 +1,64 @@ +{new + JoinInvitePanel + join_invite_panel + (file + "join_invite.milo") + (enter + {critical_user_listener clear_critical_user} + {net_sync disable} + {net_sync set_ui_state kNetUI_JoinInvite} + {gamemode set_mode init} + {overshell leave_options} + {$this set_focus retry.btn} + {$this disable retry.btn}) + (exit + {ui set_invite_accepted FALSE}) + (check_disconnect + {unless + {ui_event_mgr has_active_destructive_event} + #ifdef HX_XBOX + {if + {! + {platform_mgr is_connected}} + {ui_event_mgr + trigger_event + lost_connection + (dummy init kLostConnection)}} + #else + {if + {! + {server is_connected}} + {ui_event_mgr + trigger_event + lost_connection + (dummy init kLostServer)}} + #endif}) + (enable_retry + {$this enable retry.btn} + {$this set_focus retry.btn}) + (set_presence + ($token) + {presence.lbl set text_token $token}) + (SELECT_MSG + {switch + $component + (retry.btn + {$this disable retry.btn} + {$this set_joining_user $user} + {$this join_invite}) + (cancel.btn + {session disconnect} + {ui goto_screen main_hub_screen})}) + (BUTTON_DOWN_MSG + {cond + ({!= $action kAction_Cancel} + kDataUnhandled) + (TRUE + {session disconnect} + kDataUnhandled)})} +{new + BandScreen + join_invite_screen + (panels meta join_invite_panel) + (back main_hub_screen) + (focus join_invite_panel)} \ No newline at end of file diff --git a/_ark/ui/overshell/overshell.dta b/_ark/ui/overshell/overshell.dta index 0c3f6a9fc4..a72e95db85 100644 --- a/_ark/ui/overshell/overshell.dta +++ b/_ark/ui/overshell/overshell.dta @@ -133,7 +133,7 @@ (show_message {{overshell_player_message find show.trg} trigger} - #ifndef HX_WII {overshell_player_message set_showing TRUE} #endif) + {overshell_player_message set_showing TRUE}) (hide_message {{overshell_player_message find hide.trg} trigger}) @@ -374,12 +374,24 @@ (dest 0)}) (wait_for_session {$this update_all}) + #ifdef RB3E + (move_slots + ($in_game) + {if_else + $in_game + {if_else + {modifier_mgr is_modifier_active mod_auto_vocals} + {slot_positions.anim set_frame 2} + {slot_positions.anim set_frame 1}} + {slot_positions.anim set_frame 0}}) + #else (move_slots ($in_game) {if_else $in_game {slot_positions.anim set_frame DX_IS_VOX_LANED} ; dx - dynamically moves the vocalist's pause menu depending on if they're on a laned instrument or not {slot_positions.anim set_frame 0}}) + #endif (set_position_frame ($frame) {slot_positions.anim set_frame $frame}) diff --git a/_ark/ui/overshell/overshell_dir.dta b/_ark/ui/overshell/overshell_dir.dta index 74e02ff386..65079ef4dc 100644 --- a/_ark/ui/overshell/overshell_dir.dta +++ b/_ark/ui/overshell/overshell_dir.dta @@ -82,7 +82,10 @@ (types (overshell_slot (get_native_platform - $dx_overshell_platform + {do + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} + $dx_overshell_platform + } ) (init {$this setup_static_lists} @@ -92,10 +95,12 @@ {$this cache_lists} {$this set_platform - {$this get_native_platform}}) + {$this get_native_platform}} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (enter {$this init} - {modifiers.lst set circular 1}) ;circular modifiers menu + {modifiers.lst set circular 1} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) ;circular modifiers menu (setup_providers ($char_provider $profiles_provider #ifdef HX_WII $friends_provider #else $invite_provider #endif $part_select_provider $cymbal_provider $modifier_provider) {chars.lst set_provider $char_provider} @@ -107,7 +112,8 @@ #endif {choose_part.lst set_provider $part_select_provider} {options_drum.lst set_provider $cymbal_provider} - {modifiers.lst set_provider $modifier_provider}) + {modifiers.lst set_provider $modifier_provider} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (setup_static_lists {choose_diff.lst set_data @@ -179,7 +185,8 @@ {no_invitations.lst set_data (wii_friends_no_invitations_ok)} - #endif) + #endif + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (setup_online_options_list ($platform) {do @@ -350,7 +357,8 @@ {push_back $options overshell_sign_in_continue}} {push_back $options overshell_sign_in} {push_back $options overshell_sign_in_cancel} - {sign_in_to_register.lst set_data $options}}) + {sign_in_to_register.lst set_data $options}} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (setup_game_options_list ($controller_type $online_options $online_enabled $in_game $solo) {do @@ -491,6 +499,7 @@ {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (refresh_list_types_in_nav_chain ($list $in_track_mode) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {if $list {do @@ -562,6 +571,7 @@ {$list get nav_down}}}) (update_controller_type ($controller_type $controller_font_char) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {slot_instrument_icon.lbl set icon $controller_font_char} {mic_arrows.grp set_showing @@ -573,12 +583,14 @@ {difficulty_pos_non_vocals.trg trigger}}}) (update_sign_in_continue ($can_continue) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {if_else $can_continue {sign_in_to_register.lst enable_data overshell_sign_in_continue} {sign_in_to_register.lst disable_data overshell_sign_in_continue}}) (update_kick_allowed ($can_kick) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {if_else $can_kick {online_options.lst enable_data overshell_kick} @@ -656,14 +668,20 @@ #endif (update_local_status ($is_local) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {pad_num.lbl set_showing $is_local}) (update_pad_num ($pad_num) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {pad_num.lbl set_int $pad_num}) (button_pulse_joined - {button_pulse_joined.trig trigger}) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} + {button_pulse_joined.trig trigger} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (button_pulse_unjoined - {button_pulse_unjoined.trig trigger}) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} + {button_pulse_unjoined.trig trigger} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (update_user_name ($user) #ifdef HX_PS3 @@ -680,13 +698,15 @@ {user_name.lbl set_token_fmt {sprint $dx_current_player_name_sanitized}} #else {user_name.lbl set_user_name $user} - #endif) + #endif + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (update_char_provider ($provider) {chars.lst refresh}) (update_users_provider ($provider) - {users.lst set_provider $provider}) + {users.lst set_provider $provider} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (update_remote_status ($status_token_fmt) {remote_status.lbl set_token_fmt $status_token_fmt}) @@ -753,10 +773,32 @@ {lefty_and_static_toggle.lbl set text_token overshell_righty_flip}}}) (update_auto_vocals_enabled ($enabled) - {auto_vocals.chk set checked $enabled}) + {if {! $got_check_1_pos} + {set $got_check_1_pos TRUE} + {set $check_1_pos_stored {auto_vocals.chk get_local_pos_index 0}} + } + {if_else $actually_show_checks + {do + {auto_vocals.chk set_local_pos_index 0 $check_1_pos_stored} + {auto_vocals.chk set checked $enabled} + } + {auto_vocals.chk set_local_pos_index 0 {+ $check_1_pos_stored 1500}} + } + ) (update_no_fail_enabled ($enabled) - {no_fail.chk set checked $enabled}) + {if {! $got_check_2_pos} + {set $got_check_2_pos TRUE} + {set $check_2_pos_stored {no_fail.chk get_local_pos_index 0}} + } + {if_else $actually_show_checks + {do + {no_fail.chk set_local_pos_index 0 $check_2_pos_stored} + {no_fail.chk set checked $enabled} + } + {no_fail.chk set_local_pos_index 0 {+ $check_2_pos_stored 1500}} + } + ) (update_in_game_options ($quit_token $can_skip $restart $change_diff $metronome $practice #ifdef HX_WII $trainer #endif $can_quit) {do @@ -832,6 +874,7 @@ {options.lst disable_data overshell_song_options_in_game}}) (update_character_portrait ($tex) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {choose_character.mat set diffuse_tex @@ -917,6 +960,7 @@ #ifndef HX_WII (set_can_change_synapse ($can_change) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {if_else $can_change {if_else {modifier_mgr is_modifier_active mod_auto_vocals} ;Disables while in AIM, option only works when Vocals is tied to an active player @@ -930,6 +974,7 @@ {static_vocals.chk set checked $static_enabled}) (update_linking_code ($waiting $success $code $profile) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {linking_code_wait.grp set_showing $waiting} {linking_code_success.grp set_showing @@ -952,6 +997,7 @@ {linking_code.lbl set_linking_code $code}}) (set_options_signed_in ($val) + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}} {if_else {modifier_mgr is_modifier_active mod_auto_play} {options_av_settings.lst disable_data overshell_autosave_enabled} {if_else @@ -1163,19 +1209,22 @@ (set_confirm_actions ($msg $options) {confirm_question.lbl set text_token $msg} - {confirm_action.lst set_data $options}) + {confirm_action.lst set_data $options} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (set_confirm_message ($token) {confirm_question.lbl set text_token $token} {confirm_action.lst set_data - (overshell_confirm_ok)}) + (overshell_confirm_ok)} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (set_confirm_message_fmt ($arg) {confirm_question.lbl set_token_fmt $arg} {confirm_action.lst set_data - (overshell_confirm_ok)}) + (overshell_confirm_ok)} + {{$this find platform_color.mat} set color {pack_color $dx_menu_color_r $dx_menu_color_g $dx_menu_color_b}}) (set_difficulty_restriction ($difficulty) {cond diff --git a/_ark/ui/overshell/slot_states.dta b/_ark/ui/overshell/slot_states.dta index 9cd1decf22..aabaf3c759 100644 --- a/_ark/ui/overshell/slot_states.dta +++ b/_ark/ui/overshell/slot_states.dta @@ -673,6 +673,7 @@ options_in_game options}) (enter + {game_options.lst set circular FALSE} {if $dx_customizer {$this show_state dxState_TextureMenu} } @@ -916,6 +917,7 @@ kDataUnhandled}) kDataUnhandled}) (on_cancel + DX_OS_CLOSE_MSG {$this leave_options}) (on_start ($user) @@ -1258,6 +1260,18 @@ {$this show_options})) (kState_GameOptions (view game_options) + (enter + {set $actually_show_checks TRUE} + {handle + ($this + update_auto_vocals_enabled + {modifier_mgr is_modifier_active mod_auto_vocals})} + {do + ($no_fail_enabled + {modifier_mgr is_modifier_active mod_no_fail_band}) + {handle + ($this update_no_fail_enabled $no_fail_enabled)}} + ) (update_view {do ($controller @@ -1856,8 +1870,9 @@ {$this on_slider_change $component $user})) #define DX_OPTIONS_SET_DATA ( - {options_extras.lst set_data + {options_audio.lst set_data ( + refresh_library overshell_credits overshell_linking_code #ifdef HX_XBOX overshell_audition #endif @@ -1869,7 +1884,7 @@ } ) (kState_OptionsExtras - (view options_extras) + (view options_audio) (enter DX_OPTIONS_SET_DATA {if {&& {! {session is_in_game}} {session_mgr is_local}} @@ -1894,6 +1909,12 @@ {$component selected_sym} (overshell_credits {$this show_enter_credits}) + (refresh_library + {if {! {session is_in_game}} + {content_mgr remove_content kDataUnhandled} + {content_mgr start_refresh} + } + ) (overshell_linking_code {if_else {&& @@ -2297,16 +2318,9 @@ } DX_UPDATE_ICON ) - (SCROLL_MSG + (poll DX_UPDATE_ICON ) - (exit - {set $dx_play_a_show_num_votes 0} - {set $dx_play_a_show_required_votes 0} - {if $dx_prep_show_flow - {set $dx_prep_show_flow FALSE} - } - ) (SELECT_MSG {if $dx_in_show_flow {if $votingallowed @@ -2479,6 +2493,7 @@ } ) } + {if $dx_in_show_flow {$this show_state kState_ReadyToPlayaShowWait}} {if {! $dx_in_show_flow} {unless {|| $dx_customizer $dx_auto_endurance} ;Saves default instrument by slot number @@ -2957,6 +2972,14 @@ (view ready_to_play) (song_settings_flow TRUE) (ready_to_play TRUE)) +(kState_ReadyToPlayaShowWait + (view ready_to_play) + (song_settings_flow TRUE) + ;(ready_to_play TRUE) + (on_cancel + {if $votingallowed + {set $dx_play_a_show_required_votes {- $dx_play_a_show_required_votes 1}} + {$this show_state kState_ChoosePart}})) (kState_SongOptionsCancel (view cancel_song) (song_settings_flow TRUE) diff --git a/_ark/ui/seldiff/seldiff.dta b/_ark/ui/seldiff/seldiff.dta index f6f15e668e..3adcb6e501 100644 --- a/_ark/ui/seldiff/seldiff.dta +++ b/_ark/ui/seldiff/seldiff.dta @@ -25,7 +25,7 @@ {career.grp add_object play_prep_text.lbl} } {career.grp set_showing TRUE} - {play_prep_text.lbl set text_token {sprint "Welcome to Play a Show!\nGrab your axe and give the crowd a great opener!"}} + {play_prep_text.lbl set text_token play_a_show_welcome_text} ) (enter {tour.grp set_showing FALSE} @@ -146,16 +146,8 @@ {career.pic set tex_file "dx/custom_textures/_additional_textures/acc_dx_hourglass_keep.png"} {song_preview.lbl set_token_fmt dx_play_a_show_welcome} {tour.grp set_showing FALSE} - {career.grp set_showing TRUE} {battle.grp set_showing FALSE} {$this dx_generate_lines_info} - {$this dx_play_info} - {$this dx_play_set_count} - {$this dx_play_header} - {if {! $gotthislabelpreview} - {set $gotthislabelpreview {song_preview.lbl get_local_pos_index 2}} - } - {song_preview.lbl set_local_pos_index 2 {- $gotthislabelpreview 15}} ) (update_tour_setlist_label ($filter $song_count) @@ -236,7 +228,6 @@ {if {overshell in_override_flow kOverrideFlow_None} {overshell begin_override_flow kOverrideFlow_SongSettings}}} - {dx_play_a_show_panel dx_play_countdown} {dx_play_a_show_panel hold_up} {{dx_play_a_show_panel find song_preview.lbl} set_token_fmt dx_play_a_show_welcome} {play_header.lbl set text_token {sprint " "}} diff --git a/_ark/ui/song_select/song_select.dta b/_ark/ui/song_select/song_select.dta index 1638fbdbd7..9c54a4c5e8 100644 --- a/_ark/ui/song_select/song_select.dta +++ b/_ark/ui/song_select/song_select.dta @@ -407,9 +407,24 @@ (file "song_select.milo") (focus song.lst) + (get_page_up_button + {if_else + {== + {$user get_controller_type} + kControllerVocals} + kAction_ShellOption + kAction_PageUp}) + (get_page_down_button + {if_else + {== + {$user get_controller_type} + kControllerVocals} + kAction_ShellOption + kAction_PageDown}) (held_buttons (kAction_PageUp 0.25) (kAction_PageDown 0.25) + #ifdef HX_WII (kAction_ShellOption 0.25) #endif (kAction_Confirm 1.5) (kAction_Cancel 1.5)) (joypad @@ -427,8 +442,21 @@ (trainer_from_main_menu kControllerNone) (song_data_mounted {$this refresh_top}) + (get_option_button kAction_Option) + (get_button_for_review + {if_else + {== + {$user get_controller_type} + kControllerVocals} + kAction_Right + kAction_Option}) (poll - {if {&& {== {{music_library get_highlighted_node} get_node_type} kNodeSong} $probeforfinder} + {if {song.lst is_scrolling} + {if {exists author_finder} + {delete author_finder} + } + } + {if {&& {! {song.lst is_scrolling}} {== {{music_library get_highlighted_node} get_node_type} kNodeSong} $probeforfinder} {if {song_mgr is_song_mounted {{music_library get_highlighted_node} get_token}} {set $probeforfinder FALSE} {$this dx_authorfinder} @@ -1484,7 +1512,13 @@ {leaderboard_instruments.lst scroll 1 $user}) ({details_bottom.grp showing} {instruments.lst scroll 1 $user})}}) - ({== $action kAction_Option} + (#ifdef HX_WII + {== + $action + {$this get_option_button}} + #else + {== $action kAction_Option} + #endif {$this hide_details}) #ifdef HX_WII ({'||' @@ -1768,7 +1802,13 @@ } {music_library select_highlighted_node $user}}}}) ({&& + #ifdef HX_WII + {== + $action + {$this get_option_button}} + #else {== $action kAction_Option} + #endif {! {song.lst is_scrolling}}} {do @@ -1784,7 +1824,17 @@ {== $type kNodeSetlist}}} {$this show_details $user}}}) ({&& + #ifdef HX_WII + {'||' + {'||' + {== + $action + {$this get_option_button}} + {== $action kAction_Right}} + {== $action kAction_Left}} + #else {== $action kAction_ShellOption} + #endif {! {song.lst is_scrolling}}} {do @@ -1792,12 +1842,28 @@ {music_library get_highlighted_node}) ($type {$node get_node_type}) + #ifdef HX_WII + ($new_score + {if_else + {== $action kAction_Left} + {mod + {- + {header_review.rvw get score} + 1} + 6} + {mod + {'+' + {header_review.rvw get score} + 1} + 6}}) + #else ($new_score {mod {'+' {header_review.rvw get score} 1} 6}) + #endif {if {&& {! @@ -1813,23 +1879,99 @@ [reviews_dirty] TRUE}}}) ({&& + #ifdef HX_WII + {== + $action + {$this get_page_down_button}} + #else {== $action kAction_PageDown} + #endif {! {song.lst is_scrolling}}} {unless [waiting_for_sort] {song.lst set_scroll_user $user} - {music_library skip_to_next_shortcut}}) + {if_else {&& {music_library can_headers_be_selected} $sort_check_2} + {do + {song.lst set_selected_simulate_scroll {+ {song.lst selected_pos} 1}} + {set $pause_scroll_sound TRUE} + {foreach_int $i 0 50 + {if_else + {&& + {!= {{music_library get_highlighted_node} get_node_type} kNodeShortcut} + ;{!= {{music_library get_highlighted_node} get_node_type} kNodeSubheader} + {!= {{music_library get_highlighted_node} get_node_type} kNodeHeader} + {!= {{music_library get_highlighted_node} get_node_type} kNodeFunction} + } + {song.lst set_selected_simulate_scroll {+ {song.lst selected_pos} 1}} + kDataUnhandled + } + {if + {&& + {== $i 49} + ;{!= {{music_library get_highlighted_node} get_node_type} kNodeSubheader} + {!= {{music_library get_highlighted_node} get_node_type} kNodeShortcut} + {!= {{music_library get_highlighted_node} get_node_type} kNodeHeader} + {!= {{music_library get_highlighted_node} get_node_type} kNodeFunction} + } + {music_library skip_to_next_shortcut} + } + } + {set $pause_scroll_sound FALSE} + } + {music_library skip_to_next_shortcut} + } + } + ) + #ifndef HX_WII DX_SONG_LIST_LEFT_ACTION DX_SONG_LIST_RIGHT_ACTION + #endif ({&& + #ifdef HX_WII + {== + $action + {$this get_page_up_button}} + #else {== $action kAction_PageUp} + #endif {! {song.lst is_scrolling}}} {unless [waiting_for_sort] {song.lst set_scroll_user $user} - {music_library skip_to_prev_shortcut}}) + {if_else {&& {music_library can_headers_be_selected} $sort_check_2} + {do + {song.lst set_selected_simulate_scroll {- {song.lst selected_pos} 1}} + {set $pause_scroll_sound TRUE} + {foreach_int $i 0 50 + {if_else + {&& + {!= {{music_library get_highlighted_node} get_node_type} kNodeSubheader} + {!= {{music_library get_highlighted_node} get_node_type} kNodeShortcut} + {!= {{music_library get_highlighted_node} get_node_type} kNodeHeader} + {!= {{music_library get_highlighted_node} get_node_type} kNodeFunction} + } + {song.lst set_selected_simulate_scroll {- {song.lst selected_pos} 1}} + kDataUnhandled + } + {if + {&& + {== $i 49} + {!= {{music_library get_highlighted_node} get_node_type} kNodeSubheader} + {!= {{music_library get_highlighted_node} get_node_type} kNodeShortcut} + {!= {{music_library get_highlighted_node} get_node_type} kNodeHeader} + {!= {{music_library get_highlighted_node} get_node_type} kNodeFunction} + } + {music_library skip_to_prev_shortcut} + } + } + {set $pause_scroll_sound FALSE} + } + {music_library skip_to_prev_shortcut} + } + } + ) ({'||' {== $action kAction_Up} {== $action kAction_Down}} @@ -1942,8 +2084,17 @@ {music_library get_back_screen} $user}}}}) ({'||' + #ifdef HX_WII + {== + $action + {$this get_page_up_button}} + {== + $action + {$this get_page_down_button}} + #else {== $action kAction_PageUp} {== $action kAction_PageDown}} + #endif {unless {'||' {ui in_transition} @@ -2062,7 +2213,9 @@ ($user) {do {drum_pro.idd set instrument_type real_drum} - {drum_pro.idd set_song {{music_library get_highlighted_node} get_token}} + {if {== {{music_library get_highlighted_node} get_node_type} kNodeSong} + {drum_pro.idd set_song {{music_library get_highlighted_node} get_token}} + } {guitar.idd set_showing TRUE} {bass.idd set_showing TRUE} {drum.idd set_showing TRUE} diff --git a/_ark/ui/song_select/song_select_extras.dta b/_ark/ui/song_select/song_select_extras.dta index d9b5d25600..a4b97954d1 100644 --- a/_ark/ui/song_select/song_select_extras.dta +++ b/_ark/ui/song_select/song_select_extras.dta @@ -222,6 +222,10 @@ {do ($main_provider {music_library get view_settings_provider}) + {if_else {== {settings.lst selected_data} 1} + {set $sort_check_1 TRUE} + {set $sort_check_1 FALSE} + } {if_else {$main_provider select_setting @@ -240,6 +244,12 @@ {do ($main_provider {music_library get view_settings_provider}) + {if {&& $sort_check_1 {== {options.lst selected_data} 1}} + {set $sort_check_2 TRUE} + } + {if {&& $sort_check_1 {!= {options.lst selected_data} 1}} + {set $sort_check_2 FALSE} + } {$main_provider select_setting_option {options.lst selected_data}} diff --git a/_ark/ui/splash/splash.dta b/_ark/ui/splash/splash.dta index 2790caa6d4..586afb7614 100644 --- a/_ark/ui/splash/splash.dta +++ b/_ark/ui/splash/splash.dta @@ -78,7 +78,11 @@ DX_SPLASH_HANDLES (enter {if_else {== $dx_current_intro_movie off} + #ifdef HX_WII + {$this leave} + #else {$this dx_splash_screen_enter} + #endif {profile_mgr set_overscan TRUE}}) (movie_done #ifdef HX_WII diff --git a/_ark/ui/tour/tour.dta b/_ark/ui/tour/tour.dta new file mode 100644 index 0000000000..8dce492074 --- /dev/null +++ b/_ark/ui/tour/tour.dta @@ -0,0 +1,361 @@ +{func dx_play_cutscene + ($milo $dest) + {set $dx_transition_cat FALSE} + {switch $milo + ((rv1_a rv2_a rv3_a rv4_a rv5_a rv6_a rv7_a) + {set $dx_transition_cat reward} + ) + ((tv1_a tv3_a tv3_b tv3_c tv3_d tv3_e tv3_f tv4_a tv4_b tv4_c tv4_d tv4_e tv5_a tv6_a tv11_a) + {set $dx_transition_cat transition} + ) + ((sv2_a sv3_a sv3_b sv4_a sv4_b sv4_c sv4_d sv4_e sv5_a sv7_a sv7_b sv7_c sv8_a) + {set $dx_transition_cat shell} + ) + {set $dx_transition_cat FALSE} + } + {if $dx_transition_cat + {set $dx_transition_milo $milo} + {dx_tran_screen set dest_screen $dest} + {ui goto_screen dx_tran_screen} + } +} +;reward +;rv1_a rv2_a rv3_a rv4_a rv5_a rv6_a rv7_a +;transition +;tv1_a tv3_a tv3_b tv3_c tv3_d tv3_e tv3_f +;tv4_a tv4_b tv4_c tv4_d tv4_e tv5_a tv6_a tv11_a +;shell (softlocks because never "transitions") +;sv2_a sv3_a sv3_b sv4_a sv4_b sv4_c sv4_d +;sv4_e sv5_a sv7_a sv7_b sv7_c sv8_a +;{dx_play_cutscene tv11_a meta_loading_continue_screen} + + +{func + dx_career_array_reader + {if {find_exists $dx_career_array career_id} + {set $dx_career_name_id {elem {find $dx_career_array career_id} 1}} + } + {if {find_exists $dx_career_array career_name} + {set $dx_career_name {elem {find $dx_career_array career_name} 1}} + } + {if {find_exists $dx_career_array num_tiers} + {set $dx_career_num_tiers {elem {find $dx_career_array num_tiers} 1}} + } + {if {find_exists $dx_career_array intro_movie} + {set $dx_career_intro_movie {elem {find $dx_career_array intro_movie} 1}} + } + {if {find_exists $dx_career_array intro_transition} + {set $dx_career_intro_transition {elem {find $dx_career_array intro_transition} 1}} + } + {if {find_exists $dx_career_array intro_message} + {set $dx_career_intro_message {elem {find $dx_career_array intro_message} 1}} + } + {set $dx_this_tier tier_1} + {if {find_exists $dx_career_array $dx_this_tier name} + {set $dx_this_tier_name {elem {find $dx_career_array $dx_this_tier name} 1}} + } + {if {find_exists $dx_career_array $dx_this_tier intro_message} + {set $dx_this_tier_intro_message {elem {find $dx_career_array $dx_this_tier intro_message} 1}} + } + {if {find_exists $dx_career_array $dx_this_tier transition} + {set $dx_this_tier_transition {elem {find $dx_career_array $dx_this_tier transition} 1}} + } + {if {find_exists $dx_career_array $dx_this_tier win_movie} + {set $dx_this_tier_win_movie {elem {find $dx_career_array $dx_this_tier win_movie} 1}} + } + {if {find_exists $dx_career_array $dx_this_tier songs} + {set $dx_this_tier_songs_array ()} + {resize $dx_this_tier_songs_array 0} + {set $dx_this_tier_songs_array_raw ()} + {resize $dx_this_tier_songs_array_raw 0} + {set $dx_this_tier_songs_array_raw_songs ()} + {resize $dx_this_tier_songs_array_raw_songs 0} + {set $dx_this_tier_songs_array_raw {find $dx_career_array $dx_this_tier songs}} + {foreach $entry $dx_this_tier_songs_array_raw + {if {!= $entry songs} + {push_back $dx_this_tier_songs_array_raw_songs $entry} + ;{push_back $list_of_custom_careers $entry} + } + } + } +} + +#define DX_TOUR_HANDLES +( + {new + TourDescPanel + dx_tour_customize_panel + (file + "tour_customize.milo") + (focus + "tours.lst") + (initially_selected_tour '') + (enter + {set $careers_got FALSE} + {$this dx_tour} + ) + (get_careers + {set $dx_this_tier_songs_array ()} + {resize $dx_this_tier_songs_array 0} + {set $list_of_custom_careers ()} + {resize $list_of_custom_careers 0} + {set $list_of_custom_careers_tracker ()} + {resize $list_of_custom_careers_tracker 0} + {push_back $list_of_custom_careers_tracker (none none)} + {set $dx_career_file_array ()} + {resize $dx_career_file_array 0} + {set $dx_this_tier_songs_array_raw_songs ()} + {resize $dx_this_tier_songs_array_raw_songs 0} + {set $dx_career_file_array + #ifdef HX_PS3 + {file_list {sprint "GD:/dev_hdd0/game/" DX_TITLE_ID "/USRDIR/dx_career_*.dta"}} + #else + {file_list {sprint "GAME:/dx_career_*.dta"}} + #endif + } + {foreach $file + $dx_career_file_array + {if + {file_exists + #ifdef HX_PS3 + {sprint "GD:/dev_hdd0/game/" DX_TITLE_ID "/USRDIR/" $file ".dta"} + #else + {sprint "GAME:/" $file ".dta"} + #endif + } + {do + {set $dx_career_array ()} + {resize $dx_career_array 0} + {set $dx_career_array + {read_file + #ifdef HX_PS3 + {sprint "GD:/dev_hdd0/game/" DX_TITLE_ID "/USRDIR/" $file ".dta"} + #else + {sprint "GAME:/" $file ".dta"} + #endif + } + } + {set $dx_career_array {array $dx_career_array}} + {dx_career_array_reader} + {push_back $list_of_custom_careers_tracker ($dx_career_name $dx_career_name_id)} + {set $list_of_custom_careers_tracker {array $list_of_custom_careers_tracker}} + {push_back $list_of_custom_careers $dx_career_name} + } + } + } + ) + (dx_tour + {if {! $careers_got} + {set $careers_got TRUE} + {$this get_careers} + } + {if {== {size $list_of_custom_careers} 0} ;if nothing was found at all + {set $list_of_custom_careers ('cant find' 'careers' 'this is a bug')} ;fill the list so it doesnt crash + } + {tours.lst set_data $list_of_custom_careers} + ) + (exit) + (SELECT_MSG + {set $career_find_id none} + {foreach $entry $list_of_custom_careers_tracker + {do + {set $test_a {sprint {$component selected_sym}}} + {set $test_b {sprint {symbol {elem $entry 0}}}} + {if {== $test_a $test_b} + {set $test_c {elem $entry 1}} + {if + {file_exists + #ifdef HX_PS3 + {sprint "GD:/dev_hdd0/game/" DX_TITLE_ID "/USRDIR/dx_career_" $test_c ".dta"} + #else + {sprint "GAME:/dx_career_" $test_c ".dta"} + #endif + } + {set $dx_career_array ()} + {resize $dx_career_array 0} + {set $dx_career_array + {read_file + #ifdef HX_PS3 + {sprint "GD:/dev_hdd0/game/" DX_TITLE_ID "/USRDIR/dx_career_" $test_c ".dta"} + #else + {sprint "GAME:/dx_career_" $test_c ".dta"} + #endif + } + } + {set $dx_career_array {array $dx_career_array}} + {dx_career_array_reader} + {dx_play_cutscene tv3_d dx_tour_tier_screen} + } + } + } + } + ) + (update_tourdesc_provider + ($provider) + {tours.lst set_provider $provider} + {tours.lst refresh} + {$this dx_tour}) + (get_selected_tourdesc_index + {tours.lst selected_pos}) + (get_initially_selected_tour + [initially_selected_tour]) + (clear_initially_selected_tour + {$this set initially_selected_tour ''})} + {new + BandScreen + dx_tour_customize_screen + (panels meta sv3_panel) + (enter + {if + {tour progress} + {if + {{tour progress} + is_tour_complete} + {{tour progress} + update_most_stars} + {tour + reset_tour_data + {tour get_profile}}}} + {acc_mgr check_for_tour_goals} + {tour initialize_tour} + {if + {'||' + {! + {session_mgr has_leader_user}} + {is_leader_local}} + {tour update_progress_with_career_data}}) + (TRANSITION_COMPLETE_MSG + {ui goto_screen dx_tour_customize_post_screen})} + {new + BandScreen + dx_tour_customize_post_screen + (panels meta sv3_panel dx_tour_customize_panel) + (focus dx_tour_customize_panel) + (back main_hub_screen) + } + {new + TourDescPanel + dx_tour_tier_panel + (file + "tour_customize.milo") + (focus + "tours.lst") + (initially_selected_tour '') + (shortname_to_song + ($shortname) + {meta_performer set_song {symbol $shortname}} + {if {meta_performer song_id} + {set $tempsongname {{song_mgr get_meta_data {meta_performer song}} title}} + } + {push_back $dx_song_finder_holder ($tempsongname $shortname)} + {set $dx_song_finder_holder {array $dx_song_finder_holder}} + {meta_performer reset_songs} + ) + (dx_tour + {set $dx_this_tier tier_1} + {dx_career_array_reader} + {set $dx_tier_holder ()} + {resize $dx_tier_holder 0} + {set $dx_song_finder_holder ()} + {resize $dx_song_finder_holder 0} + {push_back $dx_song_finder_holder (none none)} + {push_back $dx_tier_holder {sprint $dx_this_tier_name}} + {foreach $entry $dx_this_tier_songs_array_raw_songs + {$this shortname_to_song $entry} + {push_back $dx_tier_holder $tempsongname} + } + {if {== {size $dx_this_tier_songs_array_raw_songs} 0} ;if nothing was found at all + {set $dx_this_tier_songs_array_raw_songs ('cant find' 'songs' 'this is a bug')} ;fill the list so it doesnt crash + } + {tours.lst set_data $dx_tier_holder} + {tours.lst disable_data {sprint $dx_this_tier_name}} + {tours.lst dim_data {sprint $dx_this_tier_name}} + ) + (exit) + (SELECT_MSG + {foreach $entry $dx_song_finder_holder + {if {== {sprint {elem $entry 0}} {sprint {$component selected_sym}}} + {dx_passive_messenger_symbol {sprint "omg thats it"}} + {meta_performer set_song {symbol {elem $entry 1}}} + } + } + {if {meta_performer song_id} + {dx_passive_messenger_symbol {sprint "omg thats it 2"}} + } + ) + (update_tourdesc_provider + ($provider) + {tours.lst set_provider $provider} + {tours.lst refresh} + {$this dx_tour}) + (get_selected_tourdesc_index + {tours.lst selected_pos}) + (get_initially_selected_tour + [initially_selected_tour]) + (clear_initially_selected_tour + {$this set initially_selected_tour ''})} + {new + BandScreen + dx_tour_tier_screen + (panels meta sv3_panel) + (enter + {if + {tour progress} + {if + {{tour progress} + is_tour_complete} + {{tour progress} + update_most_stars} + {tour + reset_tour_data + {tour get_profile}}}} + {acc_mgr check_for_tour_goals} + {tour initialize_tour} + {if + {'||' + {! + {session_mgr has_leader_user}} + {is_leader_local}} + {tour update_progress_with_career_data}}) + (TRANSITION_COMPLETE_MSG + {ui goto_screen dx_tour_tier_post_screen})} + {new + BandScreen + dx_tour_tier_post_screen + (panels meta sv3_panel dx_tour_tier_panel) + (focus dx_tour_tier_panel) + (back dx_tour_customize_screen) + } +) +DX_TOUR_HANDLES +#include tour_welcome.dta +#include tour_quests.dta +#include tour_challenge_results.dta +#include tour_customize.dta +#include tour_finished.dta +{func + get_tour_screen + {get_tour_screen_internal TRUE}} +{func + get_tour_screen_no_announcements + {get_tour_screen_internal FALSE}} +{func + get_tour_screen_internal + ($allow_announcements) + {if_else + {tour progress} + {if_else + {&& + {{tour progress} + is_on_tour} + {! + {{tour progress} + is_tour_complete}}} + {if_else + {&& + $allow_announcements + {tour has_announcement}} + {tour get_announcement} + tour_gigguide_init_screen} + tour_customize_screen} + tour_customize_screen}} \ No newline at end of file diff --git a/_ark/ui/ui.dta b/_ark/ui/ui.dta new file mode 100644 index 0000000000..daca86ad9d --- /dev/null +++ b/_ark/ui/ui.dta @@ -0,0 +1,122 @@ +(cancel_transition_notify TRUE) +(default_allow_edit_text FALSE) +(verbose_locale_notifies TRUE) +(show_nonenglish_notifies FALSE) +(frontload_subdirs + "ui/meta_panel.milo") +(init + #include init.dta + #ifndef _SHIP + {ui set_require_fixed_text TRUE} + #endif + {meta_loading load TRUE} + {dialog_panel load TRUE} + {dialog_small_panel load TRUE} + {lose_panel load TRUE} + {coop_endgame_panel load TRUE} + {coop_track_panel load TRUE} + {overshell load TRUE} + {event_dialog_panel load TRUE} + {content_loading_panel load TRUE} + {passive_messages_panel load TRUE} + {saveload_status_panel load TRUE} + {transition_fallback_panel load TRUE} + {abstract_wipe_panel load TRUE} + {hint_career_panel load TRUE} + {hint_careerlaunch_panel load TRUE} + {hint_career_halloffame_panel load TRUE} + {hint_goalcomplete_panel load TRUE} + {hint_prodrums_panel load TRUE} + {hint_rb3_welcome_panel load TRUE} + {tour_post_seldiff_panel load TRUE} + {tour_welcome_panel load TRUE} + {ui init_panels} + #ifndef _SHIP + {ui set_require_fixed_text FALSE} + #endif + {net_cache_mgr + init + {find $syscfg store netcache_init}} + #ifndef _SHIP + {ui add_message_type session_mgr add_local_user_result_msg} + #endif + {set $first_screen intro_movie_screen} + {ui my_init} + {ui goto_screen $first_screen}) +#include band_ui.dta +(max_push_depth 2) +(my_init) +(overload_horizontal_nav TRUE) +#include cam.dta +(SELECT_MSG + {if + {&& + $user + {$user is_local}} + {unless + {&& + {{ui current_screen} + has + (muted_btns)} + {find_elem + {{ui current_screen} + get + muted_btns} + $component}} + {play_instr_sfx $user button_select}}} + kDataUnhandled) +(SCROLL_MSG + {if {&& $dx_scroll_sound {! $pause_scroll_sound}} + {if + {&& + $user + {$user is_local}} + {if_else + {$component is_a UISlider} + {synth play slider.cue} + {if + {ui current_screen} + {do + ($play + {handle_ret + ({ui current_screen} + scroll_sfx)}) + {if + {'||' + {== $play kDataUnhandled} + $play} + {play_instr_sfx $user button_toggle}}}}}}} + kDataUnhandled) +(SCROLL_SELECT_MSG + {if + {&& + $user + {$user is_local}} + {play_instr_sfx + $user + {if_else $selected button_select button_back}}} + kDataUnhandled) +(FOCUS_MSG + {unless + {'||' + {== + $nav_type + ""} + {== $nav_type none}} + {do + ($ct_arr + {find $syscfg joypad instrument_mapping $nav_type}) + ($ct_sym + {elem + (CHAR_INSTRUMENT_SYMBOLS) + {elem $ct_arr 1}}) + {play_instr_ctlr_sfx $ct_sym button_toggle TRUE}}} + kDataUnhandled) +(go_back_screen + ($screen $user) + {if + {&& + $user + {$user is_local}} + {play_instr_sfx $user button_back}} + 0) \ No newline at end of file diff --git a/_ark/ui/vignettes.dta b/_ark/ui/vignettes.dta index 1ab0024962..09713f020e 100644 --- a/_ark/ui/vignettes.dta +++ b/_ark/ui/vignettes.dta @@ -254,6 +254,23 @@ {$this get_intro_transition}) (get_intro_transition "../world/vignette/reward/rv1_a.milo")} +{new + InterstitialPanel + dx_tran_tv_panel + (file + {$this get_intro_transition}) + (get_intro_transition + {sprint "../world/vignette/" $dx_transition_cat "/" $dx_transition_milo ".milo"})} +{new + BandScreen + dx_tran_screen + (dest_screen '') + (panels meta dx_tran_tv_panel) + (focus dx_tran_tv_panel) + (TRANSITION_COMPLETE_MSG + {ui + goto_screen + [dest_screen]})} {new BandScreen tran_gig_intro_screen diff --git a/dependencies/python/gen_version.py b/dependencies/python/gen_version.py index f23aa042e0..52b37a486e 100644 --- a/dependencies/python/gen_version.py +++ b/dependencies/python/gen_version.py @@ -1,7 +1,7 @@ # add_devbuild.py import sys -version = f"1.1.0-beta8" +version = f"1.1.0-beta9" path = sys.argv[1]