Merge branch 'develop' into develop

hmxmilohax · Jan 11, 2024 · 5b1477d · 5b1477d
2 parents 42a15ab + 85f4671
commit 5b1477d
Show file tree

Hide file tree

Showing 47 changed files with 13,442 additions and 8,310 deletions.
diff --git a/_ark/char/char_objects.dta b/_ark/char/char_objects.dta
diff --git a/_ark/config/band.dta b/_ark/config/band.dta
@@ -4,6 +4,7 @@
 #include xlast_macros_update.dta
 #endif
 #include ../dx/config/dx_macros.dta
+#include ../dx/countdown/dx_countdown.dta
 #ifdef HX_WII
 #define PATCH_NO_STICKERS
 (1)

diff --git a/_ark/config/beatmatcher.dta b/_ark/config/beatmatcher.dta
@@ -14,6 +14,7 @@
       {handle_type
          ($world halfbeat)})
    (beat
+   DX_COUNTDOWN_TRACKER
    {unless {> {gamecfg get practice_speed} 0} {if {is_leader_local} {session send_msg_to_all {` (beatmatch set_music_speed {, $speedmod}) kNetReliable}}}}
    {unless {> {gamecfg get practice_speed} 0} {beatmatch set_music_speed $speedmod}}
       {if_else

diff --git a/_ark/config/midi_parsers.dta b/_ark/config/midi_parsers.dta
@@ -80,6 +80,7 @@
          {game get_venue}
          "video"}
       FALSE}}
+#include ../dx/countdown/dx_countdown_midi_parsers.dta
 {new
    MidiParser
    events_parser

diff --git a/_ark/config/modes.dta b/_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)

diff --git a/_ark/config/prefab_groups.dta b/_ark/config/prefab_groups.dta
@@ -1,43 +1,55 @@
 (prefab_groups
    (rockin_rockers
       (keywords rock poprock the 60s the70s the80s the90s the00s)
-      (characters rb2drum6 rb2drum8 rb2drum9 drum1 drum2 drum3 drum4 drum5 drum7 drum11 drum14 guitar3 guitar4 guitar14 guitar22 guitar23 guitar37 guitar38 vocals0 vocals1 vocals3 vocals5 rb2drum14 vocals2 vocals4 vocals22))
+      (characters rb2drum6 rb2drum8 rb2drum9 drum1 drum2 drum3 drum4 drum5 drum7 drum11 drum14 guitar3 guitar4 guitar14 guitar22 guitar23 vocals0 vocals1 vocals3 vocals5 rb2drum14 vocals2 vocals4
+         kimberley_monroe dawson_blake penelope chill anth annai_renae))
    (costume_rockers
       (keywords metal rock poprock the70s the80s the90s)
-      (characters rb2drum10 drum10 guitar16 vocals11 rb2guitar4 guitar17 guitar37))
+      (characters rb2drum10 drum10 guitar16 vocals11 rb2guitar4 guitar17
+         kimberley_monroe))
    (artsy_alternatives
       (keywords alternative the90s the00s)
-      (characters rb2drum9 guitar0 guitar6 vocals5 vocals9 vocals13 rb2guitar5 drum6 drum13 drum16 guitar7 guitar37 vocals20))
+      (characters rb2drum9 guitar0 guitar6 vocals5 vocals9 vocals13 rb2guitar5 drum6 drum13 drum16 guitar7 vocals20
+         kimberley_monroe luna u628 chill anth annai_renae))
    (southern_rockers
       (keywords southernrock the60s the70s the80s the90s the00s)
-      (characters rb2drum6 rb2drum11 drum4 drum11 drum12 guitar9 vocals6 vocals12 rb2drum14 rb2guitar2 drum8 guitar8 guitar15 guitar37))
+      (characters rb2drum6 rb2drum11 drum4 drum11 drum12 guitar9 vocals6 vocals12 rb2drum14 rb2guitar2 drum8 guitar8 guitar15
+         kimberley_monroe))
    (true_metals
       (keywords metal the70s the80s the90s the00s)
-      (characters rb2drum0 drum10 guitar30 guitar34 rb2drum12 rb2drum13 rb2guitar1 guitar1 guitar5 vocals4))
+      (characters rb2drum0 drum10 guitar30 guitar34 rb2drum12 rb2drum13 rb2guitar1 guitar1 guitar5 vocals4
+         vocals16 luna u628 chill anth annai_renae))
    (glam_rockers
       (keywords glam the70s the80s the90s)
       (characters rb2drum1 guitar25 vocals8 vocals21 rb2guitar2 guitar1 vocals20))
    (hair_metals
       (keywords glam metal poprock the80s the90s)
-      (characters rb2drum1 guitar24 guitar25 vocals8 vocals21 guitar1))
+      (characters rb2drum1 guitar24 guitar25 vocals8 vocals21 guitar1
+         anth annai_renae))
    (prog_rockers
       (keywords prog the60s the70s the80s)
-      (characters rb2drum2 guitar20 vocals7 drum8 guitar21))
+      (characters rb2drum2 guitar20 vocals7 drum8 guitar21
+         luna chill))
    (road_warriors
       (keywords punk metal the70s the80s the90s)
-      (characters rb2drum3 rb2guitar8 drum9 guitar18 guitar19 guitar26 guitar37 guitar38 vocals10 rb2drum13 rb2drum17 vocals22))
+      (characters rb2drum3 rb2guitar8 drum9 guitar18 guitar19 guitar26 vocals10 rb2drum13 rb2drum17
+         vocals16 kimberley_monroe dawson_blake penelope u628 chill anth annai_renae))
    (true_punks
       (keywords punk the70s the80s the90s)
-      (characters rb2drum4 rb2drum5 drum0 drum9 drum12 drum15 vocals10 vocals17 rb2drum15 rb2drum16 drum16 guitar33 guitar37 guitar38 vocals18))
+      (characters rb2drum4 rb2drum5 drum0 drum9 drum12 drum15 vocals10 vocals17 rb2drum15 rb2drum16 drum16 guitar33
+         vocals16 kimberley_monroe dawson_blake vocals18 chill anth annai_renae))
    (seattle_grungers
       (keywords grunge other the70s the80s the90s the00s)
-      (characters rb2drum5 rb2drum8 rb2drum9 drum0 drum1 drum5 drum11 drum12 guitar12 vocals14 rb2guitar1 drum6 drum13 guitar38 guitar13 vocals18))
+      (characters rb2drum5 rb2drum8 rb2drum9 drum0 drum1 drum5 drum11 drum12 guitar12 vocals14 rb2guitar1 drum6 drum13 guitar13 vocals18
+         dawson_blake chill anth annai_renae))
    (classic_rockers
       (keywords classicrock rock prog the60s the70s the80s the90s the00s)
       (characters rb2drum6 rb2drum7 rb2drum11 guitar9 guitar20 vocals1 vocals7 vocals9 rb2guitar0 rb2guitar4 rb2guitar5 drum8 guitar8 guitar21))
    (nu_emo
       (keywords numetal emo the60s the70s the80s the90s the00s)
-      (characters drum17 guitar0 guitar6 guitar26 guitar30 guitar32 guitar34 vocals13 vocals15 vocals17 vocals19 rb2guitar0 rb2guitar3 guitar2 guitar7 guitar29 guitar31 vocals20))
+      (characters drum17 guitar0 guitar6 guitar26 guitar30 guitar32 guitar34 vocals13 vocals15 vocals17 vocals19 rb2guitar0 rb2guitar3 guitar2 guitar7 guitar29 guitar31 vocals20
+         luna u628 chill anth annai_renae))
    (pop_oddities
       (keywords alternative fusion novelty poprock the60s the70s the80s the90s the00s)
-      (characters rb2drum10 guitar10 guitar32 vocals19 rb2drum15 rb2guitar3 guitar11 guitar28 guitar37 guitar39)))
+      (characters rb2drum10 guitar10 guitar32 vocals19 rb2drum15 rb2guitar3 guitar11 guitar28
+         kimberley_monroe u628 anth annai_renae)))