Merge remote-tracking branch 'remotes/dcs-retribution/dcs-retribution/dev' into pretense-generator

qt_ui/windows/QUnitInfoWindow.py

@@ -44,6 +44,8 @@ def aircraft_banner_for(unit_type: AircraftType) -> Path:
         name = "Su-30SM"
     elif unit_type.dcs_id == "F-15ESE":
         name = "F-15E"
+    elif "_FC" in unit_type.dcs_id:
+        name = unit_type.dcs_id.replace("_FC", "")
     else:
         name = unit_type.dcs_id
     return AIRCRAFT_BANNERS_BASE / f"{name}.jpg"

qt_ui/windows/groundobject/QGroundObjectBuyMenu.py

@@ -33,6 +33,8 @@ from game.theater.theatergroundobject import (
     SamGroundObject,
     VehicleGroupGroundObject,
     ShipGroundObject,
+    MissileSiteGroundObject,
+    CoastalSiteGroundObject,
 )
 from qt_ui.uiconstants import EVENT_ICONS
 
@@ -282,6 +284,12 @@ class QGroundObjectBuyMenu(QDialog):
         elif isinstance(ground_object, ShipGroundObject):
             role = GroupRole.NAVAL
             tasks.append(GroupTask.NAVY)
+        elif isinstance(ground_object, MissileSiteGroundObject):
+            role = GroupRole.DEFENSES
+            tasks.append(GroupTask.MISSILE)
+        elif isinstance(ground_object, CoastalSiteGroundObject):
+            role = GroupRole.DEFENSES
+            tasks.append(GroupTask.COASTAL)
         else:
             raise NotImplementedError(f"Unhandled TGO type {ground_object.__class__}")
 

qt_ui/windows/groundobject/QGroundObjectMenu.py

@@ -104,14 +104,14 @@ class QGroundObjectMenu(QDialog):
         self.buy_replace.clicked.connect(self.buy_group)
         self.buy_replace.setProperty("style", "btn-success")
 
-        if self.ground_object.purchasable or self.game.turn == 0:
+        if self.ground_object.purchasable:
+            # if not purchasable but is_iads => naval unit
             if self.total_value > 0:
                 self.actionLayout.addWidget(self.sell_all_button)
             self.actionLayout.addWidget(self.buy_replace)
 
-        if self.show_buy_sell_actions and (
-            self.ground_object.purchasable or self.game.turn == 0
-        ):
+        if self.show_buy_sell_actions and self.ground_object.purchasable:
+            # if not purchasable but is_iads => naval unit
             self.mainLayout.addLayout(self.actionLayout)
         self.setLayout(self.mainLayout)
 

qt_ui/windows/newgame/QNewGameWizard.py

@@ -119,6 +119,7 @@ class NewGameWizard(QtWidgets.QWizard):
             high_digit_sams=self.field("high_digit_sams"),
             spanishnavypack=self.field("spanishnavypack"),
             swedishmilitaryassetspack=self.field("swedishmilitaryassetspack"),
+            coldwarassets=self.field("coldwarassets"),
             SWPack=self.field("SWPack"),
         )
 

qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py

@@ -146,6 +146,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
         self.registerField("high_digit_sams", self.high_digit_sams)
         self.swedishmilitaryassetspack = QtWidgets.QCheckBox()
         self.registerField("swedishmilitaryassetspack", self.swedishmilitaryassetspack)
+        self.coldwarassets = QtWidgets.QCheckBox()
+        self.registerField("coldwarassets", self.coldwarassets)
         self.SWPack = QtWidgets.QCheckBox()
         self.registerField("SWPack", self.SWPack)
         self.spanishnavypack = QtWidgets.QCheckBox()
@@ -179,7 +181,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
             ("F-84G Thunderjet (v2.5.7.01)", self.f84g_thunderjet),
             ("F9F Panther (v2.8.7.101)", self.f9f_panther),
             ("F/A-18E/F Super Hornet AI Tanker (version 1.4)", self.fa18ef_tanker),
-            ("F/A-18E/F/G Super Hornet (version 2.2.5)", self.fa_18efg),
+            ("F/A-18E/F/G Super Hornet (version 2.3.2)", self.fa_18efg),
+            ("Cold War Assets mod (v1.0)", self.coldwarassets),
             ("Frenchpack (v4.9.1)", self.frenchpack),
             ("High Digit SAMs", self.high_digit_sams),
             ("IDF Assets Pack (v1.1 by IDF Mods Project)", self.irondome),