Update README.md due to changes in URLs

2025-11-10 14:22:26 +00:00 · 2024-03-05 21:45:23 +11:00
178 changed files with 911 additions and 7876 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.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:
-        - 11.0.0
+        - 10.0.0
        - Development build
  - type: textarea
    attributes:
--- a/.github/ISSUE_TEMPLATE/new-game-bug.yml
+++ b/.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:
-        - 11.0.0
+        - 10.0.0
        - Development build
  - type: textarea
    attributes:
--- a/.github/actions/setup-liberation-python/action.yaml
+++ b/.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.4"
+        python-version: "3.11"
        cache: pip

    - name: Install environment
--- a/README.md
+++ b/README.md
@@ -17,6 +17,11 @@
 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
--- a/changelog.md
+++ b/changelog.md
@@ -1,43 +1,13 @@
-# 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.

 ## Features/Improvements

-* **[Engine]** Support for DCS 2.9.3.51704. 
-* **[Campaign]** Improved tracking of parked aircraft deaths. Parked aircraft are now considered dead once sufficient damage is done, meaning guns, rockets and AGMs are viable weapons for OCA/Aircraft missions. Previously Liberation relied on DCS death tracking which required parked aircraft to be hit with more powerful weapons e.g. 2000lb bombs as they were uncontrolled.
-* **[Campaign]** Track damage to theater ground objects across turns. Damage can accumulate across turns leading to death of the unit. This behavior only applies to SAMs, ships and other units that appear on the Liberation map. Frontline units and buildings are not tracked (yet).
-* **[Mods]** F/A-18 E/F/G Super Hornet mod (v2.2.5) support added.
+* **[Engine]** Support for DCS 2.9.3.51704 Open Beta. 

 ## Fixes

-* **[Mission Generation]** When planning anti-ship missions against carriers or LHAs, target escorts (if present) if the carrier/LHA is sunk.
-* **[UI]** Identify that a carrier or LHA is sunk instead of "damaged".
-
 # 10.0.0

 Saves from 9.x are not compatible with 10.0.0.
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -7,9 +7,9 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information

 project = "DCS Liberation"
-copyright = "2024, DCS Liberation Team"
+copyright = "2023, DCS Liberation Team"
 author = "DCS Liberation Team"
-release = "11.1.0"
+release = "11.0.0"

 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
--- a/game/ato/flightplans/theaterrefueling.py
+++ b/game/ato/flightplans/theaterrefueling.py
@@ -17,13 +17,7 @@ class TheaterRefuelingFlightPlan(RefuelingFlightPlan):

    @property
    def patrol_duration(self) -> timedelta:
-        # 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)
-        )
+        return timedelta(hours=1)


 class Builder(IBuilder[TheaterRefuelingFlightPlan, PatrollingLayout]):
--- a/game/campaignloader/mizcampaignloader.py
+++ b/game/campaignloader/mizcampaignloader.py
@@ -61,8 +61,6 @@ 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 = {
--- a/game/dcs/aircrafttype.py
+++ b/game/dcs/aircrafttype.py
@@ -34,10 +34,6 @@ from game.radio.channels import (
    ViggenRadioChannelAllocator,
    ViperChannelNamer,
    WarthogChannelNamer,
-    PhantomChannelNamer,
-    HindChannelNamer,
-    HipChannelNamer,
-    KiowaChannelNamer,
 )
 from game.utils import (
    Distance,
@@ -114,10 +110,6 @@ class RadioConfig:
            "apache": ApacheChannelNamer,
            "a10c-legacy": LegacyWarthogChannelNamer,
            "a10c-ii": WarthogChannelNamer,
-            "phantom": PhantomChannelNamer,
-            "hind": HindChannelNamer,
-            "hip": HipChannelNamer,
-            "kiowa": KiowaChannelNamer,
        }[config.get("namer", "default")]


@@ -506,11 +498,9 @@ 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,
--- a/game/debriefing.py
+++ b/game/debriefing.py
@@ -1,5 +1,5 @@
 from __future__ import annotations
-from abc import ABC
+
 import itertools
 import logging
 from collections import defaultdict
@@ -9,9 +9,7 @@ from typing import (
    Dict,
    Iterator,
    List,
-    Optional,
    TYPE_CHECKING,
-    TypeVar,
    Union,
 )
 from uuid import UUID
@@ -23,10 +21,8 @@ from game.theater import Airfield, ControlPoint
 if TYPE_CHECKING:
    from game import Game
    from game.ato.flight import Flight
-    from game.dcs.unittype import UnitType
    from game.sim.simulationresults import SimulationResults
    from game.transfers import CargoShip
-    from game.theater import TheaterUnit
    from game.unitmap import (
        AirliftUnits,
        ConvoyUnit,
@@ -94,103 +90,6 @@ class BaseCaptureEvent:
    captured_by_player: bool


-@dataclass
-class UnitHitpointUpdate(ABC):
-    unit: Any
-    hit_points: int
-
-    @classmethod
-    def from_json(
-        cls, data: dict[str, Any], unit_map: UnitMap
-    ) -> Optional[UnitHitpointUpdate]:
-        raise NotImplementedError()
-
-    def is_dead(self) -> bool:
-        # Use hit_points > 1 to indicate unit is alive, rather than >=1 (DCS logic) to account for uncontrolled units which often have a
-        # health floor of 1
-        if self.hit_points > 1:
-            return False
-        return True
-
-    def is_friendly(self, to_player: bool) -> bool:
-        raise NotImplementedError()
-
-
-@dataclass
-class FlyingUnitHitPointUpdate(UnitHitpointUpdate):
-    unit: FlyingUnit
-
-    @classmethod
-    def from_json(
-        cls, data: dict[str, Any], unit_map: UnitMap
-    ) -> Optional[FlyingUnitHitPointUpdate]:
-        unit = unit_map.flight(data["name"])
-        if unit is None:
-            return None
-        return cls(unit, int(float(data["hit_points"])))
-
-    def is_friendly(self, to_player: bool) -> bool:
-        if to_player:
-            return self.unit.flight.departure.captured
-        return not self.unit.flight.departure.captured
-
-
-@dataclass
-class TheaterUnitHitPointUpdate(UnitHitpointUpdate):
-    unit: TheaterUnitMapping
-
-    @classmethod
-    def from_json(
-        cls, data: dict[str, Any], unit_map: UnitMap
-    ) -> Optional[TheaterUnitHitPointUpdate]:
-        unit = unit_map.theater_units(data["name"])
-        if unit is None:
-            return None
-
-        if unit.theater_unit.unit_type is None:
-            logging.debug(
-                f"Ground unit {data['name']} does not have a valid unit type."
-            )
-            return None
-
-        if unit.theater_unit.hit_points is None:
-            logging.debug(f"Ground unit {data['name']} does not have hit_points set.")
-            return None
-
-        sim_hit_points = int(
-            float(data["hit_points"])
-        )  # Hit points out of the sim i.e. new unit hit points - damage in this turn
-        previous_turn_hit_points = (
-            unit.theater_unit.hit_points
-        )  # Hit points at the end of the previous turn
-        full_health_hit_points = (
-            unit.theater_unit.unit_type.hit_points
-        )  # Hit points of a new unit
-
-        # Hit points left after damage this turn is subtracted from hit points at the end of the previous turn
-        new_hit_points = previous_turn_hit_points - (
-            full_health_hit_points - sim_hit_points
-        )
-
-        return cls(unit, new_hit_points)
-
-    def is_dead(self) -> bool:
-        # Some TheaterUnits can start with low health of around 1, make sure we don't always kill them off.
-        if (
-            self.unit.theater_unit.unit_type is not None
-            and self.unit.theater_unit.unit_type.hit_points is not None
-            and self.unit.theater_unit.unit_type.hit_points <= 1
-        ):
-            return False
-        return super().is_dead()
-
-    def is_friendly(self, to_player: bool) -> bool:
-        return self.unit.theater_unit.ground_object.is_friendly(to_player)
-
-    def commit(self) -> None:
-        self.unit.theater_unit.hit_points = self.hit_points
-
-
@dataclass(frozen=True)
 class StateData:
    #: True if the mission ended. If False, the mission exited abnormally.
@@ -209,10 +108,6 @@ class StateData:
    #: Mangled names of bases that were captured during the mission.
    base_capture_events: List[str]

-    # List of descriptions of damage done to units. Each list element is a dict like the following
-    # {"name": "<damaged unit name>", "hit_points": <hit points as float>}
-    unit_hit_point_updates: List[dict[str, Any]]
-
    @classmethod
    def from_json(cls, data: Dict[str, Any], unit_map: UnitMap) -> StateData:
        def clean_unit_list(unit_list: List[Any]) -> List[str]:
@@ -252,7 +147,6 @@ class StateData:
            killed_ground_units=killed_ground_units,
            destroyed_statics=data["destroyed_objects_positions"],
            base_capture_events=data["base_capture_events"],
-            unit_hit_point_updates=data["unit_hit_point_updates"],
        )


@@ -390,25 +284,6 @@ class Debriefing:
                player_losses.append(aircraft)
            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:
-                continue
-            if damaged_unit.is_dead():
-                # 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:
-                    enemy_losses.append(damaged_unit.unit)
        return AirLosses(player_losses, enemy_losses)

    def dead_ground_units(self) -> GroundLosses:
@@ -481,29 +356,8 @@ class Debriefing:
                    losses.enemy_airlifts.append(airlift_unit)
                continue

-        for unit_data in self.state_data.unit_hit_point_updates:
-            damaged_unit = TheaterUnitHitPointUpdate.from_json(unit_data, self.unit_map)
-            if damaged_unit is None:
-                continue
-            if damaged_unit.is_dead():
-                if unit_data["name"] in self.state_data.killed_ground_units:
-                    continue
-                if damaged_unit.is_friendly(to_player=True):
-                    losses.player_ground_objects.append(damaged_unit.unit)
-                else:
-                    losses.enemy_ground_objects.append(damaged_unit.unit)
-
        return losses

-    def unit_hit_point_update_events(self) -> List[TheaterUnitHitPointUpdate]:
-        damaged_units = []
-        for unit_data in self.state_data.unit_hit_point_updates:
-            unit = TheaterUnitHitPointUpdate.from_json(unit_data, self.unit_map)
-            if unit is None:
-                continue
-            damaged_units.append(unit)
-        return damaged_units
-
    def base_capture_events(self) -> List[BaseCaptureEvent]:
        """Keeps only the last instance of a base capture event for each base ID."""
        blue_coalition_id = 2
--- a/game/factions/faction.py
+++ b/game/factions/faction.py
@@ -300,11 +300,8 @@ class Faction:
            self.remove_aircraft("Su-57")
        if not mod_settings.ov10a_bronco:
            self.remove_aircraft("Bronco-OV-10A")
-        if not mod_settings.fa18efg:
-            self.remove_aircraft("FA_18E")
-            self.remove_aircraft("FA_18F")
-            self.remove_aircraft("EA_18G")
-
+        if not mod_settings.superhornet:
+            self.remove_aircraft("Super-Hornet")
        # frenchpack
        if not mod_settings.frenchpack:
            self.remove_vehicle("AMX10RCR")
--- a/game/missiongenerator/aircraft/waypoints/antishipingress.py
+++ b/game/missiongenerator/aircraft/waypoints/antishipingress.py
@@ -20,14 +20,8 @@ class AntiShipIngressBuilder(PydcsWaypointBuilder):
            group_names.append(target.name)
        elif isinstance(target, NavalControlPoint):
            carrier_name = target.get_carrier_group_name()
-            if carrier_name and self.mission.find_group(
-                carrier_name
-            ):  # Found a carrier, target it.
+            if carrier_name:
                group_names.append(carrier_name)
-            else:  # Could not find carrier/LHA, indicating it was sunk. Target other groups if present e.g. escorts.
-                for ground_object in target.ground_objects:
-                    for group in ground_object.groups:
-                        group_names.append(group.group_name)
        else:
            logging.error(
                "Unexpected target type for anti-ship mission: %s",
--- a/game/radio/channels.py
+++ b/game/radio/channels.py
@@ -389,64 +389,3 @@ 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"
--- a/game/radio/radios.py
+++ b/game/radio/radios.py
@@ -1,5 +1,4 @@
 """Radio frequency types and allocators."""
-
 from __future__ import annotations

 import itertools
@@ -160,7 +159,6 @@ 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",
        (
@@ -187,7 +185,6 @@ 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),)),
@@ -295,9 +292,6 @@ 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),)),
 ]


--- a/game/server/controlpoints/routes.py
+++ b/game/server/controlpoints/routes.py
@@ -89,11 +89,6 @@ 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

--- a/game/settings/settings.py
+++ b/game/settings/settings.py
@@ -467,12 +467,6 @@ 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
--- a/game/sim/missionresultsprocessor.py
+++ b/game/sim/missionresultsprocessor.py
@@ -34,7 +34,6 @@ class MissionResultsProcessor:
        self.commit_damaged_runways(debriefing)
        self.commit_captures(debriefing, events)
        self.commit_front_line_battle_impact(debriefing, events)
-        self.commit_unit_damage(debriefing)
        self.record_carcasses(debriefing)

    def commit_air_losses(self, debriefing: Debriefing) -> None:
@@ -308,52 +307,42 @@ class MissionResultsProcessor:
                            f"{enemy_cp.name}. {status_msg}",
                        )

-    @staticmethod
-    def commit_unit_damage(debriefing: Debriefing) -> None:
-        for damaged_unit in debriefing.unit_hit_point_update_events():
-            logging.info(
-                f"{damaged_unit.unit.theater_unit.name} damaged, setting hit points to {damaged_unit.hit_points}"
-            )
-            damaged_unit.commit()
-
    def redeploy_units(self, cp: ControlPoint) -> None:
        """ "
        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]

-        # 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)
+        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
+        ]

-        # If there are no frontline CPs, then nothing to do.
-        if len(frontline_cps) == 0:
+        # 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:
            return

-        # 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)
+        # From each ally cp, send reinforcements
+        for ally_cp in ally_connected_cps:
+            self.redeploy_between(cp, ally_cp)

-    def redeploy_between(
-        self, destination: ControlPoint, source: ControlPoint, move_factor: float
-    ) -> None:
+    def redeploy_between(self, destination: ControlPoint, source: ControlPoint) -> 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)
--- a/game/theater/controlpoint.py
+++ b/game/theater/controlpoint.py
@@ -1283,10 +1283,7 @@ class NavalControlPoint(ControlPoint, ABC):
        return RunwayStatus(damaged=not self.runway_is_operational())

    def describe_runway_status(self) -> str:
-        if self.runway_is_operational():
-            return f"Flight deck {self.runway_status.describe()}"
-        # Special handling for not operational carriers/LHAs
-        return f"Sunk"
+        return f"Flight deck {self.runway_status.describe()}"

    @property
    def runway_can_be_repaired(self) -> bool:
--- a/game/theater/start_generator.py
+++ b/game/theater/start_generator.py
@@ -66,7 +66,7 @@ class ModSettings:
    frenchpack: bool = False
    high_digit_sams: bool = False
    ov10a_bronco: bool = False
-    fa18efg: bool = False
+    superhornet: bool = False

    def save_player_settings(self) -> None:
        """Saves the player's global settings to the user directory."""
--- a/game/theater/theatergroup.py
+++ b/game/theater/theatergroup.py
@@ -35,8 +35,6 @@ class TheaterUnit:
    position: PointWithHeading
    # The parent ground object
    ground_object: TheaterGroundObject
-    # Number of hit points the unit has
-    hit_points: Optional[int] = None
    # State of the unit, dead or alive
    alive: bool = True

@@ -44,17 +42,13 @@ class TheaterUnit:
    def from_template(
        id: int, dcs_type: Type[DcsUnitType], t: LayoutUnit, go: TheaterGroundObject
    ) -> TheaterUnit:
-        unit = TheaterUnit(
+        return TheaterUnit(
            id,
            t.name,
            dcs_type,
            PointWithHeading.from_point(t.position, Heading.from_degrees(t.heading)),
            go,
        )
-        # if the TheaterUnit represents a GroundUnitType or ShipUnitType, initialize health to full hit points
-        if unit.unit_type is not None:
-            unit.hit_points = unit.unit_type.hit_points
-        return unit

    @property
    def unit_type(self) -> Optional[UnitType[Any]]:
@@ -76,12 +70,14 @@ class TheaterUnit:

    @property
    def display_name(self) -> str:
+        dead_label = " [DEAD]" if not self.alive else ""
        unit_label = self.unit_type or self.type.name or self.name
-        return f"{str(self.id).zfill(4)} | {unit_label}{self._status_label()}"
+        return f"{str(self.id).zfill(4)} | {unit_label}{dead_label}"

    @property
    def short_name(self) -> str:
-        return f"<b>{self.type.id[0:18]}</b> {self._status_label()}"
+        dead_label = " [DEAD]" if not self.alive else ""
+        return f"<b>{self.type.id[0:18]}</b> {dead_label}"

    @property
    def is_static(self) -> bool:
@@ -121,18 +117,6 @@ class TheaterUnit:
        unit_range = getattr(self.type, "threat_range", None)
        return meters(unit_range if unit_range is not None and self.alive else 0)

-    def _status_label(self) -> str:
-        if not self.alive:
-            return " [DEAD]"
-        if self.unit_type is None:
-            return ""
-        if self.hit_points is None:
-            return ""
-        if self.unit_type.hit_points == self.hit_points:
-            return ""
-        damage_percentage = 100 - int(100 * self.hit_points / self.unit_type.hit_points)
-        return f" [DAMAGED {damage_percentage}%]"
-

 class SceneryUnit(TheaterUnit):
    """Special TheaterUnit for handling scenery ground objects"""
--- a/game/version.py
+++ b/game/version.py
@@ -2,7 +2,7 @@ from pathlib import Path


 MAJOR_VERSION = 11
-MINOR_VERSION = 1
+MINOR_VERSION = 0
 MICRO_VERSION = 0
 VERSION_NUMBER = ".".join(str(v) for v in (MAJOR_VERSION, MINOR_VERSION, MICRO_VERSION))

--- a/pydcs_extensions/init.py
+++ b/pydcs_extensions/init.py
@@ -9,7 +9,6 @@ from .jas39 import *
 from .ov10a import *
 from .su57 import *
 from .uh60l import *
-from .fa18efg import *


 def load_mods() -> None:
--- a/pydcs_extensions/a4ec/a4ec.py
+++ b/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 = (1, Weapons.AGM_45B_Shrike_ARM)
+        AGM_45B_Shrike_ARM__Imp_ = (1, Weapons.AGM_45B_Shrike_ARM__Imp_)
        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 = (2, Weapons.AGM_45B_Shrike_ARM)
+        AGM_45B_Shrike_ARM__Imp_ = (2, Weapons.AGM_45B_Shrike_ARM__Imp_)
        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 = (4, Weapons.AGM_45B_Shrike_ARM)
+        AGM_45B_Shrike_ARM__Imp_ = (4, Weapons.AGM_45B_Shrike_ARM__Imp_)
        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 = (5, Weapons.AGM_45B_Shrike_ARM)
+        AGM_45B_Shrike_ARM__Imp_ = (5, Weapons.AGM_45B_Shrike_ARM__Imp_)
        Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
            5,
            Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
--- a/pydcs_extensions/f4/f4.py
+++ b/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 = (3, Weapons.AGM_45B_Shrike_ARM)
+        AGM_45B_Shrike_ARM__Imp_ = (3, Weapons.AGM_45B_Shrike_ARM__Imp_)
        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 = (9, Weapons.AGM_45B_Shrike_ARM)
+        AGM_45B_Shrike_ARM__Imp_ = (9, Weapons.AGM_45B_Shrike_ARM__Imp_)
        AGM_45A_Shrike_ARM = (9, Weapons.AGM_45A_Shrike_ARM)
        LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
            9,
--- a/pydcs_extensions/fa18efg/init.py
+++ b/pydcs_extensions/fa18efg/init.py
@@ -1 +0,0 @@
-from .fa18efg import *
--- a/pydcs_extensions/fa18efg/fa18efg.py
+++ b/pydcs_extensions/fa18efg/fa18efg.py
--- a/qt_ui/windows/AirWingConfigurationDialog.py
+++ b/qt_ui/windows/AirWingConfigurationDialog.py
@@ -285,7 +285,6 @@ 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()
@@ -665,7 +664,7 @@ class OverfullAirbasesDisplay(QGroupBox):
        parent: QWidget | None = None,
    ) -> None:
        super().__init__("Overfull airbases", parent)
-        self.setMaximumHeight(125)
+        self.setMaximumHeight(200)

        self.parking_tracker = parking_tracker
        self.parking_tracker.allocation_changed.connect(self.on_allocation_changed)
@@ -791,7 +790,7 @@ class AirWingConfigurationDialog(QDialog):
        self.game = game
        self.parking_tracker = AirWingConfigParkingTracker(game)

-        self.resize(1024, 900)
+        self.setMinimumSize(1024, 768)
        self.setWindowTitle(f"Air Wing Configuration")
        # TODO: self.setWindowIcon()

--- a/qt_ui/windows/QLiberationWindow.py
+++ b/qt_ui/windows/QLiberationWindow.py
@@ -493,8 +493,6 @@ class QLiberationWindow(QMainWindow):
            "ColonelAkirNakesh",
            "Nosajthedevil",
            "kivipe",
-            "Chilli935",
-            "DillieKoe",
        ]
        text = (
            "<h3>DCS Liberation "
--- a/qt_ui/windows/basemenu/QBaseMenu2.py
+++ b/qt_ui/windows/basemenu/QBaseMenu2.py
@@ -16,7 +16,6 @@ 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,
@@ -157,9 +156,6 @@ 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
--- a/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py
+++ b/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py
@@ -127,12 +127,6 @@ 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)
--- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py
+++ b/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().sizeHint().width() + self.lineWidth()
+        total_column_width = self.verticalHeader().width() + self.lineWidth()
        for i in range(0, self.model.columnCount()):
            total_column_width += self.columnWidth(i) + self.lineWidth()
        self.setFixedWidth(total_column_width)
--- a/qt_ui/windows/newgame/QNewGameWizard.py
+++ b/qt_ui/windows/newgame/QNewGameWizard.py
@@ -142,10 +142,6 @@ 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("======================")
@@ -208,7 +204,7 @@ class NewGameWizard(QtWidgets.QWizard):
            ov10a_bronco=self.field("ov10a_bronco"),
            frenchpack=self.field("frenchpack"),
            high_digit_sams=self.field("high_digit_sams"),
-            fa18efg=self.field("fa18efg"),
+            superhornet=self.field("superhornet"),
        )
        mod_settings.save_player_settings()

@@ -831,9 +827,9 @@ class GeneratorOptions(QtWidgets.QWizardPage):
        high_digit_sams.setChecked(mod_settings.high_digit_sams)
        self.registerField("high_digit_sams", high_digit_sams)

-        fa18efg = QtWidgets.QCheckBox()
-        fa18efg.setChecked(mod_settings.fa18efg)
-        self.registerField("fa18efg", fa18efg)
+        superhornet = QtWidgets.QCheckBox()
+        superhornet.setChecked(mod_settings.superhornet)
+        self.registerField("superhornet", superhornet)

        modHelpText = QtWidgets.QLabel(
            "<p>Select the mods you have installed. If your chosen factions support them, you'll be able to use these mods in your campaign.</p>"
@@ -887,10 +883,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
        modLayout.addWidget(high_digit_sams, modLayout_row, 1)
        modSettingsGroup.setLayout(modLayout)
        modLayout_row += 1
-        modLayout.addWidget(
-            QtWidgets.QLabel("F/A-18EFG Super Hornet (version 2.2.5)"), modLayout_row, 0
-        )
-        modLayout.addWidget(fa18efg, modLayout_row, 1)
+        modLayout.addWidget(QtWidgets.QLabel("Super Hornet"), modLayout_row, 0)
+        modLayout.addWidget(superhornet, modLayout_row, 1)
        modSettingsGroup.setLayout(modLayout)
        modLayout_row += 1

--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ annotated-types==0.6.0
 anyio==3.7.1
 asgiref==3.7.2
 attrs==23.1.0
-black==24.3.0
+black==23.11.0
 certifi==2023.11.17
 cfgv==3.4.0
 click==8.1.7
@@ -12,15 +12,15 @@ coverage==7.3.2
 distlib==0.3.7
 exceptiongroup==1.2.0
 Faker==20.1.0
-fastapi==0.109.1
+fastapi==0.104.1
 filelock==3.13.1
 future==0.18.3
 h11==0.14.0
 httptools==0.6.1
 identify==2.5.32
-idna==3.7
+idna==3.6
 iniconfig==2.0.0
-Jinja2==3.1.4
+Jinja2==3.1.3
 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.3.0
+Pillow==10.2.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/dcs-liberation/dcs@58b4cc91bfb068e094f684e4747190d1dcd57232
+pydcs @ git+https://github.com/pydcs/dcs@7eeec23ea428846ebbbd0ea4c746f8eafea04e0d
 pyinstaller==5.13.1
 pyinstaller-hooks-contrib==2023.6
 pyproj==3.6.1
@@ -54,7 +54,7 @@ shapely==2.0.2
 shiboken6==6.4.1
 six==1.16.0
 sniffio==1.3.0
-starlette==0.35.1
+starlette==0.27.0
 tabulate==0.9.0
 tomli==2.0.1
 types-Jinja2==2.11.9
--- a/resources/campaigns/battle_for_no_mans_land.miz
+++ b/resources/campaigns/battle_for_no_mans_land.miz
--- a/resources/campaigns/battle_for_no_mans_land.yaml
+++ b/resources/campaigns/battle_for_no_mans_land.yaml
@@ -6,66 +6,64 @@ recommended_player_faction: USA 2005
 recommended_enemy_faction: Private Military Company - Russian (Hard)
 description:
  <p><strong>Note:</strong> This campaign was designed for helicopters.</p><p>
-  Set against the rugged and windswept backdrop of the Falkland Islands, 
-  this fictional campaign scenario unfolds with a dramatic dawn sneak attack 
-  on RAF Mount Pleasant Airbase. Orchestrated by a Russia-backed private 
-  military company, the deadly offensive with helicopter gunships and ground troops 
-  has left the airbase's runways in ruins and its defences obliterated. This brutal 
-  incursion resulted in significant casualties among the RAF personnel, with many 
-  killed or wounded in the unexpected onslaught. The carrier HMS Queen Elizabeth and 
-  its task force are on their way to evacuate the survivors and retake Mount Pleasant. 
+  Set against the rugged and windswept backdrop of the Falkland Islands,
+  this fictional campaign scenario unfolds with a dramatic dawn sneak attack
+  on RAF Mount Pleasant Airbase. Orchestrated by a Russia-backed private
+  military company, the deadly offensive with helicopter gunships and ground troops
+  has left the airbase's runways in ruins and its defences obliterated. This brutal
+  incursion resulted in significant casualties among the RAF personnel, with many
+  killed or wounded in the unexpected onslaught. The carrier HMS Queen Elizabeth and
+  its task force are on their way to evacuate the survivors and retake Mount Pleasant.
  However, they are eight days away at full steam.</p><p>
-  Amidst this chaos, a beacon of hope emerges in the heart of the Falklands. At Port 
-  Stanley, a small detachment of US military personnel, including helicopter pilots 
-  and armor units, find themselves inadvertently thrust into the fray. Originally at 
-  Port Stanley for some R&R following a training exercise, these soldiers now face 
-  an unexpected and urgent call to action. Their mission is daunting but clear - to 
-  prevent the capture of Port Stanley and liberate East Falkland from the clutches 
+  Amidst this chaos, a beacon of hope emerges in the heart of the Falklands. At Port
+  Stanley, a small detachment of US military personnel, including helicopter pilots
+  and armor units, find themselves inadvertently thrust into the fray. Originally at
+  Port Stanley for some R&R following a training exercise, these soldiers now face
+  an unexpected and urgent call to action. Their mission is daunting but clear - to
+  prevent the capture of Port Stanley and liberate East Falkland from the clutches
  of the PMC forces.</p><p>
-  This small group must strategically destroy the PMC forces deployed around the treacherous 
-  valley lying between Wickham Heights and the Onion Ranges, an area ominously known 
-  as No Man's Land. Their plan involves a daring assault to destroy the enemy's 
-  helicopter gunships stationed at San Carlos FOB. Following this, they aim to force 
-  the PMC ground forces into a strategic retreat southward, along the 1.6 mile wide 
-  isthmus into Lafonia. This offensive is designed to create a defensible position 
-  at Goose Green on the narrow isthmus, which can be held against a numerically 
+  This small group must strategically push the PMC forces back through the treacherous
+  valley lying between Wickham Heights and the Onion Ranges, an area ominously known
+  as No Man's Land. Their plan involves a daring assault to destroy the enemy's
+  helicopter gunships stationed at San Carlos FOB. Following this, they aim to force
+  the PMC ground forces into a strategic retreat southward, along the 1.6 mile wide
+  isthmus into Lafonia. This calculated offensive is designed to create a defensible
+  position at Goose Green on the narrow isthmus, which can be held against a numerically
  superior force until the arrival of Big Lizzie.</p>
 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:
    - primary: DEAD
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - AH-64D Apache Longbow
      size: 6
    - primary: BAI
-      secondary: any
+      secondary: air-to-ground
      aircraft:
-        - OH-58D(R) Kiowa Warrior
+        - AH-64D Apache Longbow
      size: 6
    - primary: Air Assault
      secondary: any
      aircraft:
+        - UH-60L
        - UH-60A
      size: 4
  #San Carlos FOB
  3:
    - primary: BAI
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - Mi-24P Hind-F
      size: 6
  #Goose Green
  24:
    - primary: DEAD
-      secondary: any
+      secondary: air-to-ground
      aircraft:
-        - Ka-50 Hokum III
        - Ka-50 Hokum (Blackshark 3)
-      size: 6
+      size: 6
--- a/resources/campaigns/black_sea.yaml
+++ b/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: 3
+performance: 2
 version: "11.0"
 squadrons:
  # Anapa-Vityazevo
--- a/resources/campaigns/exercise_bright_star.miz
+++ b/resources/campaigns/exercise_bright_star.miz
--- a/resources/campaigns/exercise_bright_star.yaml
+++ b/resources/campaigns/exercise_bright_star.yaml
@@ -1,187 +1,155 @@
---
-name: Sinai - Exercise Bright Star
-theater: Sinai
-authors: Starfire
-recommended_player_faction: Bluefor Modern
-recommended_enemy_faction: Egypt 2000
-description:
-    <p>For over four decades, the United States and Egypt have conducted a series 
-    of biannual joint military exercises known as Bright Star. As the 
-    geopolitical landscape has transformed, so too has the scope and scale of 
-    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 
-    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 
-    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, 
-    hosting the aggressor faction of the exercise coalition at its airfields, 
-    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
-      secondary: any
-      aircraft:
-        - F/A-18C Hornet (Lot 20)
-      size: 24
-    - primary: AEW&C
-      aircraft:
-        - E-2D Advanced Hawkeye
-      size: 2
-    - primary: Refueling
-      aircraft:
-        - S-3B Tanker
-      size: 4
-  Bombers from Al Udeid Air Base:
-    - primary: Anti-ship
-      secondary: air-to-ground
-      aircraft:
-        - B-52H Stratofortress
-      size: 4
-    - primary: Strike
-      secondary: air-to-ground
-      aircraft:
-        - B-1B Lancer
-      size: 4
-  # Ovda
-  10:
-    - primary: CAS
-      secondary: air-to-ground
-      aircraft:
-        - A-10C Thunderbolt II (Suite 7)
-      size: 8
-    - primary: Escort
-      secondary: any
-      aircraft:
-        - F-15C Eagle
-      size: 16
-    - primary: OCA/Runway
-      secondary: any
-      aircraft:
-        - F-15E Strike Eagle (Suite 4+)
-      size: 16
-    - primary: BAI
-      secondary: any
-      aircraft:
-        - JF-17 Thunder
-      size: 16
-  # Ramon Airbase
-  9:
-    - primary: DEAD
-      secondary: any
-      aircraft:
-        - F-16CM Fighting Falcon (Block 50)
-      size: 16
-    - primary: BAI
-      secondary: any
-      aircraft:
-        - AH-64D Apache Longbow
-      size: 8
-    - primary: Air Assault
-      secondary: any
-      aircraft:
-        - UH-60A
-      size: 4
-  # 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
-      secondary: any
-      aircraft:
-        - Ka-50 Hokum III
-        - Ka-50 Hokum (Blackshark 3)
-      size: 4
-    - primary: BAI
-      secondary: any
-      aircraft:
-        - Mirage 2000C
-      size: 12
-    - primary: Escort
-      secondary: any
-      aircraft:
-        - MiG-21bis Fishbed-N
-      size: 12
-  # Wadi al Jandali (72)
-  13:
-    - primary: AEW&C
-      aircraft:
-        - E-2C Hawkeye
-      size: 2
-    - primary: SEAD
-      secondary: any
-      aircraft:
-        - F-4E-45MC Phantom II
-      size: 20
-    - primary: DEAD
-      secondary: 
-        - BAI
-        - BARCAP
-        - CAS
-        - Escort
-        - Fighter sweep
-        - Intercept
-        - OCA/Aircraft
-        - OCA/Runway
-        - Strike
-        - TARCAP
-      aircraft:
-        - F-16CM Fighting Falcon (Block 50)
-      size: 20
-    - primary: Air Assault
-      secondary: any
-      aircraft:
-        - Mi-24P Hind-F
-      size: 4
-    - primary: OCA/Aircraft
-      secondary: any
-      aircraft:
-        - SA 342L Gazelle
-      size: 4
-  # Cairo West (95)
-  18:
-    - primary: Transport
-      secondary: any
-      aircraft:
-        - C-130J-30 Super Hercules
-        - C-130
-      size: 2
-    - primary: BARCAP
-      secondary: air-to-air
-      aircraft:
-        - MiG-29S Fulcrum-C
+---
+name: Sinai - Exercise Bright Star
+theater: Sinai
+authors: Starfire
+recommended_player_faction: Bluefor Modern
+recommended_enemy_faction: Egypt 2000s
+description:
+  <p>For over 4 decades, the United States and Egypt have run a series of
+  biannual joint military exercises called Bright Star. Over the years, the
+  number of participating countries has grown substantially. Exercise Bright
+  Star 2025 boasts 8 participant nations and 14 observer nations. The United
+  States and a portion of the exercise coalition will play the part of a
+  fictional hostile nation dubbed Orangeland, staging a mock invasion against
+  Cairo. Israel, having for the first time accepted the invitation to observe,
+  is hosting the aggressor faction of the exercise coalition at its
+  airfields.</p>
+miz: exercise_bright_star.miz
+performance: 1
+recommended_start_date: 2025-09-01
+version: "11.0"
+squadrons:
+  Blue CV-1:
+    - primary: SEAD
+      secondary: any
+      aircraft:
+        - F/A-18C Hornet (Lot 20)
+      size: 24
+    - primary: AEW&C
+      aircraft:
+        - E-2D Advanced Hawkeye
+      size: 2
+    - primary: Refueling
+      aircraft:
+        - S-3B Tanker
+      size: 4
+  Bombers from RAF Fairford:
+    - primary: Anti-ship
+      secondary: air-to-ground
+      aircraft:
+        - B-52H Stratofortress
+      size: 8
+    - primary: Strike
+      secondary: air-to-ground
+      aircraft:
+        - B-1B Lancer
+      size: 8
+  # Hatzerim (141)
+  7:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - A-10C Thunderbolt II (Suite 7)
+      size: 6
+    - primary: Escort
+      secondary: any
+      aircraft:
+        - F-15C Eagle
+      size: 20
+    - 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
+      secondary: any
+      aircraft:
+        - Mirage 2000C
+      size: 12
+  # Kedem
+  12:
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - CH-47D
+      size: 20
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - UH-60L
+        - UH-60A
+      size: 4
+  # Nevatim (106)
+#  8:
+#    - primary: AEW&C
+#      aircraft:
+#        - E-3A
+#      size: 2
+#    - primary: Refueling
+#      aircraft:
+#        - KC-135 Stratotanker
+#      size: 2
+  # Melez (30)
+  5:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Ka-50 Hokum (Blackshark 3)
+      size: 4
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - Mirage 2000C
+      size: 12
+    - primary: Escort
+      secondary: any
+      aircraft:
+        - MiG-21bis Fishbed-N
+      size: 12
+  # Wadi al Jandali (72)
+  13:
+    - primary: AEW&C
+      aircraft:
+        - E-2C Hawkeye
+      size: 2
+    - primary: SEAD
+      secondary: any
+      aircraft:
+        - F-4E Phantom II
+      size: 20
+    - primary: DEAD
+      secondary: any
+      aircraft:
+        - F-16CM Fighting Falcon (Block 50)
+      size: 20
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - Mi-24P Hind-F
+      size: 4
+    - primary: OCA/Aircraft
+      secondary: any
+      aircraft:
+        - SA 342L Gazelle
+      size: 4
+  # Cairo West (95)
+  18:
+    - primary: Transport
+      aircraft:
+        - C-130
+      size: 8
+    - primary: BARCAP
+      secondary: air-to-air
+      aircraft:
+        - MiG-29S Fulcrum-C
      size: 20
--- a/resources/campaigns/exercise_vegas_nerve.miz
+++ b/resources/campaigns/exercise_vegas_nerve.miz
--- a/resources/campaigns/exercise_vegas_nerve.yaml
+++ b/resources/campaigns/exercise_vegas_nerve.yaml
@@ -16,9 +16,6 @@ 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
@@ -38,12 +35,16 @@ squadrons:
      secondary: any
      aircraft:
        - F-15C Eagle
-      size: 16
+      size: 12
    - primary: Strike
      secondary: air-to-ground
      aircraft:
        - F-15E Strike Eagle (Suite 4+)
-      size: 8
+      size: 12
+    - primary: AEW&C
+      aircraft:
+        - E-3A
+      size: 1
  # Tonopah Test Range
  18:
    - primary: BAI
@@ -52,15 +53,10 @@ squadrons:
        - A-10C Thunderbolt II (Suite 7)
      size: 8
    - primary: CAS
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - AH-64D Apache Longbow
-      size: 2
-    - primary: CAS
-      secondary: any
-      aircraft:
-        - OH-58D(R) Kiowa Warrior
-      size: 2
+      size: 10
    - primary: DEAD
      secondary: air-to-ground
      aircraft:
@@ -71,38 +67,33 @@ squadrons:
      aircraft:
        - F-16CM Fighting Falcon (Block 50)
      size: 24
-    - primary: AEW&C
+    - primary: Air Assault
+      secondary: air-to-ground
      aircraft:
-        - E-3A
-      size: 1
-    - primary: Transport
-      secondary: any
-      aircraft:
-        - C-130J-30 Super Hercules
-        - CH-47D
-      size: 1
+        - UH-60L
+        - UH-60A
+      size: 2
  # Groom Lake
  2:
    - primary: Escort
      secondary: air-to-air
      aircraft:
        - J-11A Flanker-L
-      size: 16
+      size: 20
    - primary: BAI
      secondary: air-to-ground
      aircraft:
        - Su-25T Frogfoot
-      size: 12
+      size: 20
  # Creech
-  1:
+  Creech FARP:
    - primary: CAS
-      secondary: any
+      secondary: air-to-ground
      aircraft:
-        - Ka-50 Hokum III
        - Ka-50 Hokum (Blackshark 3)
      size: 8
    - primary: Air Assault
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - Mi-24P Hind-F
      size: 4
@@ -121,16 +112,16 @@ squadrons:
      secondary: air-to-ground
      aircraft:
        - Su-24M Fencer-D
-      size: 16
+      size: 20
    - primary: DEAD
      secondary: air-to-ground
      aircraft:
        - Su-34 Fullback
-      size: 16
+      size: 20
  # Boulder City Airport
  6:
    - primary: SEAD Escort
      secondary: any
      aircraft:
        - FC-1 Fierce Dragon
-      size: 16
+      size: 20
--- a/resources/campaigns/final_countdown_2.miz
+++ b/resources/campaigns/final_countdown_2.miz
--- a/resources/campaigns/final_countdown_2.yaml
+++ b/resources/campaigns/final_countdown_2.yaml
@@ -2,7 +2,65 @@
 name: Normandy - The Final Countdown II
 theater: Normandy
 authors: Starfire
-recommended_player_faction: D-Day Allied Forces 1944 and 1990
+recommended_player_faction:
+  country: Combined Joint Task Forces Blue
+  name: D-Day Allied Forces 1944 and 1990
+  authors: Starfire
+  description: <p>Faction for Final Countdown II</p>
+  locales:
+    - en_US
+  aircrafts:
+    - Boston Mk.III
+    - Fortress Mk.III
+    - Mustang Mk.IV (Late)
+    - Spitfire LF Mk IX
+    - Thunderbolt Mk.II (Late)
+    - MosquitoFBMkVI
+    - F-14B Tomcat
+    - F/A-18C Hornet (Lot 20)
+    - S-3B Viking
+    - UH-60L
+    - UH-60A
+  awacs:
+    - E-2C Hawkeye
+  tankers:
+    - S-3B Tanker
+  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:
+    - M12 Gun Motor Carriage
+  logistics_units:
+    - Truck Bedford
+    - Truck GMC "Jimmy" 6x6 Truck
+  infantry_units:
+    - Infantry M1 Garand
+  naval_units:
+    - DDG Arleigh Burke IIa
+    - CG Ticonderoga
+    - CVN-74 John C. Stennis
+  missiles: []
+  air_defense_units:
+    - Bofors 40 mm Gun
+  preset_groups:
+    - Ally Flak
+  requirements:
+    WW2 Asset Pack: https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/
+  carrier_names:
+    - CVN-71 Theodore Roosevelt
+  has_jtac: true
+  jtac_unit: MQ-9 Reaper
+  unrestricted_satnav: true
+  doctrine: ww2
+  building_set: ww2ally
+  cargo_ship: LST Mk.II
 recommended_enemy_faction: Germany 1944
 description:
  <p>While enroute to the Persian Gulf for Operation Desert Shield, the USS
@@ -21,8 +79,6 @@ 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:
@@ -52,6 +108,7 @@ squadrons:
    - primary: Air Assault
      secondary: any
      aircraft:
+        - UH-60L
        - UH-60A
      size: 6
  #Stoney Cross (39)
@@ -134,4 +191,4 @@ squadrons:
      secondary: any
      aircraft:
        - Fw 190 A-8 Anton
-      size: 20
+      size: 20
--- a/resources/campaigns/grabthars_hammer.miz
+++ b/resources/campaigns/grabthars_hammer.miz
--- a/resources/campaigns/grabthars_hammer.yaml
+++ b/resources/campaigns/grabthars_hammer.yaml
@@ -7,26 +7,23 @@ 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
-  Ushuaia for use in its ongoing conflict with Chile. United States military
+  construct a beryllium bomb at the secret Omega 13 production facility in
+  Ushaia 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
-  in order to disable the bomb production facility. Fortunately, Ushuaia is
+  up north, it is up to the Marines to launch an assault upon Ushaia from an LHA
+  in order to disable the bomb production facility. Fortunately, Ushaia is
  lightly defended as the SoW are trying to avoid unwanted attention.</p>
 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: BAI
+    - primary: DEAD
      secondary: any
      aircraft:
-        - F-15E Strike Eagle (Suite 4+)
+        - F-16CM Fighting Falcon (Block 50)
      size: 8
    - primary: CAS
      secondary: air-to-ground
@@ -38,27 +35,16 @@ squadrons:
      aircraft:
        - F-15C Eagle
      size: 8
-    - primary: CAS
-      secondary: any
-      aircraft:
-        - AH-64D Apache Longbow
-      size: 4
    - primary: Refueling
      aircraft:
        - KC-135 Stratotanker
-      size: 1
-    - primary: Transport
-      secondary: any
-      aircraft:
-        - C-130J-30 Super Hercules
-        - C-130
-      size: 1
+      size: 2
  #San Julian
  11:
-    - primary: DEAD
+    - primary: BAI
      secondary: any
      aircraft:
-        - F-16CM Fighting Falcon (Block 50)
+        - F-15E Strike Eagle (Suite 4+)
      size: 8
  #Blue CV
  Blue-CV:
@@ -71,12 +57,12 @@ squadrons:
      secondary: any
      aircraft:
        - F/A-18C Hornet (Lot 20)
-      size: 32
+      size: 20
    - primary: DEAD
      secondary: air-to-ground
      aircraft:
        - S-3B Viking
-      size: 16
+      size: 20
    - primary: AEW&C
      aircraft:
        - E-2C Hawkeye
@@ -88,6 +74,7 @@ squadrons:
    - primary: Air Assault
      secondary: any
      aircraft:
+        - UH-60L
        - UH-60A
      size: 4
  # Blue LHA
@@ -96,12 +83,7 @@ squadrons:
      secondary: air-to-ground
      aircraft:
        - AV-8B Harrier II Night Attack
-      size: 10
-    - primary: CAS
-      secondary: any
-      aircraft:
-        - OH-58D(R) Kiowa Warrior
-      size: 8      
+      size: 18
    - primary: Air Assault
      secondary: any
      aircraft:
@@ -112,18 +94,18 @@ squadrons:
      secondary: air-to-ground
      aircraft:
        - B-52H Stratofortress
-      size: 4
+      size: 12
    - primary: OCA/Runway
      secondary: air-to-ground
      aircraft:
        - B-1B Lancer
-      size: 4
+      size: 12
  #El Calafate
  14:
    - primary: Transport
      aircraft:
        - Mi-8MTV2 Hip
-      size: 8
+      size: 10
  #Rio Gallegros
  5:
    - primary: Escort
@@ -160,15 +142,14 @@ squadrons:
  #Ushuaia
  7:
    - primary: CAS
-      secondary: any
+      secondary: air-to-ground
      aircraft:
-        - Ka-50 Hokum III
        - Ka-50 Hokum (Blackshark 3)
      size: 8
  #Ushuaia Helo Port
  8:
    - primary: Air Assault
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - Mi-24P Hind-F
      size: 8
--- a/resources/campaigns/operation_aegean_aegis.miz
+++ b/resources/campaigns/operation_aegean_aegis.miz
--- a/resources/campaigns/operation_aegean_aegis.yaml
+++ b/resources/campaigns/operation_aegean_aegis.yaml
@@ -38,27 +38,20 @@ description:
  </p>
 miz: operation_aegean_aegis.miz
 performance: 1
-recommended_start_date: 2013-04-20
+recommended_start_date: 2017-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:
    - primary: DEAD
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - AH-64D Apache Longbow
-      size: 8
-    - primary: CAS
-      secondary: any
-      aircraft:
-        - OH-58D(R) Kiowa Warrior
-      size: 4
+      size: 12
    - primary: DEAD
      secondary: air-to-ground
      aircraft:
@@ -74,22 +67,22 @@ squadrons:
    - primary: DEAD
      secondary: air-to-ground
      aircraft:
-        - F-4E-45MC Phantom II
+        - F-4E Phantom II
      size: 12
  #Akrotiri
  44:
    - primary: BAI
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - AH-1W SuperCobra
      size: 4
    - primary: CAS
      secondary: air-to-ground
      aircraft:
-        - OH-58D(R) Kiowa Warrior
+        - OH-58D Kiowa Warrior
      size: 4
-    - primary: Transport
-      secondary: any
+    - primary: Air Assault
+      secondary: air-to-ground
      aircraft:
        - UH-60A
      size: 4
@@ -102,7 +95,6 @@ squadrons:
  #Ercan
  49:
    - primary: Transport
-      secondary: any
      aircraft:
        - CH-47D
      size: 6
--- a/resources/campaigns/operation_allied_sword.miz
+++ b/resources/campaigns/operation_allied_sword.miz
--- a/resources/campaigns/operation_allied_sword.yaml
+++ b/resources/campaigns/operation_allied_sword.yaml
@@ -13,7 +13,6 @@ 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+)
@@ -101,6 +100,7 @@ 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,6 +110,7 @@ recommended_enemy_faction:
    - Tu-22M3 Backfire-C
    - Mi-24V Hind-E
    - Mi-8MTV2 Hip
+    - SA 342M Gazelle
    - SA 342L Gazelle
    - IL-76MD
  awacs:
@@ -262,9 +263,7 @@ squadrons:
    - primary: SEAD
      secondary: any
      aircraft:
-        - F-4E-45MC Phantom II
        - 201th Squadron
-      size: 16
    - primary: Refueling
      aircraft:
        - VMGR-352
@@ -273,12 +272,12 @@ squadrons:
      secondary: any
      aircraft:
        - 69th Squadron
-      size: 12
+      size: 8
    - primary: BAI
      secondary: any
      aircraft:
        - 110th Squadron
-      size: 16
+      size: 8
  # Damascus
  7:
    - primary: TARCAP
@@ -316,21 +315,20 @@ squadrons:
    - primary: CAS
      secondary: air-to-ground
      aircraft:
-        - SA 342L Gazelle
+        - SA 342M Gazelle
      size: 6
  # OPFOR Second inland FOB
  FOB Homs:
    - primary: CAS
      secondary: air-to-ground
      aircraft:
-        - SA 342L Gazelle
+        - SA 342M Gazelle
      size: 6
  # Palmyra
  28:
    - primary: BARCAP
      secondary: air-to-air
      aircraft:
-        - MiG-21bis Fishbed-N
        - MiG-29A Fulcrum-A
      size: 12
    - primary: Strike
@@ -367,7 +365,7 @@ squadrons:
    - primary: CAS
      secondary: air-to-ground
      aircraft:
-        - SA 342L Gazelle
+        - SA 342M Gazelle
  # OPFOR Second inland FOB
  FOB Ithriyah:
    - primary: CAS
@@ -387,7 +385,6 @@ squadrons:
    - primary: BARCAP
      secondary: air-to-air
      aircraft:
-        - MiG-23MLD Flogger-K
        - Su-30 Flanker-C
    - primary: CAS
      secondary: air-to-ground
@@ -399,7 +396,6 @@ squadrons:
    - primary: TARCAP
      secondary: air-to-air
      aircraft:
-        - MiG-25PD Foxbat-E
        - MiG-23ML Flogger-G
    - primary: BARCAP
      secondary: any
@@ -409,7 +405,6 @@ squadrons:
    - primary: Strike
      secondary: air-to-ground
      aircraft:
-        - Su-24M Fencer-D
        - Su-34 Fullback
    - primary: Transport
      secondary: air-to-ground
--- a/resources/campaigns/operation_gazelle.miz
+++ b/resources/campaigns/operation_gazelle.miz
--- a/resources/campaigns/operation_gazelle.yaml
+++ b/resources/campaigns/operation_gazelle.yaml
@@ -1,122 +0,0 @@
---
-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
--- a/resources/campaigns/operation_noisy_cricket.miz
+++ b/resources/campaigns/operation_noisy_cricket.miz
--- a/resources/campaigns/operation_noisy_cricket.yaml
+++ b/resources/campaigns/operation_noisy_cricket.yaml
@@ -30,9 +30,6 @@ 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:
@@ -43,7 +40,7 @@ squadrons:
      size: 40
    - primary: AEW&C
      aircraft:
-        - E-2C Hawkeye
+        - E-2D Advanced Hawkeye
      size: 2
    - primary: Refueling
      aircraft:
@@ -52,26 +49,21 @@ 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: 20
+      size: 32
    - primary: Escort
      secondary: air-to-air
      aircraft:
        - F-15C Eagle
-      size: 20
+      size: 24
  #Al Dhafra AFB (251)
  4:
    - primary: Strike
@@ -87,18 +79,18 @@ squadrons:
      secondary: any
      aircraft:
        - F-15E Strike Eagle (Suite 4+)
-      size: 16
+      size: 20
    - primary: DEAD
      secondary: air-to-ground
      aircraft:
        - AV-8B Harrier II Night Attack
-      size: 16
+      size: 20
  #Bandar Abbas Intl (51)
  2:
    - primary: SEAD
      secondary: air-to-ground
      aircraft:
-        - F-4E-45MC Phantom II
+        - F-4E Phantom II
      size: 20
    - primary: TARCAP
      secondary: air-to-air
@@ -108,13 +100,13 @@ squadrons:
  #Qeshm Island (12)
  13:
    - primary: Air Assault
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - Mi-24P Hind-F
      size: 12
  #Abu Musa Island (8)
  1:
-    - primary: SEAD Escort
+    - primary: DEAD
      secondary: air-to-ground
      aircraft:
        - Su-25T Frogfoot
@@ -134,10 +126,9 @@ squadrons:
  #Shiraz Intl (122)
  19:
    - primary: Transport
-      secondary: any
      aircraft:
        - IL-76MD
-      size: 4
+      size: 5
    - primary: BARCAP
      secondary: air-to-air
      aircraft:
--- a/resources/campaigns/operation_peace_spring.miz
+++ b/resources/campaigns/operation_peace_spring.miz
--- a/resources/campaigns/operation_peace_spring.yaml
+++ b/resources/campaigns/operation_peace_spring.yaml
@@ -18,16 +18,18 @@ 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: 24
+      size: 40
+    - primary: BAI
+      secondary: air-to-ground
+      aircraft:
+        - S-3B Viking
+      size: 20
    - primary: AEW&C
      aircraft:
        - E-2D Advanced Hawkeye
@@ -36,28 +38,19 @@ squadrons:
      aircraft:
        - S-3B Tanker
      size: 4
-    - primary: Air Assault
-      secondary: any
+  Bombers from RAF Fairford:
+    - primary: DEAD
+      secondary: air-to-ground
      aircraft:
-        - UH-60A
-      size: 4      
+        - B-52H Stratofortress
+      size: 8
  # Akrotiri
  44:
    - primary: Strike
      secondary: air-to-ground
      aircraft:
        - B-1B Lancer
-      size: 4
-    - primary: Refueling
-      aircraft:
-        - KC-135 Stratotanker
-      size: 2
-    - primary: Transport
-      secondary: any
-      aircraft:
-        - C-130J-30 Super Hercules
-        - C-130
-      size: 2
+      size: 8
    - primary: OCA/Runway
      secondary: any
      aircraft:
@@ -68,6 +61,12 @@ squadrons:
      aircraft:
        - F-15C Eagle
      size: 20
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - UH-60L
+        - UH-60A
+      size: 4
   # Ramat David
  30:
    - primary: BAI
@@ -81,33 +80,28 @@ squadrons:
        - F-16CM Fighting Falcon (Block 50)
      size: 28
    - primary: CAS
-      secondary: any
+      secondary: air-to-ground
      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-45MC Phantom II
+        - F-4E Phantom II
        - H-6J Badger
      size: 16
    - primary: BAI
-      secondary: any
+      secondary: air-to-ground
      aircraft:
        - AH-1W SuperCobra
        - Su-25 Frogfoot
      size: 16
    - primary: CAS
-      secondary: any
+      secondary: air-to-ground
      aircraft:
-        - OH-58D(R) Kiowa Warrior
+        - OH-58D Kiowa Warrior
        - Mi-24P Hind-F
      size: 4
  # Tiyas
@@ -121,7 +115,7 @@ squadrons:
    - primary: Escort
      secondary: air-to-air
      aircraft:
-        - F-4E-45MC Phantom II
+        - F-4E Phantom II
        - Mirage-F1EQ
      size: 16
  # Abu Al Duhur
@@ -129,7 +123,7 @@ squadrons:
    - primary: Fighter sweep
      secondary: air-to-air
      aircraft:
-        - F-4E-45MC Phantom II
+        - F-4E Phantom II
        - MiG-23ML Flogger-G
      size: 8
  # Gaziantep
@@ -145,7 +139,7 @@ squadrons:
    - primary: Strike
      secondary: air-to-ground
      aircraft:
-        - F-4E-45MC Phantom II
+        - F-4E Phantom II
        - Tu-22M3 Backfire-C
      size: 16
    - primary: AEW&C
@@ -161,6 +155,6 @@ squadrons:
    - primary: Escort
      secondary: any
      aircraft:
-        - F-4E-45MC Phantom II
+        - F-4E Phantom II
        - MiG-21bis Fishbed-N
      size: 16
--- a/resources/campaigns/operation_vectrons_claw.miz
+++ b/resources/campaigns/operation_vectrons_claw.miz
--- a/resources/campaigns/operation_vectrons_claw.yaml
+++ b/resources/campaigns/operation_vectrons_claw.yaml
@@ -1,200 +1,169 @@
---
-name: Caucasus - Operation Vectron's Claw
-theater: Caucasus
-authors: Starfire
-recommended_player_faction: USA 2005
-recommended_enemy_faction: Russia 2010
-description:
-  <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"
-settings:
-  hercules: true
-  squadron_start_full: true
-squadrons:
-  Blue CV-1:
-    - primary: BARCAP
-      secondary: any
-      aircraft:
-        - F-14B Tomcat
-      size: 16
-    - primary: SEAD
-      secondary: any
-      aircraft:
-        - F/A-18C Hornet (Lot 20)
-      size: 24
-    - primary: BAI
-      secondary: air-to-ground
-      aircraft:
-        - S-3B Viking
-      size: 12
-    - primary: AEW&C
-      aircraft:
-        - E-2C Hawkeye
-      size: 2
-    - primary: Refueling
-      aircraft:
-        - S-3B Tanker
-      size: 4
-    - primary: Air Assault
-      secondary: any
-      aircraft:
-        - UH-60A
-      size: 4
-  Blue LHA:
-    - primary: BAI
-      secondary: air-to-ground
-      aircraft:
-        - AV-8B Harrier II Night Attack
-      size: 20
-  #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: any
-      aircraft:
-        - OH-58D(R) Kiowa Warrior
-      size: 4
-  #Vaziani
-  31:
-    - primary: DEAD
-      secondary: any
-      aircraft:
-        - F-16CM Fighting Falcon (Block 50)
-      size: 16
-    - primary: BAI
-      secondary: any
-      aircraft:
-        - F-15E Strike Eagle (Suite 4+)
-      size: 12
-    - primary: Escort
-      secondary: any
-      aircraft:
-        - 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
-  #OWNFOR FARP
-  UNOMIG Sector HQ:
-    - primary: Transport
-      secondary: any
-      aircraft:
-        - UH-1H Iroquois
-      size: 2
-  #OPFOR FARP
-  Dzhugba:
-    - primary: Air Assault
-      secondary: any
-      aircraft:
-        - Mi-24P Hind-F
-      size: 4
-  #Sukhumi-Babushara
-  20:
-    - primary: SEAD Escort
-      secondary: air-to-ground
-      aircraft:
-        - Su-25T Frogfoot
-      size: 20
-  #Sochi-Adler
-  18:
-    - primary: TARCAP
-      secondary: air-to-air
-      aircraft:
-        - Su-27 Flanker-B
-      size: 8
-    - primary: SEAD
-      secondary: air-to-ground
-      aircraft:
-        - Su-24M Fencer-D
-      size: 20
-    - 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: DEAD
-      secondary: air-to-ground
-      aircraft:
-        - Tu-22M3 Backfire-C
-      size: 20
-  #Anapa-Vityazevo
-  12:
-    - primary: AEW&C
-      aircraft:
-        - 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: 12
+---
+name: Caucasus - Operation Vectron's Claw
+theater: Caucasus
+authors: Starfire
+recommended_player_faction: USA 2005
+recommended_enemy_faction: Russia 2010
+description:
+  <p>United Nations Observer Mission in Georgia (UNOMIG) observers stationed in
+  Georgia to monitor the ceasefire between Georgia and Abkhazia have been cut
+  off from friendly forces by Russian troops backing the separatist state. The
+  UNOMIG HQ at Sukhumi has been taken, and a small contingent of observers and
+  troops at the Zugdidi Sector HQ will have to make a run for the coast,
+  supported by offshore US naval aircraft. The contingent is aware that their
+  best shot at survival is to swiftly retake Sukhumi before Russian forces have
+  a chance to dig in, so that friendly ground forces can land and reinforce
+  them.</p><p><strong>Note:</strong> Ground unit purchase will not be available
+  past Turn 0 until Sukhumi is retaken, so it is imperative you reach Sukhumi
+  with at least one surviving ground unit to capture it. Two Hueys are available
+  at Zugdidi for some close air support. The player can either play the first
+  leg of the scenario as an evacuation with a couple of light vehicles (e.g.
+  Humvees) set on breakthrough (modifying waypoints in the mission editor so
+  they are not charging head-on into enemy ground forces is suggested), or
+  purchase heavier ground units if they wish to experience a more traditional
+  frontline ground war. Once Sukhumi has been captured, squadrons based in
+  Incirlik Turkey can be ferried in via the "From Incirlik" off-map spawn
+  point.</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
+squadrons:
+  Blue CV-1:
+    - primary: BARCAP
+      secondary: any
+      aircraft:
+        - F-14B Tomcat
+      size: 16
+    - primary: SEAD
+      secondary: any
+      aircraft:
+        - F/A-18C Hornet (Lot 20)
+      size: 60
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - S-3B Viking
+      size: 8
+    - primary: AEW&C
+      aircraft:
+        - E-2C Hawkeye
+      size: 2
+    - primary: Refueling
+      aircraft:
+        - S-3B Tanker
+      size: 2
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - UH-60L
+        - UH-60A
+      size: 2
+  Blue LHA:
+    - primary: BAI
+      secondary: air-to-ground
+      aircraft:
+        - AV-8B Harrier II Night Attack
+      size: 20
+  Squadrons from Incirlik:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - AH-64D Apache Longbow
+      size: 4
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - A-10C Thunderbolt II (Suite 7)
+      size: 6
+    - primary: DEAD
+      secondary: any
+      aircraft:
+        - F-16CM Fighting Falcon (Block 50)
+      size: 16
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - F-15E Strike Eagle (Suite 4+)
+      size: 8
+    - primary: Refueling
+      aircraft:
+        - KC-135 Stratotanker
+      size: 1
+  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
+  UNOMIG Sector HQ:
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - UH-1H Iroquois
+      size: 2
+  Dzhugba:
+    - primary: CAS
+      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
+      secondary: air-to-ground
+      aircraft:
+        - Su-25T Frogfoot
+      size: 12
+  #Sochi-Adler
+  18:
+    - primary: Escort
+      secondary: air-to-air
+      aircraft:
+        - Su-27 Flanker-B
+      size: 8
+    - primary: SEAD
+      secondary: air-to-ground
+      aircraft:
+        - Su-24M Fencer-D
+      size: 20
+    - primary: DEAD
+      secondary: air-to-ground
+      aircraft:
+        - Su-34 Fullback
+      size: 20
+  #Maykop-Khanskaya
+  16:
+    - primary: Anti-ship
+      secondary: air-to-ground
+      aircraft:
+        - Tu-22M3 Backfire-C
+      size: 20
+  #Anapa-Vityazevo
+  12:
+    - primary: Strike
+      secondary: air-to-ground
+      aircraft:
+        - Tu-95MS Bear-H
+      size: 16
+  Red CV:
+    - primary: BARCAP
+      secondary: any
+      aircraft:
+        - SU-33 Flanker-D
+      size: 16
--- a/resources/campaigns/operation_velvet_thunder.miz
+++ b/resources/campaigns/operation_velvet_thunder.miz
--- a/resources/campaigns/operation_velvet_thunder.yaml
+++ b/resources/campaigns/operation_velvet_thunder.yaml
@@ -5,30 +5,23 @@ authors: Starfire
 recommended_player_faction: USA 1970
 recommended_enemy_faction: NVA 1970
 description:
-  <p>Operation Velvet Thunder is a high-intensity training exercise designed to 
-  prepare fresh troops for the challenges they will face in Vietnam. The dense 
-  jungle and rugged terrain of the Mariana Islands will provide a realistic 
-  backdrop, allowing our forces to hone essential skills in jungle warfare, 
-  unconventional tactics, and counterinsurgency operations. There are multiple 
-  checkpoints scattered across the area of operations that will have to be 
-  captured by Air Assault. Due to the limited size and availability of LZs, it 
+  <p>Operation Velvet Thunder is a high-intensity training exercise designed to
+  prepare fresh troops for the challenges they will face in Vietnam. The dense
+  jungle and rugged terrain of the Mariana Islands will provide a realistic
+  backdrop, allowing our forces to hone essential skills in jungle warfare,
+  unconventional tactics, and counterinsurgency operations. There are multiple
+  checkpoints scattered across the area of operations that will have to be
+  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, 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.
+  </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>
 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
-  hercules: true
-  ov10a_bronco: true
-  squadron_start_full: true
 squadrons:
  #Andersen AFB
  6:
@@ -37,21 +30,21 @@ squadrons:
      aircraft:
        - F-5E Tiger II
      size: 8
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - C-101CC Aviojet
+      size: 8
    - primary: CAS
      secondary: any
      aircraft:
        - OV-10A Bronco
      size: 8
    - primary: SEAD
-      secondary: any
-      aircraft:
-        - F-4E-45MC Phantom II
-      size: 8
-    - primary: DEAD
      secondary: any
      aircraft:
        - F-4E Phantom II
-      size: 8
+      size: 16
    - primary: Strike
      secondary: any
      aircraft:
@@ -67,19 +60,6 @@ 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
@@ -111,4 +91,4 @@ squadrons:
      secondary: any
      aircraft:
        - MiG-21bis Fishbed-N
-      size: 8
+      size: 8
--- a/resources/customized_payloads/A-4E-C.lua
+++ b/resources/customized_payloads/A-4E-C.lua
@@ -178,15 +178,15 @@ local unitPayloads = {
 			["name"] = "Liberation SEAD",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 5,
 				},
 				[2] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 1,
 				},
 				[3] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 4,
 				},
 				[4] = {
@@ -194,7 +194,7 @@ local unitPayloads = {
 					["num"] = 3,
 				},
 				[5] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 2,
 				},
 			},
@@ -265,15 +265,15 @@ local unitPayloads = {
 			["name"] = "Liberation SEAD Escort",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 5,
 				},
 				[2] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 1,
 				},
 				[3] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 4,
 				},
 				[4] = {
@@ -281,7 +281,7 @@ local unitPayloads = {
 					["num"] = 3,
 				},
 				[5] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 2,
 				},
 			},
@@ -352,11 +352,11 @@ local unitPayloads = {
 			["name"] = "Liberation DEAD",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 5,
 				},
 				[2] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 1,
 				},
 				[3] = {
--- a/resources/customized_payloads/EA-18G.lua
+++ b/resources/customized_payloads/EA-18G.lua
@@ -1,53 +0,0 @@
-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
--- a/resources/customized_payloads/F-4E-45MC.lua
+++ b/resources/customized_payloads/F-4E-45MC.lua
@@ -1,973 +0,0 @@
-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
--- a/resources/customized_payloads/FA-18E.lua
+++ b/resources/customized_payloads/FA-18E.lua
@@ -1,463 +0,0 @@
-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
--- a/resources/customized_payloads/FA-18F.lua
+++ b/resources/customized_payloads/FA-18F.lua
@@ -1,463 +0,0 @@
-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
--- a/resources/customized_payloads/OH58D.lua
+++ b/resources/customized_payloads/OH58D.lua
@@ -1,101 +0,0 @@
-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
--- a/resources/customized_payloads/VSN_F4C.lua
+++ b/resources/customized_payloads/VSN_F4C.lua
@@ -91,11 +91,11 @@ local unitPayloads = {
 			["name"] = "SEAD",
 			["pylons"] = {
 				[1] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 9,
 				},
 				[2] = {
-					["CLSID"] = "{AGM_45A}",
+					["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
 					["num"] = 3,
 				},
 				[3] = {
--- a/resources/dcs/beacons/syria.json
+++ b/resources/dcs/beacons/syria.json
@@ -90,13 +90,6 @@
  "hertz": 343000,
  "channel": null
 },
- "world_13": {
-  "name": "GHI",
-  "callsign": "GHI",
-  "beacon_type": 5,
-  "hertz": 113800000,
-  "channel": 85
- },
 "airfield2_0": {
  "name": "",
  "callsign": "IADA",
@@ -153,20 +146,6 @@
  "hertz": 365000,
  "channel": null
 },
- "airfield67_0": {
-  "name": "",
-  "callsign": "IAMN",
-  "beacon_type": 13,
-  "hertz": 109500000,
-  "channel": null
- },
- "airfield67_1": {
-  "name": "",
-  "callsign": "IAMN",
-  "beacon_type": 14,
-  "hertz": 109500000,
-  "channel": null
- },
 "airfield6_0": {
  "name": "KALDE",
  "callsign": "KAD",
@@ -254,8 +233,8 @@
 "airfield7_4": {
  "name": "DAMASCUS",
  "callsign": "DAL",
-  "beacon_type": 9,
-  "hertz": 342000,
+  "beacon_type": 10,
+  "hertz": 342000000,
  "channel": null
 },
 "airfield7_5": {
@@ -338,8 +317,8 @@
 "airfield41_1": {
  "name": "ALANYA/GAZIPASA",
  "callsign": "GZP",
-  "beacon_type": 3,
-  "hertz": 114200000,
+  "beacon_type": 2,
+  "hertz": 0,
  "channel": 89
 },
 "airfield41_2": {
@@ -426,20 +405,6 @@
  "hertz": 111700000,
  "channel": null
 },
- "airfield65_0": {
-  "name": "",
-  "callsign": "",
-  "beacon_type": 14,
-  "hertz": 109100000,
-  "channel": null
- },
- "airfield65_1": {
-  "name": "",
-  "callsign": "",
-  "beacon_type": 13,
-  "hertz": 109100000,
-  "channel": null
- },
 "airfield47_0": {
  "name": "",
  "callsign": "ILC",
@@ -503,34 +468,6 @@
  "hertz": 358000,
  "channel": null
 },
- "airfield68_0": {
-  "name": "",
-  "callsign": "",
-  "beacon_type": 13,
-  "hertz": 112910000,
-  "channel": null
- },
- "airfield68_1": {
-  "name": "",
-  "callsign": "",
-  "beacon_type": 13,
-  "hertz": 112900000,
-  "channel": null
- },
- "airfield68_2": {
-  "name": "",
-  "callsign": "",
-  "beacon_type": 14,
-  "hertz": 112910000,
-  "channel": null
- },
- "airfield68_3": {
-  "name": "",
-  "callsign": "",
-  "beacon_type": 14,
-  "hertz": 112900000,
-  "channel": null
- },
 "airfield27_0": {
  "name": "ALEPPO",
  "callsign": "ALE",
@@ -608,27 +545,6 @@
  "hertz": null,
  "channel": 79
 },
- "airfield64_0": {
-  "name": "PrinceHussein",
-  "callsign": "ABC",
-  "beacon_type": 4,
-  "hertz": 0,
-  "channel": 106
- },
- "airfield64_1": {
-  "name": "",
-  "callsign": "ABC",
-  "beacon_type": 13,
-  "hertz": 111400000,
-  "channel": null
- },
- "airfield64_2": {
-  "name": "",
-  "callsign": "ABC",
-  "beacon_type": 14,
-  "hertz": 111400000,
-  "channel": null
- },
 "airfield30_0": {
  "name": "RAMATDAVID",
  "callsign": "RMD",
@@ -664,20 +580,6 @@
  "hertz": 115300000,
  "channel": null
 },
- "airfield58_0": {
-  "name": "Sanliurfa",
-  "callsign": "GAP",
-  "beacon_type": 3,
-  "hertz": 113200000,
-  "channel": 79
- },
- "airfield58_1": {
-  "name": "Sanliurfa",
-  "callsign": "GAP",
-  "beacon_type": 9,
-  "hertz": 391000,
-  "channel": null
- },
 "airfield40_0": {
  "name": "Cheka",
  "callsign": "CAK",
--- a/resources/factions/NATO_Desert_Storm.yaml
+++ b/resources/factions/NATO_Desert_Storm.yaml
@@ -21,11 +21,9 @@ 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
--- a/resources/factions/NATO_OIF.yaml
+++ b/resources/factions/NATO_OIF.yaml
@@ -25,7 +25,6 @@ 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
--- a/resources/factions/australia_2005.yaml
+++ b/resources/factions/australia_2005.yaml
@@ -1,15 +1,19 @@
+---
 country: Australia
 name: Australia 2005
-authors: 'Khopa, SpaceEnthusiast'
-description: >-
-  <p>The Australian army in 2005.</p><p>Some units might not be accurate, but
-  were picked to represent at best this army.</p>
+authors: Khopa, SpaceEnthusiast
+description:
+  <p>The Australian army in 2005.</p><p>Some units might not be accurate,
+  but were picked to represent at best this army.</p>
 aircrafts:
  - AH-1W SuperCobra
  - C-130J-30 Super Hercules
  - F/A-18C Hornet (Lot 20)
  - SH-60B Seahawk
  - UH-1H Iroquois
+  - F/A-18E Super Hornet
+  - F/A-18F Super Hornet
+  - EA-18G Growler
 awacs:
  - E-3A
 tankers:
@@ -38,7 +42,7 @@ missiles: []
 air_defense_units:
  - SAM Hawk SR (AN/MPQ-50)
 requirements:
-  C-130J-30 Super Hercules Mod by Anubis: 'https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/'
+  C-130J-30 Super Hercules Mod by Anubis: https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/
 carrier_names: []
 helicopter_carrier_names:
  - HMAS Canberra
--- a/resources/factions/australia_2009.yaml
+++ b/resources/factions/australia_2009.yaml
@@ -1,54 +0,0 @@
-country: Australia
-name: Australia 2009
-authors: 'Khopa, SpaceEnthusiast, Chilli'
-description: >-
-  <p>The Australian army in 2005.</p><p>Some units might not be accurate, but
-  were picked to represent at best this army.</p>
-aircrafts:
-  - AH-1W SuperCobra
-  - C-130J-30 Super Hercules
-  - F/A-18C Hornet (Lot 20)
-  - F/A-18F Super Hornet
-  - EA-18G Growler
-  - SH-60B Seahawk
-  - UH-1H Iroquois
-awacs:
-  - E-3A
-tankers:
-  - KC-130
-  - KC-135 Stratotanker
-frontline_units:
-  - FV510 Warrior
-  - LAV-25
-  - Leopard 1A3
-  - M113
-  - M1A2 Abrams
-artillery_units: []
-logistics_units:
-  - Truck M818 6x6
-infantry_units:
-  - Infantry M249
-  - Infantry M4
-  - MANPADS Stinger
-preset_groups:
-  - Hawk
-  - Rapier
-naval_units:
-  - DDG Arleigh Burke IIa
-  - LHA-1 Tarawa
-missiles: []
-air_defense_units:
-  - SAM Hawk SR (AN/MPQ-50)
-requirements:
-  C-130J-30 Super Hercules Mod by Anubis: 'https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/'
-carrier_names: []
-helicopter_carrier_names:
-  - HMAS Canberra
-  - HMAS Adelaide
-has_jtac: true
-jtac_unit: MQ-9 Reaper
-liveries_overrides:
-  F/A-18C Hornet (Lot 20):
-    - Australian 75th Squadron
-    - Australian 77th Squadron
-unrestricted_satnav: true
--- a/resources/factions/bluefor_coldwar.yaml
+++ b/resources/factions/bluefor_coldwar.yaml
@@ -13,7 +13,6 @@ 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
--- a/resources/factions/bluefor_modern.yaml
+++ b/resources/factions/bluefor_modern.yaml
@@ -45,7 +45,6 @@ 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
--- a/resources/factions/blufor_late_coldwar.yaml
+++ b/resources/factions/blufor_late_coldwar.yaml
@@ -1,96 +0,0 @@
---
-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"
--- a/resources/factions/egypt_1973.yaml
+++ b/resources/factions/egypt_1973.yaml
@@ -1,44 +0,0 @@
---
-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
--- a/resources/factions/egypt_2000.yaml
+++ b/resources/factions/egypt_2000.yaml
@@ -1,6 +1,6 @@
 ---
 country: Egypt
-name: Egypt 2000
+name: Egypt 2000s
 authors: Starfire
 description: <p>Egyptian military in the 21st century.</p>
 locales:
@@ -10,7 +10,6 @@ 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
--- a/resources/factions/final_countdown_2.yaml
+++ b/resources/factions/final_countdown_2.yaml
@@ -1,62 +0,0 @@
---
-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
--- a/resources/factions/germany_1944.yaml
+++ b/resources/factions/germany_1944.yaml
@@ -27,10 +27,7 @@ frontline_units:
  - "Sturmgesch\xFCtz III Ausf. G"
  - "Sturmgesch\xFCtz IV"
  - "Sturmpanzer IV Brummb\xE4r"
-artillery_units:
-  - FH Pak 40 75mm
-  - FH LeFH-18 105mm
-  - SPH Sd.Kfz.124 Wespe 105mm
+artillery_units: []
 logistics_units:
  - LUV Kettenrad
  - LUV Kubelwagen 82
@@ -44,7 +41,6 @@ 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: []
--- a/resources/factions/greece_2005.yaml
+++ b/resources/factions/greece_2005.yaml
@@ -11,7 +11,6 @@ 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
--- a/resources/factions/iran_1988.yaml
+++ b/resources/factions/iran_1988.yaml
@@ -9,7 +9,6 @@ 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:
--- a/resources/factions/iran_2015.yaml
+++ b/resources/factions/iran_2015.yaml
@@ -8,7 +8,6 @@ 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
--- a/resources/factions/israel_1973.yaml
+++ b/resources/factions/israel_1973.yaml
@@ -8,7 +8,6 @@ locales:
 aircrafts:
  - A-4E Skyhawk
  - F-4E Phantom II
-  - F-4E-45MC Phantom II
  - UH-1H Iroquois
 awacs:
  - E-2C Hawkeye
--- a/resources/factions/israel_1982.yaml
+++ b/resources/factions/israel_1982.yaml
@@ -12,7 +12,6 @@ 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
--- a/resources/factions/israel_2000.yaml
+++ b/resources/factions/israel_2000.yaml
@@ -16,7 +16,6 @@ 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:
--- a/resources/factions/japan_2005.yaml
+++ b/resources/factions/japan_2005.yaml
@@ -17,7 +17,6 @@ aircrafts:
  - F-15J Eagle
  - F-2A
  - F-4EJ Kai Phantom II
-  - F-4E-45MC Phantom II
 awacs:
  - E-2C Hawkeye
 tankers:
--- a/resources/factions/nva_1970.yaml
+++ b/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,5 +41,6 @@ air_defense_units:
  - AAA ZU-23 Emplacement
  - ZU-23 on Ural-375
  - ZSU-23-4 Shilka
-has_jtac: "false"
-doctrine: "coldwar"
+
+requirements: {}
+doctrine: coldwar
--- a/resources/factions/peru_1995.yaml
+++ b/resources/factions/peru_1995.yaml
@@ -11,15 +11,12 @@ aircrafts:
  - Mi-8MTV2 Hip
  - MB-339A
  - Su-22M4 Fitter-K
-  - UH-1H Iroquois
-frontline_units: 
-  - AMX-13 75mm  
-  - BRDM-2
-  - BTR-80 
+frontline_units:
  - T-55A
-  - M1043 HMMWV (M2 HMG)
  - M113
-  - M2A1 Half-Track 
+  - BRDM-2
+  - BTR-80
+  - M1043 HMMWV (M2 HMG)
  - ZSU-23-4 Shilka
 artillery_units:
  - BM-21 Grad
--- a/resources/factions/russia_1980.yaml
+++ b/resources/factions/russia_1980.yaml
@@ -1,76 +0,0 @@
---
-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"
--- a/resources/factions/turkey_2005.yaml
+++ b/resources/factions/turkey_2005.yaml
@@ -11,9 +11,7 @@ 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
--- a/resources/factions/usa_1965.yaml
+++ b/resources/factions/usa_1965.yaml
@@ -10,7 +10,6 @@ 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
--- a/resources/factions/usa_1970.yaml
+++ b/resources/factions/usa_1970.yaml
@@ -3,14 +3,13 @@ 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
@@ -18,43 +17,42 @@ aircrafts:
  - B-52H Stratofortress
  - C-47 Skytrain
  - C-130
-  - C-130J-30 Super Hercules
  - UH-1H Iroquois
  - AH-1W SuperCobra
-  - OH-58D(R) Kiowa Warrior
+  - OH-58D 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
-has_jtac: "false"
-doctrine: "coldwar"
+requirements: {}
+doctrine: coldwar
--- a/resources/factions/usa_1975.yaml
+++ b/resources/factions/usa_1975.yaml
@@ -12,7 +12,6 @@ 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
--- a/resources/factions/usa_1990.yaml
+++ b/resources/factions/usa_1990.yaml
@@ -23,7 +23,6 @@ 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
--- a/resources/factions/usa_2005.yaml
+++ b/resources/factions/usa_2005.yaml
@@ -26,7 +26,6 @@ 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
--- a/resources/factions/usn_1985.yaml
+++ b/resources/factions/usn_1985.yaml
@@ -12,7 +12,6 @@ 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
--- a/resources/factions/usn_2005.yaml
+++ b/resources/factions/usn_2005.yaml
@@ -1,3 +1,4 @@
+---
 country: USA
 name: US Navy 2005
 authors: Fuzzle
@@ -7,13 +8,14 @@ locales:
 aircrafts:
  - F-14B Tomcat
  - F/A-18C Hornet (Lot 20)
-  - F/A-18E Super Hornet
-  - F/A-18F Super Hornet
  - AV-8B Harrier II Night Attack
  - AH-1W SuperCobra
  - S-3B Viking
  - SH-60B Seahawk
  - UH-1H Iroquois
+  - F/A-18E Super Hornet
+  - F/A-18F Super Hornet
+  - EA-18G Growler
 awacs:
  - E-2C Hawkeye
 tankers:
--- a/resources/factions/usn_2009.yaml
+++ b/resources/factions/usn_2009.yaml
@@ -1,76 +0,0 @@
-country: USA
-name: US Navy 2009
-authors: Fuzzle, Chilli
-description: <p>A modern representation of the US Navy/Marine Corps.</p>
-locales:
-  - en_US
-aircrafts:
-  - F/A-18C Hornet (Lot 20)
-  - F/A-18E Super Hornet
-  - F/A-18F Super Hornet
-  - EA-18G Growler
-  - AV-8B Harrier II Night Attack
-  - AH-1W SuperCobra
-  - S-3B Viking
-  - SH-60B Seahawk
-  - UH-1H Iroquois
-awacs:
-  - E-2C Hawkeye
-tankers:
-  - S-3B Tanker
-frontline_units:
-  - M113
-  - M1043 HMMWV (M2 HMG)
-  - M1045 HMMWV (BGM-71 TOW)
-  - M1A2 Abrams
-  - LAV-25
-  - M163 Vulcan Air Defense System
-artillery_units:
-  - M270 Multiple Launch Rocket System
-logistics_units:
-  - Truck M818 6x6
-infantry_units:
-  - Infantry M4
-  - Infantry M249
-  - MANPADS Stinger
-preset_groups:
-  - Hawk
-  - Patriot
-naval_units:
-  - FFG Oliver Hazard Perry
-  - DDG Arleigh Burke IIa
-  - CG Ticonderoga
-  - LHA-1 Tarawa
-  - CVN-74 John C. Stennis
-missiles: []
-air_defense_units:
-  - SAM Hawk SR (AN/MPQ-50)
-  - M163 Vulcan Air Defense System
-  - M48 Chaparral
-requirements: {}
-carrier_names:
-  - CVN-71 Theodore Roosevelt
-  - CVN-72 Abraham Lincoln
-  - CVN-73 George Washington
-  - CVN-74 John C. Stennis
-  - CVN-75 Harry S. Truman
-helicopter_carrier_names:
-  - LHA-1 Tarawa
-  - LHA-2 Saipan
-  - LHA-3 Belleau Wood
-  - LHA-4 Nassau
-  - LHA-5 Peleliu
-has_jtac: true
-jtac_unit: MQ-9 Reaper
-doctrine: modern
-liveries_overrides:
-  F-14B Tomcat:
-    - VF-142 Ghostriders
-  F/A-18C Hornet (Lot 20):
-    - VMFA-251 high visibility
-  AV-8B Harrier II Night Attack:
-    - VMAT-542
-  AH-1W SuperCobra:
-    - Marines
-  UH-1H Iroquois:
-    - US NAVY
--- a/resources/plugins/base/dcs_liberation.lua
+++ b/resources/plugins/base/dcs_liberation.lua
@@ -11,7 +11,6 @@ kill_events = {} -- killed units will be added via S_EVENT_KILL
 base_capture_events = {}
 destroyed_objects_positions = {} -- will be added via S_EVENT_DEAD event
 killed_ground_units = {} -- keep track of static ground object deaths
-unit_hit_point_updates = {} -- stores updates to unit hit points, triggered by S_EVENT_HIT
 mission_ended = false

 local function ends_with(str, ending)
@@ -42,7 +41,6 @@ function write_state()
        ["mission_ended"] = mission_ended,
        ["destroyed_objects_positions"] = destroyed_objects_positions,
 		["killed_ground_units"] = killed_ground_units,
-		["unit_hit_point_updates"] = unit_hit_point_updates,
    }
    if not json then
        local message = string.format("Unable to save DCS Liberation state to %s, JSON library is not loaded !", _debriefing_file_location)
@@ -148,16 +146,6 @@ write_state_error_handling = function()
    mist.scheduleFunction(write_state_error_handling, {}, timer.getTime() + WRITESTATE_SCHEDULE_IN_SECONDS)
 end

-function update_hit_points(event)
-	local update = {}
-	update.name = event.target:getName()
-	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 = {}
 local function onEvent(event)
    if event.id == world.event.S_EVENT_CRASH and event.initiator then
@@ -187,15 +175,6 @@ local function onEvent(event)
        destroyed_objects_positions[#destroyed_objects_positions + 1] = destruction
        write_state()
    end
-	
-	if event.id == world.event.S_EVENT_HIT then
-        target_category = event.target:getCategory()
-		if target_category == Object.Category.UNIT then
-			-- check on the health of the target 1 second after as the life value is sometimes not updated
-			-- at the time of the event
-			timer.scheduleFunction(update_hit_points, event, timer.getTime() + 1)
-		end
-	end

    if event.id == world.event.S_EVENT_MISSION_END then
        mission_ended = true
--- a/resources/squadrons/F-4E-45MC/EAF
+++ b/resources/squadrons/F-4E-45MC/EAF
@@ -1,22 +0,0 @@
---
-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
--- a/resources/squadrons/F-4E-45MC/EAF
+++ b/resources/squadrons/F-4E-45MC/EAF
@@ -1,22 +0,0 @@
---
-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
--- a/Show More
+++ b/Show More