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

Fixed errors in faction code

Browse Source
This commit is contained in:
Khopa 2020-10-25 14:21:25 +01:00
parent 3d8c2d689e
commit 93f0627c5e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
game/factions/faction.py
View File

@ -24,6 +24,12 @@ class Faction:
# Nice name of the faction # Nice name of the faction
name: str = field(default="") name: str = field(default="")
# List of faction file authors
authors: str = field(default="")
# A description of the faction
description: str = field(default="")
# Available aircraft # Available aircraft
aircrafts: List[UnitType] = field(default_factory=list) aircrafts: List[UnitType] = field(default_factory=list)
@ -110,6 +116,9 @@ class Faction:
if not faction.name: if not faction.name:
raise AssertionError("Faction has no valid name") raise AssertionError("Faction has no valid name")
faction.authors = json.get("authors", "")
faction.description = json.get("description", "")
faction.aircrafts = [f for f in [aircraft_loader(aircraft) for aircraft in json.get("aircrafts", [])] if f is not None] faction.aircrafts = [f for f in [aircraft_loader(aircraft) for aircraft in json.get("aircrafts", [])] if f is not None]
faction.awacs = [f for f in [aircraft_loader(aircraft) for aircraft in json.get("awacs", [])] if f is not None] faction.awacs = [f for f in [aircraft_loader(aircraft) for aircraft in json.get("awacs", [])] if f is not None]
faction.tankers = [f for f in [aircraft_loader(aircraft) for aircraft in json.get("tankers", [])] if f is not None] faction.tankers = [f for f in [aircraft_loader(aircraft) for aircraft in json.get("tankers", [])] if f is not None]
@ -122,7 +131,7 @@ class Faction:
faction.sams = json.get("sams", []) faction.sams = json.get("sams", [])
faction.shorads = json.get("shorads", []) faction.shorads = json.get("shorads", [])
faction.missiles = json.get("missiles", []) faction.missiles = json.get("missiles", [])
faction.name = json.get("requirements", {}) faction.requirements = json.get("requirements", {})
faction.carrier_names = json.get("carrier_names", []) faction.carrier_names = json.get("carrier_names", [])
faction.helicopter_carrier_names = json.get("helicopter_carrier_names", []) faction.helicopter_carrier_names = json.get("helicopter_carrier_names", [])