Skip to content

Commit

Permalink
Menu refactor (#21)
Browse files Browse the repository at this point in the history
* main os menu (not final positions)

* fix modifiers

* appearance menu + other fixes

* Update locale_milo.dta

* update fix issues script, default bright hopos on

* working titty screen (for the most part)

* oops

* wip calibration sliders (help wanted)

* update xenia, more progress

* working options menu

* DE bug

* move dev options to ark init

* improved pause menu

* fix locale
  • Loading branch information
lunalawl committed Jun 5, 2023
1 parent c6357a5 commit 0a86cbd
Show file tree
Hide file tree
Showing 56 changed files with 1,187 additions and 1,083 deletions.
7 changes: 7 additions & 0 deletions _ark/config/long_cheats.dta
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
{== {ui current_screen} complete_screen}
{== {ui current_screen} highscore_screen}
{== {ui current_screen} qp_selpart_screen}
{== {ui current_screen} qp_diff_screen}
{== {ui current_screen} manage_gig_screen}
{== {ui current_screen} options_screen}
{== {ui current_screen} lag_screen}
{== {ui current_screen} audio_settings_screen}
{== {ui current_screen} mem_card_screen}
{== {ui current_screen} practice_diff_screen}
{== {ui current_screen} sel_song_screen}
{== {ui current_screen} practice_end_screen}
{== {ui current_screen} practice_sel_section_screen}
Expand Down
188 changes: 188 additions & 0 deletions _ark/ui/audioset.dta
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
#define SLIDER_LEVELS
(12)
#define AUDIO_SETTINGS_PANEL_HANDLERS
((focus gs_band.sld)
(focus_component
"")
(reset_focus TRUE)
(orig_vol 0)
(finish_load
{gs_band.sld set_num_steps SLIDER_LEVELS}
{gs_guitar.sld set_num_steps SLIDER_LEVELS}
{gs_sfx.sld set_num_steps SLIDER_LEVELS})
(slider_changed
{'||'
{!=
{options get band_volume_idx}
{gs_band.sld current}}
{!=
{options get guitar_volume_idx}
{gs_guitar.sld current}}
{!=
{options get fx_volume_idx}
{gs_sfx.sld current}}})
(enter
{if {== $menutheme 80s}
{$this disable stereo.chk}
{stereo.chk set_showing FALSE}
{$this disable gs_stereo.btn}
{gs_stereo.btn set_showing FALSE}}
{if {== $menutheme gh1}
{$this disable stereo.chk}
{stereo.chk set_showing FALSE}
{$this disable gs_stereo.btn}
{gs_stereo.btn set_showing FALSE}}
{gs_band.sld
set_current
{options get band_volume_idx}}
{gs_guitar.sld
set_current
{options get guitar_volume_idx}}
{gs_sfx.sld
set_current
{options get fx_volume_idx}})
(set_volumes
{if
{$this slider_changed}
{options
set
band_volume_idx
{gs_band.sld current}}
{options
set
guitar_volume_idx
{gs_guitar.sld current}}
{options
set
fx_volume_idx
{gs_sfx.sld current}}})
(slider_select_cancel
($component)
{switch
$component
(gs_band.sld
{$component
set_current
[orig_vol]})
(gs_guitar.sld
{$component
set_current
[orig_vol]})
(gs_sfx.sld
{$component
set_current
[orig_vol]})}
{$this update_help_display}
kDataUnhandled)
(FOCUS_MSG
{$this
set
focus_component
{$new_focus name}}
{$this update_help_display})
(update_help_display
{if_else
{$this slider_selected}
{helpbar
set_display
((fret1 help_confirm)
(fret2 help_cancel)
(strum help_adjvol))}
{helpbar
set_display
((fret1 help_select)
(fret2 help_back)
(strum help_updown))}})
(slider_start_msg
($component)
{do
($vol
{options
get_volume_from_idx
{$component current}})
{switch
$component
(gs_band.sld
{play_sfx
slider_band
(volume $vol)
(stop TRUE)})
(gs_guitar.sld
{play_sfx
slider_gtr
(volume $vol)
(stop TRUE)})
(gs_sfx.sld
{play_sfx
slider_sfx
(volume $vol)
(stop TRUE)})}})
(SELECT_START_MSG
{switch
$component
(gs_band.sld
{$this
set
orig_vol
{gs_band.sld current}})
(gs_guitar.sld
{$this
set
orig_vol
{gs_guitar.sld current}})
(gs_sfx.sld
{$this
set
orig_vol
{gs_sfx.sld current}})
kDataUnhandled}
{$this update_help_display}))
{new
SliderPanel
audio_settings_panel
(file
{if_else {== $menutheme gh1}
game_settings_gh1.milo
{if_else {== $menutheme 80s}
game_settings_80s.milo
game_settings.milo}})
AUDIO_SETTINGS_PANEL_HANDLERS}
{new
GHScreen
audio_settings_screen
(panels meta audio_settings_panel helpbar)
(focus audio_settings_panel)
(allow_back FALSE)
(BUTTON_DOWN_MSG
{if
{&&
{!
{audio_settings_panel slider_selected}}
{== $button kPad_Tri}}
{$this backwards_anim}
{synth play_sequence button_back.cue}
{$this set_volumes}
{autosave_goto options_screen}}
kDataUnhandled)}
{new
SliderPanel
pause_audio_settings_panel
(file pause_audio_settings.milo)
AUDIO_SETTINGS_PANEL_HANDLERS}
{new
GHScreen
pause_audio_settings_screen
(panels GAME_PANELS pause_audio_settings_panel helpbar)
(focus pause_audio_settings_panel)
(in_game TRUE)
(allow_back FALSE)
(animate_transition FALSE)
(BUTTON_DOWN_MSG
{if
{&&
{!
{pause_audio_settings_panel slider_selected}}
{== $button kPad_Tri}}
{$this set_volumes}
{ui goto_screen pause_screen}}
kDataUnhandled)}
43 changes: 4 additions & 39 deletions _ark/ui/calibration.dta
Original file line number Diff line number Diff line change
@@ -1,43 +1,10 @@
{new
CreditsPanel
credits_panel
(file credits.milo)
(enter
{meta_music stop}
#ifdef HX_XBOX {profilemgr disable_xmp} #endif)
(exit
{meta_music start}
#ifdef HX_XBOX {profilemgr disable_xmp} #endif)}
{new
GHScreen
credits_screen
(panels meta credits_panel helpbar)
(focus credits_panel)
(helpbar
(default
((fret2 help_back))))
(SCROLL_MSG
{do
($new_scroll_pos
{{credits_panel find credits.lst}
selected_pos})
{if
{==
{'+' 1 $new_scroll_pos}
{$this num_lines}}
#ifdef HX_XBOX {achievements submit credits} #endif
{$this go_back}}}
kDataUnhandled)
(go_back
{$this backwards_anim}
{ui goto_screen options_screen})}
{new
LagPanel
lag_panel
(file lag.milo)
(focus autocalibrate.btn)
(from_panel
"main_panel")
"")
(state init)
(lag 0)
(hits
Expand Down Expand Up @@ -173,9 +140,9 @@
{if_else
{==
[from_panel]
main_panel}
{ui goto_screen main_screen}
{ui goto_screen pause_video_settings_screen}})
video_settings_panel}
{ui goto_screen options_screen}
{ui goto_screen options_screen}})
kDataUnhandled}})
(SELECT_START_MSG
{switch
Expand Down Expand Up @@ -343,8 +310,6 @@
(focus lag_panel)
(clear_vram TRUE)
(enter
{game80s.btn set_state kDisabled}
{game80s.btn set_showing FALSE}
{hud set_showing FALSE}
{track_panel set_showing FALSE}
{world_panel set_showing FALSE})}
Loading

0 comments on commit 0a86cbd

Please sign in to comment.