weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Yesterday's fix was bogus...

Browse Source
This commit is contained in:
Raffson 2023-06-17 21:50:00 +02:00
parent 5818367f2e
commit 19a6eaeaa3
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
game/factions/faction.py
View File

@ -441,6 +441,7 @@ class Faction:
self.remove_vehicle("IRON_DOME_CP") self.remove_vehicle("IRON_DOME_CP")
self.remove_vehicle("IRON_DOME_LN") self.remove_vehicle("IRON_DOME_LN")
self.remove_vehicle("ELM2048_MMR") self.remove_vehicle("ELM2048_MMR")
self.remove_preset("Iron Dome")
# swedish military assets pack # swedish military assets pack
if not mod_settings.swedishmilitaryassetspack: if not mod_settings.swedishmilitaryassetspack:
self.remove_vehicle("BV410_RBS70") self.remove_vehicle("BV410_RBS70")
@ -528,9 +529,16 @@ class Faction:
self.preset_groups.remove(pg) self.preset_groups.remove(pg)
def remove_vehicle(self, name: str) -> None: def remove_vehicle(self, name: str) -> None:
for i in self.frontline_units: for sequence in [
if i.dcs_unit_type.id == name: self.frontline_units,
self.frontline_units.remove(i) 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: def remove_ship(self, name: str) -> None:
for i in self.naval_units: for i in self.naval_units:

2
qt_ui/windows/newgame/QNewGameWizard.py
View File

@ -114,9 +114,7 @@ class NewGameWizard(QtWidgets.QWizard):
) )
blue_faction = self.faction_selection_page.selected_blue_faction 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 = 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 blue faction: %s", blue_faction.name)
logging.info("New campaign red faction: %s", red_faction.name) logging.info("New campaign red faction: %s", red_faction.name)