Skip to content

Commit

Permalink
a bunch of highway text adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@jnackmclain
jnackmclain committed Nov 10, 2024
1 parent d30ef82 commit 3d99817
Show file tree
Hide file tree
Showing 14 changed files with 461 additions and 435 deletions.
15 changes: 5 additions & 10 deletions _ark/config/beatmatcher.dta
View file
Original file line number Diff line number Diff line change
@@ -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}}
Expand Down
64 changes: 37 additions & 27 deletions _ark/dx/overshell/dx_advanced_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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})
}
)
Expand Down Expand Up @@ -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
Expand Down
54 changes: 33 additions & 21 deletions _ark/dx/overshell/dx_color_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 3d99817

Please sign in to comment.