Move latest from develop into 11.1 branch (#3414)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Starfire13 <72491792+Starfire13@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -31,7 +31,7 @@ body:
         If the bug was found in a development build, select "Development build"
         and provide a link to the build in the field below.
       options:
-        - 10.0.0
+        - 11.0.0
         - Development build
   - type: textarea
     attributes:

.github/ISSUE_TEMPLATE/new-game-bug.yml

@@ -39,7 +39,7 @@ body:
         If the bug was found in a development build, select "Development build"
         and provide a link to the build in the field below.
       options:
-        - 10.0.0
+        - 11.0.0
         - Development build
   - type: textarea
     attributes:

.github/actions/setup-liberation-python/action.yaml

@@ -6,7 +6,7 @@ runs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: "3.11"
+        python-version: "3.11.4"
         cache: pip
 
     - name: Install environment

README.md

@@ -17,11 +17,6 @@
 DCS Liberation is a [DCS World](https://www.digitalcombatsimulator.com/en/products/world/) turn based single-player or co-op dynamic campaign. 
 It is an external program that generates full and complex DCS missions and manage a persistent combat environment.
 
-**Note that DCS Liberation does not support the stable release of DCS. We can
-only guarantee compatibility  with either  the open beta or the stable release,
-and more people play the open beta. DCS stable _might_ work sometimes, but it's
-untested, and we will be unable to fix any bugs unique to stable DCS.**
-
 ![Screenshot](https://user-images.githubusercontent.com/315852/120939254-0b4a9f80-c6cc-11eb-82f5-ce3f8d714bfe.png)
 
 ## Downloads

changelog.md

@@ -1,3 +1,27 @@
+# 11.1.0
+
+Saves from 11.0.0 are compatible with 11.1.0. See Known Issues section for exceptions.
+
+## Features/Improvements
+
+* **[Engine]** Support for DCS 2.9.5.55918 including Heatblur F-4E and Polychop OH-58D Kiowa Warrior support. 
+
+## Fixes
+
+* **[Campaign]** Fixed double counting of parked aircraft kills when DCS reports multiple kill events.
+* **[Campaign]** Fixed error where frontline units are not re-deployed when multiple control points were captured in one turn or when control points are captured "out of order" using air-assault missions.
+* **[Cheat Menu]** Re-deploy frontline units when using cheats to capture control points, so that cheats behave the same way as capturing a control point in-mission.
+* **[Data]** Added FuSe-65 Early Warning Radar.
+* **[Data]** Updated Peru 1995 and Germany 1944 factions.
+* **[Flight Planning]** Theater refuelling flight plans (those not tied to a particular package) will remain on station for a longer period, specifically the desired mission duration + 30 minutes. By default, this increases the on-station time from 1 hour to 1.5 hours. 
+* **[Mission Generation]** Patched bug where Liberation crashed when aborting a turn when Fighter Sweep missions were planned.
+* **[Radios]** Added radio setup for F-5E, F-86, Mi-8 and Mi-24.
+* **[UI]** Naval control points (carriers, LHAs) can no longer be moved onto land.
+
+## Known Issues
+
+* When loading saves from 11.0, loadouts with AGM-45B (Imp), typically on A-4E-C mod, will have the AGM-45B replaced with an empty pylon due to changes in DCS for this weapon. The AGM-45A is not affected by this issue.
+
 # 11.0.0
 
 Saves from 10.x are not compatible with 11.0.0.

docs/conf.py

@@ -7,9 +7,9 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = "DCS Liberation"
-copyright = "2023, DCS Liberation Team"
+copyright = "2024, DCS Liberation Team"
 author = "DCS Liberation Team"
-release = "11.0.0"
+release = "11.1.0"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

game/ato/flightplans/theaterrefueling.py

@@ -17,7 +17,13 @@ class TheaterRefuelingFlightPlan(RefuelingFlightPlan):
 
     @property
     def patrol_duration(self) -> timedelta:
-        return timedelta(hours=1)
+        # Add 30 minutes to desired_player_mission_duration as TOTs for flights
+        # can sit up to this time. This extension means the tanker remains on
+        # station for the flights' return.
+        return (
+            self.flight.coalition.game.settings.desired_player_mission_duration
+            + timedelta(minutes=30)
+        )
 
 
 class Builder(IBuilder[TheaterRefuelingFlightPlan, PatrollingLayout]):

game/campaignloader/mizcampaignloader.py

@@ -61,6 +61,8 @@ class MizCampaignLoader:
         AirDefence.Hawk_ln.id,
         AirDefence.S_75M_Volhov.id,
         AirDefence.X_5p73_s_125_ln.id,
+        AirDefence.NASAMS_LN_B.id,
+        AirDefence.NASAMS_LN_C.id,
     }
 
     SHORT_RANGE_SAM_UNIT_TYPES = {

game/dcs/aircrafttype.py

@@ -34,6 +34,10 @@ from game.radio.channels import (
     ViggenRadioChannelAllocator,
     ViperChannelNamer,
     WarthogChannelNamer,
+    PhantomChannelNamer,
+    HindChannelNamer,
+    HipChannelNamer,
+    KiowaChannelNamer,
 )
 from game.utils import (
     Distance,
@@ -110,6 +114,10 @@ class RadioConfig:
             "apache": ApacheChannelNamer,
             "a10c-legacy": LegacyWarthogChannelNamer,
             "a10c-ii": WarthogChannelNamer,
+            "phantom": PhantomChannelNamer,
+            "hind": HindChannelNamer,
+            "hip": HipChannelNamer,
+            "kiowa": KiowaChannelNamer,
         }[config.get("namer", "default")]
 
 
@@ -498,9 +506,11 @@ class AircraftType(UnitType[Type[FlyingType]]):
             patrol_altitude=patrol_config.altitude,
             patrol_speed=patrol_config.speed,
             max_mission_range=mission_range,
-            cruise_speed=knots(data["cruise_speed_kt_indicated"])
-            if "cruise_speed_kt_indicated" in data
-            else None,
+            cruise_speed=(
+                knots(data["cruise_speed_kt_indicated"])
+                if "cruise_speed_kt_indicated" in data
+                else None
+            ),
             fuel_consumption=fuel_consumption,
             default_livery=data.get("default_livery"),
             intra_flight_radio=radio_config.intra_flight,

game/debriefing.py

@@ -391,6 +391,9 @@ class Debriefing:
             else:
                 enemy_losses.append(aircraft)
 
+        # Keep track of damaged units that are counted as killed so we don't double count
+        # when DCS reports damage multiple times.
+        units_killed_by_damage = set()
         for unit_data in self.state_data.unit_hit_point_updates:
             damaged_unit = FlyingUnitHitPointUpdate.from_json(unit_data, self.unit_map)
             if damaged_unit is None:
@@ -399,6 +402,9 @@ class Debriefing:
                 # If unit already killed, nothing to do.
                 if unit_data["name"] in self.state_data.killed_aircraft:
                     continue
+                if unit_data["name"] in units_killed_by_damage:
+                    continue
+                units_killed_by_damage.add(unit_data["name"])
                 if damaged_unit.is_friendly(to_player=True):
                     player_losses.append(damaged_unit.unit)
                 else:

game/radio/channels.py

@@ -389,3 +389,64 @@ class WarthogChannelNamer(ChannelNamer):
     @classmethod
     def name(cls) -> str:
         return "a10c-ii"
+
+
+class PhantomChannelNamer(ChannelNamer):
+    """Channel namer for the F4-E."""
+
+    @staticmethod
+    def channel_name(radio_id: int, channel_id: int) -> str:
+        radio_name = [
+            "COMM",  # AN/ARC-164 COMM
+            "AUX",  # AN/ARC-164 AUX
+        ][radio_id - 1]
+        return f"{radio_name} Ch {channel_id}"
+
+    @classmethod
+    def name(cls) -> str:
+        return "phantom"
+
+
+class HindChannelNamer(ChannelNamer):
+    """Channel namer for Mi-24 Hind"""
+
+    @staticmethod
+    def channel_name(radio_id: int, channel_id: int) -> str:
+        radio_name = [
+            "R863",
+            "R828",
+        ][radio_id - 1]
+        return f"{radio_name} Ch {channel_id-1}"
+
+    @classmethod
+    def name(cls) -> str:
+        return "hind"
+
+
+class HipChannelNamer(ChannelNamer):
+    """Channel namer for Mi-8 Hip"""
+
+    @staticmethod
+    def channel_name(radio_id: int, channel_id: int) -> str:
+        radio_name = [
+            "R863",
+            "R828",
+        ][radio_id - 1]
+        return f"{radio_name} Ch {channel_id}"
+
+    @classmethod
+    def name(cls) -> str:
+        return "hip"
+
+
+class KiowaChannelNamer(ChannelNamer):
+    """Channel namer for OH58D Kiowa Warrior"""
+
+    @staticmethod
+    def channel_name(radio_id: int, channel_id: int) -> str:
+        radio_name = ["UHF AM", "VHF AM", "VHF FM1", "VHF FM2"][radio_id - 1]
+        return f"{radio_name} Ch {channel_id}"
+
+    @classmethod
+    def name(cls) -> str:
+        return "kiowa"

game/radio/radios.py

@@ -1,4 +1,5 @@
 """Radio frequency types and allocators."""
+
 from __future__ import annotations
 
 import itertools
@@ -159,6 +160,7 @@ RADIOS: List[Radio] = [
     Radio("AN/ARC-164", (RadioRange(MHz(225), MHz(400), MHz(1), Modulation.AM),)),
     Radio("AN/ARC-186(V) AM", (RadioRange(MHz(116), MHz(152), MHz(1), Modulation.AM),)),
     Radio("AN/ARC-186(V) FM", (RadioRange(MHz(30), MHz(76), MHz(1), Modulation.FM),)),
+    Radio("AN/ARC-201", (RadioRange(MHz(30), MHz(88), kHz(25), Modulation.FM),)),
     Radio(
         "AN/ARC-210",
         (
@@ -185,6 +187,7 @@ RADIOS: List[Radio] = [
         ),
     ),
     Radio("AN/ARC-222", (RadioRange(MHz(116), MHz(152), MHz(1), Modulation.AM),)),
+    Radio("AN/ARC-27", (RadioRange(MHz(225), MHz(400), kHz(100), Modulation.AM),)),
     Radio("SCR-522", (RadioRange(MHz(100), MHz(156), MHz(1), Modulation.AM),)),
     Radio("A.R.I. 1063", (RadioRange(MHz(100), MHz(156), MHz(1), Modulation.AM),)),
     Radio("BC-1206", (RadioRange(kHz(200), kHz(400), kHz(10), Modulation.AM),)),
@@ -292,6 +295,9 @@ RADIOS: List[Radio] = [
             ),
         ),
     ),
+    # Mi-8/Mi-24
+    Radio("R863", (RadioRange(MHz(220), MHz(400), kHz(25), Modulation.AM),)),
+    Radio("R828", (RadioRange(MHz(20), MHz(60), kHz(25), Modulation.FM),)),
 ]
 
 

game/server/controlpoints/routes.py

@@ -89,6 +89,11 @@ def set_destination(
             detail=f"Cannot move {cp} more than "
             f"{cp.max_move_distance.nautical_miles}nm.",
         )
+    if cp.is_fleet and not game.theater.is_in_sea(point):
+        raise HTTPException(
+            status.HTTP_400_BAD_REQUEST,
+            detail=f"Cannot move naval control point {cp} onto land.",
+        )
     cp.target_position = point
     from .. import EventStream
 

game/settings/settings.py

@@ -467,6 +467,12 @@ class Settings:
         default=timedelta(minutes=60),
         min=30,
         max=150,
+        detail=(
+            "Period of time after the start of a turn where "
+            "there is coverage by one or more CAP flight(s), "
+            "refuelling flights not tied to a specific package are on station, "
+            "and other flights have their TOTs."
+        ),
     )
 
     # Performance

game/sim/missionresultsprocessor.py

@@ -320,38 +320,40 @@ class MissionResultsProcessor:
         """ "
         Auto redeploy units to newly captured base
         """
+        # Find the set of friendly CPs that can either contribute or receive frontline units
+        all_ally_connected_cps = cp.transitive_connected_friendly_points() + [cp]
 
-        ally_connected_cps = [
-            ocp for ocp in cp.connected_points if cp.captured == ocp.captured
-        ]
-        enemy_connected_cps = [
-            ocp for ocp in cp.connected_points if cp.captured != ocp.captured
-        ]
+        # Split into frontline CPs that are connected to enemy CPs and should receive units
+        # vs. non-frontline CPs that are not connected to enemy CPs and should send units.
+        frontline_cps = []
+        non_frontline_cps = []
+        for cp in all_ally_connected_cps:
+            is_frontline = False
+            for ocp in cp.connected_points:
+                if not ocp.captured:
+                    is_frontline = True
+                    break
+            if is_frontline:
+                frontline_cps.append(cp)
+            else:
+                non_frontline_cps.append(cp)
 
-        # If the newly captured cp does not have enemy connected cp,
-        # then it is not necessary to redeploy frontline units there.
-        if len(enemy_connected_cps) == 0:
+        # If there are no frontline CPs, then nothing to do.
+        if len(frontline_cps) == 0:
             return
 
-        # From each ally cp, send reinforcements
-        for ally_cp in ally_connected_cps:
-            self.redeploy_between(cp, ally_cp)
+        # Equally split between all frontline CPs
+        move_factor = 1.0 / len(frontline_cps)
+        for non_frontline_cp in non_frontline_cps:
+            for frontline_cp in frontline_cps:
+                self.redeploy_between(frontline_cp, non_frontline_cp, move_factor)
 
-    def redeploy_between(self, destination: ControlPoint, source: ControlPoint) -> None:
+    def redeploy_between(
+        self, destination: ControlPoint, source: ControlPoint, move_factor: float
+    ) -> None:
         total_units_redeployed = 0
         moved_units = {}
 
-        if source.has_active_frontline or not destination.captured:
-            # If there are still active front lines to defend at the
-            # transferring CP we should not transfer all units.
-            #
-            # Opfor also does not transfer all of their units.
-            # TODO: Balance the CPs rather than moving half from everywhere.
-            move_factor = 0.5
-        else:
-            # Otherwise we can move everything.
-            move_factor = 1
-
         for frontline_unit, count in source.base.armor.items():
             moved_units[frontline_unit] = int(count * move_factor)
             total_units_redeployed = total_units_redeployed + int(count * move_factor)

game/version.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 
 MAJOR_VERSION = 11
-MINOR_VERSION = 0
+MINOR_VERSION = 1
 MICRO_VERSION = 0
 VERSION_NUMBER = ".".join(str(v) for v in (MAJOR_VERSION, MINOR_VERSION, MICRO_VERSION))
 

pydcs_extensions/a4ec/a4ec.py

@@ -1004,7 +1004,7 @@ class A_4E_C(PlaneType):
         LAU3_WP156 = (1, Weapons.LAU3_WP156)
         LAU3_HE151 = (1, Weapons.LAU3_HE151)
         AGM_45A_Shrike_ARM = (1, Weapons.AGM_45A_Shrike_ARM)
-        AGM_45B_Shrike_ARM__Imp_ = (1, Weapons.AGM_45B_Shrike_ARM__Imp_)
+        AGM_45B_Shrike_ARM = (1, Weapons.AGM_45B_Shrike_ARM)
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             1,
             Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
@@ -1213,7 +1213,7 @@ class A_4E_C(PlaneType):
             WeaponsA4EC._2_x_LAU_3_pod___19_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice__TER__,
         )
         AGM_45A_Shrike_ARM = (2, Weapons.AGM_45A_Shrike_ARM)
-        AGM_45B_Shrike_ARM__Imp_ = (2, Weapons.AGM_45B_Shrike_ARM__Imp_)
+        AGM_45B_Shrike_ARM = (2, Weapons.AGM_45B_Shrike_ARM)
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             2,
             Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
@@ -1850,7 +1850,7 @@ class A_4E_C(PlaneType):
             WeaponsA4EC._2_x_LAU_3_pod___19_x_2_75_Hydra__UnGd_Rkts_WTU_1_B__Practice__TER___,
         )
         AGM_45A_Shrike_ARM = (4, Weapons.AGM_45A_Shrike_ARM)
-        AGM_45B_Shrike_ARM__Imp_ = (4, Weapons.AGM_45B_Shrike_ARM__Imp_)
+        AGM_45B_Shrike_ARM = (4, Weapons.AGM_45B_Shrike_ARM)
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             4,
             Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
@@ -2048,7 +2048,7 @@ class A_4E_C(PlaneType):
         LAU3_WP156 = (5, Weapons.LAU3_WP156)
         LAU3_HE151 = (5, Weapons.LAU3_HE151)
         AGM_45A_Shrike_ARM = (5, Weapons.AGM_45A_Shrike_ARM)
-        AGM_45B_Shrike_ARM__Imp_ = (5, Weapons.AGM_45B_Shrike_ARM__Imp_)
+        AGM_45B_Shrike_ARM = (5, Weapons.AGM_45B_Shrike_ARM)
         Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
             5,
             Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,

pydcs_extensions/f4/f4.py

@@ -542,7 +542,7 @@ class VSN_F4C(PlaneType):
             Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD,
         )
         Mk_84___2000lb_GP_Bomb_LD = (3, Weapons.Mk_84___2000lb_GP_Bomb_LD)
-        AGM_45B_Shrike_ARM__Imp_ = (3, Weapons.AGM_45B_Shrike_ARM__Imp_)
+        AGM_45B_Shrike_ARM = (3, Weapons.AGM_45B_Shrike_ARM)
         AGM_45A_Shrike_ARM = (3, Weapons.AGM_45A_Shrike_ARM)
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             3,
@@ -653,7 +653,7 @@ class VSN_F4C(PlaneType):
             Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD,
         )
         Mk_84___2000lb_GP_Bomb_LD = (9, Weapons.Mk_84___2000lb_GP_Bomb_LD)
-        AGM_45B_Shrike_ARM__Imp_ = (9, Weapons.AGM_45B_Shrike_ARM__Imp_)
+        AGM_45B_Shrike_ARM = (9, Weapons.AGM_45B_Shrike_ARM)
         AGM_45A_Shrike_ARM = (9, Weapons.AGM_45A_Shrike_ARM)
         LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
             9,

qt_ui/windows/AirWingConfigurationDialog.py

@@ -285,6 +285,7 @@ class SquadronConfigurationBox(QGroupBox):
         )
         self.player_list.setAcceptRichText(False)
         self.player_list.setEnabled(squadron.player and squadron.aircraft.flyable)
+        self.player_list.setMaximumHeight(125)
         left_column.addWidget(self.player_list)
 
         button_row = QHBoxLayout()
@@ -664,7 +665,7 @@ class OverfullAirbasesDisplay(QGroupBox):
         parent: QWidget | None = None,
     ) -> None:
         super().__init__("Overfull airbases", parent)
-        self.setMaximumHeight(200)
+        self.setMaximumHeight(125)
 
         self.parking_tracker = parking_tracker
         self.parking_tracker.allocation_changed.connect(self.on_allocation_changed)
@@ -790,7 +791,7 @@ class AirWingConfigurationDialog(QDialog):
         self.game = game
         self.parking_tracker = AirWingConfigParkingTracker(game)
 
-        self.setMinimumSize(1024, 768)
+        self.resize(1024, 900)
         self.setWindowTitle(f"Air Wing Configuration")
         # TODO: self.setWindowIcon()
 

qt_ui/windows/QLiberationWindow.py

@@ -494,6 +494,7 @@ class QLiberationWindow(QMainWindow):
             "Nosajthedevil",
             "kivipe",
             "Chilli935",
+            "DillieKoe",
         ]
         text = (
             "<h3>DCS Liberation "

qt_ui/windows/basemenu/QBaseMenu2.py

@@ -16,6 +16,7 @@ from game import Game
 from game.ato.flighttype import FlightType
 from game.config import RUNWAY_REPAIR_COST
 from game.server import EventStream
+from game.sim.missionresultsprocessor import MissionResultsProcessor
 from game.theater import (
     AMMO_DEPOT_FRONTLINE_UNIT_CONTRIBUTION,
     ControlPoint,
@@ -156,6 +157,9 @@ class QBaseMenu2(QDialog):
             self.cp.capture(
                 self.game_model.game, events, for_player=not self.cp.captured
             )
+            # Redeploy frontline units, as if the CP capture was done in mission.
+            results_processor = MissionResultsProcessor(self.game_model.game)
+            results_processor.redeploy_units(self.cp)
             self.close()
 
     @property

qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py

@@ -127,6 +127,12 @@ class QFlightPayloadTab(QFrame):
         scrolling_layout.addWidget(docsText)
 
         self.setLayout(layout)
+        # Increase width of tab when there are long loadout names. Add 50px to loadout selector
+        # to account for padding around the selector.
+        width = max(
+            self.sizeHint().width(), self.loadout_selector.sizeHint().width() + 50
+        )
+        self.setMinimumWidth(width)
 
     def resize_for_flight(self) -> None:
         self.member_selector.setMaximum(self.flight.count - 1)

qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py

@@ -83,7 +83,7 @@ class QFlightWaypointList(QTableView):
             self.model.index(current_index, 0), QItemSelectionModel.Select
         )
         self.resizeColumnsToContents()
-        total_column_width = self.verticalHeader().width() + self.lineWidth()
+        total_column_width = self.verticalHeader().sizeHint().width() + self.lineWidth()
         for i in range(0, self.model.columnCount()):
             total_column_width += self.columnWidth(i) + self.lineWidth()
         self.setFixedWidth(total_column_width)

qt_ui/windows/newgame/QNewGameWizard.py

@@ -142,6 +142,10 @@ class NewGameWizard(QtWidgets.QWizard):
 
         self.setWindowTitle("New Game")
 
+        # Resize wizard to the size of the largest page to keep size and position
+        # consistent.
+        self.resize(self.theater_page.sizeHint())
+
     def accept(self):
         logging.info("New Game Wizard accept")
         logging.info("======================")

requirements.txt

@@ -18,9 +18,9 @@ future==0.18.3
 h11==0.14.0
 httptools==0.6.1
 identify==2.5.32
-idna==3.6
+idna==3.7
 iniconfig==2.0.0
-Jinja2==3.1.3
+Jinja2==3.1.4
 MarkupSafe==2.1.3
 mypy==1.7.1
 mypy-extensions==1.0.0
@@ -29,14 +29,14 @@ numpy==1.26.2
 packaging==23.2
 pathspec==0.11.2
 pefile==2023.2.7
-Pillow==10.2.0
+Pillow==10.3.0
 platformdirs==4.0.0
 pluggy==1.3.0
 pre-commit==3.5.0
 pydantic==2.5.2
 pydantic-settings==2.1.0
 pydantic_core==2.14.5
-pydcs @ git+https://github.com/zhexu14/dcs@bb41fa849e718fee1b97d5d7a7c2e417f78de3d8
+pydcs @ git+https://github.com/dcs-liberation/dcs@58b4cc91bfb068e094f684e4747190d1dcd57232
 pyinstaller==5.13.1
 pyinstaller-hooks-contrib==2023.6
 pyproj==3.6.1

resources/campaigns/battle_for_no_mans_land.yaml

@@ -34,6 +34,8 @@ miz: battle_for_no_mans_land.miz
 performance: 1
 recommended_start_date: 2001-11-10
 version: "11.0"
+settings:
+  squadron_start_full: true
 squadrons:
   #Port Stanley
   1:
@@ -45,12 +47,11 @@ squadrons:
     - primary: BAI
       secondary: any
       aircraft:
-        - AH-64D Apache Longbow
+        - OH-58D(R) Kiowa Warrior
       size: 6
     - primary: Air Assault
       secondary: any
       aircraft:
-        - UH-60L
         - UH-60A
       size: 4
   #San Carlos FOB

resources/campaigns/black_sea.yaml

@@ -8,7 +8,7 @@ recommended_player_faction: USA 2005
 recommended_enemy_faction: Russia 2010
 recommended_start_date: 2004-01-07
 miz: black_sea.miz
-performance: 2
+performance: 3
 version: "11.0"
 squadrons:
   # Anapa-Vityazevo

resources/campaigns/exercise_bright_star.yaml

@@ -11,14 +11,14 @@ description:
     Exercise Bright Star. The exercise has grown over the years to incorporate 
     a wide array of international participants. The 2025 iteration of 
     Exercise Bright Star features eight participating nations alongside 
-    fourteen observer nations.</p><p>
-    For the 2025 exercises, the United States, along with a select contingent 
+    fourteen observer nations.</p>
+    <p>For the 2025 exercises, the United States, along with a select contingent 
     from the exercise coalition, will take on the role of a hypothetical 
     adversarial nation, dubbed Orangeland. This scenario is designed to 
     simulate a mock invasion against Cairo, and presents a valuable 
     opportunity for participating nations to refine their joint operational 
-    capabilities and improve logistical and tactical interoperability</p><p>
-    A historic addition to Exercise Bright Star 2025 is the participation of 
+    capabilities and improve logistical and tactical interoperability.</p>
+    <p>A historic addition to Exercise Bright Star 2025 is the participation of 
     Israel as an observer nation. This marks a significant milestone, given 
     the complex historical relations in the region, and symbolises a step 
     forward in regional collaboration and military diplomacy. Israel's role, 
@@ -26,10 +26,17 @@ description:
     not only demonstrates the broadening scope of the exercise but also highlights 
     the value of fostering an environment of mutual cooperation and shared 
     security objectives.</p>
+    <p><strong>Note:</strong> There is no overland supply route between Melez and 
+    Wadi al Jandali due to the simulated destruction of the Al Salam Bridge spanning 
+    the Suez Canal. Consequently, ground units will have to be ferried across by 
+    air during the exercise.</p>
 miz: exercise_bright_star.miz
 performance: 1
 recommended_start_date: 2025-09-01
 version: "11.0"
+settings:
+  hercules: true
+  squadron_start_full: true  
 squadrons:
   Blue CV-1:
     - primary: SEAD
@@ -45,56 +52,46 @@ squadrons:
       aircraft:
         - S-3B Tanker
       size: 4
-  Bombers from RAF Fairford:
+  Bombers from Al Udeid Air Base:
     - primary: Anti-ship
       secondary: air-to-ground
       aircraft:
         - B-52H Stratofortress
-      size: 8
+      size: 4
     - primary: Strike
       secondary: air-to-ground
       aircraft:
         - B-1B Lancer
-      size: 8
-  # Hatzerim (141)
-  7:
+      size: 4
+  # Ovda
+  10:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
         - A-10C Thunderbolt II (Suite 7)
-      size: 6
+      size: 8
     - primary: Escort
       secondary: any
       aircraft:
         - F-15C Eagle
-      size: 20
+      size: 16
     - primary: OCA/Runway
       secondary: any
       aircraft:
         - F-15E Strike Eagle (Suite 4+)
       size: 16
-    - primary: DEAD
-      secondary: any
-      aircraft:
-        - F-16CM Fighting Falcon (Block 50)
-      size: 20
     - primary: BAI
       secondary: any
       aircraft:
         - JF-17 Thunder
       size: 16
-    - primary: BARCAP
+  # Ramon Airbase
+  9:
+    - primary: DEAD
       secondary: any
       aircraft:
-        - Mirage 2000C
-      size: 12
-  # Kedem
-  12:
-    - primary: Transport
-      secondary: any
-      aircraft:
-        - CH-47D
-      size: 20
+        - F-16CM Fighting Falcon (Block 50)
+      size: 16
     - primary: BAI
       secondary: any
       aircraft:
@@ -103,20 +100,24 @@ squadrons:
     - primary: Air Assault
       secondary: any
       aircraft:
-        - UH-60L
         - UH-60A
       size: 4
-  # Nevatim (106)
-# Nevatim temporarilly disabled because airfield is borked
-#  8:
-#    - primary: AEW&C
-#      aircraft:
-#        - E-3A
-#      size: 2
-#    - primary: Refueling
-#      aircraft:
-#        - KC-135 Stratotanker
-#      size: 2
+  # Ben-Gurion
+  24:
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 2
+    - primary: AEW&C
+      aircraft:
+        - E-3A
+      size: 2
+    - primary: Refueling
+      aircraft:
+        - KC-135 Stratotanker
+      size: 2
   # Melez (30)
   5:
     - primary: CAS
@@ -144,10 +145,20 @@ squadrons:
     - primary: SEAD
       secondary: any
       aircraft:
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
       size: 20
     - primary: DEAD
-      secondary: any
+      secondary: 
+        - BAI
+        - BARCAP
+        - CAS
+        - Escort
+        - Fighter sweep
+        - Intercept
+        - OCA/Aircraft
+        - OCA/Runway
+        - Strike
+        - TARCAP
       aircraft:
         - F-16CM Fighting Falcon (Block 50)
       size: 20
@@ -164,9 +175,11 @@ squadrons:
   # Cairo West (95)
   18:
     - primary: Transport
+      secondary: any
       aircraft:
+        - C-130J-30 Super Hercules
         - C-130
-      size: 8
+      size: 2
     - primary: BARCAP
       secondary: air-to-air
       aircraft:

resources/campaigns/exercise_vegas_nerve.yaml

@@ -16,6 +16,9 @@ miz: exercise_vegas_nerve.miz
 performance: 1
 recommended_start_date: 2011-02-24
 version: "11.0"
+settings:
+  hercules: true
+  squadron_start_full: true
 squadrons:
   Bombers from Minot AFB:
     - primary: Strike
@@ -35,16 +38,12 @@ squadrons:
       secondary: any
       aircraft:
         - F-15C Eagle
-      size: 12
+      size: 16
     - primary: Strike
       secondary: air-to-ground
       aircraft:
         - F-15E Strike Eagle (Suite 4+)
-      size: 12
-    - primary: AEW&C
-      aircraft:
-        - E-3A
-      size: 1
+      size: 8
   # Tonopah Test Range
   18:
     - primary: BAI
@@ -56,7 +55,12 @@ squadrons:
       secondary: any
       aircraft:
         - AH-64D Apache Longbow
-      size: 10
+      size: 2
+    - primary: CAS
+      secondary: any
+      aircraft:
+        - OH-58D(R) Kiowa Warrior
+      size: 2
     - primary: DEAD
       secondary: air-to-ground
       aircraft:
@@ -67,24 +71,28 @@ squadrons:
       aircraft:
         - F-16CM Fighting Falcon (Block 50)
       size: 24
-    - primary: Air Assault
-      secondary: air-to-ground
+    - primary: AEW&C
       aircraft:
-        - UH-60L
-        - UH-60A
-      size: 2
+        - E-3A
+      size: 1
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - CH-47D
+      size: 1
   # Groom Lake
   2:
     - primary: Escort
       secondary: air-to-air
       aircraft:
         - J-11A Flanker-L
-      size: 20
+      size: 16
     - primary: BAI
       secondary: air-to-ground
       aircraft:
         - Su-25T Frogfoot
-      size: 20
+      size: 12
   # Creech
   1:
     - primary: CAS
@@ -113,16 +121,16 @@ squadrons:
       secondary: air-to-ground
       aircraft:
         - Su-24M Fencer-D
-      size: 20
+      size: 16
     - primary: DEAD
       secondary: air-to-ground
       aircraft:
         - Su-34 Fullback
-      size: 20
+      size: 16
   # Boulder City Airport
   6:
     - primary: SEAD Escort
       secondary: any
       aircraft:
         - FC-1 Fierce Dragon
-      size: 20
+      size: 16

resources/campaigns/final_countdown_2.yaml

@@ -21,6 +21,8 @@ miz: final_countdown_2.miz
 performance: 2
 recommended_start_date: 1944-06-06
 version: "11.0"
+settings:
+  squadron_start_full: true
 squadrons:
   #Blue CV (90)
   Blue-CV:
@@ -50,7 +52,6 @@ squadrons:
     - primary: Air Assault
       secondary: any
       aircraft:
-        - UH-60L
         - UH-60A
       size: 6
   #Stoney Cross (39)

resources/campaigns/grabthars_hammer.yaml

@@ -7,7 +7,7 @@ recommended_enemy_faction: Russia 2010
 description:
   <p>An Argentinean extremist group has contracted the Sons of Warvan (SoW), an
   unusually well-equipped PMC with close ties to the Russian government, to
-  construct a beryllium bomb at the secret Omega 13 production facility in
+  construct a beryllium bomb at the secret Omega-13 production facility in
   Ushuaia for use in its ongoing conflict with Chile. United States military
   forces have established a foothold at San Julian. While the SoW are distracted
   up north, it is up to the Marines to launch an assault upon Ushuaia from an LHA
@@ -17,13 +17,16 @@ miz: grabthars_hammer.miz
 performance: 2
 recommended_start_date: 1999-12-25
 version: "11.0"
+settings:
+  hercules: true
+  squadron_start_full: true
 squadrons:
   #Mount Pleasant
   2:
-    - primary: DEAD
+    - primary: BAI
       secondary: any
       aircraft:
-        - F-16CM Fighting Falcon (Block 50)
+        - F-15E Strike Eagle (Suite 4+)
       size: 8
     - primary: CAS
       secondary: air-to-ground
@@ -39,17 +42,23 @@ squadrons:
       secondary: any
       aircraft:
         - AH-64D Apache Longbow
-      size: 8
+      size: 4
     - primary: Refueling
       aircraft:
         - KC-135 Stratotanker
-      size: 2
-  #San Julian
-  11:
-    - primary: BAI
+      size: 1
+    - primary: Transport
       secondary: any
       aircraft:
-        - F-15E Strike Eagle (Suite 4+)
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 1
+  #San Julian
+  11:
+    - primary: DEAD
+      secondary: any
+      aircraft:
+        - F-16CM Fighting Falcon (Block 50)
       size: 8
   #Blue CV
   Blue-CV:
@@ -62,12 +71,12 @@ squadrons:
       secondary: any
       aircraft:
         - F/A-18C Hornet (Lot 20)
-      size: 40
+      size: 32
     - primary: DEAD
       secondary: air-to-ground
       aircraft:
         - S-3B Viking
-      size: 20
+      size: 16
     - primary: AEW&C
       aircraft:
         - E-2C Hawkeye
@@ -79,7 +88,6 @@ squadrons:
     - primary: Air Assault
       secondary: any
       aircraft:
-        - UH-60L
         - UH-60A
       size: 4
   # Blue LHA
@@ -88,7 +96,12 @@ squadrons:
       secondary: air-to-ground
       aircraft:
         - AV-8B Harrier II Night Attack
-      size: 18
+      size: 10
+    - primary: CAS
+      secondary: any
+      aircraft:
+        - OH-58D(R) Kiowa Warrior
+      size: 8      
     - primary: Air Assault
       secondary: any
       aircraft:
@@ -99,18 +112,18 @@ squadrons:
       secondary: air-to-ground
       aircraft:
         - B-52H Stratofortress
-      size: 12
+      size: 4
     - primary: OCA/Runway
       secondary: air-to-ground
       aircraft:
         - B-1B Lancer
-      size: 12
+      size: 4
   #El Calafate
   14:
     - primary: Transport
       aircraft:
         - Mi-8MTV2 Hip
-      size: 10
+      size: 8
   #Rio Gallegros
   5:
     - primary: Escort

resources/campaigns/operation_aegean_aegis.yaml

@@ -38,12 +38,14 @@ description:
   </p>
 miz: operation_aegean_aegis.miz
 performance: 1
-recommended_start_date: 2017-04-20
+recommended_start_date: 2013-04-20
 recommended_player_money: 1000
 recommended_enemy_money: 0
 recommended_player_income_multiplier: 1.0
 recommended_enemy_income_multiplier: 0.0
 version: "11.0"
+settings:
+  squadron_start_full: true
 squadrons:
   #Tarawa Class LHA
   Blue-LHA:
@@ -51,7 +53,12 @@ squadrons:
       secondary: any
       aircraft:
         - AH-64D Apache Longbow
-      size: 12
+      size: 8
+    - primary: CAS
+      secondary: any
+      aircraft:
+        - OH-58D(R) Kiowa Warrior
+      size: 4
     - primary: DEAD
       secondary: air-to-ground
       aircraft:
@@ -67,7 +74,7 @@ squadrons:
     - primary: DEAD
       secondary: air-to-ground
       aircraft:
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
       size: 12
   #Akrotiri
   44:
@@ -79,7 +86,7 @@ squadrons:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
-        - OH-58D Kiowa Warrior
+        - OH-58D(R) Kiowa Warrior
       size: 4
     - primary: Transport
       secondary: any

resources/campaigns/operation_allied_sword.yaml

@@ -13,6 +13,7 @@ recommended_player_faction:
     - en_US
   aircrafts:
     - F-4E Phantom II
+    - F-4E-45MC Phantom II
     - F-15C Eagle
     - F-15E Strike Eagle
     - F-15E Strike Eagle (Suite 4+)
@@ -100,7 +101,6 @@ recommended_enemy_faction:
     assets. Designed for use with the Allied Sword scenario.</p>
   aircrafts:
     - MiG-23ML Flogger-G
-    - MiG-25RBT Foxbat-B
     - MiG-29A Fulcrum-A
     - Su-17M4 Fitter-K
     - Su-24M Fencer-D
@@ -110,7 +110,6 @@ recommended_enemy_faction:
     - Tu-22M3 Backfire-C
     - Mi-24V Hind-E
     - Mi-8MTV2 Hip
-    - SA 342M Gazelle
     - SA 342L Gazelle
     - IL-76MD
   awacs:
@@ -263,7 +262,9 @@ squadrons:
     - primary: SEAD
       secondary: any
       aircraft:
+        - F-4E-45MC Phantom II
         - 201th Squadron
+      size: 16
     - primary: Refueling
       aircraft:
         - VMGR-352
@@ -272,12 +273,12 @@ squadrons:
       secondary: any
       aircraft:
         - 69th Squadron
-      size: 8
+      size: 12
     - primary: BAI
       secondary: any
       aircraft:
         - 110th Squadron
-      size: 8
+      size: 16
   # Damascus
   7:
     - primary: TARCAP
@@ -315,20 +316,21 @@ squadrons:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
-        - SA 342M Gazelle
+        - SA 342L Gazelle
       size: 6
   # OPFOR Second inland FOB
   FOB Homs:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
-        - SA 342M Gazelle
+        - SA 342L Gazelle
       size: 6
   # Palmyra
   28:
     - primary: BARCAP
       secondary: air-to-air
       aircraft:
+        - MiG-21bis Fishbed-N
         - MiG-29A Fulcrum-A
       size: 12
     - primary: Strike
@@ -365,7 +367,7 @@ squadrons:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
-        - SA 342M Gazelle
+        - SA 342L Gazelle
   # OPFOR Second inland FOB
   FOB Ithriyah:
     - primary: CAS
@@ -385,6 +387,7 @@ squadrons:
     - primary: BARCAP
       secondary: air-to-air
       aircraft:
+        - MiG-23MLD Flogger-K
         - Su-30 Flanker-C
     - primary: CAS
       secondary: air-to-ground
@@ -396,6 +399,7 @@ squadrons:
     - primary: TARCAP
       secondary: air-to-air
       aircraft:
+        - MiG-25PD Foxbat-E
         - MiG-23ML Flogger-G
     - primary: BARCAP
       secondary: any
@@ -405,6 +409,7 @@ squadrons:
     - primary: Strike
       secondary: air-to-ground
       aircraft:
+        - Su-24M Fencer-D
         - Su-34 Fullback
     - primary: Transport
       secondary: air-to-ground

resources/campaigns/operation_gazelle.yaml

@@ -0,0 +1,122 @@
+---
+name: Sinai - Operation Gazelle (Yom Kippur War)
+theater: Sinai
+authors: Starfire
+recommended_player_faction: Israel 1973
+recommended_enemy_faction: Egypt 1973
+description:
+    <p>In this semi-historical scenario set during the early stages of the 
+    Yom Kippur War, Egypt has successfully captured extensive territory 
+    across the Sinai Peninsula during the initial surprise attack. 
+    Operation Gazelle represents a critical Israeli counter-offensive to 
+    reclaim these areas. Supported by armoured brigades, paratrooper units, 
+    and air cover, Israeli forces are tasked with driving the Egyptian Third 
+    Army back across the Al Salam Bridge. Their mission also involves encircling 
+    and cutting off the Egyptian forces that are advancing eastward from the 
+    Port Tewfik Pontoon Bridge through the Mitla and Gidi mountain passes. This 
+    operation aims to decisively shift the war's momentum, re-establishing 
+    Israeli dominance in the crucial Sinai region.</p>
+miz: operation_gazelle.miz
+performance: 1
+recommended_start_date: 1973-10-15
+version: "11.0"
+settings:
+  a4_skyhawk: true
+  hercules: true
+  squadron_start_full: true
+squadrons:
+  # Ben-Gurion
+  24:
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 4
+  # Tel Nof
+  23:
+    - primary: SEAD
+      secondary: any
+      aircraft:
+        - F-4E-45MC Phantom II
+      size: 20
+    - primary: Escort
+      secondary: any
+      aircraft:
+        - F-4E-45MC Phantom II
+      size: 20
+    - primary: AEW&C
+      aircraft:
+        - E-2C Hawkeye
+      size: 2
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - UH-1H Iroquois
+      size: 4
+  # Hatzor
+  20:
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - A-4E Skyhawk
+        - F-4E-45MC Phantom II
+      size: 20
+    - primary: Strike
+      secondary: any
+      aircraft:
+        - A-4E Skyhawk
+        - F-4E-45MC Phantom II
+      size: 20
+  # El Arish
+  29:
+    - primary: CAS
+      secondary: any
+      aircraft:
+        - MiG-19P Farmer-B
+      size: 12
+  # Baluza
+  #27:
+  # Melez
+  5:
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - MiG-15bis Fagot
+      size: 16
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - Mi-8MTV2 Hip
+      size: 4
+  # Al Mansurah
+  14:
+    - primary: BARCAP
+      secondary: any
+      aircraft:
+        - MiG-21bis Fishbed-N
+      size: 16
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - MiG-19P Farmer-B
+      size: 16
+  # Cairo West
+  18:
+    - primary: Strike
+      secondary: any
+      aircraft:
+        - Tu-16 Badger
+      size: 14
+    - primary: Escort
+      secondary: air-to-air
+      aircraft:
+        - MiG-21bis Fishbed-N
+      size: 16
+  # FARP
+  Port Tewfik Staging Area:
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - Mi-8MTV2 Hip
+      size: 8

resources/campaigns/operation_noisy_cricket.yaml

@@ -30,6 +30,9 @@ recommended_player_money: 0
 recommended_enemy_money: 0
 recommended_player_income_multiplier: 0.2
 recommended_enemy_income_multiplier: 0.2
+settings:
+  hercules: true
+  squadron_start_full: true
 version: "11.0"
 squadrons:
   Blue CV-1:
@@ -40,7 +43,7 @@ squadrons:
       size: 40
     - primary: AEW&C
       aircraft:
-        - E-2D Advanced Hawkeye
+        - E-2C Hawkeye
       size: 2
     - primary: Refueling
       aircraft:
@@ -49,21 +52,26 @@ squadrons:
     - primary: Air Assault
       secondary: any
       aircraft:
-        - UH-60L
         - UH-60A
       size: 4
   #Al Minhad AFB (61)
   12:
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 2
     - primary: DEAD
       secondary: any
       aircraft:
         - F-16CM Fighting Falcon (Block 50)
-      size: 32
+      size: 20
     - primary: Escort
       secondary: air-to-air
       aircraft:
         - F-15C Eagle
-      size: 24
+      size: 20
   #Al Dhafra AFB (251)
   4:
     - primary: Strike
@@ -79,18 +87,18 @@ squadrons:
       secondary: any
       aircraft:
         - F-15E Strike Eagle (Suite 4+)
-      size: 20
+      size: 16
     - primary: DEAD
       secondary: air-to-ground
       aircraft:
         - AV-8B Harrier II Night Attack
-      size: 20
+      size: 16
   #Bandar Abbas Intl (51)
   2:
     - primary: SEAD
       secondary: air-to-ground
       aircraft:
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
       size: 20
     - primary: TARCAP
       secondary: air-to-air
@@ -106,7 +114,7 @@ squadrons:
       size: 12
   #Abu Musa Island (8)
   1:
-    - primary: DEAD
+    - primary: SEAD Escort
       secondary: air-to-ground
       aircraft:
         - Su-25T Frogfoot
@@ -126,9 +134,10 @@ squadrons:
   #Shiraz Intl (122)
   19:
     - primary: Transport
+      secondary: any
       aircraft:
         - IL-76MD
-      size: 5
+      size: 4
     - primary: BARCAP
       secondary: air-to-air
       aircraft:

resources/campaigns/operation_peace_spring.yaml

@@ -18,18 +18,16 @@ miz: operation_peace_spring.miz
 performance: 2
 recommended_start_date: 2019-12-23
 version: "11.0"
+settings:
+  hercules: true
+  squadron_start_full: true
 squadrons:
   Blue CV-1:
     - primary: SEAD
       secondary: any
       aircraft:
         - F/A-18C Hornet (Lot 20)
-      size: 40
-    - primary: BAI
-      secondary: air-to-ground
-      aircraft:
-        - S-3B Viking
-      size: 20
+      size: 24
     - primary: AEW&C
       aircraft:
         - E-2D Advanced Hawkeye
@@ -38,19 +36,28 @@ squadrons:
       aircraft:
         - S-3B Tanker
       size: 4
-  Bombers from RAF Fairford:
-    - primary: DEAD
-      secondary: air-to-ground
+    - primary: Air Assault
+      secondary: any
       aircraft:
-        - B-52H Stratofortress
-      size: 8
+        - UH-60A
+      size: 4      
   # Akrotiri
   44:
     - primary: Strike
       secondary: air-to-ground
       aircraft:
         - B-1B Lancer
-      size: 8
+      size: 4
+    - primary: Refueling
+      aircraft:
+        - KC-135 Stratotanker
+      size: 2
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 2
     - primary: OCA/Runway
       secondary: any
       aircraft:
@@ -61,12 +68,6 @@ squadrons:
       aircraft:
         - F-15C Eagle
       size: 20
-    - primary: Air Assault
-      secondary: any
-      aircraft:
-        - UH-60L
-        - UH-60A
-      size: 4
    # Ramat David
   30:
     - primary: BAI
@@ -84,12 +85,17 @@ squadrons:
       aircraft:
         - AH-64D Apache Longbow
       size: 4
+    - primary: CAS
+      secondary: any
+      aircraft:
+        - OH-58D(R) Kiowa Warrior
+      size: 4
   # Damascus
   7:
     - primary: Strike
       secondary: air-to-ground
       aircraft:
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
         - H-6J Badger
       size: 16
     - primary: BAI
@@ -101,7 +107,7 @@ squadrons:
     - primary: CAS
       secondary: any
       aircraft:
-        - OH-58D Kiowa Warrior
+        - OH-58D(R) Kiowa Warrior
         - Mi-24P Hind-F
       size: 4
   # Tiyas
@@ -115,7 +121,7 @@ squadrons:
     - primary: Escort
       secondary: air-to-air
       aircraft:
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
         - Mirage-F1EQ
       size: 16
   # Abu Al Duhur
@@ -123,7 +129,7 @@ squadrons:
     - primary: Fighter sweep
       secondary: air-to-air
       aircraft:
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
         - MiG-23ML Flogger-G
       size: 8
   # Gaziantep
@@ -139,7 +145,7 @@ squadrons:
     - primary: Strike
       secondary: air-to-ground
       aircraft:
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
         - Tu-22M3 Backfire-C
       size: 16
     - primary: AEW&C
@@ -155,6 +161,6 @@ squadrons:
     - primary: Escort
       secondary: any
       aircraft:
-        - F-4E Phantom II
+        - F-4E-45MC Phantom II
         - MiG-21bis Fishbed-N
       size: 16

resources/campaigns/operation_vectrons_claw.yaml

@@ -5,19 +5,30 @@ authors: Starfire
 recommended_player_faction: USA 2005
 recommended_enemy_faction: Russia 2010
 description:
-  <p><strong>Background</strong>  - The United Nations Observer Mission in Georgia (UNOMIG) has been actively monitoring the ceasefire agreement between Georgia and its breakaway region of Abkhazia. Recent developments have escalated tensions in the area, leading to a precarious situation for UN observers and affiliated personnel.
-  </p><p><strong>Current Situation</strong>  - UNOMIG observers, along with a contingent of international troops, have found themselves isolated due to the intervention of Russian forces supporting the separatist ambitions of Abkhazia. The UNOMIG headquarters located in Sukhumi has fallen into enemy hands. A smaller group based at the Zugdidi Sector Headquarters now faces the daunting task of navigating to safety with the aid of offshore naval air support.
-  </p><p><strong>Objective</strong>  - The immediate goal is to orchestrate a strategic withdrawal of UN forces to the coastline, leveraging support from US naval aircraft positioned offshore. The critical mission objective is the rapid recapture of Sukhumi. This action is essential to enable the landing of friendly ground forces and the ferrying in of land-based sqwuadrons from Incirlik.
-  </p><p><strong>Operational Constraints</strong>  - It is crucial to note that reinforcement of ground units will not be possible until Sukhumi is successfully recaptured. This recapture can either be performed using existing UN personnel and ground vehicles, or via heliborne assault troop insertion.
-  </p><p><strong>Assets & Support</strong>  - Available assets include two Huey helicopters for close air support. Commanders may opt to initiate the operation with light vehicles, such as Humvees, employing breakthrough tactics to avoid direct confrontations with enemy forces. Alternatively, the use of heavier ground units is an option for commanders seeking a more conventional combat engagement. Upon the recapture of Sukhumi, additional squadrons from Incirlik, Turkey, will become operational.
-  </p><p><strong>Secondary Objective</strong>  - Consider prioritising the capture of the Batumi airfield, located to the south, for its strategic value as a forward operating base. Commanders should be aware of the inherent risks, as the airfield is relatively small and lacks air defence systems, posing a significant threat to any stationed aircraft.</p>
+  <p>The United Nations Observer Mission in Georgia (UNOMIG) has been actively 
+  monitoring the ceasefire agreement between Georgia and its breakaway region 
+  of Abkhazia. However, recent developments have escalated tensions, leading 
+  to a precarious situation for the UN observers. Along with a small contingent 
+  of international troops, they have found themselves isolated due to the 
+  intervention of Russian forces supporting Abkhazia's separatist ambitions. 
+  The UNOMIG headquarters in Sukhumi has fallen into enemy hands, leaving a 
+  small group based at the Zugdidi Sector Headquarters facing the daunting 
+  task of navigating to safety with the aid of close air support.</p>
+  <p>The immediate goal is to orchestrate a strategic withdrawal of UN forces to 
+  the coastline, leveraging support from US naval aircraft positioned offshore 
+  as well as US Air force squadrons newly arrived at Tbilisi. Commanders may opt 
+  to begin the operation with light vehicles, employing breakthrough tactics to 
+  avoid direct confrontations with enemy forces. Alternatively, the use of 
+  heavier ground units is an option for commanders seeking a more conventional 
+  combat engagement. C-17 Globemasters stand ready bring in additional ground 
+  units from Incirlik to reinforce existing troops, upon recapture of Sukhumi.</p>
 miz: operation_vectrons_claw.miz
 performance: 1
 recommended_start_date: 2008-08-08
 version: "11.0"
-control_points:
-  Squadrons from Incirlik:
-    ferry_only: true
+settings:
+  hercules: true
+  squadron_start_full: true
 squadrons:
   Blue CV-1:
     - primary: BARCAP
@@ -29,12 +40,12 @@ squadrons:
       secondary: any
       aircraft:
         - F/A-18C Hornet (Lot 20)
-      size: 60
-    - primary: CAS
+      size: 24
+    - primary: BAI
       secondary: air-to-ground
       aircraft:
         - S-3B Viking
-      size: 8
+      size: 12
     - primary: AEW&C
       aircraft:
         - E-2C Hawkeye
@@ -42,30 +53,46 @@ squadrons:
     - primary: Refueling
       aircraft:
         - S-3B Tanker
-      size: 2
+      size: 4
     - primary: Air Assault
       secondary: any
       aircraft:
-        - UH-60L
         - UH-60A
-      size: 2
+      size: 4
   Blue LHA:
     - primary: BAI
       secondary: air-to-ground
       aircraft:
         - AV-8B Harrier II Night Attack
       size: 20
-  Squadrons from Incirlik:
+  #Tbilisi-Lochini
+  29:
+    - primary: OCA/Runway
+      secondary: air-to-ground
+      aircraft:
+        - B-1B Lancer
+      size: 4    
+    - primary: Refueling
+      aircraft:
+        - KC-135 Stratotanker
+      size: 2
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - A-10C Thunderbolt II (Suite 7)
+      size: 4
     - primary: CAS
       secondary: any
       aircraft:
         - AH-64D Apache Longbow
       size: 4
     - primary: CAS
-      secondary: air-to-ground
+      secondary: any
       aircraft:
-        - A-10C Thunderbolt II (Suite 7)
-      size: 6
+        - OH-58D(R) Kiowa Warrior
+      size: 4
+  #Vaziani
+  31:
     - primary: DEAD
       secondary: any
       aircraft:
@@ -75,51 +102,48 @@ squadrons:
       secondary: any
       aircraft:
         - F-15E Strike Eagle (Suite 4+)
-      size: 8
-    - primary: Refueling
+      size: 12
+    - primary: Escort
+      secondary: any
       aircraft:
-        - KC-135 Stratotanker
-      size: 1
+        - F-15C Eagle
+      size: 12
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 2
   Bombers from RAF Fairford:
     - primary: Anti-ship
       secondary: air-to-ground
       aircraft:
         - B-52H Stratofortress
       size: 4
-  Bombers from Base Aérea de Morón:
-    - primary: OCA/Runway
-      secondary: air-to-ground
-      aircraft:
-        - B-1B Lancer
-      size: 4
-  #FARPs
+  #OWNFOR FARP
   UNOMIG Sector HQ:
     - primary: Transport
       secondary: any
       aircraft:
         - UH-1H Iroquois
       size: 2
+  #OPFOR FARP
   Dzhugba:
-    - primary: CAS
+    - primary: Air Assault
       secondary: any
       aircraft:
         - Mi-24P Hind-F
       size: 4
   #Sukhumi-Babushara
   20:
-    - primary: TARCAP
-      secondary: air-to-air
-      aircraft:
-        - MiG-29S Fulcrum-C
-      size: 8
-    - primary: BAI
+    - primary: SEAD Escort
       secondary: air-to-ground
       aircraft:
         - Su-25T Frogfoot
-      size: 12
+      size: 20
   #Sochi-Adler
   18:
-    - primary: Escort
+    - primary: TARCAP
       secondary: air-to-air
       aircraft:
         - Su-27 Flanker-B
@@ -129,28 +153,48 @@ squadrons:
       aircraft:
         - Su-24M Fencer-D
       size: 20
-    - primary: DEAD
+    - primary: BAI
       secondary: air-to-ground
       aircraft:
         - Su-34 Fullback
       size: 20
+  #Mineralnye Vody
+  26:
+    - primary: Strike
+      secondary: air-to-ground
+      aircraft:
+        - Tu-95MS Bear-H
+      size: 12
+    - primary: Escort
+      secondary: air-to-air
+      aircraft:
+        - MiG-29S Fulcrum-C
+      size: 12
   #Maykop-Khanskaya
   16:
-    - primary: Strike
+    - primary: DEAD
       secondary: air-to-ground
       aircraft:
         - Tu-22M3 Backfire-C
       size: 20
   #Anapa-Vityazevo
   12:
-    - primary: Strike
-      secondary: air-to-ground
+    - primary: AEW&C
       aircraft:
-        - Tu-95MS Bear-H
-      size: 16
+        - A-50
+      size: 2
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - IL-76MD
+      size: 2
+    - primary: Refueling
+      aircraft:
+        - IL-78M
+      size: 2
   Red CV:
     - primary: BARCAP
       secondary: any
       aircraft:
         - SU-33 Flanker-D
-      size: 16
+      size: 12

resources/campaigns/operation_velvet_thunder.yaml

@@ -14,18 +14,21 @@ description:
   captured by Air Assault. Due to the limited size and availability of LZs, it 
   is vital to pay close attention to where you designate troop drop off zones.
   </p><p><strong>Note:</strong> This campaign is intended to be played with the 
-  A-4 Skyhawk and OV-10a aircraft mods active. The C-101CC has also been included 
-  as a stand-in for the Cessna A-37 Dragonfly in order to provide a CAS platform 
-  of roughly equivalent combat capability. This campaign will be updated to use 
-  Heatblur's F-4 Phantom II once it is in early access.</p>
+  A-4 Skyhawk, OV-10A, and C-130J aircraft mods active. The C-101CC has also 
+  been included as a stand-in for the Cessna A-37 Dragonfly in order to provide 
+  a CAS platform of roughly equivalent combat capability.</p>
+  <strong>Note:</strong> Airbase threat range should be set to 25 for this campaign.
 miz: operation_velvet_thunder.miz
 performance: 1
 recommended_start_date: 1970-11-29
 version: "11.0"
 settings:
+  airbase_threat_range: 25
+  restrict_weapons_by_date: true
   a4_skyhawk: true
-  f4bc_phantom: true
+  hercules: true
   ov10a_bronco: true
+  squadron_start_full: true
 squadrons:
   #Andersen AFB
   6:
@@ -34,11 +37,6 @@ squadrons:
       aircraft:
         - F-5E Tiger II
       size: 8
-    - primary: BAI
-      secondary: any
-      aircraft:
-        - C-101CC Aviojet
-      size: 8
     - primary: CAS
       secondary: any
       aircraft:
@@ -47,7 +45,11 @@ squadrons:
     - primary: SEAD
       secondary: any
       aircraft:
-        - F-4C Phantom II
+        - F-4E-45MC Phantom II
+      size: 8
+    - primary: DEAD
+      secondary: any
+      aircraft:
         - F-4E Phantom II
       size: 8
     - primary: Strike
@@ -65,6 +67,19 @@ squadrons:
       aircraft:
         - CH-47D
       size: 4
+  #Antonio B. Won Pat Intl
+  4:
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - C-130J-30 Super Hercules
+        - C-130
+      size: 8
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - C-101CC Aviojet
+      size: 8
   #Blue CV
   Blue-CV:
     - primary: DEAD

resources/customized_payloads/A-4E-C.lua

@@ -178,15 +178,15 @@ local unitPayloads = {
 			["name"] = "Liberation SEAD",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 5,
 				},
 				[2] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 1,
 				},
 				[3] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 4,
 				},
 				[4] = {
@@ -194,7 +194,7 @@ local unitPayloads = {
 					["num"] = 3,
 				},
 				[5] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 2,
 				},
 			},
@@ -265,15 +265,15 @@ local unitPayloads = {
 			["name"] = "Liberation SEAD Escort",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 5,
 				},
 				[2] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 1,
 				},
 				[3] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 4,
 				},
 				[4] = {
@@ -281,7 +281,7 @@ local unitPayloads = {
 					["num"] = 3,
 				},
 				[5] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 2,
 				},
 			},
@@ -352,11 +352,11 @@ local unitPayloads = {
 			["name"] = "Liberation DEAD",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 5,
 				},
 				[2] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 1,
 				},
 				[3] = {

resources/customized_payloads/EA-18G.lua

@@ -0,0 +1,53 @@
+local unitPayloads = {
+	["name"] = "EA-18G",
+	["payloads"] = {
+		[1] = {
+			["name"] = "Retribution SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{FPU_12_FUEL_TANKHighVis}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{ALQ-99Wing}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{ALQ-99Center}",
+					["num"] = 5,
+				},
+				[6] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 4,
+				},
+				[7] = {
+					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{ALQ-99Wing}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{FPU_12_FUEL_TANKHighVis}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "EA-18G",
+}
+return unitPayloads

resources/customized_payloads/F-4E-45MC.lua

@@ -0,0 +1,973 @@
+local unitPayloads = {
+	["name"] = "F-4E-45MC",
+	["payloads"] = {
+		[1] = {
+			["displayName"] = "Liberation SEAD Escort",
+			["name"] = "Liberation SEAD Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{AGM_12B}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 12,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 10,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 4,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[8] = {
+					["CLSID"] = "{AGM_12B}",
+					["num"] = 1,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[12] = {
+					["CLSID"] = "{F4_SARGENT_TANK_600_GAL}",
+					["num"] = 7,
+				},
+				[13] = {
+					["CLSID"] = "{AGM_12B}",
+					["num"] = 11,
+				},
+				[14] = {
+					["CLSID"] = "{AGM_12B}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[2] = {
+			["name"] = "Liberation Anti-ship",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL_R}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "{C40A1E3A-DD05-40D9-85A4-217729E37FAE}",
+					["num"] = 11,
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 10,
+				},
+				[5] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 12,
+				},
+				[6] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[7] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[8] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{C40A1E3A-DD05-40D9-85A4-217729E37FAE}",
+					["num"] = 3,
+				},
+				[11] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+				},
+				[12] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 4,
+				},
+				[13] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[3] = {
+			["name"] = "Liberation BARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL_R}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 12,
+				},
+				[4] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 10,
+				},
+				[5] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 2,
+				},
+				[7] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL}",
+					["num"] = 1,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[4] = {
+			["displayName"] = "Liberation Escort",
+			["name"] = "Liberation Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL_R}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 12,
+				},
+				[4] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 10,
+				},
+				[5] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 2,
+				},
+				[7] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL}",
+					["num"] = 1,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[5] = {
+			["displayName"] = "Liberation BAI",
+			["name"] = "Liberation BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{AGM_62_I}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 12,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 10,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 4,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[8] = {
+					["CLSID"] = "{AGM_62_I}",
+					["num"] = 1,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[12] = {
+					["CLSID"] = "{F4_SARGENT_TANK_600_GAL}",
+					["num"] = 7,
+				},
+				[13] = {
+					["CLSID"] = "{AGM_62_I}",
+					["num"] = 11,
+				},
+				[14] = {
+					["CLSID"] = "{AGM_62_I}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[6] = {
+			["displayName"] = "Liberation CAS",
+			["name"] = "Liberation CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{AGM_62_I}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 12,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 10,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 4,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[8] = {
+					["CLSID"] = "{AGM_62_I}",
+					["num"] = 1,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[12] = {
+					["CLSID"] = "{F4_SARGENT_TANK_600_GAL}",
+					["num"] = 7,
+				},
+				[13] = {
+					["CLSID"] = "{AGM_62_I}",
+					["num"] = 11,
+				},
+				[14] = {
+					["CLSID"] = "{AGM_62_I}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[7] = {
+			["displayName"] = "Liberation SEAD",
+			["name"] = "Liberation SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{LAU_34_AGM_45A}",
+					["num"] = 13,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 12,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 10,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 4,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[8] = {
+					["CLSID"] = "{LAU_34_AGM_45A}",
+					["num"] = 1,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[12] = {
+					["CLSID"] = "{F4_SARGENT_TANK_600_GAL}",
+					["num"] = 7,
+				},
+				[13] = {
+					["CLSID"] = "{LAU_34_AGM_45A}",
+					["num"] = 11,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[14] = {
+					["CLSID"] = "{LAU_34_AGM_45A}",
+					["num"] = 3,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[8] = {
+			["displayName"] = "Liberation Strike",
+			["name"] = "Liberation Strike",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
+					["num"] = 13,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 12,
+				},
+				[4] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 10,
+				},
+				[5] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 2,
+				},
+				[7] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
+					["num"] = 1,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[12] = {
+					["CLSID"] = "{F4_SARGENT_TANK_600_GAL}",
+					["num"] = 7,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[9] = {
+			["displayName"] = "Liberation TARCAP",
+			["name"] = "Liberation TARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL_R}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 12,
+				},
+				[4] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 10,
+				},
+				[5] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 2,
+				},
+				[7] = {
+					["CLSID"] = "{AIM-9M}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL}",
+					["num"] = 1,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[10] = {
+			["displayName"] = "Liberation DEAD",
+			["name"] = "Liberation DEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{AGM_12B}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 12,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 10,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 4,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[8] = {
+					["CLSID"] = "{AGM_12B}",
+					["num"] = 1,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[12] = {
+					["CLSID"] = "{F4_SARGENT_TANK_600_GAL}",
+					["num"] = 7,
+				},
+				[13] = {
+					["CLSID"] = "{AGM_12B}",
+					["num"] = 11,
+				},
+				[14] = {
+					["CLSID"] = "{AGM_12B}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[11] = {
+			["displayName"] = "Liberation OCA/Runway",
+			["name"] = "Liberation OCA/Runway",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL_R}",
+					["num"] = 13,
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 12,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 10,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 4,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[8] = {
+					["CLSID"] = "{F4_SARGENT_TANK_370_GAL}",
+					["num"] = 1,
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[12] = {
+					["CLSID"] = "{HB_F4E_BLU-107B_6x}",
+					["num"] = 7,
+				},
+				[13] = {
+					["CLSID"] = "{HB_F4E_BLU-107B_3x}",
+					["num"] = 11,
+				},
+				[14] = {
+					["CLSID"] = "{HB_F4E_BLU-107B_3x}",
+					["num"] = 3,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[12] = {
+			["displayName"] = "Liberation OCA/Aircraft",
+			["name"] = "Liberation OCA/Aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{HB_ALE_40_30_60}",
+					["num"] = 14,
+				},
+				[2] = {
+					["CLSID"] = "{HB_F4E_MK-82_Snakeye_6x}",
+					["num"] = 13,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[3] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 12,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 10,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{HB_ALQ-131_ON_ADAPTER_IN_AERO7}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 2,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 4,
+					["settings"] = {
+						["EAS_bypass_ctrl"] = 1,
+						["NFP_rfgu_type"] = 1,
+						["rf_lower_limit_ctrl_Mk22Mod2"] = 4800000000,
+						["rf_upper_limit_ctrl_Mk22Mod2"] = 5200000000,
+					},
+				},
+				[8] = {
+					["CLSID"] = "{HB_F4E_MK-82_Snakeye_6x}",
+					["num"] = 1,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[9] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 5,
+				},
+				[10] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 8,
+				},
+				[11] = {
+					["CLSID"] = "{HB_F4E_AIM-7M}",
+					["num"] = 9,
+				},
+				[12] = {
+					["CLSID"] = "{F4_SARGENT_TANK_600_GAL}",
+					["num"] = 7,
+				},
+				[13] = {
+					["CLSID"] = "{HB_F4E_MK-82_Snakeye_3x}",
+					["num"] = 11,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+				[14] = {
+					["CLSID"] = "{HB_F4E_MK-82_Snakeye_3x}",
+					["num"] = 3,
+					["settings"] = {
+						["NFP_VIS_DrawArgNo_57"] = 0,
+						["NFP_fuze_type_nose"] = "M904E4",
+						["NFP_fuze_type_tail"] = "M905",
+						["arm_delay_ctrl_M904E4"] = 2,
+						["arm_delay_ctrl_M905"] = 4,
+						["function_delay_ctrl_M904E4"] = 0,
+						["function_delay_ctrl_M905"] = 0,
+					},
+				},
+			},
+			["tasks"] = {
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "F-4E-45MC",
+}
+return unitPayloads

resources/customized_payloads/FA-18E.lua

@@ -0,0 +1,463 @@
+local unitPayloads = {
+	["name"] = "FA-18E",
+	["payloads"] = {
+		[1] = {
+			["displayName"] = "Retribution SEAD",
+			["name"] = "Retribution SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[2] = {
+			["displayName"] = "Retribution BARCAP",
+			["name"] = "Retribution BARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-120C",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-120C",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+				[10] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 10,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[3] = {
+			["displayName"] = "Retribution TARCAP/Escort",
+			["name"] = "Retribution TARCAP/Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-120C",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-120C",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[4] = {
+			["displayName"] = "Retribution Anti-ship",
+			["name"] = "Retribution Anti-ship",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{AGM_84D}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{AGM_84D}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[5] = {
+			["displayName"] = "Retribution BAI",
+			["name"] = "Retribution BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[6] = {
+			["displayName"] = "Retribution CAS",
+			["name"] = "Retribution CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[7] = {
+			["displayName"] = "Retribution OCA/Runway",
+			["name"] = "Retribution OCA/Runway",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{GBU_31_V_4B}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{GBU_31_V_4B}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[8] = {
+			["displayName"] = "Retribution DEAD",
+			["name"] = "Retribution DEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{AGM-154A}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{AGM-154A}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{AGM-154A}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{AGM-154A}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[9] = {
+			["displayName"] = "Retribution Strike",
+			["name"] = "Retribution Strike",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[10] = {
+			["displayName"] = "Retribution OCA/aircraft",
+			["name"] = "Retribution OCA/aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{BRU33_2X_CBU-99}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2X_CBU-99}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "FA-18E",
+}
+return unitPayloads

resources/customized_payloads/FA-18F.lua

@@ -0,0 +1,463 @@
+local unitPayloads = {
+	["name"] = "FA-18F",
+	["payloads"] = {
+		[1] = {
+			["displayName"] = "Retribution SEAD",
+			["name"] = "Retribution SEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[2] = {
+			["displayName"] = "Retribution BARCAP",
+			["name"] = "Retribution BARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-120C",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-120C",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+				[10] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 10,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[3] = {
+			["displayName"] = "Retribution TARCAP/Escort",
+			["name"] = "Retribution TARCAP/Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-120C",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-120C",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[4] = {
+			["displayName"] = "Retribution Anti-ship",
+			["name"] = "Retribution Anti-ship",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{AGM_84D}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{AGM_84D}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[5] = {
+			["displayName"] = "Retribution BAI",
+			["name"] = "Retribution BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[6] = {
+			["displayName"] = "Retribution CAS",
+			["name"] = "Retribution CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "LAU_117_AGM_65F",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[7] = {
+			["displayName"] = "Retribution OCA/Runway",
+			["name"] = "Retribution OCA/Runway",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{GBU_31_V_4B}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{GBU_31_V_4B}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[8] = {
+			["displayName"] = "Retribution DEAD",
+			["name"] = "Retribution DEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{AGM-154A}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{AGM-154A}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{AGM-154A}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{AGM-154A}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[9] = {
+			["displayName"] = "Retribution Strike",
+			["name"] = "Retribution Strike",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{GBU_32_V_2B}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[10] = {
+			["displayName"] = "Retribution OCA/aircraft",
+			["name"] = "Retribution OCA/aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 9,
+				},
+				[2] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 8,
+				},
+				[3] = {
+					["CLSID"] = "{BRU33_2X_CBU-99}",
+					["num"] = 7,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 6,
+				},
+				[5] = {
+					["CLSID"] = "{AN_ASQ_228}",
+					["num"] = 4,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2X_CBU-99}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{FPU_12_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[8] = {
+					["CLSID"] = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}",
+					["num"] = 2,
+				},
+				[9] = {
+					["CLSID"] = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "FA-18F",
+}
+return unitPayloads

resources/customized_payloads/OH58D.lua

@@ -0,0 +1,101 @@
+local unitPayloads = {
+	["name"] = "OH58D",
+	["payloads"] = {
+		[1] = {
+			["name"] = "Liberation CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "OH58D_AGM_114_R",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "OH58D_M3P_L500",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 16,
+			},
+		},
+		[2] = {
+			["displayName"] = "Liberation DEAD",
+			["name"] = "Liberation DEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "OH58D_AGM_114_R",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "OH58D_AGM_114_L",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 16,
+			},
+		},
+		[3] = {
+			["displayName"] = "Liberation BAI",
+			["name"] = "Liberation BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "OH58D_AGM_114_R",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "{M260_APKWS_M151}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 16,
+			},
+		},
+		[4] = {
+			["displayName"] = "Liberation OCA/Aircraft",
+			["name"] = "Liberation OCA/Aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{M260_APKWS_M151}",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "{M260_APKWS_M151}",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 16,
+			},
+		},
+		[5] = {
+			["displayName"] = "Liberation Escort",
+			["name"] = "Liberation Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "OH58D_AGM_114_R",
+					["num"] = 5,
+				},
+				[2] = {
+					["CLSID"] = "OH58D_FIM_92_L",
+					["num"] = 1,
+				},
+			},
+			["tasks"] = {
+				[1] = 16,
+			},
+		},
+	},
+	["tasks"] = {
+		[1] = 11,
+		[2] = 31,
+		[3] = 32,
+		[4] = 16,
+		[5] = 18,
+		[6] = 35,
+		[7] = 30,
+		[8] = 17,
+	},
+	["unitType"] = "OH58D",
+}
+return unitPayloads

resources/customized_payloads/VSN_F4C.lua

@@ -91,11 +91,11 @@ local unitPayloads = {
 			["name"] = "SEAD",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 9,
 				},
 				[2] = {
-					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
+					["CLSID"] = "{AGM_45A}",
 					["num"] = 3,
 				},
 				[3] = {

resources/factions/NATO_Desert_Storm.yaml

@@ -21,9 +21,11 @@ aircrafts:
   - F-15E Strike Eagle (Suite 4+)
   - F-16CM Fighting Falcon (Block 50)
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - F/A-18C Hornet (Lot 20)
   - Mirage 2000C
   - OH-58D Kiowa Warrior
+  - OH-58D(R) Kiowa Warrior
   - S-3B Viking
   - SA 342L Gazelle
   - SA 342M Gazelle

resources/factions/NATO_OIF.yaml

@@ -25,6 +25,7 @@ aircrafts:
   - F/A-18C Hornet (Lot 20)
   - Mirage 2000C
   - OH-58D Kiowa Warrior
+  - OH-58D(R) Kiowa Warrior
   - S-3B Viking
   - SA 342L Gazelle
   - SA 342M Gazelle

resources/factions/bluefor_coldwar.yaml

@@ -13,6 +13,7 @@ aircrafts:
   - F-14A Tomcat (Block 135-GR Late)
   - F-14B Tomcat
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - F-5E Tiger II
   - Mirage-F1B
   - Mirage-F1BE

resources/factions/bluefor_modern.yaml

@@ -45,6 +45,7 @@ aircrafts:
   - Mi-24P Hind-F
   - Mi-8MTV2 Hip
   - MiG-29S Fulcrum-C
+  - OH-58D(R) Kiowa Warrior
   - SA 342L Gazelle
   - SA 342M Gazelle
   - Su-25T Frogfoot

resources/factions/blufor_late_coldwar.yaml

@@ -0,0 +1,96 @@
+---
+country: Combined Joint Task Forces Blue
+name: Blufor Late Cold War (80s)
+authors: Starfire
+description: <p>Blufor 1980s late cold war faction featuring units from NATO and NATO-aligned nations.</p>
+aircrafts: 
+  - A-10A Thunderbolt II
+  - A-4E Skyhawk
+  - AH-1W SuperCobra
+  - AJS-37 Viggen
+  - AV-8B Harrier II Night Attack
+  - B-1B Lancer
+  - B-52H Stratofortress
+  - C-101CC Aviojet
+  - C-130
+  - C-130J-30 Super Hercules
+  - C-47 Dakota
+  - CH-47D
+  - CH-53E
+  - F-14A Tomcat (Block 135-GR Late)
+  - F-14B Tomcat
+  - F-15C Eagle
+  - F-15E Strike Eagle (Suite 4+)
+  - F-16CM Fighting Falcon (Block 50)
+  - F/A-18C Hornet (Lot 20)
+  - F-4E Phantom II
+  - F-4E-45MC Phantom II
+  - F-5E Tiger II
+  - OH-58D(R) Kiowa Warrior
+  - Mi-8MTV2 Hip
+  - MiG-21bis Fishbed-N
+  - Mirage-F1B
+  - Mirage-F1BE
+  - Mirage-F1CE
+  - Mirage-F1C-200
+  - Mirage-F1EE
+  - S-3B Viking
+  - SA 342L Gazelle
+  - SA 342M Gazelle
+  - SH-60B Seahawk
+  - UH-1H Iroquois
+  - UH-60A
+  - UH-60L
+awacs: 
+  - E-2C Hawkeye
+  - E-3A
+tankers: 
+  - KC-130
+  - KC-135 Stratotanker
+frontline_units: 
+  - M113
+  - M163 Vulcan Air Defense System
+  - M48 Chaparral
+  - M60A3 "Patton"
+  - Leopard 2
+  - M1A2 Abrams
+  - M2A2 Bradley
+  - Marder 1A3
+  - VAB Mephisto
+artillery_units: 
+  - M109A6 Paladin
+  - M270 Multiple Launch Rocket System
+logistics_units: 
+  - Truck M818 6x6
+infantry_units: 
+  - Infantry M249
+  - Infantry M4
+missiles: []
+preset_groups: 
+  - Hawk
+  - Patriot
+  - Rapier
+naval_units: 
+  - FFG Oliver Hazard Perry
+  - CG Ticonderoga
+  - LHA-1 Tarawa
+  - CV-59 Forrestal
+air_defense_units: 
+  - SAM Hawk SR (AN/MPQ-50)
+  - M163 Vulcan Air Defense System
+  - M48 Chaparral
+  - Flakpanzer Gepard
+  - Roland 2 (Marder Chassis)
+carrier_names: 
+  - CVN-59 Forrestal
+  - CVN-60 Saratoga
+  - CVN-61 Ranger
+  - CVN-62 Independence
+helicopter_carrier_names: 
+  - LHA-1 Tarawa
+  - LHA-2 Saipan
+  - LHA-3 Belleau Wood
+  - LHA-4 Nassau
+  - LHA-5 Peleliu
+has_jtac: "false"
+doctrine: "coldwar"

resources/factions/egypt_1973.yaml

@@ -0,0 +1,44 @@
+---
+country: Egypt
+name: Egypt 1973
+authors: Starfire
+description: "<p>Egypt during the 1973 Yom Kippur War.</p>"
+locales:
+  - ar_SA
+aircrafts:
+  - MiG-21bis Fishbed-N
+  - MiG-19P Farmer-B
+  - Mi-8MTV2 Hip
+  - Tu-16 Badger
+awacs: []
+frontline_units:
+  - T-55A
+  - BMP-1
+  - BRDM-2
+  - BTR-80
+  - PT-76
+  - ZSU-23-4 Shilka
+artillery_units:
+  - BM-21 Grad
+logistics_units:
+  - Truck Ural-375
+  - Truck GAZ-66
+infantry_units:
+  - Infantry RPG
+  - Infantry AK-74 Rus
+preset_groups:
+  - SA-2/S-75
+  - SA-3/S-125
+  - SA-6
+naval_units: []
+missiles: []
+air_defense_units:
+  - SAM P19 "Flat Face" SR (SA-2/3)
+  - SAM SA-5 S-200 ST-68U "Tin Shield" SR
+  - ZSU-23-4 Shilka
+  - AAA ZU-23 Closed Emplacement
+  - ZU-23 on Ural-375
+  - S-60 57mm
+  - ZSU-57-2 'Sparka'
+has_jtac: false
+doctrine: coldwar

resources/factions/egypt_2000.yaml

@@ -10,6 +10,7 @@ aircrafts:
   - MiG-21bis Fishbed-N
   - Mirage 2000C
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - F-16CM Fighting Falcon (Block 50)
   - IL-76MD
   - C-130

resources/factions/final_countdown_2.yaml

@@ -0,0 +1,62 @@
+---
+country: Combined Joint Task Forces Blue
+name: D-Day Allied Forces 1944 and 1990
+authors: Starfire
+description: <p>Faction for Final Countdown II.</p>
+aircrafts:
+  - Boston Mk.III
+  - Fortress Mk.III
+  - Mustang Mk.IV (Early)
+  - Mustang Mk.IV (Late)
+  - Spitfire LF Mk IX
+  - Spitfire LF Mk IX (Clipped Wings)
+  - Thunderbolt Mk.II (Early)
+  - Thunderbolt Mk.II (Late)
+  - Thunderbolt Mk.II (Mid)
+  - MosquitoFBMkVI
+  - AH-64D Apache Longbow
+  - AV-8B Harrier II Night Attack
+  - F-14B Tomcat
+  - F/A-18C Hornet (Lot 20)
+  - UH-1H Iroquois
+frontline_units:
+  - A17 Light Tank Mk VII Tetrarch
+  - A22 Infantry Tank MK IV Churchill VII
+  - A27L Cruiser Tank MK VIII Centaur IV
+  - A27M Cruiser Tank MK VIII Cromwell IV
+  - Daimler Armoured Car Mk I
+  - M2A1 Half-Track
+  - QF 40 mm Mark III
+  - Sherman Firefly VC
+  - Sherman III
+artillery_units: []
+awacs:
+  - E-2D Advanced Hawkeye
+tankers:
+  - S-3B Tanker
+logistics_units:
+  - Truck Bedford
+  - Truck GMC "Jimmy" 6x6 Truck
+infantry_units:
+  - Infantry SMLE No.4 Mk-1
+missiles: []
+air_defense_units:
+  - Bofors 40 mm Gun
+preset_groups:
+  - Ally Flak
+  - WW2LST
+naval_units:
+  - DDG Arleigh Burke IIa
+  - CG Ticonderoga
+  - LHA-1 Tarawa
+  - CVN-74 John C. Stennis
+requirements:
+  WW2 Asset Pack: https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/
+carrier_names:
+  - CVN-71 Theodore Roosevelt
+helicopter_carrier_names:
+  - LHA-4 Nassau
+has_jtac: true
+jtac_unit: MQ-9 Reaper
+unrestricted_satnav: true
+building_set: ww2ally

resources/factions/germany_1944.yaml

@@ -27,7 +27,10 @@ frontline_units:
   - "Sturmgesch\xFCtz III Ausf. G"
   - "Sturmgesch\xFCtz IV"
   - "Sturmpanzer IV Brummb\xE4r"
-artillery_units: []
+artillery_units:
+  - FH Pak 40 75mm
+  - FH LeFH-18 105mm
+  - SPH Sd.Kfz.124 Wespe 105mm
 logistics_units:
   - LUV Kettenrad
   - LUV Kubelwagen 82
@@ -41,6 +44,7 @@ preset_groups:
   - Freya
 naval_units:
   - Boat Schnellboot type S130
+  - U-boat VIIC U-flak
 requirements:
   WW2 Asset Pack: https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/
 carrier_names: []

resources/factions/greece_2005.yaml

@@ -11,6 +11,7 @@ aircrafts:
   - C-130J-30 Super Hercules
   - F-16CM Fighting Falcon (Block 50)
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - Mirage 2000-5
   - Mirage 2000C
   - UH-1H Iroquois

resources/factions/iran_1988.yaml

@@ -9,6 +9,7 @@ aircrafts:
   - AH-1J SeaCobra
   - F-14A Tomcat (Block 135-GR Late)
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - F-5E Tiger II
   - MiG-21bis Fishbed-N
 awacs:

resources/factions/iran_2015.yaml

@@ -8,6 +8,7 @@ locales:
 aircrafts:
   - F-14A Tomcat (Block 135-GR Late)
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - F-5E Tiger II
   - IL-76MD
   - Mi-24V Hind-E

resources/factions/israel_1973.yaml

@@ -8,6 +8,7 @@ locales:
 aircrafts:
   - A-4E Skyhawk
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - UH-1H Iroquois
 awacs:
   - E-2C Hawkeye

resources/factions/israel_1982.yaml

@@ -12,6 +12,7 @@ aircrafts:
   - F-16A
   - F-16CM Fighting Falcon (Block 50)
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - UH-1H Iroquois
 awacs:
   - E-2C Hawkeye

resources/factions/israel_2000.yaml

@@ -16,6 +16,7 @@ aircrafts:
   - F-15E Strike Eagle (Suite 4+)
   - F-16CM Fighting Falcon (Block 50)
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - UH-1H Iroquois
   - UH-60L
 awacs:

resources/factions/japan_2005.yaml

@@ -17,6 +17,7 @@ aircrafts:
   - F-15J Eagle
   - F-2A
   - F-4EJ Kai Phantom II
+  - F-4E-45MC Phantom II
 awacs:
   - E-2C Hawkeye
 tankers:

resources/factions/nva_1970.yaml

@@ -3,37 +3,37 @@ country: Vietnam
 name: NVA 1970
 authors: Starfire
 description: <p>North Vietnamese Army during the Vietnam War from 1965 to 1975</p>
-locales:
+locales: 
   - vi_Vn
-aircrafts:
+aircrafts: 
   - Mi-8MTV2 Hip
   - MiG-19P Farmer-B
   - MiG-21bis Fishbed-N
 awacs: []
 tankers: []
-frontline_units:
+frontline_units: 
   - T-55A
   - PT-76
   - M2A1 Half-Track
   - Grad MRL FDDM (FC)
-artillery_units:
+artillery_units: 
   - BM-21 Grad
-logistics_units:
+logistics_units: 
   - LUV UAZ-469 Jeep
   - Truck Ural-375
-infantry_units:
+infantry_units: 
   - Infantry AK-74 Rus
   - Infantry RPG
 missiles: []
-preset_groups:
+preset_groups: 
   - SA-2/S-75
   - SA-3/S-125
   - KS-19
   - Cold-War-Flak
-naval_units:
+naval_units: 
   - Boat Armed Hi-speed
   - Boat Schnellboot type S130
-air_defense_units:
+air_defense_units: 
   - SAM P19 "Flat Face" SR (SA-2/3)
   - S-60 57mm
   - 8.8 cm Flak 18
@@ -41,6 +41,5 @@ air_defense_units:
   - AAA ZU-23 Emplacement
   - ZU-23 on Ural-375
   - ZSU-23-4 Shilka
-
-requirements: {}
-doctrine: coldwar
+has_jtac: "false"
+doctrine: "coldwar"

resources/factions/peru_1995.yaml

@@ -11,12 +11,15 @@ aircrafts:
   - Mi-8MTV2 Hip
   - MB-339A
   - Su-22M4 Fitter-K
-frontline_units:
-  - T-55A
-  - M113
+  - UH-1H Iroquois
+frontline_units: 
+  - AMX-13 75mm  
   - BRDM-2
-  - BTR-80
+  - BTR-80 
+  - T-55A
   - M1043 HMMWV (M2 HMG)
+  - M113
+  - M2A1 Half-Track 
   - ZSU-23-4 Shilka
 artillery_units:
   - BM-21 Grad

resources/factions/russia_1980.yaml

@@ -0,0 +1,76 @@
+---
+country: Russia
+name: Russia 1980
+authors: Starfire
+description: <p>Soviet military in the 1980s.</p>
+locales: 
+  - ru_RU
+aircrafts: 
+  - IL-76MD
+  - Mi-24V Hind-E
+  - Mi-24P Hind-F
+  - Mi-8MTV2 Hip
+  - MiG-21bis Fishbed-N
+  - MiG-23MLD Flogger-K
+  - MiG-25PD Foxbat-E
+  - MiG-27K Flogger-J2
+  - MiG-29A Fulcrum-A
+  - MiG-31 Foxhound
+  - Su-17M4 Fitter-K
+  - Su-24M Fencer-D
+  - Su-25 Frogfoot
+  - Su-27 Flanker-B
+  - Tu-142 Bear-F
+  - Tu-22M3 Backfire-C
+  - Tu-95MS Bear-H
+awacs: 
+  - A-50
+tankers: 
+  - IL-78M
+frontline_units: 
+  - BMD-1
+  - BMP-1
+  - BRDM-2
+  - BTR-80
+  - PT-76
+  - T-55A
+  - T-72B with Kontakt-1 ERA
+artillery_units: 
+  - 2S1 Gvozdika
+  - 2S9 Nona-S
+  - BM-21 Grad
+logistics_units: 
+  - LUV UAZ-469 Jeep
+  - Truck Ural-375
+infantry_units: 
+  - Infantry AK-74 Rus
+  - Infantry RPG
+  - Mortar 2B11 120mm
+preset_groups: 
+  - SA-2/S-75
+  - SA-2/S-75 V-759/5V23
+  - SA-3/S-125
+  - SA-3/S-125 V-601P/5V27
+  - SA-5/S-200
+  - SA-6
+  - KS-19
+naval_units: 
+  - Corvette 1241.1 Molniya
+  - Corvette 1124.4 Grish
+air_defense_units: 
+  - SAM P19 "Flat Face" SR (SA-2/3)
+  - SAM SA-5 S-200 ST-68U "Tin Shield" SR
+  - SAM SA-8 Osa "Gecko" TEL
+  - SA-9 Strela
+  - SA-13 Gopher (9K35 Strela-10M3)
+  - ZSU-57-2 'Sparka'
+  - AAA ZU-23 Closed Emplacement
+  - ZU-23 on Ural-375
+  - ZSU-23-4 Shilka
+helicopter_carrier_names: 
+missiles: 
+  - SSM SS-1C Scud-B
+requirements: 
+carrier_names: 
+has_jtac: "false"
+doctrine: "coldwar"

resources/factions/turkey_2005.yaml

@@ -11,7 +11,9 @@ aircrafts:
   - CH-47D
   - F-16CM Fighting Falcon (Block 50)
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - OH-58D Kiowa Warrior
+  - OH-58D(R) Kiowa Warrior
   - UH-1H Iroquois
   - UH-60A
   - UH-60L

resources/factions/usa_1965.yaml

@@ -10,6 +10,7 @@ aircrafts:
   - C-130
   - CH-47D
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - F-4B Phantom II
   - F-4C Phantom II
   - F-5E Tiger II

resources/factions/usa_1970.yaml

@@ -3,13 +3,14 @@ country: USA
 name: USA 1970
 authors: Starfire
 description: <p>US military during the Vietnam War from 1965 to 1975</p>
-locales:
+locales: 
   - en_US
-aircrafts:
+aircrafts: 
   - F-14A Tomcat (Block 135-GR Late)
   - F-4C Phantom II
   - F-4B Phantom II
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - F-5E Tiger II
   - A-4E Skyhawk
   - OV-10A Bronco
@@ -17,42 +18,43 @@ aircrafts:
   - B-52H Stratofortress
   - C-47 Skytrain
   - C-130
+  - C-130J-30 Super Hercules
   - UH-1H Iroquois
   - AH-1W SuperCobra
-  - OH-58D Kiowa Warrior
+  - OH-58D(R) Kiowa Warrior
   - CH-47D
   - CH-53E
-awacs:
+awacs: 
   - E-2C Hawkeye
-tankers:
+tankers: 
   - KC-130
   - KC-135 Stratotanker
-frontline_units:
+frontline_units: 
   - M113
   - M163 Vulcan Air Defense System
   - M60A3 "Patton"
-artillery_units:
+artillery_units: 
   - M109A6 Paladin
-logistics_units:
+logistics_units: 
   - Truck M818 6x6
   - LARC-V
-infantry_units:
+infantry_units: 
   - Infantry M249
   - Infantry M4
 missiles: []
-preset_groups:
+preset_groups: 
   - Hawk
-naval_units:
+naval_units: 
   - FFG Oliver Hazard Perry
   - CV-59 Forrestal
-air_defense_units:
+air_defense_units: 
   - SAM Hawk SR (AN/MPQ-50)
   - M163 Vulcan Air Defense System
   - M48 Chaparral
-carrier_names:
+carrier_names: 
   - CV-59 Forrestal
   - CV-60 Saratoga
   - CV-61 Ranger
   - CV-62 Independence
-requirements: {}
-doctrine: coldwar
+has_jtac: "false"
+doctrine: "coldwar"

resources/factions/usa_1975.yaml

@@ -12,6 +12,7 @@ aircrafts:
   - CH-53E
   - F-14A Tomcat (Block 135-GR Late)
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - F-4B Phantom II
   - F-4C Phantom II
   - F-5E Tiger II

resources/factions/usa_1990.yaml

@@ -23,6 +23,7 @@ aircrafts:
   - F-15E Strike Eagle (Suite 4+)
   - F-16CM Fighting Falcon (Block 50)
   - F/A-18C Hornet (Lot 20)
+  - OH-58D(R) Kiowa Warrior
   - S-3B Viking
   - SH-60B Seahawk
   - UH-1H Iroquois

resources/factions/usa_2005.yaml

@@ -26,6 +26,7 @@ aircrafts:
   - F-16CM Fighting Falcon (Block 50)
   - F-22A Raptor
   - F/A-18C Hornet (Lot 20)
+  - OH-58D(R) Kiowa Warrior
   - S-3B Viking
   - SH-60B Seahawk
   - UH-1H Iroquois

resources/factions/usn_1985.yaml

@@ -12,6 +12,7 @@ aircrafts:
   - F-14B Tomcat
   - F-4B Phantom II
   - F-4E Phantom II
+  - F-4E-45MC Phantom II
   - S-3B Viking
   - SH-60B Seahawk
   - UH-1H Iroquois

resources/factions/usn_2009.yaml

@@ -1,6 +1,6 @@
 country: USA
 name: US Navy 2009
-authors: Fuzzle, Chili
+authors: Fuzzle, Chilli
 description: <p>A modern representation of the US Navy/Marine Corps.</p>
 locales:
   - en_US

resources/plugins/base/dcs_liberation.lua

@@ -151,9 +151,11 @@ end
 function update_hit_points(event)
 	local update = {}
 	update.name = event.target:getName()
-	update.hit_points = event.target:getLife()
-	unit_hit_point_updates[#unit_hit_point_updates + 1] = update
-	write_state()
+	get_life_success, update.hit_points = pcall(event.target.getLife, event.target)
+	if get_life_success then
+		unit_hit_point_updates[#unit_hit_point_updates + 1] = update
+		write_state()
+	end
 end 
 
 activeWeapons = {}

resources/squadrons/F-4E-45MC/EAF 222-FG-GG.yaml

@@ -0,0 +1,22 @@
+---
+name: EAF 222nd TFB
+nickname: Pharaoh's Ghosts
+country: Egypt
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: EAF-60366_Ghost
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/EAF 222-FG-SEA.yaml

@@ -0,0 +1,22 @@
+---
+name: EAF 222nd TFB SEA
+nickname: Pharaoh's Ghosts
+country: Egypt
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: EAF-70373_SEAW
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/GAF JG-72.yaml

@@ -0,0 +1,22 @@
+---
+name: GAF JG 72
+nickname: Westphalen
+country: Germany
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: 37+24_N81B_JG72
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/GAF JG-74.yaml

@@ -0,0 +1,22 @@
+---
+name: GAF JG 74
+nickname: Moelders
+country: Germany
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: 37+36_N72_JG74
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/HAF 338-FS.yaml

@@ -0,0 +1,22 @@
+---
+name: HAF 338rd FS
+nickname: Ares
+country: Greece
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: HAF-01507_AG
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/IAF 119-FS.yaml

@@ -0,0 +1,22 @@
+---
+name: IAF 119 FS
+nickname: Bat Squadron
+country: Israel
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: IAF-Kurnass-114-119SQN
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/IAF-69-FS.yaml

@@ -0,0 +1,22 @@
+---
+name: IAF 69 FS
+nickname: Hammers
+country: Israel
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: IAF-Kurnass-175-69SQN
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/IRIAF 69-TFS.yaml

@@ -0,0 +1,22 @@
+---
+name: IRIAF 61st TFS
+nickname: Panthers
+country: Iran
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: IRIAF-3-6643
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/JASDF 8-TFS.yaml

@@ -0,0 +1,22 @@
+---
+name: JASDF 8th TFS
+nickname: Black Panthers
+country: Japan
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: JASDF-87-8312-3WG
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/RAAF 1-SQN.yaml

@@ -0,0 +1,22 @@
+---
+name: RAAF No. 1 SQN
+nickname: Fighting First
+country: Australia
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: RAAF-97203_SEA
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/RAF 43-SQN.yaml

@@ -0,0 +1,22 @@
+---
+name: RAF No. 43 SQN
+nickname: Fighting Cocks
+country: UK
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: RAF-43-Sqn-FG.1
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/ROKAF 153-SQN.yaml

@@ -0,0 +1,22 @@
+---
+name: ROKAF 153rd FS
+nickname: 153rd Fighter Squadron
+country: South Korea
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: ROKAF-80470-CG-153FS
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/TuAF 111-FILO.yaml

@@ -0,0 +1,22 @@
+---
+name: TuAF 111 Filo
+nickname: Panter
+country: Turkey
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: TUAF-67-0268-H2
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP

resources/squadrons/F-4E-45MC/USAF 110-ANG-BS.yaml

@@ -0,0 +1,22 @@
+---
+name: USAF 110th ANG BS
+nickname: Lindbergh's Own
+country: USA
+role: Fighter Bomber
+aircraft: F-4E-45MC Phantom II
+livery: SL68-303_H1_110ANG
+mission_types:
+  - Anti-ship
+  - BAI
+  - BARCAP
+  - CAS
+  - DEAD
+  - Escort
+  - Intercept
+  - OCA/Aircraft
+  - OCA/Runway
+  - SEAD
+  - SEAD Escort
+  - Strike
+  - Fighter sweep
+  - TARCAP