working titty screen (for the most part)

_ark/config/long_cheats.dta

@@ -10,6 +10,9 @@
                {== {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} practice_diff_screen}
                {== {ui current_screen} sel_song_screen}
                {== {ui current_screen} practice_end_screen}
                {== {ui current_screen} practice_sel_section_screen}

_ark/ui/eng/locale.dta

@@ -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 "SINGLEPLAYER")
+(QUICK_PLAY "FREE PLAY")
 (QP_SELSONG "SELECT SONG")
 (E3_SINGLE_PLAYER "E3 SINGLE PLAYER")
 (E3_MULTI_COOP "E3 MULTI CO-OP")

_ark/ui/eng/locale_milo.dta

@@ -45,7 +45,7 @@
 (speed_msg "NOTES: %d%%  SONG: %d%%\n FPS: %dFPS")
 (speed_msg "NOTES:%d%%  SONG: %d%%\n FPS: %dFPS")
 (width_msg "WIDTH: %d%%")
-(gm_tspd "FPS")
+(gm_tspd "VENUE FPS")
 (gm_sngspd "NOTE SPEED")
 (gm_unusedsl "SONG SPEED")
 (gm_red "RED")
@@ -93,10 +93,10 @@
 
 ; Manage Gig/Extras menu
 (gig_play "PLAY SHOW")
-(gig_character "CHARACTER")
-(gig_guitar "GUITAR")
-(gig_venue "VENUE")
-(gig_extras "EXTRAS")
+(gig_character "READY")
+(gig_guitar "INSTRUMENT")
+(gig_venue "DIFFICULTY")
+(gig_extras "OPTIONS")
 (milo_extras "EXTRAS")
 (extras_songtitle "SONG TITLE ALWAYS")
 #ifndef HX_XBOX
@@ -167,9 +167,17 @@
 (os_gameplay "GAMEPLAY")
 (os_modifiers "MODIFIERS")
 (os_appearance "APPEARANCE")
-(os_background "BACKGROUND")
+(os_background "MANAGE GIG")
 (os_options "OPTIONS")
-(os_audiooptions "AUDIO OPTIONS")
+(os_audiooptions "SET AUDIO")
+(os_handedness "HANDEDNESS")
+(os_username "USERNAME")
+(os_calibration "CALIBRATE LAG")
+(os_credits "CREDITS")
+(dx_play "READY")
+(dx_part "INSTRUMENT")
+(dx_diff "DIFFICULTY")
+(dx_options "OPTIONS")
 (elm_name "Name Display")
 (elm_starpower "Star Power")
 (elm_streaklabel "FC Streak Counter")
@@ -192,7 +200,7 @@
 (sld_guitar "GUITAR")
 (sld_sfx "SFX")
 (sld_songspeed "SONG SPEED")
-(sld_trackspeed "TRACK SPEED")
+(sld_trackspeed "NOTE SPEED")
 (sld_fps "VENUE FPS")
 (sld_focus "FOCUS MODE")
 (sld_red "RED")

_ark/ui/initializer.dta

@@ -83,6 +83,8 @@
 #include overshell_handlers.dta
 #include practice.dta
 #include pause.dta
+#include seldiff.dta
+#include managegig.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/managegig.dta

@@ -0,0 +1,45 @@
+{new
+   GHPanel
+   manage_gig_panel
+   (file {if_else {== $menutheme 80s} ;which milo file to use based on the 80s theme flag
+    manage_gig_80s.milo manage_gig.milo}) ;use 80s if 80s use gh2 if not 80s
+   (focus speed0.btn)
+   (set_button_text
+	{if_else {> $numofinst 1}
+		{speed2.btn set_state kDisabled}
+		{speed2.btn set_showing TRUE}})
+   (enter
+      {$this disable speed0.btn}
+      {speed0.btn set_showing FALSE}
+      {$this disable speed4.btn}
+      {speed4.btn set_showing FALSE})
+   (SELECT_START_MSG
+      {switch
+         $component
+         (speed1.btn
+            {ui goto_screen loading_screen}) ;start song when pressed
+         (speed2.btn
+            {ui goto_screen qp_selpart_screen}) ;select instrument
+         (speed3.btn
+            {ui goto_screen qp_diff_screen}) ;select difficulty
+         (speed4.btn
+            {ui push_screen overshell_screen})})} ;open overshell (crashes on close)
+{new
+   GHScreen
+   manage_gig_screen
+   (panels meta manage_gig_panel helpbar)
+   (focus manage_gig_panel)
+   (enter
+	  {$this set_button_text})
+   (helpbar
+      (default
+         ((fret1 help_continue)
+            (fret2 help_back)
+            (strum help_updown))))
+   (BUTTON_DOWN_MSG
+      {if
+         {== $button kPad_Tri}
+         {$this backwards_anim}
+         {synth play_sequence button_back.cue}
+         {ui goto_screen sel_song_screen}}
+      kDataUnhandled)}

_ark/ui/overshell.dta

@@ -162,13 +162,11 @@
       {section.btn set_localized_text {localize os_appearance}} ;set the button text
       {newsong.btn set_localized_text {localize os_background}} ;set the button text
       {quit.btn set_localized_text {localize os_options}} ;set the button text
+      {extra1.btn set_localized_text {localize os_credits}} ;set the button text
       {$this disable diff.btn} ;hide unused button
       {diff.btn set_showing FALSE}
-      {$this disable extra1.btn} ;hide unused button
-      {extra1.btn set_showing FALSE}
       {$this disable extra2.btn} ;hide unused button
       {extra2.btn set_showing FALSE}
-   ;   {extra1.btn set_localized_text {localize eight}} ;set the button text
    ;   {extra2.btn set_localized_text {localize nine}} ;set the button text
    )
 }
@@ -186,9 +184,8 @@
          (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_options_screen}) ;options screen
          (quit.btn {ui push_screen overshell_options_screen}) ;guitar select screen
-      ;   (extra1.btn {ui push_screen overshell_theme_list_screen}) ;theme 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
       }
    )

_ark/ui/overshell_handlers.dta

@@ -213,6 +213,73 @@
    )
    OVERSHELL_COMMON_BUTTON_DOWN_HANDLER ;common script ran in all overshells to handle selections
 }
+{new
+   GHPanel ;panel type
+   overshell_options_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_options}} ;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_username}} ;set the title text for this screen
+      {restart.btn set_localized_text {localize os_audiooptions}} ;set the title text for this screen
+      {change_speed.btn set_localized_text {localize os_calibration}} ;set the title text for this screen
+      {section.btn set_localized_text {localize os_handedness}} ;set the title text for this screen
+      {newsong.btn set_localized_text {localize os_credits}} ;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
+      {$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
+   GHScreen ;screen type
+   overshell_options_screen ;screen name
+   (panels overshell_options_list) ;panels used for this screen. overshell only uses one panel
+   (focus overshell_options_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 ;username
+            {ui pop_screen}
+            {ui pop_screen}
+            {ui goto_screen manage_band_screen} ;we open another screen for another list
+         )
+         (restart.btn ;audio options
+            {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
+         )
+         (section.btn ;handedness
+            {ui push_screen overshell_handedness_screen} ;we open another screen for another list
+         )
+         (newsong.btn ;credits
+            {ui pop_screen}
+            {ui pop_screen}
+            {ui goto_screen credits_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
+      ;   )
+      }
+   )
+   OVERSHELL_COMMON_BUTTON_DOWN_HANDLER ;common script ran in all overshells to handle selections
+}
 {new
    MultiSelectListPanel ;panel type
    overshell_track_list ;panel name
@@ -710,6 +777,54 @@
    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
+   MultiSelectListPanel ;panel type
+   overshell_handedness_list ;panel name
+   (file overshell_list.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 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_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
+      {sel_section.lst set_local_pos -140 0 35} ;move the list to the proper location
+      {sel_section.lst set_data ;set up the data for the list
+         (
+            os_leftyp1 os_leftyp2
+         )
+      }
+   )
+   (SELECT_START_MSG ;ran when an item on screen is selected
+      {switch {$component selected_sym} ;run specific code based on exactly which item is selected
+         (os_leftyp1
+            {set $leftyp1 {! $leftyp1}} ;set var to opposite value
+            {options set_lefty 0 $leftyp1} ;set lefty flip for player 1
+            {if_else $leftyp1
+               CHEAT_POP ;shortcut for the if else options on which sound effect to play
+            }
+         )
+         (os_leftyp2
+            {set $leftyp2 {! $leftyp2}} ;set var to opposite value
+            {options set_lefty 1 $leftyp2} ;set lefty flip for player 2
+            {if_else $leftyp2
+               CHEAT_POP ;shortcut for the if else options on which sound effect to play
+            }
+         )
+      }
+      OVERSHELL_DIFF_RESET_HANDLER ;resets the current overshell screen with new parameters, and pop up the help screen if needed
+   )
+   OVERSHELL_COMMON_BUTTON_DOWN_HANDLER ;common script ran in all overshells to handle selections
+}
+{new
+   GHScreen ;screen type
+   overshell_handedness_screen ;screen name
+   (panels overshell_handedness_list) ;panels used for this screen. overshell only uses one panel
+   (focus overshell_handedness_list) ;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
    MultiSelectListPanel ;panel type
    overshell_character_list ;panel name

_ark/ui/partselect.dta

@@ -137,8 +137,8 @@
    (SELECT_START_MSG ;what to do when a button is pressed or a menu item is selected
       {if {== $component part0.btn}
          {switch {gamecfg get mode}
-            (career {gamecfg set_track 0 0})
-            (quickplay {gamecfg set_track 0 0})
+            (career {gamecfg set_track 0 0} {if_else $diffseen {ui goto_screen manage_gig_screen} {ui goto_screen qp_diff_screen}}) ;go to titty screen if a song has been played this session, if not go to part select
+            (quickplay {gamecfg set_track 0 0} {ui goto_screen qp_diff_screen})
             (multi_vs
                {gamecfg set_track 0 0}
                {gamecfg set_track 1 0}
@@ -147,13 +147,13 @@
                {gamecfg set_track 0 0}
                {gamecfg set_track 1 0}
             )
-            (practice {gamecfg set_track 0 0})
+            (practice {gamecfg set_track 0 0} {if_else $diffseen {ui goto_screen manage_gig_screen} {ui goto_screen practice_diff_screen}})
          }
       }
       {if {== $component part1.btn}
          {switch {gamecfg get mode}
-            (career {gamecfg set_track 0 1})
-            (quickplay {gamecfg set_track 0 1})
+            (career {gamecfg set_track 0 1} {if_else $diffseen {ui goto_screen manage_gig_screen} {ui goto_screen qp_diff_screen}}) ;go to titty screen if a song has been played this session, if not go to part select
+            (quickplay {gamecfg set_track 0 1} {ui goto_screen qp_diff_screen})
             (multi_vs
                {gamecfg set_track 0 1}
                {gamecfg set_track 1 1}
@@ -162,15 +162,15 @@
                {gamecfg set_track 0 1}
                {gamecfg set_track 1 1}
             )
-            (practice {gamecfg set_track 0 1})
+            (practice {gamecfg set_track 0 1} {if_else $diffseen {ui goto_screen manage_gig_screen} {ui goto_screen practice_diff_screen}}) ;go to titty screen if a song has been played this session, if not go to difficulty
          }
       }
       {if {== $component part2.btn}
       {gamecfg set_track 0 2} {set $roygb TRUE} ;if part 2 button is selected, set player 0 to the third instrument in the song definition. also set roygb colors to true since this is drums
       }
       {switch {gamecfg get mode} ;switch action based on result of which game mode is currently being used
-          (career {ui goto_screen loading_screen}) ;dx uses career for quickplay, if career, go to the loading screen
-          (practice {ui goto_screen practice_sel_section_screen}) ;if practice, go to the select section screen
+          (career {if_else $diffseen {ui goto_screen manage_gig_screen} {ui goto_screen qp_diff_screen}}) ;go to titty screen if a song has been played this session, if not go to part select
+          (practice {if_else $diffseen {ui goto_screen manage_gig_screen} {ui goto_screen practice_diff_screen}}) ;if practice, go to the select section screen
           (multi_fo
              {ui goto_screen multi_fo_seldiff_screen}
           )

_ark/ui/seldiff.dta

@@ -0,0 +1,64 @@
+{new
+   GHPanel
+   sel_diff_qp_panel
+	(file {if_else {== $menutheme 80s} ;which milo file to use based on the 80s theme flag
+    sel_diff_qp_80s.milo sel_diff_qp.milo}) ;use 80s if 80s use gh2 if not 80s
+   SEL_DIFFICULTY_COMMON
+   (enter
+      {$this update_focus})
+   (last_difficulty
+      {game get_difficulty 0})
+   (update_difficulty)}
+{new
+   GHScreen
+   qp_diff_screen
+   (panels meta sel_diff_qp_panel helpbar)
+   (focus sel_diff_qp_panel)
+   (helpbar
+      (default
+         ((fret1 help_continue)
+            (fret2 help_back)
+            (strum help_updown))))
+   (BUTTON_DOWN_MSG
+      {if
+         {== $button kPad_Tri}
+         {do
+            {$this backwards_anim}
+            {synth play_sequence button_back.cue}
+            {if_else $diffseen
+            {ui goto_screen manage_gig_screen}
+            {ui goto_screen loading_screen}}
+            {set $diffseen TRUE}}}
+      kDataUnhandled)
+   (SELECT_START_MSG
+               {do
+         {if_else $diffseen
+         {ui goto_screen manage_gig_screen}
+         {ui goto_screen loading_screen}}
+         {set $diffseen TRUE}}
+      kDataUnhandled)}
+{new
+   GHPanel
+   sel_diff_practice_panel
+   (file {if_else {== $menutheme 80s} ;which milo file to use based on the 80s theme flag
+    sel_diff_practice_80s.milo sel_diff_practice.milo}) ;use 80s if 80s use gh2 if not 80s
+   SEL_DIFFICULTY_COMMON
+   (enter
+      {$this update_focus})
+   (last_difficulty
+      {game get_difficulty 0})
+   (update_difficulty)}
+{new
+   GHScreen
+   practice_diff_screen
+   (panels meta sel_diff_practice_panel helpbar)
+   (focus sel_diff_practice_panel)
+   (back_screen practice_selpart_screen)
+   (helpbar
+      (default
+         ((fret1 help_continue)
+            (fret2 help_back)
+            (strum help_updown))))
+   (SELECT_START_MSG
+      {ui goto_screen practice_sel_section_screen}
+      kDataUnhandled)}