working options menu

_ark/config/long_cheats.dta

@@ -12,6 +12,10 @@
                {== {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}

_ark/ui/audioset.dta

@@ -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)}

_ark/ui/calibration.dta

@@ -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
@@ -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
@@ -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})}

_ark/ui/eng/locale.dta

@@ -68,12 +68,12 @@
 (max_profile_msg "There are no free band slots.  You must delete one or more band slots to create a new profile.")
 (cant_delete_profile "CAN'T DELETE BAND")
 (cant_delete_profile_msg "The currently selected band cannot be deleted. To delete this band, first choose a different band using LOAD BAND or NEW BAND.")
-(op_bonus_material "Bonus Videos")
+(op_bonus_material "Deluxe Settings  ")
 (op_credits "Credits")
-(op_data_settings "Manage Band ")
-(op_game_settings "Audio Settings ")
-(op_video_settings "Video Settings")
-(op_memcard "Data Settings")
+(op_data_settings "Calibrate Lag    ")
+(op_game_settings "Username    ")
+(op_video_settings "Set Audio")
+(op_memcard "Manage Data")
 (GAME_SETTINGS "AUDIO SETTINGS")
 (LEFT_PLAYER_1 "LEFTY FLIP - PLAYER 1")
 (LEFT_PLAYER_2 "LEFTY FLIP - PLAYER 2")
@@ -116,7 +116,7 @@
 (video1_shop_desc "Ever dreamed of taking an all-access tour of the Gibson USA factory? This is your chance.")
 (video2_shop_desc "Check out an exclusive behind-the-scenes video of the recording of the Guitar Hero II songs.")
 (video3_shop_desc "The Guitar Hero II development team takes you backstage to see what life is REALLY like at Harmonix.")
-(QUICK_PLAY "FREE PLAY")
+(QUICK_PLAY "MULTIPLAYER")
 (QP_SELSONG "SELECT SONG")
 (E3_SINGLE_PLAYER "E3 SINGLE PLAYER")
 (E3_MULTI_COOP "E3 MULTI CO-OP")
@@ -218,12 +218,13 @@
 (cheat_enabled_fmt "CHEAT ENABLED:\n%s")
 (cheat_disabled_fmt "CHEAT DISABLED:\n%s")
 (cheat_unlock_all "Unlock All (saving disabled)")
-(CAREER "USERNAME")
-(MULTIPLAYER "MULTIPLAYER")
+(CAREER "FREE PLAY")
+(MULTIPLAYER "PRACTICE")
 (OPTIONS "CREDITS")
+(dx_options "OPTIONS")
 (EXTRAS "EXTRAS")
 (OFFSET "OFFSET")
-(TRAINING "practice")
+(TRAINING "OPTIONS")
 (multi_campaign "CAREER")
 (multi_coop "COOPERATIVE")
 (multi_versus "FACE-OFF")

_ark/ui/eng/locale_milo.dta

@@ -298,4 +298,4 @@
 (besttext "Best")
 
 ;extras
-(random "[RANDOM]")
+(random "[RANDOM]")

_ark/ui/initializer.dta

@@ -79,12 +79,15 @@
 #include multiplayer.dta
 #include mainmenu.dta
 #include calibration.dta
+#include audioset.dta
+#include memcard.dta
 #include overshell.dta
 #include overshell_handlers.dta
 #include practice.dta
 #include pause.dta
 #include seldiff.dta
 #include managegig.dta
+#include options.dta
 {foreach $p (pause_panel pause_controller_panel tut_pause_panel pract_pause_panel tut_pause_controller_panel lose_panel helpbar endgame_encore_panel) {$p load}}
 {meta set_defaults}
 #ifdef HX_XBOX {set $first_screen splash_screen} #endif

_ark/ui/mainmenu.dta

@@ -33,7 +33,7 @@
           main.milo
        }
     )
-   (focus main_quickspin.btn) ;focus on quickplay button on enter
+   (focus main_career.btn) ;focus on quickplay button on enter
    (msg_last_frame 0) ;cheat messages no longer occur in DX
    (already_entered FALSE)
    (memcard_flow_entered FALSE)
@@ -83,6 +83,7 @@
       }
    )
    (enter
+       {$this disable main_quickspin.btn} ;disable multiplayer (broken)
        #ifndef HX_XBOX
        {set $cheat_enabled_unlock_all 1}
        {campaign set_all_access 1}
@@ -147,32 +148,15 @@
    (SELECT_START_MSG ;what to do when a button is pressed or a menu item is selected
       {switch $component ;switch action based on result of which button is selected
          (main_career.btn
-            {gamecfg set mode career}
-            {if_else
-               {>
-                  {campaign num_profiles}
-                  0}
-               {ui goto_screen manage_band_screen}
-               {do
-                  {nameprof_screen set back_screen main_screen}
-                  {nameprof_screen set is_editing FALSE}
-                  {nameprof_screen set profile_slot 0}
-                  {nameprof_screen set next_screen main_screen}
-                  {ui goto_screen nameprof_screen}}}
-            ;{game set_song {campaign pick_attract_song}} {game set_career} {ui goto_screen loading_screen}
-            ;{{load_objects "game:/test.milo"} save_objects "game:/converted.milo"} ;test code for milo conversion. input milo must be named as test.milo_xbox
-            ;{ui goto_screen nameprof_screen} ;name profile screen for highscores (career)
-            )
-         (main_quickspin.btn
             {gamecfg set mode career} ;set to career so select song screen shows saved scores
             {set $gh3list {random_int 1 4}} ;set the random number for one of the 4 combinations of gh3 song list screen
             {ui goto_screen sel_song_screen} ;go to the select song screen
             kDataUnhandled)
-         (main_multiplayer.btn
+         (main_quickspin.btn
             {set $gh3list {random_int 1 5}}
             {ui goto_screen multi_controller_select_screen} ;go to the controller configuration screen for multiplayer (xbox only)
             kDataUnhandled)
-         (main_tutorial.btn
+         (main_multiplayer.btn
             {gamecfg set mode practice} ;set the current game mode to practice
             {gamecfg set practice_speed 0} ;we use our own speed scripting, so ensure practice speed is set to full speed
             {set $gh3list {random_int 1 4}} ;set the random number for one of the 4 combinations of gh3 song list screen
@@ -181,6 +165,9 @@
          (main_leaderboards.btn
             {ui goto_screen lag_screen} ;go directly to the calibration screen
             kDataUnhandled)
+         (main_tutorial.btn
+            {ui goto_screen options_screen} ;go directly to the options menu
+            kDataUnhandled)
          (main_options.btn
             {ui goto_screen credits_screen} ;go directly to the credits screen
             kDataUnhandled)})