Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@jnackmclain
jnackmclain committed Dec 11, 2024
1 parent 60a985b commit 9691182
Show file tree
Hide file tree
Showing 8 changed files with 158 additions and 282 deletions.
8 changes: 4 additions & 4 deletions .dtacheckfns
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@ dx_sanitize_player_name 1 1
dx_send_leader_song_speed 0 0
dx_set_auto_play 0 0
dx_set_first_note 1 1
dx_set_player_names 1 1
dx_set_player_names 2 2
dx_set_postfx 1 1
dx_set_solo_box_pos 0 0
dx_set_solo_box_pos 4 4
dx_set_song_speed 0 0
dx_setting_saver 3 3
dx_settings_dta_reader 0 0
dx_settings_dta_writer 0 0
dx_show_solo_box 2 2
dx_show_track_username 0 0
dx_show_track_username 2 2
dx_show_user_overdrive 3 3
dx_size_delay_array 1 1
dx_solo_set_label 2 2
Expand Down Expand Up @@ -204,7 +204,7 @@ dx_uptime 0 0
dx_uptime_onscreen 0 0
dx_values_dta_reader 0 0
dx_values_dta_writer 0 0
dx_vanilla_track_text_reset 0 0
dx_vanilla_track_text_reset 2 2
dx_venue_setter 0 0
everyone_deploy 0 0
facing_string 1 1
Expand Down
29 changes: 7 additions & 22 deletions _ark/dx/overshell/dx_advanced_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1368,24 +1368,17 @@
{set $solo_boxpos_0 $dx_set_ui_pos_0}
{set $solo_boxpos_1 $dx_set_ui_pos_1}
{set $solo_boxpos_2 $dx_set_ui_pos_2}
{if
{&&
{! {gamemode in_mode practice}}
{! {gamemode in_mode trainer}}
{exists beatmatch}
{if {&& {$this in_game} {! {gamemode in_mode trainer}}}
{beatmatch foreach_active_player $player
{dx_set_solo_box_pos $player $solo_boxpos_0 $solo_boxpos_1 $solo_boxpos_2}
}
{dx_set_solo_box_pos}
}
)
(highway_overdrive_text
{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}
}
{if {&& {$this in_game} {! {gamemode in_mode trainer}}}
{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}
}
Expand All @@ -1395,11 +1388,7 @@
{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}
}
{if {&& {$this in_game} {! {gamemode in_mode trainer}}}
{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}
Expand All @@ -1411,15 +1400,11 @@
{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}
}
{if {&& {$this in_game} {! {gamemode in_mode trainer}}}
{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}}
{dx_show_track_username $dx_track_username $player}
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions _ark/dx/overshell/dx_hud_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@
{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_show_track_username $dx_track_username $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 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}
}
Expand Down Expand Up @@ -1521,7 +1521,7 @@
{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_show_track_username $dx_track_username $player}
}
}
{dx_state_pos_tracker}
Expand All @@ -1537,7 +1537,7 @@
{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_show_track_username $dx_track_username $player}
}
}
{dx_state_pos_tracker}
Expand All @@ -1553,7 +1553,7 @@
{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_show_track_username $dx_track_username $player}
}
}
{dx_state_pos_tracker}
Expand Down Expand Up @@ -1804,7 +1804,7 @@
{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}
{if {&& {$this in_game} {! {gamemode in_mode trainer}}}
{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}
Expand All @@ -1817,7 +1817,7 @@
{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}
{if {&& {$this in_game} {! {gamemode in_mode trainer}}}
{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}
Expand All @@ -1830,11 +1830,11 @@
{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}
{if {&& {$this in_game} {! {gamemode in_mode trainer}}}
{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_show_track_username $dx_track_username $player}
}
}
}
Expand All @@ -1844,7 +1844,7 @@
{set $dx_mtv_overlay_text_font $dx_set_ui_text_font}
{set $dx_mtv_overlay_text_alignment $dx_set_ui_text_alignment}
{set $dx_mtv_overlay_text_kerning $dx_set_ui_text_kerning}
{if {$this in_game}
{if {&& {$this in_game} {! {gamemode in_mode trainer}}}
{if $dx_mtvup
{{{gamemode get track_panel} find mtv_overlay} mtv_formatter} ;refresh the mtv overlay
}
Expand Down
9 changes: 0 additions & 9 deletions _ark/dx/track/countdown/dx_countdown_midi_parsers.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
{push_back $guitar_note_tracker ({sprint "delay_" $tracked_break_num_guitar} $guitar_tracked_prev_end $guitar_tracked_start)}
{set $guitar_note_tracker {array $guitar_note_tracker}}
{set $tracked_break_num_guitar {+ $tracked_break_num_guitar 1}}
{dx_log_writer countdown {sprint "Guitar Tracker array: " $guitar_note_tracker}}
}
{set $dx_final_note_guitar {int $mp.end}}
{if {> $dx_final_note_guitar $dx_final_note} {set $dx_final_note $dx_final_note_guitar}}
Expand Down Expand Up @@ -112,7 +111,6 @@
{push_back $real_guitar_note_tracker ({sprint "delay_" $tracked_break_num_real_guitar} $real_guitar_tracked_prev_end $real_guitar_tracked_start)}
{set $real_guitar_note_tracker {array $real_guitar_note_tracker}}
{set $tracked_break_num_real_guitar {+ $tracked_break_num_real_guitar 1}}
{dx_log_writer countdown {sprint "real_guitar Tracker array: " $real_guitar_note_tracker}}
}
{set $dx_final_note_real_guitar {int $mp.end}}
{if {> $dx_final_note_real_guitar $dx_final_note} {set $dx_final_note $dx_final_note_real_guitar}}
Expand Down Expand Up @@ -224,7 +222,6 @@
{push_back $drum_note_tracker ({sprint "delay_" $tracked_break_num_drum} $drum_tracked_prev_end $drum_tracked_start)}
{set $drum_note_tracker {array $drum_note_tracker}}
{set $tracked_break_num_drum {+ $tracked_break_num_drum 1}}
{dx_log_writer countdown {sprint "Drum Tracker array: " $drum_note_tracker}}
}
{set $dx_final_note_drum {int $mp.end}}
{if {> $dx_final_note_drum $dx_final_note} {set $dx_final_note $dx_final_note_drum}}
Expand Down Expand Up @@ -309,7 +306,6 @@
{push_back $bass_note_tracker ({sprint "delay_" $tracked_break_num_bass} $bass_tracked_prev_end $bass_tracked_start)}
{set $bass_note_tracker {array $bass_note_tracker}}
{set $tracked_break_num_bass {+ $tracked_break_num_bass 1}}
{dx_log_writer countdown {sprint "Bass Tracker array: " $bass_note_tracker}}
}
{set $dx_final_note_bass {int $mp.end}}
{if {> $dx_final_note_bass $dx_final_note} {set $dx_final_note $dx_final_note_bass}}
Expand Down Expand Up @@ -392,7 +388,6 @@
{push_back $real_bass_note_tracker ({sprint "delay_" $tracked_break_num_real_bass} $real_bass_tracked_prev_end $real_bass_tracked_start)}
{set $real_bass_note_tracker {array $real_bass_note_tracker}}
{set $tracked_break_num_real_bass {+ $tracked_break_num_real_bass 1}}
{dx_log_writer countdown {sprint "real_bass Tracker array: " $real_bass_note_tracker}}
}
{set $dx_final_note_real_bass {int $mp.end}}
{if {> $dx_final_note_real_bass $dx_final_note} {set $dx_final_note $dx_final_note_real_bass}}
Expand Down Expand Up @@ -476,7 +471,6 @@
{push_back $keys_note_tracker ({sprint "delay_" $tracked_break_num_keys} $keys_tracked_prev_end $keys_tracked_start)}
{set $keys_note_tracker {array $keys_note_tracker}}
{set $tracked_break_num_keys {+ $tracked_break_num_keys 1}}
{dx_log_writer countdown {sprint "Keys Tracker array: " $keys_note_tracker}}
}
{set $dx_final_note_keys {int $mp.end}}
{if {> $dx_final_note_keys $dx_final_note} {set $dx_final_note $dx_final_note_keys}}
Expand Down Expand Up @@ -560,7 +554,6 @@
{push_back $real_keys_note_tracker ({sprint "delay_" $tracked_break_num_real_keys} $real_keys_tracked_prev_end $real_keys_tracked_start)}
{set $real_keys_note_tracker {array $real_keys_note_tracker}}
{set $tracked_break_num_real_keys {+ $tracked_break_num_real_keys 1}}
{dx_log_writer countdown {sprint "real_keys Tracker array: " $real_keys_note_tracker}}
}
{set $dx_final_note_real_keys {int $mp.end}}
{if {> $dx_final_note_real_keys $dx_final_note} {set $dx_final_note $dx_final_note_real_keys}}
Expand Down Expand Up @@ -645,7 +638,6 @@
{push_back $vocals_note_tracker ({sprint "delay_" $tracked_break_num_vocals} $vocals_tracked_prev_end $vocals_tracked_start)}
{set $vocals_note_tracker {array $vocals_note_tracker}}
{set $tracked_break_num_vocals {+ $tracked_break_num_vocals 1}}
{dx_log_writer countdown {sprint "Vocal Tracker array: " $vocals_note_tracker}}
}
{set $dx_final_note_vocals {int $mp.end}}
{if {> $dx_final_note_vocals $dx_final_note} {set $dx_final_note $dx_final_note_vocals}}
Expand Down Expand Up @@ -721,7 +713,6 @@
{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}}
Expand Down
15 changes: 6 additions & 9 deletions _ark/dx/track/track/dx_track_panel_handles.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
{$this set dx_is_nohud {modifier_mgr is_modifier_active mod_nohud}}
{if {|| {! {gamemode in_mode trainer} {! {gamemode in_mode campaign}}}} ;position objects based on user preference
{dx_set_scoreboard_pos}
{dx_set_solo_box_pos}
;{dx_set_star_display_pos}
{$this dx_force_remote_vox}
; reset texts and hide them
Expand Down Expand Up @@ -146,30 +145,28 @@
(dx_track_panel_on_extend
{if {! {gamemode in_mode trainer}}
{dx_track_streak_reset}
{dx_vanilla_track_text_reset}
{beatmatch foreach_active_player $player
{dx_clean_solo_box $player {$player instrument}}
{unless {== {$player instrument} vocals}
{dx_vanilla_track_text_reset $player {$player instrument}}
{dx_set_solo_box_pos $player $solo_boxpos_0 $solo_boxpos_1 $solo_boxpos_2}
{if {!= {$player instrument} vocals}
{dx_track_fc_reset $dx_fc_glow $player}
{dx_set_player_names $dx_diff_popups $player}
{dx_show_track_username $dx_track_username $player}
}
}
{dx_set_song_speed}
{dx_toggle_fail_feedback}
{dx_brutal_mode {modifier_mgr is_modifier_active mod_brutalmode}}
{dx_track_configurer}
{dx_show_track_username}
{dx_dim_remote_players}
{dx_mtv_time_remaining_handler}
{if {&& {! {gamemode in_mode practice}} {! {gamemode in_mode trainer}}}
{if {! {gamemode in_mode practice}}
{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
{if {== $dx_crowd_meter_state dx_disabled} {adjust_crowd_rating 1}} ;max out crowd meter when it's disabled for crowd audio
}
{dx_set_player_names $dx_diff_popups}
{if $dx_auto_endurance
{fake_win 5}
}
}
)
)
58 changes: 29 additions & 29 deletions _ark/dx/track/track_ui/dx_track_overdrive_ui_funcs.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,6 @@
}
}
}
{func dx_track_label_overdrive
($name $size $font $alignment $kerning $slot $x $y $r $g $b $reset)
{do
($label {sprint $name $slot ".lbl"})
($color {sprint $name $slot ".color"})
{set_this {find_obj {{get_track_panel} loaded_dir} {sprint "track_" $slot} band_power_meter}} ;change context to the current checked player overdrive meter dir
{if $reset ;if we need to destroy and rebuild this label
{delete $label} {delete $color} ;destroy label
{new BandLabel $label} {new UIColor $color} ;rebuild label
;set up default properties
{$label set resource_name $font}
{$label set color_override $color}
{$label set_showing TRUE}
{$label set_local_scale 1 1 1}
{$label set_local_rot 0 0 0}
{$label set width 500}
{$label set height 500}
{meters.grp add_object $label} ;tie it into the overdrive meter group
}
;these properties are user controllable via overshell
;when configured in-game they do not destroy the label
;so we should run these when the func is called always
{$label set alignment $alignment}
{$label set text_size $size}
{$label set kerning $kerning}
{$label set color {pack_color $r $g $b}}
{$label set_local_pos $x -5 $y} ;don't allow user configuration of Z space because it sucks
}
}
; prep od ready popup
{func
dx_calc_overdrive
Expand Down Expand Up @@ -103,4 +74,33 @@
}
$delay
}
}
{func dx_track_label_overdrive
($name $size $font $alignment $kerning $slot $x $y $r $g $b $reset)
{do
($label {sprint $name $slot ".lbl"})
($color {sprint $name $slot ".color"})
{set_this {find_obj {{get_track_panel} loaded_dir} {sprint "track_" $slot} band_power_meter}} ;change context to the current checked player overdrive meter dir
{if $reset ;if we need to destroy and rebuild this label
{delete $label} {delete $color} ;destroy label
{new BandLabel $label} {new UIColor $color} ;rebuild label
;set up default properties
{$label set resource_name $font}
{$label set color_override $color}
{$label set_showing TRUE}
{$label set_local_scale 1 1 1}
{$label set_local_rot 0 0 0}
{$label set width 500}
{$label set height 500}
{meters.grp add_object $label} ;tie it into the overdrive meter group
}
;these properties are user controllable via overshell
;when configured in-game they do not destroy the label
;so we should run these when the func is called always
{$label set alignment $alignment}
{$label set text_size $size}
{$label set kerning $kerning}
{$label set color {pack_color $r $g $b}}
{$label set_local_pos $x -5 $y} ;don't allow user configuration of Z space because it sucks
}
}
Loading

0 comments on commit 9691182

Please sign in to comment.