Fix

SpexGH · Jun 1, 2024 · c558eb5 · c558eb5
1 parent 0aa61c2
commit c558eb5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/TheOtherRoles/CustomOptionHolder.cs b/TheOtherRoles/CustomOptionHolder.cs
@@ -641,8 +641,9 @@ public static void Load()
         randomGameStartPosition = CustomOption.Create(50, Types.General, "Random Spawn Location", false, null, true);
         randomGameStartToVents = CustomOption.Create(51, Types.General, "Random Spawn To Vents", false, randomGameStartPosition);
         ShowVentsOnMap = CustomOption.Create(65, Types.General, "Show Vents On Map", false, null, true);
-        ShowVentsOnMeetingMap = CustomOption.Create(66, Types.General, "Show Vents On Map", false, null, true);
-        enableBetterPolus = CustomOption.Create(60, Types.General, "Enable Better Polus", false);
+        ShowVentsOnMeetingMap = CustomOption.Create(66, Types.General, "Only show position of vents\n  during the meeting", true, ShowVentsOnMap);
+
+        enableBetterPolus = CustomOption.Create(60, Types.General, "Enable Better Polus", false, null, true);
         movePolusVents = CustomOption.Create(61, Types.General, "Adjust Vents", false, enableBetterPolus, false);
         movePolusVitals = CustomOption.Create(62, Types.General, "Move Vitals To Labs", false, enableBetterPolus, false);
         swapNavWifi = CustomOption.Create(63, Types.General, "Swap Reboot And Chart Course", false, enableBetterPolus, false);

diff --git a/TheOtherRoles/Patches/MapBehaviourPatch.cs b/TheOtherRoles/Patches/MapBehaviourPatch.cs
@@ -98,6 +98,7 @@ static void Postfix(MapBehaviour __instance)
 
             foreach (var vent in MapUtilities.CachedShipStatus.AllVents)
             {
+                if (TORMapOptions.ShowVentsOnMeetingMap && MeetingHud.Instance == null) return;
                 if (vent.name.StartsWith("JackInThe") && !(PlayerControl.LocalPlayer == Trickster.trickster || PlayerControl.LocalPlayer.Data.IsDead)) continue; //for trickster vents
 
                 if (!TORMapOptions.ShowVentsOnMap)

diff --git a/TheOtherRoles/Patches/RoleAssignmentPatch.cs b/TheOtherRoles/Patches/RoleAssignmentPatch.cs
@@ -105,6 +105,8 @@ public static RoleAssignmentData getRoleAssignmentData()
             {
                 crewmateMax = crewmates.Count - neutralMin;
                 crewmateMin = crewmates.Count - neutralMax;
+                crewmateMin += neutralMax;
+                crewmateMax += neutralMax;
             }
 
             // Get the maximum allowed count of each role type based on the minimum and maximum option