diff --git a/changelog.md b/changelog.md index 5af9dd55..52cf2aba 100644 --- a/changelog.md +++ b/changelog.md @@ -41,19 +41,22 @@ * **[Map]** Added "V1 Site" (WW2) * **[Misc]** Made it possible to setup DCS Saved Games directory and DCS installation directory manually at first start +* **[Misc]** Added culling performance settings ## Fixed issues : * **[Units/Factions]** Replaced S3-B Tanker by KC130 for most factions (More fuel) * **[Units/Factions]** WW2 factions will not have offshore oil station and other modern buildings generated. No more third-reich operated offshore stations will spawn on normandy's coast. +* **[Units/Factions]** Missing icons added for some aircraft + * **[Mission Generator]** When playing as RED the activation trigger would not be properly generated * **[Mission Generator]** FW-190A8 is now properly considered as a flyable aircraft * **[Mission Generator]** Changed "strike" payload for Su-24M that was innefective * **[Mission Generator]** Changed "strike" payload for JF-17 to use LS-6 bombs instead of GBU * **[Mission Generator]** Change power station template. (Buildings could end up superposed). -* **[Maps/Campaign]** Now using Vasiani airbase instead of Soganlung airport in North Caucasus campaign (More parking slots) +* **[Maps/Campaign]** Now using Vasiani airbase instead of Soganlung airport in Caucasus campaigns (more parking slot) * **[Info Panel]** Message displayed on base capture event stated that the enemy captured an airbase, while it was the player who captured it. * **[Map View]** Graphical glitch on map when one building of an objective was destroyed, but not the others diff --git a/gen/aircraft.py b/gen/aircraft.py index 6bd8f8ac..21597750 100644 --- a/gen/aircraft.py +++ b/gen/aircraft.py @@ -40,11 +40,15 @@ class AircraftConflictGenerator: did_load_loadout = False unit_type = group.units[0].unit_type - print("SETUP GROUP : " + str(for_task) + " -- " + str(group.name)) - if unit_type in db.PLANE_PAYLOAD_OVERRIDES: override_loadout = db.PLANE_PAYLOAD_OVERRIDES[unit_type] if type(override_loadout) == dict: + + # Clear pylons + for p in group.units: + p.pylons.clear() + + # Now load loadout if for_task in db.PLANE_PAYLOAD_OVERRIDES[unit_type]: payload_name = db.PLANE_PAYLOAD_OVERRIDES[unit_type][for_task] group.load_loadout(payload_name) diff --git a/resources/ui/units/aircrafts/A-20G_24.jpg b/resources/ui/units/aircrafts/A-20G_24.jpg new file mode 100644 index 00000000..a0e0e35b Binary files /dev/null and b/resources/ui/units/aircrafts/A-20G_24.jpg differ diff --git a/resources/ui/units/aircrafts/Ju-88-A4_24.jpg b/resources/ui/units/aircrafts/Ju-88-A4_24.jpg new file mode 100644 index 00000000..def4dc79 Binary files /dev/null and b/resources/ui/units/aircrafts/Ju-88-A4_24.jpg differ diff --git a/resources/ui/units/aircrafts/P-47D-30_24.jpg b/resources/ui/units/aircrafts/P-47D-30_24.jpg new file mode 100644 index 00000000..b71e5342 Binary files /dev/null and b/resources/ui/units/aircrafts/P-47D-30_24.jpg differ diff --git a/theater/caucasus.py b/theater/caucasus.py index 1256ba58..3fadd1d7 100644 --- a/theater/caucasus.py +++ b/theater/caucasus.py @@ -27,7 +27,7 @@ class CaucasusTheater(ConflictTheater): def __init__(self, load_ground_objects=True): super(CaucasusTheater, self).__init__() - self.soganlug = ControlPoint.from_airport(caucasus.Soganlug, LAND, SIZE_SMALL, IMPORTANCE_LOW) + self.vaziani = ControlPoint.from_airport(caucasus.Vaziani, LAND, SIZE_SMALL, IMPORTANCE_LOW) self.kutaisi = ControlPoint.from_airport(caucasus.Kutaisi, LAND, SIZE_SMALL, IMPORTANCE_LOW) self.senaki = ControlPoint.from_airport(caucasus.Senaki_Kolkhi, LAND, SIZE_REGULAR, IMPORTANCE_LOW) self.kobuleti = ControlPoint.from_airport(caucasus.Kobuleti, COAST_A_E, SIZE_SMALL, 1.1) @@ -45,17 +45,17 @@ class CaucasusTheater(ConflictTheater): self.mineralnye = ControlPoint.from_airport(caucasus.Mineralnye_Vody, LAND, SIZE_BIG, 1.3) self.mozdok = ControlPoint.from_airport(caucasus.Mozdok, LAND, SIZE_BIG, 1.1) - self.soganlug.frontline_offset = 0.5 - self.soganlug.base.strength = 1 + self.vaziani.frontline_offset = 0.5 + self.vaziani.base.strength = 1 - self.add_controlpoint(self.soganlug, connected_to=[self.kutaisi, self.beslan]) - self.add_controlpoint(self.beslan, connected_to=[self.soganlug, self.mozdok, self.nalchik]) + self.add_controlpoint(self.vaziani, connected_to=[self.kutaisi, self.beslan]) + self.add_controlpoint(self.beslan, connected_to=[self.vaziani, self.mozdok, self.nalchik]) self.add_controlpoint(self.nalchik, connected_to=[self.beslan, self.mozdok, self.mineralnye]) self.add_controlpoint(self.mozdok, connected_to=[self.nalchik, self.beslan, self.mineralnye]) self.add_controlpoint(self.mineralnye, connected_to=[self.nalchik, self.mozdok, self.maykop]) self.add_controlpoint(self.maykop, connected_to=[self.mineralnye, self.krasnodar]) - self.add_controlpoint(self.kutaisi, connected_to=[self.soganlug, self.senaki]) + self.add_controlpoint(self.kutaisi, connected_to=[self.vaziani, self.senaki]) self.add_controlpoint(self.senaki, connected_to=[self.kobuleti, self.sukhumi, self.kutaisi]) self.add_controlpoint(self.kobuleti, connected_to=[self.batumi, self.senaki]) self.add_controlpoint(self.batumi, connected_to=[self.kobuleti])