Add NASAMs to MERAD unit list for campaign template (#3406) (#3410)

Adds NASAM launcher B and C to the list of units that can be placed in a
campaign template to define a MERAD spawn location.

This is needed to maintain compatibility with the new versions of my
campaigns.

Pull requests should be made against the `develop` branch. Any backports
necessary will be handled by the development team.

Pull requests should be focused on one task. Multiple bug fixes should
be
multiple PRs. We cannot merge half a PR, and combined PRs are much more
difficult to review. PRs that do not adhere to this will have their
review
delayed.

Prefer rebase to merge, and squash commits as needed to preserve a
readable
commit history. This project maintains linear history in the develop
branch, so
we will either rebase or squash your PR when merging. It is much easier
for us
if your branch already has a readable commit history (ensure that your
commit
subject lines are clear enough to identify the patch in the git log). An
exception to this is made for large PRs that are likely to require
multiple
rounds of review; in that case it's easier if you **don't** do this
(GitHub
does not preserve the history of old commits, so we cannot filter a PR
for only
new changes if a branch is force pushed) and we will squash it when
merging.

New features and bug fixes are usually worth mentioning in the
changelog.
Exceptions are fixes for bugs that never shipped (were only present in a
canary
build), and changes with no intended user observable behavior, such as a
refactor. If you're comfortable writing the note yourself, add it to
`changelog.md` in the root of the project in the section for the
upcoming
release.

Co-authored-by: Starfire13 <72491792+Starfire13@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug-report.yml

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

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

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

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

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

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-python@v2
       - uses: psf/black@stable
         with:
-          version: ~=22.12
+          version: ~=23.11
           src: "."
           options: "--check"
 

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.11.0
     hooks:
       - id: black
         language_version: python3

README.md

@@ -2,7 +2,7 @@
 
 (Github Readme Banner and Splash screen Artwork by Andriy Dankovych, CC BY-SA 4.0)
 
-[![Patreon](https://img.shields.io/badge/patreon-become%20a%20patron-orange?logo=patreon)](https://patreon.com/khopa)
+[![Patreon](https://img.shields.io/badge/patreon-become%20a%20patron-orange?logo=patreon)](https://patreon.com/dcsliberation)
 
 [![Download](https://img.shields.io/github/downloads/dcs-liberation/dcs_liberation/total?label=Download)](https://github.com/dcs-liberation/dcs_liberation/releases)
 
@@ -17,11 +17,6 @@
 DCS Liberation is a [DCS World](https://www.digitalcombatsimulator.com/en/products/world/) turn based single-player or co-op dynamic campaign. 
 It is an external program that generates full and complex DCS missions and manage a persistent combat environment.
 
-**Note that DCS Liberation does not support the stable release of DCS. We can
-only guarantee compatibility  with either  the open beta or the stable release,
-and more people play the open beta. DCS stable _might_ work sometimes, but it's
-untested, and we will be unable to fix any bugs unique to stable DCS.**
-
 ![Screenshot](https://user-images.githubusercontent.com/315852/120939254-0b4a9f80-c6cc-11eb-82f5-ce3f8d714bfe.png)
 
 ## Downloads

changelog.md

@@ -1,3 +1,58 @@
+# 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.
+
+## 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.
+
+## Features/Improvements
+
+* **[Engine]** Support for DCS 2.9.2.49629 Open Beta. (F-15E JDAM and JSOW, F-16 AIM-9P, updated Falklands and Normandy airfields).
+* **[UI]** Improved the description of "runway" state for FARPs, FOBs, carriers, and off-map spawns.
+
+## Fixes
+
+* **[Flight Planning]** Aircraft from even numbered flights will no longer become inaccessible when canceling a draft package.
+* **[UI]** Flight members in the loadout menu are now numbered starting from 1 instead of 0.
+* **[UI]** Flight plan paths are now drawn behind all other map elements, fixing rare cases where they could prevent other UI elements from being clickable.
+
 # 9.0.0
 
 Saves from 8.x are not compatible with 9.0.0.
@@ -46,7 +101,7 @@ Saves from 8.x are not compatible with 9.0.0.
 * **[UI]** Fixed deleting waypoints in custom flight plans deleting the wrong waypoint.
 * **[UI]** Fixed flight properties UI to support F-15E S4+ laser codes.
 * **[UI]** In unit transfer dialog, only list control points that are reachable from the control point units are being transferred from.
-* **[UI]** Fixed UI bug where altering an "ahead of package" TOT offset would change the offset back to a "behind pacakge" offset.
+* **[UI]** Fixed UI bug where altering an "ahead of package" TOT offset would change the offset back to a "behind package" offset.
 * **[UI]** Fixed bug where changing TOT offsets could result in flight startup times that are in the past.
 * **[UI]** Fixed odd spacing of the finance window when there were not enough items to fill the page.
 * **[UI]** Fixed regression where waypoint altitude changes in the waypoint list screen are applied to the wrong waypoint.

client/src/components/flightplan/FlightPlan.tsx

@@ -1,7 +1,8 @@
 import { Flight } from "../../api/liberationApi";
 import { useGetCommitBoundaryForFlightQuery } from "../../api/liberationApi";
 import WaypointMarker from "../waypointmarker";
-import { ReactElement } from "react";
+import { Polyline as LPolyline } from "leaflet";
+import { ReactElement, useEffect, useRef } from "react";
 import { Polyline } from "react-leaflet";
 
 const BLUE_PATH = "#0084ff";
@@ -27,16 +28,41 @@ const pathColor = (props: FlightPlanProps) => {
 function FlightPlanPath(props: FlightPlanProps) {
   const color = pathColor(props);
   const waypoints = props.flight.waypoints;
+
+  const polylineRef = useRef<LPolyline | null>(null);
+
+  // Flight paths should be drawn under everything else. There seems to be an
+  // issue where `interactive: false` doesn't do as its told (there's nuance,
+  // see the bug for details). It looks better if we draw the other elements on
+  // top of the flight plans anyway, so just push the flight plan to the back.
+  //
+  // https://github.com/dcs-liberation/dcs_liberation/issues/3295
+  //
+  // It's not possible to z-index a polyline (and leaflet says it never will be,
+  // because this is a limitation of SVG, not leaflet:
+  // https://github.com/Leaflet/Leaflet/issues/185), so we need to use
+  // bringToBack() to push the flight paths to the back of the drawing once
+  // they've been added to the map. They'll still draw on top of the map, but
+  // behind everything than was added before them. Anything added after always
+  // goes on top.
+  useEffect(() => {
+    if (!props.selected) {
+      polylineRef.current?.bringToBack();
+    }
+  });
+
   if (waypoints == null) {
     return <></>;
   }
   const points = waypoints
     .filter((waypoint) => waypoint.include_in_path)
     .map((waypoint) => waypoint.position);
+
   return (
     <Polyline
       positions={points}
       pathOptions={{ color: color, interactive: false }}
+      ref={polylineRef}
     />
   );
 }

client/src/components/flightplanslayer/FlightPlansLayer.test.tsx

@@ -95,8 +95,12 @@ describe("FlightPlansLayer", () => {
           },
         },
       });
-      expect(mockPolyline).toHaveBeenCalledTimes(2);
-      expect(mockLayerGroup).toBeCalledTimes(1);
+
+      // For some reason passing ref to PolyLine causes it and its group to be
+      // redrawn, so these numbers don't match what you'd expect from the test.
+      // It probably needs to be rewritten without mocks.
+      expect(mockPolyline).toHaveBeenCalledTimes(3);
+      expect(mockLayerGroup).toBeCalledTimes(2);
     });
     it("are not drawn if wrong coalition", () => {
       renderWithProviders(<FlightPlansLayer blue={true} />, {

docs/conf.py

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

game/ato/flightplans/airassault.py

@@ -88,7 +88,7 @@ class Builder(IBuilder[AirAssaultFlightPlan, AirAssaultLayout]):
             raise PlanningError("Air assault is only usable by helicopters")
         assert self.package.waypoints is not None
 
-        altitude = feet(1500) if self.flight.is_helo else self.doctrine.ingress_altitude
+        altitude = self.doctrine.helicopter.air_assault_nav_altitude
         altitude_is_agl = self.flight.is_helo
 
         builder = WaypointBuilder(self.flight, self.coalition)

game/ato/flightplans/barcap.py

@@ -19,7 +19,7 @@ class BarCapFlightPlan(PatrollingFlightPlan[PatrollingLayout]):
 
     @property
     def patrol_duration(self) -> timedelta:
-        return self.flight.coalition.doctrine.cap_duration
+        return self.flight.coalition.doctrine.cap.duration
 
     @property
     def patrol_speed(self) -> Speed:
@@ -29,7 +29,7 @@ class BarCapFlightPlan(PatrollingFlightPlan[PatrollingLayout]):
 
     @property
     def engagement_distance(self) -> Distance:
-        return self.flight.coalition.doctrine.cap_engagement_range
+        return self.flight.coalition.doctrine.cap.engagement_range
 
 
 class Builder(CapBuilder[BarCapFlightPlan, PatrollingLayout]):
@@ -44,8 +44,8 @@ class Builder(CapBuilder[BarCapFlightPlan, PatrollingLayout]):
         preferred_alt = self.flight.unit_type.preferred_patrol_altitude
         randomized_alt = preferred_alt + feet(random.randint(-2, 1) * 1000)
         patrol_alt = max(
-            self.doctrine.min_patrol_altitude,
-            min(self.doctrine.max_patrol_altitude, randomized_alt),
+            self.doctrine.cap.min_patrol_altitude,
+            min(self.doctrine.cap.max_patrol_altitude, randomized_alt),
         )
 
         builder = WaypointBuilder(self.flight, self.coalition)

game/ato/flightplans/capbuilder.py

@@ -90,10 +90,10 @@ class CapBuilder(IBuilder[FlightPlanT, LayoutT], ABC):
             # buffer.
             distance_to_no_fly = (
                 meters(position.distance(self.threat_zones.all))
-                - self.doctrine.cap_engagement_range
+                - self.doctrine.cap.engagement_range
                 - nautical_miles(5)
             )
-            max_track_length = self.doctrine.cap_max_track_length
+            max_track_length = self.doctrine.cap.max_track_length
         else:
             # Other race tracks (TARCAPs, currently) just try to keep some
             # distance from the nearest enemy airbase, but since they are by
@@ -108,15 +108,15 @@ class CapBuilder(IBuilder[FlightPlanT, LayoutT], ABC):
             distance_to_no_fly = distance_to_airfield - min_distance_from_enemy
 
             # TARCAPs fly short racetracks because they need to react faster.
-            max_track_length = self.doctrine.cap_min_track_length + 0.3 * (
-                self.doctrine.cap_max_track_length - self.doctrine.cap_min_track_length
+            max_track_length = self.doctrine.cap.min_track_length + 0.3 * (
+                self.doctrine.cap.max_track_length - self.doctrine.cap.min_track_length
             )
 
         min_cap_distance = min(
-            self.doctrine.cap_min_distance_from_cp, distance_to_no_fly
+            self.doctrine.cap.min_distance_from_cp, distance_to_no_fly
         )
         max_cap_distance = min(
-            self.doctrine.cap_max_distance_from_cp, distance_to_no_fly
+            self.doctrine.cap.max_distance_from_cp, distance_to_no_fly
         )
 
         end = location.position.point_from_heading(
@@ -125,7 +125,7 @@ class CapBuilder(IBuilder[FlightPlanT, LayoutT], ABC):
         )
 
         track_length = random.randint(
-            int(self.doctrine.cap_min_track_length.meters),
+            int(self.doctrine.cap.min_track_length.meters),
             int(max_track_length.meters),
         )
         start = end.point_from_heading(heading.opposite.degrees, track_length)

game/ato/flightplans/cas.py

@@ -44,7 +44,7 @@ class CasFlightPlan(PatrollingFlightPlan[CasLayout], UiZoneDisplay):
 
     @property
     def patrol_duration(self) -> timedelta:
-        return self.flight.coalition.doctrine.cas_duration
+        return self.flight.coalition.doctrine.cas.duration
 
     @property
     def patrol_speed(self) -> Speed:
@@ -96,7 +96,7 @@ class Builder(IBuilder[CasFlightPlan, CasLayout]):
         builder = WaypointBuilder(self.flight, self.coalition)
 
         is_helo = self.flight.unit_type.dcs_unit_type.helicopter
-        patrol_altitude = self.doctrine.ingress_altitude if not is_helo else meters(50)
+        patrol_altitude = self.doctrine.resolve_combat_altitude(is_helo)
         use_agl_patrol_altitude = is_helo
 
         ip_solver = IpSolver(

game/ato/flightplans/escort.py

@@ -33,7 +33,7 @@ class Builder(FormationAttackBuilder[EscortFlightPlan, FormationAttackLayout]):
             departure=builder.takeoff(self.flight.departure),
             hold=hold,
             nav_to=builder.nav_path(
-                hold.position, join.position, self.doctrine.ingress_altitude
+                hold.position, join.position, self.doctrine.combat_altitude
             ),
             join=join,
             ingress=ingress,
@@ -43,7 +43,7 @@ class Builder(FormationAttackBuilder[EscortFlightPlan, FormationAttackLayout]):
             nav_from=builder.nav_path(
                 refuel.position,
                 self.flight.arrival.position,
-                self.doctrine.ingress_altitude,
+                self.doctrine.combat_altitude,
             ),
             arrival=builder.land(self.flight.arrival),
             divert=builder.divert(self.flight.divert),

game/ato/flightplans/formationattack.py

@@ -163,7 +163,7 @@ class FormationAttackBuilder(IBuilder[FlightPlanT, LayoutT], ABC):
             departure=builder.takeoff(self.flight.departure),
             hold=hold,
             nav_to=builder.nav_path(
-                hold.position, join.position, self.doctrine.ingress_altitude
+                hold.position, join.position, self.doctrine.combat_altitude
             ),
             join=join,
             ingress=ingress,
@@ -173,7 +173,7 @@ class FormationAttackBuilder(IBuilder[FlightPlanT, LayoutT], ABC):
             nav_from=builder.nav_path(
                 refuel.position,
                 self.flight.arrival.position,
-                self.doctrine.ingress_altitude,
+                self.doctrine.combat_altitude,
             ),
             arrival=builder.land(self.flight.arrival),
             divert=builder.divert(self.flight.divert),

game/ato/flightplans/shiprecoverytanker.py

@@ -65,7 +65,6 @@ class RecoveryTankerFlightPlan(StandardFlightPlan[RecoveryTankerLayout]):
 
 class Builder(IBuilder[RecoveryTankerFlightPlan, RecoveryTankerLayout]):
     def layout(self) -> RecoveryTankerLayout:
-
         builder = WaypointBuilder(self.flight, self.coalition)
 
         # TODO: Propagate the ship position to the Tanker's TOT,

game/ato/flightplans/sweep.py

@@ -114,11 +114,11 @@ class Builder(IBuilder[SweepFlightPlan, SweepLayout]):
             self.package.waypoints.join.heading_between_point(target)
         )
         start_pos = target.point_from_heading(
-            heading.degrees, -self.doctrine.sweep_distance.meters
+            heading.degrees, -self.doctrine.sweep.distance.meters
         )
 
         builder = WaypointBuilder(self.flight, self.coalition)
-        start, end = builder.sweep(start_pos, target, self.doctrine.ingress_altitude)
+        start, end = builder.sweep(start_pos, target, self.doctrine.combat_altitude)
 
         hold = builder.hold(self._hold_point())
 
@@ -126,12 +126,12 @@ class Builder(IBuilder[SweepFlightPlan, SweepLayout]):
             departure=builder.takeoff(self.flight.departure),
             hold=hold,
             nav_to=builder.nav_path(
-                hold.position, start.position, self.doctrine.ingress_altitude
+                hold.position, start.position, self.doctrine.combat_altitude
             ),
             nav_from=builder.nav_path(
                 end.position,
                 self.flight.arrival.position,
-                self.doctrine.ingress_altitude,
+                self.doctrine.combat_altitude,
             ),
             sweep_start=start,
             sweep_end=end,

game/ato/flightplans/tarcap.py

@@ -40,7 +40,7 @@ class TarCapFlightPlan(PatrollingFlightPlan[TarCapLayout]):
         # flights in the package that have requested escort. If the package
         # requests an escort the CAP self.flight will remain on station for the
         # duration of the escorted mission, or until it is winchester/bingo.
-        return self.flight.coalition.doctrine.cap_duration
+        return self.flight.coalition.doctrine.cap.duration
 
     @property
     def patrol_speed(self) -> Speed:
@@ -50,7 +50,7 @@ class TarCapFlightPlan(PatrollingFlightPlan[TarCapLayout]):
 
     @property
     def engagement_distance(self) -> Distance:
-        return self.flight.coalition.doctrine.cap_engagement_range
+        return self.flight.coalition.doctrine.cap.engagement_range
 
     @staticmethod
     def builder_type() -> Type[Builder]:
@@ -90,8 +90,8 @@ class Builder(CapBuilder[TarCapFlightPlan, TarCapLayout]):
         preferred_alt = self.flight.unit_type.preferred_patrol_altitude
         randomized_alt = preferred_alt + feet(random.randint(-2, 1) * 1000)
         patrol_alt = max(
-            self.doctrine.min_patrol_altitude,
-            min(self.doctrine.max_patrol_altitude, randomized_alt),
+            self.doctrine.cap.min_patrol_altitude,
+            min(self.doctrine.cap.max_patrol_altitude, randomized_alt),
         )
 
         builder = WaypointBuilder(self.flight, self.coalition)

game/ato/flightplans/theaterrefueling.py

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

game/ato/flightplans/waypointbuilder.py

@@ -72,7 +72,7 @@ class WaypointBuilder:
                 "NAV",
                 FlightWaypointType.NAV,
                 position,
-                meters(500) if self.is_helo else self.doctrine.rendezvous_altitude,
+                self.doctrine.resolve_rendezvous_altitude(self.is_helo),
                 description="Enter theater",
                 pretty_name="Enter theater",
             )
@@ -99,7 +99,7 @@ class WaypointBuilder:
                 "NAV",
                 FlightWaypointType.NAV,
                 position,
-                meters(500) if self.is_helo else self.doctrine.rendezvous_altitude,
+                self.doctrine.resolve_rendezvous_altitude(self.is_helo),
                 description="Exit theater",
                 pretty_name="Exit theater",
             )
@@ -127,10 +127,7 @@ class WaypointBuilder:
         position = divert.position
         altitude_type: AltitudeReference
         if isinstance(divert, OffMapSpawn):
-            if self.is_helo:
-                altitude = meters(500)
-            else:
-                altitude = self.doctrine.rendezvous_altitude
+            altitude = self.doctrine.resolve_rendezvous_altitude(self.is_helo)
             altitude_type = "BARO"
         else:
             altitude = meters(0)
@@ -168,10 +165,7 @@ class WaypointBuilder:
             "HOLD",
             FlightWaypointType.LOITER,
             position,
-            # Bug: DCS only accepts MSL altitudes for the orbit task and 500 meters is
-            # below the ground for most if not all of NTTR (and lots of places in other
-            # maps).
-            meters(500) if self.is_helo else self.doctrine.rendezvous_altitude,
+            self.doctrine.resolve_rendezvous_altitude(self.is_helo),
             alt_type,
             description="Wait until push time",
             pretty_name="Hold",
@@ -186,7 +180,7 @@ class WaypointBuilder:
             "JOIN",
             FlightWaypointType.JOIN,
             position,
-            meters(80) if self.is_helo else self.doctrine.ingress_altitude,
+            self.doctrine.resolve_combat_altitude(self.is_helo),
             alt_type,
             description="Rendezvous with package",
             pretty_name="Join",
@@ -201,7 +195,7 @@ class WaypointBuilder:
             "REFUEL",
             FlightWaypointType.REFUEL,
             position,
-            meters(80) if self.is_helo else self.doctrine.ingress_altitude,
+            self.doctrine.resolve_combat_altitude(self.is_helo),
             alt_type,
             description="Refuel from tanker",
             pretty_name="Refuel",
@@ -229,7 +223,7 @@ class WaypointBuilder:
             "SPLIT",
             FlightWaypointType.SPLIT,
             position,
-            meters(80) if self.is_helo else self.doctrine.ingress_altitude,
+            self.doctrine.resolve_combat_altitude(self.is_helo),
             alt_type,
             description="Depart from package",
             pretty_name="Split",
@@ -249,7 +243,7 @@ class WaypointBuilder:
             "INGRESS",
             ingress_type,
             position,
-            meters(60) if self.is_helo else self.doctrine.ingress_altitude,
+            self.doctrine.resolve_combat_altitude(self.is_helo),
             alt_type,
             description=f"INGRESS on {objective.name}",
             pretty_name=f"INGRESS on {objective.name}",
@@ -294,7 +288,7 @@ class WaypointBuilder:
             f"SEAD on {target.name}",
             target,
             flyover=True,
-            altitude=self.doctrine.ingress_altitude,
+            altitude=self.doctrine.combat_altitude,
             alt_type="BARO",
         )
 
@@ -484,7 +478,7 @@ class WaypointBuilder:
             "TARGET",
             FlightWaypointType.TARGET_GROUP_LOC,
             target.position,
-            meters(60) if self.is_helo else self.doctrine.ingress_altitude,
+            self.doctrine.resolve_combat_altitude(self.is_helo),
             alt_type,
             description="Escort the package",
             pretty_name="Target area",

game/ato/traveltime.py

@@ -18,6 +18,9 @@ class GroundSpeed:
         # on fuel, but mission speed will be fast enough to keep the flight
         # safer.
 
+        if flight.squadron.aircraft.cruise_speed is not None:
+            return mach(flight.squadron.aircraft.cruise_speed.mach(), altitude)
+
         # DCS's max speed is in kph at 0 MSL.
         max_speed = flight.unit_type.max_speed
         if max_speed > SPEED_OF_SOUND_AT_SEA_LEVEL:

game/campaignloader/defaultsquadronassigner.py

@@ -29,7 +29,6 @@ class DefaultSquadronAssigner:
             self.coalition.player
         ):
             for squadron_config in self.config.by_location[control_point]:
-
                 squadron_def = self.override_squadron_defaults(
                     self.find_squadron_for(squadron_config, control_point),
                     squadron_config,
@@ -162,7 +161,6 @@ class DefaultSquadronAssigner:
     def override_squadron_defaults(
         squadron_def: Optional[SquadronDef], config: SquadronConfig
     ) -> Optional[SquadronDef]:
-
         if squadron_def is None:
             return None
 

game/campaignloader/mizcampaignloader.py

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

game/commander/objectivefinder.py

@@ -25,6 +25,7 @@ from game.utils import meters, nautical_miles
 if TYPE_CHECKING:
     from game import Game
     from game.transfers import CargoShip, Convoy
+    from game.threatzones import ThreatZones
 
 MissionTargetType = TypeVar("MissionTargetType", bound=MissionTarget)
 
@@ -193,17 +194,36 @@ class ObjectiveFinder:
 
     def farthest_friendly_control_point(self) -> ControlPoint:
         """Finds the friendly control point that is farthest from any threats."""
+
+        def find_farthest(
+            control_points: Iterator[ControlPoint],
+            threat_zones: ThreatZones,
+            consider_off_map_spawn: bool,
+        ) -> ControlPoint | None:
+            farthest = None
+            max_distance = meters(0)
+            for cp in control_points:
+                if isinstance(cp, OffMapSpawn) and not consider_off_map_spawn:
+                    continue
+                distance = threat_zones.distance_to_threat(cp.position)
+                if distance > max_distance:
+                    farthest = cp
+                    max_distance = distance
+            return farthest
+
         threat_zones = self.game.threat_zone_for(not self.is_player)
 
-        farthest = None
-        max_distance = meters(0)
-        for cp in self.friendly_control_points():
-            if isinstance(cp, OffMapSpawn):
-                continue
-            distance = threat_zones.distance_to_threat(cp.position)
-            if distance > max_distance:
-                farthest = cp
-                max_distance = distance
+        farthest = find_farthest(
+            self.friendly_control_points(), threat_zones, consider_off_map_spawn=False
+        )
+
+        # If there are only off-map spawn control points, fall back to the farthest amongst off map spawn points
+        if farthest is None:
+            farthest = find_farthest(
+                self.friendly_control_points(),
+                threat_zones,
+                consider_off_map_spawn=True,
+            )
 
         if farthest is None:
             raise RuntimeError("Found no friendly control points. You probably lost.")

game/commander/theaterstate.py

@@ -158,7 +158,7 @@ class TheaterState(WorldState["TheaterState"]):
         # Plan enough rounds of CAP that the target has coverage over the expected
         # mission duration.
         mission_duration = game.settings.desired_player_mission_duration.total_seconds()
-        barcap_duration = coalition.doctrine.cap_duration.total_seconds()
+        barcap_duration = coalition.doctrine.cap.duration.total_seconds()
         barcap_rounds = math.ceil(mission_duration / barcap_duration)
 
         refueling_targets: list[MissionTarget] = []

game/data/doctrine.py

@@ -1,3 +1,9 @@
+from __future__ import annotations
+
+from pathlib import Path
+import yaml
+from typing import Any, ClassVar
+
 from dataclasses import dataclass
 from datetime import timedelta
 
@@ -15,19 +21,105 @@ class GroundUnitProcurementRatios:
         except KeyError:
             return 0.0
 
+    @staticmethod
+    def from_dict(data: dict[str, float]) -> GroundUnitProcurementRatios:
+        unit_class_enum_from_name = {unit.value: unit for unit in UnitClass}
+        r = {}
+        for unit_class in data:
+            if unit_class not in unit_class_enum_from_name:
+                raise ValueError(f"Could not find unit type {unit_class}")
+            r[unit_class_enum_from_name[unit_class]] = float(data[unit_class])
+        return GroundUnitProcurementRatios(r)
+
+
+@dataclass
+class Helicopter:
+    #: The altitude used for combat section of a flight, overrides the base combat_altitude parameter for helos
+    combat_altitude: Distance
+
+    #: The altitude used for forming up a pacakge. Overrides the base rendezvous_altitude parameter for helos
+    rendezvous_altitude: Distance
+
+    #: Altitude of the nav points (cruise section) of air assault missions.
+    air_assault_nav_altitude: Distance
+
+    @staticmethod
+    def from_dict(data: dict[str, Any]) -> Helicopter:
+        return Helicopter(
+            combat_altitude=feet(data["combat_altitude_ft_agl"]),
+            rendezvous_altitude=feet(data["rendezvous_altitude_ft_agl"]),
+            air_assault_nav_altitude=feet(data["air_assault_nav_altitude_ft_agl"]),
+        )
+
+
+@dataclass
+class Cas:
+    #: The duration that CAP flights will remain on-station.
+    duration: timedelta
+
+    @staticmethod
+    def from_dict(data: dict[str, Any]) -> Cas:
+        return Cas(duration=timedelta(minutes=data["duration_minutes"]))
+
+
+@dataclass
+class Sweep:
+    #: Length of the sweep / patrol leg
+    distance: Distance
+
+    @staticmethod
+    def from_dict(data: dict[str, Any]) -> Sweep:
+        return Sweep(
+            distance=nautical_miles(data["distance_nm"]),
+        )
+
+
+@dataclass
+class Cap:
+    #: The duration that CAP flights will remain on-station.
+    duration: timedelta
+
+    #: The minimum length of the CAP race track.
+    min_track_length: Distance
+
+    #: The maximum length of the CAP race track.
+    max_track_length: Distance
+
+    #: The minimum distance between the defended position and the *end* of the
+    #: CAP race track.
+    min_distance_from_cp: Distance
+
+    #: The maximum distance between the defended position and the *end* of the
+    #: CAP race track.
+    max_distance_from_cp: Distance
+
+    #: The engagement range of CAP flights. Any enemy aircraft within this range
+    #: of the CAP's current position will be engaged by the CAP.
+    engagement_range: Distance
+
+    #: Defines the range of altitudes CAP racetracks are planned at.
+    min_patrol_altitude: Distance
+    max_patrol_altitude: Distance
+
+    @staticmethod
+    def from_dict(data: dict[str, Any]) -> Cap:
+        return Cap(
+            duration=timedelta(minutes=data["duration_minutes"]),
+            min_track_length=nautical_miles(data["min_track_length_nm"]),
+            max_track_length=nautical_miles(data["max_track_length_nm"]),
+            min_distance_from_cp=nautical_miles(data["min_distance_from_cp_nm"]),
+            max_distance_from_cp=nautical_miles(data["max_distance_from_cp_nm"]),
+            engagement_range=nautical_miles(data["engagement_range_nm"]),
+            min_patrol_altitude=feet(data["min_patrol_altitude_ft_msl"]),
+            max_patrol_altitude=feet(data["max_patrol_altitude_ft_msl"]),
+        )
+
 
 @dataclass(frozen=True)
 class Doctrine:
+    #: Name of the doctrine, used to assign a doctrine in a faction.
     name: str
 
-    cas: bool
-    cap: bool
-    sead: bool
-    strike: bool
-    antiship: bool
-
-    rendezvous_altitude: Distance
-
     #: The minimum distance between the departure airfield and the hold point.
     hold_distance: Distance
 
@@ -46,155 +138,87 @@ class Doctrine:
     #: target.
     min_ingress_distance: Distance
 
-    ingress_altitude: Distance
+    #: The altitude used for combat section of a flight.
+    combat_altitude: Distance
 
-    min_patrol_altitude: Distance
-    max_patrol_altitude: Distance
-    pattern_altitude: Distance
-
-    #: The duration that CAP flights will remain on-station.
-    cap_duration: timedelta
-
-    #: The minimum length of the CAP race track.
-    cap_min_track_length: Distance
-
-    #: The maximum length of the CAP race track.
-    cap_max_track_length: Distance
-
-    #: The minimum distance between the defended position and the *end* of the
-    #: CAP race track.
-    cap_min_distance_from_cp: Distance
-
-    #: The maximum distance between the defended position and the *end* of the
-    #: CAP race track.
-    cap_max_distance_from_cp: Distance
-
-    #: The engagement range of CAP flights. Any enemy aircraft within this range
-    #: of the CAP's current position will be engaged by the CAP.
-    cap_engagement_range: Distance
-
-    cas_duration: timedelta
-
-    sweep_distance: Distance
+    #: The altitude used for forming up a pacakge.
+    rendezvous_altitude: Distance
 
+    #: Defines prioritization of ground unit purchases.
     ground_unit_procurement_ratios: GroundUnitProcurementRatios
 
+    #: Helicopter specific doctrines.
+    helicopter: Helicopter
 
-MODERN_DOCTRINE = Doctrine(
-    "modern",
-    cap=True,
-    cas=True,
-    sead=True,
-    strike=True,
-    antiship=True,
-    rendezvous_altitude=feet(25000),
-    hold_distance=nautical_miles(25),
-    push_distance=nautical_miles(20),
-    join_distance=nautical_miles(20),
-    max_ingress_distance=nautical_miles(45),
-    min_ingress_distance=nautical_miles(10),
-    ingress_altitude=feet(20000),
-    min_patrol_altitude=feet(15000),
-    max_patrol_altitude=feet(33000),
-    pattern_altitude=feet(5000),
-    cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nautical_miles(15),
-    cap_max_track_length=nautical_miles(40),
-    cap_min_distance_from_cp=nautical_miles(10),
-    cap_max_distance_from_cp=nautical_miles(40),
-    cap_engagement_range=nautical_miles(50),
-    cas_duration=timedelta(minutes=30),
-    sweep_distance=nautical_miles(60),
-    ground_unit_procurement_ratios=GroundUnitProcurementRatios(
-        {
-            UnitClass.TANK: 3,
-            UnitClass.ATGM: 2,
-            UnitClass.APC: 2,
-            UnitClass.IFV: 3,
-            UnitClass.ARTILLERY: 1,
-            UnitClass.SHORAD: 2,
-            UnitClass.RECON: 1,
-        }
-    ),
-)
+    #: Doctrine for CAS missions.
+    cas: Cas
 
-COLDWAR_DOCTRINE = Doctrine(
-    name="coldwar",
-    cap=True,
-    cas=True,
-    sead=True,
-    strike=True,
-    antiship=True,
-    rendezvous_altitude=feet(22000),
-    hold_distance=nautical_miles(15),
-    push_distance=nautical_miles(10),
-    join_distance=nautical_miles(10),
-    max_ingress_distance=nautical_miles(30),
-    min_ingress_distance=nautical_miles(10),
-    ingress_altitude=feet(18000),
-    min_patrol_altitude=feet(10000),
-    max_patrol_altitude=feet(24000),
-    pattern_altitude=feet(5000),
-    cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nautical_miles(12),
-    cap_max_track_length=nautical_miles(24),
-    cap_min_distance_from_cp=nautical_miles(8),
-    cap_max_distance_from_cp=nautical_miles(25),
-    cap_engagement_range=nautical_miles(35),
-    cas_duration=timedelta(minutes=30),
-    sweep_distance=nautical_miles(40),
-    ground_unit_procurement_ratios=GroundUnitProcurementRatios(
-        {
-            UnitClass.TANK: 4,
-            UnitClass.ATGM: 2,
-            UnitClass.APC: 3,
-            UnitClass.IFV: 2,
-            UnitClass.ARTILLERY: 1,
-            UnitClass.SHORAD: 2,
-            UnitClass.RECON: 1,
-        }
-    ),
-)
+    #: Doctrine for CAP missions.
+    cap: Cap
 
-WWII_DOCTRINE = Doctrine(
-    name="ww2",
-    cap=True,
-    cas=True,
-    sead=False,
-    strike=True,
-    antiship=True,
-    hold_distance=nautical_miles(10),
-    push_distance=nautical_miles(5),
-    join_distance=nautical_miles(5),
-    rendezvous_altitude=feet(10000),
-    max_ingress_distance=nautical_miles(7),
-    min_ingress_distance=nautical_miles(5),
-    ingress_altitude=feet(8000),
-    min_patrol_altitude=feet(4000),
-    max_patrol_altitude=feet(15000),
-    pattern_altitude=feet(5000),
-    cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nautical_miles(8),
-    cap_max_track_length=nautical_miles(18),
-    cap_min_distance_from_cp=nautical_miles(0),
-    cap_max_distance_from_cp=nautical_miles(5),
-    cap_engagement_range=nautical_miles(20),
-    cas_duration=timedelta(minutes=30),
-    sweep_distance=nautical_miles(10),
-    ground_unit_procurement_ratios=GroundUnitProcurementRatios(
-        {
-            UnitClass.TANK: 3,
-            UnitClass.ATGM: 3,
-            UnitClass.APC: 3,
-            UnitClass.ARTILLERY: 1,
-            UnitClass.SHORAD: 3,
-            UnitClass.RECON: 1,
-        }
-    ),
-)
+    #: Doctrine for Fighter Sweep missions.
+    sweep: Sweep
 
-ALL_DOCTRINES = [
-    COLDWAR_DOCTRINE,
-    MODERN_DOCTRINE,
-    WWII_DOCTRINE,
-]
+    _by_name: ClassVar[dict[str, Doctrine]] = {}
+    _loaded: ClassVar[bool] = False
+
+    def resolve_combat_altitude(self, is_helo: bool = False) -> Distance:
+        if is_helo:
+            return self.helicopter.combat_altitude
+        return self.combat_altitude
+
+    def resolve_rendezvous_altitude(self, is_helo: bool = False) -> Distance:
+        if is_helo:
+            return self.helicopter.rendezvous_altitude
+        return self.rendezvous_altitude
+
+    @classmethod
+    def register(cls, doctrine: Doctrine) -> None:
+        if doctrine.name in cls._by_name:
+            duplicate = cls._by_name[doctrine.name]
+            raise ValueError(f"Doctrine {doctrine.name} is already loaded")
+        cls._by_name[doctrine.name] = doctrine
+
+    @classmethod
+    def named(cls, name: str) -> Doctrine:
+        if not cls._loaded:
+            cls.load_all()
+        return cls._by_name[name]
+
+    @classmethod
+    def all_doctrines(cls) -> list[Doctrine]:
+        if not cls._loaded:
+            cls.load_all()
+        return list(cls._by_name.values())
+
+    @classmethod
+    def load_all(cls) -> None:
+        if cls._loaded:
+            return
+        for doctrine_file_path in Path("resources/doctrines").glob("**/*.yaml"):
+            with doctrine_file_path.open(encoding="utf8") as doctrine_file:
+                data = yaml.safe_load(doctrine_file)
+            cls.register(
+                Doctrine(
+                    name=data["name"],
+                    rendezvous_altitude=feet(data["rendezvous_altitude_ft_msl"]),
+                    hold_distance=nautical_miles(data["hold_distance_nm"]),
+                    push_distance=nautical_miles(data["push_distance_nm"]),
+                    join_distance=nautical_miles(data["join_distance_nm"]),
+                    max_ingress_distance=nautical_miles(
+                        data["max_ingress_distance_nm"]
+                    ),
+                    min_ingress_distance=nautical_miles(
+                        data["min_ingress_distance_nm"]
+                    ),
+                    combat_altitude=feet(data["combat_altitude_ft_msl"]),
+                    ground_unit_procurement_ratios=GroundUnitProcurementRatios.from_dict(
+                        data["ground_unit_procurement_ratios"]
+                    ),
+                    helicopter=Helicopter.from_dict(data["helicopter"]),
+                    cas=Cas.from_dict(data["cas"]),
+                    cap=Cap.from_dict(data["cap"]),
+                    sweep=Sweep.from_dict(data["sweep"]),
+                )
+            )
+        cls._loaded = True

game/dcs/aircrafttype.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import logging
 from collections import defaultdict
-from dataclasses import dataclass
+from dataclasses import dataclass, replace as dataclasses_replace
 from functools import cache, cached_property
 from pathlib import Path
 from typing import Any, ClassVar, Dict, Iterator, Optional, TYPE_CHECKING, Type
@@ -34,6 +34,10 @@ from game.radio.channels import (
     ViggenRadioChannelAllocator,
     ViperChannelNamer,
     WarthogChannelNamer,
+    PhantomChannelNamer,
+    HindChannelNamer,
+    HipChannelNamer,
+    KiowaChannelNamer,
 )
 from game.utils import (
     Distance,
@@ -110,6 +114,10 @@ class RadioConfig:
             "apache": ApacheChannelNamer,
             "a10c-legacy": LegacyWarthogChannelNamer,
             "a10c-ii": WarthogChannelNamer,
+            "phantom": PhantomChannelNamer,
+            "hind": HindChannelNamer,
+            "hip": HipChannelNamer,
+            "kiowa": KiowaChannelNamer,
         }[config.get("namer", "default")]
 
 
@@ -182,6 +190,9 @@ class AircraftType(UnitType[Type[FlyingType]]):
     #: planner will consider this aircraft usable for a mission.
     max_mission_range: Distance
 
+    #: Speed used for TOT calculations
+    cruise_speed: Optional[Speed]
+
     fuel_consumption: Optional[FuelConsumption]
 
     default_livery: Optional[str]
@@ -400,6 +411,12 @@ class AircraftType(UnitType[Type[FlyingType]]):
             for k in config:
                 if k in aircraft.property_defaults:
                     aircraft.property_defaults[k] = config[k]
+                    # In addition to setting the property_defaults, we have to set the "default" property in the
+                    # value of aircraft.properties for the key, as this is used in parts of the codebase to get
+                    # the default value.
+                    aircraft.properties[k] = dataclasses_replace(
+                        aircraft.properties[k], default=config[k]
+                    )
                 else:
                     logging.warning(
                         f"'{aircraft.id}' attempted to set default prop '{k}' that does not exist"
@@ -489,6 +506,11 @@ class AircraftType(UnitType[Type[FlyingType]]):
             patrol_altitude=patrol_config.altitude,
             patrol_speed=patrol_config.speed,
             max_mission_range=mission_range,
+            cruise_speed=(
+                knots(data["cruise_speed_kt_indicated"])
+                if "cruise_speed_kt_indicated" in data
+                else None
+            ),
             fuel_consumption=fuel_consumption,
             default_livery=data.get("default_livery"),
             intra_flight_radio=radio_config.intra_flight,
@@ -505,6 +527,7 @@ class AircraftType(UnitType[Type[FlyingType]]):
                 LaserCodeConfig.from_yaml(d) for d in data.get("laser_codes", [])
             ],
             use_f15e_waypoint_names=data.get("use_f15e_waypoint_names", False),
+            hit_points=data.get("hit_points", 1),
         )
 
     def __hash__(self) -> int:

game/dcs/groundunittype.py

@@ -133,4 +133,5 @@ class GroundUnitType(UnitType[Type[VehicleType]]):
                 data.get("skynet_properties", {})
             ),
             reversed_heading=data.get("reversed_heading", False),
+            hit_points=data.get("hit_points", 1),
         )

game/dcs/shipunittype.py

@@ -79,4 +79,5 @@ class ShipUnitType(UnitType[Type[ShipType]]):
             manufacturer=data.get("manufacturer", "No data."),
             role=data.get("role", "No data."),
             price=data["price"],
+            hit_points=data.get("hit_points", 1),
         )

game/dcs/unittype.py

@@ -27,6 +27,7 @@ class UnitType(ABC, Generic[DcsUnitTypeT]):
     role: str
     price: int
     unit_class: UnitClass
+    hit_points: int
 
     _loaded: ClassVar[bool] = False
 

game/debriefing.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-
+from abc import ABC
 import itertools
 import logging
 from collections import defaultdict
@@ -9,7 +9,9 @@ from typing import (
     Dict,
     Iterator,
     List,
+    Optional,
     TYPE_CHECKING,
+    TypeVar,
     Union,
 )
 from uuid import UUID
@@ -21,8 +23,10 @@ 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,
@@ -90,6 +94,103 @@ 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.
@@ -108,6 +209,10 @@ 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]:
@@ -147,6 +252,7 @@ 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"],
         )
 
 
@@ -284,6 +390,25 @@ 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:
@@ -356,8 +481,29 @@ 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

game/factions/faction.py

@@ -19,12 +19,7 @@ from game.data.building_data import (
     WW2_FREE,
     WW2_GERMANY_BUILDINGS,
 )
-from game.data.doctrine import (
-    COLDWAR_DOCTRINE,
-    Doctrine,
-    MODERN_DOCTRINE,
-    WWII_DOCTRINE,
-)
+from game.data.doctrine import Doctrine
 from game.data.groups import GroupRole
 from game.data.units import UnitClass
 from game.dcs.aircrafttype import AircraftType
@@ -106,7 +101,7 @@ class Faction:
     jtac_unit: Optional[AircraftType] = field(default=None)
 
     # doctrine
-    doctrine: Doctrine = field(default=MODERN_DOCTRINE)
+    doctrine: Doctrine = field(default=Doctrine.named("modern"))
 
     # List of available building layouts for this faction
     building_set: List[str] = field(default_factory=list)
@@ -238,14 +233,7 @@ class Faction:
 
         # Load doctrine
         doctrine = json.get("doctrine", "modern")
-        if doctrine == "modern":
-            faction.doctrine = MODERN_DOCTRINE
-        elif doctrine == "coldwar":
-            faction.doctrine = COLDWAR_DOCTRINE
-        elif doctrine == "ww2":
-            faction.doctrine = WWII_DOCTRINE
-        else:
-            faction.doctrine = MODERN_DOCTRINE
+        faction.doctrine = Doctrine.named(doctrine)
 
         # Load the building set
         faction.building_set = []
@@ -312,6 +300,11 @@ 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")
+
         # frenchpack
         if not mod_settings.frenchpack:
             self.remove_vehicle("AMX10RCR")

game/flightplan/waypointsolverloader.py

@@ -11,17 +11,14 @@ from shapely import transform
 from shapely.geometry import shape
 from shapely.geometry.base import BaseGeometry
 
-from game.data.doctrine import Doctrine, ALL_DOCTRINES
+from game.data.doctrine import Doctrine
 from .ipsolver import IpSolver
 from .waypointsolver import WaypointSolver
 from ..theater.theaterloader import TERRAINS_BY_NAME
 
 
 def doctrine_from_name(name: str) -> Doctrine:
-    for doctrine in ALL_DOCTRINES:
-        if doctrine.name == name:
-            return doctrine
-    raise KeyError
+    return Doctrine.named(name)
 
 
 def geometry_ll_to_xy(geometry: BaseGeometry, terrain: Terrain) -> BaseGeometry:

game/flightplan/waypointstrategy.py

@@ -119,7 +119,6 @@ class RequirementBuilder:
     def maximum_turn_to(
         self, turn_point: Point, next_point: Point, turn_limit: Heading
     ) -> None:
-
         large_distance = nautical_miles(400)
         next_heading = Heading.from_degrees(
             angle_between_points(next_point, turn_point)

game/ground_forces/ai_ground_planner.py

@@ -89,7 +89,6 @@ class GroundPlanner:
         self.reserve: List[CombatGroup] = []
 
     def plan_groundwar(self) -> None:
-
         ground_unit_limit = self.cp.frontline_unit_count_limit
 
         remaining_available_frontline_units = ground_unit_limit
@@ -139,7 +138,6 @@ class GroundPlanner:
             remaining_available_frontline_units -= available
 
             while available > 0:
-
                 if role == CombatGroupRole.SHORAD:
                     count = 1
                 else:

game/layout/layout.py

@@ -241,7 +241,6 @@ class AntiAirLayout(TgoLayout):
         location: PresetLocation,
         control_point: ControlPoint,
     ) -> IadsGroundObject:
-
         if GroupTask.EARLY_WARNING_RADAR in self.tasks:
             return EwrGroundObject(name, location, control_point)
         elif any(tasking in self.tasks for tasking in GroupRole.AIR_DEFENSE.tasks):

game/layout/layoutloader.py

@@ -132,7 +132,6 @@ class LayoutLoader:
                     temp_mis.country(country.name).ship_group,
                     temp_mis.country(country.name).static_group,
                 ):
-
                     try:
                         g_id, u_id, group_name, group_mapping = mapping.group_for_name(
                             dcs_group.name

game/missiongenerator/aircraft/waypoints/antishipingress.py

@@ -20,8 +20,14 @@ class AntiShipIngressBuilder(PydcsWaypointBuilder):
             group_names.append(target.name)
         elif isinstance(target, NavalControlPoint):
             carrier_name = target.get_carrier_group_name()
-            if carrier_name:
+            if carrier_name and self.mission.find_group(
+                carrier_name
+            ):  # Found a carrier, target it.
                 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",

game/missiongenerator/aircraft/waypoints/recoverytanker.py

@@ -8,7 +8,6 @@ from .pydcswaypointbuilder import PydcsWaypointBuilder
 
 class RecoveryTankerBuilder(PydcsWaypointBuilder):
     def add_tasks(self, waypoint: MovingPoint) -> None:
-
         assert self.flight.flight_type == FlightType.REFUELING
 
         # Tanker task required in conjunction with RecoveryTanker task.
@@ -48,7 +47,6 @@ class RecoveryTankerBuilder(PydcsWaypointBuilder):
         )
 
     def configure_tanker_tacan(self, waypoint: MovingPoint) -> None:
-
         if self.flight.unit_type.dcs_unit_type.tacan:
             tanker_info = self.mission_data.tankers[-1]
             tacan = tanker_info.tacan

game/missiongenerator/aircraft/waypoints/splitpoint.py

@@ -6,7 +6,6 @@ from .pydcswaypointbuilder import PydcsWaypointBuilder
 
 class SplitPointBuilder(PydcsWaypointBuilder):
     def add_tasks(self, waypoint: MovingPoint) -> None:
-
         if not self.flight.flight_type.is_air_to_air:
             # Capture any non A/A type to avoid issues with SPJs that use the primary radar such as the F/A-18C.
             # You can bully them with STT to not be able to fire radar guided missiles at you,

game/missiongenerator/drawingsgenerator.py

@@ -59,7 +59,6 @@ class DrawingsGenerator:
                 if destination in seen:
                     continue
                 else:
-
                     # Determine path color
                     if cp.captured and destination.captured:
                         color = BLUE_PATH_COLOR

game/missiongenerator/flotgenerator.py

@@ -191,7 +191,6 @@ class FlotGenerator:
         side: Country,
         forward_heading: Heading,
     ) -> None:
-
         infantry_position = self.conflict.find_ground_position(
             group.points[0].position.random_point_within(250, 50),
             500,
@@ -304,7 +303,6 @@ class FlotGenerator:
 
         # Artillery will fall back when under attack
         if stance != CombatStance.RETREAT:
-
             # Hold position
             dcs_group.points[1].tasks.append(Hold())
             retreat = self.find_retreat_point(
@@ -476,7 +474,6 @@ class FlotGenerator:
         from_cp: ControlPoint,
         to_cp: ControlPoint,
     ) -> None:
-
         if not self.game.settings.perf_moving_units:
             return
 

game/missiongenerator/kneeboard.py

@@ -185,7 +185,6 @@ class NumberedWaypoint:
 
 
 class FlightPlanBuilder:
-
     WAYPOINT_DESC_MAX_LEN = 25
 
     def __init__(self, start_time: datetime.datetime, units: UnitSystem) -> None:
@@ -503,7 +502,6 @@ class SupportPage(KneeboardPage):
         aewc_ladder = []
 
         for single_aewc in self.awacs:
-
             if single_aewc.depature_location is None:
                 dep = "-"
                 arr = "-"

game/missiongenerator/tgogenerator.py

@@ -402,7 +402,6 @@ class GenericCarrierGenerator(GroundObjectGenerator):
         self.mission_data = mission_data
 
     def generate(self) -> None:
-
         # This can also be refactored as the general generation was updated
         atc = self.radio_registry.alloc_uhf()
 

game/procurement.py

@@ -41,7 +41,6 @@ class ProcurementAi:
         manage_front_line: bool,
         manage_aircraft: bool,
     ) -> None:
-
         self.game = game
         self.is_player = for_player
         self.air_wing = game.air_wing_for(for_player)

game/radio/channels.py

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

game/radio/radios.py

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

game/server/combat/models.py

@@ -33,15 +33,19 @@ class FrozenCombatJs(BaseModel):
         if isinstance(combat, AtIp):
             return FrozenCombatJs(
                 id=combat.id,
-                flight_position=combat.flight.position().latlng(),
-                target_positions=[combat.flight.package.target.position.latlng()],
+                flight_position=LeafletPoint.from_pydcs(combat.flight.position()),
+                target_positions=[
+                    LeafletPoint.from_pydcs(combat.flight.package.target.position)
+                ],
                 footprint=None,
             )
         if isinstance(combat, DefendingSam):
             return FrozenCombatJs(
                 id=combat.id,
-                flight_position=combat.flight.position().latlng(),
-                target_positions=[sam.position.latlng() for sam in combat.air_defenses],
+                flight_position=LeafletPoint.from_pydcs(combat.flight.position()),
+                target_positions=[
+                    LeafletPoint.from_pydcs(sam.position) for sam in combat.air_defenses
+                ],
                 footprint=None,
             )
         raise NotImplementedError(f"Unhandled FrozenCombat type: {combat.__class__}")

game/server/controlpoints/models.py

@@ -28,12 +28,12 @@ class ControlPointJs(BaseModel):
     def for_control_point(control_point: ControlPoint) -> ControlPointJs:
         destination = None
         if control_point.target_position is not None:
-            destination = control_point.target_position.latlng()
+            destination = LeafletPoint.from_pydcs(control_point.target_position)
         return ControlPointJs(
             id=control_point.id,
             name=control_point.name,
             blue=control_point.captured,
-            position=control_point.position.latlng(),
+            position=LeafletPoint.from_pydcs(control_point.position),
             mobile=control_point.moveable and control_point.captured,
             destination=destination,
             sidc=str(control_point.sidc()),

game/server/controlpoints/routes.py

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

game/server/eventstream/models.py

@@ -47,7 +47,6 @@ class GameUpdateEventsJs(BaseModel):
     def from_events(
         cls, events: GameUpdateEvents, game: Game | None
     ) -> GameUpdateEventsJs:
-
         # We still need to be able to send update events when there is no game loaded
         # because we need to send the unload event.
         new_combats = []
@@ -81,9 +80,13 @@ class GameUpdateEventsJs(BaseModel):
                 for f in events.updated_front_lines
             ]
 
+        reset_on_map_center: LeafletPoint | None = None
+        if events.reset_on_map_center is not None:
+            reset_on_map_center = LeafletPoint.from_pydcs(events.reset_on_map_center)
         return GameUpdateEventsJs(
             updated_flight_positions={
-                f[0].id: f[1].latlng() for f in events.updated_flight_positions
+                f[0].id: LeafletPoint.from_pydcs(f[1])
+                for f in events.updated_flight_positions
             },
             new_combats=new_combats,
             updated_combats=updated_combats,
@@ -110,7 +113,7 @@ class GameUpdateEventsJs(BaseModel):
             ],
             updated_iads=updated_iads,
             deleted_iads=events.deleted_iads_connections,
-            reset_on_map_center=events.reset_on_map_center,
+            reset_on_map_center=reset_on_map_center,
             game_unloaded=events.game_unloaded,
             new_turn=events.new_turn,
         )

game/server/eventstream/routes.py

@@ -1,5 +1,5 @@
 import asyncio
-from asyncio import wait
+from asyncio import wait, Future
 
 from fastapi import APIRouter, WebSocket
 from fastapi.encoders import jsonable_encoder
@@ -16,9 +16,9 @@ class ConnectionManager:
         self.active_connections: list[WebSocket] = []
 
     async def shutdown(self) -> None:
-        futures = []
+        futures: list[Future[None]] = []
         for connection in self.active_connections:
-            futures.append(connection.close())
+            futures.append(asyncio.create_task(connection.close()))
         await wait(futures)
 
     async def connect(self, websocket: WebSocket) -> None:

game/server/flights/models.py

@@ -37,7 +37,7 @@ class FlightJs(BaseModel):
         # lost.
         position = None
         if isinstance(flight.state, InFlight) or isinstance(flight.state, Killed):
-            position = flight.position().latlng()
+            position = LeafletPoint.from_pydcs(flight.position())
         waypoints = None
         if with_waypoints:
             waypoints = waypoints_for_flight(flight)

game/server/frontlines/models.py

@@ -27,7 +27,10 @@ class FrontLineJs(BaseModel):
         bounds = FrontLineConflictDescription.frontline_bounds(front_line, theater)
         return FrontLineJs(
             id=front_line.id,
-            extents=[bounds.left_position.latlng(), bounds.right_position.latlng()],
+            extents=[
+                LeafletPoint.from_pydcs(bounds.left_position),
+                LeafletPoint.from_pydcs(bounds.right_position),
+            ],
         )
 
     @staticmethod

game/server/game/models.py

@@ -7,12 +7,12 @@ from pydantic import BaseModel
 from game.server.controlpoints.models import ControlPointJs
 from game.server.flights.models import FlightJs
 from game.server.frontlines.models import FrontLineJs
+from game.server.iadsnetwork.models import IadsNetworkJs
 from game.server.leaflet import LeafletPoint
 from game.server.mapzones.models import ThreatZoneContainerJs, UnculledZoneJs
 from game.server.navmesh.models import NavMeshesJs
 from game.server.supplyroutes.models import SupplyRouteJs
 from game.server.tgos.models import TgoJs
-from game.server.iadsnetwork.models import IadsConnectionJs, IadsNetworkJs
 
 if TYPE_CHECKING:
     from game import Game
@@ -44,6 +44,8 @@ class GameJs(BaseModel):
             iads_network=IadsNetworkJs.from_network(game.theater.iads_network),
             threat_zones=ThreatZoneContainerJs.for_game(game),
             navmeshes=NavMeshesJs.from_game(game),
-            map_center=game.theater.terrain.map_view_default.position.latlng(),
+            map_center=LeafletPoint.from_pydcs(
+                game.theater.terrain.map_view_default.position
+            ),
             unculled_zones=UnculledZoneJs.from_game(game),
         )

game/server/iadsnetwork/models.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
+
 from uuid import UUID
 
 from pydantic import BaseModel
 
 from game.server.leaflet import LeafletPoint
 from game.theater.iadsnetwork.iadsnetwork import IadsNetworkNode, IadsNetwork
-from game.theater.theatergroundobject import TheaterGroundObject
 
 
 class IadsConnectionJs(BaseModel):
@@ -45,8 +45,8 @@ class IadsConnectionJs(BaseModel):
                 IadsConnectionJs(
                     id=id,
                     points=[
-                        tgo.position.latlng(),
-                        connection.ground_object.position.latlng(),
+                        LeafletPoint.from_pydcs(tgo.position),
+                        LeafletPoint.from_pydcs(connection.ground_object.position),
                     ],
                     node=tgo.id,
                     connected=connection.ground_object.id,

game/server/leaflet.py

@@ -19,6 +19,11 @@ class LeafletPoint(BaseModel):
 
         title = "LatLng"
 
+    @staticmethod
+    def from_pydcs(point: Point) -> LeafletPoint:
+        latlng = point.latlng()
+        return LeafletPoint(lat=latlng.lat, lng=latlng.lng)
+
 
 LeafletLine = list[LeafletPoint]
 

game/server/mapzones/models.py

@@ -36,7 +36,7 @@ class UnculledZoneJs(BaseModel):
     def from_game(game: Game) -> list[UnculledZoneJs]:
         return [
             UnculledZoneJs(
-                position=zone.latlng(),
+                position=LeafletPoint.from_pydcs(zone),
                 radius=game.settings.perf_culling_distance * 1000,
             )
             for zone in game.get_culling_zones()

game/server/settings.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from functools import lru_cache
 
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings
 
 
 class ServerSettings(BaseSettings):

game/server/supplyroutes/models.py

@@ -92,7 +92,7 @@ class SupplyRouteJs(BaseModel):
             # https://reactjs.org/docs/lists-and-keys.html#keys
             # https://github.com/dcs-liberation/dcs_liberation/issues/2167
             id=uuid.uuid4(),
-            points=[p.latlng() for p in points],
+            points=[LeafletPoint.from_pydcs(p) for p in points],
             front_active=not sea and a.front_is_active(b),
             is_sea=sea,
             blue=a.captured,

game/server/tgos/models.py

@@ -38,7 +38,7 @@ class TgoJs(BaseModel):
             control_point_name=tgo.control_point.name,
             category=tgo.category,
             blue=tgo.control_point.captured,
-            position=tgo.position.latlng(),
+            position=LeafletPoint.from_pydcs(tgo.position),
             units=[unit.display_name for unit in tgo.units],
             threat_ranges=threat_ranges,
             detection_ranges=detection_ranges,

game/server/waypoints/models.py

@@ -82,7 +82,7 @@ class FlightWaypointJs(BaseModel):
 
         return FlightWaypointJs(
             name=waypoint.name,
-            position=waypoint.position.latlng(),
+            position=LeafletPoint.from_pydcs(waypoint.position),
             altitude_ft=waypoint.alt.feet,
             altitude_reference=waypoint.alt_type,
             is_movable=is_movable,

game/settings/settings.py

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

game/sim/gameupdateevents.py

@@ -5,7 +5,6 @@ from typing import TYPE_CHECKING
 from uuid import UUID
 
 from dcs import Point
-from dcs.mapping import LatLng
 
 if TYPE_CHECKING:
     from game import Game
@@ -38,7 +37,7 @@ class GameUpdateEvents:
     updated_control_points: set[ControlPoint] = field(default_factory=set)
     updated_iads: set[IadsNetworkNode] = field(default_factory=set)
     deleted_iads_connections: set[UUID] = field(default_factory=set)
-    reset_on_map_center: LatLng | None = None
+    reset_on_map_center: Point | None = None
     game_unloaded: bool = False
     new_turn: bool = False
     shutting_down: bool = False
@@ -140,9 +139,7 @@ class GameUpdateEvents:
             self.game_unloaded = True
             self.reset_on_map_center = None
         else:
-            self.reset_on_map_center = (
-                game.theater.terrain.map_view_default.position.latlng()
-            )
+            self.reset_on_map_center = game.theater.terrain.map_view_default.position
             self.game_unloaded = False
         return self
 

game/sim/missionresultsprocessor.py

@@ -34,6 +34,7 @@ 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:
@@ -245,7 +246,6 @@ class MissionResultsProcessor:
                                 delta = DEFEAT_INFLUENCE
                                 status_msg = f"Enemy casualties outnumber allied casualties along the {cp.name}-{enemy_cp.name} frontline.  Allied forces claim a victory."
                     elif ally_casualties > enemy_casualties:
-
                         if (
                             ally_units_alive > 2 * enemy_units_alive
                             and player_aggresive
@@ -308,42 +308,52 @@ 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]
 
-        ally_connected_cps = [
-            ocp for ocp in cp.connected_points if cp.captured == ocp.captured
-        ]
-        enemy_connected_cps = [
-            ocp for ocp in cp.connected_points if cp.captured != ocp.captured
-        ]
+        # Split into frontline CPs that are connected to enemy CPs and should receive units
+        # vs. non-frontline CPs that are not connected to enemy CPs and should send units.
+        frontline_cps = []
+        non_frontline_cps = []
+        for cp in all_ally_connected_cps:
+            is_frontline = False
+            for ocp in cp.connected_points:
+                if not ocp.captured:
+                    is_frontline = True
+                    break
+            if is_frontline:
+                frontline_cps.append(cp)
+            else:
+                non_frontline_cps.append(cp)
 
-        # If the newly captured cp does not have enemy connected cp,
-        # then it is not necessary to redeploy frontline units there.
-        if len(enemy_connected_cps) == 0:
+        # If there are no frontline CPs, then nothing to do.
+        if len(frontline_cps) == 0:
             return
 
-        # From each ally cp, send reinforcements
-        for ally_cp in ally_connected_cps:
-            self.redeploy_between(cp, ally_cp)
+        # Equally split between all frontline CPs
+        move_factor = 1.0 / len(frontline_cps)
+        for non_frontline_cp in non_frontline_cps:
+            for frontline_cp in frontline_cps:
+                self.redeploy_between(frontline_cp, non_frontline_cp, move_factor)
 
-    def redeploy_between(self, destination: ControlPoint, source: ControlPoint) -> None:
+    def redeploy_between(
+        self, destination: ControlPoint, source: ControlPoint, move_factor: float
+    ) -> None:
         total_units_redeployed = 0
         moved_units = {}
 
-        if source.has_active_frontline or not destination.captured:
-            # If there are still active front lines to defend at the
-            # transferring CP we should not transfer all units.
-            #
-            # Opfor also does not transfer all of their units.
-            # TODO: Balance the CPs rather than moving half from everywhere.
-            move_factor = 0.5
-        else:
-            # Otherwise we can move everything.
-            move_factor = 1
-
         for frontline_unit, count in source.base.armor.items():
             moved_units[frontline_unit] = int(count * move_factor)
             total_units_redeployed = total_units_redeployed + int(count * move_factor)

game/squadrons/squadrondef.py

@@ -54,7 +54,6 @@ class SquadronDef:
 
     @classmethod
     def from_yaml(cls, path: Path) -> SquadronDef:
-
         with path.open(encoding="utf8") as squadron_file:
             data = yaml.safe_load(squadron_file)
 

game/theater/controlpoint.py

@@ -271,15 +271,15 @@ class RunwayStatus:
     def needs_repair(self) -> bool:
         return self.damaged and self.repair_turns_remaining is None
 
-    def __str__(self) -> str:
+    def describe(self) -> str:
         if not self.damaged:
-            return "Runway operational"
+            return "operational"
 
         turns_remaining = self.repair_turns_remaining
         if turns_remaining is None:
-            return "Runway damaged"
+            return "damaged"
 
-        return f"Runway repairing, {turns_remaining} turns remaining"
+        return f"repairing, {turns_remaining} turns remaining"
 
 
 @total_ordering
@@ -915,6 +915,10 @@ class ControlPoint(MissionTarget, SidcDescribable, ABC):
     def runway_status(self) -> RunwayStatus:
         ...
 
+    @abstractmethod
+    def describe_runway_status(self) -> str | None:
+        """Description of the runway status suitable for UI use."""
+
     @property
     def runway_can_be_repaired(self) -> bool:
         return self.runway_status.needs_repair
@@ -1157,6 +1161,9 @@ class Airfield(ControlPoint):
     def runway_status(self) -> RunwayStatus:
         return self._runway_status
 
+    def describe_runway_status(self) -> str:
+        return f"Runway {self.runway_status.describe()}"
+
     def damage_runway(self) -> None:
         self.runway_status.damage()
 
@@ -1275,6 +1282,12 @@ class NavalControlPoint(ControlPoint, ABC):
     def runway_status(self) -> RunwayStatus:
         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"
+
     @property
     def runway_can_be_repaired(self) -> bool:
         return False
@@ -1428,6 +1441,9 @@ class OffMapSpawn(ControlPoint):
     def runway_status(self) -> RunwayStatus:
         return RunwayStatus()
 
+    def describe_runway_status(self) -> str:
+        return f"Off-map airport {self.runway_status.describe()}"
+
     @property
     def can_deploy_ground_units(self) -> bool:
         return False
@@ -1474,6 +1490,11 @@ class Fob(ControlPoint):
     def runway_status(self) -> RunwayStatus:
         return RunwayStatus()
 
+    def describe_runway_status(self) -> str | None:
+        if not self.has_helipads:
+            return None
+        return f"FARP {self.runway_status.describe()}"
+
     def mission_types(self, for_player: bool) -> Iterator[FlightType]:
         from game.ato import FlightType
 

game/theater/start_generator.py

@@ -66,6 +66,7 @@ class ModSettings:
     frenchpack: bool = False
     high_digit_sams: bool = False
     ov10a_bronco: bool = False
+    fa18efg: bool = False
 
     def save_player_settings(self) -> None:
         """Saves the player's global settings to the user directory."""

game/theater/theatergroup.py

@@ -35,6 +35,8 @@ 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
 
@@ -42,13 +44,17 @@ class TheaterUnit:
     def from_template(
         id: int, dcs_type: Type[DcsUnitType], t: LayoutUnit, go: TheaterGroundObject
     ) -> TheaterUnit:
-        return TheaterUnit(
+        unit = 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]]:
@@ -70,14 +76,12 @@ 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}{dead_label}"
+        return f"{str(self.id).zfill(4)} | {unit_label}{self._status_label()}"
 
     @property
     def short_name(self) -> str:
-        dead_label = " [DEAD]" if not self.alive else ""
-        return f"<b>{self.type.id[0:18]}</b> {dead_label}"
+        return f"<b>{self.type.id[0:18]}</b> {self._status_label()}"
 
     @property
     def is_static(self) -> bool:
@@ -117,6 +121,18 @@ 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"""
@@ -196,7 +212,8 @@ class TheaterGroup:
 
     def max_threat_range(self, radar_only: bool = False) -> Distance:
         """Calculate the maximum threat range of the TheaterGroup.
-        This also checks for Launcher and Tracker Pairs and if they are functioning or not. Allows to also use only radar emitting units for the calculation with the parameter."""
+        This also checks for Launcher and Tracker Pairs and if they are functioning or not. Allows to also use only radar emitting units for the calculation with the parameter.
+        """
         max_non_radar = meters(0)
         max_telar_range = meters(0)
         max_tel_range = meters(0)

game/threatzones.py

@@ -165,7 +165,7 @@ class ThreatZones:
         cls, doctrine: Doctrine, control_point: ControlPoint
     ) -> Distance:
         cap_threat_range = (
-            doctrine.cap_max_distance_from_cp + doctrine.cap_engagement_range
+            doctrine.cap.max_distance_from_cp + doctrine.cap.engagement_range
         )
         opposing_airfield = cls.closest_enemy_airbase(
             control_point, cap_threat_range * 2

game/transfers.py

@@ -718,7 +718,6 @@ class PendingTransfers:
                 self.order_airlift_assets_at(control_point)
 
     def desired_airlift_capacity(self, control_point: ControlPoint) -> int:
-
         if control_point.has_factory:
             is_major_hub = control_point.total_aircraft_parking > 0
             # Check if there is a CP which is only reachable via Airlift

game/version.py

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

game/weather/weather.py

@@ -190,7 +190,6 @@ class Weather(ABC):
     def interpolate_solar_activity(
         time_of_day: TimeOfDay, high: float, low: float
     ) -> float:
-
         scale: float = 0
 
         match time_of_day:

pydcs_extensions/__init__.py

@@ -9,6 +9,7 @@ from .jas39 import *
 from .ov10a import *
 from .su57 import *
 from .uh60l import *
+from .fa18efg import *
 
 
 def load_mods() -> None:

pydcs_extensions/a4ec/a4ec.py

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

pydcs_extensions/f4/f4.py

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

pydcs_extensions/fa18efg/__init__.py

@@ -0,0 +1 @@
+from .fa18efg import *

qt_ui/liberation_theme.py

@@ -32,7 +32,7 @@ def init():
 
     if os.path.isfile(THEME_PREFERENCES_FILE_PATH):
         try:
-            with (open(THEME_PREFERENCES_FILE_PATH)) as prefs:
+            with open(THEME_PREFERENCES_FILE_PATH) as prefs:
                 pref_data = json.loads(prefs.read())
                 __theme_index = pref_data["theme_index"]
                 set_theme_index(__theme_index)
@@ -83,5 +83,5 @@ def get_theme_css_file():
 # save current theme index to json file
 def save_theme_config():
     pref_data = {"theme_index": get_theme_index()}
-    with (open(THEME_PREFERENCES_FILE_PATH, "w")) as prefs:
+    with open(THEME_PREFERENCES_FILE_PATH, "w") as prefs:
         prefs.write(json.dumps(pref_data))

qt_ui/logging_handler.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import logging
 import typing
+from collections.abc import Iterator
 
 LogHook = typing.Callable[[str], None]
 
@@ -15,6 +18,16 @@ class HookableInMemoryHandler(logging.Handler):
         self._log = ""
         self._hook = None
 
+    @staticmethod
+    def iter_registered_handlers(
+        logger: logging.Logger | None = None,
+    ) -> Iterator[HookableInMemoryHandler]:
+        if logger is None:
+            logger = logging.getLogger()
+        for handler in logger.handlers:
+            if isinstance(handler, HookableInMemoryHandler):
+                yield handler
+
     @property
     def log(self) -> str:
         return self._log

qt_ui/models.py

@@ -288,7 +288,7 @@ class AtoModel(QAbstractListModel):
                     return
 
                 package_model = self.find_matching_package_model(package)
-                for flight in package.flights:
+                for flight in list(package.flights):
                     if flight.state.cancelable:
                         package_model.delete_flight(flight)
                         events.delete_flight(flight)

qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py

@@ -54,7 +54,6 @@ class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
         return waypoints
 
     def find_possible_waypoints(self):
-
         self.wpts = []
         model = QStandardItemModel()
         i = 0

qt_ui/windows/AirWingConfigurationDialog.py

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

qt_ui/windows/GameUpdateSignal.py

@@ -9,7 +9,6 @@ from game.debriefing import Debriefing
 
 
 class GameUpdateSignal(QObject):
-
     instance = None
     gameupdated = Signal(Game)
     budgetupdated = Signal(Game)

qt_ui/windows/QLiberationWindow.py

@@ -27,6 +27,7 @@ from game.theater import ControlPoint, MissionTarget, TheaterGroundObject
 from game.turnstate import TurnState
 from qt_ui import liberation_install
 from qt_ui.dialogs import Dialog
+from qt_ui.logging_handler import HookableInMemoryHandler
 from qt_ui.models import GameModel
 from qt_ui.simcontroller import SimController
 from qt_ui.uiflags import UiFlags
@@ -492,6 +493,8 @@ class QLiberationWindow(QMainWindow):
             "ColonelAkirNakesh",
             "Nosajthedevil",
             "kivipe",
+            "Chilli935",
+            "DillieKoe",
         ]
         text = (
             "<h3>DCS Liberation "
@@ -576,6 +579,10 @@ class QLiberationWindow(QMainWindow):
         self._cp_dialog = QBaseMenu2(None, cp, self.game_model)
         self._cp_dialog.show()
 
+    def _disconnect_log_signals(self) -> None:
+        for handler in HookableInMemoryHandler.iter_registered_handlers():
+            handler.clearHook()
+
     def _qsettings(self) -> QSettings:
         return QSettings("DCS Liberation", "Qt UI")
 
@@ -597,6 +604,7 @@ class QLiberationWindow(QMainWindow):
             QMessageBox.Yes | QMessageBox.No,
         )
         if result == QMessageBox.Yes:
+            self._disconnect_log_signals()
             self._save_window_geometry()
             super().closeEvent(event)
             self.dialog = None

qt_ui/windows/QWaitingForMissionResultWindow.py

@@ -28,7 +28,6 @@ from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 
 
 class DebriefingFileWrittenSignal(QObject):
-
     instance = None
     debriefingReceived = Signal(Debriefing)
 

qt_ui/windows/basemenu/QBaseMenu2.py

@@ -16,6 +16,7 @@ from game import Game
 from game.ato.flighttype import FlightType
 from game.config import RUNWAY_REPAIR_COST
 from game.server import EventStream
+from game.sim.missionresultsprocessor import MissionResultsProcessor
 from game.theater import (
     AMMO_DEPOT_FRONTLINE_UNIT_CONTRIBUTION,
     ControlPoint,
@@ -156,6 +157,9 @@ class QBaseMenu2(QDialog):
             self.cp.capture(
                 self.game_model.game, events, for_player=not self.cp.captured
             )
+            # Redeploy frontline units, as if the CP capture was done in mission.
+            results_processor = MissionResultsProcessor(self.game_model.game)
+            results_processor.redeploy_units(self.cp)
             self.close()
 
     @property
@@ -254,19 +258,22 @@ class QBaseMenu2(QDialog):
                 f" (Up to {ground_unit_limit} deployable, {unit_overage} reserve)"
             )
 
-        self.intel_summary.setText(
-            "\n".join(
-                [
-                    f"{aircraft}/{parking} aircraft",
-                    f"{self.cp.base.total_armor} ground units" + deployable_unit_info,
-                    f"{allocated.total_transferring} more ground units en route, {allocated.total_ordered} ordered",
-                    str(self.cp.runway_status),
-                    f"{self.cp.active_ammo_depots_count}/{self.cp.total_ammo_depots_count} ammo depots",
-                    f"{'Factory can produce units' if self.cp.has_factory else 'Does not have a factory'}",
-                ]
-            )
+        intel_lines = [
+            f"{aircraft}/{parking} aircraft",
+            f"{self.cp.base.total_armor} ground units" + deployable_unit_info,
+            f"{allocated.total_transferring} more ground units en route, {allocated.total_ordered} ordered",
+        ]
+        if (runway_description := self.cp.describe_runway_status()) is not None:
+            intel_lines.append(runway_description)
+        intel_lines.extend(
+            [
+                f"{self.cp.active_ammo_depots_count}/{self.cp.total_ammo_depots_count} ammo depots",
+                f"{'Factory can produce units' if self.cp.has_factory else 'Does not have a factory'}",
+            ]
         )
 
+        self.intel_summary.setText("\n".join(intel_lines))
+
     def generate_intel_tooltip(self) -> str:
         tooltip = (
             f"Deployable unit limit ({self.cp.frontline_unit_count_limit}) = {FREE_FRONTLINE_UNIT_SUPPLY} (base) + "

qt_ui/windows/groundobject/QGroundObjectMenu.py

@@ -70,7 +70,6 @@ class QGroundObjectMenu(QDialog):
         self.init_ui()
 
     def init_ui(self):
-
         self.mainLayout = QVBoxLayout()
         self.budget = QBudgetBox(self.game)
         self.budget.setGame(self.game)
@@ -105,7 +104,6 @@ class QGroundObjectMenu(QDialog):
         self.setLayout(self.mainLayout)
 
     def doLayout(self):
-
         self.update_total_value()
         self.intelBox = QGroupBox("Units :")
         self.intelLayout = QGridLayout()

qt_ui/windows/intel.py

@@ -160,7 +160,6 @@ class IntelWindow(QDialog):
         self.refresh_layout()
 
     def refresh_layout(self) -> None:
-
         # Clear the existing layout
         if self.layout():
             idx = 0

qt_ui/windows/logs/QLogsWindow.py

@@ -1,14 +1,13 @@
-import logging
 import typing
 
 from PySide6.QtCore import Signal
+from PySide6.QtGui import QTextCursor, QIcon
 from PySide6.QtWidgets import (
     QDialog,
     QPlainTextEdit,
     QVBoxLayout,
     QPushButton,
 )
-from PySide6.QtGui import QTextCursor, QIcon
 
 from qt_ui.logging_handler import HookableInMemoryHandler
 
@@ -50,12 +49,17 @@ class QLogsWindow(QDialog):
 
         self.appendLogSignal.connect(self.appendLog)
 
-        self._logging_handler = None
-        logger = logging.getLogger()
-        for handler in logger.handlers:
-            if isinstance(handler, HookableInMemoryHandler):
-                self._logging_handler = handler
-                break
+        try:
+            # This assumes that there's never more than one in memory handler. We don't
+            # configure more than one by default, but logging is customizable with
+            # resources/logging.yaml. If someone adds a second in-memory handler, only
+            # the first one (in arbitrary order) will be shown.
+            self._logging_handler = next(
+                HookableInMemoryHandler.iter_registered_handlers()
+            )
+        except StopIteration:
+            self._logging_handler = None
+
         if self._logging_handler is not None:
             self.textbox.setPlainText(self._logging_handler.log)
             self.textbox.moveCursor(QTextCursor.End)

qt_ui/windows/mission/QPackageDialog.py

@@ -261,7 +261,7 @@ class QNewPackageDialog(QPackageDialog):
 
     def on_cancel(self) -> None:
         super().on_cancel()
-        for flight in self.package_model.package.flights:
+        for flight in list(self.package_model.package.flights):
             self.package_model.cancel_or_abort_flight(flight)
 
 

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

@@ -38,12 +38,12 @@ class FlightMemberSelector(QSpinBox):
     def __init__(self, flight: Flight, parent: QWidget | None = None) -> None:
         super().__init__(parent)
         self.flight = flight
-        self.setMinimum(0)
-        self.setMaximum(flight.count - 1)
+        self.setMinimum(1)
+        self.setMaximum(flight.count)
 
     @property
     def selected_member(self) -> FlightMember:
-        return self.flight.roster.members[self.value()]
+        return self.flight.roster.members[self.value() - 1]
 
 
 class QFlightPayloadTab(QFrame):
@@ -127,6 +127,12 @@ class QFlightPayloadTab(QFrame):
         scrolling_layout.addWidget(docsText)
 
         self.setLayout(layout)
+        # Increase width of tab when there are long loadout names. Add 50px to loadout selector
+        # to account for padding around the selector.
+        width = max(
+            self.sizeHint().width(), self.loadout_selector.sizeHint().width() + 50
+        )
+        self.setMinimumWidth(width)
 
     def resize_for_flight(self) -> None:
         self.member_selector.setMaximum(self.flight.count - 1)

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

@@ -14,7 +14,6 @@ class QFlightWaypointInfoBox(QGroupBox):
         self.init_ui()
 
     def init_ui(self) -> None:
-
         layout = QVBoxLayout()
 
         x_pos_layout = QHBoxLayout()

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

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

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

@@ -60,7 +60,6 @@ class QFlightWaypointTab(QFrame):
 
         self.recreate_buttons.clear()
         for task in self.package.target.mission_types(for_player=True):
-
             if (
                 task == FlightType.AIR_ASSAULT
                 and not self.game.lua_plugin_manager.is_plugin_enabled("ctld")

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

@@ -27,7 +27,6 @@ PREDEFINED_WAYPOINT_CATEGORIES = [
 
 
 class QPredefinedWaypointSelectionWindow(QDialog):
-
     # List of FlightWaypoint
     waypoints_added = Signal(list)
 

qt_ui/windows/newgame/QNewGameWizard.py

@@ -142,6 +142,10 @@ class NewGameWizard(QtWidgets.QWizard):
 
         self.setWindowTitle("New Game")
 
+        # Resize wizard to the size of the largest page to keep size and position
+        # consistent.
+        self.resize(self.theater_page.sizeHint())
+
     def accept(self):
         logging.info("New Game Wizard accept")
         logging.info("======================")
@@ -204,6 +208,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"),
         )
         mod_settings.save_player_settings()
 
@@ -826,6 +831,10 @@ 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)
+
         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>"
         )
@@ -877,6 +886,13 @@ class GeneratorOptions(QtWidgets.QWizardPage):
         modLayout.addWidget(QtWidgets.QLabel("High Digit SAMs"), modLayout_row, 0)
         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)
+        modSettingsGroup.setLayout(modLayout)
+        modLayout_row += 1
 
         mlayout = QVBoxLayout()
         mlayout.addWidget(generatorSettingsGroup)

qt_ui/windows/preferences/QLiberationPreferences.py

@@ -87,7 +87,6 @@ class QLiberationPreferences(QFrame):
             self.edit_dcs_install_dir.setText(install_dir)
 
     def apply(self):
-
         print("Applying changes")
         self.saved_game_dir = self.edit_saved_game_dir.text()
         self.dcs_install_dir = self.edit_dcs_install_dir.text()