Fix: Maintain Superiority now only over Neutral structures

DCS-BR-Tools · Jan 27, 2025 · 50ecf07 · 50ecf07
1 parent 192bfa5
commit 50ecf07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Database/ObjectiveTasks/HoldSuperiority.ini b/Database/ObjectiveTasks/HoldSuperiority.ini
@@ -11,7 +11,8 @@ Remarks=
 
 [ObjectiveTask]
 CompletionTriggersLua=HoldSuperiority
-TargetSide=Ally
+TargetSide=Neutral
+ValidUnitCategories=Static
 
 
 [Include]

diff --git a/src/BriefingRoom/Generator/UnitMaker.cs b/src/BriefingRoom/Generator/UnitMaker.cs
@@ -76,7 +76,8 @@ internal static Tuple<List<string>, List<DBEntryJSONUnit>> GetUnits(
 
             if (side == Side.Neutral)
             {
-                (country, units) = GeneratorTools.GetNeutralRandomUnits(mission.LangKey, families, mission.CoalitionsDB.SelectMany(x => x.Countries).ToList(), mission.TemplateRecord.ContextDecade, unitCount, mission.TemplateRecord.Mods, mission.TemplateRecord.OptionsMission.Contains("AllowLowPoly"), mission.TemplateRecord.OptionsUnitBanList);
+                var ignoreCountries = mission.CoalitionsDB.SelectMany(x => x.Countries).Where(x => x != Country.ALL).ToList();
+                (country, units) = GeneratorTools.GetNeutralRandomUnits(mission.LangKey, families, ignoreCountries, mission.TemplateRecord.ContextDecade, unitCount, mission.TemplateRecord.Mods, mission.TemplateRecord.OptionsMission.Contains("AllowLowPoly"), mission.TemplateRecord.OptionsUnitBanList);
                 if (!units.Where(x => x != null).Any()) return new(new List<string>(), new List<DBEntryJSONUnit>());
             }
             else if (forceTryTemplate || families.All(x => TEMPLATE_ALWAYS_FAMILIES.Contains(x)) || (families.All(x => TEMPLATE_PREFERENCE_FAMILIES.Contains(x)) && Toolbox.RandomChance(3)))