From 81f4c7303fc99dec2a3117046a3f973d91947b6b Mon Sep 17 00:00:00 2001 From: Donnie Date: Wed, 24 Jun 2020 15:39:08 -0400 Subject: [PATCH 1/5] changed AA icon --- resources/ui/ground_assets/aa.png | Bin 363 -> 940 bytes resources/ui/ground_assets/aa_blue.png | Bin 363 -> 934 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/ui/ground_assets/aa.png b/resources/ui/ground_assets/aa.png index ca3f8daa22533edbcefdbf0c1131672cd376973e..171b5e4cf1b246317df81a8ab65b6c5f35ace3aa 100644 GIT binary patch delta 881 zcmXBB3sBMr00&^8hiR$!Sn0Cj)(Z&X8TUwbR@TSLPq|eD)&q zYKe7ovL#t&YFlbt>d+qOGU-ZtVm|T_C_WGc{ncIHH$=H^CFK$1d%Hryxfs!7H5uHs z80^DFDmFP`4Fy}5VEqDYcgL$|@OFgwC-l9;F(LYUFlGQ}C5q2s?OZe~p>70y9vy%5Jo z?ok+qA>09P2h7Z%v=EvWY<5OP36zzvSWy2Dd|VO6g5NUei6OAvP<9zLvUZF4-Z#s~bgq&oIjvz&V)5p-RCUEuy5+X1@3RxchEkoiy zBu3)vFL5{=vXc<-z_7;iCs5VmU?{e&!lfK^v_o_N!#bS$4XiKl$tu#_!M(dkByt8n zI4C^jMXKh92u=`nzV>*H4dtsGO1k7v0nI}o`fOBhZ%jX8m#zLko0zFE7hQVo=Y5La zzCD-c;1pEq&|os%)^eBHnJ9s}+G_*FlK5B^XO76Ow7kig*4o*8X!FwLRL5w_PL?e- z+JCw>UaX=syC=SY3MKTW*-K zMN-M`iV!NvPRX5f$~tx^3Juoms@W?U$<^O$vJ^e}0zO?UOR$a)xF9)Otz@vAD-40N z-;}JNO$;%er7}ZQ)iqy|w1`IPdCW8WG$&qVxv*6~UZ3(+XJ*yc?AegFkP_!x8JYBw zq0pu|Znaf5tR5A*{`Jezm~p-)!CL;(q9s!7J*7Ua3Em1qyw7Mq3{%}?#A1J?&CRf4 jFJ|g^*`4pwEcfQQkj!z$52~WJPSPiQZfI~hCpP^f5WEIE delta 300 zcmV+{0n`4h2kQcmNPhr4P)t-s|8`*iy08DpzyFee|1uE&@$dgXApdDl|64%+*3bV< zF#n&A|K#8QMJN9>6aR#8|E-_@HWmN>|NkTa&*3fa0002RNklTrc3(X*gKs!1D7zNPklxqWTHoSS{cLVtHvU z-efP~2?X^g5y{lXo6BbhP!E=h+@P6EvD>2Bi?EeiNa@ye8RQVvvm5x3RZ~6cWn`3S z1|($s0GNI}Aeh5C1k4tU2C)u-l|^v}iEcx{k+P+vB&`QhZSBzkNy{4$HrJms0Q58L yK(4(951=x~R3+9Vgz$&IdI!E9@3-^63orm6f<&2_q^TzW0000Jit|JuJ`ke%-r2wNE=sv;hHV)=tX$37xJRQK_N=z-lK&+r~7(;4wPeQ+p;W;pi z(KC%{9oF-4;wjc9<8B9Xy0AltEg5jj#^o2_v>-u(che~E$L&|xln&}GOGP z7C)E6rwAA7@$3Ws)goDnl~o)qMMwp*J5lluF?CQc;`IcYM<8fN%^;+s;I(3J4&F@R zmK3&Gutk;8lZ;L?YktV;*K*{*ch~%TJVj z=BED~3Scmb9*KF5u1;Gj^Ii3dcy;5VBEF)*AXS7v2>62!3%;ICF`KZvusbn}%y+A%`1V?GQsH;P zBevU-&dw%#Nq-~goyw4Tv&exP`<>oS#dTOVmMm`ip@9gbZu=#qMeWWH<;(5}gQeQ%G(5JY2*j0vb>WNSi zFJ48XvQ^P-qL}p*>tjsLtf@ZllqzvkGIyZ=Y(Z7f9NYH0KzXLMk3`0Od|$|G(h>5RCut_x~W1|4^&{&*=X!oBu$g z|BuQ4-|+tvjsGW?|8TnhpV9vnj{pDv{{V#lzT;rN0002RNkl2Bi?EeiNbc5j3FHvfqZ{~;R7*YTWn`3S z0%Ah?0GNI}Ae6#71k4tS2B8jt6-8+WnQueDv7)7-EUgDhZSB#4So0eYHrJms0Q58L yK&rh551=B(k|oz7Oz?-ldI!E9@3-^63orm2-9(wpgi$vD0000 Date: Wed, 24 Jun 2020 23:22:07 +0200 Subject: [PATCH 2/5] Fix : Carrier TACAN was wrongfully set up as an A/A TACAN --- changelog.md | 5 +++++ gen/groundobjectsgen.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index cc8ac97f..1099bac4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,8 @@ +# 2.0 RC 9 + +## Fixed issues : +* **[Mission Generator]** Carrier TACAN was wrongfully set up as an A/A TACAN + # 2.0 RC 8 ## Fixed issues : diff --git a/gen/groundobjectsgen.py b/gen/groundobjectsgen.py index c85c5746..64939fc0 100644 --- a/gen/groundobjectsgen.py +++ b/gen/groundobjectsgen.py @@ -130,7 +130,7 @@ class GroundObjectsGenerator: # Set UP TACAN and ICLS modeChannel = "X" if not cp.tacanY else "Y" - sg.points[0].tasks.append(ActivateBeaconCommand(channel=cp.tacanN, modechannel=modeChannel, callsign=cp.tacanI, unit_id=sg.units[0].id)) + sg.points[0].tasks.append(ActivateBeaconCommand(channel=cp.tacanN, modechannel=modeChannel, callsign=cp.tacanI, unit_id=sg.units[0].id, aa=False)) if ground_object.dcs_identifier == "CARRIER" and hasattr(cp, "icls"): sg.points[0].tasks.append(ActivateICLSCommand(cp.icls, unit_id=sg.units[0].id)) From 44e8cc810fbb1c8b79976f80e560bd77fb00c3b3 Mon Sep 17 00:00:00 2001 From: Khopa Date: Wed, 24 Jun 2020 23:49:27 +0200 Subject: [PATCH 3/5] Fixed an issue with MolniyaGroup generator causing an error on campaign start. --- gen/fleet/ru_dd_group.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen/fleet/ru_dd_group.py b/gen/fleet/ru_dd_group.py index 0ac62686..dc048029 100644 --- a/gen/fleet/ru_dd_group.py +++ b/gen/fleet/ru_dd_group.py @@ -45,7 +45,7 @@ class GrishaGroupGenerator(DDGroupGenerator): class MolniyaGroupGenerator(DDGroupGenerator): def __init__(self, game, ground_object, faction): - super(MolniyaGroupGenerator, self).__init__(game, ground_object, faction, MolniyaGroupGenerator) + super(MolniyaGroupGenerator, self).__init__(game, ground_object, faction, FSG_1241_1MP_Molniya) class KiloSubGroupGenerator(DDGroupGenerator): From 8f7b51a3dfa4783ce2df4fb5e9eff12cb20ed24a Mon Sep 17 00:00:00 2001 From: Khopa Date: Wed, 24 Jun 2020 23:51:23 +0200 Subject: [PATCH 4/5] Fixed an issue with MolniyaGroup generator causing an error on campaign start. --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index 1099bac4..f0cfa0bb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,11 @@ # 2.0 RC 9 +## Features/Improvements : +* **[UI/UX]** New icons from contributor Deus + ## Fixed issues : * **[Mission Generator]** Carrier TACAN was wrongfully set up as an A/A TACAN +* **[Campaign Generator]** Fixed issue with Russian navy group generator causing a random crash on campaign creation. # 2.0 RC 8 From c5d055c19bcef0f418fb58a1d8a65c539f0f4b1e Mon Sep 17 00:00:00 2001 From: Khopa Date: Wed, 24 Jun 2020 23:54:23 +0200 Subject: [PATCH 5/5] Prepared version RC9 --- qt_ui/main.py | 2 +- qt_ui/windows/QNewGameWizard.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt_ui/main.py b/qt_ui/main.py index 5c6a033b..55262ab9 100644 --- a/qt_ui/main.py +++ b/qt_ui/main.py @@ -1,7 +1,7 @@ from userdata import logging_config # Logging setup -VERSION_STRING = "2.0RC7" +VERSION_STRING = "2.0RC9" logging_config.init_logging(VERSION_STRING) import logging diff --git a/qt_ui/windows/QNewGameWizard.py b/qt_ui/windows/QNewGameWizard.py index f858b084..3fd56fb3 100644 --- a/qt_ui/windows/QNewGameWizard.py +++ b/qt_ui/windows/QNewGameWizard.py @@ -108,7 +108,7 @@ class NewGameWizard(QtWidgets.QWizard): game.budget = int(game.budget * multiplier) game.settings.multiplier = multiplier game.settings.sams = True - game.settings.version = "2.0RC7" + game.settings.version = "2.0RC9" if midgame: game.budget = game.budget * 4 * len(list(conflicttheater.conflicts()))