prepare for $dx_connected_server from ashcentral

_ark/config/modes.dta

@@ -168,7 +168,16 @@
    (unlock_song_initial_num 20)
    (enable_streak TRUE)
    (enable_star_power TRUE)
-   (cannot_connect_warning community_no_server_warning)
+   (cannot_connect_warning
+      {switch $dx_connected_server
+         (none
+            community_no_server_warning
+         )
+         (ashcentral
+            ash_community_no_server_warning
+         )
+      }
+   )
    (missing_part_type kMissingSelectCoop)
    (has_track TRUE)
    (update_leaderboards TRUE)
@@ -190,7 +199,17 @@
    (lb_song_select_screen lb_song_select_screen)
    (leaderboards_screen leaderboards_screen)
    (leaderboards_band_profile_screen leaderboards_band_profile_screen)
-   (cannot_connect_warning community_no_server_warning))
+   (cannot_connect_warning
+      {switch $dx_connected_server
+         (none
+            community_no_server_warning
+         )
+         (ashcentral
+            ash_community_no_server_warning
+         )
+      }
+   )
+)
 #define H2H_PROPERTIES
 ((game_screen h2h_game_screen)
    (track_panel h2h_track_panel)
@@ -489,7 +508,16 @@
 (tour_local
    TOUR_MODE_PROPERTIES
    (show_pause_quit FALSE)
-   (cannot_connect_warning tour_no_server_warning)
+   (cannot_connect_warning
+      {switch $dx_connected_server
+         (none
+            tour_no_server_warning
+         )
+         (ashcentral
+            ash_tour_no_server_warning
+         )
+      }
+   )
    #ifdef HX_EE
    (main_mode_screen tour_band_sel_screen)
    #endif)
@@ -679,7 +707,16 @@
    (lb_song_select_screen lb_song_select_screen)
    (leaderboards_screen leaderboards_screen)
    (leaderboards_band_profile_screen leaderboards_band_profile_screen)
-   (cannot_connect_warning community_no_server_warning)
+   (cannot_connect_warning
+      {switch $dx_connected_server
+         (none
+            community_no_server_warning
+         )
+         (ashcentral
+            ash_community_no_server_warning
+         )
+      }
+   )
    (uisink_lost_connection_screen main_community_screen)
    (uisink_default_screen main_community_screen)
    (uisink_signout_screen main_community_screen)
@@ -688,7 +725,16 @@
    #ifndef HX_PC
    (local_network FALSE)
    #endif
-   (cannot_connect_warning community_no_server_warning)
+   (cannot_connect_warning
+      {switch $dx_connected_server
+         (none
+            community_no_server_warning
+         )
+         (ashcentral
+            ash_community_no_server_warning
+         )
+      }
+   )
    (login_status kProhibited)
    (uisink_lost_connection_screen store_unload_screen)
    (uisink_default_screen store_unload_screen)
@@ -704,7 +750,16 @@
    (player_arrangement kArrangeBand)
    (intro_category INTRO_VENUE)
    (game_mode_context CONTEXT_GAME_MODE_TYPE_JUKEBOX)
-   (cannot_connect_warning solo_no_server_warning)
+   (cannot_connect_warning
+      {switch $dx_connected_server
+         (none
+            solo_no_server_warning
+         )
+         (ashcentral
+            ash_solo_no_server_warning
+         )
+      }
+   )
    (game_screen jukebox_screen)
    (is_jukebox TRUE)
    (has_track FALSE)

_ark/dx/ui/dx_init.dta

@@ -2,6 +2,9 @@
 #include ../track/dx_track_callback.dta
 #include dx_funcs.dta
 #include ../countdown/dx_countdown_ui_init.dta
+
+{set $dx_connected_server none}
+
 ;sets default track speed. 1.15 is 115%, 1.30 is 130% and so on.
 {set $trackspeed 1.0}
 

_ark/ui/band_ui.dta

@@ -116,12 +116,25 @@
          ($reason)
          {$this
             set_ok
-            {localize
-               {switch
-                  $reason
-                  (kLostConnection error_lost_connection)
-                  (kLostServer error_lost_server)
-                  (kEthernetUnplugged error_ethernet_unplugged)}}}
+            {switch $dx_connected_server
+               (none
+                  {localize
+                     {switch
+                        $reason
+                        (kLostConnection error_lost_connection)
+                        (kLostServer error_lost_server)
+                        (kEthernetUnplugged error_ethernet_unplugged)}}
+               )
+               (ashcentral
+                  {localize
+                     {switch
+                        $reason
+                        (kLostConnection error_lost_connection)
+                        (kLostServer ash_error_lost_server)
+                        (kEthernetUnplugged error_ethernet_unplugged)}}
+               )
+            }
+         }
          {net_sync disable_and_goto meta_loading_uisink_lost_connection_screen})
       (SELECT_DONE_MSG
          {band_ui dismiss_event}))
@@ -131,7 +144,15 @@
       (init
          {$this
             set_ok
-            {localize error_lost_server}}
+            {switch $dx_connected_server
+               (none
+                  {localize error_lost_server}
+               )
+               (ashcentral
+                  {localize ash_error_lost_server}
+               )
+            }
+         }
          {if_else
             {session is_local}
             {net_sync disable_and_goto meta_loading_return_to_tour_hub_screen}

_ark/ui/eng/locale_updates.dta

@@ -217,6 +217,48 @@
 (leader_hb_choosesong240 "Choose Song at 240%")
 (leader_hb_choosesong245 "Choose Song at 245%")
 (leader_hb_choosesong250 "Choose Song at 250%")
+
+;server stuff
+;none
+(shell_network_busy "Communicating with the game servers...")
+(upload_uploading "Communicating with the game servers...")
+(upload_error_start_single "There was an error during the upload to the game servers.")
+(upload_error_start_fmt "There were %d errors during the upload to the game servers.")
+(upload_error_server_down "The game servers appear to be unavailable.  Rock Band 2 will attempt to upload again automatically during a later autosave.")
+(error_lost_server "You have lost contact with the game servers.")
+(leaderboards_not_available_rock_central "You will only be able to see local leaderboards while logged out of the game servers.")
+(connecting_server "Connecting to the game servers...")
+(solo_no_server_warning "Couldn't connect to the game servers.\n\nYou won't be able to send your scores to the leaderboards.  Continue anyway?")
+(tour_no_server_warning "Couldn't connect to the game servers.\n\nYou won't be able to send your scores to the leaderboards or update your band to the website.  Continue anyway?")
+#ifdef HX_PS3
+(community_no_server_warning "Couldn't connect to the game servers.\n\nYou won't be able to access the online leaderboards.  Continue anyway?")
+#else
+(community_no_server_warning "Couldn't connect to the game servers.\n\nYou won't be able to access the Xbox LIVE leaderboards.  Continue anyway?")
+#endif
+(motd_no_rock_central "Attempting to connect to the game servers...")
+(motd_online_disabled "Cannot connect to the game servers while modifiers are enabled.")
+(privileges_restricted_strict "Connecting to the game server is disabled on your PLAYSTATION<sup>®</sup>Network account due to parental control restrictions.\n\nYou are not allowed to access this mode.")
+(privileges_restricted_lenient "Connecting to the game server is disabled on your PLAYSTATION<sup>®</sup>Network account due to parental control restrictions.\n\nYou will be unable to view leaderboards or post your scores.")
+(leaderboard_connection_error "Failed to connect to the game servers.")
+(botb_net_failed "The game servers are unable to send battle information at this time. Please try again in a few minutes.")
+(tour_no_botb_connecting "Sorry, but you're unable to play Battle of the Bands at the moment.  You are currently attempting to connect to the game servers.")
+;ashcentral
+(ash_qp_online "AshCentral Quickplay")
+(ash_tour_online "AshCentral Tour")
+(ash_player_match "AshCentral Match")
+(ash_shell_network_busy "Communicating with the AshCentral server...")
+(ash_upload_uploading "Uploading data to the AshCentral server...")
+(ash_upload_error_start_single "There was an error during the upload to the AshCentral server.")
+(ash_upload_error_start_fmt "There were %d errors during the upload to the AshCentral server.")
+(ash_error_lost_server "You have lost contact with the AshCentral server.")
+(ash_leaderboards_not_available_rock_central "You will only be able to see local leaderboards while logged out of AshCentral.")
+(ash_connecting_server "Connecting to the AshCentral server...")
+(ash_solo_no_server_warning "Couldn't connect to the AshCentral server.\n\nYou won't be able to send your scores to the leaderboards.  Continue anyway?")
+(ash_tour_no_server_warning "Couldn't connect to the AshCentral server.\n\nYou won't be able to send your scores to the leaderboards or update your band to the website.  Continue anyway?")
+(ash_community_no_server_warning "Couldn't connect to the AshCentral server.\n\nYou won't be able to access the online leaderboards.  Continue anyway?")
+(ash_privileges_restricted_strict "Connecting to the AshCentral server is disabled on your PLAYSTATION<sup>®</sup>Network account due to parental control restrictions.\n\nYou are not allowed to access this mode.")
+(ash_privileges_restricted_lenient "Connecting to the AshCentral server is disabled on your PLAYSTATION<sup>®</sup>Network account due to parental control restrictions.\n\nYou will be unable to view leaderboards or post your scores.")
+
 #ifdef HX_PS3
 (error_cheating
    "Sorry, you have a modifier activated that disables online play. You cannot access any online features until the modifier is disabled.")
@@ -289,8 +331,6 @@
 #endif
 (charcreator_full_profile_fmt
    "You already own the maximum of %d characters.  If you want to make a new character, you'll have to delete an old one first.")
-(tour_no_botb_connecting
-   "Sorry, but you're unable to play Battle of the Bands at the moment.  You are currently attempting to connect to Rock Central.")
 #ifdef HX_PS3
 (cal_video_desc_pad_swapped
    "This test determines the amount of Video Latency in your system. When you see the needle hit either side of the meter, press the circle button.")