From 8f3236ac85daba1eb25c79ae733eb0216e9ed94a Mon Sep 17 00:00:00 2001
From: Luna <37005649+lunalawl@users.noreply.github.com>
Date: Sun, 7 Jan 2024 12:59:19 -0800
Subject: [PATCH] never force vocal gender online

---
 _ark/config/modes.dta | 36 ++++++++++++++++++++++++------------
 _ark/ui/main/main.dta | 16 ----------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/_ark/config/modes.dta b/_ark/config/modes.dta
index 3ff33731..55e15795 100644
--- a/_ark/config/modes.dta
+++ b/_ark/config/modes.dta
@@ -26,10 +26,14 @@
    (show_prefab_chars TRUE)
    (allow_create_char TRUE)
    (force_player_vocal_gender
-      {if_else
-         {modifier_mgr is_modifier_active mod_vocalgender}
-		 FALSE
-		 TRUE})
+      {if_else $online_enabled
+         FALSE
+         {if_else {modifier_mgr is_modifier_active mod_vocalgender}
+            FALSE
+            TRUE
+         }
+      }
+   )
    (local_network TRUE)
    (ranked FALSE)
    (online_play_required FALSE)
@@ -349,10 +353,14 @@
    (main_mode_screen main_quickplay_screen)
    (allow_create_char FALSE)
    (force_player_vocal_gender
-      {if_else
-         {modifier_mgr is_modifier_active mod_vocalgender}
-		 FALSE
-		 TRUE})
+      {if_else $online_enabled
+         FALSE
+         {if_else {modifier_mgr is_modifier_active mod_vocalgender}
+            FALSE
+            TRUE
+         }
+      }
+   )
    (max_players 1)
    (max_local_players 1)
    (player_arrangement kArrangeBand)
@@ -716,10 +724,14 @@
    (enable_streak FALSE)
    (enable_star_power FALSE)
    (force_player_vocal_gender
-      {if_else
-         {modifier_mgr is_modifier_active mod_vocalgender}
-		 FALSE
-		 TRUE})
+      {if_else $online_enabled
+         FALSE
+         {if_else {modifier_mgr is_modifier_active mod_vocalgender}
+            FALSE
+            TRUE
+         }
+      }
+   )
    (allow_overdrive_phrases FALSE)
    (endgame_screen
       {if_else
diff --git a/_ark/ui/main/main.dta b/_ark/ui/main/main.dta
index a4ee9bea..99abedac 100644
--- a/_ark/ui/main/main.dta
+++ b/_ark/ui/main/main.dta
@@ -411,11 +411,6 @@
    (back main_quickplay_screen)
    MAIN_SCREEN_H2H_HANDLERS
    (SELECT_MSG
-      {switch $component
-         (player_match_scoreduel.btn
-            {modifier_mgr activate_modifier mod_vocalgender})
-         (ranked_match_scoreduel.btn
-            {modifier_mgr activate_modifier mod_vocalgender})}
       {gamemode
          set_mode
          {switch
@@ -453,11 +448,6 @@
    (back main_quickplay_screen)
    MAIN_SCREEN_H2H_HANDLERS
    (SELECT_MSG
-      {switch $component
-         (player_match_tow.btn
-            {modifier_mgr activate_modifier mod_vocalgender})
-         (ranked_match_tow.btn
-            {modifier_mgr activate_modifier mod_vocalgender})}
       {gamemode
          set_mode
          {switch
@@ -522,9 +512,6 @@
          {profile_mgr get_all_unlocked}
          {online.btn set_state kComponentDisabled}})
    (SELECT_MSG
-      {switch $component
-         (online_bandcoop.btn
-            {modifier_mgr activate_modifier mod_vocalgender})}
       {gamemode
          set_mode
          {switch
@@ -555,9 +542,6 @@
    main_worldtour_panel
    MAIN_SUBSCREEN_PANEL_HANDLER
    (SELECT_MSG
-      {switch $component
-         (online.btn
-            {modifier_mgr activate_modifier mod_vocalgender})}
       {if_else
          {'||'
             {!= $component online.btn}