Update UH-60L mod support to version 1.3.1

Updated the UH-60L loadout for version 1.3.1 and added the UH-60 to the following factions as per #2176
    Israel-USN 2005 (Allied Sword)
    Israel 2000
    Israel 2012'ish

changelog.md

@@ -13,6 +13,7 @@ Saves from 5.x are not compatible with 6.0.
 * **[Flight Planning]** Added the ability to plan tankers for recovery on package flights.  AI does not plan.
 * **[Flight Planning]** Air to Ground flights now have ECM enabled on lock at the join point, and SEAD/DEAD also have ECM enabled on detection and lock at ingress.
 * **[Flight Planning]** AWACS flightplan changed from orbit to a racetrack to reduce data link disconnects which were caused by blind spots as a result of the bank angle. 
+* **[Modding]** Updated UH-60L mod version support to 1.3.1
 * **[UI]** Added options to the loadout editor for setting properties such as HMD choice.
 * **[UI]** Added separate images for the different carrier types.
 * **[Campaign]** Allow campaign designers to define default values for the economy settings (starting budget and multiplier).

pydcs_extensions/uh60l/uh60l.py

@@ -15,6 +15,26 @@ class WeaponsUH60L:
         "name": "CEFS Fuel Tank 200 gallons",
         "weight": 730.09478,
     }
+    Cargo_Seats__Rear_Row_ = {
+        "clsid": "{UH60_SEAT_CARGO_REAR}",
+        "name": "Cargo Seats (Rear Row)",
+        "weight": 300,
+    }
+    Cargo_Seats__Three_Rows_ = {
+        "clsid": "{UH60_SEAT_CARGO_ALL}",
+        "name": "Cargo Seats (Three Rows)",
+        "weight": 900,
+    }
+    Left_Gunner_Seat = {
+        "clsid": "{UH60_SEAT_GUNNER_L}",
+        "name": "Left Gunner Seat",
+        "weight": 100,
+    }
+    Right_Gunner_Seat = {
+        "clsid": "{UH60_SEAT_GUNNER_R}",
+        "name": "Right Gunner Seat",
+        "weight": 100,
+    }
 
 
 inject_weapons(WeaponsUH60L)
@@ -30,10 +50,10 @@ class UH_60L(HelicopterType):
     fuel_max = 1362
     max_speed = 355.584
     chaff = 30
-    flare = 0
-    charge_total = 30
+    flare = 60
+    charge_total = 90
     chaff_charge_size = 1
-    flare_charge_size = 0
+    flare_charge_size = 1
     radio_frequency = 124
 
     panel_radio = {
@@ -77,7 +97,6 @@ class UH_60L(HelicopterType):
 
     property_defaults: Dict[str, Any] = {
         "FuelProbeEnabled": False,
-        "SoloFlight": False,
         "NetCrewControlPriority": 1,
     }
 
@@ -85,9 +104,6 @@ class UH_60L(HelicopterType):
         class FuelProbeEnabled:
             id = "FuelProbeEnabled"
 
-        class SoloFlight:
-            id = "SoloFlight"
-
         class NetCrewControlPriority:
             id = "NetCrewControlPriority"
 
@@ -1257,16 +1273,26 @@ class UH_60L(HelicopterType):
     # ERRR <CLEAN>
 
     class Pylon3:
-        CEFS_Fuel_Tank_200_gallons = (3, WeaponsUH60L.CEFS_Fuel_Tank_200_gallons)
-
-    # ERRR <CLEAN>
+        Left_Gunner_Seat = (3, WeaponsUH60L.Left_Gunner_Seat)
 
     class Pylon4:
-        CEFS_Fuel_Tank_200_gallons = (4, WeaponsUH60L.CEFS_Fuel_Tank_200_gallons)
+        Cargo_Seats__Rear_Row_ = (4, WeaponsUH60L.Cargo_Seats__Rear_Row_)
+        Cargo_Seats__Three_Rows_ = (4, WeaponsUH60L.Cargo_Seats__Three_Rows_)
+
+    class Pylon5:
+        Right_Gunner_Seat = (5, WeaponsUH60L.Right_Gunner_Seat)
+
+    class Pylon6:
+        CEFS_Fuel_Tank_200_gallons = (6, WeaponsUH60L.CEFS_Fuel_Tank_200_gallons)
 
     # ERRR <CLEAN>
 
-    pylons = {1, 2, 3, 4}
+    class Pylon7:
+        CEFS_Fuel_Tank_200_gallons = (7, WeaponsUH60L.CEFS_Fuel_Tank_200_gallons)
+
+    # ERRR <CLEAN>
+
+    pylons = {1, 2, 3, 4, 5, 6, 7}
 
     tasks = [task.Transport, task.Reconnaissance]
     task_default = task.Transport

qt_ui/windows/newgame/QNewGameWizard.py

@@ -672,7 +672,9 @@ class GeneratorOptions(QtWidgets.QWizardPage):
 
         modLayout = QtWidgets.QGridLayout()
         modLayout_row = 1
-        modLayout.addWidget(QtWidgets.QLabel("A-4E Skyhawk"), modLayout_row, 0)
+        modLayout.addWidget(
+            QtWidgets.QLabel("A-4E Skyhawk (version 2.0.0)"), modLayout_row, 0
+        )
         modLayout.addWidget(a4_skyhawk, modLayout_row, 1)
         modLayout_row += 1
         modLayout.addWidget(QtWidgets.QLabel("F-22A Raptor"), modLayout_row, 0)
@@ -686,13 +688,17 @@ class GeneratorOptions(QtWidgets.QWizardPage):
         )
         modLayout.addWidget(hercules, modLayout_row, 1)
         modLayout_row += 1
-        modLayout.addWidget(QtWidgets.QLabel("UH-60L Black Hawk"), modLayout_row, 0)
+        modLayout.addWidget(
+            QtWidgets.QLabel("UH-60L Black Hawk (version 1.3.1)"), modLayout_row, 0
+        )
         modLayout.addWidget(uh_60l, modLayout_row, 1)
         modLayout_row += 1
         # Section break here for readability
         modLayout.addWidget(QtWidgets.QWidget(), modLayout_row, 0)
         modLayout_row += 1
-        modLayout.addWidget(QtWidgets.QLabel("JAS 39 Gripen"), modLayout_row, 0)
+        modLayout.addWidget(
+            QtWidgets.QLabel("JAS 39 Gripen (version v1.8.0-beta)"), modLayout_row, 0
+        )
         modLayout.addWidget(jas39_gripen, modLayout_row, 1)
         modLayout_row += 1
         modLayout.addWidget(QtWidgets.QLabel("Su-57 Felon"), modLayout_row, 0)

resources/customized_payloads/UH-60L.lua

@@ -8,26 +8,34 @@ local unitPayloads =
 			["name"] = "Liberation Ferry",
 			["pylons"] =
 			{
-				[1] =
-				{
+				[1] = {
+					["CLSID"] = "{UH60_FUEL_TANK_230}",
+					["num"] = 7,
+				},
+				[2] = {
 					["CLSID"] = "{UH60_FUEL_TANK_230}",
 					["num"] = 1,
 				},
-				[2] =
-				{
+				[3] = {
 					["CLSID"] = "{UH60_FUEL_TANK_230}",
 					["num"] = 2,
 				},
-				[3] =
-				{
+				[4] = {
 					["CLSID"] = "{UH60_FUEL_TANK_230}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{UH60_SEAT_GUNNER_L}",
 					["num"] = 3,
 				},
-				[4] =
-				{
-					["CLSID"] = "{UH60_FUEL_TANK_230}",
+				[6] = {
+					["CLSID"] = "{UH60_SEAT_CARGO_ALL}",
 					["num"] = 4,
 				},
+				[7] = {
+					["CLSID"] = "{UH60_SEAT_GUNNER_R}",
+					["num"] = 5,
+				},
 			},
 			["tasks"] =
 			{

resources/factions/Israel-USN_2005_Allied_Sword.json

@@ -19,7 +19,8 @@
     "AH-64D Apache Longbow (AI)",
     "S-3B Viking",
     "SH-60B Seahawk",
-    "UH-1H Iroquois"
+    "UH-1H Iroquois",
+    "UH-60L"
   ],
   "awacs": [
     "E-2C Hawkeye"
@@ -97,7 +98,10 @@
     ],
     "UH-1H Iroquois": [
       "US NAVY"
-    ]
+    ],
+    "UH-60L": [
+      "Israeli Air Force"
+    ]	
   },
   "unrestricted_satnav": true
 }

resources/factions/israel_2000.json

@@ -16,7 +16,8 @@
     "F-15E Strike Eagle",
     "F-16CM Fighting Falcon (Block 50)",
     "F-4E Phantom II",
-    "UH-1H Iroquois"
+    "UH-1H Iroquois",
+    "UH-60L"
   ],
   "awacs": [
     "E-2C Hawkeye"
@@ -62,5 +63,10 @@
   "helicopter_carrier_names": [],
   "has_jtac": true,
   "jtac_unit": "MQ-9 Reaper",
+  "liveries_overrides": {
+    "UH-60L": [
+      "Israeli Air Force"
+    ]
+  },
   "unrestricted_satnav": true
 }

resources/factions/israel_2012.json

@@ -17,7 +17,8 @@
     "F-16CM Fighting Falcon (Block 50)",
     "F/A-18C Hornet (Lot 20)",
     "Mirage 2000C",
-    "UH-1H Iroquois"
+    "UH-1H Iroquois",
+    "UH-60L"
   ],
   "awacs": [
     "E-2C Hawkeye"
@@ -90,7 +91,10 @@
     ],
     "Mirage 2000C": [
       "UAE Air Force"
-    ]
+    ],
+    "UH-60L": [
+      "Israeli Air Force"
+    ]	
   },
   "unrestricted_satnav": true
 }