Prepared version RC9

changed AA icon

.gitignore

@@ -11,3 +11,11 @@ resources/tools/a.miz
 tests/**
 # User-specific stuff
 .idea/
+
+liberation_preferences.json
+
+logs/liberation.log
+
+qt_ui/logs/liberation.log
+
+*.psd

changelog.md

@@ -1,3 +1,20 @@
+# 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
+
+## Fixed issues :
+* **[Mission Generator]** Frequency for P-47D-30 changed to 124Mhz (Generated mission with 251Mhz would not work)
+* **[Mission Generator]** Reduced the maximum number of uboat per generated group
+* **[Mission Generator]** Fixed an issue with the WW2 LST groups (superposed units).
+* **[UI]** Fixed issue with the zoom
+
 # 2.0 RC 7
 
 ## Features/Improvements :
@@ -88,4 +105,4 @@ Sorry :(
 * **[Mission Generator]** Planned flights will spawn even if their home base has been captured or is being contested by enemy ground units. 
 * **[Campaign Generator]** Base defenses would not be generated on Normandy map and in some rare cases on others maps as well
 * **[Mission Planning]** CAS waypoints created from the "Predefined waypoint selector" would not be at the exact location of the frontline
-* **[Naming]** CAP mission flown from airbase are not named BARCAP anymore (CAP from carrier is still named BARCAP)
+* **[Naming]** CAP mission flown from airbase are not named BARCAP anymore (CAP from carrier is still named BARCAP)

gen/aircraft.py

@@ -90,7 +90,7 @@ class AircraftConflictGenerator:
         if unit_type in helicopters.helicopter_map.values() and unit_type not in [UH_1H]:
             group.set_frequency(127.5)
         else:
-            if unit_type not in [P_51D_30_NA, P_51D, SpitfireLFMkIX, SpitfireLFMkIXCW, FW_190A8, FW_190D9, Bf_109K_4]:
+            if unit_type not in [P_51D_30_NA, P_51D, SpitfireLFMkIX, SpitfireLFMkIXCW, FW_190A8, FW_190D9, Bf_109K_4, P_47D_30]:
                 group.set_frequency(251.0)
             else:
                 # WW2

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):

gen/fleet/uboat.py

@@ -13,7 +13,7 @@ class UBoatGroupGenerator(GroupGenerator):
 
     def generate(self):
 
-        for i in range(random.randint(2, 6)):
+        for i in range(random.randint(1, 4)):
             self.add_unit(Uboat_VIIC_U_flak, "Uboat" + str(i), self.position.x + i * random.randint(100, 250), self.position.y + (random.randint(100, 200)-100), self.heading)
 
         self.get_generated_group().points[0].speed = 20

gen/fleet/ww2lst.py

@@ -16,7 +16,7 @@ class WW2LSTGroupGenerator(GroupGenerator):
         # Add LS Samuel Chase
         self.add_unit(LS_Samuel_Chase, "SamuelChase", self.position.x, self.position.y, self.heading)
 
-        for i in range(random.randint(2, 4)):
+        for i in range(1, random.randint(3, 4)):
             self.add_unit(LST_Mk_II, "LST" + str(i), self.position.x + i * random.randint(800, 1200), self.position.y, self.heading)
 
         self.get_generated_group().points[0].speed = 20

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))
 

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

qt_ui/widgets/map/QLiberationMap.py

@@ -43,6 +43,7 @@ class QLiberationMap(QGraphicsView):
         self.setMaximumHeight(2160)
         self._zoom = 0
         self.factor = 1
+        self.factorized = 1
         self.init_scene()
         self.connectSignals()
         self.setGame(game)
@@ -119,7 +120,6 @@ class QLiberationMap(QGraphicsView):
         #    text = scene.addText(str(r), font=QFont("Trebuchet MS", 10, weight=5, italic=False))
         #    text.setPos(0, i * 24)
 
-
         for cp in self.game.theater.controlpoints:
         
             pos = self._transform_point(cp.position)
@@ -263,15 +263,21 @@ class QLiberationMap(QGraphicsView):
         if event.angleDelta().y() > 0:
             factor = 1.25
             self._zoom += 1
+            if self._zoom < 10:
+                self.scale(factor, factor)
+                self.factorized *= factor
+            else:
+                self._zoom = 9
         else:
             factor = 0.8
             self._zoom -= 1
+            if self._zoom > -5:
+                self.scale(factor, factor)
+                self.factorized *= factor
+            else:
+                self._zoom = -4
 
-        if self._zoom > -5:
-            self.scale(factor, factor)
-        else:
-            self._zoom = -5
-
+        #print(self.factorized, factor, self._zoom)
 
     def _transform_point(self, p: Point, treshold=30) -> (int, int):
         point_a = list(self.game.theater.reference_points.keys())[0]

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()))

requirements.txt

@@ -1,4 +1,4 @@
 pydcs>=0.9.4
 Pyside2>=5.13.0
-pyinstaller==3.5
+pyinstaller==3.6
 pyproj==2.6.1.post1