diff --git a/_ark/config/beatmatcher.dta b/_ark/config/beatmatcher.dta index b20170636..c7c5e5e98 100644 --- a/_ark/config/beatmatcher.dta +++ b/_ark/config/beatmatcher.dta @@ -1,16 +1,11 @@ (callbacks (sixteenth_note {dx_show_user_overdrive} - {dx_calc_overdrive bass} - {dx_calc_overdrive real_guitar} - {dx_calc_overdrive real_bass} - {dx_calc_overdrive keys} - {dx_calc_overdrive real_keys} - {dx_calc_overdrive guitar} - {dx_calc_overdrive drum} - {dx_calc_overdrive real_drum} - {dx_set_song_progress} - {dx_fix_track_instrument_icon_pos} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_calc_overdrive {$player instrument}} + } + } {dx_new_set_song_progress $dx_song_progress_bar} {dx_fix_new_song_progress_pos} {unless {gamemode in_mode trainer} {dx_bot_overdrive_handler}} diff --git a/_ark/dx/overshell/dx_advanced_states.dta b/_ark/dx/overshell/dx_advanced_states.dta index dabf215bc..c43624c4b 100644 --- a/_ark/dx/overshell/dx_advanced_states.dta +++ b/_ark/dx/overshell/dx_advanced_states.dta @@ -1208,19 +1208,19 @@ {set $dx_set_ui_pos_2 $solo_boxpos_2} ) (highway_overdrive_text - {set $dx_set_ui_pos_0 $dx_highway_overdrive_text_x} - {set $dx_set_ui_pos_1 $dx_highway_overdrive_text_z} - {set $dx_set_ui_pos_2 $dx_highway_overdrive_text_y} + {set $dx_set_ui_pos_0 $dx_track_overdrive_x} + {set $dx_set_ui_pos_1 $dx_track_overdrive_z} + {set $dx_set_ui_pos_2 $dx_track_overdrive_y} ) (highway_streak_text - {set $dx_set_ui_pos_0 $dx_highway_streak_text_x} - {set $dx_set_ui_pos_1 $dx_highway_streak_text_z} - {set $dx_set_ui_pos_2 $dx_highway_streak_text_y} + {set $dx_set_ui_pos_0 $dx_track_streak_x} + {set $dx_set_ui_pos_1 $dx_track_streak_z} + {set $dx_set_ui_pos_2 $dx_track_streak_y} ) (highway_username_text - {set $dx_set_ui_pos_0 $dx_highway_username_text_x} - {set $dx_set_ui_pos_1 $dx_highway_username_text_z} - {set $dx_set_ui_pos_2 $dx_highway_username_text_y} + {set $dx_set_ui_pos_0 $dx_track_username_x} + {set $dx_set_ui_pos_1 $dx_track_username_z} + {set $dx_set_ui_pos_2 $dx_track_username_y} ) kDataUnhandled } @@ -1242,7 +1242,7 @@ (star_display {set $dx_set_ui_pos_0 0}) (solo_box {set $dx_set_ui_pos_0 0}) (highway_overdrive_text {set $dx_set_ui_pos_0 0}) - (highway_streak_text {set $dx_set_ui_pos_0 2.2}) + (highway_streak_text {set $dx_set_ui_pos_0 2}) (highway_username_text {set $dx_set_ui_pos_0 0}) } {switch $dx_set_ui_pos_tracked_ui @@ -1254,8 +1254,8 @@ (scoreboard {set $dx_set_ui_pos_1 0}) (star_display {set $dx_set_ui_pos_1 0}) (solo_box {set $dx_set_ui_pos_1 0}) - (highway_overdrive_text {set $dx_set_ui_pos_1 0}) - (highway_streak_text {set $dx_set_ui_pos_1 0}) + (highway_overdrive_text {set $dx_set_ui_pos_1 -5}) + (highway_streak_text {set $dx_set_ui_pos_1 -5}) (highway_username_text {set $dx_set_ui_pos_1 0}) } {switch $dx_set_ui_pos_tracked_ui @@ -1267,8 +1267,8 @@ (scoreboard {set $dx_set_ui_pos_2 -16}) (star_display {set $dx_set_ui_pos_2 0}) (solo_box {set $dx_set_ui_pos_2 0}) - (highway_overdrive_text {set $dx_set_ui_pos_2 -4}) - (highway_streak_text {set $dx_set_ui_pos_2 -3.7}) + (highway_overdrive_text {set $dx_set_ui_pos_2 -2.5}) + (highway_streak_text {set $dx_set_ui_pos_2 -2}) (highway_username_text {set $dx_set_ui_pos_2 -5.5}) } ) @@ -1378,40 +1378,50 @@ } ) (highway_overdrive_text - {set $dx_highway_overdrive_text_x $dx_set_ui_pos_0} - {set $dx_highway_overdrive_text_z $dx_set_ui_pos_1} - {set $dx_highway_overdrive_text_y $dx_set_ui_pos_2} + {set $dx_track_overdrive_x $dx_set_ui_pos_0} + {set $dx_track_overdrive_z $dx_set_ui_pos_1} + {set $dx_track_overdrive_y $dx_set_ui_pos_2} {if {&& {! {gamemode in_mode trainer}} {exists beatmatch} } - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_highway_overdrive_text_r $dx_highway_overdrive_text_g $dx_highway_overdrive_text_b FALSE} + {beatmatch foreach_active_player $player + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_track_overdrive_r $dx_track_overdrive_g $dx_track_overdrive_b FALSE} + } } ) (highway_streak_text - {set $dx_highway_streak_text_x $dx_set_ui_pos_0} - {set $dx_highway_streak_text_z $dx_set_ui_pos_1} - {set $dx_highway_streak_text_y $dx_set_ui_pos_2} + {set $dx_track_streak_x $dx_set_ui_pos_0} + {set $dx_track_streak_z $dx_set_ui_pos_1} + {set $dx_track_streak_y $dx_set_ui_pos_2} {if {&& {! {gamemode in_mode trainer}} {exists beatmatch} } - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b FALSE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b FALSE} + } + } } ) (highway_username_text - {set $dx_highway_username_text_x $dx_set_ui_pos_0} - {set $dx_highway_username_text_z $dx_set_ui_pos_1} - {set $dx_highway_username_text_y $dx_set_ui_pos_2} + {set $dx_track_username_x $dx_set_ui_pos_0} + {set $dx_track_username_z $dx_set_ui_pos_1} + {set $dx_track_username_y $dx_set_ui_pos_2} {if {&& {! {gamemode in_mode trainer}} {exists beatmatch} } - {dx_track_label dx_track_label_username $dx_highway_username_text_size $dx_highway_username_text_font $dx_highway_username_text_alignment $dx_highway_username_text_kerning $dx_highway_username_text_x $dx_highway_username_text_y $dx_highway_username_text_r $dx_highway_username_text_g $dx_highway_username_text_b FALSE} - {if $dx_highway_username_text {dx_show_track_username}} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label dx_track_label_username $dx_track_username_size $dx_track_username_font $dx_track_username_alignment $dx_track_username_kerning {{$player get_user} get_slot_num} $dx_track_username_x $dx_track_username_y $dx_track_username_r $dx_track_username_g $dx_track_username_b FALSE} + {if $dx_track_username {dx_show_track_username}} + } + } } ) kDataUnhandled diff --git a/_ark/dx/overshell/dx_color_states.dta b/_ark/dx/overshell/dx_color_states.dta index adce045ae..28dc1f25a 100644 --- a/_ark/dx/overshell/dx_color_states.dta +++ b/_ark/dx/overshell/dx_color_states.dta @@ -1194,19 +1194,19 @@ {set $dx_set_ui_rgb_b $dx_overdrive_b} ) (highway_overdrive_text - {set $dx_set_ui_rgb_r $dx_highway_overdrive_text_r} - {set $dx_set_ui_rgb_g $dx_highway_overdrive_text_g} - {set $dx_set_ui_rgb_b $dx_highway_overdrive_text_b} + {set $dx_set_ui_rgb_r $dx_track_overdrive_r} + {set $dx_set_ui_rgb_g $dx_track_overdrive_g} + {set $dx_set_ui_rgb_b $dx_track_overdrive_b} ) (highway_username_text - {set $dx_set_ui_rgb_r $dx_highway_username_text_r} - {set $dx_set_ui_rgb_g $dx_highway_username_text_g} - {set $dx_set_ui_rgb_b $dx_highway_username_text_b} + {set $dx_set_ui_rgb_r $dx_track_username_r} + {set $dx_set_ui_rgb_g $dx_track_username_g} + {set $dx_set_ui_rgb_b $dx_track_username_b} ) (highway_streak_text - {set $dx_set_ui_rgb_r $dx_highway_streak_text_r} - {set $dx_set_ui_rgb_g $dx_highway_streak_text_g} - {set $dx_set_ui_rgb_b $dx_highway_streak_text_b} + {set $dx_set_ui_rgb_r $dx_track_streak_r} + {set $dx_set_ui_rgb_g $dx_track_streak_g} + {set $dx_set_ui_rgb_b $dx_track_streak_b} ) kDataUnhandled } @@ -1249,27 +1249,39 @@ ;} ) (highway_overdrive_text - {set $dx_highway_overdrive_text_r $dx_set_ui_rgb_r} - {set $dx_highway_overdrive_text_g $dx_set_ui_rgb_g} - {set $dx_highway_overdrive_text_b $dx_set_ui_rgb_b} + {set $dx_track_overdrive_r $dx_set_ui_rgb_r} + {set $dx_track_overdrive_g $dx_set_ui_rgb_g} + {set $dx_track_overdrive_b $dx_set_ui_rgb_b} {if {$this in_game} - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_highway_overdrive_text_r $dx_highway_overdrive_text_g $dx_highway_overdrive_text_b FALSE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_track_overdrive_r $dx_track_overdrive_g $dx_track_overdrive_b FALSE} + } + } } ) (highway_username_text - {set $dx_highway_username_text_r $dx_set_ui_rgb_r} - {set $dx_highway_username_text_g $dx_set_ui_rgb_g} - {set $dx_highway_username_text_b $dx_set_ui_rgb_b} + {set $dx_track_username_r $dx_set_ui_rgb_r} + {set $dx_track_username_g $dx_set_ui_rgb_g} + {set $dx_track_username_b $dx_set_ui_rgb_b} {if {$this in_game} - {dx_track_label dx_track_label_username $dx_highway_username_text_size $dx_highway_username_text_font $dx_highway_username_text_alignment $dx_highway_username_text_kerning $dx_highway_username_text_x $dx_highway_username_text_y $dx_highway_username_text_r $dx_highway_username_text_g $dx_highway_username_text_b FALSE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label dx_track_label_username $dx_track_username_size $dx_track_username_font $dx_track_username_alignment $dx_track_username_kerning {{$player get_user} get_slot_num} $dx_track_username_x $dx_track_username_y $dx_track_username_r $dx_track_username_g $dx_track_username_b FALSE} + } + } } ) (highway_streak_text - {set $dx_highway_streak_text_r $dx_set_ui_rgb_r} - {set $dx_highway_streak_text_g $dx_set_ui_rgb_g} - {set $dx_highway_streak_text_b $dx_set_ui_rgb_b} + {set $dx_track_streak_r $dx_set_ui_rgb_r} + {set $dx_track_streak_g $dx_set_ui_rgb_g} + {set $dx_track_streak_b $dx_set_ui_rgb_b} {if {$this in_game} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b FALSE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b FALSE} + } + } } ) kDataUnhandled diff --git a/_ark/dx/overshell/dx_hud_states.dta b/_ark/dx/overshell/dx_hud_states.dta index b068933fe..891d604cf 100644 --- a/_ark/dx/overshell/dx_hud_states.dta +++ b/_ark/dx/overshell/dx_hud_states.dta @@ -1341,9 +1341,9 @@ {push_back $options {if_else {&& - {! $dx_highway_username_text} - {! $dx_highway_overdrive_text} - {! $dx_highway_streak_text} + {! $dx_track_username} + {! $dx_track_overdrive} + {! $dx_track_streak} } os_all_on os_all_off @@ -1366,29 +1366,37 @@ (SELECT_MSG {switch {$component selected_sym} (os_all_on - {set $dx_highway_username_text TRUE} - {set $dx_highway_overdrive_text TRUE} - {set $dx_highway_streak_text TRUE} + {set $dx_track_username TRUE} + {set $dx_track_overdrive TRUE} + {set $dx_track_streak TRUE} {set $dx_tracked_changed os_all_off} {if {$this in_game} - {dx_track_label dx_track_label_username $dx_highway_username_text_size $dx_highway_username_text_font $dx_highway_username_text_alignment $dx_highway_username_text_kerning $dx_highway_username_text_x $dx_highway_username_text_y $dx_highway_username_text_r $dx_highway_username_text_g $dx_highway_username_text_b TRUE} - {dx_show_track_username} - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_highway_overdrive_text_r $dx_highway_overdrive_text_g $dx_highway_overdrive_text_b TRUE} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b TRUE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label dx_track_label_username $dx_track_username_size $dx_track_username_font $dx_track_username_alignment $dx_track_username_kerning {{$player get_user} get_slot_num} $dx_track_username_x $dx_track_username_y $dx_track_username_r $dx_track_username_g $dx_track_username_b TRUE} + {dx_show_track_username} + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_track_overdrive_r $dx_track_overdrive_g $dx_track_overdrive_b TRUE} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b TRUE} + } + } } {dx_state_pos_tracker} DX_HIGHWAY_TEXT_ELEMENTS_DATA {set $previous_state dxState_TrackHighwayText} ) (os_all_off - {set $dx_highway_username_text FALSE} - {set $dx_highway_overdrive_text FALSE} - {set $dx_highway_streak_text FALSE} + {set $dx_track_username FALSE} + {set $dx_track_overdrive FALSE} + {set $dx_track_streak FALSE} {set $dx_tracked_changed os_all_on} {if {$this in_game} - {dx_track_label dx_track_label_username $dx_highway_username_text_size $dx_highway_username_text_font $dx_highway_username_text_alignment $dx_highway_username_text_kerning $dx_highway_username_text_x $dx_highway_username_text_y $dx_highway_username_text_r $dx_highway_username_text_g $dx_highway_username_text_b TRUE} - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_highway_overdrive_text_r $dx_highway_overdrive_text_g $dx_highway_overdrive_text_b TRUE} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b TRUE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label dx_track_label_username $dx_track_username_size $dx_track_username_font $dx_track_username_alignment $dx_track_username_kerning {{$player get_user} get_slot_num} $dx_track_username_x $dx_track_username_y $dx_track_username_r $dx_track_username_g $dx_track_username_b TRUE} + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_track_overdrive_r $dx_track_overdrive_g $dx_track_overdrive_b TRUE} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b TRUE} + } + } } {dx_state_pos_tracker} DX_HIGHWAY_TEXT_ELEMENTS_DATA @@ -1418,12 +1426,12 @@ ) -#define DX_HIGHWAY_USERNAME_TEXT_ELEMENTS_DATA +#define dx_track_username_ELEMENTS_DATA ( {do ($options {array 0}) - {push_back $options {if_else $dx_highway_username_text os_highway_username_on os_highway_username_off}} + {push_back $options {if_else $dx_track_username os_highway_username_on os_highway_username_off}} {push_back $options os_pos} {push_back $options os_col} {push_back $options os_text_options} @@ -1432,7 +1440,7 @@ ) (dxState_TrackHighwayUsername (view - DX_HIGHWAY_USERNAME_TEXT_ELEMENTS_DATA + dx_track_username_ELEMENTS_DATA {overshell_view_chooser} ) (SCROLL_MSG @@ -1441,15 +1449,19 @@ (SELECT_MSG {switch {$component selected_sym} ((os_highway_username_on os_highway_username_off) - {set $dx_highway_username_text {! $dx_highway_username_text}} - {if_else $dx_highway_username_text + {set $dx_track_username {! $dx_track_username}} + {if_else $dx_track_username {set $dx_tracked_changed os_highway_username_on} {set $dx_tracked_changed os_highway_username_off} } - {dx_track_label dx_track_label_username $dx_highway_username_text_size $dx_highway_username_text_font $dx_highway_username_text_alignment $dx_highway_username_text_kerning $dx_highway_username_text_x $dx_highway_username_text_y $dx_highway_username_text_r $dx_highway_username_text_g $dx_highway_username_text_b TRUE} - {if $dx_highway_username_text {dx_show_track_username}} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label dx_track_label_username $dx_track_username_size $dx_track_username_font $dx_track_username_alignment $dx_track_username_kerning {{$player get_user} get_slot_num} $dx_track_username_x $dx_track_username_y $dx_track_username_r $dx_track_username_g $dx_track_username_b TRUE} + {if $dx_track_username {dx_show_track_username}} + } + } {dx_state_pos_tracker} - DX_HIGHWAY_USERNAME_TEXT_ELEMENTS_DATA + dx_track_username_ELEMENTS_DATA {set $previous_state dxState_TrackHighwayUsername} ) (os_pos @@ -1466,7 +1478,7 @@ ) } {set $in_state FALSE} - DX_HIGHWAY_USERNAME_TEXT_ELEMENTS_DATA + dx_track_username_ELEMENTS_DATA {set $previous_state dxState_TrackHighwayUsername} ) (exit @@ -1478,12 +1490,12 @@ ) ) -#define DX_HIGHWAY_OVERDRIVE_TEXT_ELEMENTS_DATA +#define dx_track_overdrive_ELEMENTS_DATA ( {do ($options {array 0}) - {push_back $options {if_else $dx_highway_overdrive_text os_highway_overdrive_on os_highway_overdrive_off}} + {push_back $options {if_else $dx_track_overdrive os_highway_overdrive_on os_highway_overdrive_off}} {push_back $options os_pos} {push_back $options os_col} {push_back $options os_text_options} @@ -1492,7 +1504,7 @@ ) (dxState_TrackHighwayOverdrive (view - DX_HIGHWAY_OVERDRIVE_TEXT_ELEMENTS_DATA + dx_track_overdrive_ELEMENTS_DATA {overshell_view_chooser} ) (SCROLL_MSG @@ -1501,16 +1513,20 @@ (SELECT_MSG {switch {$component selected_sym} ((os_highway_overdrive_on os_highway_overdrive_off) - {set $dx_highway_overdrive_text {! $dx_highway_overdrive_text}} - {if_else $dx_highway_overdrive_text + {set $dx_track_overdrive {! $dx_track_overdrive}} + {if_else $dx_track_overdrive {set $dx_tracked_changed os_highway_overdrive_on} {set $dx_tracked_changed os_highway_overdrive_off} } {if {$this in_game} - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_highway_overdrive_text_r $dx_highway_overdrive_text_g $dx_highway_overdrive_text_b TRUE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_track_overdrive_r $dx_track_overdrive_g $dx_track_overdrive_b TRUE} + } + } } {dx_state_pos_tracker} - DX_HIGHWAY_OVERDRIVE_TEXT_ELEMENTS_DATA + dx_track_overdrive_ELEMENTS_DATA {set $previous_state dxState_TrackHighwayOverdrive} ) (os_pos @@ -1527,7 +1543,7 @@ ) } {set $in_state FALSE} - DX_HIGHWAY_OVERDRIVE_TEXT_ELEMENTS_DATA + dx_track_overdrive_ELEMENTS_DATA {set $previous_state dxState_TrackHighwayOverdrive} ) (exit @@ -1539,13 +1555,13 @@ ) ) -#define DX_HIGHWAY_STREAK_TEXT_ELEMENTS_DATA +#define dx_track_streak_ELEMENTS_DATA ( {do ($options {array 0}) - {push_back $options {if_else $dx_highway_streak_text os_highway_streak_on os_highway_streak_off}} - {push_back $options {if_else $dx_highway_streak_text_gh3_delay os_highway_streak_gh3_delay_on os_highway_streak_gh3_delay_off}} + {push_back $options {if_else $dx_track_streak os_highway_streak_on os_highway_streak_off}} + {push_back $options {if_else $dx_track_streak_gh3_delay os_highway_streak_gh3_delay_on os_highway_streak_gh3_delay_off}} {push_back $options os_pos} {push_back $options os_col} {push_back $options os_text_options} @@ -1554,7 +1570,7 @@ ) (dxState_TrackHighwayStreak (view - DX_HIGHWAY_STREAK_TEXT_ELEMENTS_DATA + dx_track_streak_ELEMENTS_DATA {overshell_view_chooser} ) (SCROLL_MSG @@ -1563,29 +1579,37 @@ (SELECT_MSG {switch {$component selected_sym} ((os_highway_streak_on os_highway_streak_off) - {set $dx_highway_streak_text {! $dx_highway_streak_text}} - {if_else $dx_highway_streak_text + {set $dx_track_streak {! $dx_track_streak}} + {if_else $dx_track_streak {set $dx_tracked_changed os_highway_streak_on} {set $dx_tracked_changed os_highway_streak_off} } {if {$this in_game} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b TRUE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b TRUE} + } + } } {dx_state_pos_tracker} - DX_HIGHWAY_STREAK_TEXT_ELEMENTS_DATA + dx_track_streak_ELEMENTS_DATA {set $previous_state dxState_TrackHighwayStreak} ) ((os_highway_streak_gh3_delay_on os_highway_streak_gh3_delay_off) - {set $dx_highway_streak_text_gh3_delay {! $dx_highway_streak_text_gh3_delay}} - {if_else $dx_highway_streak_text_gh3_delay + {set $dx_track_streak_gh3_delay {! $dx_track_streak_gh3_delay}} + {if_else $dx_track_streak_gh3_delay {set $dx_tracked_changed os_highway_streak_gh3_delay_on} {set $dx_tracked_changed os_highway_streak_gh3_delay_off} } {if {$this in_game} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b TRUE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b TRUE} + } + } } {dx_state_pos_tracker} - DX_HIGHWAY_STREAK_TEXT_ELEMENTS_DATA + dx_track_streak_ELEMENTS_DATA {set $previous_state dxState_TrackHighwayStreak} ) (os_pos @@ -1602,7 +1626,7 @@ ) } {set $in_state FALSE} - DX_HIGHWAY_STREAK_TEXT_ELEMENTS_DATA + dx_track_streak_ELEMENTS_DATA {set $previous_state dxState_TrackHighwayStreak} ) (exit @@ -1619,22 +1643,22 @@ ( {switch $dx_set_ui_label_tracked_ui (highway_overdrive_text - {set $dx_set_ui_text_size $dx_highway_overdrive_text_size} - {set $dx_set_ui_text_font $dx_highway_overdrive_text_font} - {set $dx_set_ui_text_alignment $dx_highway_overdrive_text_alignment} - {set $dx_set_ui_text_kerning $dx_highway_overdrive_text_kerning} + {set $dx_set_ui_text_size $dx_track_overdrive_size} + {set $dx_set_ui_text_font $dx_track_overdrive_font} + {set $dx_set_ui_text_alignment $dx_track_overdrive_alignment} + {set $dx_set_ui_text_kerning $dx_track_overdrive_kerning} ) (highway_streak_text - {set $dx_set_ui_text_size $dx_highway_streak_text_size} - {set $dx_set_ui_text_font $dx_highway_streak_text_font} - {set $dx_set_ui_text_alignment $dx_highway_streak_text_alignment} - {set $dx_set_ui_text_kerning $dx_highway_streak_text_kerning} + {set $dx_set_ui_text_size $dx_track_streak_size} + {set $dx_set_ui_text_font $dx_track_streak_font} + {set $dx_set_ui_text_alignment $dx_track_streak_alignment} + {set $dx_set_ui_text_kerning $dx_track_streak_kerning} ) (highway_username_text - {set $dx_set_ui_text_size $dx_highway_username_text_size} - {set $dx_set_ui_text_font $dx_highway_username_text_font} - {set $dx_set_ui_text_alignment $dx_highway_username_text_alignment} - {set $dx_set_ui_text_kerning $dx_highway_username_text_kerning} + {set $dx_set_ui_text_size $dx_track_username_size} + {set $dx_set_ui_text_font $dx_track_username_font} + {set $dx_set_ui_text_alignment $dx_track_username_alignment} + {set $dx_set_ui_text_kerning $dx_track_username_kerning} ) kDataUnhandled } @@ -1668,31 +1692,43 @@ ( {switch $dx_set_ui_label_tracked_ui (highway_overdrive_text - {set $dx_highway_overdrive_text_size $dx_set_ui_text_size} - {set $dx_highway_overdrive_text_font $dx_set_ui_text_font} - {set $dx_highway_overdrive_text_alignment $dx_set_ui_text_alignment} - {set $dx_highway_overdrive_text_kerning $dx_set_ui_text_kerning} + {set $dx_track_overdrive_size $dx_set_ui_text_size} + {set $dx_track_overdrive_font $dx_set_ui_text_font} + {set $dx_track_overdrive_alignment $dx_set_ui_text_alignment} + {set $dx_track_overdrive_kerning $dx_set_ui_text_kerning} {if {$this in_game} - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_highway_overdrive_text_r $dx_highway_overdrive_text_g $dx_highway_overdrive_text_b TRUE} + {beatmatch foreach_active_player $players + {if {!= {$player instrument} vocals} + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_track_overdrive_r $dx_track_overdrive_g $dx_track_overdrive_b TRUE} + } + } } ) (highway_streak_text - {set $dx_highway_streak_text_size $dx_set_ui_text_size} - {set $dx_highway_streak_text_font $dx_set_ui_text_font} - {set $dx_highway_streak_text_alignment $dx_set_ui_text_alignment} - {set $dx_highway_streak_text_kerning $dx_set_ui_text_kerning} + {set $dx_track_streak_size $dx_set_ui_text_size} + {set $dx_track_streak_font $dx_set_ui_text_font} + {set $dx_track_streak_alignment $dx_set_ui_text_alignment} + {set $dx_track_streak_kerning $dx_set_ui_text_kerning} {if {$this in_game} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b TRUE} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b TRUE} + } + } } ) (highway_username_text - {set $dx_highway_username_text_size $dx_set_ui_text_size} - {set $dx_highway_username_text_font $dx_set_ui_text_font} - {set $dx_highway_username_text_alignment $dx_set_ui_text_alignment} - {set $dx_highway_username_text_kerning $dx_set_ui_text_kerning} + {set $dx_track_username_size $dx_set_ui_text_size} + {set $dx_track_username_font $dx_set_ui_text_font} + {set $dx_track_username_alignment $dx_set_ui_text_alignment} + {set $dx_track_username_kerning $dx_set_ui_text_kerning} {if {$this in_game} - {dx_track_label dx_track_label_username $dx_highway_username_text_size $dx_highway_username_text_font $dx_highway_username_text_alignment $dx_highway_username_text_kerning $dx_highway_username_text_x $dx_highway_username_text_y $dx_highway_username_text_r $dx_highway_username_text_g $dx_highway_username_text_b TRUE} - {dx_show_track_username} + {beatmatch foreach_active_player $player + {if {!= {$player instrument} vocals} + {dx_track_label dx_track_label_username $dx_track_username_size $dx_track_username_font $dx_track_username_alignment $dx_track_username_kerning {{$player get_user} get_slot_num} $dx_track_username_x $dx_track_username_y $dx_track_username_r $dx_track_username_g $dx_track_username_b TRUE} + {dx_show_track_username} + } + } } ) kDataUnhandled diff --git a/_ark/dx/read_write/dx_reader_macros.dta b/_ark/dx/read_write/dx_reader_macros.dta index b73b6020e..20b6e1fb8 100644 --- a/_ark/dx/read_write/dx_reader_macros.dta +++ b/_ark/dx/read_write/dx_reader_macros.dta @@ -506,174 +506,174 @@ {elem {find $entry dx_dim_remote_players} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text}} - {set $dx_highway_overdrive_text - {elem {find $entry dx_highway_overdrive_text} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive}} + {set $dx_track_overdrive + {elem {find $entry dx_track_overdrive} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_size}} - {set $dx_highway_overdrive_text_size - {elem {find $entry dx_highway_overdrive_text_size} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_size}} + {set $dx_track_overdrive_size + {elem {find $entry dx_track_overdrive_size} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_font}} - {set $dx_highway_overdrive_text_font - {elem {find $entry dx_highway_overdrive_text_font} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_font}} + {set $dx_track_overdrive_font + {elem {find $entry dx_track_overdrive_font} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_alignment}} - {set $dx_highway_overdrive_text_alignment - {elem {find $entry dx_highway_overdrive_text_alignment} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_alignment}} + {set $dx_track_overdrive_alignment + {elem {find $entry dx_track_overdrive_alignment} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_kerning}} - {set $dx_highway_overdrive_text_kerning - {elem {find $entry dx_highway_overdrive_text_kerning} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_kerning}} + {set $dx_track_overdrive_kerning + {elem {find $entry dx_track_overdrive_kerning} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_x}} - {set $dx_highway_overdrive_text_x - {elem {find $entry dx_highway_overdrive_text_x} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_x}} + {set $dx_track_overdrive_x + {elem {find $entry dx_track_overdrive_x} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_z}} - {set $dx_highway_overdrive_text_z - {elem {find $entry dx_highway_overdrive_text_z} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_z}} + {set $dx_track_overdrive_z + {elem {find $entry dx_track_overdrive_z} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_y}} - {set $dx_highway_overdrive_text_y - {elem {find $entry dx_highway_overdrive_text_y} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_y}} + {set $dx_track_overdrive_y + {elem {find $entry dx_track_overdrive_y} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_r}} - {set $dx_highway_overdrive_text_r - {elem {find $entry dx_highway_overdrive_text_r} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_r}} + {set $dx_track_overdrive_r + {elem {find $entry dx_track_overdrive_r} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_g}} - {set $dx_highway_overdrive_text_g - {elem {find $entry dx_highway_overdrive_text_g} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_g}} + {set $dx_track_overdrive_g + {elem {find $entry dx_track_overdrive_g} 1} } } - {if {== {elem $entry 0} {basename dx_highway_overdrive_text_b}} - {set $dx_highway_overdrive_text_b - {elem {find $entry dx_highway_overdrive_text_b} 1} + {if {== {elem $entry 0} {basename dx_track_overdrive_b}} + {set $dx_track_overdrive_b + {elem {find $entry dx_track_overdrive_b} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text}} - {set $dx_highway_username_text - {elem {find $entry dx_highway_username_text} 1} + {if {== {elem $entry 0} {basename dx_track_username}} + {set $dx_track_username + {elem {find $entry dx_track_username} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_size}} - {set $dx_highway_username_text_size - {elem {find $entry dx_highway_username_text_size} 1} + {if {== {elem $entry 0} {basename dx_track_username_size}} + {set $dx_track_username_size + {elem {find $entry dx_track_username_size} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_font}} - {set $dx_highway_username_text_font - {elem {find $entry dx_highway_username_text_font} 1} + {if {== {elem $entry 0} {basename dx_track_username_font}} + {set $dx_track_username_font + {elem {find $entry dx_track_username_font} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_alignment}} - {set $dx_highway_username_text_alignment - {elem {find $entry dx_highway_username_text_alignment} 1} + {if {== {elem $entry 0} {basename dx_track_username_alignment}} + {set $dx_track_username_alignment + {elem {find $entry dx_track_username_alignment} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_kerning}} - {set $dx_highway_username_text_kerning - {elem {find $entry dx_highway_username_text_kerning} 1} + {if {== {elem $entry 0} {basename dx_track_username_kerning}} + {set $dx_track_username_kerning + {elem {find $entry dx_track_username_kerning} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_x}} - {set $dx_highway_username_text_x - {elem {find $entry dx_highway_username_text_x} 1} + {if {== {elem $entry 0} {basename dx_track_username_x}} + {set $dx_track_username_x + {elem {find $entry dx_track_username_x} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_z}} - {set $dx_highway_username_text_z - {elem {find $entry dx_highway_username_text_z} 1} + {if {== {elem $entry 0} {basename dx_track_username_z}} + {set $dx_track_username_z + {elem {find $entry dx_track_username_z} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_y}} - {set $dx_highway_username_text_y - {elem {find $entry dx_highway_username_text_y} 1} + {if {== {elem $entry 0} {basename dx_track_username_y}} + {set $dx_track_username_y + {elem {find $entry dx_track_username_y} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_r}} - {set $dx_highway_username_text_r - {elem {find $entry dx_highway_username_text_r} 1} + {if {== {elem $entry 0} {basename dx_track_username_r}} + {set $dx_track_username_r + {elem {find $entry dx_track_username_r} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_g}} - {set $dx_highway_username_text_g - {elem {find $entry dx_highway_username_text_g} 1} + {if {== {elem $entry 0} {basename dx_track_username_g}} + {set $dx_track_username_g + {elem {find $entry dx_track_username_g} 1} } } - {if {== {elem $entry 0} {basename dx_highway_username_text_b}} - {set $dx_highway_username_text_b - {elem {find $entry dx_highway_username_text_b} 1} + {if {== {elem $entry 0} {basename dx_track_username_b}} + {set $dx_track_username_b + {elem {find $entry dx_track_username_b} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text}} - {set $dx_highway_streak_text - {elem {find $entry dx_highway_streak_text} 1} + {if {== {elem $entry 0} {basename dx_track_streak}} + {set $dx_track_streak + {elem {find $entry dx_track_streak} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_gh3_delay}} - {set $dx_highway_streak_text_gh3_delay - {elem {find $entry dx_highway_streak_text_gh3_delay} 1} + {if {== {elem $entry 0} {basename dx_track_streak_gh3_delay}} + {set $dx_track_streak_gh3_delay + {elem {find $entry dx_track_streak_gh3_delay} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_size}} - {set $dx_highway_streak_text_size - {elem {find $entry dx_highway_streak_text_size} 1} + {if {== {elem $entry 0} {basename dx_track_streak_size}} + {set $dx_track_streak_size + {elem {find $entry dx_track_streak_size} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_font}} - {set $dx_highway_streak_text_font - {elem {find $entry dx_highway_streak_text_font} 1} + {if {== {elem $entry 0} {basename dx_track_streak_font}} + {set $dx_track_streak_font + {elem {find $entry dx_track_streak_font} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_alignment}} - {set $dx_highway_streak_text_alignment - {elem {find $entry dx_highway_streak_text_alignment} 1} + {if {== {elem $entry 0} {basename dx_track_streak_alignment}} + {set $dx_track_streak_alignment + {elem {find $entry dx_track_streak_alignment} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_kerning}} - {set $dx_highway_streak_text_kerning - {elem {find $entry dx_highway_streak_text_kerning} 1} + {if {== {elem $entry 0} {basename dx_track_streak_kerning}} + {set $dx_track_streak_kerning + {elem {find $entry dx_track_streak_kerning} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_x}} - {set $dx_highway_streak_text_x - {elem {find $entry dx_highway_streak_text_x} 1} + {if {== {elem $entry 0} {basename dx_track_streak_x}} + {set $dx_track_streak_x + {elem {find $entry dx_track_streak_x} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_z}} - {set $dx_highway_streak_text_z - {elem {find $entry dx_highway_streak_text_z} 1} + {if {== {elem $entry 0} {basename dx_track_streak_z}} + {set $dx_track_streak_z + {elem {find $entry dx_track_streak_z} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_y}} - {set $dx_highway_streak_text_y - {elem {find $entry dx_highway_streak_text_y} 1} + {if {== {elem $entry 0} {basename dx_track_streak_y}} + {set $dx_track_streak_y + {elem {find $entry dx_track_streak_y} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_r}} - {set $dx_highway_streak_text_r - {elem {find $entry dx_highway_streak_text_r} 1} + {if {== {elem $entry 0} {basename dx_track_streak_r}} + {set $dx_track_streak_r + {elem {find $entry dx_track_streak_r} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_g}} - {set $dx_highway_streak_text_g - {elem {find $entry dx_highway_streak_text_g} 1} + {if {== {elem $entry 0} {basename dx_track_streak_g}} + {set $dx_track_streak_g + {elem {find $entry dx_track_streak_g} 1} } } - {if {== {elem $entry 0} {basename dx_highway_streak_text_b}} - {set $dx_highway_streak_text_b - {elem {find $entry dx_highway_streak_text_b} 1} + {if {== {elem $entry 0} {basename dx_track_streak_b}} + {set $dx_track_streak_b + {elem {find $entry dx_track_streak_b} 1} } } {if {== {elem $entry 0} {basename dx_time_remaining_direction}} diff --git a/_ark/dx/read_write/dx_writer_macros.dta b/_ark/dx/read_write/dx_writer_macros.dta index dc7426b8f..d532e391d 100644 --- a/_ark/dx/read_write/dx_writer_macros.dta +++ b/_ark/dx/read_write/dx_writer_macros.dta @@ -116,40 +116,40 @@ {dx_setting_saver dx_settings dx_diff_popups $dx_diff_popups} {dx_setting_saver dx_settings dx_force_remote_vox $dx_force_remote_vox} {dx_setting_saver dx_settings dx_dim_remote_players $dx_dim_remote_players} - {dx_setting_saver dx_settings dx_highway_overdrive_text $dx_highway_overdrive_text} - {dx_setting_saver dx_settings dx_highway_overdrive_text_size $dx_highway_overdrive_text_size} - {dx_setting_saver dx_settings dx_highway_overdrive_text_font $dx_highway_overdrive_text_font} - {dx_setting_saver dx_settings dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_alignment} - {dx_setting_saver dx_settings dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_kerning} - {dx_setting_saver dx_settings dx_highway_overdrive_text_x $dx_highway_overdrive_text_x} - {dx_setting_saver dx_settings dx_highway_overdrive_text_z $dx_highway_overdrive_text_z} - {dx_setting_saver dx_settings dx_highway_overdrive_text_y $dx_highway_overdrive_text_y} - {dx_setting_saver dx_settings dx_highway_overdrive_text_r $dx_highway_overdrive_text_r} - {dx_setting_saver dx_settings dx_highway_overdrive_text_g $dx_highway_overdrive_text_g} - {dx_setting_saver dx_settings dx_highway_overdrive_text_b $dx_highway_overdrive_text_b} - {dx_setting_saver dx_settings dx_highway_username_text $dx_highway_username_text} - {dx_setting_saver dx_settings dx_highway_username_text_size $dx_highway_username_text_size} - {dx_setting_saver dx_settings dx_highway_username_text_font $dx_highway_username_text_font} - {dx_setting_saver dx_settings dx_highway_username_text_alignment $dx_highway_username_text_alignment} - {dx_setting_saver dx_settings dx_highway_username_text_kerning $dx_highway_username_text_kerning} - {dx_setting_saver dx_settings dx_highway_username_text_x $dx_highway_username_text_x} - {dx_setting_saver dx_settings dx_highway_username_text_z $dx_highway_username_text_z} - {dx_setting_saver dx_settings dx_highway_username_text_y $dx_highway_username_text_y} - {dx_setting_saver dx_settings dx_highway_username_text_r $dx_highway_username_text_r} - {dx_setting_saver dx_settings dx_highway_username_text_g $dx_highway_username_text_g} - {dx_setting_saver dx_settings dx_highway_username_text_b $dx_highway_username_text_b} - {dx_setting_saver dx_settings dx_highway_streak_text $dx_highway_streak_text} - {dx_setting_saver dx_settings dx_highway_streak_text_gh3_delay $dx_highway_streak_text_gh3_delay} - {dx_setting_saver dx_settings dx_highway_streak_text_size $dx_highway_streak_text_size} - {dx_setting_saver dx_settings dx_highway_streak_text_font $dx_highway_streak_text_font} - {dx_setting_saver dx_settings dx_highway_streak_text_alignment $dx_highway_streak_text_alignment} - {dx_setting_saver dx_settings dx_highway_streak_text_kerning $dx_highway_streak_text_kerning} - {dx_setting_saver dx_settings dx_highway_streak_text_x $dx_highway_streak_text_x} - {dx_setting_saver dx_settings dx_highway_streak_text_z $dx_highway_streak_text_z} - {dx_setting_saver dx_settings dx_highway_streak_text_y $dx_highway_streak_text_y} - {dx_setting_saver dx_settings dx_highway_streak_text_r $dx_highway_streak_text_r} - {dx_setting_saver dx_settings dx_highway_streak_text_g $dx_highway_streak_text_g} - {dx_setting_saver dx_settings dx_highway_streak_text_b $dx_highway_streak_text_b} + {dx_setting_saver dx_settings dx_track_overdrive $dx_track_overdrive} + {dx_setting_saver dx_settings dx_track_overdrive_size $dx_track_overdrive_size} + {dx_setting_saver dx_settings dx_track_overdrive_font $dx_track_overdrive_font} + {dx_setting_saver dx_settings dx_track_overdrive_alignment $dx_track_overdrive_alignment} + {dx_setting_saver dx_settings dx_track_overdrive_kerning $dx_track_overdrive_kerning} + {dx_setting_saver dx_settings dx_track_overdrive_x $dx_track_overdrive_x} + {dx_setting_saver dx_settings dx_track_overdrive_z $dx_track_overdrive_z} + {dx_setting_saver dx_settings dx_track_overdrive_y $dx_track_overdrive_y} + {dx_setting_saver dx_settings dx_track_overdrive_r $dx_track_overdrive_r} + {dx_setting_saver dx_settings dx_track_overdrive_g $dx_track_overdrive_g} + {dx_setting_saver dx_settings dx_track_overdrive_b $dx_track_overdrive_b} + {dx_setting_saver dx_settings dx_track_username $dx_track_username} + {dx_setting_saver dx_settings dx_track_username_size $dx_track_username_size} + {dx_setting_saver dx_settings dx_track_username_font $dx_track_username_font} + {dx_setting_saver dx_settings dx_track_username_alignment $dx_track_username_alignment} + {dx_setting_saver dx_settings dx_track_username_kerning $dx_track_username_kerning} + {dx_setting_saver dx_settings dx_track_username_x $dx_track_username_x} + {dx_setting_saver dx_settings dx_track_username_z $dx_track_username_z} + {dx_setting_saver dx_settings dx_track_username_y $dx_track_username_y} + {dx_setting_saver dx_settings dx_track_username_r $dx_track_username_r} + {dx_setting_saver dx_settings dx_track_username_g $dx_track_username_g} + {dx_setting_saver dx_settings dx_track_username_b $dx_track_username_b} + {dx_setting_saver dx_settings dx_track_streak $dx_track_streak} + {dx_setting_saver dx_settings dx_track_streak_gh3_delay $dx_track_streak_gh3_delay} + {dx_setting_saver dx_settings dx_track_streak_size $dx_track_streak_size} + {dx_setting_saver dx_settings dx_track_streak_font $dx_track_streak_font} + {dx_setting_saver dx_settings dx_track_streak_alignment $dx_track_streak_alignment} + {dx_setting_saver dx_settings dx_track_streak_kerning $dx_track_streak_kerning} + {dx_setting_saver dx_settings dx_track_streak_x $dx_track_streak_x} + {dx_setting_saver dx_settings dx_track_streak_z $dx_track_streak_z} + {dx_setting_saver dx_settings dx_track_streak_y $dx_track_streak_y} + {dx_setting_saver dx_settings dx_track_streak_r $dx_track_streak_r} + {dx_setting_saver dx_settings dx_track_streak_g $dx_track_streak_g} + {dx_setting_saver dx_settings dx_track_streak_b $dx_track_streak_b} {dx_setting_saver dx_settings dx_time_remaining_direction $dx_time_remaining_direction} {dx_setting_saver dx_settings dx_time_remaining_pos_top $dx_time_remaining_pos_top} {dx_setting_saver dx_settings dx_disp_total_time $dx_disp_total_time} diff --git a/_ark/dx/track/callbacks/dx_track_callbacks.dta b/_ark/dx/track/callbacks/dx_track_callbacks.dta index d83be48e0..d938eae91 100644 --- a/_ark/dx/track/callbacks/dx_track_callbacks.dta +++ b/_ark/dx/track/callbacks/dx_track_callbacks.dta @@ -50,7 +50,7 @@ {set [num_gems_combo] {'+' [num_gems_combo] 1}} ;increment the notes comboed counter {dx_store_note_hit_info [track_instrument] [num_gems_hit] [num_gems_combo] [num_gems_pass] [num_gems_miss]} {dx_check_for_streak_popup $dx_note_streak_popups [track_instrument] [num_gems_combo]} - {dx_indv_note_streak $dx_highway_streak_text [track_instrument]} + {dx_indv_note_streak $dx_track_streak [track_instrument]} ) (miss ;when a note is missed (overstrum) {if {dx_check_first_note [track_instrument]} @@ -58,7 +58,7 @@ {set [num_gems_combo] 0} ;reset the notes comboed counter {dx_store_note_hit_info [track_instrument] [num_gems_hit] [num_gems_combo] [num_gems_pass] [num_gems_miss]} {$this check_missed} ;run the logic to check our current misses - {dx_indv_note_streak $dx_highway_streak_text [track_instrument]} + {dx_indv_note_streak $dx_track_streak [track_instrument]} } ) (pass ;when a note is passed (ignored) @@ -68,7 +68,7 @@ {dx_store_note_hit_info [track_instrument] [num_gems_hit] [num_gems_combo] [num_gems_pass] [num_gems_miss]} {$this check_missed} ;run the logic to check our current misses {dx_acceleration_mode 0} - {dx_indv_note_streak $dx_highway_streak_text [track_instrument]} + {dx_indv_note_streak $dx_track_streak [track_instrument]} ) (first_note {if {! {dx_check_first_note [track_instrument]}} ;if the first note has not been hit/missed/passed yet, track that the first note has been hit/missed/passed diff --git a/_ark/dx/track/dx_track_includes.dta b/_ark/dx/track/dx_track_includes.dta index ec32c3a0c..216d0259a 100644 --- a/_ark/dx/track/dx_track_includes.dta +++ b/_ark/dx/track/dx_track_includes.dta @@ -15,6 +15,5 @@ #include track/dx_track_funcs.dta #include track_ui/dx_track_fc_ui_funcs.dta #include track_ui/dx_track_ui_funcs.dta -#include track_ui/dx_track_inst_label_funcs.dta #include track_ui/dx_track_streak_funcs.dta #include track_ui/dx_track_overdrive_ui_funcs.dta \ No newline at end of file diff --git a/_ark/dx/track/track/dx_track_panel_handles.dta b/_ark/dx/track/track/dx_track_panel_handles.dta index ab314f33e..3c2613cdf 100644 --- a/_ark/dx/track/track/dx_track_panel_handles.dta +++ b/_ark/dx/track/track/dx_track_panel_handles.dta @@ -119,10 +119,10 @@ {dx_song_progress_instrument_label dx_song_progress_instrument_label TRUE} {dx_game_hud_label dx_hud_label_band_streak $dx_hud_band_streak_text_size $dx_hud_band_streak_text_font $dx_hud_band_streak_text_alignment $dx_hud_band_streak_text_kerning $dx_hud_band_streak_text_x $dx_hud_band_streak_text_z $dx_hud_band_streak_text_y $dx_hud_band_streak_text_r $dx_hud_band_streak_text_g $dx_hud_band_streak_text_b TRUE} {beatmatch foreach_active_player $player - {unless {== {$player instrument} vocals} - {dx_track_label dx_track_label_username $dx_highway_username_text_size $dx_highway_username_text_font $dx_highway_username_text_alignment $dx_highway_username_text_kerning $dx_highway_username_text_x $dx_highway_username_text_y $dx_highway_username_text_r $dx_highway_username_text_g $dx_highway_username_text_b TRUE} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b TRUE} - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_highway_overdrive_text_r $dx_highway_overdrive_text_g $dx_highway_overdrive_text_b TRUE} + {if {!= {$player instrument} vocals} + {dx_track_label dx_track_label_username $dx_track_username_size $dx_track_username_font $dx_track_username_alignment $dx_track_username_kerning {{$player get_user} get_slot_num} $dx_track_username_x $dx_track_username_y $dx_track_username_r $dx_track_username_g $dx_track_username_b TRUE} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b TRUE} + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_track_overdrive_r $dx_track_overdrive_g $dx_track_overdrive_b TRUE} } } } @@ -150,7 +150,6 @@ {dx_track_fc_reset} {dx_show_track_username} {dx_dim_remote_players} - {dx_track_panel_extended_ui} {dx_mtv_time_remaining_handler} {dx_new_set_song_progress_backer $dx_song_progress_bar} {if {! {modifier_mgr is_modifier_active mod_brutalmode}} ;brutal mode relies on crowd meter accuracy diff --git a/_ark/dx/track/track_ui/dx_track_inst_label_funcs.dta b/_ark/dx/track/track_ui/dx_track_inst_label_funcs.dta deleted file mode 100644 index 4a1925581..000000000 --- a/_ark/dx/track/track_ui/dx_track_inst_label_funcs.dta +++ /dev/null @@ -1,90 +0,0 @@ -{func dx_track_label_instrument - ($name $instrument $slot $reset) - {set_this {find_obj {{get_track_panel} loaded_dir} {sprint "track_" $slot} band_power_meter}} - {set $thislabel {sprint $name $slot ".lbl"}} - {set $thiscolor {sprint $name $slot ".color"}} - {if $reset - {if {exists $thislabel} - {delete $thislabel} - } - {if {exists $thiscolor} - {delete $thiscolor} - } - } - {if {! {exists $thislabel}} - {new BandLabel $thislabel} - {$thislabel set resource_name pentatonic_outline} - {$thislabel set alt_font_resource_name instruments_icons} - {$thislabel set alt_style_enabled TRUE} - {$thislabel set markup TRUE} - {$thislabel set alt_text_size 3} - {$thislabel set alt_z_offset 0} - {$thislabel set_showing TRUE} - {$thislabel set_local_scale 1 1 1} - {$thislabel set_local_rot -60 0 5} - {$thislabel set text_size 1} - {$thislabel set alignment kMiddleCenter} - {$thislabel set width 500} - {$thislabel set height 500} - {$thislabel set alpha 1} - {$thislabel set kerning 1} - {tour_flag.grp add_object $thislabel} - {$thislabel set_token_fmt os_blnk} - {$thislabel set_local_pos 11.13 0 -2.42} - } - {if {! {exists $thiscolor}} - {new UIColor $thiscolor} - {$thislabel set color_override $thiscolor} - } - {$thiscolor set color {pack_color 1 1 1}} -} - -{func - dx_fix_track_instrument_icon_pos - {set $active_insts 0} - {beatmatch foreach_active_player $player ;count total players first - {unless {== {$player instrument} vocals} - {set $active_insts {+ $active_insts 1}} - } - } - {beatmatch foreach_active_player $player - {unless {== {$player instrument} vocals} - {if $dx_mtvup - {set_this {find_obj DX_GEMTRACKDIR band_power_meter}} - {set $overdrive_inst_label {sprint "dx_track_label_instrument" {{$player get_user} get_slot_num} ".lbl"}} - {set $overdrive_streak_label {sprint "dx_track_label_streak" {{$player get_user} get_slot_num} ".lbl"}} - {$overdrive_inst_label set_token_fmt - {switch {$player instrument} - ((guitar real_guitar) inst_icon_guitar) - ((bass real_bass) inst_icon_bass) - ((drum real_drum) inst_icon_drum) - ((keys real_keys) inst_icon_keys) - } - } - {switch $active_insts - (1 - {$overdrive_inst_label set_local_pos 10.21 -8.3 -0.18} - {$overdrive_streak_label set_local_pos 10.4 -9 -2.32} - {$overdrive_inst_label set alt_text_size 2.95} - ) - (2 - {$overdrive_inst_label set_local_pos 10.21 -8.3 -0.18} - {$overdrive_streak_label set_local_pos 10.4 -9 -2.32} - {$overdrive_inst_label set alt_text_size 2.95} - ) - (3 - {$overdrive_inst_label set_local_pos 10.27 -8.3 -0.36} - {$overdrive_streak_label set_local_pos 10.5 -9 -2.32} - {$overdrive_inst_label set alt_text_size 2.95} - ) - (4 - {$overdrive_inst_label set_local_pos 10.25 -9 -0.12} - {$overdrive_streak_label set_local_pos 10.5 -9 -2.32} - {$overdrive_inst_label set alt_text_size 3} - ) - kDataUnhandled - } - } - } - } -} \ No newline at end of file diff --git a/_ark/dx/track/track_ui/dx_track_overdrive_ui_funcs.dta b/_ark/dx/track/track_ui/dx_track_overdrive_ui_funcs.dta index 935a511e9..7f8c9df39 100644 --- a/_ark/dx/track/track_ui/dx_track_overdrive_ui_funcs.dta +++ b/_ark/dx/track/track_ui/dx_track_overdrive_ui_funcs.dta @@ -1,4 +1,5 @@ {func + ;disabled, left here for reference dx_set_song_progress {beatmatch foreach_active_player $player {unless {== {$player instrument} vocals} @@ -16,21 +17,62 @@ ; shows the current overdrive of each player at the bottom of their respective highways {func dx_show_user_overdrive - {if $dx_highway_overdrive_text + {if $dx_track_overdrive {beatmatch foreach_active_player $player ;handle adding the appropriate callbacks to each player - {unless {== {$player instrument} vocals} + {if {!= {$player instrument} vocals} + {set_this {find_obj DX_GEMTRACKDIR band_power_meter}} + {set $this_od_label {sprint "dx_track_label_overdrive" {{$player get_user} get_slot_num} ".lbl"}} {if_else {|| {$player is_deploying} {>= {$player band_energy} 0.50}} - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_gold_ui_r $dx_gold_ui_g $dx_gold_ui_b FALSE} - {dx_track_label dx_track_label_overdrive $dx_highway_overdrive_text_size $dx_highway_overdrive_text_font $dx_highway_overdrive_text_alignment $dx_highway_overdrive_text_kerning $dx_highway_overdrive_text_x $dx_highway_overdrive_text_y $dx_highway_overdrive_text_r $dx_highway_overdrive_text_g $dx_highway_overdrive_text_b FALSE} + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_gold_ui_r $dx_gold_ui_g $dx_gold_ui_b FALSE} + {dx_track_label_overdrive dx_track_label_overdrive $dx_track_overdrive_size $dx_track_overdrive_font $dx_track_overdrive_alignment $dx_track_overdrive_kerning {{$player get_user} get_slot_num} $dx_track_overdrive_x $dx_track_overdrive_y $dx_track_overdrive_r $dx_track_overdrive_g $dx_track_overdrive_b FALSE} } {if_else {>= {$player band_energy} 0.01} - {{{find_obj DX_GEMTRACKDIR} find {sprint "dx_track_label_overdrive" {{$player get_user} get_slot_num} ".lbl"}} set_token_fmt dx_overdrive_report {* {$player band_energy} 100}} - {{{find_obj DX_GEMTRACKDIR} find {sprint "dx_track_label_overdrive" {{$player get_user} get_slot_num} ".lbl"}} set_token_fmt os_blnk} + {$this_od_label set_token_fmt dx_overdrive_report {* {$player band_energy} 100}} + {$this_od_label set_token_fmt os_blnk} } } } } } +{func dx_track_label_overdrive + ($name $size $font $alignment $kerning $slot $x $y $r $g $b $reset) + {set_this {find_obj {{get_track_panel} loaded_dir} {sprint "track_" $slot} band_power_meter}} + {set $thislabel {sprint $name $slot ".lbl"}} + {set $thiscolor {sprint $name $slot ".color"}} + {if $reset + {if {exists $thislabel} + {delete $thislabel} + } + {if {exists $thiscolor} + {delete $thiscolor} + } + } + {if {! {exists $thislabel}} + {new BandLabel $thislabel} + {$thislabel set resource_name $font} + {$thislabel set alt_font_resource_name instruments_icons} + {$thislabel set markup TRUE} + {$thislabel set alt_text_size 3.3} + {$thislabel set alt_z_offset 0} + {$thislabel set_showing TRUE} + {$thislabel set_local_scale 1 1 1} + {$thislabel set_local_rot 0 0 0} + {$thislabel set width 500} + {$thislabel set height 500} + {$thislabel set alpha 1} + {meters.grp add_object $thislabel} + ;{$thislabel set_token_fmt os_blnk} + } + {if {! {exists $thiscolor}} + {new UIColor $thiscolor} + {$thislabel set color_override $thiscolor} + } + {$thislabel set alignment $alignment} + {$thislabel set text_size $size} + {$thislabel set kerning $kerning} + {$thiscolor set color {pack_color $r $g $b}} + {$thislabel set_local_pos $x -5 $y} +} ; prep od ready popup {func dx_calc_overdrive diff --git a/_ark/dx/track/track_ui/dx_track_streak_funcs.dta b/_ark/dx/track/track_ui/dx_track_streak_funcs.dta index 0ecb4d0cb..8f81d36f6 100644 --- a/_ark/dx/track/track_ui/dx_track_streak_funcs.dta +++ b/_ark/dx/track/track_ui/dx_track_streak_funcs.dta @@ -9,10 +9,10 @@ {set $track_label_inst {sprint "dx_track_label_streak" {{$player get_user} get_slot_num} ".lbl"}} {dx_poll_inst_info $instrument} {if_else {== {+ $polled_gems_miss $polled_gems_pass} 0} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_gold_ui_r $dx_gold_ui_g $dx_gold_ui_b FALSE} - {dx_track_label_streak dx_track_label_streak $dx_highway_streak_text_size $dx_highway_streak_text_font $dx_highway_streak_text_alignment $dx_highway_streak_text_kerning $dx_highway_streak_text_r $dx_highway_streak_text_g $dx_highway_streak_text_b FALSE} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_gold_ui_r $dx_gold_ui_g $dx_gold_ui_b FALSE} + {dx_track_label_streak dx_track_label_streak $dx_track_streak_size $dx_track_streak_font $dx_track_streak_alignment $dx_track_streak_kerning {{$player get_user} get_slot_num} $dx_track_streak_x $dx_track_streak_y $dx_track_streak_r $dx_track_streak_g $dx_track_streak_b FALSE} } - {if_else {> $polled_gems_combo {if_else $dx_highway_streak_text_gh3_delay 24 0}} + {if_else {> $polled_gems_combo {if_else $dx_track_streak_gh3_delay 24 0}} {$track_label_inst set_token_fmt dx_indv_combo $polled_gems_combo} {$track_label_inst set_token_fmt os_blnk} } @@ -21,10 +21,10 @@ } } {func dx_track_label_streak - ($name $size $font $alignment $kerning $r $g $b $reset) - {set_this {find_obj {{get_track_panel} loaded_dir} {sprint "track_" {{$player get_user} get_slot_num}} band_power_meter}} - {set $thislabel {sprint $name {{$player get_user} get_slot_num} ".lbl"}} - {set $thiscolor {sprint $name {{$player get_user} get_slot_num} ".color"}} + ($name $size $font $alignment $kerning $slot $x $y $r $g $b $reset) + {set_this {find_obj {{get_track_panel} loaded_dir} {sprint "track_" $slot} band_power_meter}} + {set $thislabel {sprint $name $slot ".lbl"}} + {set $thiscolor {sprint $name $slot ".color"}} {if $reset {if {exists $thislabel} {delete $thislabel} @@ -43,20 +43,21 @@ {$thislabel set_showing TRUE} {$thislabel set_local_scale 1 1 1} {$thislabel set_local_rot 0 0 0} - {$thislabel set text_size 1} - {$thislabel set alignment kMiddleCenter} {$thislabel set width 500} {$thislabel set height 500} {$thislabel set alpha 1} - {$thislabel set kerning $kerning} - {tour_flag.grp add_object $thislabel} + {meters.grp add_object $thislabel} ;{$thislabel set_token_fmt os_blnk} } {if {! {exists $thiscolor}} {new UIColor $thiscolor} {$thislabel set color_override $thiscolor} } + {$thislabel set kerning $kerning} + {$thislabel set alignment $alignment} + {$thislabel set text_size $size} {$thiscolor set color {pack_color $r $g $b}} + {$thislabel set_local_pos $x -5 $y} } ;gh style note streak text popups above the track diff --git a/_ark/dx/track/track_ui/dx_track_ui_funcs.dta b/_ark/dx/track/track_ui/dx_track_ui_funcs.dta index 2718da4cb..0ea6abfa7 100644 --- a/_ark/dx/track/track_ui/dx_track_ui_funcs.dta +++ b/_ark/dx/track/track_ui/dx_track_ui_funcs.dta @@ -1,4 +1,5 @@ {func + ;disabled, left here for reference dx_track_panel_extended_ui {beatmatch foreach_active_player $player ;handle adding the appropriate callbacks to each player {unless {== {$player instrument} vocals} @@ -97,7 +98,7 @@ {icon.lbl set_local_pos_index 0 {+ $player_icon_pos 0.01}} {player_name.lbl set_token_fmt {sprint - {if_else $dx_highway_username_text ;dont show username twice if track username is enabled + {if_else $dx_track_username ;dont show username twice if track username is enabled {localize os_blnk} $dx_current_player_name_sanitized } @@ -116,16 +117,34 @@ ; shows the username of each player at the bottom of their respective highways {func dx_show_track_username - {if $dx_highway_username_text + {if $dx_track_username {beatmatch foreach_active_player $player ;handle adding the appropriate callbacks to each player - {unless {== {$player instrument} vocals} + {if {!= {$player instrument} vocals} {dx_sanitize_player_name {{$player get_user} get_user_name}} - {dx_track_label dx_track_label_username $dx_highway_username_text_size $dx_highway_username_text_font $dx_highway_username_text_alignment $dx_highway_username_text_kerning $dx_highway_username_text_x $dx_highway_username_text_y $dx_highway_username_text_r $dx_highway_username_text_g $dx_highway_username_text_b FALSE} - {dx_track_label_instrument dx_track_label_instrument {$player instrument} {{$player get_user} get_slot_num} TRUE} + {dx_track_label dx_track_label_username $dx_track_username_size $dx_track_username_font $dx_track_username_alignment $dx_track_username_kerning {{$player get_user} get_slot_num} $dx_track_username_x $dx_track_username_y $dx_track_username_r $dx_track_username_g $dx_track_username_b FALSE} {set_this {find_obj DX_GEMTRACKDIR}} {set $this_track_username_label {sprint "dx_track_label_username" {{$player get_user} get_slot_num} ".lbl"}} - {if_else $dx_current_player_name_sanitized - {$this_track_username_label set_token_fmt {sprint $dx_current_player_name_sanitized}} + {set $this_icon + {switch {$player instrument} + ((guitar real_guitar) inst_icon_guitar) + ((bass real_bass) inst_icon_bass) + ((drum real_drum) inst_icon_drum) + ((keys real_keys) inst_icon_keys) + } + } + {cond + ({&& {== {beatmatch num_active_players} 1} $dx_current_player_name_sanitized} + {$this_track_username_label set_token_fmt {sprint $dx_current_player_name_sanitized}} + ) + ({&& {> {beatmatch num_active_players} 1} $dx_current_player_name_sanitized $dx_highway_username_inst {session_mgr is_local}} + {$this_track_username_label set_token_fmt {sprint $dx_current_player_name_sanitized " - " "" {localize $this_icon} ""}} + ) + ({&& $dx_current_player_name_sanitized {|| {! $dx_highway_username_inst} {! {session_mgr is_local}}}} + {$this_track_username_label set_token_fmt {sprint $dx_current_player_name_sanitized}} + ) + ({&& {> {beatmatch num_active_players} 1} {! $dx_current_player_name_sanitized} $dx_highway_username_inst {session_mgr is_local}} + {$this_track_username_label set_token_fmt {sprint "" {localize $this_icon} ""}} + ) {$this_track_username_label set_token_fmt os_blnk} } } @@ -143,10 +162,10 @@ } } {func dx_track_label - ($name $size $font $alignment $kerning $x $y $r $g $b $reset) - {set_this {find_obj {{get_track_panel} loaded_dir} {sprint "track_" {{$player get_user} get_slot_num}}}} - {set $thislabel {sprint $name {{$player get_user} get_slot_num} ".lbl"}} - {set $thiscolor {sprint $name {{$player get_user} get_slot_num} ".color"}} + ($name $size $font $alignment $kerning $slot $x $y $r $g $b $reset) + {set_this {find_obj {{get_track_panel} loaded_dir} {sprint "track_" $slot}}} + {set $thislabel {sprint $name $slot ".lbl"}} + {set $thiscolor {sprint $name $slot ".color"}} {if $reset {if {exists $thislabel} {delete $thislabel} @@ -159,18 +178,16 @@ {new BandLabel $thislabel} {$thislabel set resource_name $font} {$thislabel set alt_font_resource_name instruments_icons} + {$thislabel set alt_style_enabled TRUE} {$thislabel set markup TRUE} - {$thislabel set alt_text_size 3.3} + {$thislabel set alt_text_size 2} {$thislabel set alt_z_offset 0} {$thislabel set_showing TRUE} {$thislabel set_local_scale 1 1 1} {$thislabel set_local_rot 0 0 0} - {$thislabel set text_size $size} - {$thislabel set alignment $alignment} {$thislabel set width 500} {$thislabel set height 500} {$thislabel set alpha 1} - {$thislabel set kerning $kerning} {meters.grp add_object $thislabel} {$thislabel set_token_fmt os_blnk} } @@ -178,6 +195,9 @@ {new UIColor $thiscolor} {$thislabel set color_override $thiscolor} } + {$thislabel set kerning $kerning} + {$thislabel set text_size $size} + {$thislabel set alignment $alignment} {$thiscolor set color {pack_color $r $g $b}} {$thislabel set_local_pos $x 0 $y} } \ No newline at end of file diff --git a/_ark/dx/ui/dx_ui_init.dta b/_ark/dx/ui/dx_ui_init.dta index 269471703..59ec98983 100644 --- a/_ark/dx/ui/dx_ui_init.dta +++ b/_ark/dx/ui/dx_ui_init.dta @@ -87,42 +87,43 @@ DX_CURRENT_SONG_CLEAR {set $dx_loading_tip_var FALSE} {set $dx_hide_on_countdown off} -{set $dx_highway_overdrive_text TRUE} -{set $dx_highway_overdrive_text_size 1} -{set $dx_highway_overdrive_text_font pentatonic_outline} -{set $dx_highway_overdrive_text_alignment kMiddleCenter} -{set $dx_highway_overdrive_text_kerning 0} -{set $dx_highway_overdrive_text_x 0} -{set $dx_highway_overdrive_text_z 0} -{set $dx_highway_overdrive_text_y -4} -{set $dx_highway_overdrive_text_r 1} -{set $dx_highway_overdrive_text_g 1} -{set $dx_highway_overdrive_text_b 1} - -{set $dx_highway_streak_text TRUE} -{set $dx_highway_streak_text_gh3_delay FALSE} -{set $dx_highway_streak_text_size 1.5} -{set $dx_highway_streak_text_font pentatonic_outline} -{set $dx_highway_streak_text_alignment kMiddleLeft} -{set $dx_highway_streak_text_kerning 0} -{set $dx_highway_streak_text_x 2.2} -{set $dx_highway_streak_text_z 0} -{set $dx_highway_streak_text_y -3.7} -{set $dx_highway_streak_text_r 1} -{set $dx_highway_streak_text_g 1} -{set $dx_highway_streak_text_b 1} - -{set $dx_highway_username_text TRUE} -{set $dx_highway_username_text_size 2} -{set $dx_highway_username_text_font pentatonic_outline} -{set $dx_highway_username_text_alignment kMiddleCenter} -{set $dx_highway_username_text_kerning 0} -{set $dx_highway_username_text_x 0} -{set $dx_highway_username_text_z 0} -{set $dx_highway_username_text_y -5.5} -{set $dx_highway_username_text_r 1} -{set $dx_highway_username_text_g 1} -{set $dx_highway_username_text_b 1} +{set $dx_track_overdrive TRUE} +{set $dx_track_overdrive_size 1} +{set $dx_track_overdrive_font pentatonic_outline} +{set $dx_track_overdrive_alignment kMiddleCenter} +{set $dx_track_overdrive_kerning 0} +{set $dx_track_overdrive_x 0} +{set $dx_track_overdrive_z -5} +{set $dx_track_overdrive_y -2.5} +{set $dx_track_overdrive_r 1} +{set $dx_track_overdrive_g 1} +{set $dx_track_overdrive_b 1} + +{set $dx_highway_username_inst TRUE} +{set $dx_track_streak TRUE} +{set $dx_track_streak_gh3_delay FALSE} +{set $dx_track_streak_size 1} +{set $dx_track_streak_font pentatonic_outline} +{set $dx_track_streak_alignment kMiddleLeft} +{set $dx_track_streak_kerning 0} +{set $dx_track_streak_x 2} +{set $dx_track_streak_z -5} +{set $dx_track_streak_y -2} +{set $dx_track_streak_r 1} +{set $dx_track_streak_g 1} +{set $dx_track_streak_b 1} + +{set $dx_track_username TRUE} +{set $dx_track_username_size 2} +{set $dx_track_username_font pentatonic_outline} +{set $dx_track_username_alignment kMiddleCenter} +{set $dx_track_username_kerning 0} +{set $dx_track_username_x 0} +{set $dx_track_username_z 0} +{set $dx_track_username_y -5.5} +{set $dx_track_username_r 1} +{set $dx_track_username_g 1} +{set $dx_track_username_b 1} #ifndef HX_WII {set $dx_song_progress_bar TRUE} @@ -131,6 +132,7 @@ DX_CURRENT_SONG_CLEAR {set $dx_bre_progress TRUE} {set $dx_icon_progress TRUE} #endif + {set $dx_hud_time_remaining_text TRUE} {set $dx_hud_time_remaining_text_size 1} {set $dx_hud_time_remaining_text_font pentatonic_outline}