From 19a6eaeaa331685ecde860b4836357c8a7ccc708 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sat, 17 Jun 2023 21:50:00 +0200 Subject: [PATCH] Yesterday's fix was bogus... --- game/factions/faction.py | 14 +++++++++++--- qt_ui/windows/newgame/QNewGameWizard.py | 2 -- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/game/factions/faction.py b/game/factions/faction.py index 52a1b02f..377d5a1b 100644 --- a/game/factions/faction.py +++ b/game/factions/faction.py @@ -441,6 +441,7 @@ class Faction: self.remove_vehicle("IRON_DOME_CP") self.remove_vehicle("IRON_DOME_LN") self.remove_vehicle("ELM2048_MMR") + self.remove_preset("Iron Dome") # swedish military assets pack if not mod_settings.swedishmilitaryassetspack: self.remove_vehicle("BV410_RBS70") @@ -528,9 +529,16 @@ class Faction: self.preset_groups.remove(pg) def remove_vehicle(self, name: str) -> None: - for i in self.frontline_units: - if i.dcs_unit_type.id == name: - self.frontline_units.remove(i) + for sequence in [ + self.frontline_units, + self.infantry_units, + self.air_defense_units, + self.artillery_units, + self.logistics_units, + ]: + for i in sequence: + if i.dcs_unit_type.id == name: + sequence.remove(i) def remove_ship(self, name: str) -> None: for i in self.naval_units: diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 06b4e648..1f5d1ba8 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -114,9 +114,7 @@ class NewGameWizard(QtWidgets.QWizard): ) blue_faction = self.faction_selection_page.selected_blue_faction - blue_faction.apply_mod_settings(mod_settings) red_faction = self.faction_selection_page.selected_red_faction - red_faction.apply_mod_settings(mod_settings) logging.info("New campaign blue faction: %s", blue_faction.name) logging.info("New campaign red faction: %s", red_faction.name)