From 4ef2f6c22afa2fb15261e303747f1aaaadef4b9e Mon Sep 17 00:00:00 2001 From: Druss99 <42724070+Druss99@users.noreply.github.com> Date: Tue, 4 Feb 2025 16:36:41 -0500 Subject: [PATCH 1/4] Allow refueling & escort on friendly FOBs, Airfields & Carriers (#477) --- game/theater/controlpoint.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index d9555301..389809a2 100644 --- a/game/theater/controlpoint.py +++ b/game/theater/controlpoint.py @@ -1259,6 +1259,7 @@ class Airfield(ControlPoint, CTLD): if self.is_friendly(for_player): yield from [ FlightType.AEWC, + FlightType.ESCORT, # TODO: FlightType.INTERCEPTION # TODO: FlightType.LOGISTICS ] @@ -1372,6 +1373,7 @@ class NavalControlPoint( FlightType.AEWC, FlightType.RECOVERY, FlightType.REFUELING, + FlightType.ESCORT, # TODO: FlightType.INTERCEPTION # TODO: Buddy tanking for the A-4? # TODO: Rescue chopper? @@ -1655,8 +1657,11 @@ class Fob(ControlPoint, RadioFrequencyContainer, CTLD): if self.total_aircraft_parking(ParkingType(True, True, True)): yield FlightType.OCA_AIRCRAFT else: - yield FlightType.AEWC - + yield from [ + FlightType.AEWC, + FlightType.ESCORT, + FlightType.REFUELING, + ] yield from super().mission_types(for_player) def total_aircraft_parking(self, parking_type: ParkingType) -> int: From 1e74f8f124b2bea6c2c4a290de2c293d08181d2b Mon Sep 17 00:00:00 2001 From: Eclipse/Druss99 Date: Tue, 4 Feb 2025 19:05:27 -0500 Subject: [PATCH 2/4] fix error if missions directory does not exist --- game/missiongenerator/missiongenerator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/game/missiongenerator/missiongenerator.py b/game/missiongenerator/missiongenerator.py index b3ca7930..3957641a 100644 --- a/game/missiongenerator/missiongenerator.py +++ b/game/missiongenerator/missiongenerator.py @@ -125,6 +125,7 @@ class MissionGenerator: namegen.reset_numbers() self.generate_warehouses() + output.parent.mkdir(parents=True, exist_ok=True) self.mission.save(output) return self.unit_map From 394a9d05b25ee6513a03eda68a153382444cfa3d Mon Sep 17 00:00:00 2001 From: Eclipse/Druss99 Date: Tue, 4 Feb 2025 19:13:42 -0500 Subject: [PATCH 3/4] fix missile sites not being removed when mod is disabled --- game/factions/faction.py | 1 + 1 file changed, 1 insertion(+) diff --git a/game/factions/faction.py b/game/factions/faction.py index 8978bd4e..8873328d 100644 --- a/game/factions/faction.py +++ b/game/factions/faction.py @@ -860,6 +860,7 @@ class Faction: self.air_defense_units, self.artillery_units, self.logistics_units, + self.missiles, ]: for i in list(sequence): if i.dcs_unit_type.id == name: From 5fc5e27ee06ad2b616d7a02d0a09c749b40e87ba Mon Sep 17 00:00:00 2001 From: Eclipse/Druss99 Date: Wed, 5 Feb 2025 17:18:38 -0500 Subject: [PATCH 4/4] remove unnecessary aircraft icon mapping --- qt_ui/uiconstants.py | 8 -------- .../units/aircrafts/icons/{B-21.jpg => B-21_24.jpg} | Bin .../icons/{CH_JAS39C.jpg => CH_JAS39C_24.jpg} | Bin .../icons/{CH_Ka52K.jpg => CH_Ka52K_24.jpg} | Bin .../aircrafts/icons/{CH_Ka52.jpg => CH_Ka52_24.jpg} | Bin .../icons/{CH_Mi28N.jpg => CH_Mi28N_24.jpg} | Bin .../icons/{CH_Tu-160M2.jpg => CH_Tu-160M2_24.jpg} | Bin .../icons/{CH_Tu-95MSM.jpg => CH_Tu-95MSM_24.jpg} | Bin .../aircrafts/icons/{HKP15B.jpg => HKP15B_24.jpg} | Bin 9 files changed, 8 deletions(-) rename resources/ui/units/aircrafts/icons/{B-21.jpg => B-21_24.jpg} (100%) rename resources/ui/units/aircrafts/icons/{CH_JAS39C.jpg => CH_JAS39C_24.jpg} (100%) rename resources/ui/units/aircrafts/icons/{CH_Ka52K.jpg => CH_Ka52K_24.jpg} (100%) rename resources/ui/units/aircrafts/icons/{CH_Ka52.jpg => CH_Ka52_24.jpg} (100%) rename resources/ui/units/aircrafts/icons/{CH_Mi28N.jpg => CH_Mi28N_24.jpg} (100%) rename resources/ui/units/aircrafts/icons/{CH_Tu-160M2.jpg => CH_Tu-160M2_24.jpg} (100%) rename resources/ui/units/aircrafts/icons/{CH_Tu-95MSM.jpg => CH_Tu-95MSM_24.jpg} (100%) rename resources/ui/units/aircrafts/icons/{HKP15B.jpg => HKP15B_24.jpg} (100%) diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index f8e852c4..63bfe1bb 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -222,14 +222,6 @@ def load_aircraft_icons(): AIRCRAFT_ICONS["F-5E-3_FC"] = AIRCRAFT_ICONS["F-5E-3"] AIRCRAFT_ICONS["F-86F_FC"] = AIRCRAFT_ICONS["F-86F Sabre"] AIRCRAFT_ICONS["MiG-15bis_FC"] = AIRCRAFT_ICONS["MiG-15bis"] - AIRCRAFT_ICONS["CH_Ka52"] = AIRCRAFT_ICONS["CH_K"] - AIRCRAFT_ICONS["CH_Ka52K"] = AIRCRAFT_ICONS["CH_Ka"] - AIRCRAFT_ICONS["CH_Mi28N"] = AIRCRAFT_ICONS["CH_Mi"] - AIRCRAFT_ICONS["CH_Tu-95MSM"] = AIRCRAFT_ICONS["CH_Tu-95"] - AIRCRAFT_ICONS["CH_Tu-160M2"] = AIRCRAFT_ICONS["CH_Tu-16"] - AIRCRAFT_ICONS["B-21"] = AIRCRAFT_ICONS["B"] - AIRCRAFT_ICONS["CH_JAS39C"] = AIRCRAFT_ICONS["CH_JAS"] - AIRCRAFT_ICONS["HKP15B"] = AIRCRAFT_ICONS["HKP"] def load_vehicle_icons(): diff --git a/resources/ui/units/aircrafts/icons/B-21.jpg b/resources/ui/units/aircrafts/icons/B-21_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/icons/B-21.jpg rename to resources/ui/units/aircrafts/icons/B-21_24.jpg diff --git a/resources/ui/units/aircrafts/icons/CH_JAS39C.jpg b/resources/ui/units/aircrafts/icons/CH_JAS39C_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/icons/CH_JAS39C.jpg rename to resources/ui/units/aircrafts/icons/CH_JAS39C_24.jpg diff --git a/resources/ui/units/aircrafts/icons/CH_Ka52K.jpg b/resources/ui/units/aircrafts/icons/CH_Ka52K_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/icons/CH_Ka52K.jpg rename to resources/ui/units/aircrafts/icons/CH_Ka52K_24.jpg diff --git a/resources/ui/units/aircrafts/icons/CH_Ka52.jpg b/resources/ui/units/aircrafts/icons/CH_Ka52_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/icons/CH_Ka52.jpg rename to resources/ui/units/aircrafts/icons/CH_Ka52_24.jpg diff --git a/resources/ui/units/aircrafts/icons/CH_Mi28N.jpg b/resources/ui/units/aircrafts/icons/CH_Mi28N_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/icons/CH_Mi28N.jpg rename to resources/ui/units/aircrafts/icons/CH_Mi28N_24.jpg diff --git a/resources/ui/units/aircrafts/icons/CH_Tu-160M2.jpg b/resources/ui/units/aircrafts/icons/CH_Tu-160M2_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/icons/CH_Tu-160M2.jpg rename to resources/ui/units/aircrafts/icons/CH_Tu-160M2_24.jpg diff --git a/resources/ui/units/aircrafts/icons/CH_Tu-95MSM.jpg b/resources/ui/units/aircrafts/icons/CH_Tu-95MSM_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/icons/CH_Tu-95MSM.jpg rename to resources/ui/units/aircrafts/icons/CH_Tu-95MSM_24.jpg diff --git a/resources/ui/units/aircrafts/icons/HKP15B.jpg b/resources/ui/units/aircrafts/icons/HKP15B_24.jpg similarity index 100% rename from resources/ui/units/aircrafts/icons/HKP15B.jpg rename to resources/ui/units/aircrafts/icons/HKP15B_24.jpg