Merge branch 'develop' into pr/458

CaptnCH · Nov 5, 2023 · 95466d5 · 95466d5
2 parents d7e9701 + 9b8b51f
commit 95466d5
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 55 deletions.
diff --git a/_ark/dx/overshell/dx_overshell_macros.dta b/_ark/dx/overshell/dx_overshell_macros.dta
@@ -521,7 +521,36 @@
    }
 )
 #define DX_PART_SELECT_AUTOPLAY
-({choose_part.lst set_data (overshell_vocal_solo overshell_vocal_harmony overshell_guitar overshell_bass overshell_drums overshell_drums_pro overshell_keys overshell_real_keys overshell_real_guitar overshell_real_bass overshell_real_guitar_22 overshell_real_bass_22)})
+(
+   {do
+      ($options
+         {array 0})
+      {unless 
+         {&& 
+            {== {ui current_screen} game_screen}
+            {||
+               {== {{$this get_user} get_controller_type} kControllerGuitar}
+               {== {{$this get_user} get_controller_type} kControllerDrum}
+               {== {{$this get_user} get_controller_type} kControllerKeys}
+               {== {{$this get_user} get_controller_type} kControllerRealGuitar}
+            }
+         }
+         {do
+            {push_back $options overshell_vocal_solo} {push_back $options overshell_vocal_harmony}
+         }
+      }
+      {unless {&& {== {ui current_screen} game_screen} {== {{$this get_user} get_controller_type} kControllerVocals}}
+         {do
+            {push_back $options overshell_guitar} {push_back $options overshell_bass}
+            {push_back $options overshell_drums} {push_back $options overshell_drums_pro}
+            {push_back $options overshell_keys} {push_back $options overshell_real_keys}
+            {push_back $options overshell_real_guitar} {push_back $options overshell_real_bass}
+            {push_back $options overshell_real_guitar_22} {push_back $options overshell_real_bass_22}
+         }
+      }
+      {choose_part.lst set_data $options}
+   }
+)
 #define DX_PART_SELECT_HANDLERS
 (
    {if_else {modifier_mgr is_modifier_active mod_auto_play}