Update Grinnelli Designs F-22A Mod to 2.0.0 (May 2025) (#515)

2025-11-10 15:41:24 +00:00 · 2025-05-28 08:54:14 +10:00 · 2025-05-28 08:54:14 +10:00 · 68a9dbd141
commit 68a9dbd141
parent 4c3f0a82d9
4 changed files with 421 additions and 374 deletions
--- a/changelog.md
+++ b/changelog.md
@ -4,6 +4,7 @@
 * **[Campaigns]** Ability to define invisible FOBs
 * **[Plugins]** Improvements to AI support for EW Script 2.0
 * **[Config]** New preference setting to trigger the first-start window on every start (could help in scenarios multiple Retribution instances need to run concurrently)
+* **[Modding]** Update Grinelli Designs F-22A Mod to 2.0.0 (May 2025)

 ## Fixes
 * **[Flight Plans]** Fixed a bug when a package was created with only escort flights
--- a/pydcs_extensions/f22a/f22a.py
+++ b/pydcs_extensions/f22a/f22a.py
@ -11,6 +11,111 @@ from pydcs_extensions.weapon_injector import inject_weapons
 class F22AWeapons:
    AIM_9XX = {"clsid": "{AIM-9XX}", "name": "AIM-9XX", "weight": 85}
    AIM_120D = {"clsid": "{AIM-120D}", "name": "AIM-120D", "weight": 152}
+    AIM9X_BLKII_Sidewinder_IR_AAM = {
+        "clsid": "{AIM9X-BLKII}",
+        "name": "AIM9X-BLKII Sidewinder IR AAM",
+        "weight": 85.5,
+    }
+    LDTP_Fuel_tank_600_gal = {
+        "clsid": "{LDTP_FUEL_Tank}",
+        "name": "LDTP Fuel tank 600 gal",
+        "weight": 2045.8766885,
+    }
+    AIM_120C7___Active_Radar_AAM = {
+        "clsid": "{AIM-120C-7}",
+        "name": "AIM-120C7 - Active Radar AAM",
+        "weight": 161.48,
+    }
+    AIM_120C7___Active_Radar_AAM__IRST_POD = {
+        "clsid": "{AIM_120C-7_IRST_LEFT}",
+        "name": "AIM-120C7 - Active Radar AAM + IRST POD",
+        "weight": 266.48,
+    }
+    AIM_120C7___Active_Radar_AAM__IRST_POD_ = {
+        "clsid": "{AIM_120C-7_IRST_RIGHT}",
+        "name": "AIM-120C7 - Active Radar AAM + IRST POD",
+        "weight": 266.48,
+    }
+    AIM_120C8___Active_Radar_AAM = {
+        "clsid": "{AIM-120C-8}",
+        "name": "AIM-120C8 - Active Radar AAM",
+        "weight": 161.48,
+    }
+    AIM_120C8___Active_Radar_AAM__IRST_POD = {
+        "clsid": "{AIM_120C-8_IRST_LEFT}",
+        "name": "AIM-120C8 - Active Radar AAM + IRST POD",
+        "weight": 266.48,
+    }
+    AIM_120C8___Active_Radar_AAM__IRST_POD_ = {
+        "clsid": "{AIM_120C-8_IRST_RIGHT}",
+        "name": "AIM-120C8 - Active Radar AAM + IRST POD",
+        "weight": 266.48,
+    }
+    AIM_120D3___Active_Radar_AAM = {
+        "clsid": "{AIM-120D-3}",
+        "name": "AIM-120D3 - Active Radar AAM",
+        "weight": 165,
+    }
+    AIM_120D3___Active_Radar_AAM__IRST_POD = {
+        "clsid": "{AIM_120D-3_IRST_LEFT}",
+        "name": "AIM-120D3 - Active Radar AAM + IRST POD",
+        "weight": 270,
+    }
+    AIM_120D3___Active_Radar_AAM__IRST_POD_ = {
+        "clsid": "{AIM_120D-3_IRST_RIGHT}",
+        "name": "AIM-120D3 - Active Radar AAM + IRST POD",
+        "weight": 270,
+    }
+    AIM_260A___Active_Radar_AAM = {
+        "clsid": "{AIM-260A}",
+        "name": "AIM-260A - Active Radar AAM",
+        "weight": 160,
+    }
+    AIM_260A___Active_Radar_AAM__IRST_POD = {
+        "clsid": "{AIM_260A_IRST_LEFT}",
+        "name": "AIM-260A - Active Radar AAM + IRST POD",
+        "weight": 265,
+    }
+    AIM_260A___Active_Radar_AAM__IRST_POD_ = {
+        "clsid": "{AIM_260A_IRST_RIGHT}",
+        "name": "AIM-260A - Active Radar AAM + IRST POD",
+        "weight": 265,
+    }
+    _2x_AIM9X_BLKII_Sidewinder_IR_AAM = {
+        "clsid": "{LAU_115_2xAIM9X-II}",
+        "name": "2x AIM9X-BLKII Sidewinder IR AAM",
+        "weight": 221,
+    }
+    _2x_AIM_120C7___Active_Radar_AAM = {
+        "clsid": "{LAU_115_2xAIM-120C-7}",
+        "name": "2x AIM-120C7 - Active Radar AAM",
+        "weight": 372.96,
+    }
+    _2x_AIM_120C8___Active_Radar_AAM = {
+        "clsid": "{LAU_115_2xAIM-120C-8}",
+        "name": "2x AIM-120C8 - Active Radar AAM",
+        "weight": 372.96,
+    }
+    _2x_AIM_120D3___Active_Radar_AAM = {
+        "clsid": "{LAU_115_2xAIM-120D-3}",
+        "name": "2x AIM-120D3 - Active Radar AAM",
+        "weight": 380,
+    }
+    _2x_AIM_260A___Active_Radar_AAM = {
+        "clsid": "{LAU_115_2xAIM-260A}",
+        "name": "2x AIM-260A - Active Radar AAM",
+        "weight": 370,
+    }
+    IRST_Sensor_Pod = {
+        "clsid": "{IRST_SENSOR_Pod}",
+        "name": "IRST Sensor Pod",
+        "weight": 105,
+    }
+    Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM = {
+        "clsid": "{MAKO_A2A_C}",
+        "name": "Mako Multi-Mission Hypersonic Missile - Active Radar AAM",
+        "weight": 160,
+    }


 inject_weapons(F22AWeapons)
@ -23,7 +128,7 @@ class F_22A(PlaneType):
    height = 4.88
    width = 13.05
    length = 19.1
-    fuel_max = 6103
+    fuel_max = 8200
    max_speed = 2649.996
    chaff = 120
    flare = 120
@ -46,31 +151,109 @@ class F_22A(PlaneType):

    class Pylon1:
        AIM_9X_Sidewinder_IR_AAM = (1, Weapons.AIM_9X_Sidewinder_IR_AAM)
-        AIM_9XX = (1, F22AWeapons.AIM_9XX)
+        AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
+        AIM9X_BLKII_Sidewinder_IR_AAM = (1, F22AWeapons.AIM9X_BLKII_Sidewinder_IR_AAM)

    class Pylon2:
        Fuel_tank_610_gal = (2, Weapons.Fuel_tank_610_gal)
+        LDTP_Fuel_tank_600_gal = (2, F22AWeapons.LDTP_Fuel_tank_600_gal)
+        AIM_9X_Sidewinder_IR_AAM = (2, Weapons.AIM_9X_Sidewinder_IR_AAM)
+        AIM_9M_Sidewinder_IR_AAM = (2, Weapons.AIM_9M_Sidewinder_IR_AAM)
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
+            2,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            2,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM = (2, F22AWeapons.AIM_120C7___Active_Radar_AAM)
+        AIM_120C8___Active_Radar_AAM = (2, F22AWeapons.AIM_120C8___Active_Radar_AAM)
+        AIM_120D3___Active_Radar_AAM = (2, F22AWeapons.AIM_120D3___Active_Radar_AAM)
+        # ERRR {LAU_115_2xAIM9X-II}}
+        _2x_AIM_120C7___Active_Radar_AAM = (
+            2,
+            F22AWeapons._2x_AIM_120C7___Active_Radar_AAM,
+        )
+        _2x_AIM_120C8___Active_Radar_AAM = (
+            2,
+            F22AWeapons._2x_AIM_120C8___Active_Radar_AAM,
+        )
+        _2x_AIM_120D3___Active_Radar_AAM = (
+            2,
+            F22AWeapons._2x_AIM_120D3___Active_Radar_AAM,
+        )
+        _2x_AIM_260A___Active_Radar_AAM = (
+            2,
+            F22AWeapons._2x_AIM_260A___Active_Radar_AAM,
+        )

    class Pylon3:
        AIM_120C_AMRAAM___Active_Radar_AAM = (
            3,
            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
        )
-        AIM_120D = (3, F22AWeapons.AIM_120D)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            3,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM = (3, F22AWeapons.AIM_120C7___Active_Radar_AAM)
+        AIM_120C8___Active_Radar_AAM = (3, F22AWeapons.AIM_120C8___Active_Radar_AAM)
+        AIM_120D3___Active_Radar_AAM = (3, F22AWeapons.AIM_120D3___Active_Radar_AAM)
+        AIM_260A___Active_Radar_AAM = (3, F22AWeapons.AIM_260A___Active_Radar_AAM)

    class Pylon4:
+        IRST_Sensor_Pod = (4, F22AWeapons.IRST_Sensor_Pod)
        AIM_120C_AMRAAM___Active_Radar_AAM = (
            4,
            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
        )
-        AIM_120D = (4, F22AWeapons.AIM_120D)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            4,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM = (4, F22AWeapons.AIM_120C7___Active_Radar_AAM)
+        AIM_120C8___Active_Radar_AAM = (4, F22AWeapons.AIM_120C8___Active_Radar_AAM)
+        AIM_120D3___Active_Radar_AAM = (4, F22AWeapons.AIM_120D3___Active_Radar_AAM)
+        AIM_260A___Active_Radar_AAM = (4, F22AWeapons.AIM_260A___Active_Radar_AAM)
+        Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM = (
+            4,
+            F22AWeapons.Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM__IRST_POD = (
+            4,
+            F22AWeapons.AIM_120C7___Active_Radar_AAM__IRST_POD,
+        )
+        AIM_120C8___Active_Radar_AAM__IRST_POD = (
+            4,
+            F22AWeapons.AIM_120C8___Active_Radar_AAM__IRST_POD,
+        )
+        AIM_120D3___Active_Radar_AAM__IRST_POD = (
+            4,
+            F22AWeapons.AIM_120D3___Active_Radar_AAM__IRST_POD,
+        )
+        AIM_260A___Active_Radar_AAM__IRST_POD = (
+            4,
+            F22AWeapons.AIM_260A___Active_Radar_AAM__IRST_POD,
+        )

    class Pylon5:
        AIM_120C_AMRAAM___Active_Radar_AAM = (
            5,
            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
        )
-        AIM_120D = (5, F22AWeapons.AIM_120D)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            5,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM = (5, F22AWeapons.AIM_120C7___Active_Radar_AAM)
+        AIM_120C8___Active_Radar_AAM = (5, F22AWeapons.AIM_120C8___Active_Radar_AAM)
+        AIM_120D3___Active_Radar_AAM = (5, F22AWeapons.AIM_120D3___Active_Radar_AAM)
+        AIM_260A___Active_Radar_AAM = (5, F22AWeapons.AIM_260A___Active_Radar_AAM)
+        Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM = (
+            5,
+            F22AWeapons.Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM,
+        )

    class Pylon6:
        Smokewinder___red = (6, Weapons.Smokewinder___red)
@ -84,28 +267,109 @@ class F_22A(PlaneType):
            7,
            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
        )
-        AIM_120D = (7, F22AWeapons.AIM_120D)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            7,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM = (7, Weapons.AIM_120C7___Active_Radar_AAM)
+        AIM_120C8___Active_Radar_AAM = (7, Weapons.AIM_120C8___Active_Radar_AAM)
+        AIM_120D3___Active_Radar_AAM = (7, Weapons.AIM_120D3___Active_Radar_AAM)
+        AIM_260A___Active_Radar_AAM = (7, Weapons.AIM_260A___Active_Radar_AAM)
+        Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM = (
+            7,
+            Weapons.Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM,
+        )

    class Pylon8:
+        IRST_Sensor_Pod = (8, F22AWeapons.IRST_Sensor_Pod)
        AIM_120C_AMRAAM___Active_Radar_AAM = (
            8,
            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
        )
-        AIM_120D = (8, F22AWeapons.AIM_120D)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            8,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM = (8, Weapons.AIM_120C7___Active_Radar_AAM)
+        AIM_120C8___Active_Radar_AAM = (8, Weapons.AIM_120C8___Active_Radar_AAM)
+        AIM_120D3___Active_Radar_AAM = (8, Weapons.AIM_120D3___Active_Radar_AAM)
+        AIM_260A___Active_Radar_AAM = (8, Weapons.AIM_260A___Active_Radar_AAM)
+        Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM = (
+            8,
+            Weapons.Mako_Multi_Mission_Hypersonic_Missile___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM__IRST_POD_ = (
+            8,
+            Weapons.AIM_120C7___Active_Radar_AAM__IRST_POD_,
+        )
+        AIM_120C8___Active_Radar_AAM__IRST_POD_ = (
+            8,
+            Weapons.AIM_120C8___Active_Radar_AAM__IRST_POD_,
+        )
+        AIM_120D3___Active_Radar_AAM__IRST_POD_ = (
+            8,
+            Weapons.AIM_120D3___Active_Radar_AAM__IRST_POD_,
+        )
+        AIM_260A___Active_Radar_AAM__IRST_POD_ = (
+            8,
+            Weapons.AIM_260A___Active_Radar_AAM__IRST_POD_,
+        )

    class Pylon9:
        AIM_120C_AMRAAM___Active_Radar_AAM = (
            9,
            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
        )
-        AIM_120D = (9, F22AWeapons.AIM_120D)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            9,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM = (9, Weapons.AIM_120C7___Active_Radar_AAM)
+        AIM_120C8___Active_Radar_AAM = (9, Weapons.AIM_120C8___Active_Radar_AAM)
+        AIM_120D3___Active_Radar_AAM = (9, Weapons.AIM_120D3___Active_Radar_AAM)
+        AIM_260A___Active_Radar_AAM = (9, Weapons.AIM_260A___Active_Radar_AAM)

    class Pylon10:
        Fuel_tank_610_gal = (10, Weapons.Fuel_tank_610_gal)
+        LDTP_Fuel_tank_600_gal = (10, F22AWeapons.LDTP_Fuel_tank_600_gal)
+        AIM_9X_Sidewinder_IR_AAM = (10, Weapons.AIM_9X_Sidewinder_IR_AAM)
+        AIM_9M_Sidewinder_IR_AAM = (10, Weapons.AIM_9M_Sidewinder_IR_AAM)
+        AIM_120C_AMRAAM___Active_Radar_AAM = (
+            10,
+            Weapons.AIM_120C_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            10,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C7___Active_Radar_AAM = (10, Weapons.AIM_120C7___Active_Radar_AAM)
+        AIM_120C8___Active_Radar_AAM = (10, Weapons.AIM_120C8___Active_Radar_AAM)
+        AIM_120D3___Active_Radar_AAM = (10, Weapons.AIM_120D3___Active_Radar_AAM)
+        _2x_AIM9X_BLKII_Sidewinder_IR_AAM = (
+            10,
+            F22AWeapons._2x_AIM9X_BLKII_Sidewinder_IR_AAM,
+        )
+        _2x_AIM_120C7___Active_Radar_AAM = (
+            10,
+            F22AWeapons._2x_AIM_120C7___Active_Radar_AAM,
+        )
+        _2x_AIM_120C8___Active_Radar_AAM = (
+            10,
+            F22AWeapons._2x_AIM_120C8___Active_Radar_AAM,
+        )
+        _2x_AIM_120D3___Active_Radar_AAM = (
+            10,
+            F22AWeapons._2x_AIM_120D3___Active_Radar_AAM,
+        )
+        _2x_AIM_260A___Active_Radar_AAM = (
+            10,
+            F22AWeapons._2x_AIM_260A___Active_Radar_AAM,
+        )

    class Pylon11:
        AIM_9X_Sidewinder_IR_AAM = (11, Weapons.AIM_9X_Sidewinder_IR_AAM)
-        AIM_9XX = (11, F22AWeapons.AIM_9XX)
+        AIM_9M_Sidewinder_IR_AAM = (11, Weapons.AIM_9M_Sidewinder_IR_AAM)
+        AIM9X_BLKII_Sidewinder_IR_AAM = (11, F22AWeapons.AIM9X_BLKII_Sidewinder_IR_AAM)

    pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}

--- a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
+++ b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py
@ -218,7 +218,7 @@ class GeneratorOptions(QtWidgets.QWizardPage):
            ("F-15D Baz (v1.0)", self.f15d_baz),
            ("F-15I Ra'am (v1.0 by IDF Mods Project)", self.f_15_idf),
            ("F-16I Sufa & F-16D (v3.6 by IDF Mods Project)", self.f_16_idf),
-            ("F-22A Raptor (v3.0)", self.f22_raptor),
+            ("F-22A Raptor (v2.0.0 released May 2025)", self.f22_raptor),
            ("F-4B/C Phantom II (2.8.7.204)", self.f4bc_phantom),
            ("F-84G Thunderjet (v2.5.7.01)", self.f84g_thunderjet),
            ("F9F Panther (v2.8.7.101)", self.f9f_panther),
--- a/resources/customized_payloads/F-22A.lua
+++ b/resources/customized_payloads/F-22A.lua
@ -1,461 +1,243 @@
 local unitPayloads = {
 	["name"] = "F-22A",
 	["payloads"] = {
+
 		[1] = {
-			["displayName"] = "Retribution Ferry",
-			["name"] = "Retribution Ferry",
+			["displayName"] = "Retribution Escort",
+			["name"] = "Retribution Escort",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}",
-					["num"] = 2,
+					["CLSID"] = "{AIM9X-BLKII}",
+					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}",
-					["num"] = 10,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-9XX}",
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 11,
 				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
+				[3] = {
+					["CLSID"] = "{AIM-120D-3}",
 					["num"] = 9,
 				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
+				[4] = {
+					["CLSID"] = "{AIM_120D-3_IRST_RIGHT}",
 					["num"] = 8,
 				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
+				[5] = {
+					["CLSID"] = "{MAKO_A2A_C}",
 					["num"] = 7,
 				},
-				[7] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[8] = {
-					["CLSID"] = "{AIM-120D}",
+				[6] = {
+					["CLSID"] = "{AIM_120D-3_IRST_LEFT}",
 					["num"] = 4,
 				},
-				[9] = {
-					["CLSID"] = "{AIM-120D}",
+				[7] = {
+					["CLSID"] = "{AIM-120D-3}",
 					["num"] = 3,
 				},
-				[10] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 1,
+				[8] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 5,
 				},
 			},
 			["tasks"] = {
-				[1] = 10,
-				[2] = 11,
-				[3] = 18,
-				[4] = 15,
+				[1] = 11,
 			},
 		},
 		[2] = {
-			["name"] = "SEAD",
+			["name"] = "Retribution BARCAP",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 1,
 				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
+				[2] = {
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 11,
 				},
+				[3] = {
+					["CLSID"] = "{AIM-120D-3}",
+					["num"] = 9,
+				},
+				[4] = {
+					["CLSID"] = "{AIM_120D-3_IRST_RIGHT}",
+					["num"] = 8,
+				},
+				[5] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 7,
+				},
+				[6] = {
+					["CLSID"] = "{AIM_120D-3_IRST_LEFT}",
+					["num"] = 4,
+				},
+				[7] = {
+					["CLSID"] = "{AIM-120D-3}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 5,
+				},
 			},
 			["tasks"] = {
 				[1] = 11,
 			},
 		},
 		[3] = {
-			["name"] = "ANTISHIP",
+			["name"] = "Retribution Fighter Sweep",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 1,
 				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
+				[2] = {
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 11,
 				},
+				[3] = {
+					["CLSID"] = "{AIM-120D-3}",
+					["num"] = 9,
+				},
+				[4] = {
+					["CLSID"] = "{AIM_120D-3_IRST_RIGHT}",
+					["num"] = 8,
+				},
+				[5] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 7,
+				},
+				[6] = {
+					["CLSID"] = "{AIM_120D-3_IRST_LEFT}",
+					["num"] = 4,
+				},
+				[7] = {
+					["CLSID"] = "{AIM-120D-3}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 5,
+				},
 			},
 			["tasks"] = {
 				[1] = 11,
 			},
 		},
 		[4] = {
-			["name"] = "CAS",
+			["name"] = "Retribution TARCAP",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 1,
 				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
+				[2] = {
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 11,
 				},
+				[3] = {
+					["CLSID"] = "{AIM-120D-3}",
+					["num"] = 9,
+				},
+				[4] = {
+					["CLSID"] = "{AIM_120D-3_IRST_RIGHT}",
+					["num"] = 8,
+				},
+				[5] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 7,
+				},
+				[6] = {
+					["CLSID"] = "{AIM_120D-3_IRST_LEFT}",
+					["num"] = 4,
+				},
+				[7] = {
+					["CLSID"] = "{AIM-120D-3}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 5,
+				},
 			},
 			["tasks"] = {
 				[1] = 11,
 			},
 		},
 		[5] = {
-			["name"] = "BAI",
+			["name"] = "Retribution Intercept",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 1,
 				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
+				[2] = {
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 11,
 				},
+				[3] = {
+					["CLSID"] = "{AIM-120D-3}",
+					["num"] = 9,
+				},
+				[4] = {
+					["CLSID"] = "{AIM_120D-3_IRST_RIGHT}",
+					["num"] = 8,
+				},
+				[5] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 7,
+				},
+				[6] = {
+					["CLSID"] = "{AIM_120D-3_IRST_LEFT}",
+					["num"] = 4,
+				},
+				[7] = {
+					["CLSID"] = "{AIM-120D-3}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{MAKO_A2A_C}",
+					["num"] = 5,
+				},
 			},
 			["tasks"] = {
 				[1] = 11,
 			},
 		},
 		[6] = {
-			["name"] = "DEAD",
+			["name"] = "Retribution Reconnaissance",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
+					["CLSID"] = "{AIM9X-BLKII}",
 					["num"] = 1,
 				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 11,
-				},
-			},
-			["tasks"] = {
-				[1] = 11,
-			},
-		},
-		[7] = {
-			["name"] = "INTERCEPT",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
 				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
+					["CLSID"] = "{AIM9X-BLKII}",
+					["num"] = 11,
 				},
 				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 1,
-				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 11,
-				},
-			},
-			["tasks"] = {
-				[1] = 11,
-			},
-		},
-		[8] = {
-			["name"] = "OCA",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{AIM-120D}",
+					["CLSID"] = "{AIM-120D-3}",
 					["num"] = 9,
 				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
+				[4] = {
+					["CLSID"] = "{AIM_120D-3_IRST_RIGHT}",
 					["num"] = 8,
 				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
+				[5] = {
+					["CLSID"] = "{MAKO_A2A_C}",
 					["num"] = 7,
 				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
+				[6] = {
+					["CLSID"] = "{AIM_120D-3_IRST_LEFT}",
 					["num"] = 4,
 				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
+				[7] = {
+					["CLSID"] = "{AIM-120D-3}",
 					["num"] = 3,
 				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 1,
-				},
 				[8] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 11,
-				},
-			},
-			["tasks"] = {
-				[1] = 11,
-			},
-		},
-		[9] = {
-			["name"] = "STRIKE",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
+					["CLSID"] = "{MAKO_A2A_C}",
 					["num"] = 5,
 				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 1,
-				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 11,
-				},
-			},
-			["tasks"] = {
-				[1] = 11,
-			},
-		},
-		[10] = {
-			["name"] = "CAP",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 1,
-				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 11,
-				},
-				[9] = {
-					["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}",
-					["num"] = 10,
-				},
-				[10] = {
-					["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}",
-					["num"] = 2,
-				},
-			},
-			["tasks"] = {
-				[1] = 11,
-			},
-		},
-		[11] = {
-			["name"] = "RUNWAY_ATTACK",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 9,
-				},
-				[2] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 8,
-				},
-				[3] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 7,
-				},
-				[4] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 5,
-				},
-				[5] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 4,
-				},
-				[6] = {
-					["CLSID"] = "{AIM-120D}",
-					["num"] = 3,
-				},
-				[7] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 1,
-				},
-				[8] = {
-					["CLSID"] = "{AIM-9XX}",
-					["num"] = 11,
-				},
 			},
 			["tasks"] = {
 				[1] = 11,