Skip to content

Commit

Permalink
majorly overhaul song progress bar
Browse files Browse the repository at this point in the history
  • Loading branch information
@jnackmclain
jnackmclain committed Nov 9, 2024
1 parent 7691396 commit fdbddf6
Show file tree
Hide file tree
Showing 11 changed files with 597 additions and 189 deletions.
1 change: 1 addition & 0 deletions _ark/config/macros.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,7 @@
#define dxState_TrackHighwayOverdrive (69112)
#define dxState_TrackHighwayStreak (69113)
#define dxState_LabelOptions (69114)
#define dxState_ProgressBarElements (69115)
#define kOverrideFlow_None
(0)
#define kOverrideFlow_SongSettings
Expand Down
22 changes: 20 additions & 2 deletions _ark/dx/locale/dx_locale_updates.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
(dx_diff_5 "<alt>2</alt>")
(dx_diff_6 "<alt>3</alt>")
(dx_diff_7 "<alt>k</alt>")
(song_progress_backer "||||||||||||||||||||||||||||||||||||||||||||||||||")
(song_progress_backer "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")

(overshell_dx_quick_chat "Quick Chat +")
(overshell_gamercard_users " ")
Expand Down Expand Up @@ -520,6 +520,8 @@
(os_solo_box_pos_desc "Placement of the Solo Box")
(os_song_timer "Song Timer...")
(os_song_timer_desc "Options relating to the Song Timer")
(os_song_progress "Song Progress Bar...")
(os_song_progress_desc "Options relating to the Song Progress Bar")
(os_total_time_on "Total Song Length: Show")
(os_total_time_off "Total Song Length: Hide")
(os_streak_counter_single "Note Counter: Single")
Expand Down Expand Up @@ -655,12 +657,12 @@
(os_dx_mic_od_4 "Mic Deploy Sens: 4")
(os_dx_mic_od_5 "Mic Deploy Sens: 5")
(os_dx_mic_od_unknown "Mic Deploy Sens: Unknown")
(os_dx_mic_od_unknown_desc "That's weird, please change me")
(os_dx_mic_od_1_desc "Microphone is at lowest sensitivity threshold to activate Overdrive")
(os_dx_mic_od_2_desc "Microphone is at low sensitivity threshold to activate Overdrive")
(os_dx_mic_od_3_desc "Microphone is at medium sensitivity threshold to activate Overdrive")
(os_dx_mic_od_4_desc "Microphone is at default sensitivity threshold to activate Overdrive")
(os_dx_mic_od_5_desc "Microphone is at highest sensitivity threshold to activate Overdrive")
(os_dx_mic_od_unknown_desc "That's weird, please change me")
(os_songdelay_on "Song Load Delay: ON")
(os_songdelay_off "Song Load Delay: OFF")
#ifdef HX_PS3
Expand Down Expand Up @@ -1589,6 +1591,22 @@
(os_bar_time_off "Song Progress Bar: Off")
(os_bar_time_on_desc "Displays a visual progress bar for time remaining")
(os_bar_time_off_desc "Displays a visual progress bar for time remaining")
(os_bar_overdrive_on "Plot OverDrive Sections: On")
(os_bar_overdrive_off "Plot OverDrive Sections: Off")
(os_bar_overdrive_on_desc "Displays Overdrive sections on the song progress bar")
(os_bar_overdrive_off_desc "Displays Overdrive sections on the song progress bar")
(os_bar_solo_on "Plot Solo Sections: On")
(os_bar_solo_off "Plot Solo Sections: Off")
(os_bar_solo_on_desc "Displays Solo sections on the song progress bar")
(os_bar_solo_off_desc "Displays Solo sections on the song progress bar")
(os_bar_bre_on "Plot Big Rock Endings: On")
(os_bar_bre_off "Plot Big Rock Endings: Off")
(os_bar_bre_on_desc "Displays Solo sections on the song progress bar")
(os_bar_bre_off_desc "Displays Solo sections on the song progress bar")
(os_bar_icon_on "Display Instrument: On")
(os_bar_icon_off "Display Instrument: Off")
(os_bar_icon_on_desc "Displays Tracked Instrument the song progress bar")
(os_bar_icon_off_desc "Displays Tracked Instrument on the song progress bar")
(os_countdown_warn "Note: Pausing mid run will throw off the countdown.")
(dx_none "[None]")
(goul-nug_fc "[Default]")
Expand Down
127 changes: 104 additions & 23 deletions _ark/dx/overshell/dx_hud_states.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
{push_back $options os_solo_box_pos}

{push_back $options os_song_timer}

#ifndef HX_WII
{push_back $options os_song_progress}
#endif
{switch $dx_streak_counter
(single {push_back $options os_streak_counter_single})
(multi {push_back $options os_streak_counter_multi})
Expand Down Expand Up @@ -85,6 +87,9 @@
(os_song_timer
{$this show_state dxState_SongTimerElements}
)
(os_song_progress
{$this show_state dxState_ProgressBarElements}
)
(os_solo_box_pos
{set $dx_set_ui_pos_tracked_ui solo_box}
{$this show_state dxState_PositionRemapper}
Expand Down Expand Up @@ -696,7 +701,6 @@
{do
($options
{array 0})
{push_back $options {if_else $dx_song_progress_bar os_bar_time_on os_bar_time_off}}
{switch $dx_time_remaining_direction
(off {push_back $options os_time_remaining_off})
(down {push_back $options os_time_remaining_down})
Expand All @@ -714,40 +718,29 @@
)
(SELECT_MSG
{switch {$component selected_sym}
((os_bar_time_on os_bar_time_off)
{set $dx_song_progress_bar {! $dx_song_progress_bar}}
{if_else $dx_song_progress_bar
{set $dx_tracked_changed os_bar_time_on}
{set $dx_tracked_changed os_bar_time_off}
}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_INGAME_HUD_DATA
{set $previous_state dxState_InGameHUD}
)
(os_time_remaining_off
{set $dx_time_remaining_direction down}
{set $dx_tracked_changed os_time_remaining_down}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_INGAME_HUD_DATA
{set $previous_state dxState_InGameHUD}
DX_SONG_TIMER_ELEMENTS_DATA
{set $previous_state dxState_SongTimerElements}
)
(os_time_remaining_down
{set $dx_time_remaining_direction up}
{set $dx_tracked_changed os_time_remaining_up}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_INGAME_HUD_DATA
{set $previous_state dxState_InGameHUD}
DX_SONG_TIMER_ELEMENTS_DATA
{set $previous_state dxState_SongTimerElements}
)
(os_time_remaining_up
{set $dx_time_remaining_direction off}
{set $dx_tracked_changed os_time_remaining_off}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_INGAME_HUD_DATA
{set $previous_state dxState_InGameHUD}
DX_SONG_TIMER_ELEMENTS_DATA
{set $previous_state dxState_SongTimerElements}
)
((os_time_remaining_on_top_on os_time_remaining_on_top_off)
{set $dx_time_remaining_pos_top {! $dx_time_remaining_pos_top}}
Expand All @@ -757,8 +750,8 @@
}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_INGAME_HUD_DATA
{set $previous_state dxState_InGameHUD}
DX_SONG_TIMER_ELEMENTS_DATA
{set $previous_state dxState_SongTimerElements}
)
((os_total_time_on os_total_time_off)
{set $dx_disp_total_time {! $dx_disp_total_time}}
Expand All @@ -768,8 +761,8 @@
}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_INGAME_HUD_DATA
{set $previous_state dxState_InGameHUD}
DX_SONG_TIMER_ELEMENTS_DATA
{set $previous_state dxState_SongTimerElements}
)
}
{set $in_state FALSE}
Expand All @@ -784,6 +777,94 @@
)
)

#define DX_SONG_PROGRESSBAR_DATA
(
{do
($options
{array 0})
{push_back $options {if_else $dx_song_progress_bar os_bar_time_on os_bar_time_off}}
{push_back $options {if_else $dx_overdrive_progress os_bar_overdrive_on os_bar_overdrive_off}}
{push_back $options {if_else $dx_solo_progress os_bar_solo_on os_bar_solo_off}}
{push_back $options {if_else $dx_bre_progress os_bar_bre_on os_bar_bre_off}}
{push_back $options {if_else $dx_icon_progress os_bar_icon_on os_bar_icon_off}}
{dx_state_setup dxState_ProgressBarElements TRUE}
}
)
(dxState_ProgressBarElements
(view
DX_SONG_PROGRESSBAR_DATA
{overshell_view_chooser}
)
(SELECT_MSG
{switch {$component selected_sym}
((os_bar_overdrive_on os_bar_overdrive_off)
{set $dx_overdrive_progress {! $dx_overdrive_progress}}
{if_else $dx_overdrive_progress
{set $dx_tracked_changed os_bar_overdrive_on}
{set $dx_tracked_changed os_bar_overdrive_off}
}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_SONG_PROGRESSBAR_DATA
{set $previous_state dxState_ProgressBarElements}
)
((os_bar_solo_on os_bar_solo_off)
{set $dx_solo_progress {! $dx_solo_progress}}
{if_else $dx_solo_progress
{set $dx_tracked_changed os_bar_solo_on}
{set $dx_tracked_changed os_bar_solo_off}
}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_SONG_PROGRESSBAR_DATA
{set $previous_state dxState_ProgressBarElements}
)
((os_bar_bre_on os_bar_bre_off)
{set $dx_bre_progress {! $dx_bre_progress}}
{if_else $dx_bre_progress
{set $dx_tracked_changed os_bar_bre_on}
{set $dx_tracked_changed os_bar_bre_off}
}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_SONG_PROGRESSBAR_DATA
{set $previous_state dxState_ProgressBarElements}
)
((os_bar_icon_on os_bar_icon_off)
{set $dx_icon_progress {! $dx_icon_progress}}
{if_else $dx_icon_progress
{set $dx_tracked_changed os_bar_icon_on}
{set $dx_tracked_changed os_bar_icon_off}
}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_SONG_PROGRESSBAR_DATA
{set $previous_state dxState_ProgressBarElements}
)
((os_bar_time_on os_bar_time_off)
{set $dx_song_progress_bar {! $dx_song_progress_bar}}
{if_else $dx_song_progress_bar
{set $dx_tracked_changed os_bar_time_on}
{set $dx_tracked_changed os_bar_time_off}
}
;{if {$this in_game} {dx_reset_time_remaining_position}}
{dx_state_pos_tracker}
DX_SONG_PROGRESSBAR_DATA
{set $previous_state dxState_ProgressBarElements}
)
}
{set $in_state FALSE}
DX_SONG_PROGRESSBAR_DATA
{set $previous_state dxState_ProgressBarElements}
)
(exit
{dx_state_pos_tracker}
)
(on_cancel
{$this show_state dxState_InGameHUD}
)
)

#define DX_CURRENT_SONG_SETUP_DATA
(
{do
Expand Down
20 changes: 20 additions & 0 deletions _ark/dx/read_write/dx_reader_macros.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,26 @@
{elem {find $entry dx_song_progress_bar} 1}
}
}
{if {== {elem $entry 0} {basename dx_overdrive_progress}}
{set $dx_overdrive_progress
{elem {find $entry dx_overdrive_progress} 1}
}
}
{if {== {elem $entry 0} {basename dx_solo_progress}}
{set $dx_solo_progress
{elem {find $entry dx_solo_progress} 1}
}
}
{if {== {elem $entry 0} {basename dx_bre_progress}}
{set $dx_bre_progress
{elem {find $entry dx_bre_progress} 1}
}
}
{if {== {elem $entry 0} {basename dx_icon_progress}}
{set $dx_icon_progress
{elem {find $entry dx_icon_progress} 1}
}
}
{if {== {elem $entry 0} {basename dx_bpm_report}}
{set $dx_bpm_report
{elem {find $entry dx_bpm_report} 1}
Expand Down
4 changes: 4 additions & 0 deletions _ark/dx/read_write/dx_writer_macros.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@
{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}
{dx_setting_saver dx_settings dx_song_progress_bar $dx_song_progress_bar}
{dx_setting_saver dx_settings dx_overdrive_progress $dx_overdrive_progress}
{dx_setting_saver dx_settings dx_solo_progress $dx_solo_progress}
{dx_setting_saver dx_settings dx_bre_progress $dx_bre_progress}
{dx_setting_saver dx_settings dx_icon_progress $dx_icon_progress}
{dx_setting_saver dx_settings dx_bpm_report $dx_bpm_report}
{dx_setting_saver dx_settings dx_black_menu $dx_black_menu}
{dx_setting_saver dx_settings dx_song_delay $dx_song_delay}
Expand Down
Loading

0 comments on commit fdbddf6

Please sign in to comment.