From 93bcd07c7f44a5c4b455d1758af3659101db7184 Mon Sep 17 00:00:00 2001 From: Khopa Date: Sat, 20 Jun 2020 13:44:11 +0200 Subject: [PATCH] Added aircraft icons + fixed ww2 empty aircraft loadout not being loaded. --- changelog.md | 5 ++++- gen/aircraft.py | 8 ++++++-- resources/ui/units/aircrafts/A-20G_24.jpg | Bin 0 -> 1230 bytes resources/ui/units/aircrafts/Ju-88-A4_24.jpg | Bin 0 -> 1228 bytes resources/ui/units/aircrafts/P-47D-30_24.jpg | Bin 0 -> 1214 bytes theater/caucasus.py | 12 ++++++------ 6 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 resources/ui/units/aircrafts/A-20G_24.jpg create mode 100644 resources/ui/units/aircrafts/Ju-88-A4_24.jpg create mode 100644 resources/ui/units/aircrafts/P-47D-30_24.jpg 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 0000000000000000000000000000000000000000..a0e0e35b114e44a192b3472345a0ba462007a215 GIT binary patch literal 1230 zcmex=^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<c1}I=;VrF4wW9Q)H;sz?% zD!{d!pzFb!U9xX3zTPI5o8roG<0MW4oqZMDikqloVbuf*=gfJ(V&YTRE(2~ znmD<{#3dx9RMpfqG__1j&CD$#!&hIoXS(LTyY|hNi`}EET`Q8duXe|exsO(^ zyO(<9jPi;ui^)m96PkZrU-HL$_f`4B{@Kf;_8tkhS3N#e+ImqFUxh87;iWxd?uI+V z?yR#~y^jA$*4&GeHrq}9VBc}R%f?*v$wIs9(h}=LEu`BO9&b=+{(0Rkq?~PE?uYX3 zQhQ$i!oqZxaJWr{d#`{U!bzR3OeuUNul$wL z?DsEe`@~nS;a7rk;{#(vmmj&$dv`-{sp?Mq&-a8Df0h)zy!K080!_ZfmOl^;&BCXOY0@n-X_tT#pm~@bsoytkebhi0h~Af4tMy zdi?NvdzxkF?(Y4k3;h4J@QMUI=}&k*y=cmOK9fym%a+!4znr4{GnCU#BKrCFsv`~c z+w+$Hl+svy(|N<+HNPj;AKK{npTV&I&$RyxZ&tqiaEbNztt0zCNHF}{66n6MJ+V6T zyO@3ZwME}N`WBZde46r}W5H&jBD)!@nIB%8#Gzkbb>qto`=uhm-vZv~XWKn}ZO>X! ub@u8l&UId2gim?>XSlD-aNTcvMu#9nXkY`w11^o#0bMtyn|-(ce-i+b)dAuF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..def4dc7928a82b7ed829cfc56e2b8d5fbdfe507f GIT binary patch literal 1228 zcmex=^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<c1}I=;VrF4wW9Q)H;sz?% zD!{d!pzFb!U9xX3zTPI5o8roG<0MW4oqZMDikqloVbuf*=gfJ(V&YTRE(2~ znmD<{#3dx9RMpfqG__1j&CD$#!|fmak5>LM&dkqV{zm+|!-k1d%%?T?Joq@N z;`xQ^_7D0yitoPSUY>nYm$lA3@ zt+`)SyG*!tYYi{|rZ3&d<7asy{m?`BPNQn|UtP@e|)@PFhoN?2^}u zj>S6XZZN;{tti>2{Bc82)b~i3U|$PnBnA9?xU_Z{&cSC>r}i)s?vw6p1{doWMq$DdL^4^^yN5b!zT&T*;! zJxK|Bem@qK-M1t+Rrt2AiIKkI;~c>sUABw)(`t2I^W?2~x8e+Ez;VgrQR{V&uJY!p zUBq+Zw?S-Cg?eA@>gT`v#pCZfe2lw$=dR|{u*}G*5i)HI-~TfRyUy>(dpqmqgM@i5 zZU*K;5^_s-KKakkYM*iVro7{+#4g)6Zg&q_d|g?0&UW>IE%(K<%8Z-^re)7yIr#7F zq}!d!7Vm$C@4NX*vpk*m;PzR}N^GB&#aR6oeC_MIx3lEZo$C1NE4j7rT}7@0SQ;7E zzW1?els{5$rLii|#nNzjVE+60=N9KWOmIwYGN@eCRkI@IOwav4vpH1@dxR%;9o=)$ zg!`F(@sh~h^VTSH)tep_34ZGIELHd+KX>{+M}hwg_w)am@N-pUR%LeBO|t)S(N$*R t8<|hi;ldb9Zc@>?pwl?%7`Oyiz6Q+;Vkeg5$(ja5%wJ{$kP2>_;W2igDt literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b71e534240f5b48e4d81c27c3577976f874d0678 GIT binary patch literal 1214 zcmex=^(PF6}rMnOeST|r4lSw=>~TvNxu(8R<c1}I=;VrF4wW9Q)H;sz?% zD!{d!pzFb!U9xX3zTPI5o8roG<0MW4oqZMDikqloVbuf*=gfJ(V&YTRE(2~ znmD<{#3dx9RMpfqG__1j&CD$#!`&-eGuM3iKGT7(F68{mbxDVh6yJ)SZ}fI4 z@9D+c{IB1*?pc}1w>(Q=2S@Kt2aA)(EN!kES1+qH`ZKG zInKq+Gx=rEe}?P=|5G6{LTfnKFFaoOZJnC*%YL(8#X|Kv*&P3B{oHwVd4F~$-(!W| ziyHD%vtGnzD!BWUCLCdX|2}BllDYg*Pxjp`PTz7jx<^-yiuF2eoJ2F$?uP0>%QE)P`S{}cEzGq zQAU@-OiXU7OuD*AdET7s_Ny|@)rwpafB{q1rIqq#op-o$v-6G#OsBuHX5IQx7gDG+ zcg=Ez#!Fq=bFWUSGK|>G+j{fiy7&*re}wcei~rAX+WHLtx5dG(BL6mq)-Kqju;atu zqu;0Ly-!b=D`s|M`78FQ>>pOwVt04j^!qgc literal 0 HcmV?d00001 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])