release 1.1.0-beta9 (fuck you jnack)

carlmylo · Jun 6, 2024 · a75e187 · a75e187
2 parents 95908c2 + 836f76f
commit a75e187
Show file tree

Hide file tree

Showing 153 changed files with 2,227 additions and 1,170 deletions.
diff --git a/_ark/config/beatmatcher.dta b/_ark/config/beatmatcher.dta
@@ -28,6 +28,16 @@
          {stagekit_left_right kStageSweepLeft_medium kStageSweepRight_medium}}
       #endif)
    (beat
+      {if {modifier_mgr is_modifier_active mod_auto_play}
+         {beatmatch foreach_active_player $player
+            {if {== {$player instrument} vocals}
+               {{{{{get_track_panel} find vocals} find vocals_mics} find arrow_1.mesh} set_showing FALSE}
+               {{{{{get_track_panel} find vocals} find vocals_mics} find arrow_2.mesh} set_showing FALSE}
+               {{{{{get_track_panel} find vocals} find vocals_mics} find arrow_3.mesh} set_showing FALSE}
+               {{{{{get_track_panel} find vocals} find vocals_mics} find label.lbl} set_showing FALSE}
+            }
+         }
+      }
       #ifdef HX_WII
       {unless
          $stagekit

diff --git a/_ark/config/macros.dta b/_ark/config/macros.dta
@@ -787,6 +787,8 @@
 #define dxState_MiloMesh (69101)
 #define dxState_MiloAO (69102)
 #define kState_ConfirmPlayaShowExit (69103)
+#define dxState_RebootThemeWarn (69104)
+#define kState_ReadyToPlayaShowWait (69105)
 #define kOverrideFlow_None
 (0)
 #define kOverrideFlow_SongSettings

diff --git a/_ark/config/midi_parsers.dta b/_ark/config/midi_parsers.dta
@@ -2557,7 +2557,7 @@
                                     (directed_guitar_cam
                                        {random_elem
                                           (directed_guitar_cam_pr directed_guitar_cam_pt)})
-                                    (directed_vocal_cam
+                                    ((directed_vocals_cam directed_vocal_cam)
                                        {random_elem
                                           (directed_vocals_cam_pr directed_vocals_cam_pt)})
                                     (directed_crowd_b
@@ -2667,4 +2667,4 @@
 (finish_loading
    {if
       $banddirector
-      {$banddirector midi_harvest_dircuts}})
+      {$banddirector midi_harvest_dircuts}})
diff --git a/_ark/config/modifiers.dta b/_ark/config/modifiers.dta
@@ -3,10 +3,10 @@
    (mod_no_fail_band custom_location save_value use_save_value) ;vanilla
    (mod_auto_vocals custom_location) ;vanilla
    (mod_drum_surface_navigation default_enabled save_value use_save_value) ;vanilla
-   (mod_drum_fills default_enabled save_value delayed_effect use_save_value) ;vanilla
+   (mod_drum_fills save_value delayed_effect use_save_value) ;vanilla, dx diasbles by default
    (mod_static_fills) ; no drum fills allowed, auto activate drum player
-   (mod_doublespeed save_value use_save_value) ;vanilla - dx added use_save_value
-   (mod_independent_track_speeds save_value use_save_value) ; vanilla
+   (mod_doublespeed save_value use_save_value custom_location) ;vanilla - dx added use_save_value (and removes it lol)
+   (mod_independent_track_speeds default_enabled save_value use_save_value) ; vanilla, dx enables by default
    (mod_synced_track_speeds) ; use the same track speed for all difficulties
    (enable_popup_help default_enabled save_value use_save_value) ; vanilla
    (mod_chord_numbers) ; vanilla

diff --git a/_ark/config/scoring.dta b/_ark/config/scoring.dta
@@ -232,9 +232,9 @@
          (range 0.4 0.9)
          (free_ride 0.4)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -243,9 +243,9 @@
          (range 0.25 0.9)
          (free_ride 0.4)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -254,9 +254,9 @@
          (range 0.2 0.75)
          (free_ride 0.4)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.1)
          (initial_display_level 0.8333))
@@ -265,9 +265,9 @@
          (range 5.0e-2 0.8)
          (free_ride 0.4)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -276,9 +276,9 @@
          (range 5.0e-2 0.8)
          (free_ride 0.4)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -287,9 +287,9 @@
          (range 0.4 0.85)
          (free_ride 0.4)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333)))
@@ -299,9 +299,9 @@
          (range 0.6 0.9)
          (free_ride 0.1)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -310,9 +310,9 @@
          (range 0.6 0.95)
          (free_ride 0.1)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -321,9 +321,9 @@
          (range 0.3 0.75)
          (free_ride 0.1)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.1)
          (initial_display_level 0.8333))
@@ -332,9 +332,9 @@
          (range 0.3 0.8)
          (free_ride 0.1)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -343,9 +343,9 @@
          (range 0.3 0.8)
          (free_ride 0.1)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -354,9 +354,9 @@
          (range 0.4 0.85)
          (free_ride 0.1)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333)))
@@ -366,9 +366,9 @@
          (range 0.65 0.9)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -377,9 +377,9 @@
          (range 0.7 0.95)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -388,9 +388,9 @@
          (range 0.35 0.75)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.1)
          (initial_display_level 0.8333))
@@ -399,9 +399,9 @@
          (range 0.45 0.8)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -410,9 +410,9 @@
          (range 0.45 0.8)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -421,9 +421,9 @@
          (range 0.45 0.85)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333)))
@@ -433,9 +433,9 @@
          (range 0.65 0.9)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -444,9 +444,9 @@
          (range 0.75 0.95)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -455,9 +455,9 @@
          (range 0.4 0.75)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.13)
          (initial_display_level 0.8333))
@@ -466,9 +466,9 @@
          (range 0.45 0.8)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -477,9 +477,9 @@
          (range 0.45 0.8)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333))
@@ -488,9 +488,9 @@
          (range 0.45 0.85)
          (free_ride 0.0)
          (great_level 0.95)
-         (okay_level 0.66)
-         (bad_level 0.33)
-         (warning_level 0.15)
+         (okay_level {if_else $dx_fail_flash 0.66 0})
+         (bad_level {if_else $dx_fail_flash 0.33 -1})
+         (warning_level {if_else $dx_fail_flash 0.15 -1})
          (lose_level 1.0e-2)
          (phrase_weight 0.2)
          (initial_display_level 0.8333)))

diff --git a/_ark/config/synth.dta b/_ark/config/synth.dta
@@ -75,8 +75,10 @@
       ({do {dx_store_meta_info "lightupthenight" "Light Up the Night" "The Protomen" "none"} rb4_shellmusic_multi_lightupthenight} 0.0)
       ({do {dx_store_meta_info "o335947165_rudeboys_dutchr" "RudeBoys" "Dutch ReBelle" "disrespect"} rb4_shellmusic_multi_rudeboys} 0.0)
       ({do {dx_store_meta_info "welcometoparadise" "Welcome to Paradise" "Green Day" "hear me whining"} gdrb_shellmusic_multi_welcometoparadise} 0.0)
-      ({do {dx_store_meta_info "psychobillyfreakoutrhh" "Psychobilly Freakout" "The Reverend Horton Heat" "none"} gh2dx_shellmusic_multi_psychobilly} 0.0) ; https://rhythmverse.co/songfile/2fe493405a61498285749b5e751bb107
+      ({do {dx_store_meta_info "PsychobillyFreakoutRHH_rb" "Psychobilly Freakout" "Reverend Horton Heat" "none"} gh2dx_shellmusic_multi_psychobilly} 0.0) ; https://rhythmverse.co/songfile/2fe493405a61498285749b5e751bb107
       ({do {dx_store_meta_info "IWANNATAKEYOUFORARIDE_rb3" "I Wanna Take You for a Ride" "Marvel vs. Capcom 2: New Age of Heroes" "insert coin"} sekrit} 0.0) ; https://rhythmverse.co/songfile/e1caa4dff20a47b8b0fbd559c1785afa
+      ({do {dx_store_meta_info "panicattack" "Panic Attack" "Dream Theater" "to feel like you're in danger"} rb3dx_shellmusic_multi_panicattack} 0.0)
+      ({do {dx_store_meta_info "igetby" "I Get By" "Honest Bob and The Factory-to-Dealer Incentives" "wait on another bright idea"} rb1_shellmusic_multi_igetby} 0.0)
    )
    (scenes
       #include metamusic_scenes.dta)