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

Improvements to disabled aircraft mod handling in Faction (#234)

Browse Source
This commit is contained in:
MetalStormGhost 2023-12-30 19:13:38 +02:00 committed by GitHub
parent 7e0125725c
commit 5ca12373d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -34,6 +34,7 @@
## Fixes
* **[Mission Generation]** Anti-ship strikes should use "group attack" in their attack-task
* **[New Game Wizard]** Faction selection overview doesn't update when inverting map
* **[New Game Wizard]** Aircraft mods are now handled better when they are disabled
* **[Payloads]** Added/Updated (missing) payloads
* **[Aircraft Tasking]** Revised aircraft tasking, filtering out incompatible tasks for several aircraft
* **[Data]** Corrected the class of the USS Samuel Chase from Logistics to LandingShip, in order to prevent it being spawned as part of AAA sites.

14
game/factions/faction.py
View File

@ -541,14 +541,16 @@ class Faction:
self.remove_ship("Destroyer_carrier")
def remove_aircraft(self, name: str) -> None:
for i in list(self.all_aircrafts):
if i.dcs_unit_type.id == name:
self.all_aircrafts.remove(i)
for aircraft_set in [self.aircraft, self.awacs, self.tankers]:
for i in list(aircraft_set):
if i.dcs_unit_type.id == name:
aircraft_set.remove(i)
def remove_aircraft_by_name(self, name: str) -> None:
for i in list(self.all_aircrafts):
if i.display_name == name:
self.all_aircrafts.remove(i)
for aircraft_set in [self.aircraft, self.awacs, self.tankers]:
for i in list(aircraft_set):
if i.display_name == name:
aircraft_set.remove(i)
def remove_preset(self, name: str) -> None:
for pg in self.preset_groups:

2
qt_ui/windows/newgame/WizardPages/QFactionSelection.py
View File

@ -238,7 +238,7 @@ class FactionSelection(QtWidgets.QWizardPage):
@staticmethod
def _filter_selected_units(qfu: QFactionUnits) -> Faction:
fac = deepcopy(qfu.faction)
qfu.updateFactionUnits(fac.all_aircrafts)
qfu.updateFactionUnits(fac.aircraft)
qfu.updateFactionUnits(fac.awacs)
qfu.updateFactionUnits(fac.tankers)
qfu.updateFactionUnits(fac.frontline_units)