hide "no mic connected" warning optional addition

also move overridden vanilla states into their own dta file
hmxmilohax · May 19, 2024 · 15b2e43 · 15b2e43
1 parent 6f07fb0
commit 15b2e43
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 97 deletions.
diff --git a/_ark/ps4/dx/macros/dx_overshell_macros.dta b/_ark/ps4/dx/macros/dx_overshell_macros.dta
@@ -4,6 +4,7 @@
 	{set $songtitle {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/song_artist_overlay.entity_ps4"}}
 	{set $noshine {file_exists "data:/GoldHEN/RB4DX/ps4/track/shared/fx_noise_b_util.bmp_ps4"}}
 	{set $noflames {file_exists "data:/GoldHEN/RB4DX/ps4/track/smasher/gem_smasher_unlit.entity_ps4"}}
+	{set $noui {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/hud.scene_ps4"}}
 )
 #define DELETE_NOFLAMES_FILES
 (

diff --git a/_ark/ps4/dx/overshell/dx_state_overrides.dta b/_ark/ps4/dx/overshell/dx_state_overrides.dta
@@ -0,0 +1,95 @@
+(kState_ChooseDiff 
+   (view list_medium) 
+   (song_settings_flow TRUE) 
+   (shows_extended_mic_arrows TRUE) 
+   (enter 
+      {$this clear_somp_difficulty } 
+      {$this setup_difficulty_list $this } 
+      {if 
+         {== 
+            {
+               {$this get_user }get_track_type }kTrackVocals }
+         {local $ui_list 
+            {$this get_ui_list }}
+         {local $list_data 
+            {$ui_list get_data_in_column token }}
+         {switch $list_data 
+            (overshell_easy 
+               {$this update_vocal_freestyle_icon kDifficultyEasy })
+            (overshell_medium 
+               {$this update_vocal_freestyle_icon kDifficultyMedium })
+            (overshell_hard 
+               {$this update_vocal_freestyle_icon kDifficultyHard })
+            (overshell_expert 
+               {$this update_vocal_freestyle_icon kDifficultyExpert })
+            (overshell_brutal 
+               {$this update_vocal_freestyle_icon kDifficultyExpert })}}) 
+   (SELECT_MSG 
+      {local $list_data 
+         {
+            ($objId UIListCom)get_data_in_column token }} 
+         {switch $list_data 
+            (overshell_easy 
+               {$this select_difficulty kDifficultyEasy })
+            (overshell_medium 
+               {$this select_difficulty kDifficultyMedium })
+            (overshell_hard 
+               {$this select_difficulty kDifficultyHard })
+            (overshell_expert 
+               {$this select_difficulty kDifficultyExpert })
+            (overshell_brutal 
+               {$this select_difficulty kDifficultyExpert })
+            (overshell_guitar_solo 
+               {$this select_difficulty kDifficultyEasy })} 
+      {$this trigger_select_effects }
+      {write_file "data:/GoldHEN/RB4DX/insong.dta" $dx_write_nul}
+      ) 
+   (list_focus 
+      ($obj_name $obj_id) 
+      {if 
+         {== 
+            {
+               {$this get_user }get_track_type }kTrackVocals }
+         {local $ui_list 
+            {$this get_ui_list }}
+         {local $list_data 
+            {$ui_list get_data_in_column token }}
+         {switch $list_data 
+            (overshell_easy 
+               {$this update_vocal_freestyle_icon kDifficultyEasy })
+            (overshell_medium 
+               {$this update_vocal_freestyle_icon kDifficultyMedium })
+            (overshell_hard 
+               {$this update_vocal_freestyle_icon kDifficultyHard })
+            (overshell_expert 
+               {$this update_vocal_freestyle_icon kDifficultyExpert })
+            (overshell_brutal 
+               {$this update_vocal_freestyle_icon kDifficultyExpert })}}) 
+   (on_cancel 
+      {$this leave_choose_difficulty }))
+
+(kState_QuitEarlyConfirm 
+   (view confirm_action) 
+   (enter 
+      {$this setup_confirm_actions confirm_quit 
+         (overshell_confirm_yes overshell_confirm_no)overshell_confirm_no }) 
+   (SELECT_MSG 
+      {local $list_data 
+         {
+            ($objId UIListCom)get_data_in_column token }} 
+      {switch $list_data 
+         (overshell_confirm_yes 
+            {file_delete "data:/GoldHEN/RB4DX/insong.dta"}
+            {$this quit_early })
+         (overshell_confirm_no 
+            {if_else 
+               {$this in_venue_meta_mode }
+               {$this show_state kState_VenueMetaMenu }
+               {$this show_in_song_menu }})} 
+      {$this trigger_select_effects }) 
+   (on_cancel 
+      {if_else 
+         {$this in_venue_meta_mode }
+         {$this show_state kState_VenueMetaMenu }
+         {$this show_in_song_menu }} 
+      {$this trigger_cancel_effects }))
diff --git a/_ark/ps4/dx/overshell/dx_states.dta b/_ark/ps4/dx/overshell/dx_states.dta
@@ -1,98 +1,4 @@
-(kState_ChooseDiff 
-   (view list_medium) 
-   (song_settings_flow TRUE) 
-   (shows_extended_mic_arrows TRUE) 
-   (enter 
-      {$this clear_somp_difficulty } 
-      {$this setup_difficulty_list $this } 
-      {if 
-         {== 
-            {
-               {$this get_user }get_track_type }kTrackVocals }
-         {local $ui_list 
-            {$this get_ui_list }}
-         {local $list_data 
-            {$ui_list get_data_in_column token }}
-         {switch $list_data 
-            (overshell_easy 
-               {$this update_vocal_freestyle_icon kDifficultyEasy })
-            (overshell_medium 
-               {$this update_vocal_freestyle_icon kDifficultyMedium })
-            (overshell_hard 
-               {$this update_vocal_freestyle_icon kDifficultyHard })
-            (overshell_expert 
-               {$this update_vocal_freestyle_icon kDifficultyExpert })
-            (overshell_brutal 
-               {$this update_vocal_freestyle_icon kDifficultyExpert })}}) 
-   (SELECT_MSG 
-      {local $list_data 
-         {
-            ($objId UIListCom)get_data_in_column token }} 
-         {switch $list_data 
-            (overshell_easy 
-               {$this select_difficulty kDifficultyEasy })
-            (overshell_medium 
-               {$this select_difficulty kDifficultyMedium })
-            (overshell_hard 
-               {$this select_difficulty kDifficultyHard })
-            (overshell_expert 
-               {$this select_difficulty kDifficultyExpert })
-            (overshell_brutal 
-               {$this select_difficulty kDifficultyExpert })
-            (overshell_guitar_solo 
-               {$this select_difficulty kDifficultyEasy })} 
-      {$this trigger_select_effects }
-      {write_file "data:/GoldHEN/RB4DX/insong.dta" $dx_write_nul}
-      ) 
-   (list_focus 
-      ($obj_name $obj_id) 
-      {if 
-         {== 
-            {
-               {$this get_user }get_track_type }kTrackVocals }
-         {local $ui_list 
-            {$this get_ui_list }}
-         {local $list_data 
-            {$ui_list get_data_in_column token }}
-         {switch $list_data 
-            (overshell_easy 
-               {$this update_vocal_freestyle_icon kDifficultyEasy })
-            (overshell_medium 
-               {$this update_vocal_freestyle_icon kDifficultyMedium })
-            (overshell_hard 
-               {$this update_vocal_freestyle_icon kDifficultyHard })
-            (overshell_expert 
-               {$this update_vocal_freestyle_icon kDifficultyExpert })
-            (overshell_brutal 
-               {$this update_vocal_freestyle_icon kDifficultyExpert })}}) 
-   (on_cancel 
-      {$this leave_choose_difficulty }))
-
-(kState_QuitEarlyConfirm 
-   (view confirm_action) 
-   (enter 
-      {$this setup_confirm_actions confirm_quit 
-         (overshell_confirm_yes overshell_confirm_no)overshell_confirm_no }) 
-   (SELECT_MSG 
-      {local $list_data 
-         {
-            ($objId UIListCom)get_data_in_column token }} 
-      {switch $list_data 
-         (overshell_confirm_yes 
-            {file_delete "data:/GoldHEN/RB4DX/insong.dta"}
-            {$this quit_early })
-         (overshell_confirm_no 
-            {if_else 
-               {$this in_venue_meta_mode }
-               {$this show_state kState_VenueMetaMenu }
-               {$this show_in_song_menu }})} 
-      {$this trigger_select_effects }) 
-   (on_cancel 
-      {if_else 
-         {$this in_venue_meta_mode }
-         {$this show_state kState_VenueMetaMenu }
-         {$this show_in_song_menu }} 
-      {$this trigger_cancel_effects }))
+#include dx_state_overrides.dta
 
 #define RB4DXMAIN_DATA
 (
@@ -164,6 +70,7 @@
       {$this trigger_cancel_effects }
    )
 )
+
 (kState_RB4DXSongSpeed
    (view confirm_action) 
    (enter 
@@ -194,6 +101,7 @@
       {$this show_state kState_RB4DXMain}
       {$this trigger_cancel_effects })
 )
+
 #define RB4DXGP_DATA
 (
    {$this setup_confirm_actions a 
@@ -338,6 +246,7 @@
       {$this trigger_cancel_effects }
    )
 )
+
 #define RB4DXVIS_DATA
 (
    {$this setup_confirm_actions a 
@@ -352,6 +261,8 @@
 (kState_RB4DXVisSettings
    (view {$this get_auto_list_view }) 
    (enter
+      {set $crowdmeter {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/crowd_meter.entity_ps4"}}
+      {set $noui {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/hud.scene_ps4"}}
       {set $dx_cur_state vis}
       RB4DXVIS_DATA
    ) 
@@ -416,6 +327,7 @@
       {$this trigger_cancel_effects }
    )
 )
+
 (kState_RB4DXOptionalAdditions
    (view {$this get_auto_list_view }) 
    (enter
@@ -427,6 +339,7 @@
             {if_else $songtitle "Song Title Always: ON" "Song Title Always: OFF"}
             {if_else $noshine "No Shine: ON" "No Shine: OFF"}
             {if_else $noflames "No Flames: ON" "No Flames: OFF"}
+            {if_else $noui "Hide Mic Warning: ON" "Hide Mic Warning: OFF"}
          )
       }
    ) 
@@ -475,6 +388,16 @@
             }
             {$this trigger_select_effects}
          )
+         (("Hide Mic Warning: ON" "Hide Mic Warning: OFF")
+            {if_else $noui
+               {do
+                  {set $optionaladd noui}
+                  {$this show_state kState_RB4DXOptionalAddWarn}
+               }
+               {$this show_state kState_RB4DXOptionalAddHowTo}
+            }
+            {$this trigger_select_effects}
+         )
       }
    ) 
    (on_cancel 
@@ -483,5 +406,6 @@
       {$this trigger_cancel_effects}
    )
 )
+
 #include dx_warn_states.dta
 #include dx_controller_states.dta
diff --git a/_ark/ps4/dx/overshell/dx_warn_states.dta b/_ark/ps4/dx/overshell/dx_warn_states.dta
@@ -92,6 +92,9 @@
                (noflames
                   DELETE_NOFLAMES_FILES
                )
+               (noui
+                  {file_delete "data:/GoldHEN/RB4DX/ps4/ui/game/hud.scene_ps4"}
+               )
             }
             {if_else {== $optionaladd calibrationmode}
                {$this show_state kState_RB4DXDelayedEffectWarn}

diff --git a/_ark/ps4/dx/ui/dx_init.dta b/_ark/ps4/dx/ui/dx_init.dta
@@ -5,14 +5,15 @@
 {if {file_exists "data:/GoldHEN/RB4DX/ps4/config/include/beatmatcher.dta_dta_ps4"}
 	{file_delete "data:/GoldHEN/RB4DX/ps4/config/include/beatmatcher.dta_dta_ps4"}
 }
+{if {file_exists "data:/GoldHEN/RB4DX/insong.dta"}
+	{file_delete "data:/GoldHEN/RB4DX/insong.dta"}
+}
 {set $nood {file_exists "nood.dta"}}
 {set $practiceod {file_exists "practiceod.dta"}}
 {set $blackbg {file_exists "blackbg.dta"}}
 {set $60fpsbg {file_exists "60fpsbg.dta"}}
 {set $nomiss {file_exists "nomiss.dta"}}
 {set $nowhammyfx {file_exists "nowhammyfx.dta"}}
-{set $crowdmeter {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/crowd_meter.entity_ps4"}}
-{set $noui {file_exists "data:/GoldHEN/RB4DX/ps4/ui/game/hud.scene_ps4"}}
 {set $trackmuting
 	{cond
 		({file_exists "trackmutingoff.dta"}

diff --git a/_build/dx_optional_additions/Hide No Mic Connected Warning/ps4/ui/game/hud.scene_ps4 b/_build/dx_optional_additions/Hide No Mic Connected Warning/ps4/ui/game/hud.scene_ps4