Skip to content

Commit

Permalink
Fix new HUD in 4:3
Browse files Browse the repository at this point in the history
  • Loading branch information
@lunalawl
lunalawl committed Feb 1, 2025
1 parent 63f25fa commit 295a5d1
Showing 1 changed file with 30 additions and 22 deletions.
52 changes: 30 additions & 22 deletions _ark/dx/track/hud_ui/dx_hud_ui_funcs.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@
;handle autopos
{if_else $vocal_track_out
{if_else {>= {beatmatch num_active_players} {if_else {modifier_mgr is_modifier_active mod_auto_vocals} 3 2}}
{$thislabel set width 22} ;real vox
{$thislabel set width 25} ;AIM
{$thislabel set width {if_else {!= {rnd aspect} kWidescreenAspect} {- 22 7.65} 22}} ;real vox
{$thislabel set width {if_else {!= {rnd aspect} kWidescreenAspect} {- 25 7.65} 25}} ;AIM
}
{if_else {>= {beatmatch num_active_players} 2}
{$thislabel set width 34} ;2p
{$thislabel set width 37} ;1p
{$thislabel set width {if_else {!= {rnd aspect} kWidescreenAspect} {- 34 7.65} 34}} ;2p
{$thislabel set width {if_else {!= {rnd aspect} kWidescreenAspect} {- 37 7.65} 37}} ;1p
}
}
{$thislabel set width 37}
Expand All @@ -107,8 +107,8 @@
{$thislabel set_local_pos
; X pos
{if_else {>= {beatmatch num_active_players} {if_else {modifier_mgr is_modifier_active mod_auto_vocals} 3 2}}
{- $x 1.74} ;band play scenario (move to make room for streak box)
$x ;singleplayer scenario (default)
{- {if_else {!= {rnd aspect} kWidescreenAspect} {- $x 7.65} $x} 1.74} ;band play scenario (move to make room for streak box)
{if_else {!= {rnd aspect} kWidescreenAspect} {- $x 7.65} $x} ;singleplayer scenario (default)
}
; Z pos
$z
Expand Down Expand Up @@ -208,56 +208,64 @@
{$thiscolor set color {pack_color $dx_hud_time_bar_r $dx_hud_time_bar_g $dx_hud_time_bar_b}}
{$thislabel set_local_pos 75.5 230 64}
}
#define DX_PROGRESS_BAR_X_COMP
(
{if_else {!= {rnd aspect} kWidescreenAspect} {- 75.6 30.931} 75.6}
)
#define DX_TIME_REMAINING_X_COMP
(
{if_else {!= {rnd aspect} kWidescreenAspect} {- 33 8.73} 33}
)
{func
dx_fix_new_song_progress_pos
{if {&& $dx_mtvup {! {gamemode in_mode trainer}}}
{set_this {coop_track_panel find scoreboard}}
{cond
({&& $dx_song_progress_bar $vocal_track_out {! $dx_time_remaining_pos_top}}
{dx_song_progress_label.lbl set_local_pos 75.6 230 15.5}
{set $dx_hud_time_remaining_text_x 33}
{dx_song_progress_label.lbl set_local_pos DX_PROGRESS_BAR_X_COMP 230 15.5}
{set $dx_hud_time_remaining_text_x DX_TIME_REMAINING_X_COMP}
{set $dx_hud_time_remaining_text_z 65}
{set $dx_hud_time_remaining_text_y 3.3}
)
({&& $dx_song_progress_bar $vocal_track_out $dx_time_remaining_pos_top}
{dx_song_progress_label.lbl set_local_pos 75.6 230 15.5}
{set $dx_hud_time_remaining_text_x 33}
{dx_song_progress_label.lbl set_local_pos DX_PROGRESS_BAR_X_COMP 230 15.5}
{set $dx_hud_time_remaining_text_x DX_TIME_REMAINING_X_COMP}
{set $dx_hud_time_remaining_text_z 65}
{set $dx_hud_time_remaining_text_y 10.7}
)
({&& $dx_song_progress_bar {! $vocal_track_out} $dx_time_remaining_pos_top}
{dx_song_progress_label.lbl set_local_pos 75.6 230 64}
{set $dx_hud_time_remaining_text_x 33}
{dx_song_progress_label.lbl set_local_pos DX_PROGRESS_BAR_X_COMP 230 64}
{set $dx_hud_time_remaining_text_x DX_TIME_REMAINING_X_COMP}
{set $dx_hud_time_remaining_text_z 65}
{set $dx_hud_time_remaining_text_y 19.2}
)
({&& $dx_song_progress_bar {! $vocal_track_out} {! $dx_time_remaining_pos_top}}
{dx_song_progress_label.lbl set_local_pos 75.6 230 41.5}
{set $dx_hud_time_remaining_text_x 33}
{dx_song_progress_label.lbl set_local_pos DX_PROGRESS_BAR_X_COMP 230 41.5}
{set $dx_hud_time_remaining_text_x DX_TIME_REMAINING_X_COMP}
{set $dx_hud_time_remaining_text_z 65}
{set $dx_hud_time_remaining_text_y 10.7}
)
({&& {! $dx_song_progress_bar} $vocal_track_out {! $dx_time_remaining_pos_top}}
{dx_song_progress_label.lbl set_local_pos 75.6 230 16}
{set $dx_hud_time_remaining_text_x 33}
{dx_song_progress_label.lbl set_local_pos DX_PROGRESS_BAR_X_COMP 230 16}
{set $dx_hud_time_remaining_text_x DX_TIME_REMAINING_X_COMP}
{set $dx_hud_time_remaining_text_z 65}
{set $dx_hud_time_remaining_text_y 4.7}
)
({&& {! $dx_song_progress_bar} $vocal_track_out $dx_time_remaining_pos_top}
{dx_song_progress_label.lbl set_local_pos 75.6 230 16}
{set $dx_hud_time_remaining_text_x 33}
{dx_song_progress_label.lbl set_local_pos DX_PROGRESS_BAR_X_COMP 230 16}
{set $dx_hud_time_remaining_text_x DX_TIME_REMAINING_X_COMP}
{set $dx_hud_time_remaining_text_z 65}
{set $dx_hud_time_remaining_text_y 10.7}
)
({&& {! $dx_song_progress_bar} {! $vocal_track_out} $dx_time_remaining_pos_top}
{dx_song_progress_label.lbl set_local_pos 75.6 230 64.5}
{set $dx_hud_time_remaining_text_x 33}
{dx_song_progress_label.lbl set_local_pos DX_PROGRESS_BAR_X_COMP 230 64.5}
{set $dx_hud_time_remaining_text_x DX_TIME_REMAINING_X_COMP}
{set $dx_hud_time_remaining_text_z 65}
{set $dx_hud_time_remaining_text_y 18}
)
({&& {! $dx_song_progress_bar} {! $vocal_track_out} {! $dx_time_remaining_pos_top}}
{dx_song_progress_label.lbl set_local_pos 75.6 230 41.5}
{set $dx_hud_time_remaining_text_x 33}
{dx_song_progress_label.lbl set_local_pos DX_PROGRESS_BAR_X_COMP 230 41.5}
{set $dx_hud_time_remaining_text_x DX_TIME_REMAINING_X_COMP}
{set $dx_hud_time_remaining_text_z 65}
{set $dx_hud_time_remaining_text_y 11.9}
)
Expand Down

0 comments on commit 295a5d1

Please sign in to comment.