Patch OneFactionAlreadyEliminated in HQlessHumansLose

- Switches to GetHasAnyCritical() method to determine if Human and Alien factions have any critical units/structures remaining
data-bomb · May 21, 2024 · dd0a35b · dd0a35b
1 parent df62536
commit dd0a35b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Si_HQlessHumansLose/Si_HQlessHumansLose.cs b/Si_HQlessHumansLose/Si_HQlessHumansLose.cs
@@ -33,7 +33,7 @@ You should have received a copy of the GNU General Public License
 using System;
 using SilicaAdminMod;
 
-[assembly: MelonInfo(typeof(HQlessHumansLose), "HQless Humans Lose", "1.3.4", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(HQlessHumansLose), "HQless Humans Lose", "1.3.5", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
@@ -71,18 +71,22 @@ static String GetRootStructureFullName(Team team)
 
         public static bool OneFactionAlreadyEliminated()
         {
-            int TeamsWithMajorStructures = 0;
+            int TeamsWithCriticalObjects = 0;
             for (int i = 0; i < SiConstants.MaxPlayableTeams; i++)
             {
                 Team? thisTeam = Team.Teams[i];
-                int thisTeamMajorStructures = thisTeam.NumMajorStructures;
-                if (thisTeamMajorStructures > 0)
+                if (thisTeam == null)
                 {
-                    TeamsWithMajorStructures++;
+                    continue;
+                }
+
+                if (thisTeam.GetHasAnyCritical())
+                {
+                    TeamsWithCriticalObjects++;
                 }
             }
 
-            if (TeamsWithMajorStructures < 2)
+            if (TeamsWithCriticalObjects < 2)
             {
                 MelonLogger.Msg("OneFactionAlreadyEliminated: true");
                 return true;