*fix for eliminated factions

Author: Morphyum

WarTech/WarTech/Helper.cs

@@ -1,6 +1,7 @@
 using BattleTech;
 using BattleTech.Data;
 using BattleTech.Framework;
+using Harmony;
 using HBS.Collections;
 using Newtonsoft.Json;
 using System;
@@ -396,20 +397,22 @@ public static StarSystem ChangeOwner(StarSystem system, FactionControl control,
                     Faction newOwner = control.faction;
                     if (!lostWar) {
                         War war = getWar(newOwner);
-                        if (war.attackers.ContainsKey(newOwner)) {
-                            if (war.attackers[newOwner].takenPlanets.ContainsKey(system.Name)) {
-                                war.attackers[newOwner].takenPlanets[system.Name] = system.Owner;
-                            }
-                            else {
-                                war.attackers[newOwner].takenPlanets.Add(system.Name, system.Owner);
-                            }
-                        }
-                        else {
-                            if (war.defenders[newOwner].takenPlanets.ContainsKey(system.Name)) {
-                                war.defenders[newOwner].takenPlanets[system.Name] = system.Owner;
+                        if (war != null) {
+                            if (war.attackers.ContainsKey(newOwner)) {
+                                if (war.attackers[newOwner].takenPlanets.ContainsKey(system.Name)) {
+                                    war.attackers[newOwner].takenPlanets[system.Name] = system.Owner;
+                                }
+                                else {
+                                    war.attackers[newOwner].takenPlanets.Add(system.Name, system.Owner);
+                                }
                             }
                             else {
-                                war.defenders[newOwner].takenPlanets.Add(system.Name, system.Owner);
+                                if (war.defenders[newOwner].takenPlanets.ContainsKey(system.Name)) {
+                                    war.defenders[newOwner].takenPlanets[system.Name] = system.Owner;
+                                }
+                                else {
+                                    war.defenders[newOwner].takenPlanets.Add(system.Name, system.Owner);
+                                }
                             }
                         }
                     }
@@ -605,6 +608,63 @@ public static List<Faction> GetTargets(StarSystem system, SimGameState Sim) {
             }
         }
 
+        public static List<Faction> GetFactionsByString(List<string> names) {
+            try {
+                List<Faction> factions = new List<Faction>();
+                foreach (string name in names) {
+                    switch (name) {
+                        case "AuriganRestoration":
+                            factions.Add(Faction.AuriganRestoration);
+                            break;
+                        case "Betrayers":
+                            factions.Add(Faction.Betrayers);
+                            break;
+                        case "AuriganDirectorate":
+                            factions.Add(Faction.AuriganDirectorate); break;
+                        case "AuriganMercenaries":
+                            factions.Add(Faction.AuriganMercenaries); break;
+                        case "AuriganPirates":
+                            factions.Add(Faction.AuriganPirates); break;
+                        case "ComStar":
+                            factions.Add(Faction.ComStar); break;
+                        case "Davion":
+                            factions.Add(Faction.Davion); break;
+                        case "Kurita":
+                            factions.Add(Faction.Kurita); break;
+                        case "Liao":
+                            factions.Add(Faction.Liao); break;
+                        case "Locals":
+                            factions.Add(Faction.Locals); break;
+                        case "MagistracyCentrella":
+                            factions.Add(Faction.MagistracyCentrella); break;
+                        case "MagistracyOfCanopus":
+                            factions.Add(Faction.MagistracyOfCanopus); break;
+                        case "MajestyMetals":
+                            factions.Add(Faction.MajestyMetals); break;
+                        case "Marik":
+                            factions.Add(Faction.Marik); break;
+                        case "MercenaryReviewBoard":
+                            factions.Add(Faction.MercenaryReviewBoard); break;
+                        case "Nautilus":
+                            factions.Add(Faction.Nautilus); break;
+                        case "Steiner":
+                            factions.Add(Faction.Steiner); break;
+                        case "TaurianConcordat":
+                            factions.Add(Faction.TaurianConcordat); break;
+                        case "NoFaction":
+                            factions.Add(Faction.NoFaction); break;
+                        default:
+                            break;
+                    }
+                }
+                return factions;
+            }
+            catch (Exception ex) {
+                Logger.LogError(ex);
+                return null;
+            }
+        }
+
         public static string GetFactionTag(Faction faction) {
             try {
                 switch (faction) {

WarTech/WarTech/Patch.cs

@@ -204,7 +204,7 @@ static void Postfix(SimGameState simGame) {
                         }
                     }
                     StarSystem system2 = simGame.StarSystems.Find(x => x.Name.Equals(system.Name));
-                    system2 = Helper.ChangeOwner(system, factionControl, simGame, battle, false);
+                    system2 = Helper.ChangeOwner(system2, factionControl, simGame, battle, false);
                     system2 = Helper.ChangeWarDescription(system2, simGame);
                 }
 
@@ -288,6 +288,10 @@ static void Prefix(SimGameState __instance, int timeLapse) {
                         if (Fields.neighbourFactions.ContainsKey(pair.Key)) {
                             fac = Fields.neighbourFactions[pair.Key];
                         }
+                        List<Faction> list = Helper.GetFactionsByString(Fields.settings.excludedFactionNames);
+                        if (fac != null && list != null && list.Count > 0) {
+                            fac = fac.Except(list).ToList();
+                        }
                         if (!Helper.IsAtWar(pair.Key) && !Helper.IsExcluded(pair.Key) && fac != null && fac.Count > 0) {
                             if (rand.Next(0, 101) > Fields.WarFatique[pair.Key]) {
                                 Faction enemy;