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

Migration changes for using sets instead of lists

Browse Source
This commit is contained in:
Raffson 2023-07-09 21:35:37 +02:00
parent d6e7451f8a
commit 2b5f6f7998
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/factions/faction.py
View File

@ -178,6 +178,10 @@ class Faction:
@property @property
def aircrafts(self) -> list[UnitType[Any]]: def aircrafts(self) -> list[UnitType[Any]]:
# Migrator can't cope with this, so we need to do it here...
self.aircraft = set(self.aircraft)
self.awacs = set(self.awacs)
self.tankers = set(self.tankers)
return list(self.aircraft.union(self.awacs.union(self.tankers))) return list(self.aircraft.union(self.awacs.union(self.tankers)))
@classmethod @classmethod

28
game/migrator.py
View File

@ -143,6 +143,34 @@ class Migrator:
for c in self.game.coalitions: for c in self.game.coalitions:
if isinstance(c.faction.country, str): if isinstance(c.faction.country, str):
c.faction.country = countries_by_name[c.faction.country]() c.faction.country = countries_by_name[c.faction.country]()
if isinstance(c.faction.aircraft, list):
c.faction.aircraft = set(c.faction.aircraft)
if isinstance(c.faction.awacs, list):
c.faction.awacs = set(c.faction.awacs)
if isinstance(c.faction.tankers, list):
c.faction.tankers = set(c.faction.tankers)
if isinstance(c.faction.frontline_units, list):
c.faction.frontline_units = set(c.faction.frontline_units)
if isinstance(c.faction.artillery_units, list):
c.faction.artillery_units = set(c.faction.artillery_units)
if isinstance(c.faction.infantry_units, list):
c.faction.infantry_units = set(c.faction.infantry_units)
if isinstance(c.faction.logistics_units, list):
c.faction.logistics_units = set(c.faction.logistics_units)
if isinstance(c.faction.air_defense_units, list):
c.faction.air_defense_units = set(c.faction.air_defense_units)
if isinstance(c.faction.missiles, list):
c.faction.missiles = set(c.faction.missiles)
if isinstance(c.faction.carrier_names, list):
c.faction.carrier_names = set(c.faction.carrier_names)
if isinstance(c.faction.helicopter_carrier_names, list):
c.faction.helicopter_carrier_names = set(
c.faction.helicopter_carrier_names
)
if isinstance(c.faction.naval_units, list):
c.faction.naval_units = set(c.faction.naval_units)
if isinstance(c.faction.building_set, list):
c.faction.building_set = set(c.faction.building_set)
def _update_weather(self) -> None: def _update_weather(self) -> None:
a = self.game.conditions.weather.atmospheric a = self.game.conditions.weather.atmospheric