From 72eb6622ac3c1a175fc7db453851b3d2b5d7b758 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sun, 21 May 2023 14:13:33 +0200 Subject: [PATCH] Cleanup country_shortname, use country.shortname instead --- game/factions/faction.py | 5 ----- qt_ui/windows/AirWingConfigurationDialog.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/game/factions/faction.py b/game/factions/faction.py index 83a48c6d..52a1b02f 100644 --- a/game/factions/faction.py +++ b/game/factions/faction.py @@ -47,9 +47,6 @@ class Faction: # Country used by this faction country: Country - # Country's short name used by this faction - country_shortname: str = field(default="") - # Nice name of the faction name: str = field(default="") @@ -194,8 +191,6 @@ class Faction: faction = Faction(locales=json.get("locales"), country=country) - faction.country_shortname = country.shortname - faction.name = json.get("name", "") if not faction.name: raise AssertionError("Faction has no valid name") diff --git a/qt_ui/windows/AirWingConfigurationDialog.py b/qt_ui/windows/AirWingConfigurationDialog.py index db4f9f66..1b25ccc5 100644 --- a/qt_ui/windows/AirWingConfigurationDialog.py +++ b/qt_ui/windows/AirWingConfigurationDialog.py @@ -144,7 +144,7 @@ class SquadronLiverySelector(QComboBox): selected_livery = squadron.livery liveries = set() - cc = squadron.coalition.faction.country_shortname + cc = squadron.coalition.faction.country.shortname aircraft_liveries = set(self.aircraft_type.dcs_unit_type.iter_liveries()) if len(aircraft_liveries) == 0: logging.info(f"Liveries for {self.aircraft_type} is empty!")