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

qt_ui/main.py

@@ -336,6 +336,7 @@ def create_game(
             f105_thunderchief=False,
             hercules=False,
             jas39_gripen=False,
+            sk60_saab105=False,
             su15_flagon=False,
             su30_flanker_h=False,
             su57_felon=False,

qt_ui/uiconstants.py

@@ -215,6 +215,10 @@ def load_aircraft_icons():
         AIRCRAFT_ICONS[f1] = AIRCRAFT_ICONS["Mirage-F1C-200"]
     AIRCRAFT_ICONS["Mirage-F1M-CE"] = AIRCRAFT_ICONS["Mirage-F1CE"]
     AIRCRAFT_ICONS["F-15ESE"] = AIRCRAFT_ICONS["F-15E"]
+    AIRCRAFT_ICONS["Su-30MKA-AG"] = AIRCRAFT_ICONS["Su-30MKA"]
+    AIRCRAFT_ICONS["Su-30MKI-AG"] = AIRCRAFT_ICONS["Su-30MKI"]
+    AIRCRAFT_ICONS["Su-30MKM-AG"] = AIRCRAFT_ICONS["Su-30MKM"]
+    AIRCRAFT_ICONS["Su-30SM-AG"] = AIRCRAFT_ICONS["Su-30SM"]
 
 
 def load_vehicle_icons():

qt_ui/windows/QDebriefingWindow.py

@@ -87,7 +87,6 @@ class QDebriefingWindow(QDialog):
         pixmap = QPixmap("./resources/ui/debriefing.png")
         header.setPixmap(pixmap)
         layout.addWidget(header)
-        layout.addStretch()
 
         title = QLabel("<b>Casualty report</b>")
         layout.addWidget(title)
@@ -96,7 +95,7 @@ class QDebriefingWindow(QDialog):
         layout.addWidget(player_lost_units)
 
         enemy_lost_units = ScrollingCasualtyReportContainer(debriefing, player=False)
-        layout.addWidget(enemy_lost_units)
+        layout.addWidget(enemy_lost_units, 1)
 
         okay = QPushButton("Okay")
         okay.clicked.connect(self.close)

qt_ui/windows/QUnitInfoWindow.py

@@ -32,7 +32,15 @@ def aircraft_banner_for(unit_type: AircraftType) -> Path:
         name = "Mirage-F1C-200"
     elif unit_type.dcs_id in {"Mirage-F1CE", "Mirage-F1M-CE"}:
         name = "Mirage-F1C"
-    elif unit_type.dcs_id in {"Su-30MKA", "Su-30MKI", "Su-30MKM"}:
+    elif unit_type.dcs_id in {
+        "Su-30MKA",
+        "Su-30MKI",
+        "Su-30MKM",
+        "Su-30MKA-AG",
+        "Su-30MKI-AG",
+        "Su-30MKM-AG",
+        "Su-30SM-AG",
+    }:
         name = "Su-30SM"
     elif unit_type.dcs_id == "F-15ESE":
         name = "F-15E"

qt_ui/windows/newgame/QNewGameWizard.py

@@ -110,6 +110,7 @@ class NewGameWizard(QtWidgets.QWizard):
             uh_60l=self.field("uh_60l"),
             jas39_gripen=self.field("jas39_gripen"),
             super_etendard=self.field("super_etendard"),
+            sk_60=self.field("sk_60"),
             su15_flagon=self.field("su15_flagon"),
             su30_flanker_h=self.field("su30_flanker_h"),
             su57_felon=self.field("su57_felon"),

qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py

@@ -130,6 +130,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
         self.registerField("jas39_gripen", self.jas39_gripen)
         self.super_etendard = QtWidgets.QCheckBox()
         self.registerField("super_etendard", self.super_etendard)
+        self.sk_60 = QtWidgets.QCheckBox()
+        self.registerField("sk_60", self.sk_60)
         self.su15_flagon = QtWidgets.QCheckBox()
         self.registerField("su15_flagon", self.su15_flagon)
         self.su30_flanker_h = QtWidgets.QCheckBox()
@@ -185,8 +187,9 @@ class GeneratorOptions(QtWidgets.QWizardPage):
             ("OV-10A Bronco", self.ov10a_bronco),
             ("Spanish Naval Assets pack (desdemicabina 3.2.0)", self.spanishnavypack),
             ("Star Wars Modpack 2.54+", self.SWPack),
+            ("Saab 105/SK-60B (v1.2.1)", self.sk_60),
             ("Su-15 Flagon (v1.0)", self.su15_flagon),
-            ("Su-30 Flanker-H (V2.7.3 beta)", self.su30_flanker_h),
+            ("Su-30 Flanker-H (V2.7.73b)", self.su30_flanker_h),
             ("Su-57 Felon (build-04)", self.su57_felon),
             ("Super Étendard (v2.5.5)", self.super_etendard),
             ("Swedish Military Assets pack (1.10)", self.swedishmilitaryassetspack),
@@ -246,6 +249,7 @@ class GeneratorOptions(QtWidgets.QWizardPage):
         self.f105_thunderchief.setChecked(s.get("f105_thunderchief", False))
         self.f106_deltadart.setChecked(s.get("f106_deltadart", False))
         self.jas39_gripen.setChecked(s.get("jas39_gripen", False))
+        self.sk_60.setChecked(s.get("sk_60", False))
         self.super_etendard.setChecked(s.get("super_etendard", False))
         self.su30_flanker_h.setChecked(s.get("su30_flanker_h", False))
         self.su57_felon.setChecked(s.get("su57_felon", False))