Skip to content

Commit

Permalink
wip calibration sliders (help wanted)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lunalawl
lunalawl committed Apr 17, 2023
1 parent 47a9fdd commit 6f09816
Show file tree
Hide file tree
Showing 4 changed files with 259 additions and 36 deletions.
26 changes: 16 additions & 10 deletions _ark/ui/eng/locale_milo.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
(cheat_neckless "Neckless Mode")
(speed_msg "NOTES: %d%% SONG: %d%%\n FPS: %dFPS")
(speed_msg "NOTES:%d%% SONG: %d%%\n FPS: %dFPS")
(lag_msg "AUDIO LAG:%d%%\nVIDEO LAG: %d%%")
(width_msg "WIDTH: %d%%")
(gm_tspd "VENUE FPS")
(gm_sngspd "NOTE SPEED")
Expand Down Expand Up @@ -141,7 +142,7 @@
(os_starpower "STAR POWER COLOR")
(os_psstrumcolor "POORSPY STRUM COLOR")
(os_trackelm "TRACK ELEMENT")
(os_trackmodifiers "TRACK MODIFIERS")
(os_trackmodifiers "TRACK OPTIONS")
(os_songlistthemes "Song List")
(os_songlistthemeslbl "SONG LIST OPTIONS")
(os_gh1theme "GUITAR HERO I")
Expand All @@ -152,18 +153,18 @@
(os_customedtheme "GHIIDX CUSTOM EDITION")
(os_goldtheme "ALL EGGS UNLOCKED")
(os_helpmsg "This is me warning you that if in game, you must back out to the nearest loading screen for most modifications to properly load and enable.")
(os_setfont "NAME FONT")
(os_setfont "SET NAME FONT")
(os_sethighway "SELECT HIGHWAY")
(os_themeselect "Menu Theme")
(os_themeselectlbl "MENU THEME")
(os_guitars "GUITARS")
(os_guitars "GUITAR SELECT")
(os_venues "VENUES")
(os_venueselect "VENUE SELECT")
(os_guitars "INSTRUMENT")
(os_guitarselect "INSTRUMENT")
(os_venues "VENUE")
(os_venueselect "SELECT VENUE")
(os_deluxesettings "DELUXE SETTINGS")
(os_colorselector "COLOR SELECTOR")
(os_characters "CHARACTERS")
(os_characterselect "CHARACTER SELECT")
(os_colorselector "COLORS")
(os_characters "CHARACTER")
(os_characterselect "CHARACTER")
(os_gameplay "GAMEPLAY")
(os_modifiers "MODIFIERS")
(os_appearance "APPEARANCE")
Expand All @@ -173,6 +174,7 @@
(os_handedness "HANDEDNESS")
(os_username "USERNAME")
(os_calibration "CALIBRATE LAG")
(os_videolag "Video Lag")
(os_credits "CREDITS")
(dx_play "READY")
(dx_part "INSTRUMENT")
Expand Down Expand Up @@ -203,6 +205,7 @@
(sld_trackspeed "NOTE SPEED")
(sld_fps "VENUE FPS")
(sld_focus "FOCUS MODE")
(sld_overscan "OVERSCAN")
(sld_red "RED")
(sld_green "GREEN")
(sld_blue "BLUE")
Expand Down Expand Up @@ -292,4 +295,7 @@
(solo_awesomechoke "Awesome Choke")
(solo_perfect "Perfect Solo!")
(solo_nice "Nice.")
(besttext "Best")
(besttext "Best")

;extras
(random "[RANDOM]")
2 changes: 1 addition & 1 deletion _ark/ui/overshell.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
(restart.btn {ui push_screen overshell_modifier_list_screen}) ;modifiers screen
(change_speed.btn {ui push_screen overshell_speed_slider_screen}) ;speed settings screen
(section.btn {ui push_screen overshell_appearance_screen}) ;appearance screen
(newsong.btn {ui push_screen overshell_background_screen}) ;background screen
(newsong.btn {ui push_screen overshell_managegig_screen}) ;manage gig screen
(quit.btn {ui push_screen overshell_options_screen}) ;guitar select screen
(extra1.btn {$this disable overshell_panel} {overshell_panel set_showing FALSE} {ui goto_screen credits_screen}) ;theme select screen
; (extra2.btn {ui push_screen overshell_audio_slider_screen}) ;audio settings screen
Expand Down
100 changes: 77 additions & 23 deletions _ark/ui/overshell_handlers.dta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,21 @@
OVERSHELL_SCREEN_COMMON_HANDLER ;common overshell screen setup for all overshell screens
OVERSHELL_COMMON_BUTTON_DOWN_HANDLER ;common script ran in all overshells to handle selections
}
{new
SliderPanel ;panel type
overshell_lag_slider ;panel name
(file overshell_slider.milo) ;milo file used for the panel. found in /ui/gen/
OVERSHELL_THEME_HANDLER ;make sure the theme coding is loaded into this panel
LAG_SLIDER_HANDLERS ;found in overshell_slider_handlers.dta
}
{new
GHScreen ;screen type
overshell_lag_screen ;screen name
(panels overshell_lag_slider) ;panels used for this screen. overshell only uses one panel
(focus overshell_lag_slider) ;panel to focus
OVERSHELL_SCREEN_COMMON_HANDLER ;common overshell screen setup for all overshell screens
OVERSHELL_COMMON_BUTTON_DOWN_HANDLER ;common script ran in all overshells to handle selections
}
{new
SliderPanel ;panel type
overshell_audio_slider ;panel name
Expand Down Expand Up @@ -171,12 +186,9 @@
{change_speed.btn set_localized_text {localize os_font}} ;set the title text for this screen
{section.btn set_localized_text {localize os_themeselect}} ;set the title text for this screen
{newsong.btn set_localized_text {localize os_songlistthemes}} ;set the title text for this screen
{$this disable quit.btn} ;hide unused btn
{quit.btn set_showing FALSE}
; {quit.btn set_localized_text {localize os_goldtheme}} ;set the title text for this screen
{quit.btn set_localized_text {localize os_colorselector}} ;set the title text for this screen
{$this disable extra1.btn} ;hide unused btn
{extra1.btn set_showing FALSE}
; {extra1.btn set_localized_text {localize os_songlistthemeslbl}} ;set the title text for this screen
)
}
{new
Expand All @@ -187,28 +199,72 @@
OVERSHELL_SCREEN_COMMON_HANDLER ;common overshell screen setup for all overshell screens
(SELECT_START_MSG ;ran when an item on screen is selected
{switch $component ;run specific code based on exactly which item is selected
(resume.btn ;gh1 menu theme
(resume.btn ;track options
{ui push_screen overshell_track_list_screen} ;we open another screen for another list
)
(restart.btn ;gh2 menu theme
(restart.btn ;highway select
{ui push_screen overshell_highway_list_screen} ;we open another screen for another list
)
(change_speed.btn ;gh 80s menu theme
(change_speed.btn ;name font
{ui push_screen overshell_font_list_screen} ;we open another screen for another list
)
(section.btn ;gh3 menu theme
(section.btn ;menu themes
{ui push_screen overshell_theme_list_screen} ;we open another screen for another list
)
(newsong.btn ;custom edition theme / users theme
(newsong.btn ;song list themes
{ui push_screen overshell_song_theme_screen} ;we open another screen for another list
)
; (quit.btn ;gold menu theme
; {set $menutheme gold}
; OVERSHELL_HELP_POP_HANDLER ;run help screen macro if havent entered help screen
; )
; (extra1.btn ;song select theme button
; {ui push_screen overshell_song_theme_screen} ;push the song select theme screen
; )
(quit.btn ;color selector
{ui push_screen overshell_color_slider_screen}
)
}
)
OVERSHELL_COMMON_BUTTON_DOWN_HANDLER ;common script ran in all overshells to handle selections
}
{new
GHPanel ;panel type
overshell_managegig_list ;panel name
(file overshell_theme.milo) ;milo file used for the panel. found in /ui/gen/
OVERSHELL_THEME_HANDLER ;make sure the theme coding is loaded into this panel
(focus resume.btn) ;focus on resume button, since we dont use all of the btns
(reset_focus TRUE) ;make sure to bring the focus to the overshell theme panel
(enter ;when the panel is entered
{$this overshell_theme} ;run the theme code on the current overshell screen
{pause_title.lbl set_localized_text {localize os_background}} ;set the title text for this screen
{diff.btn set_showing FALSE} ;hide the extra unused button
{extra2.btn set_showing FALSE} ;hide the extra unused button
{$this disable diff.btn} ;disable the extra unused button
{$this disable extra2.btn} ;disable the extra unused button
{resume.btn set_localized_text {localize os_venues}} ;set the title text for this screen
{restart.btn set_localized_text {localize os_characters}} ;set the title text for this screen
{change_speed.btn set_localized_text {localize os_guitars}} ;set the title text for this screen
{$this disable section.btn} ;hide unused btn
{section.btn set_showing FALSE}
{$this disable newsong.btn} ;hide unused btn
{newsong.btn set_showing FALSE}
{$this disable quit.btn} ;hide unused btn
{quit.btn set_showing FALSE}
{$this disable extra1.btn} ;hide unused btn
{extra1.btn set_showing FALSE}
)
}
{new
GHScreen ;screen type
overshell_managegig_screen ;screen name
(panels overshell_managegig_list) ;panels used for this screen. overshell only uses one panel
(focus overshell_managegig_list) ;panel to focus
OVERSHELL_SCREEN_COMMON_HANDLER ;common overshell screen setup for all overshell screens
(SELECT_START_MSG ;ran when an item on screen is selected
{switch $component ;run specific code based on exactly which item is selected
(resume.btn ;venue select
{ui push_screen overshell_venue_list_screen} ;we open another screen for another list
)
(restart.btn ;character select
{ui push_screen overshell_character_list_screen} ;we open another screen for another list
)
(change_speed.btn ;guitar select
{ui push_screen overshell_guitar_list_screen} ;we open another screen for another list
)
}
)
OVERSHELL_COMMON_BUTTON_DOWN_HANDLER ;common script ran in all overshells to handle selections
Expand Down Expand Up @@ -257,9 +313,7 @@
{ui push_screen overshell_audio_slider_screen} ;we open another screen for another list
)
(change_speed.btn ;calibration
{ui pop_screen}
{ui pop_screen}
{ui goto_screen lag_screen} ;we open another screen for another list
{ui push_screen overshell_lag_screen} ;we open another screen for another list
)
(section.btn ;handedness
{ui push_screen overshell_handedness_screen} ;we open another screen for another list
Expand Down Expand Up @@ -785,7 +839,7 @@
(focus sel_section.lst) ;focus the list used in the current overshell screen
(enter ;when the panel is entered
{$this overshell_theme} ;run the theme code on the current overshell screen
; {gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
{gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
{gs_title.lbl set_localized_text {localize os_handedness}} ;set the title text for this screen
{sel_section.lst set_selected $handlistpos} ;select our saved list position
{sel_section.lst set circular 0} ;we dont set this list to be circular because there are not enough list items to wrap
Expand Down Expand Up @@ -842,7 +896,7 @@
{$this overshell_theme} ;run the theme code on the current overshell screen
{sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
{sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
{gs_title.lbl set_localized_text {localize os_characters}} ;set the title label for the current screen
{gs_title.lbl set_localized_text {localize os_characterselect}} ;set the title label for the current screen
{gs_background.view add_object gs_tile5.mesh} ;make sure we have the spare mesh loaded
{gs_tile5.mesh set_local_pos 125 100 100} ;position spare image
{gs_tile5.mesh set_local_scale_index 0 .9} ;scale spare image
Expand Down Expand Up @@ -932,7 +986,7 @@
(enter ;when the panel is entered
{$this overshell_theme} ;run the theme code on the current overshell screen
{gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
{gs_title.lbl set_localized_text {localize os_venues}} ;set the title text for this screen
{gs_title.lbl set_localized_text {localize os_venueselect}} ;set the title text for this screen
{sel_section.lst set_local_pos -140 0 35} ;move the list to the proper locatio
{sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
{sel_section.lst set_data ;set up the data for the list
Expand Down Expand Up @@ -976,7 +1030,7 @@
{$this overshell_theme} ;run the theme code on the current overshell screen
{sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
{sel_section.lst set circular 1} ;set the list to wrap around when the end is reached
{gs_title.lbl set_localized_text {localize os_guitars}} ;set the title text for this screen
{gs_title.lbl set_localized_text {localize os_guitarselect}} ;set the title text for this screen
{gs_tile5.mesh set_showing FALSE} ;hide the spare mesh we put into the overshell list milo
{sel_section.lst set_data ;set up the data for the list
(
Expand Down
Loading

0 comments on commit 6f09816

Please sign in to comment.