Merge pull request #1208 from dcs-liberation/develop-3.x

Release 3.0.0.

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Black
+a47bef1f1336fd264d0b175f4421758339a30acb

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,6 +9,8 @@ assignees: ''
 
 Before filing, please search the issue tracker to see if the issue has already been reported.
 
+If reporting a DCS AI bug, check https://github.com/dcs-liberation/dcs_liberation#dcs-bugs.
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -28,7 +30,8 @@ We will usually need more information for debugging. Include as much of the foll
 
 - DCS Liberation save file (the `.liberation` file you save from the DCS Liberation window). By default these are located in your DCS saved games directory (`%USERPROFILE%/Saved Games/DCS`).
 - The generated mission file (the `.miz` file that you load in DCS to play the turn). By default these are located in your missions directory (`%USERPROFILE%/Saved Games/DCS/Missions`).
-- A tacview track file, especially when demonstrating an issue with AI behavior. By default these are locaed in your Tacview tracks directory (`%USERPROFILE%/Documents/Tacview`).
+- A tacview track file, especially when demonstrating an issue with AI behavior. By default these are located in your Tacview tracks directory (`%USERPROFILE%/Documents/Tacview`).
+- The state.json file from the finished mission when the problem is related to results processing. By default these are located in your Liberation install directory.
 
 **Version information (please complete the following information):**
  - DCS Liberation [e.g. 2.3.1]:

.github/ISSUE_TEMPLATE/campaign_update.md

@@ -0,0 +1,28 @@
+---
+name: Campaign update submission
+about: Submit an update to a campaign you maintain.
+title: 'Update for <campaign name>'
+labels: campaign-update-submission
+assignees: ''
+
+---
+
+This form should only be used for submitted updated miz/json files for campaigns
+distributed with Liberation. If you are _requesting_ an update to a campaign, see
+https://github.com/dcs-liberation/dcs_liberation/wiki/Campaign-maintenance. If the
+campaign has an owner, it will be updated before release. If it does not, you can
+volunteer to own it.
+
+If you are not the owner of the campaign listed on
+https://github.com/dcs-liberation/dcs_liberation/wiki/Campaign-maintenance, please start
+there.
+
+Otherwise, delete everything above the line below and fill out the following form. Note:
+GitHub does not accept .miz files. You can either rename the file to .miz.txt or add the
+file to a .zip file.
+
+---
+
+* Campaign name:
+* Files:
+* Update summary (optional):

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,6 +9,8 @@ assignees: ''
 
 Before filing, please search the issue tracker to see if this feature has already been requested.
 
+If requesting a DCS AI feature, check If reporting a DCS AI bug, check https://github.com/dcs-liberation/dcs_liberation#dcs-bugs.
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 

.github/workflows/black.yml

@@ -0,0 +1,13 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: psf/black@stable
+        with:
+          args: ". --check"

.github/workflows/build.yml

@@ -11,10 +11,10 @@ jobs:
       with:
         submodules: true
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Install environment
       run: |

.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
       with:
         submodules: true
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Install environment
       run: |

.gitignore

@@ -11,6 +11,7 @@ a.py
 resources/tools/a.miz
 # User-specific stuff
 .idea/
+.env
 
 /kneeboards
 /liberation_preferences.json

.pre-commit-config.yaml

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

CONTRIBUTING.md

@@ -11,7 +11,7 @@ Note that you may need to remove the filter for open bugs if it's something we'v
 
 ## Making content for Liberation
 
-You can create new campaigns : See [campaign creation wiki](https://github.com/Khopa/dcs_liberation/wiki/Custom-Campaigns).
+You can create new campaigns : See [campaign creation wiki](https://github.com/dcs-liberation/dcs_liberation/wiki/Custom-Campaigns).
 You can also improve existing campaigns.
 
 You can then submit new campaigns on the "campaigns" channel on Discord, or by making a pull request if you are comfortable with git. 

README.md

@@ -1,15 +1,14 @@
 ![Logo](https://i.imgur.com/c2k18E1.png)
 
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?logo=paypal)](https://www.paypal.com/paypalme/KhopaDCSL)
 [![Patreon](https://img.shields.io/badge/patreon-become%20a%20patron-orange?logo=patreon)](https://patreon.com/khopa)
 
-[![Download](https://img.shields.io/github/downloads/khopa/dcs_liberation/total?label=Download)](https://github.com/Khopa/dcs_liberation/releases)
+[![Download](https://img.shields.io/github/downloads/dcs-liberation/dcs_liberation/total?label=Download)](https://github.com/dcs-liberation/dcs_liberation/releases)
 
 [![Discord](https://img.shields.io/discord/595702951800995872?label=Discord&logo=discord)](https://discord.gg/bKrtrkJ)
 
-[![GitHub pull requests](https://img.shields.io/github/issues-pr/khopa/dcs_liberation)](https://github.com/Khopa/dcs_liberation)
-[![GitHub issues](https://img.shields.io/github/issues/khopa/dcs_liberation)](https://github.com/Khopa/dcs_liberation/issues)
-![GitHub stars](https://img.shields.io/github/stars/khopa/dcs_liberation?style=social)
+[![GitHub pull requests](https://img.shields.io/github/issues-pr/dcs-liberation/dcs_liberation)](https://github.com/dcs-liberation/dcs_liberation)
+[![GitHub issues](https://img.shields.io/github/issues/dcs-liberation/dcs_liberation)](https://github.com/dcs-liberation/dcs_liberation/issues)
+![GitHub stars](https://img.shields.io/github/stars/dcs-liberation/dcs_liberation?style=social)
 
 ## About DCS Liberation
 DCS Liberation is a [DCS World](https://www.digitalcombatsimulator.com/en/products/world/) turn based single-player or co-op dynamic campaign. 
@@ -19,21 +18,29 @@ It is an external program that generates full and complex DCS missions and manag
 
 ## Downloads
 
-Latest release is available here : https://github.com/Khopa/dcs_liberation/releases
+Latest release is available here : https://github.com/dcs-liberation/dcs_liberation/releases
 
-To download preview builds of the next version of DCS Liberation, see https://github.com/Khopa/dcs_liberation/wiki/Preview-builds.
+To download preview builds of the next version of DCS Liberation, see https://github.com/dcs-liberation/dcs_liberation/wiki/Preview-builds.
+
+## DCS bugs
+
+These DCS bugs prevent us from improving AI behavior. Please upvote them! (But please
+_don't_ spam them with comments):
+
+* [A2A and SEAD escorts don't escort](https://forums.eagle.ru/topic/251798-options-for-alternate-ai-escort-behavior/?tab=comments#comment-4668033)
+* [DEAD can't use mixed loadouts effectively](https://forums.eagle.ru/topic/271941-ai-rtbs-after-firing-decoys-despite-full-load-of-bombs/)
 
 ## Bugs and feature requests
 
-If you need to report a bug or want to suggest a new feature, you can do this on our [bug tracker](https://github.com/Khopa/dcs_liberation/issues). In either case, please use the search bar at the top of the page to see if it has already been reported. Note that you may need to remove the filter for open bugs if it's something we've recently fixed.
+If you need to report a bug or want to suggest a new feature, you can do this on our [bug tracker](https://github.com/dcs-liberation/dcs_liberation/issues). In either case, please use the search bar at the top of the page to see if it has already been reported. Note that you may need to remove the filter for open bugs if it's something we've recently fixed.
 
 ## Roadmap
 
-Our plans for future releases can be found on our [Projects page](https://github.com/Khopa/dcs_liberation/projects). Each planned release has a Project, and the page for that project has columns for to do, in progress, and done. Items in the Done column are in the [preview build](https://github.com/Khopa/dcs_liberation/wiki/Preview-builds) for that release. Items in the To do column are planned to be added to that release.
+Our plans for future releases can be found on our [Projects page](https://github.com/dcs-liberation/dcs_liberation/projects). Each planned release has a Project, and the page for that project has columns for to do, in progress, and done. Items in the Done column are in the [preview build](https://github.com/dcs-liberation/dcs_liberation/wiki/Preview-builds) for that release. Items in the To do column are planned to be added to that release.
 
 ## Resources
 
-Tutorials, contributors and developer's guides are available in the project's [Wiki](https://github.com/Khopa/dcs_liberation/wiki/)
+Tutorials, contributors and developer's guides are available in the project's [Wiki](https://github.com/dcs-liberation/dcs_liberation/wiki/)
 
 ## Special Thanks
 

changelog.md

@@ -1,3 +1,118 @@
+# 3.0.0
+
+Saves from 2.5 are not compatible with 3.0.
+
+## Features/Improvements
+
+* **[Campaign]** Ground units can now be transferred by road, airlift, and cargo ship. See https://github.com/dcs-liberation/dcs_liberation/wiki/Unit-Transfers for more information.
+* **[Campaign]** Ground units can no longer be sold. To move units to a new location, transfer them.
+* **[Campaign]** Ground units must now be recruited at a base with a factory and transferred to their destination. When buying units in the UI, the purchase will automatically be fulfilled at the closest factory, and a transfer will be created on the next turn.
+* **[Campaign]** Non-control point FOBs will no longer spawn.
+* **[Campaign]** Added squadrons and pilots. See https://github.com/dcs-liberation/dcs_liberation/wiki/Squadrons-and-pilots for more information.
+* **[Campaign]** Capturing a base now depopulates all of its attached objectives with units: air defenses, EWRs, ships, armor groups, etc. Buildings are captured.
+* **[Campaign]** Ammunition Depots determine how many ground units can be deployed on the frontline by a control point.
+* **[Campaign AI]** AI now considers Ju-88s for CAS, strike, and DEAD missions.
+* **[Campaign AI]** AI planned AEW&C missions will now be scheduled ASAP.
+* **[Campaign AI]** AI now considers the range to the SAM's threat zone rather than the range to the SAM itself when determining target priorities.
+* **[Campaign AI]** Auto purchase of ground units will now maintain unit composition instead of buying randomly. The unit composition is predefined.
+* **[Campaign AI]** Auto purchase will aim to purchase enough ground units to support the frontline, plus 30% reserve units.
+* **[Campaign AI]** Auto purchase will now adjust its air/ground balance to favor whichever is under-funded.
+* **[Flight Planner]** Desired mission length is now configurable (defaults to 60 minutes). A BARCAP will be planned every 30 minutes. Other packages will simply have their takeoffs spread out or compressed such that the last flight will take off around the mission end time.
+* **[Flight Planner]** Flight plans now include bullseye waypoints.
+* **[Flight Planner]** Differentiated SEAD and SEAD escort. SEAD is tasked with suppressing the package target, SEAD escort is tasked with protecting the package from all SAMs along its route.
+* **[Flight Planner]** Planned airspeed increased to 0.85 mach for supersonic airframes and 85% of max speed for subsonic.
+* **[Flight Planner]** Taxi time estimation for airfields increased from 5 minutes to 8 minutes.
+* **[Flight Planner]** Reduce expected error margin for flight plans from 10% to 5%.
+* **[Flight Planner]** SEAD flights are scheduled one minute ahead of the package's TOT so that they can suppress the site ahead of the strike.
+* **[Flight Planner]** Automatic ATO generation for the player's coalition can now be disabled in the settings.
+* **[Payloads]** AI flights for most air to ground mission types (CAS excluded) will have their guns emptied to prevent strafing fully armed and operational battle stations. Gun-reliant airframes like A-10s and warbirds will keep their bullets.
+* **[Kneeboard]** ATC table overflow alleviated by wrapping long airfield names and splitting ATC frequency and channel into separate rows.
+* **[UI]** Overhauled the map implementation. Now uses satellite imagery instead of low res map images. Display options have moved from the toolbar to panels in the map.
+* **[UI]** Campaigns generated for an older or newer version of the game will now be marked as incompatible. They can still be played, but bugs may be present.
+* **[UI]** DCS loadouts are now selectable in the loadout setup menu.
+* **[UI]** Added global aircraft inventory view under Air Wing dialog.
+* **[UI]** Base menu now shows information about ground unit deployment limits.
+* **[Modding]** Campaigns now choose locations for factories to spawn.
+* **[Modding]** Campaigns now choose locations for ammunition depots to spawn.
+* **[Modding]** Campaigns now use map structures as strike targets.
+* **[Modding]** Campaigns may now set *any* objective type to be a required spawn rather than random chance. Support for random objective generation was removed.
+* **[Modding]** Campaigns may now place AAA objectives.
+* **[Modding]** Can now install custom factions to <DCS saved games>/Liberation/Factions instead of the Liberation install directory.
+* **[Performance Settings]** Added a settings to lower the number of smoke effects generated on frontlines. Lowered default settings for frontline smoke generators, so less smoke should be generated by default.
+* **[Configuration]** Liberation preferences (DCS install and save game location) are now saved to `%LOCALAPPDATA%/DCSLiberation` to prevent needing to reconfigure each new install.
+* **[Skynet]** Updated to 2.1.0.
+
+## Fixes
+
+* **[Campaign AI]** Fix purchase of aircraft by priority (the faction's list was being used as the priority list rather than the game's).
+* **[Campaign AI]** Fixed bug causing AI to over-purchase cheap aircraft.
+* **[Campaign AI]** Auto planner will no longer attempt to plan missions for which the faction has no compatible aircraft.
+* **[Campaign AI]** Stop purchasing aircraft after the first unaffordable package to attempt to complete more packages rather than filling airfields with cheap escorts that will never be used.
+* **[Campaign]** Fixed bug where offshore strike locations were being used to spawn ship objectives.
+* **[Campaign]** EWR sites are now purchasable.
+* **[Flight Planner]** AI strike flight plans now include the correct target actions for building groups.
+* **[Flight Planner]** AI BAI/DEAD/SEAD flights now have tasks to attack all groups at the target location, not just the primary group (for multi-group SAM sites).
+* **[Flight Planner]** Fixed some contexts where damaged runways would be used. Destroying a carrier will no longer break the game.
+
+# 2.5.1
+
+## Features/Improvements
+
+* **[UI]** Engagement ranges are now displayed by default.
+* **[UI]** Engagement range display generalized to work for all patrolling flight plans (BARCAP, TARCAP, and CAS).
+* **[Flight Planner]** Front lines no longer project threat zones to avoid pushing BARCAPs back so much. TARCAPs will be forcibly planned but strike packages will not route around front lines even if it is reasonable to do so.
+
+## Fixes
+
+* **[Campaigns]** EWRs associated with a base will now only be generated near the base.
+* **[Flight Planner]** Fixed error when generating AEW&C flight plans in campaigns with no front lines.
+
+# 2.5.0
+
+Saves from 2.4 are not compatible with 2.5.
+
+## Features/Improvements
+
+* **[Engine]** DCS 2.7 Support
+* **[UI]** Improved FOB menu, added a custom banner, and do not display aircraft recruitment menu
+* **[Flight Planner]** Added AEW&C missions. (by siKruger)
+* **[Kneeboard]** Added dark kneeboard option (by GvonH)
+* **[Campaigns]** Multiple EWR sites may now be generated, and EWR sites may be generated outside bases (by SnappyComebacks)
+* **[Mission Generation]** Cloudy and rainy (but not thunderstorm) weather will use the cloud presets from DCS 2.7.
+* **[Plugins]** Added LotATC export plugin (by drsoran)
+* **[Plugins]** Added Splash Damage Plugin (by Wheelijoe)
+* **[Loadouts]** Replaced Litening with ATFLIR for all default F/A-18C loadouts.
+
+## Fixes
+
+* **[Flight Planner]** Front lines now project threat zones, so TARCAP/escorts will not be pruned for flights near the front. Packages may also route around the front line when practical.
+* **[Flight Planner]** Fixed error when planning BAI at SAMs with dead subgroups.
+* **[Flight Planner]** Mig-19 was not allowed for CAS roles fixed
+* **[Flight Planner]** Increased size of navigation planning area to avoid plannign failures with distant waypoints.
+* **[Flight Planner]** Fixed UI refresh when unchecking the "default loadout" box in the loadout editor.
+* **[Objective names]** Fixed typos in objective name : ARMADILLLO -> ARMADILLO (by SnappyComebacks)
+* **[Payloads]** F-86 Sabre was missing a custom payload
+* **[Payloads]** Added GAR-8 period restrictions (by Mustang-25)
+* **[Campaign]** Date now progresses.
+* **[Campaign]** Added game over message when a coalition runs out of functioning airbases.
+* **[Mission Generation]** Fixed "invalid face handle" error in kneeboard generation that occurred on some machines.
+
+## Regressions
+
+* **[Mod Support]** Stopped support for 2.5.5 Rafale Mode, and removed factions that were using it
+* **[Mod Support]** Su-57 mod support might be out of date
+
+# 2.4.3
+
+## Features/Improvements
+
+* **[New Game Wizard]** Added the possibility to setup custom start date
+
+## Fixes
+
+* **[Mods]** Updated C-130J mod data to version 6.4
+* **[Mods]** Updated F-22A mod to latest version
+
 # 2.4.2
 
 ## Features/Improvements

game/data/aaa_db.py

@@ -2,20 +2,21 @@ from dcs.vehicles import AirDefence
 
 AAA_UNITS = [
     AirDefence.SPAAA_Gepard,
-    AirDefence.SPAAA_ZSU_23_4_Shilka,
-    AirDefence.AAA_Vulcan_M163,
-    AirDefence.AAA_ZU_23_Closed,
+    AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish,
+    AirDefence.SPAAA_Vulcan_M163,
+    AirDefence.AAA_ZU_23_Closed_Emplacement,
     AirDefence.AAA_ZU_23_Emplacement,
-    AirDefence.AAA_ZU_23_on_Ural_375,
-    AirDefence.AAA_ZU_23_Insurgent_Closed,
-    AirDefence.AAA_ZU_23_Insurgent_on_Ural_375,
-    AirDefence.AAA_ZU_23_Insurgent,
+    AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375,
+    AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement,
+    AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375,
+    AirDefence.AAA_ZU_23_Insurgent_Emplacement,
     AirDefence.AAA_8_8cm_Flak_18,
-    AirDefence.AAA_Flak_38,
+    AirDefence.AAA_Flak_38_20mm,
     AirDefence.AAA_8_8cm_Flak_36,
     AirDefence.AAA_8_8cm_Flak_37,
-    AirDefence.AAA_Flak_Vierling_38,
-    AirDefence.AAA_Kdo_G_40,
+    AirDefence.AAA_Flak_Vierling_38_Quad_20mm,
+    AirDefence.AAA_SP_Kdo_G_40,
     AirDefence.AAA_8_8cm_Flak_41,
-    AirDefence.AAA_Bofors_40mm
-]
+    AirDefence.AAA_Bofors_40mm,
+    AirDefence.AAA_S_60_57mm,
+]

game/data/alic.py

@@ -0,0 +1,40 @@
+from dcs.unit import Unit
+from dcs.vehicles import AirDefence
+
+
+class AlicCodes:
+    CODES = {
+        AirDefence.EWR_1L13.id: 101,
+        AirDefence.EWR_55G6.id: 102,
+        AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR.id: 103,
+        AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR.id: 104,
+        AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR.id: 107,
+        AirDefence.SAM_SA_6_Kub_Straight_Flush_STR.id: 108,
+        AirDefence.MCC_SR_Sborka_Dog_Ear_SR.id: 109,
+        AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR.id: 110,
+        AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL.id: 115,
+        AirDefence.SAM_SA_8_Osa_Gecko_TEL.id: 117,
+        AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL.id: 118,
+        AirDefence.SAM_SA_15_Tor_Gauntlet.id: 119,
+        AirDefence.SAM_SA_19_Tunguska_Grison.id: 120,
+        AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish.id: 121,
+        AirDefence.SAM_P19_Flat_Face_SR__SA_2_3.id: 122,
+        AirDefence.SAM_SA_3_S_125_Low_Blow_TR.id: 123,
+        AirDefence.SAM_Rapier_Blindfire_TR.id: 124,
+        AirDefence.SAM_Rapier_LN.id: 125,
+        AirDefence.SAM_SA_2_S_75_Fan_Song_TR.id: 126,
+        AirDefence.HQ_7_Self_Propelled_LN.id: 127,
+        AirDefence.HQ_7_Self_Propelled_STR.id: 128,
+        AirDefence.SAM_Roland_ADS.id: 201,
+        AirDefence.SAM_Patriot_STR.id: 202,
+        AirDefence.SAM_Hawk_SR__AN_MPQ_50.id: 203,
+        AirDefence.SAM_Hawk_TR__AN_MPQ_46.id: 204,
+        AirDefence.SAM_Roland_EWR.id: 205,
+        AirDefence.SAM_Hawk_CWAR_AN_MPQ_55.id: 206,
+        AirDefence.SPAAA_Gepard.id: 207,
+        AirDefence.SPAAA_Vulcan_M163.id: 208,
+    }
+
+    @classmethod
+    def code_for(cls, unit: Unit) -> int:
+        return cls.CODES[unit.type]

game/data/building_data.py

@@ -1,17 +1,63 @@
 import inspect
 import dcs
 
-DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick']
+DEFAULT_AVAILABLE_BUILDINGS = [
+    "fuel",
+    "comms",
+    "oil",
+    "ware",
+    "farp",
+    "power",
+    "derrick",
+]
 
-WW2_FREE = ['fuel', 'factory', 'ware', 'fob']
-WW2_GERMANY_BUILDINGS = ['fuel', 'factory', 'ww2bunker', 'ww2bunker', 'ww2bunker', 'allycamp', 'allycamp', 'fob']
-WW2_ALLIES_BUILDINGS = ['fuel', 'factory', 'allycamp', 'allycamp', 'allycamp', 'allycamp', 'allycamp', 'fob']
+WW2_FREE = ["fuel", "ware"]
+WW2_GERMANY_BUILDINGS = [
+    "fuel",
+    "ww2bunker",
+    "ww2bunker",
+    "ww2bunker",
+    "allycamp",
+    "allycamp",
+]
+WW2_ALLIES_BUILDINGS = [
+    "fuel",
+    "allycamp",
+    "allycamp",
+    "allycamp",
+    "allycamp",
+    "allycamp",
+]
 
-FORTIFICATION_BUILDINGS = ['Siegfried Line', 'Concertina wire', 'Concertina Wire', 'Czech hedgehogs 1', 'Czech hedgehogs 2',
-                           'Dragonteeth 1', 'Dragonteeth 2', 'Dragonteeth 3', 'Dragonteeth 4', 'Dragonteeth 5',
-                           'Haystack 1', 'Haystack 2', 'Haystack 3', 'Haystack 4', 'Hemmkurvenvenhindernis',
-                           'Log posts 1', 'Log posts 2', 'Log posts 3', 'Log ramps 1', 'Log ramps 2', 'Log ramps 3',
-                           'Belgian Gate', 'Container white']
+FORTIFICATION_BUILDINGS = [
+    "Siegfried Line",
+    "Concertina wire",
+    "Concertina Wire",
+    "Czech hedgehogs 1",
+    "Czech hedgehogs 2",
+    "Dragonteeth 1",
+    "Dragonteeth 2",
+    "Dragonteeth 3",
+    "Dragonteeth 4",
+    "Dragonteeth 5",
+    "Haystack 1",
+    "Haystack 2",
+    "Haystack 3",
+    "Haystack 4",
+    "Hemmkurvenvenhindernis",
+    "Log posts 1",
+    "Log posts 2",
+    "Log posts 3",
+    "Log ramps 1",
+    "Log ramps 2",
+    "Log ramps 3",
+    "Belgian Gate",
+    "Container white",
+]
 
-FORTIFICATION_UNITS = [c for c in vars(dcs.vehicles.Fortification).values() if inspect.isclass(c)]
-FORTIFICATION_UNITS_ID = [c.id for c in vars(dcs.vehicles.Fortification).values() if inspect.isclass(c)]
+FORTIFICATION_UNITS = [
+    c for c in vars(dcs.vehicles.Fortification).values() if inspect.isclass(c)
+]
+FORTIFICATION_UNITS_ID = [
+    c.id for c in vars(dcs.vehicles.Fortification).values() if inspect.isclass(c)
+]

game/data/cap_capabilities_db.py

@@ -16,7 +16,7 @@ from dcs.planes import (
     P_51D,
     P_51D_30_NA,
     SpitfireLFMkIX,
-    SpitfireLFMkIXCW
+    SpitfireLFMkIXCW,
 )
 
 from pydcs_extensions.a4ec.a4ec import A_4E_C
@@ -26,7 +26,6 @@ This list contains the aircraft that do not use the guns as the last resort weap
 They'll RTB when they don't have gun ammo left
 """
 GUNFIGHTERS = [
-
     # Cold War
     MiG_15bis,
     MiG_19P,
@@ -34,11 +33,9 @@ GUNFIGHTERS = [
     F_86F_Sabre,
     A_4E_C,
     F_5E_3,
-
     # Trainers
     C_101CC,
     L_39ZA,
-
     # WW2
     P_51D_30_NA,
     P_51D,
@@ -51,5 +48,4 @@ GUNFIGHTERS = [
     FW_190D9,
     FW_190A8,
     I_16,
-
-]
+]

game/data/doctrine.py

@@ -1,7 +1,20 @@
 from dataclasses import dataclass
 from datetime import timedelta
+from dcs.task import Reconnaissance
 
 from game.utils import Distance, feet, nautical_miles
+from game.data.groundunitclass import GroundUnitClass
+
+
+@dataclass
+class GroundUnitProcurementRatios:
+    ratios: dict[GroundUnitClass, float]
+
+    def for_unit_class(self, unit_class: GroundUnitClass) -> float:
+        try:
+            return self.ratios[unit_class] / sum(self.ratios.values())
+        except KeyError:
+            return 0.0
 
 
 @dataclass(frozen=True)
@@ -50,6 +63,8 @@ class Doctrine:
 
     sweep_distance: Distance
 
+    ground_unit_procurement_ratios: GroundUnitProcurementRatios
+
 
 MODERN_DOCTRINE = Doctrine(
     cap=True,
@@ -76,6 +91,17 @@ MODERN_DOCTRINE = Doctrine(
     cap_engagement_range=nautical_miles(50),
     cas_duration=timedelta(minutes=30),
     sweep_distance=nautical_miles(60),
+    ground_unit_procurement_ratios=GroundUnitProcurementRatios(
+        {
+            GroundUnitClass.Tank: 3,
+            GroundUnitClass.Atgm: 2,
+            GroundUnitClass.Apc: 2,
+            GroundUnitClass.Ifv: 3,
+            GroundUnitClass.Artillery: 1,
+            GroundUnitClass.Shorads: 2,
+            GroundUnitClass.Recon: 1,
+        }
+    ),
 )
 
 COLDWAR_DOCTRINE = Doctrine(
@@ -103,6 +129,17 @@ COLDWAR_DOCTRINE = Doctrine(
     cap_engagement_range=nautical_miles(35),
     cas_duration=timedelta(minutes=30),
     sweep_distance=nautical_miles(40),
+    ground_unit_procurement_ratios=GroundUnitProcurementRatios(
+        {
+            GroundUnitClass.Tank: 4,
+            GroundUnitClass.Atgm: 2,
+            GroundUnitClass.Apc: 3,
+            GroundUnitClass.Ifv: 2,
+            GroundUnitClass.Artillery: 1,
+            GroundUnitClass.Shorads: 2,
+            GroundUnitClass.Recon: 1,
+        }
+    ),
 )
 
 WWII_DOCTRINE = Doctrine(
@@ -130,4 +167,14 @@ WWII_DOCTRINE = Doctrine(
     cap_engagement_range=nautical_miles(20),
     cas_duration=timedelta(minutes=30),
     sweep_distance=nautical_miles(10),
+    ground_unit_procurement_ratios=GroundUnitProcurementRatios(
+        {
+            GroundUnitClass.Tank: 3,
+            GroundUnitClass.Atgm: 3,
+            GroundUnitClass.Apc: 3,
+            GroundUnitClass.Artillery: 1,
+            GroundUnitClass.Shorads: 3,
+            GroundUnitClass.Recon: 1,
+        }
+    ),
 )

game/data/groundunitclass.py

@@ -0,0 +1,239 @@
+from enum import unique, Enum
+from typing import Type
+
+from dcs.vehicles import AirDefence, Infantry, Unarmed, Artillery, Armor
+from dcs.unittype import VehicleType
+
+from pydcs_extensions.frenchpack import frenchpack
+
+
+@unique
+class GroundUnitClass(Enum):
+    Tank = (
+        "Tank",
+        (
+            Armor.MBT_T_55,
+            Armor.MBT_T_72B,
+            Armor.MBT_T_72B3,
+            Armor.MBT_T_80U,
+            Armor.MBT_T_90,
+            Armor.MBT_Leopard_2A4,
+            Armor.MBT_Leopard_2A4_Trs,
+            Armor.MBT_Leopard_2A5,
+            Armor.MBT_Leopard_2A6M,
+            Armor.MBT_Leopard_1A3,
+            Armor.MBT_Leclerc,
+            Armor.MBT_Challenger_II,
+            Armor.MBT_Chieftain_Mk_3,
+            Armor.MBT_M1A2_Abrams,
+            Armor.MBT_M60A3_Patton,
+            Armor.MBT_Merkava_IV,
+            Armor.ZTZ_96B,
+            # WW2
+            # Axis
+            Armor.Tk_PzIV_H,
+            Armor.SPG_Sturmpanzer_IV_Brummbar,
+            Armor.MT_Pz_Kpfw_V_Panther_Ausf_G,
+            Armor.HT_Pz_Kpfw_VI_Tiger_I,
+            Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II,
+            # Allies
+            Armor.Tk_M4_Sherman,
+            Armor.CT_Centaur_IV,
+            Armor.CT_Cromwell_IV,
+            Armor.HIT_Churchill_VII,
+            # Mods
+            frenchpack.DIM__TOYOTA_BLUE,
+            frenchpack.DIM__TOYOTA_GREEN,
+            frenchpack.DIM__TOYOTA_DESERT,
+            frenchpack.DIM__KAMIKAZE,
+            frenchpack.AMX_30B2,
+            frenchpack.Leclerc_Serie_XXI,
+        ),
+    )
+
+    Atgm = (
+        "ATGM",
+        (
+            Armor.ATGM_HMMWV,
+            Armor.ATGM_VAB_Mephisto,
+            Armor.ATGM_Stryker,
+            Armor.IFV_BMP_2,
+            # WW2 (Tank Destroyers)
+            # Axxis
+            Armor.SPG_StuG_III_Ausf__G,
+            Armor.SPG_StuG_IV,
+            Armor.SPG_Jagdpanzer_IV,
+            Armor.SPG_Jagdpanther_G1,
+            Armor.SPG_Sd_Kfz_184_Elefant,
+            # Allies
+            Armor.SPG_M10_GMC,
+            Armor.MT_M4A4_Sherman_Firefly,
+            # Mods
+            frenchpack.VBAE_CRAB_MMP,
+            frenchpack.VAB_MEPHISTO,
+            frenchpack.TRM_2000_PAMELA,
+        ),
+    )
+
+    Ifv = (
+        "IFV",
+        (
+            Armor.IFV_BMP_3,
+            Armor.IFV_BMP_2,
+            Armor.IFV_BMP_1,
+            Armor.IFV_Marder,
+            Armor.IFV_Warrior,
+            Armor.SPG_Stryker_MGS,
+            Armor.IFV_M2A2_Bradley,
+            Armor.IFV_BMD_1,
+            Armor.ZBD_04A,
+            # Mods
+            frenchpack.VBAE_CRAB,
+            frenchpack.VAB_T20_13,
+        ),
+    )
+
+    Apc = (
+        "APC",
+        (
+            Armor.IFV_M1126_Stryker_ICV,
+            Armor.APC_M113,
+            Armor.APC_BTR_80,
+            Armor.IFV_BTR_82A,
+            Armor.APC_MTLB,
+            Armor.APC_AAV_7_Amphibious,
+            Armor.APC_TPz_Fuchs,
+            Armor.APC_BTR_RD,
+            # WW2
+            Armor.APC_M2A1_Halftrack,
+            Armor.APC_Sd_Kfz_251_Halftrack,
+            # Mods
+            frenchpack.VAB__50,
+            frenchpack.VBL__50,
+            frenchpack.VBL_AANF1,
+        ),
+    )
+
+    Artillery = (
+        "Artillery",
+        (
+            Artillery.Grad_MRL_FDDM__FC,
+            Artillery.MLRS_9A52_Smerch_HE_300mm,
+            Artillery.SPH_2S1_Gvozdika_122mm,
+            Artillery.SPH_2S3_Akatsia_152mm,
+            Artillery.MLRS_BM_21_Grad_122mm,
+            Artillery.MLRS_9K57_Uragan_BM_27_220mm,
+            Artillery.SPH_M109_Paladin_155mm,
+            Artillery.MLRS_M270_227mm,
+            Artillery.SPM_2S9_Nona_120mm_M,
+            Artillery.SPH_Dana_vz77_152mm,
+            Artillery.SPH_T155_Firtina_155mm,
+            Artillery.PLZ_05,
+            Artillery.SPH_2S19_Msta_152mm,
+            Artillery.MLRS_9A52_Smerch_CM_300mm,
+            # WW2
+            Artillery.SPG_M12_GMC_155mm,
+        ),
+    )
+
+    Logistics = (
+        "Logistics",
+        (
+            Unarmed.Carrier_M30_Cargo,
+            Unarmed.Truck_M818_6x6,
+            Unarmed.Truck_KAMAZ_43101,
+            Unarmed.Truck_Ural_375,
+            Unarmed.Truck_GAZ_66,
+            Unarmed.Truck_GAZ_3307,
+            Unarmed.Truck_GAZ_3308,
+            Unarmed.Truck_Ural_4320_31_Arm_d,
+            Unarmed.Truck_Ural_4320T,
+            Unarmed.Truck_Opel_Blitz,
+            Unarmed.LUV_Kubelwagen_82,
+            Unarmed.Carrier_Sd_Kfz_7_Tractor,
+            Unarmed.LUV_Kettenrad,
+            Unarmed.Car_Willys_Jeep,
+            Unarmed.LUV_Land_Rover_109,
+            Unarmed.Truck_Land_Rover_101_FC,
+            # Mods
+            frenchpack.VBL,
+            frenchpack.VAB,
+        ),
+    )
+
+    Recon = (
+        "Recon",
+        (
+            Armor.Scout_HMMWV,
+            Armor.Scout_Cobra,
+            Armor.LT_PT_76,
+            Armor.IFV_LAV_25,
+            Armor.Scout_BRDM_2,
+            # WW2
+            Armor.LT_Mk_VII_Tetrarch,
+            Armor.IFV_Sd_Kfz_234_2_Puma,
+            Armor.Car_M8_Greyhound_Armored,
+            Armor.Car_Daimler_Armored,
+            # Mods
+            frenchpack.ERC_90,
+            frenchpack.AMX_10RCR,
+            frenchpack.AMX_10RCR_SEPAR,
+        ),
+    )
+
+    Infantry = (
+        "Infantry",
+        (
+            Infantry.Insurgent_AK_74,
+            Infantry.Infantry_AK_74,
+            Infantry.Infantry_M1_Garand,
+            Infantry.Infantry_Mauser_98,
+            Infantry.Infantry_SMLE_No_4_Mk_1,
+            Infantry.Infantry_M4_Georgia,
+            Infantry.Infantry_AK_74_Rus,
+            Infantry.Paratrooper_AKS,
+            Infantry.Paratrooper_RPG_16,
+            Infantry.Infantry_M249,
+            Infantry.Infantry_M4,
+            Infantry.Infantry_RPG,
+        ),
+    )
+
+    Shorads = (
+        "SHORADS",
+        (
+            AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375,
+            AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375,
+            AirDefence.SPAAA_ZSU_57_2,
+            AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish,
+            AirDefence.SAM_SA_8_Osa_Gecko_TEL,
+            AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL,
+            AirDefence.SAM_SA_13_Strela_10M3_Gopher_TEL,
+            AirDefence.SAM_SA_15_Tor_Gauntlet,
+            AirDefence.SAM_SA_19_Tunguska_Grison,
+            AirDefence.SPAAA_Gepard,
+            AirDefence.SPAAA_Vulcan_M163,
+            AirDefence.SAM_Linebacker___Bradley_M6,
+            AirDefence.SAM_Chaparral_M48,
+            AirDefence.SAM_Avenger__Stinger,
+            AirDefence.SAM_Roland_ADS,
+            AirDefence.HQ_7_Self_Propelled_LN,
+            AirDefence.AAA_8_8cm_Flak_18,
+            AirDefence.AAA_8_8cm_Flak_36,
+            AirDefence.AAA_8_8cm_Flak_37,
+            AirDefence.AAA_8_8cm_Flak_41,
+            AirDefence.AAA_Bofors_40mm,
+            AirDefence.AAA_S_60_57mm,
+            AirDefence.AAA_M1_37mm,
+            AirDefence.AAA_QF_3_7,
+        ),
+    )
+
+    def __init__(
+        self, class_name: str, unit_list: tuple[Type[VehicleType], ...]
+    ) -> None:
+        self.class_name = class_name
+        self.unit_list = unit_list
+
+    def __contains__(self, unit_type: Type[VehicleType]) -> bool:
+        return unit_type in self.unit_list

game/data/radar_db.py

@@ -1,6 +1,6 @@
 from dcs.ships import (
-    CGN_1144_2_Pyotr_Velikiy,
-    CG_1164_Moskva,
+    Battlecruiser_1144_2_Pyotr_Velikiy,
+    Cruiser_1164_Moskva,
     CVN_70_Carl_Vinson,
     CVN_71_Theodore_Roosevelt,
     CVN_72_Abraham_Lincoln,
@@ -8,67 +8,101 @@ from dcs.ships import (
     CVN_74_John_C__Stennis,
     CV_1143_5_Admiral_Kuznetsov,
     CV_1143_5_Admiral_Kuznetsov_2017,
-    FFG_11540_Neustrashimy,
-    FFL_1124_4_Grisha,
-    FF_1135M_Rezky,
-    FSG_1241_1MP_Molniya,
+    Frigate_11540_Neustrashimy,
+    Corvette_1124_4_Grisha,
+    Frigate_1135M_Rezky,
+    Corvette_1241_1_Molniya,
     LHA_1_Tarawa,
-    Oliver_Hazzard_Perry_class,
-    Ticonderoga_class,
+    FFG_Oliver_Hazzard_Perry,
+    CG_Ticonderoga,
     Type_052B_Destroyer,
     Type_052C_Destroyer,
     Type_054A_Frigate,
-    USS_Arleigh_Burke_IIa,
+    DDG_Arleigh_Burke_IIa,
 )
 from dcs.vehicles import AirDefence
 
-UNITS_WITH_RADAR = [
+TELARS = {
+    AirDefence.SAM_SA_19_Tunguska_Grison,
+    AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL,
+    AirDefence.SAM_SA_8_Osa_Gecko_TEL,
+    AirDefence.SAM_SA_15_Tor_Gauntlet,
+    AirDefence.SAM_Roland_ADS,
+}
 
-    # Radars
-    AirDefence.SAM_SA_15_Tor_9A331,
-    AirDefence.SAM_SA_11_Buk_CC_9S470M1,
-    AirDefence.SAM_Patriot_AMG_AN_MRC_137,
-    AirDefence.SAM_Patriot_ECS_AN_MSQ_104,
-    AirDefence.SPAAA_Gepard,
-    AirDefence.AAA_Vulcan_M163,
-    AirDefence.SPAAA_ZSU_23_4_Shilka,
-    AirDefence.EWR_1L13,
-    AirDefence.SAM_SA_6_Kub_STR_9S91,
-    AirDefence.SAM_SA_10_S_300PS_TR_30N6,
-    AirDefence.SAM_SA_10_S_300PS_SR_5N66M,
-    AirDefence.EWR_55G6,
-    AirDefence.SAM_SA_10_S_300PS_SR_64H6E,
-    AirDefence.SAM_SA_11_Buk_SR_9S18M1,
-    AirDefence.CP_9S80M1_Sborka,
-    AirDefence.SAM_Hawk_TR_AN_MPQ_46,
-    AirDefence.SAM_Hawk_SR_AN_MPQ_50,
-    AirDefence.SAM_Patriot_STR_AN_MPQ_53,
-    AirDefence.SAM_Hawk_CWAR_AN_MPQ_55,
-    AirDefence.SAM_SR_P_19,
-    AirDefence.SAM_Roland_EWR,
-    AirDefence.SAM_SA_3_S_125_TR_SNR,
-    AirDefence.SAM_SA_2_TR_SNR_75_Fan_Song,
+TRACK_RADARS = {
+    AirDefence.SAM_SA_6_Kub_Straight_Flush_STR,
+    AirDefence.SAM_SA_3_S_125_Low_Blow_TR,
+    AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR,
+    AirDefence.SAM_Hawk_TR__AN_MPQ_46,
+    AirDefence.SAM_Patriot_STR,
+    AirDefence.SAM_SA_2_S_75_Fan_Song_TR,
+    AirDefence.SAM_Rapier_Blindfire_TR,
     AirDefence.HQ_7_Self_Propelled_STR,
+}
 
+LAUNCHER_TRACKER_PAIRS = {
+    AirDefence.SAM_SA_6_Kub_Gainful_TEL: AirDefence.SAM_SA_6_Kub_Straight_Flush_STR,
+    AirDefence.SAM_SA_3_S_125_Goa_LN: AirDefence.SAM_SA_3_S_125_Low_Blow_TR,
+    AirDefence.SAM_SA_10_S_300_Grumble_TEL_D: AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR,
+    AirDefence.SAM_SA_10_S_300_Grumble_TEL_C: AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR,
+    AirDefence.SAM_Hawk_LN_M192: AirDefence.SAM_Hawk_TR__AN_MPQ_46,
+    AirDefence.SAM_Patriot_LN: AirDefence.SAM_Patriot_STR,
+    AirDefence.SAM_SA_2_S_75_Guideline_LN: AirDefence.SAM_SA_2_S_75_Fan_Song_TR,
+    AirDefence.SAM_Rapier_LN: AirDefence.SAM_Rapier_Blindfire_TR,
+    AirDefence.HQ_7_Self_Propelled_LN: AirDefence.HQ_7_Self_Propelled_STR,
+}
+
+UNITS_WITH_RADAR = {
+    # Radars
+    AirDefence.SAM_SA_19_Tunguska_Grison,
+    AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL,
+    AirDefence.SAM_SA_8_Osa_Gecko_TEL,
+    AirDefence.SAM_SA_15_Tor_Gauntlet,
+    AirDefence.SPAAA_Gepard,
+    AirDefence.SPAAA_Vulcan_M163,
+    AirDefence.SAM_Roland_ADS,
+    AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish,
+    AirDefence.EWR_1L13,
+    AirDefence.SAM_SA_6_Kub_Straight_Flush_STR,
+    AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR,
+    AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR,
+    AirDefence.EWR_55G6,
+    AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR,
+    AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR,
+    AirDefence.MCC_SR_Sborka_Dog_Ear_SR,
+    AirDefence.SAM_Hawk_TR__AN_MPQ_46,
+    AirDefence.SAM_Hawk_SR__AN_MPQ_50,
+    AirDefence.SAM_Patriot_STR,
+    AirDefence.SAM_Hawk_CWAR_AN_MPQ_55,
+    AirDefence.SAM_P19_Flat_Face_SR__SA_2_3,
+    AirDefence.SAM_Roland_EWR,
+    AirDefence.SAM_SA_3_S_125_Low_Blow_TR,
+    AirDefence.SAM_SA_2_S_75_Fan_Song_TR,
+    AirDefence.SAM_Rapier_Blindfire_TR,
+    AirDefence.HQ_7_Self_Propelled_LN,
+    AirDefence.HQ_7_Self_Propelled_STR,
+    AirDefence.EWR_FuMG_401_Freya_LZ,
+    AirDefence.EWR_FuSe_65_Würzburg_Riese,
     # Ships
     CVN_70_Carl_Vinson,
-    Oliver_Hazzard_Perry_class,
-    Ticonderoga_class,
-    FFL_1124_4_Grisha,
+    FFG_Oliver_Hazzard_Perry,
+    CG_Ticonderoga,
+    Corvette_1124_4_Grisha,
     CV_1143_5_Admiral_Kuznetsov,
-    FSG_1241_1MP_Molniya,
-    CG_1164_Moskva,
-    FFG_11540_Neustrashimy,
-    CGN_1144_2_Pyotr_Velikiy,
-    FF_1135M_Rezky,
+    Corvette_1241_1_Molniya,
+    Cruiser_1164_Moskva,
+    Frigate_11540_Neustrashimy,
+    Battlecruiser_1144_2_Pyotr_Velikiy,
+    Frigate_1135M_Rezky,
     CV_1143_5_Admiral_Kuznetsov_2017,
     CVN_74_John_C__Stennis,
     CVN_71_Theodore_Roosevelt,
     CVN_72_Abraham_Lincoln,
     CVN_73_George_Washington,
-    USS_Arleigh_Burke_IIa,
+    DDG_Arleigh_Burke_IIa,
     LHA_1_Tarawa,
     Type_052B_Destroyer,
     Type_054A_Frigate,
-    Type_052C_Destroyer
-]
+    Type_052C_Destroyer,
+}

game/debriefing.py

@@ -22,7 +22,16 @@ from dcs.unittype import FlyingType, UnitType
 
 from game import db
 from game.theater import Airfield, ControlPoint
-from game.unitmap import Building, FrontLineUnit, GroundObjectUnit, UnitMap
+from game.transfers import CargoShip
+from game.unitmap import (
+    AirliftUnits,
+    Building,
+    ConvoyUnit,
+    FrontLineUnit,
+    GroundObjectUnit,
+    UnitMap,
+    FlyingUnit,
+)
 from gen.flights.flight import Flight
 
 if TYPE_CHECKING:
@@ -33,24 +42,24 @@ DEBRIEFING_LOG_EXTENSION = "log"
 
 @dataclass(frozen=True)
 class AirLosses:
-    player: List[Flight]
-    enemy: List[Flight]
+    player: List[FlyingUnit]
+    enemy: List[FlyingUnit]
 
     @property
-    def losses(self) -> Iterator[Flight]:
+    def losses(self) -> Iterator[FlyingUnit]:
         return itertools.chain(self.player, self.enemy)
 
     def by_type(self, player: bool) -> Dict[Type[FlyingType], int]:
         losses_by_type: Dict[Type[FlyingType], int] = defaultdict(int)
         losses = self.player if player else self.enemy
         for loss in losses:
-            losses_by_type[loss.unit_type] += 1
+            losses_by_type[loss.flight.unit_type] += 1
         return losses_by_type
 
     def surviving_flight_members(self, flight: Flight) -> int:
         losses = 0
         for loss in self.losses:
-            if loss == flight:
+            if loss.flight == flight:
                 losses += 1
         return flight.count - losses
 
@@ -60,6 +69,15 @@ class GroundLosses:
     player_front_line: List[FrontLineUnit] = field(default_factory=list)
     enemy_front_line: List[FrontLineUnit] = field(default_factory=list)
 
+    player_convoy: List[ConvoyUnit] = field(default_factory=list)
+    enemy_convoy: List[ConvoyUnit] = field(default_factory=list)
+
+    player_cargo_ships: List[CargoShip] = field(default_factory=list)
+    enemy_cargo_ships: List[CargoShip] = field(default_factory=list)
+
+    player_airlifts: List[AirliftUnits] = field(default_factory=list)
+    enemy_airlifts: List[AirliftUnits] = field(default_factory=list)
+
     player_ground_objects: List[GroundObjectUnit] = field(default_factory=list)
     enemy_ground_objects: List[GroundObjectUnit] = field(default_factory=list)
 
@@ -70,6 +88,12 @@ class GroundLosses:
     enemy_airfields: List[Airfield] = field(default_factory=list)
 
 
+@dataclass(frozen=True)
+class BaseCaptureEvent:
+    control_point: ControlPoint
+    captured_by_player: bool
+
+
 @dataclass(frozen=True)
 class StateData:
     #: True if the mission ended. If False, the mission exited abnormally.
@@ -94,16 +118,21 @@ class StateData:
             killed_aircraft=data["killed_aircrafts"],
             # Airfields emit a new "dead" event every time a bomb is dropped on
             # them when they've already dead. Dedup.
-            killed_ground_units=list(set(data["killed_ground_units"])),
+            #
+            # Also normalize dead map objects (which are ints) to strings. The unit map
+            # only stores strings.
+            killed_ground_units=list({str(u) for u in data["killed_ground_units"]}),
             destroyed_statics=data["destroyed_objects_positions"],
-            base_capture_events=data["base_capture_events"]
+            base_capture_events=data["base_capture_events"],
         )
 
 
 class Debriefing:
-    def __init__(self, state_data: Dict[str, Any], game: Game,
-                 unit_map: UnitMap) -> None:
+    def __init__(
+        self, state_data: Dict[str, Any], game: Game, unit_map: UnitMap
+    ) -> None:
         self.state_data = StateData.from_json(state_data)
+        self.game = game
         self.unit_map = unit_map
 
         self.player_country = game.player_country
@@ -113,12 +142,28 @@ class Debriefing:
 
         self.air_losses = self.dead_aircraft()
         self.ground_losses = self.dead_ground_units()
+        self.base_captures = self.base_capture_events()
 
     @property
     def front_line_losses(self) -> Iterator[FrontLineUnit]:
         yield from self.ground_losses.player_front_line
         yield from self.ground_losses.enemy_front_line
 
+    @property
+    def convoy_losses(self) -> Iterator[ConvoyUnit]:
+        yield from self.ground_losses.player_convoy
+        yield from self.ground_losses.enemy_convoy
+
+    @property
+    def cargo_ship_losses(self) -> Iterator[CargoShip]:
+        yield from self.ground_losses.player_cargo_ships
+        yield from self.ground_losses.enemy_cargo_ships
+
+    @property
+    def airlift_losses(self) -> Iterator[AirliftUnits]:
+        yield from self.ground_losses.player_airlifts
+        yield from self.ground_losses.enemy_airlifts
+
     @property
     def ground_object_losses(self) -> Iterator[GroundObjectUnit]:
         yield from self.ground_losses.player_ground_objects
@@ -135,12 +180,9 @@ class Debriefing:
         yield from self.ground_losses.enemy_airfields
 
     def casualty_count(self, control_point: ControlPoint) -> int:
-        return len(
-            [x for x in self.front_line_losses if x.origin == control_point]
-        )
+        return len([x for x in self.front_line_losses if x.origin == control_point])
 
-    def front_line_losses_by_type(
-            self, player: bool) -> Dict[Type[UnitType], int]:
+    def front_line_losses_by_type(self, player: bool) -> Dict[Type[UnitType], int]:
         losses_by_type: Dict[Type[UnitType], int] = defaultdict(int)
         if player:
             losses = self.ground_losses.player_front_line
@@ -150,6 +192,38 @@ class Debriefing:
             losses_by_type[loss.unit_type] += 1
         return losses_by_type
 
+    def convoy_losses_by_type(self, player: bool) -> Dict[Type[UnitType], int]:
+        losses_by_type: Dict[Type[UnitType], int] = defaultdict(int)
+        if player:
+            losses = self.ground_losses.player_convoy
+        else:
+            losses = self.ground_losses.enemy_convoy
+        for loss in losses:
+            losses_by_type[loss.unit_type] += 1
+        return losses_by_type
+
+    def cargo_ship_losses_by_type(self, player: bool) -> Dict[Type[UnitType], int]:
+        losses_by_type: Dict[Type[UnitType], int] = defaultdict(int)
+        if player:
+            ships = self.ground_losses.player_cargo_ships
+        else:
+            ships = self.ground_losses.enemy_cargo_ships
+        for ship in ships:
+            for unit_type, count in ship.units.items():
+                losses_by_type[unit_type] += count
+        return losses_by_type
+
+    def airlift_losses_by_type(self, player: bool) -> Dict[Type[UnitType], int]:
+        losses_by_type: Dict[Type[UnitType], int] = defaultdict(int)
+        if player:
+            losses = self.ground_losses.player_airlifts
+        else:
+            losses = self.ground_losses.enemy_airlifts
+        for loss in losses:
+            for unit_type in loss.cargo:
+                losses_by_type[unit_type] += 1
+        return losses_by_type
+
     def building_losses_by_type(self, player: bool) -> Dict[str, int]:
         losses_by_type: Dict[str, int] = defaultdict(int)
         if player:
@@ -167,14 +241,14 @@ class Debriefing:
         player_losses = []
         enemy_losses = []
         for unit_name in self.state_data.killed_aircraft:
-            flight = self.unit_map.flight(unit_name)
-            if flight is None:
+            aircraft = self.unit_map.flight(unit_name)
+            if aircraft is None:
                 logging.error(f"Could not find Flight matching {unit_name}")
                 continue
-            if flight.departure.captured:
-                player_losses.append(flight)
+            if aircraft.flight.departure.captured:
+                player_losses.append(aircraft)
             else:
-                enemy_losses.append(flight)
+                enemy_losses.append(aircraft)
         return AirLosses(player_losses, enemy_losses)
 
     def dead_ground_units(self) -> GroundLosses:
@@ -188,6 +262,22 @@ class Debriefing:
                     losses.enemy_front_line.append(front_line_unit)
                 continue
 
+            convoy_unit = self.unit_map.convoy_unit(unit_name)
+            if convoy_unit is not None:
+                if convoy_unit.convoy.player_owned:
+                    losses.player_convoy.append(convoy_unit)
+                else:
+                    losses.enemy_convoy.append(convoy_unit)
+                continue
+
+            cargo_ship = self.unit_map.cargo_ship(unit_name)
+            if cargo_ship is not None:
+                if cargo_ship.player_owned:
+                    losses.player_cargo_ships.append(cargo_ship)
+                else:
+                    losses.enemy_cargo_ships.append(cargo_ship)
+                continue
+
             ground_object_unit = self.unit_map.ground_object_unit(unit_name)
             if ground_object_unit is not None:
                 if ground_object_unit.ground_object.control_point.captured:
@@ -221,28 +311,60 @@ class Debriefing:
             # deaths, so we expect to see quite a few unclaimed dead ground
             # units. We should start tracking those and covert this to a
             # warning.
-            logging.debug(f"Death of untracked ground unit {unit_name} will "
-                          "have no effect. This may be normal behavior.")
+            logging.debug(
+                f"Death of untracked ground unit {unit_name} will "
+                "have no effect. This may be normal behavior."
+            )
+
+        for unit_name in self.state_data.killed_aircraft:
+            airlift_unit = self.unit_map.airlift_unit(unit_name)
+            if airlift_unit is not None:
+                if airlift_unit.transfer.player:
+                    losses.player_airlifts.append(airlift_unit)
+                else:
+                    losses.enemy_airlifts.append(airlift_unit)
+                continue
 
         return losses
 
-    @property
-    def base_capture_events(self):
+    def base_capture_events(self) -> List[BaseCaptureEvent]:
         """Keeps only the last instance of a base capture event for each base ID."""
-        reversed_captures = list(reversed(self.state_data.base_capture_events))
-        last_base_cap_indexes = []
-        for idx, base in enumerate(i.split("||")[0] for i in reversed_captures):
-            if base not in [x[1] for x in last_base_cap_indexes]:
-                last_base_cap_indexes.append((idx, base))
-        return [reversed_captures[idx[0]] for idx in last_base_cap_indexes]        
+        blue_coalition_id = 2
+        seen = set()
+        captures = []
+        for capture in reversed(self.state_data.base_capture_events):
+            cp_id_str, new_owner_id_str, _name = capture.split("||")
+            cp_id = int(cp_id_str)
+
+            # Only the most recent capture event matters.
+            if cp_id in seen:
+                continue
+            seen.add(cp_id)
+
+            try:
+                control_point = self.game.theater.find_control_point_by_id(cp_id)
+            except KeyError:
+                # Captured base is not a part of the campaign. This happens when neutral
+                # bases are near the conflict. Nothing to do.
+                continue
+
+            captured_by_player = int(new_owner_id_str) == blue_coalition_id
+            if control_point.is_friendly(to_player=captured_by_player):
+                # Base is currently friendly to the new owner. Was captured and
+                # recaptured in the same mission. Nothing to do.
+                continue
+
+            captures.append(BaseCaptureEvent(control_point, captured_by_player))
+        return captures
 
 
 class PollDebriefingFileThread(threading.Thread):
     """Thread class with a stop() method. The thread itself has to check
     regularly for the stopped() condition."""
 
-    def __init__(self, callback: Callable[[Debriefing], None],
-                 game: Game, unit_map: UnitMap) -> None:
+    def __init__(
+        self, callback: Callable[[Debriefing], None], game: Game, unit_map: UnitMap
+    ) -> None:
         super().__init__()
         self._stop_event = threading.Event()
         self.callback = callback
@@ -261,7 +383,10 @@ class PollDebriefingFileThread(threading.Thread):
         else:
             last_modified = 0
         while not self.stopped():
-            if os.path.isfile("state.json") and os.path.getmtime("state.json") > last_modified:
+            if (
+                os.path.isfile("state.json")
+                and os.path.getmtime("state.json") > last_modified
+            ):
                 with open("state.json", "r") as json_file:
                     json_data = json.load(json_file)
                     debriefing = Debriefing(json_data, self.game, self.unit_map)
@@ -270,8 +395,9 @@ class PollDebriefingFileThread(threading.Thread):
             time.sleep(5)
 
 
-def wait_for_debriefing(callback: Callable[[Debriefing], None],
-                        game: Game, unit_map) -> PollDebriefingFileThread:
+def wait_for_debriefing(
+    callback: Callable[[Debriefing], None], game: Game, unit_map
+) -> PollDebriefingFileThread:
     thread = PollDebriefingFileThread(callback, game, unit_map)
     thread.start()
     return thread

game/event/event.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 import logging
-import math
-from typing import Dict, Iterator, List, TYPE_CHECKING, Tuple, Type
+from typing import List, TYPE_CHECKING, Type
 
 from dcs.mapping import Point
 from dcs.task import Task
-from dcs.unittype import UnitType, VehicleType
+from dcs.unittype import VehicleType
 
 from game import persistency
 from game.debriefing import AirLosses, Debriefing
@@ -15,7 +14,6 @@ from game.operation.operation import Operation
 from game.theater import ControlPoint
 from gen import AirTaskingOrder
 from gen.ground_forces.combat_stance import CombatStance
-from ..db import PRICES
 from ..unitmap import UnitMap
 
 if TYPE_CHECKING:
@@ -37,7 +35,15 @@ class Event:
     to_cp = None  # type: ControlPoint
     difficulty = 1  # type: int
 
-    def __init__(self, game, from_cp: ControlPoint, target_cp: ControlPoint, location: Point, attacker_name: str, defender_name: str):
+    def __init__(
+        self,
+        game,
+        from_cp: ControlPoint,
+        target_cp: ControlPoint,
+        location: Point,
+        attacker_name: str,
+        defender_name: str,
+    ):
         self.game = game
         self.from_cp = from_cp
         self.to_cp = target_cp
@@ -57,12 +63,14 @@ class Event:
         Operation.prepare(self.game)
         unit_map = Operation.generate()
         Operation.current_mission.save(
-            persistency.mission_path_for("liberation_nextturn.miz"))
+            persistency.mission_path_for("liberation_nextturn.miz")
+        )
         return unit_map
 
     @staticmethod
-    def _transfer_aircraft(ato: AirTaskingOrder, losses: AirLosses,
-                           for_player: bool) -> None:
+    def _transfer_aircraft(
+        ato: AirTaskingOrder, losses: AirLosses, for_player: bool
+    ) -> None:
         for package in ato.packages:
             for flight in package.flights:
                 # No need to transfer to the same location.
@@ -77,13 +85,16 @@ class Event:
                 if flight.arrival.captured != for_player:
                     logging.info(
                         f"Not transferring {flight} because {flight.arrival} "
-                        "was captured")
+                        "was captured"
+                    )
                     continue
 
                 transfer_count = losses.surviving_flight_members(flight)
                 if transfer_count < 0:
-                    logging.error(f"{flight} had {flight.count} aircraft but "
-                                  f"{transfer_count} losses were recorded.")
+                    logging.error(
+                        f"{flight} had {flight.count} aircraft but "
+                        f"{transfer_count} losses were recorded."
+                    )
                     continue
 
                 aircraft = flight.unit_type
@@ -91,7 +102,8 @@ class Event:
                 if available < transfer_count:
                     logging.error(
                         f"Found killed {aircraft} from {flight.departure} but "
-                        f"that airbase has only {available} available.")
+                        f"that airbase has only {available} available."
+                    )
                     continue
 
                 flight.departure.base.aircraft[aircraft] -= transfer_count
@@ -101,26 +113,50 @@ class Event:
                 flight.arrival.base.aircraft[aircraft] += transfer_count
 
     def complete_aircraft_transfers(self, debriefing: Debriefing) -> None:
-        self._transfer_aircraft(self.game.blue_ato, debriefing.air_losses,
-                                for_player=True)
-        self._transfer_aircraft(self.game.red_ato, debriefing.air_losses,
-                                for_player=False)
+        self._transfer_aircraft(
+            self.game.blue_ato, debriefing.air_losses, for_player=True
+        )
+        self._transfer_aircraft(
+            self.game.red_ato, debriefing.air_losses, for_player=False
+        )
 
-    @staticmethod
-    def commit_air_losses(debriefing: Debriefing) -> None:
+    def commit_air_losses(self, debriefing: Debriefing) -> None:
         for loss in debriefing.air_losses.losses:
-            aircraft = loss.unit_type
-            cp = loss.departure
+            if (
+                not loss.pilot.player
+                or not self.game.settings.invulnerable_player_pilots
+            ):
+                loss.pilot.kill()
+            aircraft = loss.flight.unit_type
+            cp = loss.flight.departure
             available = cp.base.total_units_of_type(aircraft)
             if available <= 0:
                 logging.error(
                     f"Found killed {aircraft} from {cp} but that airbase has "
-                    "none available.")
+                    "none available."
+                )
                 continue
 
             logging.info(f"{aircraft} destroyed from {cp}")
             cp.base.aircraft[aircraft] -= 1
 
+    @staticmethod
+    def _commit_pilot_experience(ato: AirTaskingOrder) -> None:
+        for package in ato.packages:
+            for flight in package.flights:
+                for idx, pilot in enumerate(flight.roster.pilots):
+                    if pilot is None:
+                        logging.error(
+                            f"Cannot award experience to pilot #{idx} of {flight} "
+                            "because no pilot is assigned"
+                        )
+                        continue
+                    pilot.record.missions_flown += 1
+
+    def commit_pilot_experience(self) -> None:
+        self._commit_pilot_experience(self.game.blue_ato)
+        self._commit_pilot_experience(self.game.red_ato)
+
     @staticmethod
     def commit_front_line_losses(debriefing: Debriefing) -> None:
         for loss in debriefing.front_line_losses:
@@ -130,12 +166,54 @@ class Event:
             if available <= 0:
                 logging.error(
                     f"Found killed {unit_type} from {control_point} but that "
-                    "airbase has none available.")
+                    "airbase has none available."
+                )
                 continue
 
             logging.info(f"{unit_type} destroyed from {control_point}")
             control_point.base.armor[unit_type] -= 1
 
+    @staticmethod
+    def commit_convoy_losses(debriefing: Debriefing) -> None:
+        for loss in debriefing.convoy_losses:
+            unit_type = loss.unit_type
+            convoy = loss.convoy
+            available = loss.convoy.units.get(unit_type, 0)
+            convoy_name = f"convoy from {convoy.origin} to {convoy.destination}"
+            if available <= 0:
+                logging.error(
+                    f"Found killed {unit_type} in {convoy_name} but that convoy has "
+                    "none available."
+                )
+                continue
+
+            logging.info(f"{unit_type} destroyed in {convoy_name}")
+            convoy.kill_unit(unit_type)
+
+    @staticmethod
+    def commit_cargo_ship_losses(debriefing: Debriefing) -> None:
+        for ship in debriefing.cargo_ship_losses:
+            logging.info(
+                f"All units destroyed in cargo ship from {ship.origin} to "
+                f"{ship.destination}."
+            )
+            ship.kill_all()
+
+    @staticmethod
+    def commit_airlift_losses(debriefing: Debriefing) -> None:
+        for loss in debriefing.airlift_losses:
+            transfer = loss.transfer
+            airlift_name = f"airlift from {transfer.origin} to {transfer.destination}"
+            for unit_type in loss.cargo:
+                try:
+                    transfer.kill_unit(unit_type)
+                    logging.info(f"{unit_type} destroyed in {airlift_name}")
+                except KeyError:
+                    logging.exception(
+                        f"Found killed {unit_type} in {airlift_name} but that airlift "
+                        "has none available."
+                    )
+
     @staticmethod
     def commit_ground_object_losses(debriefing: Debriefing) -> None:
         for loss in debriefing.ground_object_losses:
@@ -149,63 +227,55 @@ class Event:
     def commit_building_losses(self, debriefing: Debriefing) -> None:
         for loss in debriefing.building_losses:
             loss.ground_object.kill()
-            self.game.informations.append(Information(
-                "Building destroyed",
-                f"{loss.ground_object.dcs_identifier} has been destroyed at "
-                f"location {loss.ground_object.obj_name}", self.game.turn
-            ))
+            self.game.informations.append(
+                Information(
+                    "Building destroyed",
+                    f"{loss.ground_object.dcs_identifier} has been destroyed at "
+                    f"location {loss.ground_object.obj_name}",
+                    self.game.turn,
+                )
+            )
 
     @staticmethod
     def commit_damaged_runways(debriefing: Debriefing) -> None:
         for damaged_runway in debriefing.damaged_runways:
             damaged_runway.damage_runway()
 
+    def commit_captures(self, debriefing: Debriefing) -> None:
+        for captured in debriefing.base_captures:
+            try:
+                if captured.captured_by_player:
+                    info = Information(
+                        f"{captured.control_point} captured!",
+                        f"We took control of {captured.control_point}.",
+                        self.game.turn,
+                    )
+                else:
+                    info = Information(
+                        f"{captured.control_point} lost!",
+                        f"The enemy took control of {captured.control_point}.",
+                        self.game.turn,
+                    )
+
+                self.game.informations.append(info)
+                captured.control_point.capture(self.game, captured.captured_by_player)
+                logging.info(f"Will run redeploy for {captured.control_point}")
+                self.redeploy_units(captured.control_point)
+            except Exception:
+                logging.exception(f"Could not process base capture {captured}")
+
     def commit(self, debriefing: Debriefing):
         logging.info("Committing mission results")
 
         self.commit_air_losses(debriefing)
+        self.commit_pilot_experience()
         self.commit_front_line_losses(debriefing)
+        self.commit_convoy_losses(debriefing)
+        self.commit_airlift_losses(debriefing)
         self.commit_ground_object_losses(debriefing)
         self.commit_building_losses(debriefing)
         self.commit_damaged_runways(debriefing)
-
-        # ------------------------------
-        # Captured bases
-        #if self.game.player_country in db.BLUEFOR_FACTIONS:
-        coalition = 2 # Value in DCS mission event for BLUE
-        #else:
-        #    coalition = 1 # Value in DCS mission event for RED
-
-        for captured in debriefing.base_capture_events:
-            try:
-                id = int(captured.split("||")[0])
-                new_owner_coalition = int(captured.split("||")[1])
-
-                captured_cps = []
-                for cp in self.game.theater.controlpoints:
-                    if cp.id == id:
-
-                        if cp.captured and new_owner_coalition != coalition:
-                            for_player = False
-                            info = Information(cp.name + " lost !", "The ennemy took control of " + cp.name + "\nShame on us !", self.game.turn)
-                            self.game.informations.append(info)
-                            captured_cps.append(cp)
-                        elif not(cp.captured) and new_owner_coalition == coalition:
-                            for_player = True
-                            info = Information(cp.name + " captured !", "We took control of " + cp.name + "! Great job !", self.game.turn)
-                            self.game.informations.append(info)
-                            captured_cps.append(cp)
-                        else:
-                            continue
-
-                        cp.capture(self.game, for_player)
-
-                for cp in captured_cps:
-                    logging.info("Will run redeploy for " + cp.name)
-                    self.redeploy_units(cp)
-            except Exception:
-                logging.exception(f"Could not process base capture {captured}")
-
+        self.commit_captures(debriefing)
         self.complete_aircraft_transfers(debriefing)
 
         # Destroyed units carcass
@@ -218,7 +288,12 @@ class Event:
         for cp in self.game.theater.player_points():
             enemy_cps = [e for e in cp.connected_points if not e.captured]
             for enemy_cp in enemy_cps:
-                print("Compute frontline progression for : " + cp.name + " to " + enemy_cp.name)
+                print(
+                    "Compute frontline progression for : "
+                    + cp.name
+                    + " to "
+                    + enemy_cp.name
+                )
 
                 delta = 0.0
                 player_won = True
@@ -234,7 +309,11 @@ class Event:
 
                 ratio = (1.0 + enemy_casualties) / (1.0 + ally_casualties)
 
-                player_aggresive = cp.stances[enemy_cp.id] in [CombatStance.AGGRESSIVE, CombatStance.ELIMINATION, CombatStance.BREAKTHROUGH]
+                player_aggresive = cp.stances[enemy_cp.id] in [
+                    CombatStance.AGGRESSIVE,
+                    CombatStance.ELIMINATION,
+                    CombatStance.BREAKTHROUGH,
+                ]
 
                 if ally_units_alive == 0:
                     player_won = False
@@ -259,11 +338,17 @@ class Event:
                                 delta = DEFEAT_INFLUENCE
                     elif ally_casualties > enemy_casualties:
 
-                        if ally_units_alive > 2*enemy_units_alive and player_aggresive:
+                        if (
+                            ally_units_alive > 2 * enemy_units_alive
+                            and player_aggresive
+                        ):
                             # Even with casualties if the enemy is overwhelmed, they are going to lose ground
                             player_won = True
                             delta = MINOR_DEFEAT_INFLUENCE
-                        elif ally_units_alive > 3*enemy_units_alive and player_aggresive:
+                        elif (
+                            ally_units_alive > 3 * enemy_units_alive
+                            and player_aggresive
+                        ):
                             player_won = True
                             delta = STRONG_DEFEAT_INFLUENCE
                         else:
@@ -275,7 +360,10 @@ class Event:
                                 delta = STRONG_DEFEAT_INFLUENCE
 
                     # No progress with defensive strategies
-                    if player_won and cp.stances[enemy_cp.id] in [CombatStance.DEFENSIVE, CombatStance.AMBUSH]:
+                    if player_won and cp.stances[enemy_cp.id] in [
+                        CombatStance.DEFENSIVE,
+                        CombatStance.AMBUSH,
+                    ]:
                         print("Defensive stance, progress is limited")
                         delta = MINOR_DEFEAT_INFLUENCE
 
@@ -283,28 +371,40 @@ class Event:
                     print(cp.name + " won !  factor > " + str(delta))
                     cp.base.affect_strength(delta)
                     enemy_cp.base.affect_strength(-delta)
-                    info = Information("Frontline Report",
-                                       "Our ground forces from " + cp.name + " are making progress toward " + enemy_cp.name,
-                                       self.game.turn)
+                    info = Information(
+                        "Frontline Report",
+                        "Our ground forces from "
+                        + cp.name
+                        + " are making progress toward "
+                        + enemy_cp.name,
+                        self.game.turn,
+                    )
                     self.game.informations.append(info)
                 else:
                     print(cp.name + " lost !  factor > " + str(delta))
                     enemy_cp.base.affect_strength(delta)
                     cp.base.affect_strength(-delta)
-                    info = Information("Frontline Report",
-                                       "Our ground forces from " + cp.name + " are losing ground against the enemy forces from " + enemy_cp.name,
-                                       self.game.turn)
+                    info = Information(
+                        "Frontline Report",
+                        "Our ground forces from "
+                        + cp.name
+                        + " are losing ground against the enemy forces from "
+                        + enemy_cp.name,
+                        self.game.turn,
+                    )
                     self.game.informations.append(info)
 
     def redeploy_units(self, cp: ControlPoint) -> None:
-        """"
+        """ "
         Auto redeploy units to newly captured base
         """
 
-        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]
+        ally_connected_cps = [
+            ocp for ocp in cp.connected_points if cp.captured == ocp.captured
+        ]
+        enemy_connected_cps = [
+            ocp for ocp in cp.connected_points if cp.captured != ocp.captured
+        ]
 
         # If the newly captured cp does not have enemy connected cp,
         # then it is not necessary to redeploy frontline units there.
@@ -315,8 +415,7 @@ class Event:
         for ally_cp in ally_connected_cps:
             self.redeploy_between(cp, ally_cp)
 
-    def redeploy_between(self, destination: ControlPoint,
-                         source: ControlPoint) -> None:
+    def redeploy_between(self, destination: ControlPoint, source: ControlPoint) -> None:
         total_units_redeployed = 0
         moved_units = {}
 
@@ -333,8 +432,7 @@ class Event:
 
         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)
+            total_units_redeployed = total_units_redeployed + int(count * move_factor)
 
         destination.base.commision_units(moved_units)
         source.base.commit_losses(moved_units)
@@ -359,65 +457,3 @@ class Event:
             info = Information("Units redeployed", text, self.game.turn)
             self.game.informations.append(info)
             logging.info(text)
-
-
-class UnitsDeliveryEvent:
-
-    def __init__(self, control_point: ControlPoint) -> None:
-        self.to_cp = control_point
-        self.units: Dict[Type[UnitType], int] = {}
-
-    def __str__(self) -> str:
-        return "Pending delivery to {}".format(self.to_cp)
-
-    def order(self, units: Dict[Type[UnitType], int]) -> None:
-        for k, v in units.items():
-            self.units[k] = self.units.get(k, 0) + v
-
-    def sell(self, units: Dict[Type[UnitType], int]) -> None:
-        for k, v in units.items():
-            self.units[k] = self.units.get(k, 0) - v
-
-    def consume_each_order(self) -> Iterator[Tuple[Type[UnitType], int]]:
-        while self.units:
-            yield self.units.popitem()
-
-    def refund_all(self, game: Game) -> None:
-        for unit_type, count in self.consume_each_order():
-            try:
-                price = PRICES[unit_type]
-            except KeyError:
-                logging.error(f"Could not refund {unit_type.id}, price unknown")
-                continue
-
-            logging.info(
-                f"Refunding {count} {unit_type.id} at {self.to_cp.name}")
-            game.adjust_budget(price * count, player=self.to_cp.captured)
-
-    def available_next_turn(self, unit_type: Type[UnitType]) -> int:
-        pending_units = self.units.get(unit_type)
-        if pending_units is None:
-            pending_units = 0
-        current_units = self.to_cp.base.total_units_of_type(unit_type)
-        return pending_units + current_units
-
-    def process(self, game: Game) -> None:
-        bought_units: Dict[Type[UnitType], int] = {}
-        sold_units: Dict[Type[UnitType], int] = {}
-        for unit_type, count in self.units.items():
-            coalition = "Ally" if self.to_cp.captured else "Enemy"
-            aircraft = unit_type.id
-            name = self.to_cp.name
-            if count >= 0:
-                bought_units[unit_type] = count 
-                game.message(
-                    f"{coalition} reinforcements: {aircraft} x {count} at {name}")
-            else:
-                sold_units[unit_type] = -count
-                game.message(
-                    f"{coalition} sold: {aircraft} x {-count} at {name}")
-        self.to_cp.base.commision_units(bought_units)
-        self.to_cp.base.commit_losses(sold_units)
-        self.units = {}
-        bought_units = {}
-        sold_units = {}

game/event/frontlineattack.py

@@ -7,5 +7,6 @@ class FrontlineAttackEvent(Event):
     Currently the same as its parent, but here for legacy compatibility as well as to allow for
     future unique Event handling
     """
+
     def __str__(self):
         return "Frontline attack"

game/factions/faction.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+from game.data.groundunitclass import GroundUnitClass
 
 import logging
 from dataclasses import dataclass, field
@@ -10,13 +11,26 @@ from dcs.planes import plane_map
 from dcs.unittype import FlyingType, ShipType, VehicleType, UnitType
 from dcs.vehicles import Armor, Unarmed, Infantry, Artillery, AirDefence
 
-from game.data.building_data import WW2_ALLIES_BUILDINGS, DEFAULT_AVAILABLE_BUILDINGS, WW2_GERMANY_BUILDINGS, WW2_FREE
-from game.data.doctrine import Doctrine, MODERN_DOCTRINE, COLDWAR_DOCTRINE, WWII_DOCTRINE
+from game.data.building_data import (
+    WW2_ALLIES_BUILDINGS,
+    DEFAULT_AVAILABLE_BUILDINGS,
+    WW2_GERMANY_BUILDINGS,
+    WW2_FREE,
+)
+from game.data.doctrine import (
+    Doctrine,
+    MODERN_DOCTRINE,
+    COLDWAR_DOCTRINE,
+    WWII_DOCTRINE,
+)
 from pydcs_extensions.mod_units import MODDED_VEHICLES, MODDED_AIRPLANES
 
 
 @dataclass
 class Faction:
+    #: List of locales to use when generating random names. If not set, Faker will
+    #: choose the default locale.
+    locales: Optional[List[str]]
 
     # Country used by this faction
     country: str = field(default="")
@@ -60,6 +74,9 @@ class Faction:
     # Possible Missile site generators for this faction
     missiles: List[str] = field(default_factory=list)
 
+    # Possible costal site generators for this faction
+    coastal_defenses: List[str] = field(default_factory=list)
+
     # Required mods or asset packs
     requirements: Dict[str, str] = field(default_factory=dict)
 
@@ -90,6 +107,9 @@ class Faction:
     # How many missiles group should we try to generate per CP on startup for this faction
     missiles_group_count: int = field(default=1)
 
+    # How many coastal group should we try to generate per CP on startup for this faction
+    coastal_group_count: int = field(default=1)
+
     # Whether this faction has JTAC access
     has_jtac: bool = field(default=False)
 
@@ -103,8 +123,7 @@ class Faction:
     building_set: List[str] = field(default_factory=list)
 
     # List of default livery overrides
-    liveries_overrides: Dict[Type[UnitType], List[str]] = field(
-        default_factory=dict)
+    liveries_overrides: Dict[Type[UnitType], List[str]] = field(default_factory=dict)
 
     #: Set to True if the faction should force the "Unrestricted satnav" option
     #: for the mission. This option enables GPS for capable aircraft regardless
@@ -115,14 +134,27 @@ class Faction:
     #: both will use it.
     unrestricted_satnav: bool = False
 
+    def has_access_to_unittype(self, unitclass: GroundUnitClass) -> bool:
+        has_access = False
+        for vehicle in unitclass.unit_list:
+            if vehicle in self.frontline_units:
+                return True
+            if vehicle in self.artillery_units:
+                return True
+
+        return has_access
+
     @classmethod
     def from_json(cls: Type[Faction], json: Dict[str, Any]) -> Faction:
-
-        faction = Faction()
+        faction = Faction(locales=json.get("locales"))
 
         faction.country = json.get("country", "/")
         if faction.country not in [c.name for c in country_dict.values()]:
-            raise AssertionError("Faction's country (\"{}\") is not a valid DCS country ID".format(faction.country))
+            raise AssertionError(
+                'Faction\'s country ("{}") is not a valid DCS country ID'.format(
+                    faction.country
+                )
+            )
 
         faction.name = json.get("name", "")
         if not faction.name:
@@ -135,14 +167,12 @@ class Faction:
         faction.awacs = load_all_aircraft(json.get("awacs", []))
         faction.tankers = load_all_aircraft(json.get("tankers", []))
 
-        faction.frontline_units = load_all_vehicles(
-            json.get("frontline_units", []))
-        faction.artillery_units = load_all_vehicles(
-            json.get("artillery_units", []))
-        faction.infantry_units = load_all_vehicles(
-            json.get("infantry_units", []))
-        faction.logistics_units = load_all_vehicles(
-            json.get("logistics_units", []))
+        faction.aircrafts = list(set(faction.aircrafts + faction.awacs))
+
+        faction.frontline_units = load_all_vehicles(json.get("frontline_units", []))
+        faction.artillery_units = load_all_vehicles(json.get("artillery_units", []))
+        faction.infantry_units = load_all_vehicles(json.get("infantry_units", []))
+        faction.logistics_units = load_all_vehicles(json.get("logistics_units", []))
 
         faction.ewrs = json.get("ewrs", [])
 
@@ -153,16 +183,14 @@ class Faction:
         faction.air_defenses.extend(json.get("shorads", []))
 
         faction.missiles = json.get("missiles", [])
+        faction.coastal_defenses = json.get("coastal_defenses", [])
         faction.requirements = json.get("requirements", {})
 
         faction.carrier_names = json.get("carrier_names", [])
-        faction.helicopter_carrier_names = json.get(
-            "helicopter_carrier_names", [])
+        faction.helicopter_carrier_names = json.get("helicopter_carrier_names", [])
         faction.navy_generators = json.get("navy_generators", [])
-        faction.aircraft_carrier = load_all_ships(
-            json.get("aircraft_carrier", []))
-        faction.helicopter_carrier = load_all_ships(
-            json.get("helicopter_carrier", []))
+        faction.aircraft_carrier = load_all_ships(json.get("aircraft_carrier", []))
+        faction.helicopter_carrier = load_all_ships(json.get("helicopter_carrier", []))
         faction.destroyers = load_all_ships(json.get("destroyers", []))
         faction.cruisers = load_all_ships(json.get("cruisers", []))
         faction.has_jtac = json.get("has_jtac", False)
@@ -173,6 +201,7 @@ class Faction:
             faction.jtac_unit = None
         faction.navy_group_count = int(json.get("navy_group_count", 1))
         faction.missiles_group_count = int(json.get("missiles_group_count", 0))
+        faction.coastal_group_count = int(json.get("coastal_group_count", 0))
 
         # Load doctrine
         doctrine = json.get("doctrine", "modern")
@@ -212,13 +241,18 @@ class Faction:
 
     @property
     def units(self) -> List[Type[UnitType]]:
-        return (self.infantry_units + self.aircrafts + self.awacs +
-                self.artillery_units + self.frontline_units +
-                self.tankers + self.logistics_units)
+        return (
+            self.infantry_units
+            + self.aircrafts
+            + self.awacs
+            + self.artillery_units
+            + self.frontline_units
+            + self.tankers
+            + self.logistics_units
+        )
 
 
-def unit_loader(
-        unit: str, class_repository: List[Any]) -> Optional[Type[UnitType]]:
+def unit_loader(unit: str, class_repository: List[Any]) -> Optional[Type[UnitType]]:
     """
     Find unit by name
     :param unit: Unit name as string
@@ -242,9 +276,10 @@ def unit_loader(
 
 
 def load_aircraft(name: str) -> Optional[Type[FlyingType]]:
-    return cast(Optional[FlyingType], unit_loader(
-        name, [dcs.planes, dcs.helicopters, MODDED_AIRPLANES]
-    ))
+    return cast(
+        Optional[FlyingType],
+        unit_loader(name, [dcs.planes, dcs.helicopters, MODDED_AIRPLANES]),
+    )
 
 
 def load_all_aircraft(data) -> List[Type[FlyingType]]:
@@ -257,9 +292,12 @@ def load_all_aircraft(data) -> List[Type[FlyingType]]:
 
 
 def load_vehicle(name: str) -> Optional[Type[VehicleType]]:
-    return cast(Optional[FlyingType], unit_loader(
-        name, [Infantry, Unarmed, Armor, AirDefence, Artillery, MODDED_VEHICLES]
-    ))
+    return cast(
+        Optional[FlyingType],
+        unit_loader(
+            name, [Infantry, Unarmed, Armor, AirDefence, Artillery, MODDED_VEHICLES]
+        ),
+    )
 
 
 def load_all_vehicles(data) -> List[Type[VehicleType]]:

game/factions/faction_loader.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 import json
 import logging
 from pathlib import Path
-from typing import Dict, Iterator, Optional, Type
+from typing import Dict, Iterator, List, Optional, Type
 
+from game import persistency
 from game.factions.faction import Faction
 
 FACTION_DIRECTORY = Path("./resources/factions/")
@@ -23,15 +24,22 @@ class FactionLoader:
         if self._factions is None:
             self._factions = self.load_factions()
 
+    @staticmethod
+    def find_faction_files_in(path: Path) -> List[Path]:
+        return [f for f in path.glob("*.json") if f.is_file()]
+
     @classmethod
     def load_factions(cls: Type[FactionLoader]) -> Dict[str, Faction]:
-        files = [f for f in FACTION_DIRECTORY.glob("*.json") if f.is_file()]
+        user_faction_path = Path(persistency.base_path()) / "Liberation/Factions"
+        files = cls.find_faction_files_in(
+            FACTION_DIRECTORY
+        ) + cls.find_faction_files_in(user_faction_path)
         factions = {}
 
         for f in files:
             try:
                 with f.open("r", encoding="utf-8") as fdata:
-                    data = json.load(fdata, encoding="utf-8")
+                    data = json.load(fdata)
                     factions[data["name"]] = Faction.from_json(data)
                     logging.info("Loaded faction : " + str(f))
             except Exception:

game/game.py

@@ -4,17 +4,19 @@ import random
 import sys
 from datetime import date, datetime, timedelta
 from enum import Enum
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Iterator
 
 from dcs.action import Coalition
 from dcs.mapping import Point
 from dcs.task import CAP, CAS, PinpointStrike
 from dcs.vehicles import AirDefence
+from faker import Faker
 
 from game import db
 from game.inventory import GlobalAircraftInventory
 from game.models.game_stats import GameStats
 from game.plugins import LuaPluginManager
+from game.theater.theatergroundobject import MissileSiteGroundObject
 from gen.ato import AirTaskingOrder
 from gen.conflictgen import Conflict
 from gen.flights.ai_flight_planner import CoalitionMissionPlanner
@@ -23,17 +25,21 @@ from gen.flights.flight import FlightType
 from gen.ground_forces.ai_ground_planner import GroundPlanner
 from . import persistency
 from .debriefing import Debriefing
-from .event.event import Event, UnitsDeliveryEvent
+from .event.event import Event
 from .event.frontlineattack import FrontlineAttackEvent
 from .factions.faction import Faction
 from .income import Income
 from .infos.information import Information
 from .navmesh import NavMesh
-from .procurement import ProcurementAi
-from .settings import Settings
-from .theater import ConflictTheater, ControlPoint, TheaterGroundObject
-from game.theater.theatergroundobject import MissileSiteGroundObject
+from .procurement import AircraftProcurementRequest, ProcurementAi
+from .profiling import logged_duration
+from .settings import Settings, AutoAtoBehavior
+from .squadrons import Pilot, AirWing
+from .theater import ConflictTheater
+from .theater.bullseye import Bullseye
+from .theater.transitnetwork import TransitNetwork, TransitNetworkBuilder
 from .threatzones import ThreatZones
+from .transfers import PendingTransfers
 from .unitmap import UnitMap
 from .weather import Conditions, TimeOfDay
 
@@ -78,10 +84,16 @@ class TurnState(Enum):
 
 
 class Game:
-    def __init__(self, player_name: str, enemy_name: str,
-                 theater: ConflictTheater, start_date: datetime,
-                 settings: Settings, player_budget: float,
-                 enemy_budget: float) -> None:
+    def __init__(
+        self,
+        player_name: str,
+        enemy_name: str,
+        theater: ConflictTheater,
+        start_date: datetime,
+        settings: Settings,
+        player_budget: float,
+        enemy_budget: float,
+    ) -> None:
         self.settings = settings
         self.events: List[Event] = []
         self.theater = theater
@@ -89,7 +101,10 @@ class Game:
         self.player_country = db.FACTIONS[player_name].country
         self.enemy_name = enemy_name
         self.enemy_country = db.FACTIONS[enemy_name].country
-        self.turn = 0
+        # pass_turn() will be called when initialization is complete which will
+        # increment this to turn 0 before it reaches the player.
+        self.turn = -1
+        # NB: This is the *start* date. It is never updated.
         self.date = date(start_date.year, start_date.month, start_date.day)
         self.game_stats = GameStats()
         self.game_stats.update(self)
@@ -98,8 +113,6 @@ class Game:
         self.informations.append(Information("Game Start", "-" * 40, 0))
         # Culling Zones are for areas around points of interest that contain things we may not wish to cull.
         self.__culling_zones: List[Point] = []
-        # Culling Points are for individual theater ground objects that we don't wish to cull.
-        self.__culling_points: List[Point] = []
         self.__destroyed_units: List[str] = []
         self.savepath = ""
         self.budget = player_budget
@@ -109,27 +122,31 @@ class Game:
 
         self.conditions = self.generate_conditions()
 
+        self.blue_transit_network = TransitNetwork()
+        self.red_transit_network = TransitNetwork()
+
+        self.blue_procurement_requests: List[AircraftProcurementRequest] = []
+        self.red_procurement_requests: List[AircraftProcurementRequest] = []
+
         self.blue_ato = AirTaskingOrder()
         self.red_ato = AirTaskingOrder()
 
-        self.aircraft_inventory = GlobalAircraftInventory(
-            self.theater.controlpoints
-        )
+        self.blue_bullseye = Bullseye(Point(0, 0))
+        self.red_bullseye = Bullseye(Point(0, 0))
+
+        self.aircraft_inventory = GlobalAircraftInventory(self.theater.controlpoints)
+
+        self.transfers = PendingTransfers(self)
 
         self.sanitize_sides()
 
-        self.on_load()
+        self.blue_faker = Faker(self.player_faction.locales)
+        self.red_faker = Faker(self.enemy_faction.locales)
 
-        # Turn 0 procurement. We don't actually have any missions to plan, but
-        # the planner will tell us what it would like to plan so we can use that
-        # to drive purchase decisions.
-        blue_planner = CoalitionMissionPlanner(self, is_player=True)
-        blue_planner.plan_missions()
+        self.blue_air_wing = AirWing(self, player=True)
+        self.red_air_wing = AirWing(self, player=False)
 
-        red_planner = CoalitionMissionPlanner(self, is_player=False)
-        red_planner.plan_missions()
-
-        self.plan_procurement(blue_planner, red_planner)
+        self.on_load(game_still_initializing=True)
 
     def __getstate__(self) -> Dict[str, Any]:
         state = self.__dict__.copy()
@@ -139,6 +156,8 @@ class Game:
         del state["red_threat_zone"]
         del state["blue_navmesh"]
         del state["red_navmesh"]
+        del state["blue_faker"]
+        del state["red_faker"]
         return state
 
     def __setstate__(self, state: Dict[str, Any]) -> None:
@@ -146,9 +165,27 @@ class Game:
         # Regenerate any state that was not persisted.
         self.on_load()
 
+    def ato_for(self, player: bool) -> AirTaskingOrder:
+        if player:
+            return self.blue_ato
+        return self.red_ato
+
+    def procurement_requests_for(
+        self, player: bool
+    ) -> List[AircraftProcurementRequest]:
+        if player:
+            return self.blue_procurement_requests
+        return self.red_procurement_requests
+
+    def transit_network_for(self, player: bool) -> TransitNetwork:
+        if player:
+            return self.blue_transit_network
+        return self.red_transit_network
+
     def generate_conditions(self) -> Conditions:
-        return Conditions.generate(self.theater, self.date,
-                                   self.current_turn_time_of_day, self.settings)
+        return Conditions.generate(
+            self.theater, self.current_day, self.current_turn_time_of_day, self.settings
+        )
 
     def sanitize_sides(self):
         """
@@ -176,6 +213,26 @@ class Game:
             return self.player_faction
         return self.enemy_faction
 
+    def faker_for(self, player: bool) -> Faker:
+        if player:
+            return self.blue_faker
+        return self.red_faker
+
+    def air_wing_for(self, player: bool) -> AirWing:
+        if player:
+            return self.blue_air_wing
+        return self.red_air_wing
+
+    def country_for(self, player: bool) -> str:
+        if player:
+            return self.player_country
+        return self.enemy_country
+
+    def bullseye_for(self, player: bool) -> Bullseye:
+        if player:
+            return self.blue_bullseye
+        return self.red_bullseye
+
     def _roll(self, prob, mult):
         if self.settings.version == "dev":
             # always generate all events for dev
@@ -184,13 +241,24 @@ class Game:
             return random.randint(1, 100) <= prob * mult
 
     def _generate_player_event(self, event_class, player_cp, enemy_cp):
-        self.events.append(event_class(self, player_cp, enemy_cp, enemy_cp.position, self.player_name, self.enemy_name))
+        self.events.append(
+            event_class(
+                self,
+                player_cp,
+                enemy_cp,
+                enemy_cp.position,
+                self.player_name,
+                self.enemy_name,
+            )
+        )
 
     def _generate_events(self):
-        for front_line in self.theater.conflicts(True):
-            self._generate_player_event(FrontlineAttackEvent,
-                                        front_line.control_point_a,
-                                        front_line.control_point_b)
+        for front_line in self.theater.conflicts():
+            self._generate_player_event(
+                FrontlineAttackEvent,
+                front_line.blue_cp,
+                front_line.red_cp,
+            )
 
     def adjust_budget(self, amount: float, player: bool) -> None:
         if player:
@@ -208,7 +276,7 @@ class Game:
         self.enemy_budget += Income(self, player=False).total
 
     def initiate_event(self, event: Event) -> UnitMap:
-        #assert event in self.events
+        # assert event in self.events
         logging.info("Generating {} (regular)".format(event))
         return event.generate()
 
@@ -223,29 +291,48 @@ class Game:
 
     def is_player_attack(self, event):
         if isinstance(event, Event):
-            return event and event.attacker_name and event.attacker_name == self.player_name
+            return (
+                event
+                and event.attacker_name
+                and event.attacker_name == self.player_name
+            )
         else:
             raise RuntimeError(f"{event} was passed when an Event type was expected")
 
-    def on_load(self) -> None:
+    def on_load(self, game_still_initializing: bool = False) -> None:
         LuaPluginManager.load_settings(self.settings)
         ObjectiveDistanceCache.set_theater(self.theater)
         self.compute_conflicts_position()
-        self.compute_threat_zones()
+        if not game_still_initializing:
+            self.compute_threat_zones()
+        self.blue_faker = Faker(self.faction_for(player=True).locales)
+        self.red_faker = Faker(self.faction_for(player=False).locales)
 
-    def pass_turn(self, no_action: bool = False) -> None:
-        logging.info("Pass turn")
-        self.informations.append(Information("End of turn #" + str(self.turn), "-" * 40, 0))
+    def reset_ato(self) -> None:
+        self.blue_ato.clear()
+        self.red_ato.clear()
+
+    def finish_turn(self, skipped: bool = False) -> None:
+        self.informations.append(
+            Information("End of turn #" + str(self.turn), "-" * 40, 0)
+        )
         self.turn += 1
 
+        # Need to recompute before transfers and deliveries to account for captures.
+        # This happens in in initialize_turn as well, because cheating doesn't advance a
+        # turn but can capture bases so we need to recompute there as well.
+        self.compute_transit_networks()
+
+        # Must happen *before* unit deliveries are handled, or else new units will spawn
+        # one hop ahead. ControlPoint.process_turn handles unit deliveries.
+        self.transfers.perform_transfers()
+
+        # Needs to happen *before* planning transfers so we don't cancel the
+        self.reset_ato()
         for control_point in self.theater.controlpoints:
             control_point.process_turn(self)
 
-        self.process_enemy_income()
-
-        self.process_player_income()
-
-        if not no_action and self.turn > 1:
+        if not skipped and self.turn > 1:
             for cp in self.theater.player_points():
                 cp.base.affect_strength(+PLAYER_BASE_STRENGTH_RECOVERY)
         else:
@@ -255,47 +342,88 @@ class Game:
 
         self.conditions = self.generate_conditions()
 
+        self.process_enemy_income()
+        self.process_player_income()
+
+    def begin_turn_0(self) -> None:
+        self.turn = 0
         self.initialize_turn()
 
+    def pass_turn(self, no_action: bool = False) -> None:
+        logging.info("Pass turn")
+        with logged_duration("Turn finalization"):
+            self.finish_turn(no_action)
+        with logged_duration("Turn initialization"):
+            self.initialize_turn()
+
         # Autosave progress
         persistency.autosave(self)
 
     def check_win_loss(self):
-        captured_states = {i.captured for i in self.theater.controlpoints}
-        if True not in captured_states:
+        player_airbases = {
+            cp for cp in self.theater.player_points() if cp.runway_is_operational()
+        }
+        if not player_airbases:
             return TurnState.LOSS
-        if False not in captured_states:
+
+        enemy_airbases = {
+            cp for cp in self.theater.enemy_points() if cp.runway_is_operational()
+        }
+        if not enemy_airbases:
             return TurnState.WIN
+
         return TurnState.CONTINUE
 
+    def set_bullseye(self) -> None:
+        player_cp, enemy_cp = self.theater.closest_opposing_control_points()
+        self.blue_bullseye = Bullseye(enemy_cp.position)
+        self.red_bullseye = Bullseye(player_cp.position)
+
     def initialize_turn(self) -> None:
         self.events = []
         self._generate_events()
 
+        self.set_bullseye()
+
         # Update statistics
         self.game_stats.update(self)
 
+        self.blue_air_wing.reset()
+        self.red_air_wing.reset()
         self.aircraft_inventory.reset()
         for cp in self.theater.controlpoints:
             self.aircraft_inventory.set_from_control_point(cp)
 
         # Check for win or loss condition
         turn_state = self.check_win_loss()
-        if turn_state in (TurnState.LOSS,TurnState.WIN):
+        if turn_state in (TurnState.LOSS, TurnState.WIN):
             return self.process_win_loss(turn_state)
 
         # Plan flights & combat for next turn
-        self.compute_conflicts_position()
-        self.compute_threat_zones()
+        with logged_duration("Computing conflict positions"):
+            self.compute_conflicts_position()
+        with logged_duration("Threat zone computation"):
+            self.compute_threat_zones()
+        with logged_duration("Transit network identification"):
+            self.compute_transit_networks()
         self.ground_planners = {}
-        self.blue_ato.clear()
-        self.red_ato.clear()
 
-        blue_planner = CoalitionMissionPlanner(self, is_player=True)
-        blue_planner.plan_missions()
+        self.blue_procurement_requests.clear()
+        self.red_procurement_requests.clear()
 
-        red_planner = CoalitionMissionPlanner(self, is_player=False)
-        red_planner.plan_missions()
+        with logged_duration("Procurement of airlift assets"):
+            self.transfers.order_airlift_assets()
+        with logged_duration("Transport planning"):
+            self.transfers.plan_transports()
+
+        with logged_duration("Blue mission planning"):
+            if self.settings.auto_ato_behavior is not AutoAtoBehavior.Disabled:
+                blue_planner = CoalitionMissionPlanner(self, is_player=True)
+                blue_planner.plan_missions()
+
+        with logged_duration("Red mission planning"):
+            red_planner = CoalitionMissionPlanner(self, is_player=False)
+            red_planner.plan_missions()
 
         for cp in self.theater.controlpoints:
             if cp.has_frontline:
@@ -303,16 +431,15 @@ class Game:
                 gplanner.plan_groundwar()
                 self.ground_planners[cp.id] = gplanner
 
-        self.plan_procurement(blue_planner, red_planner)
+        self.plan_procurement()
 
-    def plan_procurement(self, blue_planner: CoalitionMissionPlanner,
-                         red_planner: CoalitionMissionPlanner) -> None:
+    def plan_procurement(self) -> None:
         # The first turn needs to buy a *lot* of aircraft to fill CAPs, so it
         # gets much more of the budget that turn. Otherwise budget (after
         # repairs) is split evenly between air and ground. For the default
         # starting budget of 2000 this gives 600 to ground forces and 1400 to
-        # aircraft.
-        ground_portion = 0.3 if self.turn == 0 else 0.5
+        # aircraft. After that the budget will be spend proportionally based on how much is already invested
+
         self.budget = ProcurementAi(
             self,
             for_player=True,
@@ -320,8 +447,7 @@ class Game:
             manage_runways=self.settings.automate_runway_repair,
             manage_front_line=self.settings.automate_front_line_reinforcements,
             manage_aircraft=self.settings.automate_aircraft_reinforcements,
-            front_line_budget_share=ground_portion
-        ).spend_budget(self.budget, blue_planner.procurement_requests)
+        ).spend_budget(self.budget)
 
         self.enemy_budget = ProcurementAi(
             self,
@@ -330,8 +456,7 @@ class Game:
             manage_runways=True,
             manage_front_line=True,
             manage_aircraft=True,
-            front_line_budget_share=ground_portion
-        ).spend_budget(self.enemy_budget, red_planner.procurement_requests)
+        ).spend_budget(self.enemy_budget)
 
     def message(self, text: str) -> None:
         self.informations.append(Information(text, turn=self.turn))
@@ -358,13 +483,22 @@ class Game:
         self.current_group_id += 1
         return self.current_group_id
 
+    def compute_transit_networks(self) -> None:
+        self.blue_transit_network = self.compute_transit_network_for(player=True)
+        self.red_transit_network = self.compute_transit_network_for(player=False)
+
+    def compute_transit_network_for(self, player: bool) -> TransitNetwork:
+        return TransitNetworkBuilder(self.theater, player).build()
+
     def compute_threat_zones(self) -> None:
         self.blue_threat_zone = ThreatZones.for_faction(self, player=True)
         self.red_threat_zone = ThreatZones.for_faction(self, player=False)
-        self.blue_navmesh = NavMesh.from_threat_zones(self.red_threat_zone,
-                                                      self.theater)
-        self.red_navmesh = NavMesh.from_threat_zones(self.blue_threat_zone,
-                                                     self.theater)
+        self.blue_navmesh = NavMesh.from_threat_zones(
+            self.red_threat_zone, self.theater
+        )
+        self.red_navmesh = NavMesh.from_threat_zones(
+            self.blue_threat_zone, self.theater
+        )
 
     def threat_zone_for(self, player: bool) -> ThreatZones:
         if player:
@@ -382,23 +516,15 @@ class Game:
         :return: List of points of interests
         """
         zones = []
-        points = []
 
         # By default, use the existing frontline conflict position
         for front_line in self.theater.conflicts():
-            position = Conflict.frontline_position(front_line.control_point_a,
-                                                   front_line.control_point_b,
-                                                   self.theater)
+            position = Conflict.frontline_position(front_line, self.theater)
             zones.append(position[0])
-            zones.append(front_line.control_point_a.position)
-            zones.append(front_line.control_point_b.position)
+            zones.append(front_line.blue_cp.position)
+            zones.append(front_line.red_cp.position)
 
         for cp in self.theater.controlpoints:
-            # Don't cull missile sites - their range is long enough to make them
-            # easily culled despite being a threat.
-            for tgo in cp.ground_objects:
-                if isinstance(tgo, MissileSiteGroundObject):
-                    points.append(tgo.position)
             # If do_not_cull_carrier is enabled, add carriers as culling point
             if self.settings.perf_do_not_cull_carrier:
                 if cp.is_carrier or cp.is_lha:
@@ -413,7 +539,10 @@ class Game:
                     d = cp.position.distance_to_point(cp2.position)
                     if d < min_distance:
                         min_distance = d
-                        cpoint = Point((cp.position.x + cp2.position.x) / 2, (cp.position.y + cp2.position.y) / 2)
+                        cpoint = Point(
+                            (cp.position.x + cp2.position.x) / 2,
+                            (cp.position.y + cp2.position.y) / 2,
+                        )
                         zones.append(cp.position)
                         zones.append(cp2.position)
                         break
@@ -422,8 +551,7 @@ class Game:
             if cpoint is not None:
                 zones.append(cpoint)
 
-        packages = itertools.chain(self.blue_ato.packages,
-                                   self.red_ato.packages)
+        packages = itertools.chain(self.blue_ato.packages, self.red_ato.packages)
         for package in packages:
             if package.primary_task is FlightType.BARCAP:
                 # BARCAPs will be planned at most locations on smaller theaters,
@@ -440,7 +568,6 @@ class Game:
             zones.append(Point(0, 0))
 
         self.__culling_zones = zones
-        self.__culling_points = points
 
     def add_destroyed_units(self, data):
         pos = Point(data["x"], data["z"])
@@ -456,16 +583,12 @@ class Game:
         :param pos: Position you are tryng to spawn stuff at
         :return: True if units can not be added at given position
         """
-        if self.settings.perf_culling == False:
+        if not self.settings.perf_culling:
             return False
-        else:
-            for z in self.__culling_zones:
-                if z.distance_to_point(pos) < self.settings.perf_culling_distance * 1000:
-                    return False
-            for p in self.__culling_points:
-                if p.distance_to_point(pos) < 2500:
-                    return False
-            return True
+        for z in self.__culling_zones:
+            if z.distance_to_point(pos) < self.settings.perf_culling_distance * 1000:
+                return False
+        return True
 
     def get_culling_zones(self):
         """
@@ -474,13 +597,6 @@ class Game:
         """
         return self.__culling_zones
 
-    def get_culling_points(self):
-        """
-        Check culling points
-        :return: List of culling points
-        """
-        return self.__culling_points
-
     # 1 = red, 2 = blue
     def get_player_coalition_id(self):
         return 2
@@ -502,6 +618,10 @@ class Game:
 
     def process_win_loss(self, turn_state: TurnState):
         if turn_state is TurnState.WIN:
-            return self.message("Congratulations, you are victorious!  Start a new campaign to continue.")
+            return self.message(
+                "Congratulations, you are victorious!  Start a new campaign to continue."
+            )
         elif turn_state is TurnState.LOSS:
-            return self.message("Game Over, you lose. Start a new campaign to continue.")
+            return self.message(
+                "Game Over, you lose. Start a new campaign to continue."
+            )

game/income.py

@@ -46,10 +46,10 @@ class Income:
             for tgo in tgos:
                 if not tgo.is_dead:
                     count += 1
-            self.buildings.append(BuildingIncome(name, category, count,
-                                                 REWARDS[category]))
+            self.buildings.append(
+                BuildingIncome(name, category, count, REWARDS[category])
+            )
 
         self.from_bases = sum(cp.income_per_turn for cp in self.control_points)
         self.total_buildings = sum(b.income for b in self.buildings)
-        self.total = ((self.total_buildings + self.from_bases) *
-                      self.multiplier)
+        self.total = (self.total_buildings + self.from_bases) * self.multiplier

game/infos/information.py

@@ -1,7 +1,7 @@
 import datetime
 
-class Information():
 
+class Information:
     def __init__(self, title="", text="", turn=0):
         self.title = title
         self.text = text
@@ -9,9 +9,11 @@ class Information():
         self.timestamp = datetime.datetime.now()
 
     def __str__(self):
-        return '[{}][{}] {} {}'.format(
-            self.timestamp.strftime("%Y-%m-%d %H:%M:%S") if self.timestamp is not None else '',
+        return "[{}][{}] {} {}".format(
+            self.timestamp.strftime("%Y-%m-%d %H:%M:%S")
+            if self.timestamp is not None
+            else "",
             self.turn,
             self.title,
-            self.text
-        )
+            self.text,
+        )

game/inventory.py

@@ -79,6 +79,7 @@ class ControlPointAircraftInventory:
 
 class GlobalAircraftInventory:
     """Game-wide aircraft inventory."""
+
     def __init__(self, control_points: Iterable[ControlPoint]) -> None:
         self.inventories: Dict[ControlPoint, ControlPointAircraftInventory] = {
             cp: ControlPointAircraftInventory(cp) for cp in control_points
@@ -100,8 +101,8 @@ class GlobalAircraftInventory:
             inventory.add_aircraft(aircraft, count)
 
     def for_control_point(
-            self,
-            control_point: ControlPoint) -> ControlPointAircraftInventory:
+        self, control_point: ControlPoint
+    ) -> ControlPointAircraftInventory:
         """Returns the inventory specific to the given control point."""
         return self.inventories[control_point]
 

game/models/destroyed_units.py

@@ -7,8 +7,7 @@ class DestroyedUnit:
     y: int
     name: str
 
-    def __init__(self, x , y, name):
+    def __init__(self, x, y, name):
         self.x = x
         self.y = y
         self.name = name
-

game/models/frontline_data.py

@@ -1,13 +0,0 @@
-from game.theater import ControlPoint
-
-
-class FrontlineData:
-    """
-    This Data structure will store information about an existing frontline
-    """
-
-    def __init__(self, from_cp:ControlPoint, to_cp: ControlPoint):
-        self.to_cp = to_cp
-        self.from_cp = from_cp
-        self.enemy_units_position = []
-        self.blue_units_position = []

game/models/game_stats.py

@@ -1,5 +1,6 @@
 from typing import List
 
+
 class FactionTurnMetadata:
     """
     Store metadata about a faction
@@ -20,8 +21,8 @@ class GameTurnMetadata:
     Store metadata about a game turn
     """
 
-    allied_units:FactionTurnMetadata
-    enemy_units:FactionTurnMetadata
+    allied_units: FactionTurnMetadata
+    enemy_units: FactionTurnMetadata
 
     def __init__(self):
         self.allied_units = FactionTurnMetadata()
@@ -53,4 +54,3 @@ class GameStats:
                 turn_data.enemy_units.vehicles_count += sum(cp.base.armor.values())
 
         self.data_per_turn.append(turn_data)
-

game/navmesh.py

@@ -21,6 +21,10 @@ from game.threatzones import ThreatZones
 from game.utils import nautical_miles
 
 
+class NavMeshError(RuntimeError):
+    pass
+
+
 class NavMeshPoly:
     def __init__(self, ident: int, poly: Polygon, threatened: bool) -> None:
         self.ident = ident
@@ -99,7 +103,7 @@ class NavMesh:
         # currently.
         p = ShapelyPoint(point.x, point.y)
         for navpoly in self.polys:
-            if navpoly.poly.contains(p):
+            if navpoly.poly.intersects(p):
                 return navpoly
         return None
 
@@ -114,16 +118,18 @@ class NavMesh:
         return self.travel_cost(a, b)
 
     @staticmethod
-    def reconstruct_path(came_from: Dict[NavPoint, Optional[NavPoint]],
-                         origin: NavPoint,
-                         destination: NavPoint) -> List[Point]:
+    def reconstruct_path(
+        came_from: Dict[NavPoint, Optional[NavPoint]],
+        origin: NavPoint,
+        destination: NavPoint,
+    ) -> List[Point]:
         current = destination
         path: List[Point] = []
         while current != origin:
             path.append(current.world_point)
             previous = came_from[current]
             if previous is None:
-                raise RuntimeError(
+                raise NavMeshError(
                     f"Could not reconstruct path to {destination} from {origin}"
                 )
             current = previous
@@ -138,19 +144,19 @@ class NavMesh:
     def shortest_path(self, origin: Point, destination: Point) -> List[Point]:
         origin_poly = self.localize(origin)
         if origin_poly is None:
-            raise ValueError(f"Origin point {origin} is outside the navmesh")
+            raise NavMeshError(f"Origin point {origin} is outside the navmesh")
         destination_poly = self.localize(destination)
         if destination_poly is None:
-            raise ValueError(
-                f"Origin point {destination} is outside the navmesh")
+            raise NavMeshError(
+                f"Destination point {destination} is outside the navmesh"
+            )
 
         return self._shortest_path(
             NavPoint(self.dcs_to_shapely_point(origin), origin_poly),
-            NavPoint(self.dcs_to_shapely_point(destination), destination_poly)
+            NavPoint(self.dcs_to_shapely_point(destination), destination_poly),
         )
 
-    def _shortest_path(self, origin: NavPoint,
-                       destination: NavPoint) -> List[Point]:
+    def _shortest_path(self, origin: NavPoint, destination: NavPoint) -> List[Point]:
         # Adapted from
         # https://www.redblobgames.com/pathfinding/a-star/implementation.py.
         frontier = NavFrontier()
@@ -167,9 +173,7 @@ class NavMesh:
             if current.poly == destination.poly:
                 # Made it to the correct nav poly. Add the leg from the border
                 # to the target.
-                cost = best_known[current] + self.travel_cost(
-                    current, destination
-                )
+                cost = best_known[current] + self.travel_cost(current, destination)
                 if cost < best_known[destination]:
                     best_known[destination] = cost
                     estimated = cost
@@ -185,14 +189,10 @@ class NavMesh:
                     raise RuntimeError
                 _, neighbor_point = nearest_points(current.point, boundary)
                 neighbor_nav = NavPoint(neighbor_point, neighbor)
-                cost = best_known[current] + self.travel_cost(
-                    current, neighbor_nav
-                )
+                cost = best_known[current] + self.travel_cost(current, neighbor_nav)
                 if cost < best_known[neighbor_nav]:
                     best_known[neighbor_nav] = cost
-                    estimated = cost + self.travel_heuristic(
-                        neighbor_nav, destination
-                    )
+                    estimated = cost + self.travel_heuristic(neighbor_nav, destination)
                     frontier.push(neighbor_nav, estimated)
                     came_from[neighbor_nav] = current
 
@@ -209,13 +209,16 @@ class NavMesh:
         # threatened airbases at the map edges have room to retreat from the
         # threat without running off the navmesh.
         return box(*LineString(points).bounds).buffer(
-            nautical_miles(100).meters, resolution=1)
+            nautical_miles(200).meters, resolution=1
+        )
 
     @staticmethod
-    def create_navpolys(polys: List[Polygon],
-                        threat_zones: ThreatZones) -> List[NavMeshPoly]:
-        return [NavMeshPoly(i, p, threat_zones.threatened(p))
-                for i, p in enumerate(polys)]
+    def create_navpolys(
+        polys: List[Polygon], threat_zones: ThreatZones
+    ) -> List[NavMeshPoly]:
+        return [
+            NavMeshPoly(i, p, threat_zones.threatened(p)) for i, p in enumerate(polys)
+        ]
 
     @staticmethod
     def associate_neighbors(polys: List[NavMeshPoly]) -> None:
@@ -234,8 +237,7 @@ class NavMesh:
                 point = (int(x), int(y))
                 neighbors = {}
                 for potential_neighbor in points_map[point]:
-                    intersection = navpoly.poly.intersection(
-                        potential_neighbor.poly)
+                    intersection = navpoly.poly.intersection(potential_neighbor.poly)
                     if not intersection.is_empty:
                         potential_neighbor.neighbors[navpoly] = intersection
                         neighbors[potential_neighbor] = intersection
@@ -243,8 +245,9 @@ class NavMesh:
                 points_map[point].add(navpoly)
 
     @classmethod
-    def from_threat_zones(cls, threat_zones: ThreatZones,
-                          theater: ConflictTheater) -> NavMesh:
+    def from_threat_zones(
+        cls, threat_zones: ThreatZones, theater: ConflictTheater
+    ) -> NavMesh:
         # Simplify the threat poly to reduce the number of nav zones. Increase
         # the size of the zone and then simplify it with the buffer size as the
         # error margin. This will create a simpler poly around the threat zone.

game/operation/operation.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
-from game.theater.theatergroundobject import TheaterGroundObject
 
 import logging
 import os
 from pathlib import Path
-from typing import TYPE_CHECKING, Iterable, List, Optional, Set
+from typing import Iterable, List, Set, TYPE_CHECKING
 
 from dcs import Mission
 from dcs.action import DoScript, DoScriptFile
@@ -14,7 +13,9 @@ from dcs.lua.parse import loads
 from dcs.mapping import Point
 from dcs.translation import String
 from dcs.triggers import TriggerStart
+
 from game.plugins import LuaPluginManager
+from game.theater.theatergroundobject import TheaterGroundObject
 from gen import Conflict, FlightType, VisualGenerator
 from gen.aircraft import AIRCRAFT_DATA, AircraftConflictGenerator, FlightData
 from gen.airfields import AIRFIELD_DATA
@@ -22,6 +23,8 @@ from gen.airsupportgen import AirSupport, AirSupportConflictGenerator
 from gen.armor import GroundConflictGenerator, JtacInfo
 from gen.beacons import load_beacons_for_terrain
 from gen.briefinggen import BriefingGenerator, MissionInfoGenerator
+from gen.cargoshipgen import CargoShipGenerator
+from gen.convoygen import ConvoyGenerator
 from gen.environmentgen import EnvironmentGenerator
 from gen.forcedoptionsgen import ForcedOptionsGenerator
 from gen.groundobjectsgen import GroundObjectsGenerator
@@ -30,9 +33,8 @@ from gen.naming import namegen
 from gen.radios import RadioFrequency, RadioRegistry
 from gen.tacan import TacanRegistry
 from gen.triggergen import TRIGGER_RADIUS_MEDIUM, TriggersGenerator
-
 from .. import db
-from ..theater import Airfield
+from ..theater import Airfield, FrontLine
 from ..unitmap import UnitMap
 
 if TYPE_CHECKING:
@@ -41,18 +43,14 @@ if TYPE_CHECKING:
 
 class Operation:
     """Static class for managing the final Mission generation"""
-    current_mission = None  # type: Mission
-    airgen = None  # type: AircraftConflictGenerator
-    triggersgen = None  # type: TriggersGenerator
-    airsupportgen = None  # type: AirSupportConflictGenerator
-    visualgen = None  # type: VisualGenerator
-    groundobjectgen = None  # type: GroundObjectsGenerator
-    briefinggen = None  # type: BriefingGenerator
-    forcedoptionsgen = None  # type: ForcedOptionsGenerator
-    radio_registry: Optional[RadioRegistry] = None
-    tacan_registry: Optional[TacanRegistry] = None
-    game = None  # type: Game
-    environment_settings = None
+
+    current_mission: Mission
+    airgen: AircraftConflictGenerator
+    airsupportgen: AirSupportConflictGenerator
+    groundobjectgen: GroundObjectsGenerator
+    radio_registry: RadioRegistry
+    tacan_registry: TacanRegistry
+    game: Game
     trigger_radius = TRIGGER_RADIUS_MEDIUM
     is_quick = None
     player_awacs_enabled = True
@@ -78,13 +76,12 @@ class Operation:
         for frontline in cls.game.theater.conflicts():
             yield Conflict(
                 cls.game.theater,
-                frontline.control_point_a,
-                frontline.control_point_b,
+                frontline,
                 cls.game.player_name,
                 cls.game.enemy_name,
                 cls.game.player_country,
                 cls.game.enemy_country,
-                frontline.position
+                frontline.position,
             )
 
     @classmethod
@@ -93,17 +90,16 @@ class Operation:
         player_cp, enemy_cp = cls.game.theater.closest_opposing_control_points()
         mid_point = player_cp.position.point_from_heading(
             player_cp.position.heading_between_point(enemy_cp.position),
-            player_cp.position.distance_to_point(enemy_cp.position) / 2
+            player_cp.position.distance_to_point(enemy_cp.position) / 2,
         )
         return Conflict(
             cls.game.theater,
-            player_cp,
-            enemy_cp,
+            FrontLine(player_cp, enemy_cp),
             cls.game.player_name,
             cls.game.enemy_name,
             cls.game.player_country,
             cls.game.enemy_country,
-            mid_point
+            mid_point,
         )
 
     @classmethod
@@ -112,15 +108,21 @@ class Operation:
 
     @classmethod
     def _setup_mission_coalitions(cls):
-        cls.current_mission.coalition["blue"] = Coalition("blue")
-        cls.current_mission.coalition["red"] = Coalition("red")
+        cls.current_mission.coalition["blue"] = Coalition(
+            "blue", bullseye=cls.game.blue_bullseye.to_pydcs()
+        )
+        cls.current_mission.coalition["red"] = Coalition(
+            "red", bullseye=cls.game.red_bullseye.to_pydcs()
+        )
 
         p_country = cls.game.player_country
         e_country = cls.game.enemy_country
         cls.current_mission.coalition["blue"].add_country(
-            country_dict[db.country_id_from_name(p_country)]())
+            country_dict[db.country_id_from_name(p_country)]()
+        )
         cls.current_mission.coalition["red"].add_country(
-            country_dict[db.country_id_from_name(e_country)]())
+            country_dict[db.country_id_from_name(e_country)]()
+        )
 
     @classmethod
     def inject_lua_trigger(cls, contents: str, comment: str) -> None:
@@ -133,12 +135,11 @@ class Operation:
         cls.plugin_scripts.append(mnemonic)
 
     @classmethod
-    def inject_plugin_script(cls, plugin_mnemonic: str, script: str,
-                             script_mnemonic: str) -> None:
+    def inject_plugin_script(
+        cls, plugin_mnemonic: str, script: str, script_mnemonic: str
+    ) -> None:
         if script_mnemonic in cls.plugin_scripts:
-            logging.debug(
-                f"Skipping already loaded {script} for {plugin_mnemonic}"
-            )
+            logging.debug(f"Skipping already loaded {script} for {plugin_mnemonic}")
         else:
             cls.plugin_scripts.append(script_mnemonic)
 
@@ -146,15 +147,12 @@ class Operation:
 
             script_path = Path(plugin_path, script)
             if not script_path.exists():
-                logging.error(
-                    f"Cannot find {script_path} for plugin {plugin_mnemonic}"
-                )
+                logging.error(f"Cannot find {script_path} for plugin {plugin_mnemonic}")
                 return
 
             trigger = TriggerStart(comment=f"Load {script_mnemonic}")
             filename = script_path.resolve()
-            fileref = cls.current_mission.map_resource.add_resource_file(
-                filename)
+            fileref = cls.current_mission.map_resource.add_resource_file(filename)
             trigger.add_action(DoScriptFile(fileref))
             cls.current_mission.triggerrules.triggers.append(trigger)
 
@@ -166,25 +164,27 @@ class Operation:
         jtacs: List[JtacInfo],
         airgen: AircraftConflictGenerator,
     ):
-        """Generates subscribed MissionInfoGenerator objects (currently kneeboards and briefings)
-        """
+        """Generates subscribed MissionInfoGenerator objects (currently kneeboards and briefings)"""
+
         gens: List[MissionInfoGenerator] = [
             KneeboardGenerator(cls.current_mission, cls.game),
-            BriefingGenerator(cls.current_mission, cls.game)
+            BriefingGenerator(cls.current_mission, cls.game),
         ]
         for gen in gens:
             for dynamic_runway in groundobjectgen.runways.values():
                 gen.add_dynamic_runway(dynamic_runway)
 
             for tanker in airsupportgen.air_support.tankers:
-                gen.add_tanker(tanker)
+                if tanker.blue:
+                    gen.add_tanker(tanker)
 
-            if cls.player_awacs_enabled:
-                for awacs in airsupportgen.air_support.awacs:
-                    gen.add_awacs(awacs)
+            for aewc in airsupportgen.air_support.awacs:
+                if aewc.blue:
+                    gen.add_awacs(aewc)
 
             for jtac in jtacs:
-                gen.add_jtac(jtac)
+                if jtac.blue:
+                    gen.add_jtac(jtac)
 
             for flight in airgen.flights:
                 gen.add_flight(flight)
@@ -208,8 +208,9 @@ class Operation:
             cls.radio_registry.reserve(frequency)
 
     @classmethod
-    def assign_channels_to_flights(cls, flights: List[FlightData],
-                                   air_support: AirSupport) -> None:
+    def assign_channels_to_flights(
+        cls, flights: List[FlightData], air_support: AirSupport
+    ) -> None:
         """Assigns preset radio channels for client flights."""
         for flight in flights:
             if not flight.client_units:
@@ -217,8 +218,7 @@ class Operation:
             cls.assign_channels_to_flight(flight, air_support)
 
     @staticmethod
-    def assign_channels_to_flight(flight: FlightData,
-                                  air_support: AirSupport) -> None:
+    def assign_channels_to_flight(flight: FlightData, air_support: AirSupport) -> None:
         """Assigns preset radio channels for a client flight."""
         airframe = flight.aircraft_type
 
@@ -234,7 +234,9 @@ class Operation:
             )
 
     @classmethod
-    def _create_tacan_registry(cls, unique_map_frequencies: Set[RadioFrequency]) -> None:
+    def _create_tacan_registry(
+        cls, unique_map_frequencies: Set[RadioFrequency]
+    ) -> None:
         """
         Dedup beacon/radio frequencies, since some maps have some frequencies
         used multiple times.
@@ -246,13 +248,14 @@ class Operation:
             unique_map_frequencies.add(beacon.frequency)
             if beacon.is_tacan:
                 if beacon.channel is None:
-                    logging.error(
-                        f"TACAN beacon has no channel: {beacon.callsign}")
+                    logging.error(f"TACAN beacon has no channel: {beacon.callsign}")
                 else:
                     cls.tacan_registry.reserve(beacon.tacan_channel)
 
     @classmethod
-    def _create_radio_registry(cls, unique_map_frequencies: Set[RadioFrequency]) -> None:
+    def _create_radio_registry(
+        cls, unique_map_frequencies: Set[RadioFrequency]
+    ) -> None:
         cls.radio_registry = RadioRegistry()
         for data in AIRFIELD_DATA.values():
             if data.theater == cls.game.theater.terrain.name and data.atc:
@@ -270,7 +273,7 @@ class Operation:
             cls.game,
             cls.radio_registry,
             cls.tacan_registry,
-            cls.unit_map
+            cls.unit_map,
         )
         cls.groundobjectgen.generate()
 
@@ -284,10 +287,13 @@ class Operation:
                 continue
 
             pos = Point(d["x"], d["z"])
-            if utype is not None and not cls.game.position_culled(pos) and cls.game.settings.perf_destroyed_units:
+            if (
+                utype is not None
+                and not cls.game.position_culled(pos)
+                and cls.game.settings.perf_destroyed_units
+            ):
                 cls.current_mission.static_group(
-                    country=cls.current_mission.country(
-                        cls.game.player_country),
+                    country=cls.current_mission.country(cls.game.player_country),
                     name="",
                     _type=utype,
                     hidden=True,
@@ -302,13 +308,14 @@ class Operation:
         cls.create_unit_map()
         cls.create_radio_registries()
         # Set mission time and weather conditions.
-        EnvironmentGenerator(cls.current_mission,
-                             cls.game.conditions).generate()
+        EnvironmentGenerator(cls.current_mission, cls.game.conditions).generate()
         cls._generate_ground_units()
+        cls._generate_transports()
         cls._generate_destroyed_units()
         cls._generate_air_units()
-        cls.assign_channels_to_flights(cls.airgen.flights,
-                                        cls.airsupportgen.air_support)
+        cls.assign_channels_to_flights(
+            cls.airgen.flights, cls.airsupportgen.air_support
+        )
         cls._generate_ground_conflicts()
 
         # Triggers
@@ -317,14 +324,11 @@ class Operation:
 
         # Setup combined arms parameters
         cls.current_mission.groundControl.pilot_can_control_vehicles = cls.ca_slots > 0
-        if cls.game.player_country in [country.name for country in cls.current_mission.coalition["blue"].countries.values()]:
-            cls.current_mission.groundControl.blue_tactical_commander = cls.ca_slots
-        else:
-            cls.current_mission.groundControl.red_tactical_commander = cls.ca_slots
+        cls.current_mission.groundControl.blue_tactical_commander = cls.ca_slots
+        cls.current_mission.groundControl.blue_observer = 1
 
         # Options
-        forcedoptionsgen = ForcedOptionsGenerator(
-            cls.current_mission, cls.game)
+        forcedoptionsgen = ForcedOptionsGenerator(cls.current_mission, cls.game)
         forcedoptionsgen.generate()
 
         # Generate Visuals Smoke Effects
@@ -341,13 +345,11 @@ class Operation:
                 plugin.inject_scripts(cls)
                 plugin.inject_configuration(cls)
 
-        cls.assign_channels_to_flights(cls.airgen.flights,
-                                        cls.airsupportgen.air_support)
+        cls.assign_channels_to_flights(
+            cls.airgen.flights, cls.airsupportgen.air_support
+        )
         cls.notify_info_generators(
-            cls.groundobjectgen,
-            cls.airsupportgen,
-            cls.jtacs,
-            cls.airgen
+            cls.groundobjectgen, cls.airsupportgen, cls.jtacs, cls.airgen
         )
         cls.reset_naming_ids()
         return cls.unit_map
@@ -359,66 +361,88 @@ class Operation:
         # Air Support (Tanker & Awacs)
         assert cls.radio_registry and cls.tacan_registry
         cls.airsupportgen = AirSupportConflictGenerator(
-            cls.current_mission, cls.air_conflict(), cls.game, cls.radio_registry,
-            cls.tacan_registry)
+            cls.current_mission,
+            cls.air_conflict(),
+            cls.game,
+            cls.radio_registry,
+            cls.tacan_registry,
+        )
         cls.airsupportgen.generate()
 
         # Generate Aircraft Activity on the map
         cls.airgen = AircraftConflictGenerator(
-            cls.current_mission, cls.game.settings, cls.game,
-            cls.radio_registry, cls.unit_map)
+            cls.current_mission,
+            cls.game.settings,
+            cls.game,
+            cls.radio_registry,
+            cls.unit_map,
+            air_support=cls.airsupportgen.air_support,
+        )
+
         cls.airgen.clear_parking_slots()
 
         cls.airgen.generate_flights(
             cls.current_mission.country(cls.game.player_country),
             cls.game.blue_ato,
-            cls.groundobjectgen.runways
+            cls.groundobjectgen.runways,
         )
         cls.airgen.generate_flights(
             cls.current_mission.country(cls.game.enemy_country),
             cls.game.red_ato,
-            cls.groundobjectgen.runways
+            cls.groundobjectgen.runways,
         )
         cls.airgen.spawn_unused_aircraft(
             cls.current_mission.country(cls.game.player_country),
-            cls.current_mission.country(cls.game.enemy_country))
+            cls.current_mission.country(cls.game.enemy_country),
+        )
 
     @classmethod
     def _generate_ground_conflicts(cls) -> None:
         """For each frontline in the Operation, generate the ground conflicts and JTACs"""
-        for front_line in cls.game.theater.conflicts(True):
-            player_cp = front_line.control_point_a
-            enemy_cp = front_line.control_point_b
+        cls.jtacs = []
+        for front_line in cls.game.theater.conflicts():
+            player_cp = front_line.blue_cp
+            enemy_cp = front_line.red_cp
             conflict = Conflict.frontline_cas_conflict(
                 cls.game.player_name,
                 cls.game.enemy_name,
                 cls.current_mission.country(cls.game.player_country),
                 cls.current_mission.country(cls.game.enemy_country),
-                player_cp,
-                enemy_cp,
-                cls.game.theater
+                front_line,
+                cls.game.theater,
             )
             # Generate frontline ops
             player_gp = cls.game.ground_planners[player_cp.id].units_per_cp[enemy_cp.id]
             enemy_gp = cls.game.ground_planners[enemy_cp.id].units_per_cp[player_cp.id]
             ground_conflict_gen = GroundConflictGenerator(
                 cls.current_mission,
-                conflict, cls.game,
-                player_gp, enemy_gp,
+                conflict,
+                cls.game,
+                player_gp,
+                enemy_gp,
                 player_cp.stances[enemy_cp.id],
-                cls.unit_map
+                cls.unit_map,
             )
             ground_conflict_gen.generate()
             cls.jtacs.extend(ground_conflict_gen.jtacs)
 
+    @classmethod
+    def _generate_transports(cls) -> None:
+        """Generates convoys for unit transfers by road."""
+        ConvoyGenerator(cls.current_mission, cls.game, cls.unit_map).generate()
+        CargoShipGenerator(cls.current_mission, cls.game, cls.unit_map).generate()
+
     @classmethod
     def reset_naming_ids(cls):
         namegen.reset_numbers()
 
     @classmethod
-    def generate_lua(cls, airgen: AircraftConflictGenerator,
-                     airsupportgen: AirSupportConflictGenerator,
-                     jtacs: List[JtacInfo]) -> None:
+    def generate_lua(
+        cls,
+        airgen: AircraftConflictGenerator,
+        airsupportgen: AirSupportConflictGenerator,
+        jtacs: List[JtacInfo],
+    ) -> None:
         #  TODO: Refactor this
         luaData = {
             "AircraftCarriers": {},
@@ -426,39 +450,43 @@ class Operation:
             "AWACs": {},
             "JTACs": {},
             "TargetPoints": {},
+            "RedAA": {},
+            "BlueAA": {},
         }  # type: ignore
 
         for tanker in airsupportgen.air_support.tankers:
             luaData["Tankers"][tanker.callsign] = {
-                "dcsGroupName": tanker.dcsGroupName,
+                "dcsGroupName": tanker.group_name,
                 "callsign": tanker.callsign,
                 "variant": tanker.variant,
                 "radio": tanker.freq.mhz,
-                "tacan": str(tanker.tacan.number) + tanker.tacan.band.name
+                "tacan": str(tanker.tacan.number) + tanker.tacan.band.name,
             }
 
         if airsupportgen.air_support.awacs:
             for awacs in airsupportgen.air_support.awacs:
                 luaData["AWACs"][awacs.callsign] = {
-                    "dcsGroupName": awacs.dcsGroupName,
+                    "dcsGroupName": awacs.group_name,
                     "callsign": awacs.callsign,
-                    "radio": awacs.freq.mhz
+                    "radio": awacs.freq.mhz,
                 }
 
         for jtac in jtacs:
             luaData["JTACs"][jtac.callsign] = {
-                "dcsGroupName": jtac.dcsGroupName,
+                "dcsGroupName": jtac.group_name,
                 "callsign": jtac.callsign,
                 "zone": jtac.region,
                 "dcsUnit": jtac.unit_name,
-                "laserCode": jtac.code
+                "laserCode": jtac.code,
             }
 
         for flight in airgen.flights:
-            if flight.friendly and flight.flight_type in [FlightType.ANTISHIP,
-                                                          FlightType.DEAD,
-                                                          FlightType.SEAD,
-                                                          FlightType.STRIKE]:
+            if flight.friendly and flight.flight_type in [
+                FlightType.ANTISHIP,
+                FlightType.DEAD,
+                FlightType.SEAD,
+                FlightType.STRIKE,
+            ]:
                 flightType = str(flight.flight_type)
                 flightTarget = flight.package.target
                 if flightTarget:
@@ -466,23 +494,47 @@ class Operation:
                     flightTargetType = None
                     if isinstance(flightTarget, TheaterGroundObject):
                         flightTargetName = flightTarget.obj_name
-                        flightTargetType = flightType + \
-                            f" TGT ({flightTarget.category})"
-                    elif hasattr(flightTarget, 'name'):
+                        flightTargetType = (
+                            flightType + f" TGT ({flightTarget.category})"
+                        )
+                    elif hasattr(flightTarget, "name"):
                         flightTargetName = flightTarget.name
                         flightTargetType = flightType + " TGT (Airbase)"
                     luaData["TargetPoints"][flightTargetName] = {
                         "name": flightTargetName,
                         "type": flightTargetType,
-                        "position": {"x": flightTarget.position.x,
-                                     "y": flightTarget.position.y}
+                        "position": {
+                            "x": flightTarget.position.x,
+                            "y": flightTarget.position.y,
+                        },
                     }
 
+        for cp in cls.game.theater.controlpoints:
+            for ground_object in cp.ground_objects:
+                if ground_object.might_have_aa and not ground_object.is_dead:
+                    for g in ground_object.groups:
+                        threat_range = ground_object.threat_range(g)
+
+                        if not threat_range:
+                            continue
+
+                        faction = "BlueAA" if cp.captured else "RedAA"
+
+                        luaData[faction][g.name] = {
+                            "name": ground_object.name,
+                            "range": threat_range.meters,
+                            "position": {
+                                "x": ground_object.position.x,
+                                "y": ground_object.position.y,
+                            },
+                        }
+
         # set a LUA table with data from Liberation that we want to set
         # at the moment it contains Liberation's install path, and an overridable definition for the JTACAutoLase function
         # later, we'll add data about the units and points having been generated, in order to facilitate the configuration of the plugin lua scripts
         state_location = "[[" + os.path.abspath(".") + "]]"
-        lua = """
+        lua = (
+            """
         -- setting configuration table
         env.info("DCSLiberation|: setting configuration table")
 
@@ -490,9 +542,12 @@ class Operation:
         dcsLiberation = {}
 
         -- the base location for state.json; if non-existent, it'll be replaced with LIBERATION_EXPORT_DIR, TEMP, or DCS working directory
-        dcsLiberation.installPath=""" + state_location + """
+        dcsLiberation.installPath="""
+            + state_location
+            + """
 
         """
+        )
         # Process the tankers
         lua += """
 
@@ -566,7 +621,33 @@ class Operation:
         -- list the aircraft carriers generated by Liberation
         -- dcsLiberation.Carriers = {}
 
-        -- later, we'll add more data to the table
+        -- list the Red AA generated by Liberation
+        dcsLiberation.RedAA = {
+        """
+        for key in luaData["RedAA"]:
+            data = luaData["RedAA"][key]
+            name = data["name"]
+            radius = data["range"]
+            positionX = data["position"]["x"]
+            positionY = data["position"]["y"]
+            lua += f"    {{dcsGroupName='{key}', name='{name}', range='{radius}', positionX='{positionX}', positionY='{positionY}' }}, \n"
+        lua += "}"
+
+        lua += """
+
+        -- list the Blue AA generated by Liberation
+        dcsLiberation.BlueAA = {
+        """
+        for key in luaData["BlueAA"]:
+            data = luaData["BlueAA"][key]
+            name = data["name"]
+            radius = data["range"]
+            positionX = data["position"]["x"]
+            positionY = data["position"]["y"]
+            lua += f"    {{dcsGroupName='{key}', name='{name}', range='{radius}', positionX='{positionX}', positionY='{positionY}' }}, \n"
+        lua += "}"
+
+        lua += """
 
         """
 

game/persistency.py

@@ -67,4 +67,3 @@ def autosave(game) -> bool:
     except Exception:
         logging.exception("Could not save game")
         return False
-

game/plugins/luaplugin.py

@@ -14,9 +14,9 @@ if TYPE_CHECKING:
 
 
 class LuaPluginWorkOrder:
-
-    def __init__(self, parent_mnemonic: str, filename: str, mnemonic: str,
-                 disable: bool) -> None:
+    def __init__(
+        self, parent_mnemonic: str, filename: str, mnemonic: str, disable: bool
+    ) -> None:
         self.parent_mnemonic = parent_mnemonic
         self.filename = filename
         self.mnemonic = mnemonic
@@ -26,8 +26,9 @@ class LuaPluginWorkOrder:
         if self.disable:
             operation.bypass_plugin_script(self.mnemonic)
         else:
-            operation.inject_plugin_script(self.parent_mnemonic, self.filename,
-                                           self.mnemonic)
+            operation.inject_plugin_script(
+                self.parent_mnemonic, self.filename, self.mnemonic
+            )
 
 
 class PluginSettings:
@@ -45,8 +46,7 @@ class PluginSettings:
         # Plugin options are saved in the game's Settings, but it's possible for
         # plugins to change across loads. If new plugins are added or new
         # options added to those plugins, initialize the new settings.
-        self.settings.initialize_plugin_option(self.identifier,
-                                               self.enabled_by_default)
+        self.settings.initialize_plugin_option(self.identifier, self.enabled_by_default)
 
     @property
     def enabled(self) -> bool:
@@ -57,8 +57,7 @@ class PluginSettings:
 
 
 class LuaPluginOption(PluginSettings):
-    def __init__(self, identifier: str, name: str,
-                 enabled_by_default: bool) -> None:
+    def __init__(self, identifier: str, name: str, enabled_by_default: bool) -> None:
         super().__init__(identifier, enabled_by_default)
         self.name = name
 
@@ -80,24 +79,34 @@ class LuaPluginDefinition:
         options = []
         for option in data.get("specificOptions"):
             option_id = option["mnemonic"]
-            options.append(LuaPluginOption(
-                identifier=f"{name}.{option_id}",
-                name=option.get("nameInUI", name),
-                enabled_by_default=option.get("defaultValue")
-            ))
+            options.append(
+                LuaPluginOption(
+                    identifier=f"{name}.{option_id}",
+                    name=option.get("nameInUI", name),
+                    enabled_by_default=option.get("defaultValue"),
+                )
+            )
 
         work_orders = []
         for work_order in data.get("scriptsWorkOrders"):
-            work_orders.append(LuaPluginWorkOrder(
-                name, work_order.get("file"), work_order["mnemonic"],
-                work_order.get("disable", False)
-            ))
+            work_orders.append(
+                LuaPluginWorkOrder(
+                    name,
+                    work_order.get("file"),
+                    work_order["mnemonic"],
+                    work_order.get("disable", False),
+                )
+            )
         config_work_orders = []
         for work_order in data.get("configurationWorkOrders"):
-            config_work_orders.append(LuaPluginWorkOrder(
-                name, work_order.get("file"), work_order["mnemonic"],
-                work_order.get("disable", False)
-            ))
+            config_work_orders.append(
+                LuaPluginWorkOrder(
+                    name,
+                    work_order.get("file"),
+                    work_order["mnemonic"],
+                    work_order.get("disable", False),
+                )
+            )
 
         return cls(
             identifier=name,
@@ -106,16 +115,14 @@ class LuaPluginDefinition:
             enabled_by_default=data.get("defaultValue", False),
             options=options,
             work_orders=work_orders,
-            config_work_orders=config_work_orders
+            config_work_orders=config_work_orders,
         )
 
 
 class LuaPlugin(PluginSettings):
-
     def __init__(self, definition: LuaPluginDefinition) -> None:
         self.definition = definition
-        super().__init__(self.definition.identifier,
-                         self.definition.enabled_by_default)
+        super().__init__(self.definition.identifier, self.definition.enabled_by_default)
 
     @property
     def name(self) -> str:
@@ -155,12 +162,12 @@ class LuaPlugin(PluginSettings):
             for option in self.options:
                 enabled = str(option.enabled).lower()
                 name = option.identifier
-                option_decls.append(
-                    f"    dcsLiberation.plugins.{name} = {enabled}")
+                option_decls.append(f"    dcsLiberation.plugins.{name} = {enabled}")
 
             joined_options = "\n".join(option_decls)
 
-            lua = textwrap.dedent(f"""\
+            lua = textwrap.dedent(
+                f"""\
                 -- {self.identifier} plugin configuration.
 
                 if dcsLiberation then
@@ -171,10 +178,10 @@ class LuaPlugin(PluginSettings):
                     {joined_options}
                 end
 
-            """)
+            """
+            )
 
-            operation.inject_lua_trigger(
-                lua, f"{self.identifier} plugin configuration")
+            operation.inject_lua_trigger(lua, f"{self.identifier} plugin configuration")
 
         for work_order in self.definition.config_work_orders:
             work_order.work(operation)

game/plugins/manager.py

@@ -27,7 +27,8 @@ class LuaPluginManager:
             if not plugin_path.exists():
                 raise RuntimeError(
                     f"Invalid plugin configuration: required plugin {name} "
-                    f"does not exist at {plugin_path}")
+                    f"does not exist at {plugin_path}"
+                )
             logging.info(f"Loading plugin {name} from {plugin_path}")
             plugin = LuaPlugin.from_json(name, plugin_path)
             if plugin is not None:

game/point_with_heading.py

@@ -0,0 +1,15 @@
+from dcs import Point
+
+
+class PointWithHeading(Point):
+    def __init__(self):
+        super(PointWithHeading, self).__init__(0, 0)
+        self.heading = 0
+
+    @staticmethod
+    def from_point(point: Point, heading: int):
+        p = PointWithHeading()
+        p.x = point.x
+        p.y = point.y
+        p.heading = heading
+        return p

game/procurement.py

@@ -3,22 +3,24 @@ from __future__ import annotations
 import math
 import random
 from dataclasses import dataclass
-from typing import Iterator, List, Optional, TYPE_CHECKING, Type
+from typing import Iterator, List, Optional, TYPE_CHECKING, Tuple, Type
 
 from dcs.unittype import FlyingType, VehicleType
 
 from game import db
+from game.data.groundunitclass import GroundUnitClass
 from game.factions.faction import Faction
 from game.theater import ControlPoint, MissionTarget
 from game.utils import Distance
 from gen.flights.ai_flight_planner_db import aircraft_for_task
 from gen.flights.closestairfields import ObjectiveDistanceCache
 from gen.flights.flight import FlightType
-from gen.ground_forces.ai_ground_planner_db import TYPE_SHORAD
 
 if TYPE_CHECKING:
     from game import Game
 
+FRONTLINE_RESERVES_FACTOR = 1.3
+
 
 @dataclass(frozen=True)
 class AircraftProcurementRequest:
@@ -35,28 +37,51 @@ class AircraftProcurementRequest:
 
 
 class ProcurementAi:
-    def __init__(self, game: Game, for_player: bool, faction: Faction,
-                 manage_runways: bool, manage_front_line: bool,
-                 manage_aircraft: bool, front_line_budget_share: float) -> None:
-        if front_line_budget_share > 1.0:
-            raise ValueError
+    def __init__(
+        self,
+        game: Game,
+        for_player: bool,
+        faction: Faction,
+        manage_runways: bool,
+        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)
         self.faction = faction
         self.manage_runways = manage_runways
         self.manage_front_line = manage_front_line
         self.manage_aircraft = manage_aircraft
-        self.front_line_budget_share = front_line_budget_share
         self.threat_zones = self.game.threat_zone_for(not self.is_player)
 
-    def spend_budget(
-            self, budget: float,
-            aircraft_requests: List[AircraftProcurementRequest]) -> float:
+    def calculate_ground_unit_budget_share(self) -> float:
+        armor_investment = 0
+        aircraft_investment = 0
+        for cp in self.owned_points:
+            cp_ground_units = cp.allocated_ground_units(self.game.transfers)
+            armor_investment += cp_ground_units.total_value
+            cp_aircraft = cp.allocated_aircraft(self.game)
+            aircraft_investment += cp_aircraft.total_value
+
+        total_investment = aircraft_investment + armor_investment
+        if total_investment == 0:
+            # Turn 0 or all units were destroyed. Either way, split 30/70.
+            return 0.3
+
+        # the more planes we have, the more ground units we want and vice versa
+        ground_unit_share = aircraft_investment / total_investment
+        if ground_unit_share > 1.0:
+            raise ValueError
+
+        return ground_unit_share
+
+    def spend_budget(self, budget: float) -> float:
         if self.manage_runways:
             budget = self.repair_runways(budget)
         if self.manage_front_line:
-            armor_budget = math.ceil(budget * self.front_line_budget_share)
+            armor_budget = budget * self.calculate_ground_unit_budget_share()
             budget -= armor_budget
             budget += self.reinforce_front_line(armor_budget)
 
@@ -65,20 +90,20 @@ class ProcurementAi:
         if not self.is_player:
             budget += self.sell_incomplete_squadrons()
         if self.manage_aircraft:
-            budget = self.purchase_aircraft(budget, aircraft_requests)
+            budget = self.purchase_aircraft(budget)
         return budget
 
     def sell_incomplete_squadrons(self) -> float:
         # Selling incomplete squadrons gives us more money to spend on the next
         # turn. This serves as a short term fix for
-        # https://github.com/Khopa/dcs_liberation/issues/41.
+        # https://github.com/dcs-liberation/dcs_liberation/issues/41.
         #
         # Only incomplete squadrons which are unlikely to get used will be sold
         # rather than all unused aircraft because the unused aircraft are what
         # make OCA strikes worthwhile.
         #
         # This option is only used by the AI since players cannot cancel sales
-        # (https://github.com/Khopa/dcs_liberation/issues/365).
+        # (https://github.com/dcs-liberation/dcs_liberation/issues/365).
         total = 0.0
         for cp in self.game.theater.control_points_for(self.is_player):
             inventory = self.game.aircraft_inventory.for_control_point(cp)
@@ -100,31 +125,22 @@ class ProcurementAi:
                 budget -= db.RUNWAY_REPAIR_COST
                 if self.is_player:
                     self.game.message(
-                        "OPFOR has begun repairing the runway at "
-                        f"{control_point}"
+                        "OPFOR has begun repairing the runway at " f"{control_point}"
                     )
                 else:
                     self.game.message(
-                        "We have begun repairing the runway at "
-                        f"{control_point}"
+                        "We have begun repairing the runway at " f"{control_point}"
                     )
         return budget
 
-    def random_affordable_ground_unit(
-            self, budget: float,
-            cp: ControlPoint) -> Optional[Type[VehicleType]]:
-        affordable_units = [u for u in self.faction.frontline_units + self.faction.artillery_units if
-                            db.PRICES[u] <= budget]
-
-        total_number_aa = cp.base.total_frontline_aa + cp.pending_frontline_aa_deliveries_count
-        total_non_aa = cp.base.total_armor + cp.pending_deliveries_count - total_number_aa
-        max_aa = math.ceil(total_non_aa/8)
-
-        # Limit the number of AA units the AI will buy
-        if not total_number_aa < max_aa:
-            for unit in [u for u in affordable_units if u in TYPE_SHORAD]:
-                affordable_units.remove(unit)
-
+    def affordable_ground_unit_of_class(
+        self, budget: float, unit_class: GroundUnitClass
+    ) -> Optional[Type[VehicleType]]:
+        faction_units = set(self.faction.frontline_units) | set(
+            self.faction.artillery_units
+        )
+        of_class = set(unit_class.unit_list) & faction_units
+        affordable_units = [u for u in of_class if db.PRICES[u] <= budget]
         if not affordable_units:
             return None
         return random.choice(affordable_units)
@@ -133,13 +149,15 @@ class ProcurementAi:
         if not self.faction.frontline_units and not self.faction.artillery_units:
             return budget
 
+        # TODO: Attempt to transfer from reserves.
+
         while budget > 0:
-            candidates = self.front_line_candidates()
-            if not candidates:
+            cp = self.ground_reinforcement_candidate()
+            if cp is None:
                 break
 
-            cp = random.choice(candidates)
-            unit = self.random_affordable_ground_unit(budget, cp)
+            most_needed_type = self.most_needed_unit_class(cp)
+            unit = self.affordable_ground_unit_of_class(budget, most_needed_type)
             if unit is None:
                 # Can't afford any more units.
                 break
@@ -149,48 +167,99 @@ class ProcurementAi:
 
         return budget
 
-    def _affordable_aircraft_of_types(
-            self, types: List[Type[FlyingType]], airbase: ControlPoint,
-            number: int, max_price: float) -> Optional[Type[FlyingType]]:
+    def most_needed_unit_class(self, cp: ControlPoint) -> GroundUnitClass:
+        worst_balanced: Optional[GroundUnitClass] = None
+        worst_fulfillment = math.inf
+        for unit_class in GroundUnitClass:
+            if not self.faction.has_access_to_unittype(unit_class):
+                continue
+
+            current_ratio = self.cost_ratio_of_ground_unit(cp, unit_class)
+            desired_ratio = (
+                self.faction.doctrine.ground_unit_procurement_ratios.for_unit_class(
+                    unit_class
+                )
+            )
+            if not desired_ratio:
+                continue
+            if current_ratio >= desired_ratio:
+                continue
+            fulfillment = current_ratio / desired_ratio
+            if fulfillment < worst_fulfillment:
+                worst_fulfillment = fulfillment
+                worst_balanced = unit_class
+        if worst_balanced is None:
+            return GroundUnitClass.Tank
+        return worst_balanced
+
+    def _affordable_aircraft_for_task(
+        self,
+        task: FlightType,
+        airbase: ControlPoint,
+        number: int,
+        max_price: float,
+    ) -> Optional[Type[FlyingType]]:
         best_choice: Optional[Type[FlyingType]] = None
-        for unit in [u for u in self.faction.aircrafts if u in types]:
+        for unit in aircraft_for_task(task):
+            if unit not in self.faction.aircrafts:
+                continue
             if db.PRICES[unit] * number > max_price:
                 continue
             if not airbase.can_operate(unit):
                 continue
 
-            # Affordable and compatible. To keep some variety, skip with a 50/50
-            # chance. Might be a good idea to have the chance to skip based on
-            # the price compared to the rest of the choices.
+            for squadron in self.air_wing.squadrons_for(unit):
+                if task in squadron.auto_assignable_mission_types:
+                    break
+            else:
+                continue
+
+            # Affordable, compatible, and we have a squadron capable of the task. To
+            # keep some variety, skip with a 50/50 chance. Might be a good idea to have
+            # the chance to skip based on the price compared to the rest of the choices.
             best_choice = unit
             if random.choice([True, False]):
                 break
         return best_choice
 
     def affordable_aircraft_for(
-            self, request: AircraftProcurementRequest,
-            airbase: ControlPoint, budget: float) -> Optional[Type[FlyingType]]:
-        return self._affordable_aircraft_of_types(
-            aircraft_for_task(request.task_capability),
-            airbase, request.number, budget)
+        self, request: AircraftProcurementRequest, airbase: ControlPoint, budget: float
+    ) -> Optional[Type[FlyingType]]:
+        return self._affordable_aircraft_for_task(
+            request.task_capability, airbase, request.number, budget
+        )
 
-    def purchase_aircraft(
-            self, budget: float,
-            aircraft_requests: List[AircraftProcurementRequest]) -> float:
-        for request in aircraft_requests:
-            for airbase in self.best_airbases_for(request):
-                unit = self.affordable_aircraft_for(request, airbase, budget)
-                if unit is None:
-                    # Can't afford any aircraft capable of performing the
-                    # required mission that can operate from this airbase. We
-                    # might be able to afford aircraft at other airbases though,
-                    # in the case where the airbase we attempted to use is only
-                    # able to operate expensive aircraft.
-                    continue
+    def fulfill_aircraft_request(
+        self, request: AircraftProcurementRequest, budget: float
+    ) -> Tuple[float, bool]:
+        for airbase in self.best_airbases_for(request):
+            unit = self.affordable_aircraft_for(request, airbase, budget)
+            if unit is None:
+                # Can't afford any aircraft capable of performing the
+                # required mission that can operate from this airbase. We
+                # might be able to afford aircraft at other airbases though,
+                # in the case where the airbase we attempted to use is only
+                # able to operate expensive aircraft.
+                continue
 
-                budget -= db.PRICES[unit] * request.number
-                airbase.pending_unit_deliveries.order({unit: request.number})
+            budget -= db.PRICES[unit] * request.number
+            airbase.pending_unit_deliveries.order({unit: request.number})
+            return budget, True
+        return budget, False
 
+    def purchase_aircraft(self, budget: float) -> float:
+        for request in self.game.procurement_requests_for(self.is_player):
+            if not list(self.best_airbases_for(request)):
+                # No airbases in range of this request. Skip it.
+                continue
+            budget, fulfilled = self.fulfill_aircraft_request(request, budget)
+            if not fulfilled:
+                # The request was not fulfilled because we could not afford any suitable
+                # aircraft. Rather than continuing, which could proceed to buy tons of
+                # cheap escorts that will never allow us to plan a strike package, stop
+                # buying so we can save the budget until a turn where we *can* afford to
+                # fill the package.
+                break
         return budget
 
     @property
@@ -201,17 +270,13 @@ class ProcurementAi:
             return self.game.theater.enemy_points()
 
     def best_airbases_for(
-            self,
-            request: AircraftProcurementRequest) -> Iterator[ControlPoint]:
-        distance_cache = ObjectiveDistanceCache.get_closest_airfields(
-            request.near
-        )
+        self, request: AircraftProcurementRequest
+    ) -> Iterator[ControlPoint]:
+        distance_cache = ObjectiveDistanceCache.get_closest_airfields(request.near)
         threatened = []
-        for cp in distance_cache.airfields_within(request.range):
+        for cp in distance_cache.operational_airfields_within(request.range):
             if not cp.is_friendly(self.is_player):
                 continue
-            if not cp.runway_is_operational():
-                continue
             if cp.unclaimed_parking(self.game) < request.number:
                 continue
             if self.threat_zones.threatened(cp.position):
@@ -219,37 +284,69 @@ class ProcurementAi:
             yield cp
         yield from threatened
 
-    def front_line_candidates(self) -> List[ControlPoint]:
-        candidates = []
+    def ground_reinforcement_candidate(self) -> Optional[ControlPoint]:
+        worst_supply = math.inf
+        understaffed: Optional[ControlPoint] = None
 
         # Prefer to buy front line units at active front lines that are not
         # already overloaded.
         for cp in self.owned_points:
-            if cp.expected_ground_units_next_turn.total >= 30:
+            if not cp.has_active_frontline:
+                continue
+
+            if not cp.has_ground_unit_source(self.game):
+                # No source of ground units, so can't buy anything.
+                continue
+
+            purchase_target = cp.frontline_unit_count_limit * FRONTLINE_RESERVES_FACTOR
+            allocated = cp.allocated_ground_units(self.game.transfers)
+            if allocated.total >= purchase_target:
                 # Control point is already sufficiently defended.
                 continue
-            for connected in cp.connected_points:
-                if not connected.is_friendly(to_player=self.is_player):
-                    candidates.append(cp)
+            if allocated.total < worst_supply:
+                worst_supply = allocated.total
+                understaffed = cp
 
-        if not candidates:
-            # Otherwise buy reserves, but don't exceed 10 reserve units per CP.
-            # These units do not exist in the world until the CP becomes
-            # connected to an active front line, at which point all these units
-            # will suddenly appear at the gates of the newly captured CP.
-            #
-            # To avoid sudden overwhelming numbers of units we avoid buying
-            # many.
-            #
-            # Also, do not bother buying units at bases that will never connect
-            # to a front line.
-            for cp in self.owned_points:
-                if not cp.can_deploy_ground_units:
-                    continue
-                if cp.expected_ground_units_next_turn.total >= 10:
-                    continue
-                if cp.is_global:
-                    continue
-                candidates.append(cp)
+        if understaffed is not None:
+            return understaffed
 
-        return candidates
+        # Otherwise buy reserves, but don't exceed the amount defined in the settings.
+        # These units do not exist in the world until the CP becomes
+        # connected to an active front line, at which point all these units
+        # will suddenly appear at the gates of the newly captured CP.
+        #
+        # To avoid sudden overwhelming numbers of units we avoid buying
+        # many.
+        #
+        # Also, do not bother buying units at bases that will never connect
+        # to a front line.
+        for cp in self.owned_points:
+            if cp.is_global:
+                continue
+            if not cp.can_recruit_ground_units(self.game):
+                continue
+
+            allocated = cp.allocated_ground_units(self.game.transfers)
+            if allocated.total >= self.game.settings.reserves_procurement_target:
+                continue
+
+            if allocated.total < worst_supply:
+                worst_supply = allocated.total
+                understaffed = cp
+
+        return understaffed
+
+    def cost_ratio_of_ground_unit(
+        self, control_point: ControlPoint, unit_class: GroundUnitClass
+    ) -> float:
+        allocations = control_point.allocated_ground_units(self.game.transfers)
+        class_cost = 0
+        total_cost = 0
+        for unit_type, count in allocations.all.items():
+            cost = db.PRICES[unit_type] * count
+            total_cost += cost
+            if unit_type in unit_class:
+                class_cost += cost
+        if not total_cost:
+            return 0
+        return class_cost / total_cost

game/profiling.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+import logging
+import timeit
+from collections import defaultdict
+from contextlib import contextmanager
+from datetime import timedelta
+from typing import Iterator
+
+
+@contextmanager
+def logged_duration(event: str) -> Iterator[None]:
+    start = timeit.default_timer()
+    yield
+    end = timeit.default_timer()
+    logging.debug("%s took %s", event, timedelta(seconds=end - start))
+
+
+class MultiEventTracer:
+    def __init__(self) -> None:
+        self.events: dict[str, timedelta] = defaultdict(timedelta)
+
+    def __enter__(self) -> MultiEventTracer:
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        for event, duration in self.events.items():
+            logging.debug("%s took %s", event, duration)
+
+    @contextmanager
+    def trace(self, event: str) -> Iterator[None]:
+        start = timeit.default_timer()
+        yield
+        end = timeit.default_timer()
+        self.events[event] += timedelta(seconds=end - start)

game/scenery_group.py

@@ -0,0 +1,89 @@
+from __future__ import annotations
+from game.theater.theatergroundobject import NAME_BY_CATEGORY
+from dcs.triggers import TriggerZone
+
+from typing import Iterable, List
+
+
+class SceneryGroupError(RuntimeError):
+    """Error for when there are insufficient conditions to create a SceneryGroup."""
+
+    pass
+
+
+class SceneryGroup:
+    """Store information about a scenery objective."""
+
+    def __init__(
+        self, zone_def: TriggerZone, zones: Iterable[TriggerZone], category: str
+    ) -> None:
+
+        self.zone_def = zone_def
+        self.zones = zones
+        self.position = zone_def.position
+        self.category = category
+
+    @staticmethod
+    def from_trigger_zones(trigger_zones: Iterable[TriggerZone]) -> List[SceneryGroup]:
+        """Define scenery objectives based on their encompassing blue/red circle."""
+        zone_definitions = []
+        white_zones = []
+
+        scenery_groups = []
+
+        # Aggregate trigger zones into different groups based on color.
+        for zone in trigger_zones:
+            if SceneryGroup.is_blue(zone):
+                zone_definitions.append(zone)
+            if SceneryGroup.is_white(zone):
+                white_zones.append(zone)
+
+        # For each objective definition.
+        for zone_def in zone_definitions:
+
+            zone_def_radius = zone_def.radius
+            zone_def_position = zone_def.position
+            zone_def_name = zone_def.name
+
+            if len(zone_def.properties) == 0:
+                raise SceneryGroupError(
+                    "Undefined SceneryGroup category in TriggerZone: " + zone_def_name
+                )
+
+            # Arbitrary campaign design requirement:  First property must define the category.
+            zone_def_category = zone_def.properties[1].get("value").lower()
+
+            valid_white_zones = []
+
+            for zone in list(white_zones):
+                if zone.position.distance_to_point(zone_def_position) < zone_def_radius:
+                    valid_white_zones.append(zone)
+                    white_zones.remove(zone)
+
+            if len(valid_white_zones) > 0 and zone_def_category in NAME_BY_CATEGORY:
+                scenery_groups.append(
+                    SceneryGroup(zone_def, valid_white_zones, zone_def_category)
+                )
+            elif len(valid_white_zones) == 0:
+                raise SceneryGroupError(
+                    "No white triggerzones found in: " + zone_def_name
+                )
+            elif zone_def_category not in NAME_BY_CATEGORY:
+                raise SceneryGroupError(
+                    "Incorrect TriggerZone category definition for: "
+                    + zone_def_name
+                    + " in campaign definition.  TriggerZone category: "
+                    + zone_def_category
+                )
+
+        return scenery_groups
+
+    @staticmethod
+    def is_blue(zone: TriggerZone) -> bool:
+        # Blue in RGB is [0 Red], [0 Green], [1 Blue]. Ignore the fourth position: Transparency.
+        return zone.color[1] == 0 and zone.color[2] == 0 and zone.color[3] == 1
+
+    @staticmethod
+    def is_white(zone: TriggerZone) -> bool:
+        # White in RGB is [1 Red], [1 Green], [1 Blue]. Ignore the fourth position: Transparency.
+        return zone.color[1] == 1 and zone.color[2] == 1 and zone.color[3] == 1

game/settings.py

@@ -1,9 +1,19 @@
 from dataclasses import dataclass, field
+from datetime import timedelta
+from enum import Enum, unique
 from typing import Dict, Optional
 
 from dcs.forcedoptions import ForcedOptions
 
 
+@unique
+class AutoAtoBehavior(Enum):
+    Disabled = "Disabled"
+    Never = "Never assign player pilots"
+    Default = "No preference"
+    Prefer = "Prefer player pilots"
+
+
 @dataclass
 class Settings:
 
@@ -25,19 +35,29 @@ class Settings:
 
     default_start_type: str = "Cold"
 
+    # Mission specific
+    desired_player_mission_duration: timedelta = timedelta(minutes=60)
+
     # Campaign management
     automate_runway_repair: bool = False
     automate_front_line_reinforcements: bool = False
     automate_aircraft_reinforcements: bool = False
     restrict_weapons_by_date: bool = False
+    disable_legacy_aewc: bool = True
+    generate_dark_kneeboard: bool = False
+    invulnerable_player_pilots: bool = True
+    auto_ato_behavior: AutoAtoBehavior = AutoAtoBehavior.Default
+    auto_ato_player_missions_asap: bool = True
 
     # Performance oriented
     perf_red_alert_state: bool = True
     perf_smoke_gen: bool = True
+    perf_smoke_spacing = 1600
     perf_artillery: bool = True
     perf_moving_units: bool = True
     perf_infantry: bool = True
     perf_destroyed_units: bool = True
+    reserves_procurement_target: int = 10
 
     # Performance culling
     perf_culling: bool = False
@@ -58,8 +78,7 @@ class Settings:
     def plugin_settings_key(identifier: str) -> str:
         return f"plugins.{identifier}"
 
-    def initialize_plugin_option(self, identifier: str,
-                                 default_value: bool) -> None:
+    def initialize_plugin_option(self, identifier: str, default_value: bool) -> None:
         try:
             self.plugin_option(identifier)
         except KeyError:

game/squadrons.py

@@ -0,0 +1,373 @@
+from __future__ import annotations
+
+import itertools
+import logging
+import random
+from collections import defaultdict
+from dataclasses import dataclass, field
+from enum import unique, Enum
+from pathlib import Path
+from typing import (
+    Type,
+    Tuple,
+    TYPE_CHECKING,
+    Optional,
+    Iterator,
+    Sequence,
+)
+
+import yaml
+from dcs.unittype import FlyingType
+from faker import Faker
+
+from game.db import flying_type_from_name
+from game.settings import AutoAtoBehavior
+
+if TYPE_CHECKING:
+    from game import Game
+    from gen.flights.flight import FlightType
+
+
+@dataclass
+class PilotRecord:
+    missions_flown: int = field(default=0)
+
+
+@unique
+class PilotStatus(Enum):
+    Active = "Active"
+    OnLeave = "On leave"
+    Dead = "Dead"
+
+
+@dataclass
+class Pilot:
+    name: str
+    player: bool = field(default=False)
+    status: PilotStatus = field(default=PilotStatus.Active)
+    record: PilotRecord = field(default_factory=PilotRecord)
+
+    @property
+    def alive(self) -> bool:
+        return self.status is not PilotStatus.Dead
+
+    @property
+    def on_leave(self) -> bool:
+        return self.status is PilotStatus.OnLeave
+
+    def send_on_leave(self) -> None:
+        if self.status is not PilotStatus.Active:
+            raise RuntimeError("Only active pilots may be sent on leave")
+        self.status = PilotStatus.OnLeave
+
+    def return_from_leave(self) -> None:
+        if self.status is not PilotStatus.OnLeave:
+            raise RuntimeError("Only pilots on leave may be returned from leave")
+        self.status = PilotStatus.Active
+
+    def kill(self) -> None:
+        self.status = PilotStatus.Dead
+
+    @classmethod
+    def random(cls, faker: Faker) -> Pilot:
+        return Pilot(faker.name())
+
+
+@dataclass
+class Squadron:
+    name: str
+    nickname: str
+    country: str
+    role: str
+    aircraft: Type[FlyingType]
+    livery: Optional[str]
+    mission_types: tuple[FlightType, ...]
+    pilots: list[Pilot]
+    available_pilots: list[Pilot] = field(init=False, hash=False, compare=False)
+    auto_assignable_mission_types: set[FlightType] = field(
+        init=False, hash=False, compare=False
+    )
+
+    # We need a reference to the Game so that we can access the Faker without needing to
+    # persist it to the save game, or having to reconstruct it (it's not cheap) each
+    # time we create or load a squadron.
+    game: Game = field(hash=False, compare=False)
+    player: bool
+
+    def __post_init__(self) -> None:
+        self.available_pilots = list(self.active_pilots)
+        self.auto_assignable_mission_types = set(self.mission_types)
+
+    def __str__(self) -> str:
+        return f'{self.name} "{self.nickname}"'
+
+    def claim_available_pilot(self) -> Optional[Pilot]:
+        # No pilots available, so the preference is irrelevant. Create a new pilot and
+        # return it.
+        if not self.available_pilots:
+            self.enlist_new_pilots(1)
+            return self.available_pilots.pop()
+
+        # For opfor, so player/AI option is irrelevant.
+        if not self.player:
+            return self.available_pilots.pop()
+
+        preference = self.game.settings.auto_ato_behavior
+
+        # No preference, so the first pilot is fine.
+        if preference is AutoAtoBehavior.Default:
+            return self.available_pilots.pop()
+
+        prefer_players = preference is AutoAtoBehavior.Prefer
+        for pilot in self.available_pilots:
+            if pilot.player == prefer_players:
+                self.available_pilots.remove(pilot)
+                return pilot
+
+        # No pilot was found that matched the user's preference.
+        #
+        # If they chose to *never* assign players and only players remain in the pool,
+        # we cannot fill the slot with the available pilots. Recruit a new one.
+        #
+        # If they prefer players and we're out of players, just return an AI pilot.
+        if not prefer_players:
+            self.enlist_new_pilots(1)
+        return self.available_pilots.pop()
+
+    def claim_pilot(self, pilot: Pilot) -> None:
+        if pilot not in self.available_pilots:
+            raise ValueError(
+                f"Cannot assign {pilot} to {self} because they are not available"
+            )
+        self.available_pilots.remove(pilot)
+
+    def return_pilot(self, pilot: Pilot) -> None:
+        self.available_pilots.append(pilot)
+
+    def return_pilots(self, pilots: Sequence[Pilot]) -> None:
+        # Return in reverse so that returning two pilots and then getting two more
+        # results in the same ordering. This happens commonly when resetting rosters in
+        # the UI, when we clear the roster because the UI is updating, then end up
+        # repopulating the same size flight from the same squadron.
+        self.available_pilots.extend(reversed(pilots))
+
+    def enlist_new_pilots(self, count: int) -> None:
+        new_pilots = [Pilot(self.faker.name()) for _ in range(count)]
+        self.pilots.extend(new_pilots)
+        self.available_pilots.extend(new_pilots)
+
+    def return_all_pilots(self) -> None:
+        self.available_pilots = list(self.active_pilots)
+
+    @property
+    def faker(self) -> Faker:
+        return self.game.faker_for(self.player)
+
+    def _pilots_with_status(self, status: PilotStatus) -> list[Pilot]:
+        return [p for p in self.pilots if p.status == status]
+
+    def _pilots_without_status(self, status: PilotStatus) -> list[Pilot]:
+        return [p for p in self.pilots if p.status != status]
+
+    @property
+    def active_pilots(self) -> list[Pilot]:
+        return self._pilots_with_status(PilotStatus.Active)
+
+    @property
+    def pilots_on_leave(self) -> list[Pilot]:
+        return self._pilots_with_status(PilotStatus.OnLeave)
+
+    @property
+    def number_of_pilots_including_dead(self) -> int:
+        return len(self.pilots)
+
+    @property
+    def number_of_living_pilots(self) -> int:
+        return len(self._pilots_without_status(PilotStatus.Dead))
+
+    def pilot_at_index(self, index: int) -> Pilot:
+        return self.pilots[index]
+
+    @classmethod
+    def from_yaml(cls, path: Path, game: Game, player: bool) -> Squadron:
+        from gen.flights.ai_flight_planner_db import tasks_for_aircraft
+        from gen.flights.flight import FlightType
+
+        with path.open() as squadron_file:
+            data = yaml.safe_load(squadron_file)
+
+        unit_type = flying_type_from_name(data["aircraft"])
+        if unit_type is None:
+            raise KeyError(f"Could not find any aircraft with the ID {unit_type}")
+
+        pilots = [Pilot(n, player=False) for n in data.get("pilots", [])]
+        pilots.extend([Pilot(n, player=True) for n in data.get("players", [])])
+
+        mission_types = [FlightType.from_name(n) for n in data["mission_types"]]
+        tasks = tasks_for_aircraft(unit_type)
+        for mission_type in list(mission_types):
+            if mission_type not in tasks:
+                logging.error(
+                    f"Squadron has mission type {mission_type} but {unit_type} is not "
+                    f"capable of that task: {path}"
+                )
+                mission_types.remove(mission_type)
+
+        return Squadron(
+            name=data["name"],
+            nickname=data["nickname"],
+            country=data["country"],
+            role=data["role"],
+            aircraft=unit_type,
+            livery=data.get("livery"),
+            mission_types=tuple(mission_types),
+            pilots=pilots,
+            game=game,
+            player=player,
+        )
+
+    def __setstate__(self, state) -> None:
+        # TODO: Remove save compat.
+        if "auto_assignable_mission_types" not in state:
+            state["auto_assignable_mission_types"] = set(state["mission_types"])
+        self.__dict__.update(state)
+
+
+class SquadronLoader:
+    def __init__(self, game: Game, player: bool) -> None:
+        self.game = game
+        self.player = player
+
+    @staticmethod
+    def squadron_directories() -> Iterator[Path]:
+        from game import persistency
+
+        yield Path(persistency.base_path()) / "Liberation/Squadrons"
+        yield Path("resources/squadrons")
+
+    def load(self) -> dict[Type[FlyingType], list[Squadron]]:
+        squadrons: dict[Type[FlyingType], list[Squadron]] = defaultdict(list)
+        country = self.game.country_for(self.player)
+        faction = self.game.faction_for(self.player)
+        any_country = country.startswith("Combined Joint Task Forces ")
+        for directory in self.squadron_directories():
+            for path, squadron in self.load_squadrons_from(directory):
+                if not any_country and squadron.country != country:
+                    logging.debug(
+                        "Not using squadron for non-matching country (is "
+                        f"{squadron.country}, need {country}: {path}"
+                    )
+                    continue
+                if squadron.aircraft not in faction.aircrafts:
+                    logging.debug(
+                        f"Not using squadron because {faction.name} cannot use "
+                        f"{squadron.aircraft}: {path}"
+                    )
+                    continue
+                logging.debug(
+                    f"Found {squadron.name} {squadron.aircraft} {squadron.role} "
+                    f"compatible with {faction.name}"
+                )
+                squadrons[squadron.aircraft].append(squadron)
+        # Convert away from defaultdict because defaultdict doesn't unpickle so we don't
+        # want it in the save state.
+        return dict(squadrons)
+
+    def load_squadrons_from(self, directory: Path) -> Iterator[Tuple[Path, Squadron]]:
+        logging.debug(f"Looking for factions in {directory}")
+        # First directory level is the aircraft type so that historical squadrons that
+        # have flown multiple airframes can be defined as many times as needed. The main
+        # load() method is responsible for filtering out squadrons that aren't
+        # compatible with the faction.
+        for squadron_path in directory.glob("*/*.yaml"):
+            try:
+                yield squadron_path, Squadron.from_yaml(
+                    squadron_path, self.game, self.player
+                )
+            except Exception as ex:
+                raise RuntimeError(
+                    f"Failed to load squadron defined by {squadron_path}"
+                ) from ex
+
+
+class AirWing:
+    def __init__(self, game: Game, player: bool) -> None:
+        from gen.flights.ai_flight_planner_db import tasks_for_aircraft
+
+        self.game = game
+        self.player = player
+        self.squadrons = SquadronLoader(game, player).load()
+
+        count = itertools.count(1)
+        for aircraft in game.faction_for(player).aircrafts:
+            if aircraft in self.squadrons:
+                continue
+            self.squadrons[aircraft] = [
+                Squadron(
+                    name=f"Squadron {next(count):03}",
+                    nickname=self.random_nickname(),
+                    country=game.country_for(player),
+                    role="Flying Squadron",
+                    aircraft=aircraft,
+                    livery=None,
+                    mission_types=tuple(tasks_for_aircraft(aircraft)),
+                    pilots=[],
+                    game=game,
+                    player=player,
+                )
+            ]
+
+    def squadrons_for(self, aircraft: Type[FlyingType]) -> Sequence[Squadron]:
+        return self.squadrons[aircraft]
+
+    def squadrons_for_task(self, task: FlightType) -> Iterator[Squadron]:
+        for squadron in self.iter_squadrons():
+            if task in squadron.mission_types:
+                yield squadron
+
+    def squadron_for(self, aircraft: Type[FlyingType]) -> Squadron:
+        return self.squadrons_for(aircraft)[0]
+
+    def iter_squadrons(self) -> Iterator[Squadron]:
+        return itertools.chain.from_iterable(self.squadrons.values())
+
+    def squadron_at_index(self, index: int) -> Squadron:
+        return list(self.iter_squadrons())[index]
+
+    def reset(self) -> None:
+        for squadron in self.iter_squadrons():
+            squadron.return_all_pilots()
+
+    @property
+    def size(self) -> int:
+        return sum(len(s) for s in self.squadrons.values())
+
+    @staticmethod
+    def _make_random_nickname() -> str:
+        from gen.naming import ANIMALS
+
+        animal = random.choice(ANIMALS)
+        adjective = random.choice(
+            (
+                None,
+                "Red",
+                "Blue",
+                "Green",
+                "Golden",
+                "Black",
+                "Fighting",
+                "Flying",
+            )
+        )
+        if adjective is None:
+            return animal.title()
+        return f"{adjective} {animal}".title()
+
+    def random_nickname(self) -> str:
+        while True:
+            nickname = self._make_random_nickname()
+            for squadron in self.iter_squadrons():
+                if squadron.nickname == nickname:
+                    break
+            else:
+                return nickname

game/theater/__init__.py

@@ -1,5 +1,6 @@
 from .base import *
 from .conflicttheater import *
 from .controlpoint import *
+from .frontline import FrontLine
 from .missiontarget import MissionTarget
 from .theatergroundobject import SamGroundObject

game/theater/base.py

@@ -4,13 +4,12 @@ import math
 import typing
 from typing import Dict, Type
 
-from dcs.task import CAP, CAS, Embarking, PinpointStrike, Task
+from dcs.task import AWACS, CAP, CAS, Embarking, PinpointStrike, Task, Transport
 from dcs.unittype import FlyingType, UnitType, VehicleType
 from dcs.vehicles import AirDefence, Armor
 
 from game import db
 from game.db import PRICES
-from gen.ground_forces.ai_ground_planner_db import TYPE_SHORAD
 
 STRENGTH_AA_ASSEMBLE_MIN = 0.2
 PLANES_SCRAMBLE_MIN_BASE = 2
@@ -22,10 +21,10 @@ BASE_MIN_STRENGTH = 0
 
 
 class Base:
-
     def __init__(self):
         self.aircraft: Dict[Type[FlyingType], int] = {}
         self.armor: Dict[Type[VehicleType], int] = {}
+        # TODO: Appears unused.
         self.aa: Dict[AirDefence, int] = {}
         self.commision_points: Dict[Type, float] = {}
         self.strength = 1
@@ -48,32 +47,48 @@ class Base:
                 logging.exception(f"No price found for {unit_type.id}")
         return total
 
-    @property
-    def total_frontline_aa(self) -> int:
-        return sum([v for k, v in self.armor.items() if k in TYPE_SHORAD])
-
     @property
     def total_aa(self) -> int:
         return sum(self.aa.values())
 
     def total_units(self, task: Task) -> int:
-        return sum([c for t, c in itertools.chain(self.aircraft.items(), self.armor.items(), self.aa.items()) if t in db.UNIT_BY_TASK[task]])
+        return sum(
+            [
+                c
+                for t, c in itertools.chain(
+                    self.aircraft.items(), self.armor.items(), self.aa.items()
+                )
+                if t in db.UNIT_BY_TASK[task]
+            ]
+        )
 
     def total_units_of_type(self, unit_type) -> int:
-        return sum([c for t, c in itertools.chain(self.aircraft.items(), self.armor.items(), self.aa.items()) if t == unit_type])
+        return sum(
+            [
+                c
+                for t, c in itertools.chain(
+                    self.aircraft.items(), self.armor.items(), self.aa.items()
+                )
+                if t == unit_type
+            ]
+        )
 
     @property
     def all_units(self):
-        return itertools.chain(self.aircraft.items(), self.armor.items(), self.aa.items())
+        return itertools.chain(
+            self.aircraft.items(), self.armor.items(), self.aa.items()
+        )
 
-    def _find_best_unit(self, available_units: Dict[UnitType, int],
-                        for_type: Task, count: int) -> Dict[UnitType, int]:
+    def _find_best_unit(
+        self, available_units: Dict[UnitType, int], for_type: Task, count: int
+    ) -> Dict[UnitType, int]:
         if count <= 0:
             logging.warning("{}: no units for {}".format(self, for_type))
             return {}
 
-        sorted_units = [key for key in available_units if
-                        key in db.UNIT_BY_TASK[for_type]]
+        sorted_units = [
+            key for key in available_units if key in db.UNIT_BY_TASK[for_type]
+        ]
         sorted_units.sort(key=lambda x: db.PRICES[x], reverse=True)
 
         result: Dict[UnitType, int] = {}
@@ -94,14 +109,18 @@ class Base:
         logging.info("{} for {} ({}): {}".format(self, for_type, count, result))
         return result
 
-    def _find_best_planes(self, for_type: Task, count: int) -> typing.Dict[FlyingType, int]:
+    def _find_best_planes(
+        self, for_type: Task, count: int
+    ) -> typing.Dict[FlyingType, int]:
         return self._find_best_unit(self.aircraft, for_type, count)
 
     def _find_best_armor(self, for_type: Task, count: int) -> typing.Dict[Armor, int]:
         return self._find_best_unit(self.armor, for_type, count)
 
     def append_commision_points(self, for_type, points: float) -> int:
-        self.commision_points[for_type] = self.commision_points.get(for_type, 0) + points
+        self.commision_points[for_type] = (
+            self.commision_points.get(for_type, 0) + points
+        )
         points = self.commision_points[for_type]
         if points >= 1:
             self.commision_points[for_type] = points - math.floor(points)
@@ -110,7 +129,9 @@ class Base:
         return 0
 
     def filter_units(self, applicable_units: typing.Collection):
-        self.aircraft = {k: v for k, v in self.aircraft.items() if k in applicable_units}
+        self.aircraft = {
+            k: v for k, v in self.aircraft.items() if k in applicable_units
+        }
         self.armor = {k: v for k, v in self.armor.items() if k in applicable_units}
 
     def commision_units(self, units: typing.Dict[typing.Any, int]):
@@ -122,7 +143,13 @@ class Base:
             for_task = db.unit_task(unit_type)
 
             target_dict = None
-            if for_task == CAS or for_task == CAP or for_task == Embarking:
+            if (
+                for_task == AWACS
+                or for_task == CAS
+                or for_task == CAP
+                or for_task == Embarking
+                or for_task == Transport
+            ):
                 target_dict = self.aircraft
             elif for_task == PinpointStrike:
                 target_dict = self.armor
@@ -149,7 +176,7 @@ class Base:
             if unit_type not in target_array:
                 print("Base didn't find event type {}".format(unit_type))
                 continue
-                
+
             target_array[unit_type] = max(target_array[unit_type] - count, 0)
             if target_array[unit_type] == 0:
                 del target_array[unit_type]
@@ -166,12 +193,20 @@ class Base:
 
     def scramble_count(self, multiplier: float, task: Task = None) -> int:
         if task:
-            count = sum([v for k, v in self.aircraft.items() if db.unit_task(k) == task])
+            count = sum(
+                [v for k, v in self.aircraft.items() if db.unit_task(k) == task]
+            )
         else:
             count = self.total_aircraft
 
         count = int(math.ceil(count * PLANES_SCRAMBLE_FACTOR * self.strength))
-        return min(min(max(count, PLANES_SCRAMBLE_MIN_BASE), int(PLANES_SCRAMBLE_MAX_BASE * multiplier)), count)
+        return min(
+            min(
+                max(count, PLANES_SCRAMBLE_MIN_BASE),
+                int(PLANES_SCRAMBLE_MAX_BASE * multiplier),
+            ),
+            count,
+        )
 
     def assemble_count(self):
         return int(self.total_armor * 0.5)
@@ -202,4 +237,8 @@ class Base:
         return self._find_best_armor(PinpointStrike, count)
 
     def assemble_aa(self, count=None) -> typing.Dict[AirDefence, int]:
-        return self._find_best_unit(self.aa, AirDefence, count and min(count, self.total_aa) or self.assemble_aa_count())
+        return self._find_best_unit(
+            self.aa,
+            AirDefence,
+            count and min(count, self.total_aa) or self.assemble_aa_count(),
+        )

game/theater/bullseye.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Dict, TYPE_CHECKING
+
+from dcs import Point
+
+from game.theater import LatLon
+
+if TYPE_CHECKING:
+    from game.theater import ConflictTheater
+
+
+@dataclass
+class Bullseye:
+    position: Point
+
+    @classmethod
+    def from_pydcs(cls, bulls: Dict[str, float]) -> Bullseye:
+        return cls(Point(bulls["x"], bulls["y"]))
+
+    def to_pydcs(self) -> Dict[str, float]:
+        return {"x": self.position.x, "y": self.position.y}
+
+    def to_lat_lon(self, theater: ConflictTheater) -> LatLon:
+        return theater.point_to_ll(self.position)

game/theater/caucasus.py

@@ -0,0 +1,8 @@
+from game.theater.projections import TransverseMercator
+
+PARAMETERS = TransverseMercator(
+    central_meridian=33,
+    false_easting=-99516.9999999732,
+    false_northing=-4998114.999999984,
+    scale_factor=0.9996,
+)

game/theater/frontline.py

@@ -0,0 +1,179 @@
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass
+from typing import Iterator, List, Tuple
+
+from dcs.mapping import Point
+
+from gen.flights.flight import FlightType
+from .controlpoint import (
+    ControlPoint,
+    MissionTarget,
+)
+from ..utils import pairwise
+
+
+FRONTLINE_MIN_CP_DISTANCE = 5000
+
+
+@dataclass
+class FrontLineSegment:
+    """
+    Describes a line segment of a FrontLine
+    """
+
+    point_a: Point
+    point_b: Point
+
+    @property
+    def attack_heading(self) -> float:
+        """The heading of the frontline segment from player to enemy control point"""
+        return self.point_a.heading_between_point(self.point_b)
+
+    @property
+    def attack_distance(self) -> float:
+        """Length of the segment"""
+        return self.point_a.distance_to_point(self.point_b)
+
+
+class FrontLine(MissionTarget):
+    """Defines a front line location between two control points.
+    Front lines are the area where ground combat happens.
+    Overwrites the entirety of MissionTarget __init__ method to allow for
+    dynamic position calculation.
+    """
+
+    def __init__(
+        self,
+        blue_point: ControlPoint,
+        red_point: ControlPoint,
+    ) -> None:
+        self.blue_cp = blue_point
+        self.red_cp = red_point
+        try:
+            route = list(blue_point.convoy_route_to(red_point))
+        except KeyError:
+            # Some campaigns are air only and the mission generator currently relies on
+            # *some* "front line" being drawn between these two. In this case there will
+            # be no supply route to follow. Just create an arbitrary route between the
+            # two points.
+            route = [blue_point.position, red_point.position]
+        # Snap the beginning and end points to the CPs rather than the convoy waypoints,
+        # which are on roads.
+        route[0] = blue_point.position
+        route[-1] = red_point.position
+        self.segments: List[FrontLineSegment] = [
+            FrontLineSegment(a, b) for a, b in pairwise(route)
+        ]
+        self.name = f"Front line {blue_point}/{red_point}"
+
+    def control_point_hostile_to(self, player: bool) -> ControlPoint:
+        if player:
+            return self.red_cp
+        return self.blue_cp
+
+    def is_friendly(self, to_player: bool) -> bool:
+        """Returns True if the objective is in friendly territory."""
+        return False
+
+    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
+        yield from [
+            FlightType.CAS,
+            FlightType.AEWC,
+            # TODO: FlightType.TROOP_TRANSPORT
+            # TODO: FlightType.EVAC
+        ]
+        yield from super().mission_types(for_player)
+
+    @property
+    def position(self):
+        """
+        The position where the conflict should occur
+        according to the current strength of each control point.
+        """
+        return self.point_from_a(self._position_distance)
+
+    @property
+    def points(self) -> Iterator[Point]:
+        yield self.segments[0].point_a
+        for segment in self.segments:
+            yield segment.point_b
+
+    @property
+    def control_points(self) -> Tuple[ControlPoint, ControlPoint]:
+        """Returns a tuple of the two control points."""
+        return self.blue_cp, self.red_cp
+
+    @property
+    def attack_distance(self):
+        """The total distance of all segments"""
+        return sum(i.attack_distance for i in self.segments)
+
+    @property
+    def attack_heading(self):
+        """The heading of the active attack segment from player to enemy control point"""
+        return self.active_segment.attack_heading
+
+    @property
+    def active_segment(self) -> FrontLineSegment:
+        """The FrontLine segment where there can be an active conflict"""
+        if self._position_distance <= self.segments[0].attack_distance:
+            return self.segments[0]
+
+        remaining_dist = self._position_distance
+        for segment in self.segments:
+            if remaining_dist <= segment.attack_distance:
+                return segment
+            else:
+                remaining_dist -= segment.attack_distance
+        logging.error(
+            "Frontline attack distance is greater than the sum of its segments"
+        )
+        return self.segments[0]
+
+    def point_from_a(self, distance: float) -> Point:
+        """
+        Returns a point {distance} away from control_point_a along the frontline segments.
+        """
+        if distance < self.segments[0].attack_distance:
+            return self.blue_cp.position.point_from_heading(
+                self.segments[0].attack_heading, distance
+            )
+        remaining_dist = distance
+        for segment in self.segments:
+            if remaining_dist < segment.attack_distance:
+                return segment.point_a.point_from_heading(
+                    segment.attack_heading, remaining_dist
+                )
+            else:
+                remaining_dist -= segment.attack_distance
+
+    @property
+    def _position_distance(self) -> float:
+        """
+        The distance from point "a" where the conflict should occur
+        according to the current strength of each control point
+        """
+        total_strength = self.blue_cp.base.strength + self.red_cp.base.strength
+        if self.blue_cp.base.strength == 0:
+            return self._adjust_for_min_dist(0)
+        if self.red_cp.base.strength == 0:
+            return self._adjust_for_min_dist(self.attack_distance)
+        strength_pct = self.blue_cp.base.strength / total_strength
+        return self._adjust_for_min_dist(strength_pct * self.attack_distance)
+
+    def _adjust_for_min_dist(self, distance: float) -> float:
+        """
+        Ensures the frontline conflict is never located within the minimum distance
+        constant of either end control point.
+        """
+        if (distance > self.attack_distance / 2) and (
+            distance + FRONTLINE_MIN_CP_DISTANCE > self.attack_distance
+        ):
+            distance = self.attack_distance - FRONTLINE_MIN_CP_DISTANCE
+        elif (distance < self.attack_distance / 2) and (
+            distance < FRONTLINE_MIN_CP_DISTANCE
+        ):
+            distance = FRONTLINE_MIN_CP_DISTANCE
+        return distance

game/theater/landmap.py

@@ -46,4 +46,3 @@ def poly_centroid(poly) -> Tuple[float, float]:
     x = sum(x_list) / len(poly)
     y = sum(y_list) / len(poly)
     return (x, y)
-

game/theater/latlon.py

@@ -0,0 +1,34 @@
+from dataclasses import dataclass
+from typing import List, Tuple
+
+
+@dataclass(frozen=True)
+class LatLon:
+    latitude: float
+    longitude: float
+
+    def as_list(self) -> List[float]:
+        return [self.latitude, self.longitude]
+
+    @staticmethod
+    def _components(dimension: float) -> Tuple[int, int, float]:
+        degrees = int(dimension)
+        minutes = int(dimension * 60 % 60)
+        seconds = dimension * 3600 % 60
+        return degrees, minutes, seconds
+
+    def _format_component(
+        self, dimension: float, hemispheres: Tuple[str, str], seconds_precision: int
+    ) -> str:
+        hemisphere = hemispheres[0] if dimension >= 0 else hemispheres[1]
+        degrees, minutes, seconds = self._components(dimension)
+        return f"{degrees}°{minutes:02}'{seconds:02.{seconds_precision}f}\"{hemisphere}"
+
+    def format_dms(self, include_decimal_seconds: bool = False) -> str:
+        precision = 2 if include_decimal_seconds else 0
+        return " ".join(
+            [
+                self._format_component(self.latitude, ("N", "S"), precision),
+                self._format_component(self.longitude, ("E", "W"), precision),
+            ]
+        )

game/theater/missiontarget.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from typing import Iterator, TYPE_CHECKING
+from typing import Iterator, TYPE_CHECKING, List, Union
 
 from dcs.mapping import Point
+from dcs.unit import Unit
 
 if TYPE_CHECKING:
     from gen.flights.flight import FlightType
@@ -29,15 +30,20 @@ class MissionTarget:
 
     def mission_types(self, for_player: bool) -> Iterator[FlightType]:
         from gen.flights.flight import FlightType
+
         if self.is_friendly(for_player):
             yield FlightType.BARCAP
         else:
             yield from [
                 FlightType.ESCORT,
                 FlightType.TARCAP,
-                FlightType.SEAD,
+                FlightType.SEAD_ESCORT,
                 FlightType.SWEEP,
                 # TODO: FlightType.ELINT,
                 # TODO: FlightType.EWAR,
                 # TODO: FlightType.RECON,
             ]
+
+    @property
+    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+        return []

game/theater/nevada.py

@@ -0,0 +1,8 @@
+from game.theater.projections import TransverseMercator
+
+PARAMETERS = TransverseMercator(
+    central_meridian=-117,
+    false_easting=-193996.80999964548,
+    false_northing=-4410028.063999966,
+    scale_factor=0.9996,
+)

game/theater/normandy.py

@@ -0,0 +1,8 @@
+from game.theater.projections import TransverseMercator
+
+PARAMETERS = TransverseMercator(
+    central_meridian=-3,
+    false_easting=-195526.00000000204,
+    false_northing=-5484812.999999951,
+    scale_factor=0.9996,
+)

game/theater/persiangulf.py

@@ -0,0 +1,8 @@
+from game.theater.projections import TransverseMercator
+
+PARAMETERS = TransverseMercator(
+    central_meridian=57,
+    false_easting=75755.99999999645,
+    false_northing=-2894933.0000000377,
+    scale_factor=0.9996,
+)

game/theater/projections.py

@@ -0,0 +1,31 @@
+from dataclasses import dataclass
+
+from pyproj import CRS
+
+
+@dataclass(frozen=True)
+class TransverseMercator:
+    central_meridian: int
+    false_easting: float
+    false_northing: float
+    scale_factor: float
+
+    def to_crs(self) -> CRS:
+        return CRS.from_proj4(
+            " ".join(
+                [
+                    "+proj=tmerc",
+                    "+lat_0=0",
+                    f"+lon_0={self.central_meridian}",
+                    f"+k_0={self.scale_factor}",
+                    f"+x_0={self.false_easting}",
+                    f"+y_0={self.false_northing}",
+                    "+towgs84=0,0,0,0,0,0,0",
+                    "+units=m",
+                    "+vunits=m",
+                    "+ellps=WGS84",
+                    "+no_defs",
+                    "+axis=neu",
+                ]
+            )
+        )

game/theater/start_generator.py

@@ -5,7 +5,7 @@ import pickle
 import random
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Dict, Iterable, List, Optional, Set
+from typing import Any, Dict, Iterable, List, Set
 
 from dcs.mapping import Point
 from dcs.task import CAP, CAS, PinpointStrike
@@ -13,32 +13,34 @@ from dcs.vehicles import AirDefence
 
 from game import Game, db
 from game.factions.faction import Faction
-from game.theater import Carrier, Lha, LocationType
+from game.scenery_group import SceneryGroup
+from game.theater import Carrier, Lha, PointWithHeading
 from game.theater.theatergroundobject import (
     BuildingGroundObject,
     CarrierGroundObject,
     EwrGroundObject,
+    FactoryGroundObject,
     LhaGroundObject,
     MissileSiteGroundObject,
     SamGroundObject,
     ShipGroundObject,
+    SceneryGroundObject,
     VehicleGroupGroundObject,
+    CoastalSiteGroundObject,
 )
 from game.version import VERSION
 from gen import namegen
+from gen.coastal.coastal_group_generator import generate_coastal_group
 from gen.defenses.armor_group_generator import generate_armor_group
 from gen.fleet.ship_group_generator import (
     generate_carrier_group,
     generate_lha_group,
     generate_ship_group,
 )
-from gen.locations.preset_location_finder import MizDataLocationFinder
 from gen.missiles.missiles_group_generator import generate_missile_group
 from gen.sam.airdefensegroupgenerator import AirDefenseRange
-from gen.sam.sam_group_generator import (
-    generate_anti_air_group,
-    generate_ewr_group,
-)
+from gen.sam.ewr_group_generator import generate_ewr_group
+from gen.sam.sam_group_generator import generate_anti_air_group
 from . import (
     ConflictTheater,
     ControlPoint,
@@ -46,6 +48,7 @@ from . import (
     Fob,
     OffMapSpawn,
 )
+from ..profiling import logged_duration
 from ..settings import Settings
 
 GroundObjectTemplates = Dict[str, Dict[str, Any]]
@@ -76,9 +79,14 @@ class GeneratorSettings:
 
 
 class GameGenerator:
-    def __init__(self, player: str, enemy: str, theater: ConflictTheater,
-                 settings: Settings,
-                 generator_settings: GeneratorSettings) -> None:
+    def __init__(
+        self,
+        player: str,
+        enemy: str,
+        theater: ConflictTheater,
+        settings: Settings,
+        generator_settings: GeneratorSettings,
+    ) -> None:
         self.player = player
         self.enemy = enemy
         self.theater = theater
@@ -86,21 +94,23 @@ class GameGenerator:
         self.generator_settings = generator_settings
 
     def generate(self) -> Game:
-        # Reset name generator
-        namegen.reset()
-        self.prepare_theater()
-        game = Game(
-            player_name=self.player,
-            enemy_name=self.enemy,
-            theater=self.theater,
-            start_date=self.generator_settings.start_date,
-            settings=self.settings,
-            player_budget=self.generator_settings.player_budget,
-            enemy_budget=self.generator_settings.enemy_budget
-        )
+        with logged_duration("TGO population"):
+            # Reset name generator
+            namegen.reset()
+            self.prepare_theater()
+            game = Game(
+                player_name=self.player,
+                enemy_name=self.enemy,
+                theater=self.theater,
+                start_date=self.generator_settings.start_date,
+                settings=self.settings,
+                player_budget=self.generator_settings.player_budget,
+                enemy_budget=self.generator_settings.enemy_budget,
+            )
 
-        GroundObjectGenerator(game, self.generator_settings).generate()
+            GroundObjectGenerator(game, self.generator_settings).generate()
         game.settings.version = VERSION
+        game.begin_turn_0()
         return game
 
     def prepare_theater(self) -> None:
@@ -108,7 +118,7 @@ class GameGenerator:
         # Auto-capture half the bases if midgame.
         if self.generator_settings.midgame:
             control_points = self.theater.controlpoints
-            for control_point in control_points[:len(control_points) // 2]:
+            for control_point in control_points[: len(control_points) // 2]:
                 control_point.captured = True
 
         # Remove carrier and lha, invert situation if needed
@@ -135,156 +145,16 @@ class GameGenerator:
                     cp.captured = True
 
 
-class LocationFinder:
-    def __init__(self, game: Game, control_point: ControlPoint) -> None:
-        self.game = game
-        self.control_point = control_point
-        self.miz_data = MizDataLocationFinder.compute_possible_locations(
-            game.theater.terrain.name, control_point.full_name)
-
-    def location_for(self, location_type: LocationType) -> Optional[Point]:
-        position = self.control_point.preset_locations.random_for(location_type)
-        if position is not None:
-            return position
-
-        logging.warning(f"No campaign location for %s at %s",
-                        location_type.value, self.control_point)
-        position = self.random_from_miz_data(
-            location_type == LocationType.OffshoreStrikeTarget)
-        if position is not None:
-            return position
-
-        logging.debug(f"No mizdata location for %s at %s", location_type.value,
-                      self.control_point)
-        position = self.random_position(location_type)
-        if position is not None:
-            return position
-
-        logging.error(f"Could not find position for %s at %s",
-                      location_type.value, self.control_point)
-        return None
-
-    def random_from_miz_data(self, offshore: bool) -> Optional[Point]:
-        if offshore:
-            locations = self.miz_data.offshore_locations
-        else:
-            locations = self.miz_data.ashore_locations
-        if self.miz_data.offshore_locations:
-            preset = random.choice(locations)
-            locations.remove(preset)
-            return preset.position
-        return None
-
-    def random_position(self, location_type: LocationType) -> Optional[Point]:
-        # TODO: Flesh out preset locations so we never hit this case.
-        logging.warning("Falling back to random location for %s at %s",
-                        location_type.value, self.control_point)
-
-        is_base_defense = location_type in {
-            LocationType.BaseAirDefense,
-            LocationType.Garrison,
-            LocationType.Shorad,
-        }
-
-        on_land = location_type not in {
-            LocationType.OffshoreStrikeTarget,
-            LocationType.Ship,
-        }
-
-        avoid_others = location_type not in {
-            LocationType.Garrison,
-            LocationType.MissileSite,
-            LocationType.Sam,
-            LocationType.Ship,
-            LocationType.Shorad,
-        }
-
-        if is_base_defense:
-            min_range = 400
-            max_range = 3200
-        elif location_type == LocationType.Ship:
-            min_range = 5000
-            max_range = 40000
-        elif location_type == LocationType.MissileSite:
-            min_range = 2500
-            max_range = 40000
-        else:
-            min_range = 10000
-            max_range = 40000
-
-        position = self._find_random_position(min_range, max_range,
-                                              on_land, is_base_defense,
-                                              avoid_others)
-
-        # Retry once, searching a bit further (On some big airbases, 3200 is too
-        # short (Ex : Incirlik)), but searching farther on every base would be
-        # problematic, as some base defense units would end up very far away
-        # from small airfields.
-        if position is None and is_base_defense:
-            position = self._find_random_position(3200, 4800,
-                                                  on_land, is_base_defense,
-                                                  avoid_others)
-        return position
-
-    def _find_random_position(self, min_range: int, max_range: int,
-                              on_ground: bool, is_base_defense: bool,
-                              avoid_others: bool) -> Optional[Point]:
-        """
-        Find a valid ground object location
-        :param on_ground: Whether it should be on ground or on sea (True = on
-        ground)
-        :param min_range: Minimal range from point
-        :param max_range: Max range from point
-        :param is_base_defense: True if the location is for base defense.
-        :return:
-        """
-        near = self.control_point.position
-        others = self.control_point.ground_objects
-
-        def is_valid(point: Optional[Point]) -> bool:
-            if point is None:
-                return False
-
-            if on_ground and not self.game.theater.is_on_land(point):
-                return False
-            elif not on_ground and not self.game.theater.is_in_sea(point):
-                return False
-
-            if avoid_others:
-                for other in others:
-                    if other.position.distance_to_point(point) < 10000:
-                        return False
-
-            if is_base_defense:
-                # If it's a base defense we don't care how close it is to other
-                # points.
-                return True
-
-            # Else verify that it's not too close to another control point.
-            for control_point in self.game.theater.controlpoints:
-                if control_point != self.control_point:
-                    if control_point.position.distance_to_point(point) < 30000:
-                        return False
-                    for ground_obj in control_point.ground_objects:
-                        if ground_obj.position.distance_to_point(point) < 10000:
-                            return False
-            return True
-
-        for _ in range(300):
-            # Check if on land or sea
-            p = near.random_point_within(max_range, min_range)
-            if is_valid(p):
-                return p
-        return None
-
-
 class ControlPointGroundObjectGenerator:
-    def __init__(self, game: Game, generator_settings: GeneratorSettings,
-                 control_point: ControlPoint) -> None:
+    def __init__(
+        self,
+        game: Game,
+        generator_settings: GeneratorSettings,
+        control_point: ControlPoint,
+    ) -> None:
         self.game = game
         self.generator_settings = generator_settings
         self.control_point = control_point
-        self.location_finder = LocationFinder(game, control_point)
 
     @property
     def faction_name(self) -> str:
@@ -300,10 +170,7 @@ class ControlPointGroundObjectGenerator:
     def generate(self) -> bool:
         self.control_point.connected_objectives = []
         if self.faction.navy_generators:
-            # Even airbases can generate navies if they are close enough to the
-            # water. This is not controlled by the control point definition, but
-            # rather by whether or not the generator can find a valid position
-            # for the ship.
+            # Even airbases can generate navies if they are close enough to the water.
             self.generate_navy()
 
         return True
@@ -317,19 +184,15 @@ class ControlPointGroundObjectGenerator:
         if not self.control_point.captured and skip_enemy_navy:
             return
 
-        for _ in range(self.faction.navy_group_count):
-            self.generate_ship()
-
-    def generate_ship(self) -> None:
-        point = self.location_finder.location_for(
-            LocationType.OffshoreStrikeTarget)
-        if point is None:
-            return
+        for position in self.control_point.preset_locations.ships:
+            self.generate_ship_at(position)
 
+    def generate_ship_at(self, position: PointWithHeading) -> None:
         group_id = self.game.next_group_id()
 
-        g = ShipGroundObject(namegen.random_objective_name(), group_id, point,
-                             self.control_point)
+        g = ShipGroundObject(
+            namegen.random_objective_name(), group_id, position, self.control_point
+        )
 
         group = generate_ship_group(self.game, g, self.faction_name)
         g.groups = []
@@ -352,13 +215,15 @@ class CarrierGroundObjectGenerator(ControlPointGroundObjectGenerator):
         if not carrier_names:
             logging.info(
                 f"Skipping generation of {self.control_point.name} because "
-                f"{self.faction_name} has no carriers")
+                f"{self.faction_name} has no carriers"
+            )
             return False
 
         # Create ground object group
         group_id = self.game.next_group_id()
-        g = CarrierGroundObject(namegen.random_objective_name(), group_id,
-                                self.control_point)
+        g = CarrierGroundObject(
+            namegen.random_objective_name(), group_id, self.control_point
+        )
         group = generate_carrier_group(self.faction_name, self.game, g)
         g.groups = []
         if group is not None:
@@ -377,13 +242,15 @@ class LhaGroundObjectGenerator(ControlPointGroundObjectGenerator):
         if not lha_names:
             logging.info(
                 f"Skipping generation of {self.control_point.name} because "
-                f"{self.faction_name} has no LHAs")
+                f"{self.faction_name} has no LHAs"
+            )
             return False
 
         # Create ground object group
         group_id = self.game.next_group_id()
-        g = LhaGroundObject(namegen.random_objective_name(), group_id,
-                            self.control_point)
+        g = LhaGroundObject(
+            namegen.random_objective_name(), group_id, self.control_point
+        )
         group = generate_lha_group(self.faction_name, self.game, g)
         g.groups = []
         if group is not None:
@@ -393,144 +260,14 @@ class LhaGroundObjectGenerator(ControlPointGroundObjectGenerator):
         return True
 
 
-class BaseDefenseGenerator:
-    def __init__(self, game: Game, control_point: ControlPoint) -> None:
-        self.game = game
-        self.control_point = control_point
-        self.location_finder = LocationFinder(game, control_point)
-
-    @property
-    def faction_name(self) -> str:
-        if self.control_point.captured:
-            return self.game.player_name
-        else:
-            return self.game.enemy_name
-
-    @property
-    def faction(self) -> Faction:
-        return db.FACTIONS[self.faction_name]
-
-    def generate(self) -> None:
-        self.generate_ewr()
-        self.generate_garrison()
-        self.generate_base_defenses()
-
-    def generate_ewr(self) -> None:
-        position = self.location_finder.location_for(LocationType.Ewr)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = EwrGroundObject(namegen.random_objective_name(), group_id,
-                            position, self.control_point)
-
-        group = generate_ewr_group(self.game, g, self.faction)
-        if group is None:
-            logging.error(f"Could not generate EWR at {self.control_point}")
-            return
-
-        g.groups = [group]
-        self.control_point.base_defenses.append(g)
-
-    def generate_base_defenses(self) -> None:
-        # First group has a 1/2 chance of being a SAM, 1/6 chance of SHORAD,
-        # and a 1/6 chance of a garrison.
-        #
-        # Further groups have a 1/3 chance of being SHORAD and 2/3 chance of
-        # being a garrison.
-        for i in range(random.randint(2, 5)):
-            if i == 0 and random.randint(0, 1) == 0:
-                self.generate_sam()
-            elif random.randint(0, 2) == 1:
-                self.generate_shorad()
-            else:
-                self.generate_garrison()
-
-    def generate_garrison(self) -> None:
-        position = self.location_finder.location_for(LocationType.Garrison)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = VehicleGroupGroundObject(namegen.random_objective_name(), group_id,
-                                     position, self.control_point,
-                                     for_airbase=True)
-
-        group = generate_armor_group(self.faction_name, self.game, g)
-        if group is None:
-            logging.error(
-                f"Could not generate garrison at {self.control_point}")
-            return
-        g.groups.append(group)
-        self.control_point.base_defenses.append(g)
-
-    def generate_sam(self) -> None:
-        position = self.location_finder.location_for(
-            LocationType.BaseAirDefense)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = SamGroundObject(namegen.random_objective_name(), group_id,
-                            position, self.control_point, for_airbase=True)
-
-        groups = generate_anti_air_group(self.game, g, self.faction)
-        if not groups:
-            logging.error(f"Could not generate SAM at {self.control_point}")
-            return
-        g.groups = groups
-        self.control_point.base_defenses.append(g)
-
-    def generate_shorad(self) -> None:
-        position = self.location_finder.location_for(
-            LocationType.BaseAirDefense)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = SamGroundObject(namegen.random_objective_name(), group_id,
-                            position, self.control_point, for_airbase=True)
-
-        groups = generate_anti_air_group(self.game, g, self.faction,
-                                         ranges=[{AirDefenseRange.Short}])
-        if not groups:
-            logging.error(
-                f"Could not generate SHORAD group at {self.control_point}")
-            return
-        g.groups = groups
-        self.control_point.base_defenses.append(g)
-
-
-class FobDefenseGenerator(BaseDefenseGenerator):
-    def generate(self) -> None:
-        self.generate_garrison()
-        self.generate_fob_defenses()
-    
-    def generate_fob_defenses(self):
-        # First group has a 1/2 chance of being a SHORAD,
-        # and a 1/2 chance of a garrison.
-        #
-        # Further groups have a 1/3 chance of being SHORAD and 2/3 chance of
-        # being a garrison.
-        for i in range(random.randint(2, 5)):
-            if i == 0 and random.randint(0, 1) == 0:
-                self.generate_shorad()
-            elif i == 0 and random.randint(0, 1) == 0:
-                self.generate_garrison()
-            elif random.randint(0, 2) == 1:
-                self.generate_shorad()
-            else:
-                self.generate_garrison()
-
-
 class AirbaseGroundObjectGenerator(ControlPointGroundObjectGenerator):
-    def __init__(self, game: Game, generator_settings: GeneratorSettings,
-                 control_point: ControlPoint,
-                 templates: GroundObjectTemplates) -> None:
+    def __init__(
+        self,
+        game: Game,
+        generator_settings: GeneratorSettings,
+        control_point: ControlPoint,
+        templates: GroundObjectTemplates,
+    ) -> None:
         super().__init__(game, generator_settings, control_point)
         self.templates = templates
 
@@ -538,77 +275,93 @@ class AirbaseGroundObjectGenerator(ControlPointGroundObjectGenerator):
         if not super().generate():
             return False
 
-        BaseDefenseGenerator(self.game, self.control_point).generate()
         self.generate_ground_points()
-
-        if self.faction.missiles:
-            self.generate_missile_sites()
-
         return True
 
     def generate_ground_points(self) -> None:
         """Generate ground objects and AA sites for the control point."""
-        skip_sams = self.generate_required_aa()
+        self.generate_armor_groups()
+        self.generate_aa()
+        self.generate_ewrs()
+        self.generate_scenery_sites()
+        self.generate_strike_targets()
+        self.generate_offshore_strike_targets()
+        self.generate_factories()
+        self.generate_ammunition_depots()
 
-        if self.control_point.is_global:
+        if self.faction.missiles:
+            self.generate_missile_sites()
+
+        if self.faction.coastal_defenses:
+            self.generate_coastal_sites()
+
+    def generate_armor_groups(self) -> None:
+        for position in self.control_point.preset_locations.armor_groups:
+            self.generate_armor_at(position)
+
+    def generate_armor_at(self, position: PointWithHeading) -> None:
+        group_id = self.game.next_group_id()
+
+        g = VehicleGroupGroundObject(
+            namegen.random_objective_name(),
+            group_id,
+            position,
+            self.control_point,
+        )
+
+        group = generate_armor_group(self.faction_name, self.game, g)
+        if group is None:
+            logging.error(
+                "Could not generate armor group for %s at %s",
+                g.name,
+                self.control_point,
+            )
             return
+        g.groups = [group]
+        self.control_point.connected_objectives.append(g)
 
-        # Always generate at least one AA point.
-        self.generate_aa_site()
-
-        # And between 2 and 7 other objectives.
-        amount = random.randrange(2, 7)
-        for i in range(amount):
-            # 1 in 4 additional objectives are AA.
-            if random.randint(0, 3) == 0:
-                if skip_sams > 0:
-                    skip_sams -= 1
-                else:
-                    self.generate_aa_site()
-            else:
-                self.generate_ground_point()
-
-    def generate_required_aa(self) -> int:
-        """Generates the AA sites that are required by the campaign.
-
-        Returns:
-            The number of AA sites that were generated.
-        """
+    def generate_aa(self) -> None:
         presets = self.control_point.preset_locations
-        for position in presets.required_long_range_sams:
-            self.generate_aa_at(position, ranges=[
-                {AirDefenseRange.Long},
-                {AirDefenseRange.Medium},
-                {AirDefenseRange.Short},
-            ])
-        for position in presets.required_medium_range_sams:
-            self.generate_aa_at(position, ranges=[
-                {AirDefenseRange.Medium},
-                {AirDefenseRange.Short},
-            ])
-        return (len(presets.required_long_range_sams) +
-                len(presets.required_medium_range_sams))
+        for position in presets.long_range_sams:
+            self.generate_aa_at(
+                position,
+                ranges=[
+                    {AirDefenseRange.Long},
+                    {AirDefenseRange.Medium},
+                    {AirDefenseRange.Short},
+                    {AirDefenseRange.AAA},
+                ],
+            )
+        for position in presets.medium_range_sams:
+            self.generate_aa_at(
+                position,
+                ranges=[
+                    {AirDefenseRange.Medium},
+                    {AirDefenseRange.Short},
+                    {AirDefenseRange.AAA},
+                ],
+            )
+        for position in presets.short_range_sams:
+            self.generate_aa_at(
+                position,
+                ranges=[{AirDefenseRange.Short}, {AirDefenseRange.AAA}],
+            )
+        for position in presets.aaa:
+            self.generate_aa_at(
+                position,
+                ranges=[{AirDefenseRange.AAA}],
+            )
 
-    def generate_ground_point(self) -> None:
-        try:
-            category = random.choice(self.faction.building_set)
-        except IndexError:
-            logging.exception("Faction has no buildings defined")
-            return
+    def generate_ewrs(self) -> None:
+        presets = self.control_point.preset_locations
+        for position in presets.ewrs:
+            self.generate_ewr_at(position)
+
+    def generate_strike_target_at(self, category: str, position: Point) -> None:
 
         obj_name = namegen.random_objective_name()
         template = random.choice(list(self.templates[category].values()))
 
-        if category == "oil":
-            location_type = LocationType.OffshoreStrikeTarget
-        else:
-            location_type = LocationType.StrikeTarget
-
-        # Pick from preset locations
-        point = self.location_finder.location_for(location_type)
-        if point is None:
-            return
-
         object_id = 0
         group_id = self.game.next_group_id()
 
@@ -618,49 +371,126 @@ class AirbaseGroundObjectGenerator(ControlPointGroundObjectGenerator):
 
             template_point = Point(unit["offset"].x, unit["offset"].y)
             g = BuildingGroundObject(
-                obj_name, category, group_id, object_id, point + template_point,
-                unit["heading"], self.control_point, unit["type"])
+                obj_name,
+                category,
+                group_id,
+                object_id,
+                position + template_point,
+                unit["heading"],
+                self.control_point,
+                unit["type"],
+            )
 
             self.control_point.connected_objectives.append(g)
 
-    def generate_aa_site(self) -> None:
-        position = self.location_finder.location_for(LocationType.Sam)
-        if position is None:
-            return
-        self.generate_aa_at(position, ranges=[
-            # Prefer to use proper SAMs, but fall back to SHORADs if needed.
-            {AirDefenseRange.Long, AirDefenseRange.Medium},
-            {AirDefenseRange.Short},
-        ])
+    def generate_ammunition_depots(self) -> None:
+        for position in self.control_point.preset_locations.ammunition_depots:
+            self.generate_strike_target_at(category="ammo", position=position)
 
-    def generate_aa_at(
-            self, position: Point,
-            ranges: Iterable[Set[AirDefenseRange]]) -> None:
+    def generate_factories(self) -> None:
+        for position in self.control_point.preset_locations.factories:
+            self.generate_factory_at(position)
+
+    def generate_factory_at(self, point: PointWithHeading) -> None:
+        obj_name = namegen.random_objective_name()
         group_id = self.game.next_group_id()
 
-        g = SamGroundObject(namegen.random_objective_name(), group_id,
-                            position, self.control_point, for_airbase=False)
+        g = FactoryGroundObject(
+            obj_name,
+            group_id,
+            point,
+            point.heading,
+            self.control_point,
+        )
+
+        self.control_point.connected_objectives.append(g)
+
+    def generate_aa_at(
+        self, position: Point, ranges: Iterable[Set[AirDefenseRange]]
+    ) -> None:
+        group_id = self.game.next_group_id()
+
+        g = SamGroundObject(
+            namegen.random_objective_name(),
+            group_id,
+            position,
+            self.control_point,
+        )
         groups = generate_anti_air_group(self.game, g, self.faction, ranges)
         if not groups:
-            logging.error("Could not generate air defense group for %s at %s",
-                          g.name, self.control_point)
+            logging.error(
+                "Could not generate air defense group for %s at %s",
+                g.name,
+                self.control_point,
+            )
             return
         g.groups = groups
         self.control_point.connected_objectives.append(g)
 
-    def generate_missile_sites(self) -> None:
-        for i in range(self.faction.missiles_group_count):
-            self.generate_missile_site()
-
-    def generate_missile_site(self) -> None:
-        position = self.location_finder.location_for(LocationType.MissileSite)
-        if position is None:
-            return
-
+    def generate_ewr_at(self, position: PointWithHeading) -> None:
         group_id = self.game.next_group_id()
 
-        g = MissileSiteGroundObject(namegen.random_objective_name(), group_id,
-                                    position, self.control_point)
+        g = EwrGroundObject(
+            namegen.random_objective_name(),
+            group_id,
+            position,
+            self.control_point,
+        )
+        group = generate_ewr_group(self.game, g, self.faction)
+        if group is None:
+            logging.error(
+                "Could not generate ewr group for %s at %s",
+                g.name,
+                self.control_point,
+            )
+            return
+        g.groups = [group]
+        self.control_point.connected_objectives.append(g)
+
+    def generate_scenery_sites(self) -> None:
+        presets = self.control_point.preset_locations
+        for scenery_group in presets.scenery:
+            self.generate_tgo_for_scenery(scenery_group)
+
+    def generate_tgo_for_scenery(self, scenery: SceneryGroup) -> None:
+
+        obj_name = namegen.random_objective_name()
+        category = scenery.category
+        group_id = self.game.next_group_id()
+        object_id = 0
+
+        # Each nested trigger zone is a target/building/unit for an objective.
+        for zone in scenery.zones:
+
+            object_id += 1
+            local_position = zone.position
+            local_dcs_identifier = zone.name
+
+            g = SceneryGroundObject(
+                obj_name,
+                category,
+                group_id,
+                object_id,
+                local_position,
+                self.control_point,
+                local_dcs_identifier,
+                zone,
+            )
+
+            self.control_point.connected_objectives.append(g)
+
+        return
+
+    def generate_missile_sites(self) -> None:
+        for position in self.control_point.preset_locations.missile_sites:
+            self.generate_missile_site_at(position)
+
+    def generate_missile_site_at(self, position: PointWithHeading) -> None:
+        group_id = self.game.next_group_id()
+
+        g = MissileSiteGroundObject(
+            namegen.random_objective_name(), group_id, position, self.control_point
+        )
         group = generate_missile_group(self.game, g, self.faction_name)
         g.groups = []
         if group is not None:
@@ -668,21 +498,66 @@ class AirbaseGroundObjectGenerator(ControlPointGroundObjectGenerator):
             self.control_point.connected_objectives.append(g)
         return
 
+    def generate_coastal_sites(self) -> None:
+        for position in self.control_point.preset_locations.coastal_defenses:
+            self.generate_coastal_site_at(position)
+
+    def generate_coastal_site_at(self, position: PointWithHeading) -> None:
+        group_id = self.game.next_group_id()
+
+        g = CoastalSiteGroundObject(
+            namegen.random_objective_name(),
+            group_id,
+            position,
+            self.control_point,
+            position.heading,
+        )
+        group = generate_coastal_group(self.game, g, self.faction_name)
+        g.groups = []
+        if group is not None:
+            g.groups.append(group)
+            self.control_point.connected_objectives.append(g)
+        return
+
+    def generate_strike_targets(self) -> None:
+        building_set = list(set(self.faction.building_set) - {"oil"})
+        if not building_set:
+            logging.error("Faction has no buildings defined")
+            return
+        for position in self.control_point.preset_locations.strike_locations:
+            category = random.choice(building_set)
+            self.generate_strike_target_at(category, position)
+
+    def generate_offshore_strike_targets(self) -> None:
+        if "oil" not in self.faction.building_set:
+            logging.error("Faction does not support offshore strike targets")
+            return
+        for position in self.control_point.preset_locations.offshore_strike_locations:
+            self.generate_strike_target_at("oil", position)
+
 
 class FobGroundObjectGenerator(AirbaseGroundObjectGenerator):
     def generate(self) -> bool:
         self.generate_fob()
-        FobDefenseGenerator(self.game, self.control_point).generate()
-        self.generate_required_aa()
+        self.generate_armor_groups()
+        self.generate_factories()
+        self.generate_ammunition_depots()
+        self.generate_aa()
+        self.generate_ewrs()
+        self.generate_scenery_sites()
+        self.generate_strike_targets()
+        self.generate_offshore_strike_targets()
+
+        if self.faction.missiles:
+            self.generate_missile_sites()
+
+        if self.faction.coastal_defenses:
+            self.generate_coastal_sites()
+
         return True
 
     def generate_fob(self) -> None:
-        try:
-            category = self.faction.building_set[self.faction.building_set.index('fob')]
-        except IndexError:
-            logging.exception("Faction has no fob buildings defined")
-            return
-
+        category = "fob"
         obj_name = self.control_point.name
         template = random.choice(list(self.templates[category].values()))
         point = self.control_point.position
@@ -696,14 +571,21 @@ class FobGroundObjectGenerator(AirbaseGroundObjectGenerator):
 
             template_point = Point(unit["offset"].x, unit["offset"].y)
             g = BuildingGroundObject(
-                obj_name, category, group_id, object_id, point + template_point,
-                unit["heading"], self.control_point, unit["type"], airbase_group=True)
+                obj_name,
+                category,
+                group_id,
+                object_id,
+                point + template_point,
+                unit["heading"],
+                self.control_point,
+                unit["type"],
+                is_fob_structure=True,
+            )
             self.control_point.connected_objectives.append(g)
 
 
 class GroundObjectGenerator:
-    def __init__(self, game: Game,
-                 generator_settings: GeneratorSettings) -> None:
+    def __init__(self, game: Game, generator_settings: GeneratorSettings) -> None:
         self.game = game
         self.generator_settings = generator_settings
         with open("resources/groundobject_templates.p", "rb") as f:
@@ -721,19 +603,22 @@ class GroundObjectGenerator:
         generator: ControlPointGroundObjectGenerator
         if control_point.cptype == ControlPointType.AIRCRAFT_CARRIER_GROUP:
             generator = CarrierGroundObjectGenerator(
-                self.game, self.generator_settings, control_point)
+                self.game, self.generator_settings, control_point
+            )
         elif control_point.cptype == ControlPointType.LHA_GROUP:
             generator = LhaGroundObjectGenerator(
-                self.game, self.generator_settings, control_point)
+                self.game, self.generator_settings, control_point
+            )
         elif isinstance(control_point, OffMapSpawn):
             generator = NoOpGroundObjectGenerator(
-                self.game, self.generator_settings, control_point)
+                self.game, self.generator_settings, control_point
+            )
         elif isinstance(control_point, Fob):
             generator = FobGroundObjectGenerator(
-                self.game, self.generator_settings, control_point,
-                self.templates)
+                self.game, self.generator_settings, control_point, self.templates
+            )
         else:
             generator = AirbaseGroundObjectGenerator(
-                self.game, self.generator_settings, control_point,
-                self.templates)
+                self.game, self.generator_settings, control_point, self.templates
+            )
         return generator.generate()

game/theater/syria.py

@@ -0,0 +1,8 @@
+from game.theater.projections import TransverseMercator
+
+PARAMETERS = TransverseMercator(
+    central_meridian=39,
+    false_easting=282801.00000003993,
+    false_northing=-3879865.9999999935,
+    scale_factor=0.9996,
+)

game/theater/theatergroundobject.py

@@ -2,14 +2,20 @@ from __future__ import annotations
 
 import itertools
 import logging
-from typing import Iterator, List, TYPE_CHECKING
+from typing import Iterator, List, TYPE_CHECKING, Union
 
 from dcs.mapping import Point
+from dcs.triggers import TriggerZone
 from dcs.unit import Unit
 from dcs.unitgroup import Group
+from dcs.unittype import VehicleType
 
 from .. import db
-from ..data.radar_db import UNITS_WITH_RADAR
+from ..data.radar_db import (
+    TRACK_RADARS,
+    TELARS,
+    LAUNCHER_TRACKER_PAIRS,
+)
 from ..utils import Distance, meters
 
 if TYPE_CHECKING:
@@ -19,76 +25,46 @@ if TYPE_CHECKING:
 from .missiontarget import MissionTarget
 
 NAME_BY_CATEGORY = {
-    "power": "Power plant",
-    "ammo": "Ammo depot",
-    "fuel": "Fuel depot",
+    "ewr": "Early Warning Radar",
     "aa": "AA Defense Site",
-    "ware": "Warehouse",
-    "farp": "FARP",
-    "fob": "FOB",
-    "factory": "Factory",
-    "comms": "Comms. tower",
-    "oil": "Oil platform",
-    "derrick": "Derrick",
-    "ww2bunker": "Bunker",
-    "village": "Village",
     "allycamp": "Camp",
-    "EWR":"EWR",
-}
-
-ABBREV_NAME = {
-    "power": "PLANT",
-    "ammo": "AMMO",
-    "fuel": "FUEL",
-    "aa": "AA",
-    "ware": "WARE",
+    "ammo": "Ammo depot",
+    "armor": "Armor group",
+    "coastal": "Coastal defense",
+    "comms": "Communications tower",
+    "derrick": "Derrick",
+    "factory": "Factory",
     "farp": "FARP",
     "fob": "FOB",
-    "factory": "FACTORY",
-    "comms": "COMMST",
-    "oil": "OILP",
-    "derrick": "DERK",
-    "ww2bunker": "BUNK",
-    "village": "VLG",
-    "allycamp": "CMP",
-}
-
-CATEGORY_MAP = {
-
-    # Special cases
-    "CARRIER": ["CARRIER"],
-    "LHA": ["LHA"],
-    "aa": ["AA"],
-
-    # Buildings
-    "power": ["Workshop A", "Electric power box", "Garage small A", "Farm B", "Repair workshop", "Garage B"],
-    "ware": ["Warehouse", "Hangar A"],
-    "fuel": ["Tank", "Tank 2", "Tank 3", "Fuel tank"],
-    "ammo": [".Ammunition depot", "Hangar B"],
-    "farp": ["FARP Tent", "FARP Ammo Dump Coating", "FARP Fuel Depot", "FARP Command Post", "FARP CP Blindage"],
-    "fob": ["Bunker 2", "Bunker 1", "Garage small B", ".Command Center", "Barracks 2"],
-    "factory": ["Tech combine", "Tech hangar A"],
-    "comms": ["TV tower", "Comms tower M"],
-    "oil": ["Oil platform"],
-    "derrick": ["Oil derrick", "Pump station", "Subsidiary structure 2"],
-    "ww2bunker": ["Siegfried Line", "Fire Control Bunker", "SK_C_28_naval_gun", "Concertina Wire", "Czech hedgehogs 1"],
-    "village": ["Small house 1B", "Small House 1A", "Small warehouse 1"],
-    "allycamp": [],
+    "fuel": "Fuel depot",
+    "missile": "Missile site",
+    "oil": "Oil platform",
+    "power": "Power plant",
+    "ship": "Ship",
+    "village": "Village",
+    "ware": "Warehouse",
+    "ww2bunker": "Bunker",
 }
 
 
 class TheaterGroundObject(MissionTarget):
-
-    def __init__(self, name: str, category: str, group_id: int, position: Point,
-                 heading: int, control_point: ControlPoint, dcs_identifier: str,
-                 airbase_group: bool, sea_object: bool) -> None:
+    def __init__(
+        self,
+        name: str,
+        category: str,
+        group_id: int,
+        position: Point,
+        heading: int,
+        control_point: ControlPoint,
+        dcs_identifier: str,
+        sea_object: bool,
+    ) -> None:
         super().__init__(name, position)
         self.category = category
         self.group_id = group_id
         self.heading = heading
         self.control_point = control_point
         self.dcs_identifier = dcs_identifier
-        self.airbase_group = airbase_group
         self.sea_object = sea_object
         self.groups: List[Group] = []
 
@@ -103,6 +79,17 @@ class TheaterGroundObject(MissionTarget):
         """
         return list(itertools.chain.from_iterable([g.units for g in self.groups]))
 
+    @property
+    def dead_units(self) -> List[Unit]:
+        """
+        :return: all the dead units at this location
+        """
+        return list(
+            itertools.chain.from_iterable(
+                [getattr(g, "units_losts", []) for g in self.groups]
+            )
+        )
+
     @property
     def group_name(self) -> str:
         """The name of the unit group."""
@@ -131,6 +118,7 @@ class TheaterGroundObject(MissionTarget):
 
     def mission_types(self, for_player: bool) -> Iterator[FlightType]:
         from gen.flights.flight import FlightType
+
         if self.is_friendly(for_player):
             yield from [
                 # TODO: FlightType.LOGISTICS
@@ -152,12 +140,11 @@ class TheaterGroundObject(MissionTarget):
         return False
 
     @property
-    def has_radar(self) -> bool:
-        """Returns True if the ground object contains a unit with radar."""
+    def has_live_radar_sam(self) -> bool:
+        """Returns True if the ground object contains a unit with working radar SAM."""
         for group in self.groups:
-            for unit in group.units:
-                if db.unit_type_from_name(unit.type) in UNITS_WITH_RADAR:
-                    return True
+            if self.threat_range(group, radar_only=True):
+                return True
         return False
 
     def _max_range_of_type(self, group: Group, range_type: str) -> Distance:
@@ -178,24 +165,60 @@ class TheaterGroundObject(MissionTarget):
                 max_range = max(max_range, meters(unit_range))
         return max_range
 
+    def max_detection_range(self) -> Distance:
+        return max(self.detection_range(g) for g in self.groups)
+
     def detection_range(self, group: Group) -> Distance:
         return self._max_range_of_type(group, "detection_range")
 
-    def threat_range(self, group: Group) -> Distance:
-        if not self.detection_range(group):
-            # For simple SAMs like shilkas, the unit has both a threat and
-            # detection range. For complex sites like SA-2s, the launcher has a
-            # threat range and the search/track radars have detection ranges. If
-            # the site has no detection range it has no radars and can't fire,
-            # so it's not actually a threat even if it still has launchers.
-            return meters(0)
+    def max_threat_range(self) -> Distance:
+        return max(self.threat_range(g) for g in self.groups)
+
+    def threat_range(self, group: Group, radar_only: bool = False) -> Distance:
         return self._max_range_of_type(group, "threat_range")
 
+    @property
+    def is_factory(self) -> bool:
+        return self.category == "factory"
+
+    @property
+    def is_control_point(self) -> bool:
+        """True if this TGO is the group for the control point itself (CVs and FOBs)."""
+        return False
+
+    @property
+    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+        return self.units
+
+    @property
+    def mark_locations(self) -> Iterator[Point]:
+        yield self.position
+
+    def clear(self) -> None:
+        self.groups = []
+
+    @property
+    def capturable(self) -> bool:
+        raise NotImplementedError
+
+    @property
+    def purchasable(self) -> bool:
+        raise NotImplementedError
+
 
 class BuildingGroundObject(TheaterGroundObject):
-    def __init__(self, name: str, category: str, group_id: int, object_id: int,
-                 position: Point, heading: int, control_point: ControlPoint,
-                 dcs_identifier: str, airbase_group=False) -> None:
+    def __init__(
+        self,
+        name: str,
+        category: str,
+        group_id: int,
+        object_id: int,
+        position: Point,
+        heading: int,
+        control_point: ControlPoint,
+        dcs_identifier: str,
+        is_fob_structure=False,
+    ) -> None:
         super().__init__(
             name=name,
             category=category,
@@ -204,9 +227,9 @@ class BuildingGroundObject(TheaterGroundObject):
             heading=heading,
             control_point=control_point,
             dcs_identifier=dcs_identifier,
-            airbase_group=airbase_group,
-            sea_object=False
+            sea_object=False,
         )
+        self.is_fob_structure = is_fob_structure
         self.object_id = object_id
         # Other TGOs track deadness based on the number of alive units, but
         # buildings don't have groups assigned to the TGO.
@@ -230,10 +253,95 @@ class BuildingGroundObject(TheaterGroundObject):
     def kill(self) -> None:
         self._dead = True
 
+    def iter_building_group(self) -> Iterator[TheaterGroundObject]:
+        for tgo in self.control_point.ground_objects:
+            if tgo.obj_name == self.obj_name and not tgo.is_dead:
+                yield tgo
+
+    @property
+    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+        return list(self.iter_building_group())
+
+    @property
+    def mark_locations(self) -> Iterator[Point]:
+        for building in self.iter_building_group():
+            yield building.position
+
+    @property
+    def is_control_point(self) -> bool:
+        return self.is_fob_structure
+
+    @property
+    def capturable(self) -> bool:
+        return True
+
+    @property
+    def purchasable(self) -> bool:
+        return False
+
+
+class SceneryGroundObject(BuildingGroundObject):
+    def __init__(
+        self,
+        name: str,
+        category: str,
+        group_id: int,
+        object_id: int,
+        position: Point,
+        control_point: ControlPoint,
+        dcs_identifier: str,
+        zone: TriggerZone,
+    ) -> None:
+        super().__init__(
+            name=name,
+            category=category,
+            group_id=group_id,
+            object_id=object_id,
+            position=position,
+            heading=0,
+            control_point=control_point,
+            dcs_identifier=dcs_identifier,
+            is_fob_structure=False,
+        )
+        self.zone = zone
+        try:
+            # In the default TriggerZone using "assign as..." in the DCS Mission Editor,
+            # property three has the scenery's object ID as its value.
+            self.map_object_id = self.zone.properties[3]["value"]
+        except (IndexError, KeyError):
+            logging.exception(
+                "Invalid TriggerZone for Scenery definition. The third property must "
+                "be the map object ID."
+            )
+            raise
+
+
+class FactoryGroundObject(BuildingGroundObject):
+    def __init__(
+        self,
+        name: str,
+        group_id: int,
+        position: Point,
+        heading: int,
+        control_point: ControlPoint,
+    ) -> None:
+        super().__init__(
+            name=name,
+            category="factory",
+            group_id=group_id,
+            object_id=0,
+            position=position,
+            heading=heading,
+            control_point=control_point,
+            dcs_identifier="Workshop A",
+            is_fob_structure=False,
+        )
+
 
 class NavalGroundObject(TheaterGroundObject):
     def mission_types(self, for_player: bool) -> Iterator[FlightType]:
         from gen.flights.flight import FlightType
+
         if not self.is_friendly(for_player):
             yield FlightType.ANTISHIP
         yield from super().mission_types(for_player)
@@ -242,15 +350,24 @@ class NavalGroundObject(TheaterGroundObject):
     def might_have_aa(self) -> bool:
         return True
 
+    @property
+    def capturable(self) -> bool:
+        return False
+
+    @property
+    def purchasable(self) -> bool:
+        return False
+
 
 class GenericCarrierGroundObject(NavalGroundObject):
-    pass
+    @property
+    def is_control_point(self) -> bool:
+        return True
 
 
 # TODO: Why is this both a CP and a TGO?
 class CarrierGroundObject(GenericCarrierGroundObject):
-    def __init__(self, name: str, group_id: int,
-                 control_point: ControlPoint) -> None:
+    def __init__(self, name: str, group_id: int, control_point: ControlPoint) -> None:
         super().__init__(
             name=name,
             category="CARRIER",
@@ -259,8 +376,7 @@ class CarrierGroundObject(GenericCarrierGroundObject):
             heading=0,
             control_point=control_point,
             dcs_identifier="CARRIER",
-            airbase_group=True,
-            sea_object=True
+            sea_object=True,
         )
 
     @property
@@ -272,8 +388,7 @@ class CarrierGroundObject(GenericCarrierGroundObject):
 
 # TODO: Why is this both a CP and a TGO?
 class LhaGroundObject(GenericCarrierGroundObject):
-    def __init__(self, name: str, group_id: int,
-                 control_point: ControlPoint) -> None:
+    def __init__(self, name: str, group_id: int, control_point: ControlPoint) -> None:
         super().__init__(
             name=name,
             category="LHA",
@@ -282,8 +397,7 @@ class LhaGroundObject(GenericCarrierGroundObject):
             heading=0,
             control_point=control_point,
             dcs_identifier="LHA",
-            airbase_group=True,
-            sea_object=True
+            sea_object=True,
         )
 
     @property
@@ -294,31 +408,69 @@ class LhaGroundObject(GenericCarrierGroundObject):
 
 
 class MissileSiteGroundObject(TheaterGroundObject):
-    def __init__(self, name: str, group_id: int, position: Point,
-                 control_point: ControlPoint) -> None:
+    def __init__(
+        self, name: str, group_id: int, position: Point, control_point: ControlPoint
+    ) -> None:
         super().__init__(
             name=name,
-            category="aa",
+            category="missile",
             group_id=group_id,
             position=position,
             heading=0,
             control_point=control_point,
             dcs_identifier="AA",
-            airbase_group=False,
-            sea_object=False
+            sea_object=False,
         )
 
+    @property
+    def capturable(self) -> bool:
+        return False
 
-class BaseDefenseGroundObject(TheaterGroundObject):
-    """Base type for all base defenses."""
+    @property
+    def purchasable(self) -> bool:
+        return False
+
+
+class CoastalSiteGroundObject(TheaterGroundObject):
+    def __init__(
+        self,
+        name: str,
+        group_id: int,
+        position: Point,
+        control_point: ControlPoint,
+        heading,
+    ) -> None:
+        super().__init__(
+            name=name,
+            category="coastal",
+            group_id=group_id,
+            position=position,
+            heading=heading,
+            control_point=control_point,
+            dcs_identifier="AA",
+            sea_object=False,
+        )
+
+    @property
+    def capturable(self) -> bool:
+        return False
+
+    @property
+    def purchasable(self) -> bool:
+        return False
 
 
 # TODO: Differentiate types.
 # This type gets used both for AA sites (SAM, AAA, or SHORAD). These should each
 # be split into their own types.
-class SamGroundObject(BaseDefenseGroundObject):
-    def __init__(self, name: str, group_id: int, position: Point,
-                 control_point: ControlPoint, for_airbase: bool) -> None:
+class SamGroundObject(TheaterGroundObject):
+    def __init__(
+        self,
+        name: str,
+        group_id: int,
+        position: Point,
+        control_point: ControlPoint,
+    ) -> None:
         super().__init__(
             name=name,
             category="aa",
@@ -327,8 +479,7 @@ class SamGroundObject(BaseDefenseGroundObject):
             heading=0,
             control_point=control_point,
             dcs_identifier="AA",
-            airbase_group=for_airbase,
-            sea_object=False
+            sea_object=False,
         )
         # Set by the SAM unit generator if the generated group is compatible
         # with Skynet.
@@ -345,44 +496,102 @@ class SamGroundObject(BaseDefenseGroundObject):
 
     def mission_types(self, for_player: bool) -> Iterator[FlightType]:
         from gen.flights.flight import FlightType
+
         if not self.is_friendly(for_player):
             yield FlightType.DEAD
+            yield FlightType.SEAD
         yield from super().mission_types(for_player)
 
     @property
     def might_have_aa(self) -> bool:
         return True
 
+    def threat_range(self, group: Group, radar_only: bool = False) -> Distance:
+        max_non_radar = meters(0)
+        live_trs = set()
+        max_telar_range = meters(0)
+        launchers = set()
+        for unit in group.units:
+            unit_type = db.unit_type_from_name(unit.type)
+            if unit_type is None or not issubclass(unit_type, VehicleType):
+                continue
+            if unit_type in TRACK_RADARS:
+                live_trs.add(unit_type)
+            elif unit_type in TELARS:
+                max_telar_range = max(
+                    max_telar_range, meters(getattr(unit_type, "threat_range", 0))
+                )
+            elif unit_type in LAUNCHER_TRACKER_PAIRS:
+                launchers.add(unit_type)
+            else:
+                max_non_radar = max(
+                    max_non_radar, meters(getattr(unit_type, "threat_range", 0))
+                )
+        max_tel_range = meters(0)
+        for launcher in launchers:
+            if LAUNCHER_TRACKER_PAIRS[launcher] in live_trs:
+                max_tel_range = max(
+                    max_tel_range, meters(getattr(launcher, "threat_range"))
+                )
+        if radar_only:
+            return max(max_tel_range, max_telar_range)
+        else:
+            return max(max_tel_range, max_telar_range, max_non_radar)
 
-class VehicleGroupGroundObject(BaseDefenseGroundObject):
-    def __init__(self, name: str, group_id: int, position: Point,
-                 control_point: ControlPoint, for_airbase: bool) -> None:
+    @property
+    def capturable(self) -> bool:
+        return False
+
+    @property
+    def purchasable(self) -> bool:
+        return True
+
+
+class VehicleGroupGroundObject(TheaterGroundObject):
+    def __init__(
+        self,
+        name: str,
+        group_id: int,
+        position: Point,
+        control_point: ControlPoint,
+    ) -> None:
         super().__init__(
             name=name,
-            category="aa",
+            category="armor",
             group_id=group_id,
             position=position,
             heading=0,
             control_point=control_point,
             dcs_identifier="AA",
-            airbase_group=for_airbase,
-            sea_object=False
+            sea_object=False,
         )
 
+    @property
+    def capturable(self) -> bool:
+        return False
 
-class EwrGroundObject(BaseDefenseGroundObject):
-    def __init__(self, name: str, group_id: int, position: Point,
-                 control_point: ControlPoint) -> None:
+    @property
+    def purchasable(self) -> bool:
+        return True
+
+
+class EwrGroundObject(TheaterGroundObject):
+    def __init__(
+        self,
+        name: str,
+        group_id: int,
+        position: Point,
+        control_point: ControlPoint,
+    ) -> None:
         super().__init__(
             name=name,
-            category="EWR",
+            category="ewr",
             group_id=group_id,
             position=position,
             heading=0,
             control_point=control_point,
             dcs_identifier="EWR",
-            airbase_group=True,
-            sea_object=False
+            sea_object=False,
         )
 
     @property
@@ -392,6 +601,7 @@ class EwrGroundObject(BaseDefenseGroundObject):
 
     def mission_types(self, for_player: bool) -> Iterator[FlightType]:
         from gen.flights.flight import FlightType
+
         if not self.is_friendly(for_player):
             yield FlightType.DEAD
         yield from super().mission_types(for_player)
@@ -400,20 +610,28 @@ class EwrGroundObject(BaseDefenseGroundObject):
     def might_have_aa(self) -> bool:
         return True
 
+    @property
+    def capturable(self) -> bool:
+        return False
+
+    @property
+    def purchasable(self) -> bool:
+        return True
+
 
 class ShipGroundObject(NavalGroundObject):
-    def __init__(self, name: str, group_id: int, position: Point,
-                 control_point: ControlPoint) -> None:
+    def __init__(
+        self, name: str, group_id: int, position: Point, control_point: ControlPoint
+    ) -> None:
         super().__init__(
             name=name,
-            category="aa",
+            category="ship",
             group_id=group_id,
             position=position,
             heading=0,
             control_point=control_point,
             dcs_identifier="AA",
-            airbase_group=False,
-            sea_object=True
+            sea_object=True,
         )
 
     @property

game/theater/thechannel.py

@@ -0,0 +1,8 @@
+from game.theater.projections import TransverseMercator
+
+PARAMETERS = TransverseMercator(
+    central_meridian=3,
+    false_easting=99376.00000000288,
+    false_northing=-5636889.00000001,
+    scale_factor=0.9996,
+)

game/theater/transitnetwork.py

@@ -0,0 +1,196 @@
+from __future__ import annotations
+
+import heapq
+import math
+from collections import defaultdict
+from dataclasses import dataclass, field
+from enum import Enum, auto
+from typing import Dict, Iterator, List, Optional, Set, Tuple
+
+from game.theater import ConflictTheater
+from game.theater.controlpoint import ControlPoint
+
+
+class NoPathError(RuntimeError):
+    def __init__(self, origin: ControlPoint, destination: ControlPoint) -> None:
+        super().__init__(f"Could not reconstruct path to {destination} from {origin}")
+
+
+@dataclass(frozen=True, order=True)
+class FrontierNode:
+    cost: float
+    point: ControlPoint = field(compare=False)
+
+
+class Frontier:
+    def __init__(self) -> None:
+        self.nodes: List[FrontierNode] = []
+
+    def push(self, poly: ControlPoint, cost: float) -> None:
+        heapq.heappush(self.nodes, FrontierNode(cost, poly))
+
+    def pop(self) -> Optional[FrontierNode]:
+        try:
+            return heapq.heappop(self.nodes)
+        except IndexError:
+            return None
+
+    def __bool__(self) -> bool:
+        return bool(self.nodes)
+
+
+class TransitConnection(Enum):
+    Road = auto()
+    Shipping = auto()
+    Airlift = auto()
+
+
+class TransitNetwork:
+    def __init__(self) -> None:
+        self.nodes: Dict[
+            ControlPoint, Dict[ControlPoint, TransitConnection]
+        ] = defaultdict(dict)
+
+    def has_destinations(self, control_point: ControlPoint) -> bool:
+        return bool(self.nodes[control_point])
+
+    def has_link(self, a: ControlPoint, b: ControlPoint) -> bool:
+        return b in self.nodes[a]
+
+    def link_type(self, a: ControlPoint, b: ControlPoint) -> TransitConnection:
+        return self.nodes[a][b]
+
+    def link_with(
+        self, a: ControlPoint, b: ControlPoint, link_type: TransitConnection
+    ) -> None:
+        self.nodes[a][b] = link_type
+        self.nodes[b][a] = link_type
+
+    def link_road(self, a: ControlPoint, b: ControlPoint) -> None:
+        self.link_with(a, b, TransitConnection.Road)
+
+    def link_shipping(self, a: ControlPoint, b: ControlPoint) -> None:
+        self.link_with(a, b, TransitConnection.Shipping)
+
+    def link_airport(self, a: ControlPoint, b: ControlPoint) -> None:
+        self.link_with(a, b, TransitConnection.Airlift)
+
+    def connections_from(self, control_point: ControlPoint) -> Iterator[ControlPoint]:
+        yield from self.nodes[control_point]
+
+    def cost(self, a: ControlPoint, b: ControlPoint) -> float:
+        return {
+            TransitConnection.Road: 1,
+            TransitConnection.Shipping: 3,
+            # Set arbitrarily high so that other methods are preferred, but still scaled
+            # by distance so that when we do need it we still pick the closest airfield.
+            # The units of distance are meters so there's no risk of these
+            TransitConnection.Airlift: a.position.distance_to_point(b.position),
+        }[self.link_type(a, b)]
+
+    def has_path_between(
+        self,
+        origin: ControlPoint,
+        destination: ControlPoint,
+        seen: Optional[set[ControlPoint]] = None,
+    ) -> bool:
+        if seen is None:
+            seen = set()
+        seen.add(origin)
+        for connection in self.connections_from(origin):
+            if connection in seen:
+                continue
+            if connection == destination:
+                return True
+            if self.has_path_between(connection, destination, seen):
+                return True
+        return False
+
+    def shortest_path_between(
+        self, origin: ControlPoint, destination: ControlPoint
+    ) -> list[ControlPoint]:
+        return self.shortest_path_with_cost(origin, destination)[0]
+
+    def shortest_path_with_cost(
+        self, origin: ControlPoint, destination: ControlPoint
+    ) -> Tuple[List[ControlPoint], float]:
+        if origin not in self.nodes:
+            raise ValueError(f"{origin} is not in the transit network.")
+        if destination not in self.nodes:
+            raise ValueError(f"{destination} is not in the transit network.")
+
+        frontier = Frontier()
+        frontier.push(origin, 0)
+
+        came_from: Dict[ControlPoint, Optional[ControlPoint]] = {origin: None}
+
+        best_known: Dict[ControlPoint, float] = defaultdict(lambda: math.inf)
+        best_known[origin] = 0.0
+
+        while (node := frontier.pop()) is not None:
+            cost = node.cost
+            current = node.point
+            if cost > best_known[current]:
+                continue
+
+            for neighbor in self.connections_from(current):
+                new_cost = cost + self.cost(node.point, neighbor)
+                if new_cost < best_known[neighbor]:
+                    best_known[neighbor] = new_cost
+                    frontier.push(neighbor, new_cost)
+                    came_from[neighbor] = current
+
+        # Reconstruct and reverse the path.
+        current = destination
+        path: List[ControlPoint] = []
+        while current != origin:
+            path.append(current)
+            previous = came_from.get(current)
+            if previous is None:
+                raise NoPathError(origin, destination)
+            current = previous
+        path.reverse()
+        return path, best_known[destination]
+
+
+class TransitNetworkBuilder:
+    def __init__(self, theater: ConflictTheater, for_player: bool) -> None:
+        self.control_points = list(theater.control_points_for(for_player))
+        self.network = TransitNetwork()
+        self.airports: Set[ControlPoint] = {
+            cp
+            for cp in self.control_points
+            if cp.is_friendly(for_player) and cp.runway_is_operational()
+        }
+
+    def build(self) -> TransitNetwork:
+        seen = set()
+        for control_point in self.control_points:
+            if control_point not in seen:
+                seen.add(control_point)
+                self.add_transit_links(control_point)
+        return self.network
+
+    def add_transit_links(self, control_point: ControlPoint) -> None:
+        # Prefer road connections.
+        for road_connection in control_point.connected_points:
+            if road_connection.is_friendly_to(control_point):
+                self.network.link_road(control_point, road_connection)
+
+        # Use sea connections if there's no road or rail connection.
+        for sea_connection in control_point.shipping_lanes:
+            if self.network.has_link(control_point, sea_connection):
+                continue
+            if sea_connection.is_friendly_to(control_point):
+                self.network.link_shipping(control_point, sea_connection)
+
+        # And use airports as a last resort.
+        if control_point in self.airports:
+            for airport in self.airports:
+                if control_point == airport:
+                    continue
+                if self.network.has_link(control_point, airport):
+                    continue
+                if not airport.is_friendly_to(control_point):
+                    continue
+                self.network.link_airport(control_point, airport)

game/threatzones.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import singledispatchmethod
-from typing import Optional, TYPE_CHECKING, Union
+from typing import Optional, TYPE_CHECKING, Union, Iterable
 
 from dcs.mapping import Point as DcsPoint
 from shapely.geometry import (
@@ -13,10 +13,10 @@ from shapely.geometry import (
 from shapely.geometry.base import BaseGeometry
 from shapely.ops import nearest_points, unary_union
 
-from game.theater import ControlPoint
+from game.theater import ControlPoint, MissionTarget
 from game.utils import Distance, meters, nautical_miles
 from gen.flights.closestairfields import ObjectiveDistanceCache
-from gen.flights.flight import Flight
+from gen.flights.flight import Flight, FlightWaypoint
 
 if TYPE_CHECKING:
     from game import Game
@@ -26,16 +26,24 @@ ThreatPoly = Union[MultiPolygon, Polygon]
 
 
 class ThreatZones:
-    def __init__(self, airbases: ThreatPoly, air_defenses: ThreatPoly) -> None:
+    def __init__(
+        self, airbases: ThreatPoly, air_defenses: ThreatPoly, radar_sam_threats
+    ) -> None:
         self.airbases = airbases
         self.air_defenses = air_defenses
+        self.radar_sam_threats = radar_sam_threats
         self.all = unary_union([airbases, air_defenses])
 
     def closest_boundary(self, point: DcsPoint) -> DcsPoint:
-        boundary, _ = nearest_points(self.all.boundary,
-                                     self.dcs_to_shapely_point(point))
+        boundary, _ = nearest_points(
+            self.all.boundary, self.dcs_to_shapely_point(point)
+        )
         return DcsPoint(boundary.x, boundary.y)
 
+    def distance_to_threat(self, point: DcsPoint) -> Distance:
+        boundary = self.closest_boundary(point)
+        return meters(boundary.distance_to_point(point))
+
     @singledispatchmethod
     def threatened(self, position) -> bool:
         raise NotImplementedError
@@ -49,8 +57,9 @@ class ThreatZones:
         return self.all.intersects(self.dcs_to_shapely_point(position))
 
     def path_threatened(self, a: DcsPoint, b: DcsPoint) -> bool:
-        return self.threatened(LineString(
-            [self.dcs_to_shapely_point(a), self.dcs_to_shapely_point(b)]))
+        return self.threatened(
+            LineString([self.dcs_to_shapely_point(a), self.dcs_to_shapely_point(b)])
+        )
 
     @singledispatchmethod
     def threatened_by_aircraft(self, target) -> bool:
@@ -62,9 +71,16 @@ class ThreatZones:
 
     @threatened_by_aircraft.register
     def _threatened_by_aircraft_flight(self, flight: Flight) -> bool:
-        return self.threatened_by_aircraft(LineString((
-            self.dcs_to_shapely_point(p.position) for p in flight.points
-        )))
+        return self.threatened_by_aircraft(
+            LineString((self.dcs_to_shapely_point(p.position) for p in flight.points))
+        )
+
+    def waypoints_threatened_by_aircraft(
+        self, waypoints: Iterable[FlightWaypoint]
+    ) -> bool:
+        return self.threatened_by_aircraft(
+            LineString((self.dcs_to_shapely_point(p.position) for p in waypoints))
+        )
 
     @singledispatchmethod
     def threatened_by_air_defense(self, target) -> bool:
@@ -76,27 +92,56 @@ class ThreatZones:
 
     @threatened_by_air_defense.register
     def _threatened_by_air_defense_flight(self, flight: Flight) -> bool:
-        return self.threatened_by_air_defense(LineString((
-            self.dcs_to_shapely_point(p.position) for p in flight.points
-        )))
+        return self.threatened_by_air_defense(
+            LineString((self.dcs_to_shapely_point(p.position) for p in flight.points))
+        )
+
+    @threatened_by_air_defense.register
+    def _threatened_by_air_defense_mission_target(self, target: MissionTarget) -> bool:
+        return self.threatened_by_air_defense(
+            self.dcs_to_shapely_point(target.position)
+        )
+
+    @singledispatchmethod
+    def threatened_by_radar_sam(self, target) -> bool:
+        raise NotImplementedError
+
+    @threatened_by_radar_sam.register
+    def _threatened_by_radar_sam_geom(self, position: BaseGeometry) -> bool:
+        return self.radar_sam_threats.intersects(position)
+
+    @threatened_by_radar_sam.register
+    def _threatened_by_radar_sam_flight(self, flight: Flight) -> bool:
+        return self.threatened_by_radar_sam(
+            LineString((self.dcs_to_shapely_point(p.position) for p in flight.points))
+        )
+
+    def waypoints_threatened_by_radar_sam(
+        self, waypoints: Iterable[FlightWaypoint]
+    ) -> bool:
+        return self.threatened_by_radar_sam(
+            LineString((self.dcs_to_shapely_point(p.position) for p in waypoints))
+        )
 
     @classmethod
-    def closest_enemy_airbase(cls, location: ControlPoint,
-                              max_distance: Distance) -> Optional[ControlPoint]:
+    def closest_enemy_airbase(
+        cls, location: ControlPoint, max_distance: Distance
+    ) -> Optional[ControlPoint]:
         airfields = ObjectiveDistanceCache.get_closest_airfields(location)
-        for airfield in airfields.airfields_within(max_distance):
+        for airfield in airfields.all_airfields_within(max_distance):
             if airfield.captured != location.captured:
                 return airfield
         return None
 
     @classmethod
-    def barcap_threat_range(cls, game: Game,
-                            control_point: ControlPoint) -> Distance:
+    def barcap_threat_range(cls, game: Game, control_point: ControlPoint) -> Distance:
         doctrine = game.faction_for(control_point.captured).doctrine
-        cap_threat_range = (doctrine.cap_max_distance_from_cp +
-                            doctrine.cap_engagement_range)
-        opposing_airfield = cls.closest_enemy_airbase(control_point,
-                                                      cap_threat_range * 2)
+        cap_threat_range = (
+            doctrine.cap_max_distance_from_cp + doctrine.cap_engagement_range
+        )
+        opposing_airfield = cls.closest_enemy_airbase(
+            control_point, cap_threat_range * 2
+        )
         if opposing_airfield is None:
             return cap_threat_range
 
@@ -127,16 +172,16 @@ class ThreatZones:
             zone belongs to the player, it is the zone that will be avoided by
             the enemy and vice versa.
         """
-        airbases = []
+        air_threats = []
         air_defenses = []
+        radar_sam_threats = []
         for control_point in game.theater.controlpoints:
             if control_point.captured != player:
                 continue
             if control_point.runway_is_operational():
-                point = ShapelyPoint(control_point.position.x,
-                                     control_point.position.y)
+                point = ShapelyPoint(control_point.position.x, control_point.position.y)
                 cap_threat_range = cls.barcap_threat_range(game, control_point)
-                airbases.append(point.buffer(cap_threat_range.meters))
+                air_threats.append(point.buffer(cap_threat_range.meters))
 
             for tgo in control_point.ground_objects:
                 for group in tgo.groups:
@@ -147,12 +192,18 @@ class ThreatZones:
                         point = ShapelyPoint(tgo.position.x, tgo.position.y)
                         threat_zone = point.buffer(threat_range.meters)
                         air_defenses.append(threat_zone)
+                    radar_threat_range = tgo.threat_range(group, radar_only=True)
+                    if radar_threat_range > nautical_miles(3):
+                        point = ShapelyPoint(tgo.position.x, tgo.position.y)
+                        threat_zone = point.buffer(threat_range.meters)
+                        radar_sam_threats.append(threat_zone)
 
         return cls(
-            airbases=unary_union(airbases),
-            air_defenses=unary_union(air_defenses)
+            airbases=unary_union(air_threats),
+            air_defenses=unary_union(air_defenses),
+            radar_sam_threats=unary_union(radar_sam_threats),
         )
 
     @staticmethod
     def dcs_to_shapely_point(point: DcsPoint) -> ShapelyPoint:
-        return ShapelyPoint(point.x, point.y)
+        return ShapelyPoint(point.x, point.y)

game/transfers.py

@@ -0,0 +1,619 @@
+from __future__ import annotations
+
+import logging
+import math
+from collections import defaultdict
+from dataclasses import dataclass, field
+from functools import singledispatchmethod
+from typing import (
+    Dict,
+    Generic,
+    Iterator,
+    List,
+    Optional,
+    TYPE_CHECKING,
+    Type,
+    TypeVar,
+    Sequence,
+)
+
+from dcs.mapping import Point
+from dcs.unittype import FlyingType, VehicleType
+
+from game.procurement import AircraftProcurementRequest
+from game.squadrons import Squadron
+from game.theater import ControlPoint, MissionTarget
+from game.theater.transitnetwork import (
+    TransitConnection,
+    TransitNetwork,
+)
+from game.utils import meters, nautical_miles
+from gen.ato import Package
+from gen.flights.ai_flight_planner_db import TRANSPORT_CAPABLE
+from gen.flights.closestairfields import ObjectiveDistanceCache
+from gen.flights.flight import Flight, FlightType
+from gen.flights.flightplan import FlightPlanBuilder
+from gen.naming import namegen
+
+if TYPE_CHECKING:
+    from game import Game
+    from game.inventory import ControlPointAircraftInventory
+
+
+class Transport:
+    def __init__(self, destination: ControlPoint):
+        self.destination = destination
+
+    def find_escape_route(self) -> Optional[ControlPoint]:
+        raise NotImplementedError
+
+    def description(self) -> str:
+        raise NotImplementedError
+
+
+@dataclass
+class TransferOrder:
+    """The base type of all transfer orders.
+
+    A transfer order can transfer multiple units of multiple types.
+    """
+
+    #: The location the units are transferring from.
+    origin: ControlPoint
+
+    #: The location the units are transferring to.
+    destination: ControlPoint
+
+    #: The current position of the group being transferred. Groups may make multiple
+    #: stops and can switch transport modes before reaching their destination.
+    position: ControlPoint = field(init=False)
+
+    #: True if the transfer order belongs to the player.
+    player: bool = field(init=False)
+
+    #: The units being transferred.
+    units: Dict[Type[VehicleType], int]
+
+    transport: Optional[Transport] = field(default=None)
+
+    def __post_init__(self) -> None:
+        self.position = self.origin
+        self.player = self.origin.is_friendly(to_player=True)
+
+    @property
+    def description(self) -> str:
+        if self.transport is None:
+            return "No transports available"
+        return self.transport.description()
+
+    def kill_all(self) -> None:
+        self.units.clear()
+
+    def kill_unit(self, unit_type: Type[VehicleType]) -> None:
+        if unit_type not in self.units or not self.units[unit_type]:
+            raise KeyError(f"{self.destination} has no {unit_type} remaining")
+        self.units[unit_type] -= 1
+
+    @property
+    def size(self) -> int:
+        return sum(c for c in self.units.values())
+
+    def iter_units(self) -> Iterator[Type[VehicleType]]:
+        for unit_type, count in self.units.items():
+            for _ in range(count):
+                yield unit_type
+
+    @property
+    def completed(self) -> bool:
+        return self.destination == self.position or not self.units
+
+    def disband_at(self, location: ControlPoint) -> None:
+        logging.info(f"Units halting at {location}.")
+        location.base.commision_units(self.units)
+        self.units.clear()
+
+    @property
+    def next_stop(self) -> ControlPoint:
+        if self.transport is None:
+            raise RuntimeError(
+                "TransferOrder.next_stop called with no transport assigned"
+            )
+        return self.transport.destination
+
+    def proceed(self) -> None:
+        if self.transport is None:
+            return
+
+        if not self.destination.is_friendly(self.player):
+            logging.info(f"Transfer destination {self.destination} was captured.")
+            if self.position.is_friendly(self.player):
+                self.disband_at(self.position)
+            elif (escape_route := self.transport.find_escape_route()) is not None:
+                self.disband_at(escape_route)
+            else:
+                logging.info(
+                    f"No escape route available. Units were surrounded and destroyed "
+                    "during transfer."
+                )
+                self.kill_all()
+            return
+
+        self.position = self.next_stop
+        self.transport = None
+
+        if self.completed:
+            self.disband_at(self.position)
+
+
+class Airlift(Transport):
+    """A transfer order that moves units by cargo planes and helicopters."""
+
+    def __init__(
+        self, transfer: TransferOrder, flight: Flight, next_stop: ControlPoint
+    ) -> None:
+        super().__init__(next_stop)
+        self.transfer = transfer
+        self.flight = flight
+
+    @property
+    def units(self) -> Dict[Type[VehicleType], int]:
+        return self.transfer.units
+
+    @property
+    def player_owned(self) -> bool:
+        return self.transfer.player
+
+    def find_escape_route(self) -> Optional[ControlPoint]:
+        # TODO: Move units to closest base.
+        return None
+
+    def description(self) -> str:
+        return (
+            f"Being airlifted from {self.transfer.position} to {self.destination} by "
+            f"{self.flight}"
+        )
+
+
+class AirliftPlanner:
+    #: Maximum range from for any link in the route of takeoff, pickup, dropoff, and RTB
+    #: for a helicopter to be considered for airlift. Total route length is not
+    #: considered because the helicopter can refuel at each stop. Cargo planes have no
+    #: maximum range.
+    HELO_MAX_RANGE = nautical_miles(100)
+
+    def __init__(
+        self, game: Game, transfer: TransferOrder, next_stop: ControlPoint
+    ) -> None:
+        self.game = game
+        self.transfer = transfer
+        self.next_stop = next_stop
+        self.for_player = transfer.destination.captured
+        self.package = Package(target=next_stop, auto_asap=True)
+
+    def compatible_with_mission(
+        self, unit_type: Type[FlyingType], airfield: ControlPoint
+    ) -> bool:
+        if not unit_type in TRANSPORT_CAPABLE:
+            return False
+        if not self.transfer.origin.can_operate(unit_type):
+            return False
+        if not self.next_stop.can_operate(unit_type):
+            return False
+
+        # Cargo planes have no maximum range.
+        if not unit_type.helicopter:
+            return True
+
+        # A helicopter that is transport capable and able to operate at both bases. Need
+        # to check that no leg of the journey exceeds the maximum range. This doesn't
+        # account for any routing around threats that might take place, but it's close
+        # enough.
+
+        home = airfield.position
+        pickup = self.transfer.position.position
+        drop_off = self.transfer.position.position
+        if meters(home.distance_to_point(pickup)) > self.HELO_MAX_RANGE:
+            return False
+
+        if meters(pickup.distance_to_point(drop_off)) > self.HELO_MAX_RANGE:
+            return False
+
+        if meters(drop_off.distance_to_point(home)) > self.HELO_MAX_RANGE:
+            return False
+
+        return True
+
+    def create_package_for_airlift(self) -> None:
+        distance_cache = ObjectiveDistanceCache.get_closest_airfields(
+            self.transfer.position
+        )
+        for cp in distance_cache.closest_airfields:
+            if cp.captured != self.for_player:
+                continue
+
+            inventory = self.game.aircraft_inventory.for_control_point(cp)
+            for unit_type, available in inventory.all_aircraft:
+                squadrons = [
+                    s
+                    for s in self.game.air_wing_for(self.for_player).squadrons_for(
+                        unit_type
+                    )
+                    if FlightType.TRANSPORT in s.auto_assignable_mission_types
+                ]
+                if not squadrons:
+                    continue
+                squadron = squadrons[0]
+                if self.compatible_with_mission(unit_type, cp):
+                    while available and self.transfer.transport is None:
+                        flight_size = self.create_airlift_flight(squadron, inventory)
+                        available -= flight_size
+        if self.package.flights:
+            self.game.ato_for(self.for_player).add_package(self.package)
+
+    def create_airlift_flight(
+        self, squadron: Squadron, inventory: ControlPointAircraftInventory
+    ) -> int:
+        available = inventory.available(squadron.aircraft)
+        capacity_each = 1 if squadron.aircraft.helicopter else 2
+        required = math.ceil(self.transfer.size / capacity_each)
+        flight_size = min(required, available, squadron.aircraft.group_size_max)
+        capacity = flight_size * capacity_each
+
+        if capacity < self.transfer.size:
+            transfer = self.game.transfers.split_transfer(self.transfer, capacity)
+        else:
+            transfer = self.transfer
+
+        player = inventory.control_point.captured
+        flight = Flight(
+            self.package,
+            self.game.country_for(player),
+            squadron,
+            flight_size,
+            FlightType.TRANSPORT,
+            self.game.settings.default_start_type,
+            departure=inventory.control_point,
+            arrival=inventory.control_point,
+            divert=None,
+            cargo=transfer,
+        )
+
+        transport = Airlift(transfer, flight, self.next_stop)
+        transfer.transport = transport
+
+        self.package.add_flight(flight)
+        planner = FlightPlanBuilder(self.game, self.package, self.for_player)
+        planner.populate_flight_plan(flight)
+        self.game.aircraft_inventory.claim_for_flight(flight)
+        return flight_size
+
+
+class MultiGroupTransport(MissionTarget, Transport):
+    def __init__(
+        self, name: str, origin: ControlPoint, destination: ControlPoint
+    ) -> None:
+        MissionTarget.__init__(self, name, origin.position)
+        Transport.__init__(self, destination)
+        self.origin = origin
+        self.transfers: List[TransferOrder] = []
+
+    def is_friendly(self, to_player: bool) -> bool:
+        return self.origin.captured
+
+    def add_units(self, transfer: TransferOrder) -> None:
+        self.transfers.append(transfer)
+        transfer.transport = self
+
+    def remove_units(self, transfer: TransferOrder) -> None:
+        transfer.transport = None
+        self.transfers.remove(transfer)
+
+    def kill_unit(self, unit_type: Type[VehicleType]) -> None:
+        for transfer in self.transfers:
+            try:
+                transfer.kill_unit(unit_type)
+                return
+            except KeyError:
+                pass
+        raise KeyError
+
+    def kill_all(self) -> None:
+        for transfer in self.transfers:
+            transfer.kill_all()
+
+    def disband(self) -> None:
+        for transfer in list(self.transfers):
+            self.remove_units(transfer)
+        self.transfers.clear()
+
+    @property
+    def size(self) -> int:
+        return sum(sum(t.units.values()) for t in self.transfers)
+
+    @property
+    def units(self) -> Dict[Type[VehicleType], int]:
+        units: Dict[Type[VehicleType], int] = defaultdict(int)
+        for transfer in self.transfers:
+            for unit_type, count in transfer.units.items():
+                units[unit_type] += count
+        return units
+
+    @property
+    def player_owned(self) -> bool:
+        return self.origin.captured
+
+    def find_escape_route(self) -> Optional[ControlPoint]:
+        raise NotImplementedError
+
+    def description(self) -> str:
+        raise NotImplementedError
+
+
+class Convoy(MultiGroupTransport):
+    def __init__(self, origin: ControlPoint, destination: ControlPoint) -> None:
+        super().__init__(namegen.next_convoy_name(), origin, destination)
+
+    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
+        if self.is_friendly(for_player):
+            return
+
+        yield FlightType.BAI
+        yield from super().mission_types(for_player)
+
+    @property
+    def route_start(self) -> Point:
+        return self.origin.convoy_origin_for(self.destination)
+
+    @property
+    def route_end(self) -> Point:
+        return self.destination.convoy_origin_for(self.origin)
+
+    def description(self) -> str:
+        return f"In a convoy from {self.origin} to {self.destination}"
+
+    def find_escape_route(self) -> Optional[ControlPoint]:
+        return None
+
+
+class CargoShip(MultiGroupTransport):
+    def __init__(self, origin: ControlPoint, destination: ControlPoint) -> None:
+        super().__init__(namegen.next_cargo_ship_name(), origin, destination)
+
+    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
+        if self.is_friendly(for_player):
+            return
+
+        yield FlightType.ANTISHIP
+        yield from super().mission_types(for_player)
+
+    @property
+    def route(self) -> Sequence[Point]:
+        return self.origin.shipping_lanes[self.destination]
+
+    def description(self) -> str:
+        return f"On a ship from {self.origin} to {self.destination}"
+
+    def find_escape_route(self) -> Optional[ControlPoint]:
+        return None
+
+
+TransportType = TypeVar("TransportType", bound=MultiGroupTransport)
+
+
+class TransportMap(Generic[TransportType]):
+    def __init__(self) -> None:
+        # Dict of origin -> destination -> transport.
+        self.transports: Dict[
+            ControlPoint, Dict[ControlPoint, TransportType]
+        ] = defaultdict(dict)
+
+    def create_transport(
+        self, origin: ControlPoint, destination: ControlPoint
+    ) -> TransportType:
+        raise NotImplementedError
+
+    def transport_exists(self, origin: ControlPoint, destination: ControlPoint) -> bool:
+        return destination in self.transports[origin]
+
+    def find_transport(
+        self, origin: ControlPoint, destination: ControlPoint
+    ) -> Optional[TransportType]:
+        return self.transports[origin].get(destination)
+
+    def find_or_create_transport(
+        self, origin: ControlPoint, destination: ControlPoint
+    ) -> TransportType:
+        transport = self.find_transport(origin, destination)
+        if transport is None:
+            transport = self.create_transport(origin, destination)
+            self.transports[origin][destination] = transport
+        return transport
+
+    def departing_from(self, origin: ControlPoint) -> Iterator[TransportType]:
+        yield from self.transports[origin].values()
+
+    def travelling_to(self, destination: ControlPoint) -> Iterator[TransportType]:
+        for destination_dict in self.transports.values():
+            if destination in destination_dict:
+                yield destination_dict[destination]
+
+    def disband_transport(self, transport: TransportType) -> None:
+        transport.disband()
+        del self.transports[transport.origin][transport.destination]
+
+    def add(self, transfer: TransferOrder, next_stop: ControlPoint) -> None:
+        self.find_or_create_transport(transfer.position, next_stop).add_units(transfer)
+
+    def remove(self, transport: TransportType, transfer: TransferOrder) -> None:
+        transport.remove_units(transfer)
+        if not transport.transfers:
+            self.disband_transport(transport)
+
+    def disband_all(self) -> None:
+        for transport in list(self):
+            self.disband_transport(transport)
+
+    def __iter__(self) -> Iterator[TransportType]:
+        for destination_dict in self.transports.values():
+            yield from destination_dict.values()
+
+
+class ConvoyMap(TransportMap):
+    def create_transport(
+        self, origin: ControlPoint, destination: ControlPoint
+    ) -> Convoy:
+        return Convoy(origin, destination)
+
+
+class CargoShipMap(TransportMap):
+    def create_transport(
+        self, origin: ControlPoint, destination: ControlPoint
+    ) -> CargoShip:
+        return CargoShip(origin, destination)
+
+
+class PendingTransfers:
+    def __init__(self, game: Game) -> None:
+        self.game = game
+        self.convoys = ConvoyMap()
+        self.cargo_ships = CargoShipMap()
+        self.pending_transfers: List[TransferOrder] = []
+
+    def __iter__(self) -> Iterator[TransferOrder]:
+        yield from self.pending_transfers
+
+    @property
+    def pending_transfer_count(self) -> int:
+        return len(self.pending_transfers)
+
+    def transfer_at_index(self, index: int) -> TransferOrder:
+        return self.pending_transfers[index]
+
+    def index_of_transfer(self, transfer: TransferOrder) -> int:
+        return self.pending_transfers.index(transfer)
+
+    def network_for(self, control_point: ControlPoint) -> TransitNetwork:
+        return self.game.transit_network_for(control_point.captured)
+
+    def arrange_transport(self, transfer: TransferOrder) -> None:
+        network = self.network_for(transfer.position)
+        path = network.shortest_path_between(transfer.position, transfer.destination)
+        next_stop = path[0]
+        if network.link_type(transfer.position, next_stop) == TransitConnection.Road:
+            self.convoys.add(transfer, next_stop)
+        elif (
+            network.link_type(transfer.position, next_stop)
+            == TransitConnection.Shipping
+        ):
+            self.cargo_ships.add(transfer, next_stop)
+        else:
+            AirliftPlanner(self.game, transfer, next_stop).create_package_for_airlift()
+
+    def new_transfer(self, transfer: TransferOrder) -> None:
+        transfer.origin.base.commit_losses(transfer.units)
+        self.pending_transfers.append(transfer)
+        self.arrange_transport(transfer)
+
+    def split_transfer(self, transfer: TransferOrder, size: int) -> TransferOrder:
+        """Creates a smaller transfer that is a subset of the original."""
+        if transfer.size <= size:
+            raise ValueError
+
+        units = {}
+        for unit_type, remaining in transfer.units.items():
+            take = min(remaining, size)
+            size -= take
+            transfer.units[unit_type] -= take
+            units[unit_type] = take
+            if not size:
+                break
+        new_transfer = TransferOrder(transfer.origin, transfer.destination, units)
+        self.pending_transfers.append(new_transfer)
+        return new_transfer
+
+    @singledispatchmethod
+    def cancel_transport(self, transport, transfer: TransferOrder) -> None:
+        pass
+
+    @cancel_transport.register
+    def _cancel_transport_air(
+        self, transport: Airlift, _transfer: TransferOrder
+    ) -> None:
+        flight = transport.flight
+        flight.package.remove_flight(flight)
+        if not flight.package.flights:
+            self.game.ato_for(transport.player_owned).remove_package(flight.package)
+        self.game.aircraft_inventory.return_from_flight(flight)
+        flight.clear_roster()
+
+    @cancel_transport.register
+    def _cancel_transport_convoy(
+        self, transport: Convoy, transfer: TransferOrder
+    ) -> None:
+        self.convoys.remove(transport, transfer)
+
+    @cancel_transport.register
+    def _cancel_transport_cargo_ship(
+        self, transport: CargoShip, transfer: TransferOrder
+    ) -> None:
+        self.cargo_ships.remove(transport, transfer)
+
+    def cancel_transfer(self, transfer: TransferOrder) -> None:
+        if transfer.transport is not None:
+            self.cancel_transport(transfer.transport, transfer)
+        self.pending_transfers.remove(transfer)
+        transfer.origin.base.commision_units(transfer.units)
+
+    def perform_transfers(self) -> None:
+        incomplete = []
+        for transfer in self.pending_transfers:
+            transfer.proceed()
+            if not transfer.completed:
+                incomplete.append(transfer)
+        self.pending_transfers = incomplete
+        self.convoys.disband_all()
+        self.cargo_ships.disband_all()
+
+    def plan_transports(self) -> None:
+        for transfer in self.pending_transfers:
+            if transfer.transport is None:
+                self.arrange_transport(transfer)
+
+    def order_airlift_assets(self) -> None:
+        for control_point in self.game.theater.controlpoints:
+            self.order_airlift_assets_at(control_point)
+
+    @staticmethod
+    def desired_airlift_capacity(control_point: ControlPoint) -> int:
+        return 4 if control_point.has_factory else 0
+
+    def current_airlift_capacity(self, control_point: ControlPoint) -> int:
+        inventory = self.game.aircraft_inventory.for_control_point(control_point)
+        squadrons = self.game.air_wing_for(control_point.captured).squadrons_for_task(
+            FlightType.TRANSPORT
+        )
+        unit_types = {s.aircraft for s in squadrons}.intersection(TRANSPORT_CAPABLE)
+        return sum(
+            count
+            for unit_type, count in inventory.all_aircraft
+            if unit_type in unit_types
+        )
+
+    def order_airlift_assets_at(self, control_point: ControlPoint) -> None:
+        gap = self.desired_airlift_capacity(
+            control_point
+        ) - self.current_airlift_capacity(control_point)
+
+        if gap <= 0:
+            return
+
+        if gap % 2:
+            # Always buy in pairs since we're not trying to fill odd squadrons. Purely
+            # aesthetic.
+            gap += 1
+
+        self.game.procurement_requests_for(player=control_point.captured).append(
+            AircraftProcurementRequest(
+                control_point, nautical_miles(200), FlightType.TRANSPORT, gap
+            )
+        )

game/unitdelivery.py

@@ -0,0 +1,161 @@
+from __future__ import annotations
+
+import logging
+from collections import defaultdict
+from dataclasses import dataclass
+from typing import Dict, Optional, TYPE_CHECKING, Type
+
+from dcs.unittype import UnitType, VehicleType
+
+from game.theater import ControlPoint
+from .db import PRICES
+from .theater.transitnetwork import (
+    NoPathError,
+    TransitNetwork,
+)
+from .transfers import TransferOrder
+
+if TYPE_CHECKING:
+    from .game import Game
+
+
+@dataclass(frozen=True)
+class GroundUnitSource:
+    control_point: ControlPoint
+
+
+class PendingUnitDeliveries:
+    def __init__(self, destination: ControlPoint) -> None:
+        self.destination = destination
+
+        # Maps unit type to order quantity.
+        self.units: Dict[Type[UnitType], int] = defaultdict(int)
+
+    def __str__(self) -> str:
+        return f"Pending delivery to {self.destination}"
+
+    def order(self, units: Dict[Type[UnitType], int]) -> None:
+        for k, v in units.items():
+            self.units[k] += v
+
+    def sell(self, units: Dict[Type[UnitType], int]) -> None:
+        for k, v in units.items():
+            self.units[k] -= v
+
+    def refund_all(self, game: Game) -> None:
+        self.refund(game, self.units)
+        self.units = defaultdict(int)
+
+    def refund(self, game: Game, units: Dict[Type[UnitType], int]) -> None:
+        for unit_type, count in units.items():
+            try:
+                price = PRICES[unit_type]
+            except KeyError:
+                logging.error(f"Could not refund {unit_type.id}, price unknown")
+                continue
+
+            logging.info(f"Refunding {count} {unit_type.id} at {self.destination.name}")
+            game.adjust_budget(price * count, player=self.destination.captured)
+
+    def pending_orders(self, unit_type: Type[UnitType]) -> int:
+        pending_units = self.units.get(unit_type)
+        if pending_units is None:
+            pending_units = 0
+        return pending_units
+
+    def available_next_turn(self, unit_type: Type[UnitType]) -> int:
+        current_units = self.destination.base.total_units_of_type(unit_type)
+        return self.pending_orders(unit_type) + current_units
+
+    def process(self, game: Game) -> None:
+        ground_unit_source = self.find_ground_unit_source(game)
+        if ground_unit_source is None:
+            game.message(
+                f"{self.destination.name} lost its source for ground unit "
+                "reinforcements. Refunding purchase price."
+            )
+            self.refund_all(game)
+            return
+
+        bought_units: Dict[Type[UnitType], int] = {}
+        units_needing_transfer: Dict[Type[VehicleType], int] = {}
+        sold_units: Dict[Type[UnitType], int] = {}
+        for unit_type, count in self.units.items():
+            coalition = "Ally" if self.destination.captured else "Enemy"
+            name = unit_type.id
+
+            if (
+                issubclass(unit_type, VehicleType)
+                and self.destination != ground_unit_source
+            ):
+                source = ground_unit_source
+                d = units_needing_transfer
+            else:
+                source = self.destination
+                d = bought_units
+
+            if count >= 0:
+                d[unit_type] = count
+                game.message(
+                    f"{coalition} reinforcements: {name} x {count} at {source}"
+                )
+            else:
+                sold_units[unit_type] = -count
+                game.message(f"{coalition} sold: {name} x {-count} at {source}")
+
+        self.units = defaultdict(int)
+        self.destination.base.commision_units(bought_units)
+        self.destination.base.commit_losses(sold_units)
+
+        if units_needing_transfer:
+            ground_unit_source.base.commision_units(units_needing_transfer)
+            self.create_transfer(game, ground_unit_source, units_needing_transfer)
+
+    def create_transfer(
+        self, game: Game, source: ControlPoint, units: Dict[Type[VehicleType], int]
+    ) -> None:
+        game.transfers.new_transfer(TransferOrder(source, self.destination, units))
+
+    def find_ground_unit_source(self, game: Game) -> Optional[ControlPoint]:
+        # This is running *after* the turn counter has been incremented, so this is the
+        # reaction to turn 0. On turn zero we allow units to be recruited anywhere for
+        # delivery on turn 1 so that turn 1 always starts with units on the front line.
+        if game.turn == 1:
+            return self.destination
+
+        # Fast path if the destination is a valid source.
+        if self.destination.can_recruit_ground_units(game):
+            return self.destination
+
+        try:
+            return self.find_ground_unit_source_in_network(
+                game.transit_network_for(self.destination.captured), game
+            )
+        except NoPathError:
+            return None
+
+    def find_ground_unit_source_in_network(
+        self, network: TransitNetwork, game: Game
+    ) -> Optional[ControlPoint]:
+        sources = []
+        for control_point in game.theater.control_points_for(self.destination.captured):
+            if control_point.can_recruit_ground_units(
+                game
+            ) and network.has_path_between(self.destination, control_point):
+                sources.append(control_point)
+
+        if not sources:
+            return None
+
+        # Fast path to skip the distance calculation if we have only one option.
+        if len(sources) == 1:
+            return sources[0]
+
+        closest = sources[0]
+        _, cost = network.shortest_path_with_cost(self.destination, closest)
+        for source in sources:
+            _, new_cost = network.shortest_path_with_cost(self.destination, source)
+            if new_cost < cost:
+                closest = source
+                cost = new_cost
+        return closest

game/unitmap.py

@@ -1,4 +1,6 @@
 """Maps generated units back to their Liberation types."""
+import itertools
+import math
 from dataclasses import dataclass
 from typing import Dict, Optional, Type
 
@@ -7,11 +9,19 @@ from dcs.unitgroup import FlyingGroup, Group, VehicleGroup
 from dcs.unittype import VehicleType
 
 from game import db
+from game.squadrons import Pilot
 from game.theater import Airfield, ControlPoint, TheaterGroundObject
-from game.theater.theatergroundobject import BuildingGroundObject
+from game.theater.theatergroundobject import BuildingGroundObject, SceneryGroundObject
+from game.transfers import CargoShip, Convoy, TransferOrder
 from gen.flights.flight import Flight
 
 
+@dataclass(frozen=True)
+class FlyingUnit:
+    flight: Flight
+    pilot: Pilot
+
+
 @dataclass(frozen=True)
 class FrontLineUnit:
     unit_type: Type[VehicleType]
@@ -25,6 +35,18 @@ class GroundObjectUnit:
     unit: Unit
 
 
+@dataclass(frozen=True)
+class ConvoyUnit:
+    unit_type: Type[VehicleType]
+    convoy: Convoy
+
+
+@dataclass(frozen=True)
+class AirliftUnits:
+    cargo: tuple[Type[VehicleType], ...]
+    transfer: TransferOrder
+
+
 @dataclass(frozen=True)
 class Building:
     ground_object: BuildingGroundObject
@@ -32,22 +54,29 @@ class Building:
 
 class UnitMap:
     def __init__(self) -> None:
-        self.aircraft: Dict[str, Flight] = {}
+        self.aircraft: Dict[str, FlyingUnit] = {}
         self.airfields: Dict[str, Airfield] = {}
         self.front_line_units: Dict[str, FrontLineUnit] = {}
         self.ground_object_units: Dict[str, GroundObjectUnit] = {}
         self.buildings: Dict[str, Building] = {}
+        self.convoys: Dict[str, ConvoyUnit] = {}
+        self.cargo_ships: Dict[str, CargoShip] = {}
+        self.airlifts: Dict[str, AirliftUnits] = {}
 
     def add_aircraft(self, group: FlyingGroup, flight: Flight) -> None:
-        for unit in group.units:
+        for pilot, unit in zip(flight.roster.pilots, group.units):
             # The actual name is a String (the pydcs translatable string), which
             # doesn't define __eq__.
             name = str(unit.name)
             if name in self.aircraft:
                 raise RuntimeError(f"Duplicate unit name: {name}")
-            self.aircraft[name] = flight
+            if pilot is None:
+                raise ValueError(f"{name} has no pilot assigned")
+            self.aircraft[name] = FlyingUnit(flight, pilot)
+        if flight.cargo is not None:
+            self.add_airlift_units(group, flight.cargo)
 
-    def flight(self, unit_name: str) -> Optional[Flight]:
+    def flight(self, unit_name: str) -> Optional[FlyingUnit]:
         return self.aircraft.get(unit_name, None)
 
     def add_airfield(self, airfield: Airfield) -> None:
@@ -70,15 +99,19 @@ class UnitMap:
                 raise RuntimeError(f"Unknown unit type: {unit.type}")
             if not issubclass(unit_type, VehicleType):
                 raise RuntimeError(
-                    f"{name} is a {unit_type.__name__}, expected a VehicleType")
+                    f"{name} is a {unit_type.__name__}, expected a VehicleType"
+                )
             self.front_line_units[name] = FrontLineUnit(unit_type, origin)
 
     def front_line_unit(self, name: str) -> Optional[FrontLineUnit]:
         return self.front_line_units.get(name, None)
 
-    def add_ground_object_units(self, ground_object: TheaterGroundObject,
-                                persistence_group: Group,
-                                miz_group: Group) -> None:
+    def add_ground_object_units(
+        self,
+        ground_object: TheaterGroundObject,
+        persistence_group: Group,
+        miz_group: Group,
+    ) -> None:
         """Adds a group associated with a TGO to the unit map.
 
         Args:
@@ -103,13 +136,72 @@ class UnitMap:
             if name in self.ground_object_units:
                 raise RuntimeError(f"Duplicate TGO unit: {name}")
             self.ground_object_units[name] = GroundObjectUnit(
-                ground_object, persistence_group, persistent_unit)
+                ground_object, persistence_group, persistent_unit
+            )
 
     def ground_object_unit(self, name: str) -> Optional[GroundObjectUnit]:
         return self.ground_object_units.get(name, None)
 
-    def add_building(self, ground_object: BuildingGroundObject,
-                     group: Group) -> None:
+    def add_convoy_units(self, group: Group, convoy: Convoy) -> None:
+        for unit in group.units:
+            # The actual name is a String (the pydcs translatable string), which
+            # doesn't define __eq__.
+            name = str(unit.name)
+            if name in self.convoys:
+                raise RuntimeError(f"Duplicate convoy unit: {name}")
+            unit_type = db.unit_type_from_name(unit.type)
+            if unit_type is None:
+                raise RuntimeError(f"Unknown unit type: {unit.type}")
+            if not issubclass(unit_type, VehicleType):
+                raise RuntimeError(
+                    f"{name} is a {unit_type.__name__}, expected a VehicleType"
+                )
+            self.convoys[name] = ConvoyUnit(unit_type, convoy)
+
+    def convoy_unit(self, name: str) -> Optional[ConvoyUnit]:
+        return self.convoys.get(name, None)
+
+    def add_cargo_ship(self, group: Group, ship: CargoShip) -> None:
+        if len(group.units) > 1:
+            # Cargo ship "groups" are single units. Killing the one ship kills the whole
+            # transfer. If we ever want to add escorts or create multiple cargo ships in
+            # a convoy of ships that logic needs to change.
+            raise ValueError("Expected cargo ship to be a single unit group.")
+        unit = group.units[0]
+        # The actual name is a String (the pydcs translatable string), which
+        # doesn't define __eq__.
+        name = str(unit.name)
+        if name in self.cargo_ships:
+            raise RuntimeError(f"Duplicate cargo ship: {name}")
+        self.cargo_ships[name] = ship
+
+    def cargo_ship(self, name: str) -> Optional[CargoShip]:
+        return self.cargo_ships.get(name, None)
+
+    def add_airlift_units(self, group: FlyingGroup, transfer: TransferOrder) -> None:
+        capacity_each = math.ceil(transfer.size / len(group.units))
+        for idx, transport in enumerate(group.units):
+            # Slice the units in groups based on the capacity of each unit. Cargo is
+            # assigned arbitrarily to units in the order of the group. The last unit in
+            # the group will receive a partial load if there is not enough cargo to fill
+            # every transport.
+            base_idx = idx * capacity_each
+            cargo = tuple(
+                itertools.islice(
+                    transfer.iter_units(), base_idx, base_idx + capacity_each
+                )
+            )
+            # The actual name is a String (the pydcs translatable string), which
+            # doesn't define __eq__.
+            name = str(transport.name)
+            if name in self.airlifts:
+                raise RuntimeError(f"Duplicate airlift unit: {name}")
+            self.airlifts[name] = AirliftUnits(cargo, transfer)
+
+    def airlift_unit(self, name: str) -> Optional[AirliftUnits]:
+        return self.airlifts.get(name, None)
+
+    def add_building(self, ground_object: BuildingGroundObject, group: Group) -> None:
         # The actual name is a String (the pydcs translatable string), which
         # doesn't define __eq__.
         # The name of the initiator in the DCS dead event will have " object"
@@ -119,8 +211,9 @@ class UnitMap:
             raise RuntimeError(f"Duplicate TGO unit: {name}")
         self.buildings[name] = Building(ground_object)
 
-    def add_fortification(self, ground_object: BuildingGroundObject,
-                          group: VehicleGroup) -> None:
+    def add_fortification(
+        self, ground_object: BuildingGroundObject, group: VehicleGroup
+    ) -> None:
         if len(group.units) != 1:
             raise ValueError("Fortification groups must have exactly one unit.")
         unit = group.units[0]
@@ -131,5 +224,15 @@ class UnitMap:
             raise RuntimeError(f"Duplicate TGO unit: {name}")
         self.buildings[name] = Building(ground_object)
 
+    def add_scenery(self, ground_object: SceneryGroundObject) -> None:
+        name = str(ground_object.map_object_id)
+        if name in self.buildings:
+            raise RuntimeError(
+                f"Duplicate TGO unit: {name}. TriggerZone name: "
+                f"{ground_object.dcs_identifier}"
+            )
+
+        self.buildings[name] = Building(ground_object)
+
     def building_or_fortification(self, name: str) -> Optional[Building]:
         return self.buildings.get(name, None)

game/utils.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import itertools
 import math
 from dataclasses import dataclass
 from typing import Union
@@ -178,3 +179,13 @@ def mach(value: float, altitude: Distance) -> Speed:
 
 
 SPEED_OF_SOUND_AT_SEA_LEVEL = knots(661.5)
+
+
+def pairwise(iterable):
+    """
+    itertools recipe
+    s -> (s0,s1), (s1,s2), (s2, s3), ...
+    """
+    a, b = itertools.tee(iterable)
+    next(b, None)
+    return zip(a, b)

game/version.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 
 def _build_version_string() -> str:
-    components = ["2.4.2"]
+    components = ["3.0"]
     build_number_path = Path("resources/buildnumber")
     if build_number_path.exists():
         with build_number_path.open("r") as build_number_file:
@@ -16,3 +16,75 @@ def _build_version_string() -> str:
 
 #: Current version of Liberation.
 VERSION = _build_version_string()
+
+#: The latest version of the campaign format. Increment this version whenever all
+#: existing campaigns should be flagged as incompatible in the UI. We will still attempt
+#: to load old campaigns, but this provides a warning to the user that the campaign may
+#: not work correctly.
+#:
+#: There is no verification that the campaign author updated their campaign correctly
+#: this is just a UI hint.
+#:
+#: Version history:
+#:
+#: Version 0
+#: * Unknown compatibility.
+#:
+#: Version 1
+#: * Compatible with Liberation 2.5.
+#:
+#: Version 2
+#: * Front line endpoints now define convoy origin/destination waypoints. They should be
+#:   placed on or near roads.
+#: * Factories (Workshop_A) define factory objectives. Only control points with
+#:   factories will be able to recruit ground units, so they should exist in sufficient
+#:   number and be protected by IADS.
+#:
+#: Version 3
+#: * Bulker Handy Winds define shipping lanes. They should be placed in port areas that
+#:   are navigable by ships and have a route to another port area. DCS ships *will not*
+#:   avoid driving into islands, so ensure that their waypoints plot a navigable route.
+#:
+#: Version 4
+#: * TriggerZones define map based building targets.  White TriggerZones created by right
+#:   clicking an object and using "assign as..." define the buildings within an objective.
+#:   Blue circular TriggerZones created normally must surround groups of one or more
+#:   white TriggerZones to define an objective.  If a white TriggerZone is not surrounded
+#:   by a blue circular TriggerZone, campaign creation will fail.  Blue circular
+#:   TriggerZones must also have their first property's value field define the type of
+#:   objective (a valid value for a building TGO category, from `game.db.PRICES`).
+#:
+#: Version 4.1
+#: * All objective types may now be set as required generation (similar to the required
+#:   IADS generation). This includes:
+#:     * SHORADS
+#:     * Armor groups
+#:     * Strike targets
+#:     * Offshore strike targets
+#:     * Ships
+#:     * Missile sites
+#:     * Coastal defenses
+#:
+#:   See the unit lists in MizCampaignLoader in conflicttheater.py for unit types.
+#:
+#: Version 4.2
+#: * Adds support for AAA objectives. Place with any of the following units (either red
+#:   or blue):
+#:     * AAA_8_8cm_Flak_18,
+#:     * SPAAA_Vulcan_M163,
+#:     * SPAAA_ZSU_23_4_Shilka_Gun_Dish,
+#:
+#: Version 5.0
+#: * Ammunition Depots objective locations are now predetermined using the "Ammunition
+#    Depot" Warehouse object, and through trigger zone based scenery objects.
+#:     * The number of alive Ammunition Depot objective buildings connected to a control
+#:       point directly influences how many ground units can be supported on the front
+#:       line.
+#:     * The number of supported ground units at any control point is artificially
+#:       capped at 50, even if the number of alive Ammunition Depot objectives can
+#:       support more.
+#:
+#: Version 6.0
+#: * Random objective generation no is longer supported. Fixed objective locations were
+#:   added in 4.1.
+CAMPAIGN_FORMAT_VERSION = (6, 0)

game/weather.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 import datetime
 import logging
 import random
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from enum import Enum
 from typing import Optional, TYPE_CHECKING
 
-from dcs.weather import Weather as PydcsWeather, Wind
+from dcs.cloud_presets import Clouds as PydcsClouds
+from dcs.weather import CloudPreset, Weather as PydcsWeather, Wind
 
 from game.settings import Settings
 from game.utils import Distance, meters
@@ -36,6 +37,23 @@ class Clouds:
     density: int
     thickness: int
     precipitation: PydcsWeather.Preceptions
+    preset: Optional[CloudPreset] = field(default=None)
+
+    @classmethod
+    def random_preset(cls, rain: bool) -> Clouds:
+        clouds = (p.value for p in PydcsClouds)
+        if rain:
+            presets = [p for p in clouds if "Rain" in p.name]
+        else:
+            presets = [p for p in clouds if "Rain" not in p.name]
+        preset = random.choice(presets)
+        return Clouds(
+            base=random.randint(preset.min_base, preset.max_base),
+            density=0,
+            thickness=0,
+            precipitation=PydcsWeather.Preceptions.None_,
+            preset=preset,
+        )
 
 
 @dataclass(frozen=True)
@@ -58,7 +76,7 @@ class Weather:
             return None
         return Fog(
             visibility=meters(random.randint(2500, 5000)),
-            thickness=random.randint(100, 500)
+            thickness=random.randint(100, 500),
         )
 
     def generate_wind(self) -> WindConditions:
@@ -76,7 +94,7 @@ class Weather:
             # Always some wind to make the smoke move a bit.
             at_0m=Wind(wind_direction, max(1, base_wind * at_0m_factor)),
             at_2000m=Wind(wind_direction, base_wind * at_2000m_factor),
-            at_8000m=Wind(wind_direction, base_wind * at_8000m_factor)
+            at_8000m=Wind(wind_direction, base_wind * at_8000m_factor),
         )
 
     @staticmethod
@@ -101,12 +119,11 @@ class ClearSkies(Weather):
 
 class Cloudy(Weather):
     def generate_clouds(self) -> Optional[Clouds]:
-        return Clouds(
-            base=self.random_cloud_base(),
-            density=random.randint(1, 8),
-            thickness=self.random_cloud_thickness(),
-            precipitation=PydcsWeather.Preceptions.None_
-        )
+        return Clouds.random_preset(rain=False)
+
+    def generate_fog(self) -> Optional[Fog]:
+        # DCS 2.7 says to not use fog with the cloud presets.
+        return None
 
     def generate_wind(self) -> WindConditions:
         return self.random_wind(0, 4)
@@ -114,12 +131,11 @@ class Cloudy(Weather):
 
 class Raining(Weather):
     def generate_clouds(self) -> Optional[Clouds]:
-        return Clouds(
-            base=self.random_cloud_base(),
-            density=random.randint(5, 8),
-            thickness=self.random_cloud_thickness(),
-            precipitation=PydcsWeather.Preceptions.Rain
-        )
+        return Clouds.random_preset(rain=True)
+
+    def generate_fog(self) -> Optional[Fog]:
+        # DCS 2.7 says to not use fog with the cloud presets.
+        return None
 
     def generate_wind(self) -> WindConditions:
         return self.random_wind(0, 6)
@@ -131,7 +147,7 @@ class Thunderstorm(Weather):
             base=self.random_cloud_base(),
             density=random.randint(9, 10),
             thickness=self.random_cloud_thickness(),
-            precipitation=PydcsWeather.Preceptions.Thunderstorm
+            precipitation=PydcsWeather.Preceptions.Thunderstorm,
         )
 
     def generate_wind(self) -> WindConditions:
@@ -145,20 +161,29 @@ class Conditions:
     weather: Weather
 
     @classmethod
-    def generate(cls, theater: ConflictTheater, day: datetime.date,
-                 time_of_day: TimeOfDay, settings: Settings) -> Conditions:
+    def generate(
+        cls,
+        theater: ConflictTheater,
+        day: datetime.date,
+        time_of_day: TimeOfDay,
+        settings: Settings,
+    ) -> Conditions:
         return cls(
             time_of_day=time_of_day,
             start_time=cls.generate_start_time(
                 theater, day, time_of_day, settings.night_disabled
             ),
-            weather=cls.generate_weather()
+            weather=cls.generate_weather(),
         )
 
     @classmethod
-    def generate_start_time(cls, theater: ConflictTheater, day: datetime.date,
-                            time_of_day: TimeOfDay,
-                            night_disabled: bool) -> datetime.datetime:
+    def generate_start_time(
+        cls,
+        theater: ConflictTheater,
+        day: datetime.date,
+        time_of_day: TimeOfDay,
+        night_disabled: bool,
+    ) -> datetime.datetime:
         if night_disabled:
             logging.info("Skip Night mission due to user settings")
             time_range = {
@@ -181,6 +206,7 @@ class Conditions:
             Cloudy: 60,
             ClearSkies: 20,
         }
-        weather_type = random.choices(list(chances.keys()),
-                                      weights=list(chances.values()))[0]
+        weather_type = random.choices(
+            list(chances.keys()), weights=list(chances.values())
+        )[0]
         return weather_type()

gen/airsupportgen.py

@@ -1,6 +1,7 @@
 import logging
 from dataclasses import dataclass, field
-from typing import List, Type, Tuple
+from datetime import timedelta
+from typing import List, Type, Tuple, Optional
 
 from dcs.mission import Mission, StartType
 from dcs.planes import IL_78M, KC130, KC135MPRS, KC_135
@@ -21,6 +22,7 @@ from .conflictgen import Conflict
 from .radios import RadioFrequency, RadioRegistry
 from .tacan import TacanBand, TacanChannel, TacanRegistry
 
+
 TANKER_DISTANCE = 15000
 TANKER_ALT = 4572
 TANKER_HEADING_OFFSET = 45
@@ -32,19 +34,26 @@ AWACS_ALT = 13000
 @dataclass
 class AwacsInfo:
     """AWACS information for the kneeboard."""
-    dcsGroupName: str
+
+    group_name: str
     callsign: str
     freq: RadioFrequency
+    depature_location: Optional[str]
+    start_time: Optional[timedelta]
+    end_time: Optional[timedelta]
+    blue: bool
 
 
 @dataclass
 class TankerInfo:
     """Tanker information for the kneeboard."""
-    dcsGroupName: str
+
+    group_name: str
     callsign: str
     variant: str
     freq: RadioFrequency
     tacan: TacanChannel
+    blue: bool
 
 
 @dataclass
@@ -54,10 +63,14 @@ class AirSupport:
 
 
 class AirSupportConflictGenerator:
-
-    def __init__(self, mission: Mission, conflict: Conflict, game,
-                 radio_registry: RadioRegistry,
-                 tacan_registry: TacanRegistry) -> None:
+    def __init__(
+        self,
+        mission: Mission,
+        conflict: Conflict,
+        game,
+        radio_registry: RadioRegistry,
+        tacan_registry: TacanRegistry,
+    ) -> None:
         self.mission = mission
         self.conflict = conflict
         self.game = game
@@ -78,22 +91,37 @@ class AirSupportConflictGenerator:
         elif unit_type is KC135MPRS:
             return (TANKER_ALT + 500, 596)
         return (TANKER_ALT, 574)
-        
+
     def generate(self):
-        player_cp = self.conflict.from_cp if self.conflict.from_cp.captured else self.conflict.to_cp
+        player_cp = (
+            self.conflict.blue_cp
+            if self.conflict.blue_cp.captured
+            else self.conflict.red_cp
+        )
 
         fallback_tanker_number = 0
 
-        for i, tanker_unit_type in enumerate(db.find_unittype(Refueling, self.conflict.attackers_side)):
+        for i, tanker_unit_type in enumerate(
+            db.find_unittype(Refueling, self.conflict.attackers_side)
+        ):
             alt, airspeed = self._get_tanker_params(tanker_unit_type)
-            variant = db.unit_type_name(tanker_unit_type)            
+            variant = db.unit_type_name(tanker_unit_type)
             freq = self.radio_registry.alloc_uhf()
             tacan = self.tacan_registry.alloc_for_band(TacanBand.Y)
-            tanker_heading = self.conflict.to_cp.position.heading_between_point(self.conflict.from_cp.position) + TANKER_HEADING_OFFSET * i
-            tanker_position = player_cp.position.point_from_heading(tanker_heading, TANKER_DISTANCE)
+            tanker_heading = (
+                self.conflict.red_cp.position.heading_between_point(
+                    self.conflict.blue_cp.position
+                )
+                + TANKER_HEADING_OFFSET * i
+            )
+            tanker_position = player_cp.position.point_from_heading(
+                tanker_heading, TANKER_DISTANCE
+            )
             tanker_group = self.mission.refuel_flight(
                 country=self.mission.country(self.game.player_country),
-                name=namegen.next_tanker_name(self.mission.country(self.game.player_country), tanker_unit_type),
+                name=namegen.next_tanker_name(
+                    self.mission.country(self.game.player_country), tanker_unit_type
+                ),
                 airport=None,
                 plane_type=tanker_unit_type,
                 position=tanker_position,
@@ -124,37 +152,67 @@ class AirSupportConflictGenerator:
             if tanker_unit_type != IL_78M:
                 # Override PyDCS tacan channel.
                 tanker_group.points[0].tasks.pop()
-                tanker_group.points[0].tasks.append(ActivateBeaconCommand(
-                    tacan.number, tacan.band.value, tacan_callsign, True,
-                    tanker_group.units[0].id, True))
+                tanker_group.points[0].tasks.append(
+                    ActivateBeaconCommand(
+                        tacan.number,
+                        tacan.band.value,
+                        tacan_callsign,
+                        True,
+                        tanker_group.units[0].id,
+                        True,
+                    )
+                )
 
             tanker_group.points[0].tasks.append(SetInvisibleCommand(True))
             tanker_group.points[0].tasks.append(SetImmortalCommand(True))
 
-            self.air_support.tankers.append(TankerInfo(str(tanker_group.name), callsign, variant, freq, tacan))
-
-        possible_awacs = db.find_unittype(AWACS, self.conflict.attackers_side)
-
-        if len(possible_awacs) > 0:
-            awacs_unit = possible_awacs[0]
-            freq = self.radio_registry.alloc_uhf()
-            
-            awacs_flight = self.mission.awacs_flight(
-                country=self.mission.country(self.game.player_country),
-                name=namegen.next_awacs_name(self.mission.country(self.game.player_country)),
-                plane_type=awacs_unit,
-                altitude=AWACS_ALT,
-                airport=None,
-                position=self.conflict.position.random_point_within(AWACS_DISTANCE, AWACS_DISTANCE),
-                frequency=freq.mhz,
-                start_type=StartType.Warm,
+            self.air_support.tankers.append(
+                TankerInfo(
+                    str(tanker_group.name),
+                    callsign,
+                    variant,
+                    freq,
+                    tacan,
+                    blue=True,
+                )
             )
-            awacs_flight.set_frequency(freq.mhz)
 
-            awacs_flight.points[0].tasks.append(SetInvisibleCommand(True))
-            awacs_flight.points[0].tasks.append(SetImmortalCommand(True))
+        if not self.game.settings.disable_legacy_aewc:
+            possible_awacs = db.find_unittype(AWACS, self.conflict.attackers_side)
 
-            self.air_support.awacs.append(AwacsInfo(
-                str(awacs_flight.name), callsign_for_support_unit(awacs_flight), freq))
-        else:
-            logging.warning("No AWACS for faction")
+            if len(possible_awacs) > 0:
+                awacs_unit = possible_awacs[0]
+                freq = self.radio_registry.alloc_uhf()
+
+                awacs_flight = self.mission.awacs_flight(
+                    country=self.mission.country(self.game.player_country),
+                    name=namegen.next_awacs_name(
+                        self.mission.country(self.game.player_country)
+                    ),
+                    plane_type=awacs_unit,
+                    altitude=AWACS_ALT,
+                    airport=None,
+                    position=self.conflict.position.random_point_within(
+                        AWACS_DISTANCE, AWACS_DISTANCE
+                    ),
+                    frequency=freq.mhz,
+                    start_type=StartType.Warm,
+                )
+                awacs_flight.set_frequency(freq.mhz)
+
+                awacs_flight.points[0].tasks.append(SetInvisibleCommand(True))
+                awacs_flight.points[0].tasks.append(SetImmortalCommand(True))
+
+                self.air_support.awacs.append(
+                    AwacsInfo(
+                        group_name=str(awacs_flight.name),
+                        callsign=callsign_for_support_unit(awacs_flight),
+                        freq=freq,
+                        depature_location=None,
+                        start_time=None,
+                        end_time=None,
+                        blue=True,
+                    )
+                )
+            else:
+                logging.warning("No AWACS for faction")

gen/armor.py

@@ -12,9 +12,17 @@ from dcs.country import Country
 from dcs.mapping import Point
 from dcs.planes import MQ_9_Reaper
 from dcs.point import PointAction
-from dcs.task import (EPLRS, AttackGroup, ControlledTask, FireAtPoint,
-                      GoToWaypoint, Hold, OrbitAction, SetImmortalCommand,
-                      SetInvisibleCommand)
+from dcs.task import (
+    EPLRS,
+    AttackGroup,
+    ControlledTask,
+    FireAtPoint,
+    GoToWaypoint,
+    Hold,
+    OrbitAction,
+    SetImmortalCommand,
+    SetInvisibleCommand,
+)
 from dcs.triggers import Event, TriggerOnce
 from dcs.unit import Vehicle
 from dcs.unitgroup import VehicleGroup
@@ -24,8 +32,11 @@ from game.unitmap import UnitMap
 from game.utils import heading_sum, opposite_heading
 from game.theater.controlpoint import ControlPoint
 
-from gen.ground_forces.ai_ground_planner import (DISTANCE_FROM_FRONTLINE,
-                                                 CombatGroup, CombatGroupRole)
+from gen.ground_forces.ai_ground_planner import (
+    DISTANCE_FROM_FRONTLINE,
+    CombatGroup,
+    CombatGroupRole,
+)
 
 from .callsigns import callsign_for_support_unit
 from .conflictgen import Conflict
@@ -56,25 +67,27 @@ INFANTRY_GROUP_SIZE = 5
 @dataclass(frozen=True)
 class JtacInfo:
     """JTAC information."""
-    dcsGroupName: str
+
+    group_name: str
     unit_name: str
     callsign: str
     region: str
     code: str
+    blue: bool
     # TODO: Radio info? Type?
 
 
 class GroundConflictGenerator:
-
     def __init__(
-            self,
-            mission: Mission,
-            conflict: Conflict,
-            game: Game,
-            player_planned_combat_groups: List[CombatGroup],
-            enemy_planned_combat_groups: List[CombatGroup],
-            player_stance: CombatStance,
-            unit_map: UnitMap) -> None:
+        self,
+        mission: Mission,
+        conflict: Conflict,
+        game: Game,
+        player_planned_combat_groups: List[CombatGroup],
+        enemy_planned_combat_groups: List[CombatGroup],
+        player_stance: CombatStance,
+        unit_map: UnitMap,
+    ) -> None:
         self.mission = mission
         self.conflict = conflict
         self.enemy_planned_combat_groups = enemy_planned_combat_groups
@@ -87,14 +100,16 @@ class GroundConflictGenerator:
 
     def _enemy_stance(self):
         """Picks the enemy stance according to the number of planned groups on the frontline for each side"""
-        if len(self.enemy_planned_combat_groups) > len(self.player_planned_combat_groups):
+        if len(self.enemy_planned_combat_groups) > len(
+            self.player_planned_combat_groups
+        ):
             return random.choice(
                 [
                     CombatStance.AGGRESSIVE,
                     CombatStance.AGGRESSIVE,
                     CombatStance.AGGRESSIVE,
                     CombatStance.ELIMINATION,
-                    CombatStance.BREAKTHROUGH
+                    CombatStance.BREAKTHROUGH,
                 ]
             )
         else:
@@ -104,31 +119,37 @@ class GroundConflictGenerator:
                     CombatStance.DEFENSIVE,
                     CombatStance.DEFENSIVE,
                     CombatStance.AMBUSH,
-                    CombatStance.AGGRESSIVE
+                    CombatStance.AGGRESSIVE,
                 ]
             )
 
     @staticmethod
     def _group_point(point: Point, base_distance) -> Point:
         distance = random.randint(
-                int(base_distance * SPREAD_DISTANCE_FACTOR[0]),
-                int(base_distance * SPREAD_DISTANCE_FACTOR[1]),
-                )
-        return point.random_point_within(distance, base_distance * SPREAD_DISTANCE_SIZE_FACTOR)
+            int(base_distance * SPREAD_DISTANCE_FACTOR[0]),
+            int(base_distance * SPREAD_DISTANCE_FACTOR[1]),
+        )
+        return point.random_point_within(
+            distance, base_distance * SPREAD_DISTANCE_SIZE_FACTOR
+        )
 
     def generate(self):
-        position = Conflict.frontline_position(self.conflict.from_cp, self.conflict.to_cp, self.game.theater)
+        position = Conflict.frontline_position(
+            self.conflict.front_line, self.game.theater
+        )
         frontline_vector = Conflict.frontline_vector(
-            self.conflict.from_cp,
-            self.conflict.to_cp,
-            self.game.theater
-            )
+            self.conflict.front_line, self.game.theater
+        )
 
         # Create player groups at random position
-        player_groups = self._generate_groups(self.player_planned_combat_groups, frontline_vector, True)
+        player_groups = self._generate_groups(
+            self.player_planned_combat_groups, frontline_vector, True
+        )
 
         # Create enemy groups at random position
-        enemy_groups = self._generate_groups(self.enemy_planned_combat_groups, frontline_vector, False)
+        enemy_groups = self._generate_groups(
+            self.enemy_planned_combat_groups, frontline_vector, False
+        )
 
         # Plan combat actions for groups
         self.plan_action_for_groups(
@@ -136,62 +157,73 @@ class GroundConflictGenerator:
             player_groups,
             enemy_groups,
             self.conflict.heading + 90,
-            self.conflict.from_cp,
-            self.conflict.to_cp
+            self.conflict.blue_cp,
+            self.conflict.red_cp,
         )
         self.plan_action_for_groups(
             self.enemy_stance,
             enemy_groups,
             player_groups,
             self.conflict.heading - 90,
-            self.conflict.to_cp,
-            self.conflict.from_cp
+            self.conflict.red_cp,
+            self.conflict.blue_cp,
         )
 
         # Add JTAC
         if self.game.player_faction.has_jtac:
-            n = "JTAC" + str(self.conflict.from_cp.id) + str(self.conflict.to_cp.id)
+            n = "JTAC" + str(self.conflict.blue_cp.id) + str(self.conflict.red_cp.id)
             code = 1688 - len(self.jtacs)
 
             utype = MQ_9_Reaper
             if self.game.player_faction.jtac_unit is not None:
                 utype = self.game.player_faction.jtac_unit
 
-            jtac = self.mission.flight_group(country=self.mission.country(self.game.player_country),
-                                             name=n,
-                                             aircraft_type=utype,
-                                             position=position[0],
-                                             airport=None,
-                                             altitude=5000)
+            jtac = self.mission.flight_group(
+                country=self.mission.country(self.game.player_country),
+                name=n,
+                aircraft_type=utype,
+                position=position[0],
+                airport=None,
+                altitude=5000,
+            )
             jtac.points[0].tasks.append(SetInvisibleCommand(True))
             jtac.points[0].tasks.append(SetImmortalCommand(True))
-            jtac.points[0].tasks.append(OrbitAction(5000, 300, OrbitAction.OrbitPattern.Circle))
-            frontline = f"Frontline {self.conflict.from_cp.name}/{self.conflict.to_cp.name}"
+            jtac.points[0].tasks.append(
+                OrbitAction(5000, 300, OrbitAction.OrbitPattern.Circle)
+            )
+            frontline = (
+                f"Frontline {self.conflict.blue_cp.name}/{self.conflict.red_cp.name}"
+            )
             # Note: Will need to change if we ever add ground based JTAC.
             callsign = callsign_for_support_unit(jtac)
-            self.jtacs.append(JtacInfo(str(jtac.name), n, callsign, frontline, str(code)))
+            self.jtacs.append(
+                JtacInfo(
+                    str(jtac.name),
+                    n,
+                    callsign,
+                    frontline,
+                    str(code),
+                    blue=True,
+                )
+            )
 
     def gen_infantry_group_for_group(
-        self,
-        group: VehicleGroup,
-        is_player: bool,
-        side: Country,
-        forward_heading: int
+        self, group: VehicleGroup, is_player: bool, side: Country, forward_heading: int
     ) -> None:
 
         infantry_position = self.conflict.find_ground_position(
             group.points[0].position.random_point_within(250, 50),
             500,
             forward_heading,
-            self.conflict.theater
-            )
+            self.conflict.theater,
+        )
         if not infantry_position:
             logging.warning("Could not find infantry position")
             return
         if side == self.conflict.attackers_country:
-            cp = self.conflict.from_cp
+            cp = self.conflict.blue_cp
         else:
-            cp = self.conflict.to_cp
+            cp = self.conflict.red_cp
 
         if is_player:
             faction = self.game.player_name
@@ -208,44 +240,50 @@ class GroundConflictGenerator:
                         u = random.choice(manpads)
                         self.mission.vehicle_group(
                             side,
-                            namegen.next_infantry_name(side, cp.id, u), u,
+                            namegen.next_infantry_name(side, cp.id, u),
+                            u,
                             position=infantry_position,
                             group_size=1,
                             heading=forward_heading,
-                            move_formation=PointAction.OffRoad)
+                            move_formation=PointAction.OffRoad,
+                        )
             return
 
-        possible_infantry_units = db.find_infantry(faction, allow_manpad=self.game.settings.manpads)
+        possible_infantry_units = db.find_infantry(
+            faction, allow_manpad=self.game.settings.manpads
+        )
         if len(possible_infantry_units) == 0:
             return
 
         u = random.choice(possible_infantry_units)
         self.mission.vehicle_group(
-                side,
-                namegen.next_infantry_name(side, cp.id, u), u,
-                position=infantry_position,
-                group_size=1,
-                heading=forward_heading,
-                move_formation=PointAction.OffRoad)
+            side,
+            namegen.next_infantry_name(side, cp.id, u),
+            u,
+            position=infantry_position,
+            group_size=1,
+            heading=forward_heading,
+            move_formation=PointAction.OffRoad,
+        )
 
         for i in range(INFANTRY_GROUP_SIZE):
             u = random.choice(possible_infantry_units)
             position = infantry_position.random_point_within(55, 5)
             self.mission.vehicle_group(
                 side,
-                namegen.next_infantry_name(side, cp.id, u), u,
+                namegen.next_infantry_name(side, cp.id, u),
+                u,
                 position=position,
                 group_size=1,
                 heading=forward_heading,
-                move_formation=PointAction.OffRoad)
+                move_formation=PointAction.OffRoad,
+            )
 
     def _set_reform_waypoint(
-        self,
-        dcs_group: VehicleGroup,
-        forward_heading: int
+        self, dcs_group: VehicleGroup, forward_heading: int
     ) -> None:
         """Setting a waypoint close to the spawn position allows the group to reform gracefully
-        rather than spin        
+        rather than spin
         """
         reform_point = dcs_group.position.point_from_heading(forward_heading, 50)
         dcs_group.add_waypoint(reform_point)
@@ -256,7 +294,7 @@ class GroundConflictGenerator:
         gen_group: CombatGroup,
         dcs_group: VehicleGroup,
         forward_heading: int,
-        target: Point
+        target: Point,
     ) -> bool:
         """
         Handles adding the DCS tasks for artillery groups for all combat stances.
@@ -269,7 +307,9 @@ class GroundConflictGenerator:
             dcs_group.add_trigger_action(hold_task)
 
         # Artillery strike random start
-        artillery_trigger = TriggerOnce(Event.NoEvent, "ArtilleryFireTask #" + str(dcs_group.id))
+        artillery_trigger = TriggerOnce(
+            Event.NoEvent, "ArtilleryFireTask #" + str(dcs_group.id)
+        )
         artillery_trigger.add_condition(TimeAfter(seconds=random.randint(1, 45) * 60))
         # TODO: Update to fire at group instead of point
         fire_task = FireAtPoint(target, len(gen_group.units) * 10, 100)
@@ -283,12 +323,19 @@ class GroundConflictGenerator:
 
             # Hold position
             dcs_group.points[1].tasks.append(Hold())
-            retreat = self.find_retreat_point(dcs_group, forward_heading, (int)(RETREAT_DISTANCE/3))
-            dcs_group.add_waypoint(dcs_group.position.point_from_heading(forward_heading, 1), PointAction.OffRoad)
+            retreat = self.find_retreat_point(
+                dcs_group, forward_heading, (int)(RETREAT_DISTANCE / 3)
+            )
+            dcs_group.add_waypoint(
+                dcs_group.position.point_from_heading(forward_heading, 1),
+                PointAction.OffRoad,
+            )
             dcs_group.points[2].tasks.append(Hold())
             dcs_group.add_waypoint(retreat, PointAction.OffRoad)
 
-            artillery_fallback = TriggerOnce(Event.NoEvent, "ArtilleryRetreat #" + str(dcs_group.id))
+            artillery_fallback = TriggerOnce(
+                Event.NoEvent, "ArtilleryRetreat #" + str(dcs_group.id)
+            )
             for i, u in enumerate(dcs_group.units):
                 artillery_fallback.add_condition(UnitDamaged(u.id))
                 if i < len(dcs_group.units) - 1:
@@ -302,7 +349,9 @@ class GroundConflictGenerator:
             retreat_task.number = 4
             dcs_group.add_trigger_action(retreat_task)
 
-            artillery_fallback.add_action(AITaskPush(dcs_group.id, len(dcs_group.tasks)))
+            artillery_fallback.add_action(
+                AITaskPush(dcs_group.id, len(dcs_group.tasks))
+            )
             self.mission.triggerrules.triggers.append(artillery_fallback)
 
             for u in dcs_group.units:
@@ -330,12 +379,8 @@ class GroundConflictGenerator:
             target = self.find_nearest_enemy_group(dcs_group, enemy_groups)
             if target is not None:
                 rand_offset = Point(
-                    random.randint(
-                        -RANDOM_OFFSET_ATTACK, RANDOM_OFFSET_ATTACK
-                    ),
-                    random.randint(
-                        -RANDOM_OFFSET_ATTACK, RANDOM_OFFSET_ATTACK
-                    )
+                    random.randint(-RANDOM_OFFSET_ATTACK, RANDOM_OFFSET_ATTACK),
+                    random.randint(-RANDOM_OFFSET_ATTACK, RANDOM_OFFSET_ATTACK),
                 )
                 target_point = self.conflict.theater.nearest_land_pos(
                     target.points[0].position + rand_offset
@@ -345,8 +390,7 @@ class GroundConflictGenerator:
 
             if (
                 to_cp.position.distance_to_point(dcs_group.points[0].position)
-                <=
-                AGGRESIVE_MOVE_DISTANCE
+                <= AGGRESIVE_MOVE_DISTANCE
             ):
                 attack_point = self.conflict.theater.nearest_land_pos(
                     to_cp.position.random_point_within(500, 0)
@@ -358,16 +402,16 @@ class GroundConflictGenerator:
                 if offset_heading < 0:
                     offset_heading = 358
                 attack_point = self.find_offensive_point(
-                    dcs_group,
-                    offset_heading,
-                    AGGRESIVE_MOVE_DISTANCE
+                    dcs_group, offset_heading, AGGRESIVE_MOVE_DISTANCE
                 )
             dcs_group.add_waypoint(attack_point, PointAction.OffRoad)
         elif stance == CombatStance.BREAKTHROUGH:
             # In breakthrough mode, the units will move forward
             # If the enemy base is close enough, the units will attack the base
-            if to_cp.position.distance_to_point(
-                    dcs_group.points[0].position) <= BREAKTHROUGH_OFFENSIVE_DISTANCE:
+            if (
+                to_cp.position.distance_to_point(dcs_group.points[0].position)
+                <= BREAKTHROUGH_OFFENSIVE_DISTANCE
+            ):
                 attack_point = self.conflict.theater.nearest_land_pos(
                     to_cp.position.random_point_within(500, 0)
                 )
@@ -377,27 +421,27 @@ class GroundConflictGenerator:
                 offset_heading = forward_heading - 1
                 if offset_heading < 0:
                     offset_heading = 359
-                attack_point = self.find_offensive_point(dcs_group, offset_heading, BREAKTHROUGH_OFFENSIVE_DISTANCE)
+                attack_point = self.find_offensive_point(
+                    dcs_group, offset_heading, BREAKTHROUGH_OFFENSIVE_DISTANCE
+                )
             dcs_group.add_waypoint(attack_point, PointAction.OffRoad)
         elif stance == CombatStance.ELIMINATION:
             # In elimination mode, the units focus on destroying as much enemy groups as possible
             targets = self.find_n_nearest_enemy_groups(dcs_group, enemy_groups, 3)
             for i, target in enumerate(targets, start=1):
                 rand_offset = Point(
-                    random.randint(
-                        -RANDOM_OFFSET_ATTACK, RANDOM_OFFSET_ATTACK
-                    ),
-                    random.randint(
-                        -RANDOM_OFFSET_ATTACK,
-                        RANDOM_OFFSET_ATTACK
-                    )
+                    random.randint(-RANDOM_OFFSET_ATTACK, RANDOM_OFFSET_ATTACK),
+                    random.randint(-RANDOM_OFFSET_ATTACK, RANDOM_OFFSET_ATTACK),
                 )
                 target_point = self.conflict.theater.nearest_land_pos(
-                    target.points[0].position+rand_offset
+                    target.points[0].position + rand_offset
                 )
                 dcs_group.add_waypoint(target_point, PointAction.OffRoad)
                 dcs_group.points[i + 1].tasks.append(AttackGroup(target.id))
-            if to_cp.position.distance_to_point(dcs_group.points[0].position) <= AGGRESIVE_MOVE_DISTANCE:
+            if (
+                to_cp.position.distance_to_point(dcs_group.points[0].position)
+                <= AGGRESIVE_MOVE_DISTANCE
+            ):
                 attack_point = self.conflict.theater.nearest_land_pos(
                     to_cp.position.random_point_within(500, 0)
                 )
@@ -420,12 +464,23 @@ class GroundConflictGenerator:
         Returns True if tasking was added, returns False if the stance was not a combat stance.
         """
         self._set_reform_waypoint(dcs_group, forward_heading)
-        if stance in [CombatStance.AGGRESSIVE, CombatStance.BREAKTHROUGH, CombatStance.ELIMINATION]:
+        if stance in [
+            CombatStance.AGGRESSIVE,
+            CombatStance.BREAKTHROUGH,
+            CombatStance.ELIMINATION,
+        ]:
             # APC & ATGM will never move too much forward, but will follow along any offensive
-            if to_cp.position.distance_to_point(dcs_group.points[0].position) <= AGGRESIVE_MOVE_DISTANCE:
-                attack_point = self.conflict.theater.nearest_land_pos(to_cp.position.random_point_within(500, 0))
+            if (
+                to_cp.position.distance_to_point(dcs_group.points[0].position)
+                <= AGGRESIVE_MOVE_DISTANCE
+            ):
+                attack_point = self.conflict.theater.nearest_land_pos(
+                    to_cp.position.random_point_within(500, 0)
+                )
             else:
-                attack_point = self.find_offensive_point(dcs_group, forward_heading, AGGRESIVE_MOVE_DISTANCE)
+                attack_point = self.find_offensive_point(
+                    dcs_group, forward_heading, AGGRESIVE_MOVE_DISTANCE
+                )
             dcs_group.add_waypoint(attack_point, PointAction.OffRoad)
 
         if stance != CombatStance.RETREAT:
@@ -434,29 +489,36 @@ class GroundConflictGenerator:
         return False
 
     def plan_action_for_groups(
-        self, stance: CombatStance,
+        self,
+        stance: CombatStance,
         ally_groups: List[Tuple[VehicleGroup, CombatGroup]],
         enemy_groups: List[Tuple[VehicleGroup, CombatGroup]],
         forward_heading: int,
         from_cp: ControlPoint,
-        to_cp: ControlPoint
+        to_cp: ControlPoint,
     ) -> None:
 
         if not self.game.settings.perf_moving_units:
             return
 
         for dcs_group, group in ally_groups:
-            if hasattr(group.units[0], 'eplrs') and group.units[0].eplrs:
+            if hasattr(group.units[0], "eplrs") and group.units[0].eplrs:
                 dcs_group.points[0].tasks.append(EPLRS(dcs_group.id))
 
             if group.role == CombatGroupRole.ARTILLERY:
                 if self.game.settings.perf_artillery:
-                    target = self.get_artillery_target_in_range(dcs_group, group, enemy_groups)
+                    target = self.get_artillery_target_in_range(
+                        dcs_group, group, enemy_groups
+                    )
                     if target is not None:
-                        self._plan_artillery_action(stance, group, dcs_group, forward_heading, target)
+                        self._plan_artillery_action(
+                            stance, group, dcs_group, forward_heading, target
+                        )
 
             elif group.role in [CombatGroupRole.TANK, CombatGroupRole.IFV]:
-                self._plan_tank_ifv_action(stance, enemy_groups, dcs_group, forward_heading, to_cp)
+                self._plan_tank_ifv_action(
+                    stance, enemy_groups, dcs_group, forward_heading, to_cp
+                )
 
             elif group.role in [CombatGroupRole.APC, CombatGroupRole.ATGM]:
                 self._plan_apc_atgm_action(stance, dcs_group, forward_heading, to_cp)
@@ -464,11 +526,16 @@ class GroundConflictGenerator:
             if stance == CombatStance.RETREAT:
                 # In retreat mode, the units will fall back
                 # If the ally base is close enough, the units will even regroup there
-                if from_cp.position.distance_to_point(dcs_group.points[0].position) <= RETREAT_DISTANCE:
+                if (
+                    from_cp.position.distance_to_point(dcs_group.points[0].position)
+                    <= RETREAT_DISTANCE
+                ):
                     retreat_point = from_cp.position.random_point_within(500, 250)
                 else:
                     retreat_point = self.find_retreat_point(dcs_group, forward_heading)
-                reposition_point = retreat_point.point_from_heading(forward_heading, 10)  # Another point to make the unit face the enemy
+                reposition_point = retreat_point.point_from_heading(
+                    forward_heading, 10
+                )  # Another point to make the unit face the enemy
                 dcs_group.add_waypoint(retreat_point, PointAction.OffRoad)
                 dcs_group.add_waypoint(reposition_point, PointAction.OffRoad)
 
@@ -490,8 +557,10 @@ class GroundConflictGenerator:
 
         # We add a new retreat waypoint
         dcs_group.add_waypoint(
-            self.find_retreat_point(dcs_group, forward_heading, (int)(RETREAT_DISTANCE / 8)),
-            PointAction.OffRoad
+            self.find_retreat_point(
+                dcs_group, forward_heading, (int)(RETREAT_DISTANCE / 8)
+            ),
+            PointAction.OffRoad,
         )
 
         # Fallback task
@@ -515,7 +584,7 @@ class GroundConflictGenerator:
         self,
         dcs_group: VehicleGroup,
         frontline_heading: int,
-        distance: int = RETREAT_DISTANCE
+        distance: int = RETREAT_DISTANCE,
     ) -> Point:
         """
         Find a point to retreat to
@@ -523,17 +592,15 @@ class GroundConflictGenerator:
         :param frontline_heading: Heading of the frontline
         :return: dcs.mapping.Point object with the desired position
         """
-        desired_point = dcs_group.points[0].position.point_from_heading(heading_sum(frontline_heading, +180), distance)
+        desired_point = dcs_group.points[0].position.point_from_heading(
+            heading_sum(frontline_heading, +180), distance
+        )
         if self.conflict.theater.is_on_land(desired_point):
             return desired_point
         return self.conflict.theater.nearest_land_pos(desired_point)
 
-
     def find_offensive_point(
-        self,
-        dcs_group: VehicleGroup,
-        frontline_heading: int,
-        distance: int
+        self, dcs_group: VehicleGroup, frontline_heading: int, distance: int
     ) -> Point:
         """
         Find a point to attack
@@ -542,7 +609,9 @@ class GroundConflictGenerator:
         :param distance: Distance of the offensive (how far unit should move)
         :return: dcs.mapping.Point object with the desired position
         """
-        desired_point = dcs_group.points[0].position.point_from_heading(frontline_heading, distance)
+        desired_point = dcs_group.points[0].position.point_from_heading(
+            frontline_heading, distance
+        )
         if self.conflict.theater.is_on_land(desired_point):
             return desired_point
         return self.conflict.theater.nearest_land_pos(desired_point)
@@ -551,7 +620,7 @@ class GroundConflictGenerator:
     def find_n_nearest_enemy_groups(
         player_group: VehicleGroup,
         enemy_groups: List[Tuple[VehicleGroup, CombatGroup]],
-        n: int
+        n: int,
     ) -> List[VehicleGroup]:
         """
         Return the nearest enemy group for the player group
@@ -562,7 +631,9 @@ class GroundConflictGenerator:
         targets = []  # type: List[Optional[VehicleGroup]]
         sorted_list = sorted(
             enemy_groups,
-            key=lambda group: player_group.points[0].position.distance_to_point(group[0].points[0].position)
+            key=lambda group: player_group.points[0].position.distance_to_point(
+                group[0].points[0].position
+            ),
         )
         for i in range(n):
             # TODO: Is this supposed to return no groups if enemy_groups is less than n?
@@ -574,8 +645,7 @@ class GroundConflictGenerator:
 
     @staticmethod
     def find_nearest_enemy_group(
-        player_group: VehicleGroup,
-        enemy_groups: List[Tuple[VehicleGroup, CombatGroup]]
+        player_group: VehicleGroup, enemy_groups: List[Tuple[VehicleGroup, CombatGroup]]
     ) -> Optional[VehicleGroup]:
         """
         Search the enemy groups for a potential target suitable to armored assault
@@ -585,7 +655,9 @@ class GroundConflictGenerator:
         min_distance = 99999999
         target = None
         for dcs_group, _ in enemy_groups:
-            dist = player_group.points[0].position.distance_to_point(dcs_group.points[0].position)
+            dist = player_group.points[0].position.distance_to_point(
+                dcs_group.points[0].position
+            )
             if dist < min_distance:
                 min_distance = dist
                 target = dcs_group
@@ -595,7 +667,7 @@ class GroundConflictGenerator:
     def get_artillery_target_in_range(
         dcs_group: VehicleGroup,
         group: CombatGroup,
-        enemy_groups: List[Tuple[VehicleGroup, CombatGroup]]
+        enemy_groups: List[Tuple[VehicleGroup, CombatGroup]],
     ) -> Optional[Point]:
         """
         Search the enemy groups for a potential target suitable to an artillery unit
@@ -606,7 +678,9 @@ class GroundConflictGenerator:
             return None
         for _ in range(10):
             potential_target = random.choice(enemy_groups)[0]
-            distance_to_target = dcs_group.points[0].position.distance_to_point(potential_target.points[0].position)
+            distance_to_target = dcs_group.points[0].position.distance_to_point(
+                potential_target.points[0].position
+            )
             if distance_to_target < rng:
                 return potential_target.points[0].position
         return None
@@ -620,12 +694,12 @@ class GroundConflictGenerator:
         if rg > DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1]:
             rg = random.randint(
                 DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][0],
-                DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1]
+                DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1],
             )
         elif rg < DISTANCE_FROM_FRONTLINE[CombatGroupRole.ARTILLERY][1]:
             rg = random.randint(
                 DISTANCE_FROM_FRONTLINE[CombatGroupRole.TANK][0],
-                DISTANCE_FROM_FRONTLINE[CombatGroupRole.TANK][1]
+                DISTANCE_FROM_FRONTLINE[CombatGroupRole.TANK][1],
             )
         return rg
 
@@ -635,42 +709,46 @@ class GroundConflictGenerator:
         combat_width: int,
         distance_from_frontline: int,
         heading: int,
-        spawn_heading: int
+        spawn_heading: int,
     ):
-        shifted = conflict_position.point_from_heading(heading, random.randint(0, combat_width))
-        desired_point = shifted.point_from_heading(
-            spawn_heading,
-            distance_from_frontline
+        shifted = conflict_position.point_from_heading(
+            heading, random.randint(0, combat_width)
+        )
+        desired_point = shifted.point_from_heading(
+            spawn_heading, distance_from_frontline
+        )
+        return Conflict.find_ground_position(
+            desired_point, combat_width, heading, self.conflict.theater
         )
-        return Conflict.find_ground_position(desired_point, combat_width, heading, self.conflict.theater)
-
 
     def _generate_groups(
         self,
         groups: List[CombatGroup],
         frontline_vector: Tuple[Point, int, int],
-        is_player: bool
+        is_player: bool,
     ) -> List[Tuple[VehicleGroup, CombatGroup]]:
         """Finds valid positions for planned groups and generates a pydcs group for them"""
         positioned_groups = []
         position, heading, combat_width = frontline_vector
-        spawn_heading = int(heading_sum(heading, -90)) if is_player else int(heading_sum(heading, 90))
+        spawn_heading = (
+            int(heading_sum(heading, -90))
+            if is_player
+            else int(heading_sum(heading, 90))
+        )
         country = self.game.player_country if is_player else self.game.enemy_country
         for group in groups:
             if group.role == CombatGroupRole.ARTILLERY:
-                distance_from_frontline = self.get_artilery_group_distance_from_frontline(group)
+                distance_from_frontline = (
+                    self.get_artilery_group_distance_from_frontline(group)
+                )
             else:
                 distance_from_frontline = random.randint(
-                    DISTANCE_FROM_FRONTLINE[group.role][0], 
-                    DISTANCE_FROM_FRONTLINE[group.role][1]
+                    DISTANCE_FROM_FRONTLINE[group.role][0],
+                    DISTANCE_FROM_FRONTLINE[group.role][1],
                 )
 
             final_position = self.get_valid_position_for_group(
-                position,
-                combat_width,
-                distance_from_frontline,
-                heading,
-                spawn_heading
+                position, combat_width, distance_from_frontline, heading, spawn_heading
             )
 
             if final_position is not None:
@@ -693,7 +771,7 @@ class GroundConflictGenerator:
                         g,
                         is_player,
                         self.mission.country(country),
-                        opposite_heading(spawn_heading)
+                        opposite_heading(spawn_heading),
                     )
             else:
                 logging.warning(f"Unable to get valid position for {group}")
@@ -712,18 +790,20 @@ class GroundConflictGenerator:
     ) -> VehicleGroup:
 
         if side == self.conflict.attackers_country:
-            cp = self.conflict.from_cp
+            cp = self.conflict.blue_cp
         else:
-            cp = self.conflict.to_cp
+            cp = self.conflict.red_cp
 
         logging.info("armorgen: {} for {}".format(unit, side.id))
         group = self.mission.vehicle_group(
-                side,
-                namegen.next_unit_name(side, cp.id, unit), unit,
-                position=at,
-                group_size=count,
-                heading=heading,
-                move_formation=move_formation)
+            side,
+            namegen.next_unit_name(side, cp.id, unit),
+            unit,
+            position=at,
+            group_size=count,
+            heading=heading,
+            move_formation=move_formation,
+        )
 
         self.unit_map.add_front_line_units(group, cp)
 

gen/ato.py

@@ -8,6 +8,8 @@ example, the package to strike an enemy airfield may contain an escort flight,
 a SEAD flight, and the strike aircraft themselves. CAP packages may contain only
 the single CAP flight.
 """
+from __future__ import annotations
+
 import logging
 from collections import defaultdict
 from dataclasses import dataclass, field
@@ -65,6 +67,10 @@ class Package:
 
     waypoints: Optional[PackageWaypoints] = field(default=None)
 
+    @property
+    def has_players(self) -> bool:
+        return any(flight.client_count for flight in self.flights)
+
     @property
     def formation_speed(self) -> Optional[Speed]:
         """The speed of the package when in formation.
@@ -96,7 +102,8 @@ class Package:
             if tot is None:
                 logging.error(
                     f"{flight} requested escort at {waypoint} but that "
-                    "waypoint has no TOT. It may not be escorted.")
+                    "waypoint has no TOT. It may not be escorted."
+                )
                 continue
             times.append(tot)
         if times:
@@ -117,7 +124,8 @@ class Package:
                 logging.error(
                     f"{flight} dismissed escort at {waypoint} but that "
                     "waypoint has no TOT or departure time. It may not be "
-                    "escorted.")
+                    "escorted."
+                )
                 continue
             times.append(tot)
         if times:
@@ -170,9 +178,11 @@ class Package:
             FlightType.OCA_RUNWAY,
             FlightType.BAI,
             FlightType.DEAD,
+            FlightType.TRANSPORT,
             FlightType.SEAD,
             FlightType.TARCAP,
             FlightType.BARCAP,
+            FlightType.AEWC,
             FlightType.SWEEP,
             FlightType.ESCORT,
         ]

gen/briefinggen.py

@@ -20,12 +20,15 @@ from .ground_forces.combat_stance import CombatStance
 from .radios import RadioFrequency
 from .runways import RunwayData
 
+
 if TYPE_CHECKING:
     from game import Game
 
+
 @dataclass
 class CommInfo:
     """Communications information for the kneeboard."""
+
     name: str
     freq: RadioFrequency
 
@@ -33,14 +36,17 @@ class CommInfo:
 class FrontLineInfo:
     def __init__(self, front_line: FrontLine):
         self.front_line: FrontLine = front_line
-        self.player_base: ControlPoint = front_line.control_point_a
-        self.enemy_base: ControlPoint = front_line.control_point_b
+        self.player_base: ControlPoint = front_line.blue_cp
+        self.enemy_base: ControlPoint = front_line.red_cp
         self.player_zero: bool = self.player_base.base.total_armor == 0
         self.enemy_zero: bool = self.enemy_base.base.total_armor == 0
-        self.advantage: bool = self.player_base.base.total_armor > self.enemy_base.base.total_armor
+        self.advantage: bool = (
+            self.player_base.base.total_armor > self.enemy_base.base.total_armor
+        )
         self.stance: CombatStance = self.player_base.stances[self.enemy_base.id]
         self.combat_stances = CombatStance
 
+
 class MissionInfoGenerator:
     """Base type for generators of mission information for the player.
 
@@ -131,7 +137,6 @@ def format_waypoint_time(waypoint: FlightWaypoint, depart_prefix: str) -> str:
 
 
 class BriefingGenerator(MissionInfoGenerator):
-
     def __init__(self, mission: Mission, game: Game):
         super().__init__(mission, game)
         self.allied_flights_by_departure: Dict[str, List[FlightData]] = {}
@@ -141,36 +146,36 @@ class BriefingGenerator(MissionInfoGenerator):
                 disabled_extensions=("",),
                 default_for_string=True,
                 default=True,
-                ),
+            ),
             trim_blocks=True,
             lstrip_blocks=True,
-            )
+        )
         env.filters["waypoint_timing"] = format_waypoint_time
         self.template = env.get_template("briefingtemplate_EN.j2")
 
     def generate(self) -> None:
-        """Generate the mission briefing
-        """
+        """Generate the mission briefing"""
         self._generate_frontline_info()
         self.generate_allied_flights_by_departure()
         self.mission.set_description_text(self.template.render(vars(self)))
-        self.mission.add_picture_blue(os.path.abspath(
-            "./resources/ui/splash_screen.png"))
+        self.mission.add_picture_blue(
+            os.path.abspath("./resources/ui/splash_screen.png")
+        )
 
     def _generate_frontline_info(self) -> None:
-        """Build FrontLineInfo objects from FrontLine type and append to briefing.
-        """
-        for front_line in self.game.theater.conflicts(from_player=True):
+        """Build FrontLineInfo objects from FrontLine type and append to briefing."""
+        for front_line in self.game.theater.conflicts():
             self.add_frontline(FrontLineInfo(front_line))
 
     # TODO: This should determine if runway is friendly through a method more robust than the existing string match
     def generate_allied_flights_by_departure(self) -> None:
-        """Create iterable to display allied flights grouped by departure airfield.
-        """
+        """Create iterable to display allied flights grouped by departure airfield."""
         for flight in self.flights:
             if not flight.client_units and flight.friendly:
                 name = flight.departure.airfield_name
-                if name in self.allied_flights_by_departure:  # where else can we get this?
+                if (
+                    name in self.allied_flights_by_departure
+                ):  # where else can we get this?
                     self.allied_flights_by_departure[name].append(flight)
                 else:
                     self.allied_flights_by_departure[name] = [flight]

gen/cargoshipgen.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import itertools
+from typing import TYPE_CHECKING
+
+from dcs import Mission
+from dcs.ships import Bulker_Handy_Wind
+from dcs.unitgroup import ShipGroup
+
+from game.transfers import CargoShip
+from game.unitmap import UnitMap
+from game.utils import knots
+
+if TYPE_CHECKING:
+    from game import Game
+
+
+class CargoShipGenerator:
+    def __init__(self, mission: Mission, game: Game, unit_map: UnitMap) -> None:
+        self.mission = mission
+        self.game = game
+        self.unit_map = unit_map
+        self.count = itertools.count()
+
+    def generate(self) -> None:
+        # Reset the count to make generation deterministic.
+        for ship in self.game.transfers.cargo_ships:
+            self.generate_cargo_ship(ship)
+
+    def generate_cargo_ship(self, ship: CargoShip) -> ShipGroup:
+        country = self.mission.country(
+            self.game.player_country if ship.player_owned else self.game.enemy_country
+        )
+        waypoints = ship.route
+        group = self.mission.ship_group(
+            country,
+            ship.name,
+            Bulker_Handy_Wind,
+            position=waypoints[0],
+            group_size=1,
+        )
+        for waypoint in waypoints[1:]:
+            # 12 knots is very slow but it's also nearly the max allowed by DCS for this
+            # type of ship.
+            group.add_waypoint(waypoint, speed=knots(12).kph)
+        self.unit_map.add_cargo_ship(group, ship)
+        return group

gen/coastal/coastal_group_generator.py

@@ -0,0 +1,31 @@
+import logging
+import random
+from game import db
+from gen.coastal.silkworm import SilkwormGenerator
+
+COASTAL_MAP = {
+    "SilkwormGenerator": SilkwormGenerator,
+}
+
+
+def generate_coastal_group(game, ground_object, faction_name: str):
+    """
+    This generate a coastal defenses group
+    :return: Nothing, but put the group reference inside the ground object
+    """
+    faction = db.FACTIONS[faction_name]
+    if len(faction.coastal_defenses) > 0:
+        generators = faction.coastal_defenses
+        if len(generators) > 0:
+            gen = random.choice(generators)
+            if gen in COASTAL_MAP.keys():
+                generator = COASTAL_MAP[gen](game, ground_object, faction)
+                generator.generate()
+                return generator.get_generated_group()
+            else:
+                logging.info(
+                    "Unable to generate missile group, generator : "
+                    + str(gen)
+                    + "does not exists"
+                )
+    return None

gen/coastal/silkworm.py

@@ -0,0 +1,58 @@
+from dcs.vehicles import MissilesSS, Unarmed, AirDefence
+
+from gen.sam.group_generator import GroupGenerator
+
+
+class SilkwormGenerator(GroupGenerator):
+    def __init__(self, game, ground_object, faction):
+        super(SilkwormGenerator, self).__init__(game, ground_object)
+        self.faction = faction
+
+    def generate(self):
+
+        positions = self.get_circular_position(5, launcher_distance=120, coverage=180)
+
+        self.add_unit(
+            MissilesSS.AShM_Silkworm_SR,
+            "SR#0",
+            self.position.x,
+            self.position.y,
+            self.heading,
+        )
+
+        # Launchers
+        for i, p in enumerate(positions):
+            self.add_unit(
+                MissilesSS.AShM_SS_N_2_Silkworm,
+                "Missile#" + str(i),
+                p[0],
+                p[1],
+                self.heading,
+            )
+
+        # Commander
+        self.add_unit(
+            Unarmed.Truck_KAMAZ_43101,
+            "KAMAZ#0",
+            self.position.x - 35,
+            self.position.y - 20,
+            self.heading,
+        )
+
+        # Shorad
+        self.add_unit(
+            AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish,
+            "SHILKA#0",
+            self.position.x - 55,
+            self.position.y - 38,
+            self.heading,
+        )
+
+        # Shorad 2
+        self.add_unit(
+            AirDefence.SAM_SA_9_Strela_1_Gaskin_TEL,
+            "STRELA#0",
+            self.position.x + 200,
+            self.position.y + 15,
+            90,
+        )

gen/conflictgen.py

@@ -12,76 +12,105 @@ from game.utils import heading_sum, opposite_heading
 
 FRONTLINE_LENGTH = 80000
 
+
 class Conflict:
-    def __init__(self,
-                 theater: ConflictTheater,
-                 from_cp: ControlPoint,
-                 to_cp: ControlPoint,
-                 attackers_side: str,
-                 defenders_side: str,
-                 attackers_country: Country,
-                 defenders_country: Country,
-                 position: Point,
-                 heading: Optional[int] = None,
-                 size: Optional[int] = None
-                 ):
+    def __init__(
+        self,
+        theater: ConflictTheater,
+        front_line: FrontLine,
+        attackers_side: str,
+        defenders_side: str,
+        attackers_country: Country,
+        defenders_country: Country,
+        position: Point,
+        heading: Optional[int] = None,
+        size: Optional[int] = None,
+    ):
 
         self.attackers_side = attackers_side
         self.defenders_side = defenders_side
         self.attackers_country = attackers_country
         self.defenders_country = defenders_country
 
-        self.from_cp = from_cp
-        self.to_cp = to_cp
+        self.front_line = front_line
         self.theater = theater
         self.position = position
         self.heading = heading
         self.size = size
 
+    @property
+    def blue_cp(self) -> ControlPoint:
+        return self.front_line.blue_cp
+
+    @property
+    def red_cp(self) -> ControlPoint:
+        return self.front_line.red_cp
+
     @classmethod
     def has_frontline_between(cls, from_cp: ControlPoint, to_cp: ControlPoint) -> bool:
         return from_cp.has_frontline and to_cp.has_frontline
 
     @classmethod
-    def frontline_position(cls, from_cp: ControlPoint, to_cp: ControlPoint, theater: ConflictTheater) -> Tuple[Point, int]:
-        frontline = FrontLine(from_cp, to_cp, theater)
+    def frontline_position(
+        cls, frontline: FrontLine, theater: ConflictTheater
+    ) -> Tuple[Point, int]:
         attack_heading = frontline.attack_heading
-        position = cls.find_ground_position(frontline.position, FRONTLINE_LENGTH, heading_sum(attack_heading, 90), theater)
+        position = cls.find_ground_position(
+            frontline.position,
+            FRONTLINE_LENGTH,
+            heading_sum(attack_heading, 90),
+            theater,
+        )
         return position, opposite_heading(attack_heading)
 
     @classmethod
-    def frontline_vector(cls, from_cp: ControlPoint, to_cp: ControlPoint, theater: ConflictTheater) -> Tuple[Point, int, int]:
+    def frontline_vector(
+        cls, front_line: FrontLine, theater: ConflictTheater
+    ) -> Tuple[Point, int, int]:
         """
         Returns a vector for a valid frontline location avoiding exclusion zones.
         """
-        center_position, heading = cls.frontline_position(from_cp, to_cp, theater)
+        center_position, heading = cls.frontline_position(front_line, theater)
         left_heading = heading_sum(heading, -90)
         right_heading = heading_sum(heading, 90)
-        left_position = cls.extend_ground_position(center_position, int(FRONTLINE_LENGTH / 2), left_heading, theater)
-        right_position = cls.extend_ground_position(center_position, int(FRONTLINE_LENGTH / 2), right_heading, theater)
+        left_position = cls.extend_ground_position(
+            center_position, int(FRONTLINE_LENGTH / 2), left_heading, theater
+        )
+        right_position = cls.extend_ground_position(
+            center_position, int(FRONTLINE_LENGTH / 2), right_heading, theater
+        )
         distance = int(left_position.distance_to_point(right_position))
         return left_position, right_heading, distance
 
     @classmethod
-    def frontline_cas_conflict(cls, attacker_name: str, defender_name: str, attacker: Country, defender: Country, from_cp: ControlPoint, to_cp: ControlPoint, theater: ConflictTheater):
-        assert cls.has_frontline_between(from_cp, to_cp)
-        position, heading, distance = cls.frontline_vector(from_cp, to_cp, theater)
+    def frontline_cas_conflict(
+        cls,
+        attacker_name: str,
+        defender_name: str,
+        attacker: Country,
+        defender: Country,
+        front_line: FrontLine,
+        theater: ConflictTheater,
+    ):
+        assert cls.has_frontline_between(front_line.blue_cp, front_line.red_cp)
+        position, heading, distance = cls.frontline_vector(front_line, theater)
         conflict = cls(
             position=position,
             heading=heading,
             theater=theater,
-            from_cp=from_cp,
-            to_cp=to_cp,
+            front_line=front_line,
             attackers_side=attacker_name,
             defenders_side=defender_name,
             attackers_country=attacker,
             defenders_country=defender,
-            size=distance
+            size=distance,
         )
         return conflict
 
     @classmethod
-    def extend_ground_position(cls, initial: Point, max_distance: int, heading: int, theater: ConflictTheater) -> Point:
+    def extend_ground_position(
+        cls, initial: Point, max_distance: int, heading: int, theater: ConflictTheater
+    ) -> Point:
         """Finds the first intersection with an exclusion zone in one heading from an initial point up to max_distance"""
         extended = initial.point_from_heading(heading, max_distance)
         if theater.landmap is None:
@@ -92,8 +121,7 @@ class Conflict:
         p1 = ShapelyPoint(extended.x, extended.y)
         line = LineString([p0, p1])
 
-        intersection = line.intersection(
-            theater.landmap.inclusion_zone_only.boundary)
+        intersection = line.intersection(theater.landmap.inclusion_zone_only.boundary)
         if intersection.is_empty:
             # Max extent does not intersect with the boundary of the inclusion
             # zone, so the full front line is usable. This does assume that the
@@ -104,7 +132,14 @@ class Conflict:
         return initial.point_from_heading(heading, p0.distance(intersection))
 
     @classmethod
-    def find_ground_position(cls, initial: Point, max_distance: int, heading: int, theater: ConflictTheater, coerce=True) -> Optional[Point]:
+    def find_ground_position(
+        cls,
+        initial: Point,
+        max_distance: int,
+        heading: int,
+        theater: ConflictTheater,
+        coerce=True,
+    ) -> Optional[Point]:
         """
         Finds the nearest valid ground position along a provided heading and it's inverse up to max_distance.
         `coerce=True` will return the closest land position to `initial` regardless of heading or distance
@@ -123,4 +158,3 @@ class Conflict:
             return pos
         logging.error("Didn't find ground position ({})!".format(initial))
         return None
-        

gen/convoygen.py

@@ -0,0 +1,92 @@
+from __future__ import annotations
+
+import itertools
+from typing import Dict, TYPE_CHECKING, Type
+
+from dcs import Mission
+from dcs.mapping import Point
+from dcs.point import PointAction
+from dcs.unit import Vehicle
+from dcs.unitgroup import VehicleGroup
+from dcs.unittype import VehicleType
+
+from game.transfers import Convoy
+from game.unitmap import UnitMap
+from game.utils import kph
+
+if TYPE_CHECKING:
+    from game import Game
+
+
+class ConvoyGenerator:
+    def __init__(self, mission: Mission, game: Game, unit_map: UnitMap) -> None:
+        self.mission = mission
+        self.game = game
+        self.unit_map = unit_map
+        self.count = itertools.count()
+
+    def generate(self) -> None:
+        # Reset the count to make generation deterministic.
+        for convoy in self.game.transfers.convoys:
+            self.generate_convoy(convoy)
+
+    def generate_convoy(self, convoy: Convoy) -> VehicleGroup:
+        group = self._create_mixed_unit_group(
+            convoy.name,
+            convoy.route_start,
+            convoy.units,
+            convoy.player_owned,
+        )
+        group.add_waypoint(
+            convoy.route_end,
+            speed=kph(40).kph,
+            move_formation=PointAction.OnRoad,
+        )
+        self.make_drivable(group)
+        self.unit_map.add_convoy_units(group, convoy)
+        return group
+
+    def _create_mixed_unit_group(
+        self,
+        name: str,
+        position: Point,
+        units: Dict[Type[VehicleType], int],
+        for_player: bool,
+    ) -> VehicleGroup:
+        country = self.mission.country(
+            self.game.player_country if for_player else self.game.enemy_country
+        )
+
+        unit_types = list(units.items())
+        main_unit_type, main_unit_count = unit_types[0]
+
+        group = self.mission.vehicle_group(
+            country,
+            name,
+            main_unit_type,
+            position=position,
+            group_size=main_unit_count,
+            move_formation=PointAction.OnRoad,
+        )
+
+        unit_name_counter = itertools.count(main_unit_count + 1)
+        # pydcs spreads units out by 20 in the Y axis by default. Pick up where it left
+        # off.
+        y = itertools.count(position.y + main_unit_count * 20, 20)
+        for unit_type, count in unit_types[1:]:
+            for i in range(count):
+                v = self.mission.vehicle(
+                    f"{name} Unit #{next(unit_name_counter)}", unit_type
+                )
+                v.position.x = position.x
+                v.position.y = next(y)
+                v.heading = 0
+                group.add_unit(v)
+
+        return group
+
+    @staticmethod
+    def make_drivable(group: VehicleGroup) -> None:
+        for v in group.units:
+            if isinstance(v, Vehicle):
+                v.player_can_drive = True

gen/defenses/armor_group_generator.py

@@ -3,15 +3,20 @@ import random
 from dcs.vehicles import Armor
 
 from game import db
-from gen.defenses.armored_group_generator import ArmoredGroupGenerator, FixedSizeArmorGroupGenerator
+from gen.defenses.armored_group_generator import (
+    ArmoredGroupGenerator,
+    FixedSizeArmorGroupGenerator,
+)
 
 
-def generate_armor_group(faction:str, game, ground_object):
+def generate_armor_group(faction: str, game, ground_object):
     """
     This generate a group of ground units
     :return: Generated group
     """
-    possible_unit = [u for u in db.FACTIONS[faction].frontline_units if u in Armor.__dict__.values()]
+    possible_unit = [
+        u for u in db.FACTIONS[faction].frontline_units if u in Armor.__dict__.values()
+    ]
     if len(possible_unit) > 0:
         unit_type = random.choice(possible_unit)
         return generate_armor_group_of_type(game, ground_object, unit_type)
@@ -36,4 +41,3 @@ def generate_armor_group_of_type_and_size(game, ground_object, unit_type, size:
     generator = FixedSizeArmorGroupGenerator(game, ground_object, unit_type, size)
     generator.generate()
     return generator.get_generated_group()
-

gen/defenses/armored_group_generator.py

@@ -4,7 +4,6 @@ from gen.sam.group_generator import GroupGenerator
 
 
 class ArmoredGroupGenerator(GroupGenerator):
-
     def __init__(self, game, ground_object, unit_type):
         super(ArmoredGroupGenerator, self).__init__(game, ground_object)
         self.unit_type = unit_type
@@ -20,13 +19,16 @@ class ArmoredGroupGenerator(GroupGenerator):
         for i in range(grid_x):
             for j in range(grid_y):
                 index = index + 1
-                self.add_unit(self.unit_type, "Armor#" + str(index),
-                              self.position.x + spacing * i,
-                              self.position.y + spacing * j, self.heading)
+                self.add_unit(
+                    self.unit_type,
+                    "Armor#" + str(index),
+                    self.position.x + spacing * i,
+                    self.position.y + spacing * j,
+                    self.heading,
+                )
 
 
 class FixedSizeArmorGroupGenerator(GroupGenerator):
-
     def __init__(self, game, ground_object, unit_type, size):
         super(FixedSizeArmorGroupGenerator, self).__init__(game, ground_object)
         self.unit_type = unit_type
@@ -38,7 +40,10 @@ class FixedSizeArmorGroupGenerator(GroupGenerator):
         index = 0
         for i in range(self.size):
             index = index + 1
-            self.add_unit(self.unit_type, "Armor#" + str(index),
-                            self.position.x + spacing * i,
-                            self.position.y, self.heading)
-
+            self.add_unit(
+                self.unit_type,
+                "Armor#" + str(index),
+                self.position.x + spacing * i,
+                self.position.y,
+                self.heading,
+            )

gen/environmentgen.py

@@ -17,6 +17,7 @@ class EnvironmentGenerator:
         self.mission.weather.clouds_thickness = clouds.thickness
         self.mission.weather.clouds_density = clouds.density
         self.mission.weather.clouds_iprecptns = clouds.precipitation
+        self.mission.weather.clouds_preset = clouds.preset
 
     def set_fog(self, fog: Optional[Fog]) -> None:
         if fog is None:

gen/fleet/carrier_group.py

@@ -2,25 +2,122 @@ import random
 
 from gen.sam.group_generator import ShipGroupGenerator
 
+from dcs.ships import DDG_Arleigh_Burke_IIa, CG_Ticonderoga
+
 
 class CarrierGroupGenerator(ShipGroupGenerator):
-
     def generate(self):
 
-        # Add carrier
-        if len(self.faction.aircraft_carrier) > 0:
+        # Carrier Strike Group 8
+        if self.faction.carrier_names[0] == "Carrier Strike Group 8":
             carrier_type = random.choice(self.faction.aircraft_carrier)
-            self.add_unit(carrier_type, "Carrier", self.position.x, self.position.y, self.heading)
+
+            self.add_unit(
+                carrier_type,
+                "CVN-75 Harry S. Truman",
+                self.position.x,
+                self.position.y,
+                self.heading,
+            )
+
+            # Add Arleigh Burke escort
+            self.add_unit(
+                DDG_Arleigh_Burke_IIa,
+                "USS Ramage",
+                self.position.x + 6482,
+                self.position.y + 6667,
+                self.heading,
+            )
+
+            self.add_unit(
+                DDG_Arleigh_Burke_IIa,
+                "USS Mitscher",
+                self.position.x - 7963,
+                self.position.y + 7037,
+                self.heading,
+            )
+
+            self.add_unit(
+                DDG_Arleigh_Burke_IIa,
+                "USS Forrest Sherman",
+                self.position.x - 7408,
+                self.position.y - 7408,
+                self.heading,
+            )
+
+            self.add_unit(
+                DDG_Arleigh_Burke_IIa,
+                "USS Lassen",
+                self.position.x + 8704,
+                self.position.y - 6296,
+                self.heading,
+            )
+
+            # Add Ticonderoga escort
+            if self.heading >= 180:
+                self.add_unit(
+                    CG_Ticonderoga,
+                    "USS Hué City",
+                    self.position.x + 2222,
+                    self.position.y - 3333,
+                    self.heading,
+                )
+            else:
+                self.add_unit(
+                    CG_Ticonderoga,
+                    "USS Hué City",
+                    self.position.x - 3333,
+                    self.position.y + 2222,
+                    self.heading,
+                )
+
+            self.get_generated_group().points[0].speed = 20
+        ##################################################################################################
+        # Add carrier for normal generation
         else:
-            return
+            if len(self.faction.aircraft_carrier) > 0:
+                carrier_type = random.choice(self.faction.aircraft_carrier)
+                self.add_unit(
+                    carrier_type,
+                    "Carrier",
+                    self.position.x,
+                    self.position.y,
+                    self.heading,
+                )
+            else:
+                return
 
-        # Add destroyers escort
-        if len(self.faction.destroyers) > 0:
-            dd_type = random.choice(self.faction.destroyers)
-            self.add_unit(dd_type, "DD1", self.position.x + 2500, self.position.y + 4500, self.heading)
-            self.add_unit(dd_type, "DD2", self.position.x + 2500, self.position.y - 4500, self.heading)
+            # Add destroyers escort
+            if len(self.faction.destroyers) > 0:
+                dd_type = random.choice(self.faction.destroyers)
+                self.add_unit(
+                    dd_type,
+                    "DD1",
+                    self.position.x + 2500,
+                    self.position.y + 4500,
+                    self.heading,
+                )
+                self.add_unit(
+                    dd_type,
+                    "DD2",
+                    self.position.x + 2500,
+                    self.position.y - 4500,
+                    self.heading,
+                )
 
-            self.add_unit(dd_type, "DD3", self.position.x + 4500, self.position.y + 8500, self.heading)
-            self.add_unit(dd_type, "DD4", self.position.x + 4500, self.position.y - 8500, self.heading)
+                self.add_unit(
+                    dd_type,
+                    "DD3",
+                    self.position.x + 4500,
+                    self.position.y + 8500,
+                    self.heading,
+                )
+                self.add_unit(
+                    dd_type,
+                    "DD4",
+                    self.position.x + 4500,
+                    self.position.y - 8500,
+                    self.heading,
+                )
 
-        self.get_generated_group().points[0].speed = 20
+            self.get_generated_group().points[0].speed = 20

gen/fleet/cn_dd_group.py

@@ -20,7 +20,6 @@ if TYPE_CHECKING:
 
 
 class ChineseNavyGroupGenerator(ShipGroupGenerator):
-
     def generate(self):
 
         include_frigate = random.choice([True, True, False])
@@ -30,17 +29,45 @@ class ChineseNavyGroupGenerator(ShipGroupGenerator):
             include_frigate = True
 
         if include_frigate:
-            self.add_unit(Type_054A_Frigate, "FF1", self.position.x + 1200, self.position.y + 900, self.heading)
-            self.add_unit(Type_054A_Frigate, "FF2", self.position.x + 1200, self.position.y - 900, self.heading)
+            self.add_unit(
+                Type_054A_Frigate,
+                "FF1",
+                self.position.x + 1200,
+                self.position.y + 900,
+                self.heading,
+            )
+            self.add_unit(
+                Type_054A_Frigate,
+                "FF2",
+                self.position.x + 1200,
+                self.position.y - 900,
+                self.heading,
+            )
 
         if include_dd:
             dd_type = random.choice([Type_052C_Destroyer, Type_052B_Destroyer])
-            self.add_unit(dd_type, "DD1", self.position.x + 2400, self.position.y + 900, self.heading)
-            self.add_unit(dd_type, "DD2", self.position.x + 2400, self.position.y - 900, self.heading)
+            self.add_unit(
+                dd_type,
+                "DD1",
+                self.position.x + 2400,
+                self.position.y + 900,
+                self.heading,
+            )
+            self.add_unit(
+                dd_type,
+                "DD2",
+                self.position.x + 2400,
+                self.position.y - 900,
+                self.heading,
+            )
 
         self.get_generated_group().points[0].speed = 20
 
 
 class Type54GroupGenerator(DDGroupGenerator):
-    def __init__(self, game: Game, ground_object: TheaterGroundObject, faction: Faction):
-        super(Type54GroupGenerator, self).__init__(game, ground_object, faction, Type_054A_Frigate)
+    def __init__(
+        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
+    ):
+        super(Type54GroupGenerator, self).__init__(
+            game, ground_object, faction, Type_054A_Frigate
+        )

gen/fleet/dd_group.py

@@ -6,29 +6,54 @@ from game.theater.theatergroundobject import TheaterGroundObject
 
 from gen.sam.group_generator import ShipGroupGenerator
 from dcs.unittype import ShipType
-from dcs.ships import Oliver_Hazzard_Perry_class, USS_Arleigh_Burke_IIa
+from dcs.ships import FFG_Oliver_Hazzard_Perry, DDG_Arleigh_Burke_IIa
 
 if TYPE_CHECKING:
     from game.game import Game
 
 
 class DDGroupGenerator(ShipGroupGenerator):
-
-    def __init__(self, game: Game, ground_object: TheaterGroundObject, faction: Faction, ddtype: ShipType):
+    def __init__(
+        self,
+        game: Game,
+        ground_object: TheaterGroundObject,
+        faction: Faction,
+        ddtype: ShipType,
+    ):
         super(DDGroupGenerator, self).__init__(game, ground_object, faction)
         self.ddtype = ddtype
 
     def generate(self):
-        self.add_unit(self.ddtype, "DD1", self.position.x + 500, self.position.y + 900, self.heading)
-        self.add_unit(self.ddtype, "DD2", self.position.x + 500, self.position.y - 900, self.heading)
+        self.add_unit(
+            self.ddtype,
+            "DD1",
+            self.position.x + 500,
+            self.position.y + 900,
+            self.heading,
+        )
+        self.add_unit(
+            self.ddtype,
+            "DD2",
+            self.position.x + 500,
+            self.position.y - 900,
+            self.heading,
+        )
         self.get_generated_group().points[0].speed = 20
 
 
 class OliverHazardPerryGroupGenerator(DDGroupGenerator):
-    def __init__(self, game: Game, ground_object: TheaterGroundObject, faction: Faction):
-        super(OliverHazardPerryGroupGenerator, self).__init__(game, ground_object, faction, Oliver_Hazzard_Perry_class)
+    def __init__(
+        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
+    ):
+        super(OliverHazardPerryGroupGenerator, self).__init__(
+            game, ground_object, faction, FFG_Oliver_Hazzard_Perry
+        )
 
 
 class ArleighBurkeGroupGenerator(DDGroupGenerator):
-    def __init__(self, game: Game, ground_object: TheaterGroundObject, faction: Faction):
-        super(ArleighBurkeGroupGenerator, self).__init__(game, ground_object, faction, USS_Arleigh_Burke_IIa)
+    def __init__(
+        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
+    ):
+        super(ArleighBurkeGroupGenerator, self).__init__(
+            game, ground_object, faction, DDG_Arleigh_Burke_IIa
+        )

gen/fleet/lacombattanteII.py

@@ -0,0 +1,12 @@
+from dcs.ships import FAC_La_Combattante_IIa
+
+from game.factions.faction import Faction
+from game.theater import TheaterGroundObject
+from gen.fleet.dd_group import DDGroupGenerator
+
+
+class LaCombattanteIIGroupGenerator(DDGroupGenerator):
+    def __init__(self, game, ground_object: TheaterGroundObject, faction: Faction):
+        super(LaCombattanteIIGroupGenerator, self).__init__(
+            game, ground_object, faction, FAC_La_Combattante_IIa
+        )

gen/fleet/lha_group.py

@@ -4,18 +4,31 @@ from gen.sam.group_generator import ShipGroupGenerator
 
 
 class LHAGroupGenerator(ShipGroupGenerator):
-
     def generate(self):
 
         # Add carrier
         if len(self.faction.helicopter_carrier) > 0:
             carrier_type = random.choice(self.faction.helicopter_carrier)
-            self.add_unit(carrier_type, "LHA", self.position.x, self.position.y, self.heading)
+            self.add_unit(
+                carrier_type, "LHA", self.position.x, self.position.y, self.heading
+            )
 
         # Add destroyers escort
         if len(self.faction.destroyers) > 0:
             dd_type = random.choice(self.faction.destroyers)
-            self.add_unit(dd_type, "DD1", self.position.x + 1250, self.position.y + 1450, self.heading)
-            self.add_unit(dd_type, "DD2", self.position.x + 1250, self.position.y - 1450, self.heading)
+            self.add_unit(
+                dd_type,
+                "DD1",
+                self.position.x + 1250,
+                self.position.y + 1450,
+                self.heading,
+            )
+            self.add_unit(
+                dd_type,
+                "DD2",
+                self.position.x + 1250,
+                self.position.y - 1450,
+                self.heading,
+            )
 
         self.get_generated_group().points[0].speed = 20

gen/fleet/ru_dd_group.py

@@ -3,13 +3,13 @@ import random
 from typing import TYPE_CHECKING
 
 from dcs.ships import (
-    FFL_1124_4_Grisha,
-    FSG_1241_1MP_Molniya,
-    FFG_11540_Neustrashimy,
-    FF_1135M_Rezky,
-    CG_1164_Moskva,
-    SSK_877,
-    SSK_641B
+    Corvette_1124_4_Grisha,
+    Corvette_1241_1_Molniya,
+    Frigate_11540_Neustrashimy,
+    Frigate_1135M_Rezky,
+    Cruiser_1164_Moskva,
+    SSK_877V_Kilo,
+    SSK_641B_Tango,
 )
 
 from gen.fleet.dd_group import DDGroupGenerator
@@ -23,7 +23,6 @@ if TYPE_CHECKING:
 
 
 class RussianNavyGroupGenerator(ShipGroupGenerator):
-
     def generate(self):
 
         include_frigate = random.choice([True, True, False])
@@ -38,38 +37,86 @@ class RussianNavyGroupGenerator(ShipGroupGenerator):
             include_frigate = True
 
         if include_frigate:
-            frigate_type = random.choice([FFL_1124_4_Grisha, FSG_1241_1MP_Molniya])
-            self.add_unit(frigate_type, "FF1", self.position.x + 1200, self.position.y + 900, self.heading)
-            self.add_unit(frigate_type, "FF2", self.position.x + 1200, self.position.y - 900, self.heading)
+            frigate_type = random.choice(
+                [Corvette_1124_4_Grisha, Corvette_1241_1_Molniya]
+            )
+            self.add_unit(
+                frigate_type,
+                "FF1",
+                self.position.x + 1200,
+                self.position.y + 900,
+                self.heading,
+            )
+            self.add_unit(
+                frigate_type,
+                "FF2",
+                self.position.x + 1200,
+                self.position.y - 900,
+                self.heading,
+            )
 
         if include_dd:
-            dd_type = random.choice([FFG_11540_Neustrashimy, FF_1135M_Rezky])
-            self.add_unit(dd_type, "DD1", self.position.x + 2400, self.position.y + 900, self.heading)
-            self.add_unit(dd_type, "DD2", self.position.x + 2400, self.position.y - 900, self.heading)
+            dd_type = random.choice([Frigate_11540_Neustrashimy, Frigate_1135M_Rezky])
+            self.add_unit(
+                dd_type,
+                "DD1",
+                self.position.x + 2400,
+                self.position.y + 900,
+                self.heading,
+            )
+            self.add_unit(
+                dd_type,
+                "DD2",
+                self.position.x + 2400,
+                self.position.y - 900,
+                self.heading,
+            )
 
         if include_cc:
             # Only include the Moskva for now, the Pyotry Velikiy is an unkillable monster.
-            # See https://github.com/Khopa/dcs_liberation/issues/567
-            self.add_unit(CG_1164_Moskva, "CC1", self.position.x, self.position.y, self.heading)
+            # See https://github.com/dcs-liberation/dcs_liberation/issues/567
+            self.add_unit(
+                Cruiser_1164_Moskva,
+                "CC1",
+                self.position.x,
+                self.position.y,
+                self.heading,
+            )
 
         self.get_generated_group().points[0].speed = 20
 
 
 class GrishaGroupGenerator(DDGroupGenerator):
-    def __init__(self, game: Game, ground_object: TheaterGroundObject, faction: Faction):
-        super(GrishaGroupGenerator, self).__init__(game, ground_object, faction, FFL_1124_4_Grisha)
+    def __init__(
+        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
+    ):
+        super(GrishaGroupGenerator, self).__init__(
+            game, ground_object, faction, Corvette_1124_4_Grisha
+        )
 
 
 class MolniyaGroupGenerator(DDGroupGenerator):
-    def __init__(self, game: Game, ground_object: TheaterGroundObject, faction: Faction):
-        super(MolniyaGroupGenerator, self).__init__(game, ground_object, faction, FSG_1241_1MP_Molniya)
+    def __init__(
+        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
+    ):
+        super(MolniyaGroupGenerator, self).__init__(
+            game, ground_object, faction, Corvette_1241_1_Molniya
+        )
 
 
 class KiloSubGroupGenerator(DDGroupGenerator):
-    def __init__(self, game: Game, ground_object: TheaterGroundObject, faction: Faction):
-        super(KiloSubGroupGenerator, self).__init__(game, ground_object, faction, SSK_877)
+    def __init__(
+        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
+    ):
+        super(KiloSubGroupGenerator, self).__init__(
+            game, ground_object, faction, SSK_877V_Kilo
+        )
 
 
 class TangoSubGroupGenerator(DDGroupGenerator):
-    def __init__(self, game: Game, ground_object: TheaterGroundObject, faction: Faction):
-        super(TangoSubGroupGenerator, self).__init__(game, ground_object, faction, SSK_641B)
+    def __init__(
+        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
+    ):
+        super(TangoSubGroupGenerator, self).__init__(
+            game, ground_object, faction, SSK_641B_Tango
+        )

gen/fleet/schnellboot.py

@@ -1,15 +1,20 @@
 import random
 
-from dcs.ships import Schnellboot_type_S130
+from dcs.ships import Boat_Schnellboot_type_S130
 
 from gen.sam.group_generator import ShipGroupGenerator
 
 
 class SchnellbootGroupGenerator(ShipGroupGenerator):
-
     def generate(self):
 
         for i in range(random.randint(2, 4)):
-            self.add_unit(Schnellboot_type_S130, "Schnellboot" + str(i), self.position.x + i * random.randint(100, 250), self.position.y + (random.randint(100, 200)-100), self.heading)
+            self.add_unit(
+                Boat_Schnellboot_type_S130,
+                "Schnellboot" + str(i),
+                self.position.x + i * random.randint(100, 250),
+                self.position.y + (random.randint(100, 200) - 100),
+                self.heading,
+            )
 
         self.get_generated_group().points[0].speed = 20

gen/fleet/ship_group_generator.py

@@ -4,10 +4,19 @@ import random
 from game import db
 from gen.fleet.carrier_group import CarrierGroupGenerator
 from gen.fleet.cn_dd_group import ChineseNavyGroupGenerator, Type54GroupGenerator
-from gen.fleet.dd_group import ArleighBurkeGroupGenerator, OliverHazardPerryGroupGenerator
+from gen.fleet.dd_group import (
+    ArleighBurkeGroupGenerator,
+    OliverHazardPerryGroupGenerator,
+)
+from gen.fleet.lacombattanteII import LaCombattanteIIGroupGenerator
 from gen.fleet.lha_group import LHAGroupGenerator
-from gen.fleet.ru_dd_group import RussianNavyGroupGenerator, GrishaGroupGenerator, MolniyaGroupGenerator, \
-    KiloSubGroupGenerator, TangoSubGroupGenerator
+from gen.fleet.ru_dd_group import (
+    RussianNavyGroupGenerator,
+    GrishaGroupGenerator,
+    MolniyaGroupGenerator,
+    KiloSubGroupGenerator,
+    TangoSubGroupGenerator,
+)
 from gen.fleet.schnellboot import SchnellbootGroupGenerator
 from gen.fleet.uboat import UBoatGroupGenerator
 from gen.fleet.ww2lst import WW2LSTGroupGenerator
@@ -25,7 +34,8 @@ SHIP_MAP = {
     "MolniyaGroupGenerator": MolniyaGroupGenerator,
     "KiloSubGroupGenerator": KiloSubGroupGenerator,
     "TangoSubGroupGenerator": TangoSubGroupGenerator,
-    "Type54GroupGenerator": Type54GroupGenerator
+    "Type54GroupGenerator": Type54GroupGenerator,
+    "LaCombattanteIIGroupGenerator": LaCombattanteIIGroupGenerator,
 }
 
 
@@ -39,10 +49,15 @@ def generate_ship_group(game, ground_object, faction_name: str):
         gen = random.choice(faction.navy_generators)
         if gen in SHIP_MAP.keys():
             generator = SHIP_MAP[gen](game, ground_object, faction)
+            print(generator.position)
             generator.generate()
             return generator.get_generated_group()
         else:
-            logging.info("Unable to generate ship group, generator : " + str(gen) + "does not exists")
+            logging.info(
+                "Unable to generate ship group, generator : "
+                + str(gen)
+                + "does not exists"
+            )
     return None
 
 

gen/fleet/uboat.py

@@ -1,15 +1,20 @@
 import random
 
-from dcs.ships import Uboat_VIIC_U_flak
+from dcs.ships import U_boat_VIIC_U_flak
 
 from gen.sam.group_generator import ShipGroupGenerator
 
 
 class UBoatGroupGenerator(ShipGroupGenerator):
-
     def generate(self):
 
         for i in range(random.randint(1, 4)):
-            self.add_unit(Uboat_VIIC_U_flak, "Uboat" + str(i), self.position.x + i * random.randint(100, 250), self.position.y + (random.randint(100, 200)-100), self.heading)
+            self.add_unit(
+                U_boat_VIIC_U_flak,
+                "Uboat" + str(i),
+                self.position.x + i * random.randint(100, 250),
+                self.position.y + (random.randint(100, 200) - 100),
+                self.heading,
+            )
 
-        self.get_generated_group().points[0].speed = 20
+        self.get_generated_group().points[0].speed = 20

gen/fleet/ww2lst.py

@@ -6,13 +6,24 @@ from gen.sam.group_generator import ShipGroupGenerator
 
 
 class WW2LSTGroupGenerator(ShipGroupGenerator):
-
     def generate(self):
 
         # Add LS Samuel Chase
-        self.add_unit(LS_Samuel_Chase, "SamuelChase", self.position.x, self.position.y, self.heading)
+        self.add_unit(
+            LS_Samuel_Chase,
+            "SamuelChase",
+            self.position.x,
+            self.position.y,
+            self.heading,
+        )
 
         for i in range(1, random.randint(3, 4)):
-            self.add_unit(LST_Mk_II, "LST" + str(i), self.position.x + i * random.randint(800, 1200), self.position.y, self.heading)
+            self.add_unit(
+                LST_Mk_II,
+                "LST" + str(i),
+                self.position.x + i * random.randint(800, 1200),
+                self.position.y,
+                self.heading,
+            )
 
-        self.get_generated_group().points[0].speed = 20
+        self.get_generated_group().points[0].speed = 20

gen/flights/ai_flight_planner.py

@@ -17,12 +17,17 @@ from typing import (
     TYPE_CHECKING,
     Tuple,
     Type,
+    TypeVar,
+    Union,
 )
 
 from dcs.unittype import FlyingType
 
+from game.factions.faction import Faction
 from game.infos.information import Information
 from game.procurement import AircraftProcurementRequest
+from game.profiling import logged_duration, MultiEventTracer
+from game.squadrons import AirWing, Squadron
 from game.theater import (
     Airfield,
     ControlPoint,
@@ -39,8 +44,8 @@ from game.theater.theatergroundobject import (
     NavalGroundObject,
     VehicleGroupGroundObject,
 )
-from game.utils import Distance, nautical_miles
-from gen import Conflict
+from game.transfers import CargoShip, Convoy
+from game.utils import Distance, nautical_miles, meters
 from gen.ato import Package
 from gen.flights.ai_flight_planner_db import aircraft_for_task
 from gen.flights.closestairfields import (
@@ -108,24 +113,31 @@ class ProposedMission:
     #: The proposed flights that are required for the mission.
     flights: List[ProposedFlight]
 
+    asap: bool = field(default=False)
+
     def __str__(self) -> str:
-        flights = ', '.join([str(f) for f in self.flights])
+        flights = ", ".join([str(f) for f in self.flights])
         return f"{self.location.name}: {flights}"
 
 
 class AircraftAllocator:
     """Finds suitable aircraft for proposed missions."""
 
-    def __init__(self, closest_airfields: ClosestAirfields,
-                 global_inventory: GlobalAircraftInventory,
-                 is_player: bool) -> None:
+    def __init__(
+        self,
+        air_wing: AirWing,
+        closest_airfields: ClosestAirfields,
+        global_inventory: GlobalAircraftInventory,
+        is_player: bool,
+    ) -> None:
+        self.air_wing = air_wing
         self.closest_airfields = closest_airfields
         self.global_inventory = global_inventory
         self.is_player = is_player
 
-    def find_aircraft_for_flight(
-            self, flight: ProposedFlight
-    ) -> Optional[Tuple[ControlPoint, Type[FlyingType]]]:
+    def find_squadron_for_flight(
+        self, flight: ProposedFlight
+    ) -> Optional[Tuple[ControlPoint, Squadron]]:
         """Finds aircraft suitable for the given mission.
 
         Searches for aircraft capable of performing the given mission within the
@@ -144,45 +156,70 @@ class AircraftAllocator:
         on subsequent calls. If the found aircraft are not used, the caller is
         responsible for returning them to the inventory.
         """
-        return self.find_aircraft_of_type(
-            flight, aircraft_for_task(flight.task)
-        )
+        return self.find_aircraft_for_task(flight, flight.task)
 
-    def find_aircraft_of_type(
-            self, flight: ProposedFlight, types: List[Type[FlyingType]],
-    ) -> Optional[Tuple[ControlPoint, Type[FlyingType]]]:
-        airfields_in_range = self.closest_airfields.airfields_within(
+    def find_aircraft_for_task(
+        self, flight: ProposedFlight, task: FlightType
+    ) -> Optional[Tuple[ControlPoint, Squadron]]:
+        types = aircraft_for_task(task)
+        airfields_in_range = self.closest_airfields.operational_airfields_within(
             flight.max_distance
         )
+
+        # Prefer using squadrons with pilots first
+        best_understaffed: Optional[Tuple[ControlPoint, Squadron]] = None
         for airfield in airfields_in_range:
             if not airfield.is_friendly(self.is_player):
                 continue
             inventory = self.global_inventory.for_control_point(airfield)
-            for aircraft, available in inventory.all_aircraft:
+            for aircraft in types:
                 if not airfield.can_operate(aircraft):
                     continue
-                if aircraft in types and available >= flight.num_aircraft:
-                    inventory.remove_aircraft(aircraft, flight.num_aircraft)
-                    return airfield, aircraft
+                if inventory.available(aircraft) < flight.num_aircraft:
+                    continue
+                # Valid location with enough aircraft available. Find a squadron to fit
+                # the role.
+                for squadron in self.air_wing.squadrons_for(aircraft):
+                    if task not in squadron.auto_assignable_mission_types:
+                        continue
+                    if len(squadron.available_pilots) >= flight.num_aircraft:
+                        inventory.remove_aircraft(aircraft, flight.num_aircraft)
+                        return airfield, squadron
 
-        return None
+                    # A compatible squadron that doesn't have enough pilots. Remember it
+                    # as a fallback in case we find no better choices.
+                    if best_understaffed is None:
+                        best_understaffed = airfield, squadron
+
+        if best_understaffed is not None:
+            airfield, squadron = best_understaffed
+            self.global_inventory.for_control_point(airfield).remove_aircraft(
+                squadron.aircraft, flight.num_aircraft
+            )
+        return best_understaffed
 
 
 class PackageBuilder:
     """Builds a Package for the flights it receives."""
 
-    def __init__(self, location: MissionTarget,
-                 closest_airfields: ClosestAirfields,
-                 global_inventory: GlobalAircraftInventory,
-                 is_player: bool,
-                 package_country: str,
-                 start_type: str) -> None:
+    def __init__(
+        self,
+        location: MissionTarget,
+        closest_airfields: ClosestAirfields,
+        global_inventory: GlobalAircraftInventory,
+        air_wing: AirWing,
+        is_player: bool,
+        package_country: str,
+        start_type: str,
+        asap: bool,
+    ) -> None:
         self.closest_airfields = closest_airfields
         self.is_player = is_player
         self.package_country = package_country
-        self.package = Package(location)
-        self.allocator = AircraftAllocator(closest_airfields, global_inventory,
-                                           is_player)
+        self.package = Package(location, auto_asap=asap)
+        self.allocator = AircraftAllocator(
+            air_wing, closest_airfields, global_inventory, is_player
+        )
         self.global_inventory = global_inventory
         self.start_type = start_type
 
@@ -194,25 +231,36 @@ class PackageBuilder:
         caller should return any previously planned flights to the inventory
         using release_planned_aircraft.
         """
-        assignment = self.allocator.find_aircraft_for_flight(plan)
+        assignment = self.allocator.find_squadron_for_flight(plan)
         if assignment is None:
             return False
-        airfield, aircraft = assignment
+        airfield, squadron = assignment
         if isinstance(airfield, OffMapSpawn):
             start_type = "In Flight"
         else:
             start_type = self.start_type
 
-        flight = Flight(self.package, self.package_country, aircraft, plan.num_aircraft, plan.task,
-                        start_type, departure=airfield, arrival=airfield,
-                        divert=self.find_divert_field(aircraft, airfield))
+        flight = Flight(
+            self.package,
+            self.package_country,
+            squadron,
+            plan.num_aircraft,
+            plan.task,
+            start_type,
+            departure=airfield,
+            arrival=airfield,
+            divert=self.find_divert_field(squadron.aircraft, airfield),
+        )
         self.package.add_flight(flight)
         return True
 
-    def find_divert_field(self, aircraft: Type[FlyingType],
-                          arrival: ControlPoint) -> Optional[ControlPoint]:
+    def find_divert_field(
+        self, aircraft: Type[FlyingType], arrival: ControlPoint
+    ) -> Optional[ControlPoint]:
         divert_limit = nautical_miles(150)
-        for airfield in self.closest_airfields.airfields_within(divert_limit):
+        for airfield in self.closest_airfields.operational_airfields_within(
+            divert_limit
+        ):
             if airfield.captured != self.is_player:
                 continue
             if airfield == arrival:
@@ -233,9 +281,13 @@ class PackageBuilder:
         flights = list(self.package.flights)
         for flight in flights:
             self.global_inventory.return_from_flight(flight)
+            flight.clear_roster()
             self.package.remove_flight(flight)
 
 
+MissionTargetType = TypeVar("MissionTargetType", bound=MissionTarget)
+
+
 class ObjectiveFinder:
     """Identifies potential objectives for the mission planner."""
 
@@ -247,41 +299,53 @@ class ObjectiveFinder:
         self.game = game
         self.is_player = is_player
 
-    def enemy_sams(self) -> Iterator[TheaterGroundObject]:
+    def enemy_air_defenses(self) -> Iterator[tuple[TheaterGroundObject, Distance]]:
         """Iterates over all enemy SAM sites."""
-        # Control points might have the same ground object several times, for
-        # some reason.
-        found_targets: Set[str] = set()
+        doctrine = self.game.faction_for(self.is_player).doctrine
+        threat_zones = self.game.threat_zone_for(not self.is_player)
         for cp in self.enemy_control_points():
             for ground_object in cp.ground_objects:
-                is_ewr = isinstance(ground_object, EwrGroundObject)
-                is_sam = isinstance(ground_object, SamGroundObject)
-                if not is_ewr and not is_sam:
-                    continue
-
                 if ground_object.is_dead:
                     continue
 
-                if ground_object.name in found_targets:
+                if isinstance(ground_object, EwrGroundObject):
+                    if threat_zones.threatened_by_air_defense(ground_object):
+                        # This is a very weak heuristic for determining whether the EWR
+                        # is close enough to be worth targeting before a SAM that is
+                        # covering it. Ingress distance corresponds to the beginning of
+                        # the attack range and is sufficient for most standoff weapons,
+                        # so treating the ingress distance as the threat distance sorts
+                        # these EWRs such that they will be attacked before SAMs that do
+                        # not threaten the ingress point, but after those that do.
+                        target_range = doctrine.ingress_egress_distance
+                    else:
+                        # But if the EWR isn't covered then we should only be worrying
+                        # about its detection range.
+                        target_range = ground_object.max_detection_range()
+                elif isinstance(ground_object, SamGroundObject):
+                    target_range = ground_object.max_threat_range()
+                else:
                     continue
 
-                if not ground_object.has_radar:
-                    continue
+                yield ground_object, target_range
 
-                # TODO: Yield in order of most threatening.
-                # Need to sort in order of how close their defensive range comes
-                # to friendly assets. To do that we need to add effective range
-                # information to the database.
-                yield ground_object
-                found_targets.add(ground_object.name)
-
-    def threatening_sams(self) -> Iterator[MissionTarget]:
+    def threatening_air_defenses(self) -> Iterator[TheaterGroundObject]:
         """Iterates over enemy SAMs in threat range of friendly control points.
 
         SAM sites are sorted by their closest proximity to any friendly control
         point (airfield or fleet).
         """
-        return self._targets_by_range(self.enemy_sams())
+
+        target_ranges: list[tuple[TheaterGroundObject, Distance]] = []
+        for target, threat_range in self.enemy_air_defenses():
+            ranges: list[Distance] = []
+            for cp in self.friendly_control_points():
+                ranges.append(meters(target.distance_to(cp)) - threat_range)
+            target_ranges.append((target, min(ranges)))
+
+        target_ranges = sorted(target_ranges, key=operator.itemgetter(1))
+        for target, _range in target_ranges:
+            yield target
 
     def enemy_vehicle_groups(self) -> Iterator[VehicleGroupGroundObject]:
         """Iterates over all enemy vehicle groups."""
@@ -323,9 +387,9 @@ class ObjectiveFinder:
         return self._targets_by_range(self.enemy_ships())
 
     def _targets_by_range(
-            self,
-            targets: Iterable[MissionTarget]) -> Iterator[MissionTarget]:
-        target_ranges: List[Tuple[MissionTarget, int]] = []
+        self, targets: Iterable[MissionTargetType]
+    ) -> Iterator[MissionTargetType]:
+        target_ranges: List[Tuple[MissionTargetType, int]] = []
         for target in targets:
             ranges: List[int] = []
             for cp in self.friendly_control_points():
@@ -371,7 +435,7 @@ class ObjectiveFinder:
 
                 is_building = isinstance(ground_object, BuildingGroundObject)
                 is_fob = isinstance(enemy_cp, Fob)
-                if is_building and is_fob and ground_object.airbase_group:
+                if is_building and is_fob and ground_object.is_control_point:
                     # This is the FOB structure itself. Can't be repaired or
                     # targeted by the player, so shouldn't be targetable by the
                     # AI.
@@ -392,13 +456,7 @@ class ObjectiveFinder:
 
     def front_lines(self) -> Iterator[FrontLine]:
         """Iterates over all active front lines in the theater."""
-        for cp in self.friendly_control_points():
-            for connected in cp.connected_points:
-                if connected.is_friendly(self.is_player):
-                    continue
-
-                if Conflict.has_frontline_between(cp, connected):
-                    yield FrontLine(cp, connected, self.game.theater)
+        yield from self.game.theater.conflicts()
 
     def vulnerable_control_points(self) -> Iterator[ControlPoint]:
         """Iterates over friendly CPs that are vulnerable to enemy CPs.
@@ -411,8 +469,10 @@ class ObjectiveFinder:
                 # Off-map spawn locations don't need protection.
                 continue
             airfields_in_proximity = self.closest_airfields_to(cp)
-            airfields_in_threat_range = airfields_in_proximity.airfields_within(
-                self.AIRFIELD_THREAT_RANGE
+            airfields_in_threat_range = (
+                airfields_in_proximity.operational_airfields_within(
+                    self.AIRFIELD_THREAT_RANGE
+                )
             )
             for airfield in airfields_in_threat_range:
                 if not airfield.is_friendly(self.is_player):
@@ -428,15 +488,49 @@ class ObjectiveFinder:
                 airfields.append(control_point)
         return self._targets_by_range(airfields)
 
+    def convoys(self) -> Iterator[Convoy]:
+        for front_line in self.front_lines():
+            yield from self.game.transfers.convoys.travelling_to(
+                front_line.control_point_hostile_to(self.is_player)
+            )
+
+    def cargo_ships(self) -> Iterator[CargoShip]:
+        for front_line in self.front_lines():
+            yield from self.game.transfers.cargo_ships.travelling_to(
+                front_line.control_point_hostile_to(self.is_player)
+            )
+
     def friendly_control_points(self) -> Iterator[ControlPoint]:
         """Iterates over all friendly control points."""
-        return (c for c in self.game.theater.controlpoints if
-                c.is_friendly(self.is_player))
+        return (
+            c for c in self.game.theater.controlpoints if c.is_friendly(self.is_player)
+        )
+
+    def farthest_friendly_control_point(self) -> ControlPoint:
+        """Finds the friendly control point that is farthest from any threats."""
+        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
+
+        if farthest is None:
+            raise RuntimeError("Found no friendly control points. You probably lost.")
+        return farthest
 
     def enemy_control_points(self) -> Iterator[ControlPoint]:
         """Iterates over all enemy control points."""
-        return (c for c in self.game.theater.controlpoints if
-                not c.is_friendly(self.is_player))
+        return (
+            c
+            for c in self.game.theater.controlpoints
+            if not c.is_friendly(self.is_player)
+        )
 
     def all_possible_targets(self) -> Iterator[MissionTarget]:
         """Iterates over all possible mission targets in the theater.
@@ -487,6 +581,7 @@ class CoalitionMissionPlanner:
     MAX_OCA_RANGE = nautical_miles(150)
     MAX_SEAD_RANGE = nautical_miles(150)
     MAX_STRIKE_RANGE = nautical_miles(150)
+    MAX_AWEC_RANGE = nautical_miles(200)
 
     def __init__(self, game: Game, is_player: bool) -> None:
         self.game = game
@@ -494,7 +589,25 @@ class CoalitionMissionPlanner:
         self.objective_finder = ObjectiveFinder(self.game, self.is_player)
         self.ato = self.game.blue_ato if is_player else self.game.red_ato
         self.threat_zones = self.game.threat_zone_for(not self.is_player)
-        self.procurement_requests: List[AircraftProcurementRequest] = []
+        self.procurement_requests = self.game.procurement_requests_for(self.is_player)
+        self.faction = self.game.faction_for(self.is_player)
+
+    def air_wing_can_plan(self, mission_type: FlightType) -> bool:
+        """Returns True if it is possible for the air wing to plan this mission type.
+
+        Not all mission types can be fulfilled by all air wings. Many factions do not
+        have AEW&C aircraft, so they will never be able to plan those missions. It's
+        also possible for the player to exclude mission types from their squadron
+        designs.
+        """
+        all_compatible = aircraft_for_task(mission_type)
+        for squadron in self.game.air_wing_for(self.is_player).iter_squadrons():
+            if (
+                squadron.aircraft in all_compatible
+                and mission_type in squadron.auto_assignable_mission_types
+            ):
+                return True
+        return False
 
     def critical_missions(self) -> Iterator[ProposedMission]:
         """Identifies the most important missions to plan this turn.
@@ -506,27 +619,55 @@ class CoalitionMissionPlanner:
         ensure that they can be planned again next turn even if all aircraft are
         eliminated this turn.
         """
+
+        # Find farthest, friendly CP for AEWC.
+        yield ProposedMission(
+            self.objective_finder.farthest_friendly_control_point(),
+            [ProposedFlight(FlightType.AEWC, 1, self.MAX_AWEC_RANGE)],
+            # Supports all the early CAP flights, so should be in the air ASAP.
+            asap=True,
+        )
+
         # Find friendly CPs within 100 nmi from an enemy airfield, plan CAP.
         for cp in self.objective_finder.vulnerable_control_points():
-            # Plan three rounds of CAP to give ~90 minutes coverage. Spacing
-            # these out appropriately is done in stagger_missions.
-            yield ProposedMission(cp, [
-                ProposedFlight(FlightType.BARCAP, 2, self.MAX_CAP_RANGE),
-            ])
-            yield ProposedMission(cp, [
-                ProposedFlight(FlightType.BARCAP, 2, self.MAX_CAP_RANGE),
-            ])
-            yield ProposedMission(cp, [
-                ProposedFlight(FlightType.BARCAP, 2, self.MAX_CAP_RANGE),
-            ])
+            # Plan CAP in such a way, that it is established during the whole desired mission length
+            for _ in range(
+                0,
+                int(self.game.settings.desired_player_mission_duration.total_seconds()),
+                int(self.faction.doctrine.cap_duration.total_seconds()),
+            ):
+                yield ProposedMission(
+                    cp,
+                    [
+                        ProposedFlight(FlightType.BARCAP, 2, self.MAX_CAP_RANGE),
+                    ],
+                )
 
         # Find front lines, plan CAS.
         for front_line in self.objective_finder.front_lines():
-            yield ProposedMission(front_line, [
-                ProposedFlight(FlightType.CAS, 2, self.MAX_CAS_RANGE),
-                ProposedFlight(FlightType.TARCAP, 2, self.MAX_CAP_RANGE,
-                               EscortType.AirToAir),
-            ])
+            yield ProposedMission(
+                front_line,
+                [
+                    ProposedFlight(FlightType.CAS, 2, self.MAX_CAS_RANGE),
+                    # This is *not* an escort because front lines don't create a threat
+                    # zone. Generating threat zones from front lines causes the front
+                    # line to push back BARCAPs as it gets closer to the base. While
+                    # front lines do have the same problem of potentially pulling
+                    # BARCAPs off bases to engage a front line TARCAP, that's probably
+                    # the one time where we do want that.
+                    #
+                    # TODO: Use intercepts and extra TARCAPs to cover bases near fronts.
+                    # We don't have intercept missions yet so this isn't something we
+                    # can do today, but we should probably return to having the front
+                    # line project a threat zone (so that strike missions will route
+                    # around it) and instead *not plan* a BARCAP at bases near the
+                    # front, since there isn't a place to put a barrier. Instead, the
+                    # aircraft that would have been a BARCAP could be used as additional
+                    # interceptors and TARCAPs which will defend the base but won't be
+                    # trying to avoid front line contacts.
+                    ProposedFlight(FlightType.TARCAP, 2, self.MAX_CAP_RANGE),
+                ],
+            )
 
     def propose_missions(self) -> Iterator[ProposedMission]:
         """Identifies and iterates over potential mission in priority order."""
@@ -536,31 +677,109 @@ class CoalitionMissionPlanner:
         # or objects, plan DEAD.
         # Find enemy SAM sites with ranges that extend to within 50 nmi of
         # friendly CPs, front, lines, or objects, plan DEAD.
-        for sam in self.objective_finder.threatening_sams():
-            yield ProposedMission(sam, [
-                ProposedFlight(FlightType.DEAD, 2, self.MAX_SEAD_RANGE),
-                # TODO: Max escort range.
-                ProposedFlight(FlightType.ESCORT, 2, self.MAX_SEAD_RANGE,
-                               EscortType.AirToAir),
-            ])
+        for sam in self.objective_finder.threatening_air_defenses():
+            flights = [ProposedFlight(FlightType.DEAD, 2, self.MAX_SEAD_RANGE)]
+
+            # Only include SEAD against SAMs that still have emitters. No need to
+            # suppress an EWR, and SEAD isn't useful against a SAM that no longer has a
+            # working track radar.
+            #
+            # For SAMs without track radars and EWRs, we still want a SEAD escort if
+            # needed.
+            #
+            # Note that there is a quirk here: we should potentially be included a SEAD
+            # escort *and* SEAD when the target is a radar SAM but the flight path is
+            # also threatened by SAMs. We don't want to include a SEAD escort if the
+            # package is *only* threatened by the target though. Could be improved, but
+            # needs a decent refactor to the escort planning to do so.
+            if sam.has_live_radar_sam:
+                flights.append(ProposedFlight(FlightType.SEAD, 2, self.MAX_SEAD_RANGE))
+            else:
+                flights.append(
+                    ProposedFlight(
+                        FlightType.SEAD_ESCORT, 2, self.MAX_SEAD_RANGE, EscortType.Sead
+                    )
+                )
+            # TODO: Max escort range.
+            flights.append(
+                ProposedFlight(
+                    FlightType.ESCORT, 2, self.MAX_SEAD_RANGE, EscortType.AirToAir
+                )
+            )
+            yield ProposedMission(sam, flights)
+
+        # These will only rarely get planned. When a convoy is travelling multiple legs,
+        # they're targetable after the first leg. The reason for this is that
+        # procurement happens *after* mission planning so that the missions that could
+        # not be filled will guide the procurement process. Procurement is the stage
+        # that convoys are created (because they're created to move ground units that
+        # were just purchased), so we haven't created any yet. Any incomplete transfers
+        # from the previous turn (multi-leg journeys) will still be present though so
+        # they can be targeted.
+        #
+        # Even after this is fixed, the player's convoys that were created through the
+        # UI will never be targeted on the first turn of their journey because the AI
+        # stops planning after the start of the turn. We could potentially fix this by
+        # moving opfor mission planning until the takeoff button is pushed.
+        for convoy in self.objective_finder.convoys():
+            yield ProposedMission(
+                convoy,
+                [
+                    ProposedFlight(FlightType.BAI, 2, self.MAX_BAI_RANGE),
+                    # TODO: Max escort range.
+                    ProposedFlight(
+                        FlightType.ESCORT, 2, self.MAX_BAI_RANGE, EscortType.AirToAir
+                    ),
+                    ProposedFlight(
+                        FlightType.SEAD_ESCORT, 2, self.MAX_BAI_RANGE, EscortType.Sead
+                    ),
+                ],
+            )
+
+        for ship in self.objective_finder.cargo_ships():
+            yield ProposedMission(
+                ship,
+                [
+                    ProposedFlight(FlightType.ANTISHIP, 2, self.MAX_ANTISHIP_RANGE),
+                    # TODO: Max escort range.
+                    ProposedFlight(
+                        FlightType.ESCORT, 2, self.MAX_BAI_RANGE, EscortType.AirToAir
+                    ),
+                    ProposedFlight(
+                        FlightType.SEAD_ESCORT, 2, self.MAX_BAI_RANGE, EscortType.Sead
+                    ),
+                ],
+            )
 
         for group in self.objective_finder.threatening_ships():
-            yield ProposedMission(group, [
-                ProposedFlight(FlightType.ANTISHIP, 2, self.MAX_ANTISHIP_RANGE),
-                # TODO: Max escort range.
-                ProposedFlight(FlightType.ESCORT, 2, self.MAX_ANTISHIP_RANGE,
-                               EscortType.AirToAir),
-            ])
+            yield ProposedMission(
+                group,
+                [
+                    ProposedFlight(FlightType.ANTISHIP, 2, self.MAX_ANTISHIP_RANGE),
+                    # TODO: Max escort range.
+                    ProposedFlight(
+                        FlightType.ESCORT,
+                        2,
+                        self.MAX_ANTISHIP_RANGE,
+                        EscortType.AirToAir,
+                    ),
+                ],
+            )
 
         for group in self.objective_finder.threatening_vehicle_groups():
-            yield ProposedMission(group, [
-                ProposedFlight(FlightType.BAI, 2, self.MAX_BAI_RANGE),
-                # TODO: Max escort range.
-                ProposedFlight(FlightType.ESCORT, 2, self.MAX_BAI_RANGE,
-                               EscortType.AirToAir),
-                ProposedFlight(FlightType.SEAD, 2, self.MAX_OCA_RANGE,
-                               EscortType.Sead),
-            ])
+            yield ProposedMission(
+                group,
+                [
+                    ProposedFlight(FlightType.BAI, 2, self.MAX_BAI_RANGE),
+                    # TODO: Max escort range.
+                    ProposedFlight(
+                        FlightType.ESCORT, 2, self.MAX_BAI_RANGE, EscortType.AirToAir
+                    ),
+                    ProposedFlight(
+                        FlightType.SEAD_ESCORT, 2, self.MAX_OCA_RANGE, EscortType.Sead
+                    ),
+                ],
+            )
 
         for target in self.objective_finder.oca_targets(min_aircraft=20):
             flights = [
@@ -569,54 +788,77 @@ class CoalitionMissionPlanner:
             if self.game.settings.default_start_type == "Cold":
                 # Only schedule if the default start type is Cold. If the player
                 # has set anything else there are no targets to hit.
-                flights.append(ProposedFlight(FlightType.OCA_AIRCRAFT, 2,
-                                              self.MAX_OCA_RANGE))
-            flights.extend([
-                # TODO: Max escort range.
-                ProposedFlight(FlightType.ESCORT, 2, self.MAX_OCA_RANGE,
-                               EscortType.AirToAir),
-                ProposedFlight(FlightType.SEAD, 2, self.MAX_OCA_RANGE,
-                               EscortType.Sead),
-            ])
+                flights.append(
+                    ProposedFlight(FlightType.OCA_AIRCRAFT, 2, self.MAX_OCA_RANGE)
+                )
+            flights.extend(
+                [
+                    # TODO: Max escort range.
+                    ProposedFlight(
+                        FlightType.ESCORT, 2, self.MAX_OCA_RANGE, EscortType.AirToAir
+                    ),
+                    ProposedFlight(
+                        FlightType.SEAD_ESCORT, 2, self.MAX_OCA_RANGE, EscortType.Sead
+                    ),
+                ]
+            )
             yield ProposedMission(target, flights)
 
         # Plan strike missions.
         for target in self.objective_finder.strike_targets():
-            yield ProposedMission(target, [
-                ProposedFlight(FlightType.STRIKE, 2, self.MAX_STRIKE_RANGE),
-                # TODO: Max escort range.
-                ProposedFlight(FlightType.ESCORT, 2, self.MAX_STRIKE_RANGE,
-                               EscortType.AirToAir),
-                ProposedFlight(FlightType.SEAD, 2, self.MAX_STRIKE_RANGE,
-                               EscortType.Sead),
-            ])
+            yield ProposedMission(
+                target,
+                [
+                    ProposedFlight(FlightType.STRIKE, 2, self.MAX_STRIKE_RANGE),
+                    # TODO: Max escort range.
+                    ProposedFlight(
+                        FlightType.ESCORT, 2, self.MAX_STRIKE_RANGE, EscortType.AirToAir
+                    ),
+                    ProposedFlight(
+                        FlightType.SEAD_ESCORT,
+                        2,
+                        self.MAX_STRIKE_RANGE,
+                        EscortType.Sead,
+                    ),
+                ],
+            )
 
     def plan_missions(self) -> None:
         """Identifies and plans mission for the turn."""
-        for proposed_mission in self.propose_missions():
-            self.plan_mission(proposed_mission)
+        player = "Blue" if self.is_player else "Red"
+        with logged_duration(f"{player} mission identification and fulfillment"):
+            with MultiEventTracer() as tracer:
+                for proposed_mission in self.propose_missions():
+                    self.plan_mission(proposed_mission, tracer)
 
-        for critical_mission in self.critical_missions():
-            self.plan_mission(critical_mission, reserves=True)
+        with logged_duration(f"{player} reserve mission planning"):
+            with MultiEventTracer() as tracer:
+                for critical_mission in self.critical_missions():
+                    self.plan_mission(critical_mission, tracer, reserves=True)
 
-        self.stagger_missions()
+        with logged_duration(f"{player} mission scheduling"):
+            self.stagger_missions()
 
         for cp in self.objective_finder.friendly_control_points():
             inventory = self.game.aircraft_inventory.for_control_point(cp)
             for aircraft, available in inventory.all_aircraft:
-                self.message("Unused aircraft",
-                             f"{available} {aircraft.id} from {cp}")
+                self.message("Unused aircraft", f"{available} {aircraft.id} from {cp}")
 
-    def plan_flight(self, mission: ProposedMission, flight: ProposedFlight,
-                    builder: PackageBuilder, missing_types: Set[FlightType],
-                    for_reserves: bool) -> None:
+    def plan_flight(
+        self,
+        mission: ProposedMission,
+        flight: ProposedFlight,
+        builder: PackageBuilder,
+        missing_types: Set[FlightType],
+        for_reserves: bool,
+    ) -> None:
         if not builder.plan_flight(flight):
             missing_types.add(flight.task)
             purchase_order = AircraftProcurementRequest(
                 near=mission.location,
                 range=flight.max_distance,
                 task_capability=flight.task,
-                number=flight.num_aircraft
+                number=flight.num_aircraft,
             )
             if for_reserves:
                 # Reserves are planned for critical missions, so prioritize
@@ -626,50 +868,53 @@ class CoalitionMissionPlanner:
                 self.procurement_requests.append(purchase_order)
 
     def scrub_mission_missing_aircraft(
-            self, mission: ProposedMission, builder: PackageBuilder,
-            missing_types: Set[FlightType],
-            not_attempted: Iterable[ProposedFlight],
-            reserves: bool) -> None:
+        self,
+        mission: ProposedMission,
+        builder: PackageBuilder,
+        missing_types: Set[FlightType],
+        not_attempted: Iterable[ProposedFlight],
+        reserves: bool,
+    ) -> None:
         # Try to plan the rest of the mission just so we can count the missing
         # types to buy.
         for flight in not_attempted:
             self.plan_flight(mission, flight, builder, missing_types, reserves)
 
-        missing_types_str = ", ".join(
-            sorted([t.name for t in missing_types]))
+        missing_types_str = ", ".join(sorted([t.name for t in missing_types]))
         builder.release_planned_aircraft()
         desc = "reserve aircraft" if reserves else "aircraft"
         self.message(
             "Insufficient aircraft",
             f"Not enough {desc} in range for {mission.location.name} "
-            f"capable of: {missing_types_str}")
+            f"capable of: {missing_types_str}",
+        )
 
-    def check_needed_escorts(
-            self, builder: PackageBuilder) -> Dict[EscortType, bool]:
+    def check_needed_escorts(self, builder: PackageBuilder) -> Dict[EscortType, bool]:
         threats = defaultdict(bool)
         for flight in builder.package.flights:
-            if self.threat_zones.threatened_by_aircraft(flight):
+            if self.threat_zones.waypoints_threatened_by_aircraft(
+                flight.flight_plan.escorted_waypoints()
+            ):
                 threats[EscortType.AirToAir] = True
-            if self.threat_zones.threatened_by_air_defense(flight):
+            if self.threat_zones.waypoints_threatened_by_radar_sam(
+                list(flight.flight_plan.escorted_waypoints())
+            ):
                 threats[EscortType.Sead] = True
         return threats
 
-    def plan_mission(self, mission: ProposedMission,
-                     reserves: bool = False) -> None:
+    def plan_mission(
+        self, mission: ProposedMission, tracer: MultiEventTracer, reserves: bool = False
+    ) -> None:
         """Allocates aircraft for a proposed mission and adds it to the ATO."""
-
-        if self.is_player:
-            package_country = self.game.player_country
-        else:
-            package_country = self.game.enemy_country
-
         builder = PackageBuilder(
             mission.location,
             self.objective_finder.closest_airfields_to(mission.location),
             self.game.aircraft_inventory,
+            self.game.air_wing_for(self.is_player),
             self.is_player,
-            package_country,
-            self.game.settings.default_start_type
+            self.game.country_for(self.is_player),
+            self.game.settings.default_start_type,
+            mission.asap,
         )
 
         # Attempt to plan all the main elements of the mission first. Escorts
@@ -678,17 +923,31 @@ class CoalitionMissionPlanner:
         missing_types: Set[FlightType] = set()
         escorts = []
         for proposed_flight in mission.flights:
+            if not self.air_wing_can_plan(proposed_flight.task):
+                # This air wing can never plan this mission type because they do not
+                # have compatible aircraft or squadrons. Skip fulfillment so that we
+                # don't place the purchase request.
+                continue
             if proposed_flight.escort_type is not None:
                 # Escorts are planned after the primary elements of the package.
                 # If the package does not need escorts they may be pruned.
                 escorts.append(proposed_flight)
                 continue
-            self.plan_flight(mission, proposed_flight, builder, missing_types,
-                             reserves)
+            with tracer.trace("Flight planning"):
+                self.plan_flight(
+                    mission, proposed_flight, builder, missing_types, reserves
+                )
 
         if missing_types:
-            self.scrub_mission_missing_aircraft(mission, builder, missing_types,
-                                                escorts, reserves)
+            self.scrub_mission_missing_aircraft(
+                mission, builder, missing_types, escorts, reserves
+            )
+            return
+
+        if not builder.package.flights:
+            # The non-escort part of this mission is unplannable by this faction. Scrub
+            # the mission and do not attempt planning escorts because there's no reason
+            # to buy them because this mission will never be planned.
             return
 
         # Create flight plans for the main flights of the package so we can
@@ -697,10 +956,12 @@ class CoalitionMissionPlanner:
         # flights that will rendezvous with their package will be affected by
         # the other flights in the package. Escorts will not be able to
         # contribute to this.
-        flight_plan_builder = FlightPlanBuilder(self.game, builder.package,
-                                                self.is_player)
+        flight_plan_builder = FlightPlanBuilder(
+            self.game, builder.package, self.is_player
+        )
         for flight in builder.package.flights:
-            flight_plan_builder.populate_flight_plan(flight)
+            with tracer.trace("Flight plan population"):
+                flight_plan_builder.populate_flight_plan(flight)
 
         needed_escorts = self.check_needed_escorts(builder)
         for escort in escorts:
@@ -708,14 +969,15 @@ class CoalitionMissionPlanner:
             # impossible.
             assert escort.escort_type is not None
             if needed_escorts[escort.escort_type]:
-                self.plan_flight(mission, escort, builder, missing_types,
-                                 reserves)
+                with tracer.trace("Flight planning"):
+                    self.plan_flight(mission, escort, builder, missing_types, reserves)
 
         # Check again for unavailable aircraft. If the escort was required and
         # none were found, scrub the mission.
         if missing_types:
-            self.scrub_mission_missing_aircraft(mission, builder, missing_types,
-                                                escorts, reserves)
+            self.scrub_mission_missing_aircraft(
+                mission, builder, missing_types, escorts, reserves
+            )
             return
 
         if reserves:
@@ -728,33 +990,41 @@ class CoalitionMissionPlanner:
         # Add flight plans for escorts.
         for flight in package.flights:
             if not flight.flight_plan.waypoints:
-                flight_plan_builder.populate_flight_plan(flight)
+                with tracer.trace("Flight plan population"):
+                    flight_plan_builder.populate_flight_plan(flight)
+
+        if package.has_players and self.game.settings.auto_ato_player_missions_asap:
+            package.auto_asap = True
+            package.set_tot_asap()
+
         self.ato.add_package(package)
 
     def stagger_missions(self) -> None:
-        def start_time_generator(count: int, earliest: int, latest: int,
-                                 margin: int) -> Iterator[timedelta]:
+        def start_time_generator(
+            count: int, earliest: int, latest: int, margin: int
+        ) -> Iterator[timedelta]:
             interval = (latest - earliest) // count
             for time in range(earliest, latest, interval):
                 error = random.randint(-margin, margin)
-                yield timedelta(minutes=max(0, time + error))
+                yield timedelta(seconds=max(0, time + error))
 
         dca_types = {
             FlightType.BARCAP,
             FlightType.TARCAP,
         }
 
-        previous_cap_end_time: Dict[MissionTarget, timedelta] = defaultdict(
-            timedelta
-        )
-        non_dca_packages = [p for p in self.ato.packages if
-                            p.primary_task not in dca_types]
+        previous_cap_end_time: Dict[MissionTarget, timedelta] = defaultdict(timedelta)
+        non_dca_packages = [
+            p for p in self.ato.packages if p.primary_task not in dca_types
+        ]
 
         start_time = start_time_generator(
             count=len(non_dca_packages),
-            earliest=5,
-            latest=90,
-            margin=5
+            earliest=5 * 60,
+            latest=int(
+                self.game.settings.desired_player_mission_duration.total_seconds()
+            ),
+            margin=5 * 60,
         )
         for package in self.ato.packages:
             tot = TotEstimator(package).earliest_tot()
@@ -771,10 +1041,11 @@ class CoalitionMissionPlanner:
                 departure_time = package.mission_departure_time
                 # Should be impossible for CAPs
                 if departure_time is None:
-                    logging.error(
-                        f"Could not determine mission end time for {package}")
+                    logging.error(f"Could not determine mission end time for {package}")
                     continue
                 previous_cap_end_time[package.target] = departure_time
+            elif package.auto_asap:
+                package.set_tot_asap()
             else:
                 # But other packages should be spread out a bit. Note that take
                 # times are delayed, but all aircraft will become active at
@@ -791,8 +1062,6 @@ class CoalitionMissionPlanner:
         message to the info panel.
         """
         if self.is_player:
-            self.game.informations.append(
-                Information(title, text, self.game.turn)
-            )
+            self.game.informations.append(Information(title, text, self.game.turn))
         else:
             logging.info(f"{title}: {text}")

gen/flights/ai_flight_planner_db.py

@@ -5,15 +5,19 @@ from dcs.helicopters import (
     AH_1W,
     AH_64A,
     AH_64D,
+    CH_47D,
+    CH_53E,
     Ka_50,
     Mi_24V,
+    Mi_26,
     Mi_28N,
     Mi_8MT,
     OH_58D,
     SA342L,
     SA342M,
+    SH_60B,
     UH_1H,
-    SH_60B
+    UH_60A,
 )
 from dcs.planes import (
     AJS37,
@@ -22,11 +26,17 @@ from dcs.planes import (
     A_10C,
     A_10C_2,
     A_20G,
+    A_50,
+    An_26B,
     B_17G,
     B_1B,
     B_52H,
     Bf_109K_4,
     C_101CC,
+    C_130,
+    C_17A,
+    E_2C,
+    E_3A,
     FA_18C_hornet,
     FW_190A8,
     FW_190D9,
@@ -40,9 +50,12 @@ from dcs.planes import (
     F_4E,
     F_5E_3,
     F_86F_Sabre,
+    IL_76MD,
+    I_16,
     JF_17,
     J_11A,
     Ju_88A4,
+    KJ_2000,
     L_39ZA,
     MQ_9_Reaper,
     M_2000C,
@@ -54,7 +67,6 @@ from dcs.planes import (
     MiG_27K,
     MiG_29A,
     MiG_29G,
-    MiG_29K,
     MiG_29S,
     MiG_31,
     Mirage_2000_5,
@@ -83,18 +95,18 @@ from dcs.planes import (
     Tu_22M3,
     Tu_95MS,
     WingLoong_I,
-    I_16
+    I_16,
+    Yak_40,
 )
 from dcs.unittype import FlyingType
 
 from gen.flights.flight import FlightType
-
 from pydcs_extensions.a4ec.a4ec import A_4E_C
 from pydcs_extensions.f22a.f22a import F_22A
-from pydcs_extensions.mb339.mb339 import MB_339PAN
-from pydcs_extensions.rafale.rafale import Rafale_A_S, Rafale_M, Rafale_B
-from pydcs_extensions.su57.su57 import Su_57
+from pydcs_extensions.jas39.jas39 import JAS39Gripen, JAS39Gripen_AG
 from pydcs_extensions.hercules.hercules import Hercules
+from pydcs_extensions.mb339.mb339 import MB_339PAN
+from pydcs_extensions.su57.su57 import Su_57
 
 # All aircraft lists are in priority order. Aircraft higher in the list will be
 # preferred over those lower in the list.
@@ -111,26 +123,25 @@ CAP_CAPABLE = [
     F_14B,
     F_14A_135_GR,
     MiG_25PD,
-    Rafale_M,
     Su_33,
     Su_30,
     Su_27,
     J_11A,
     F_15C,
     MiG_29S,
-    MiG_29K,
     MiG_29G,
     MiG_29A,
     F_16C_50,
     FA_18C_hornet,
-    F_15E,
     F_16A,
     F_4E,
+    JAS39Gripen,
     JF_17,
     MiG_23MLD,
     MiG_21Bis,
     Mirage_2000_5,
     M_2000C,
+    F_15E,
     F_5E_3,
     MiG_19P,
     A_4E_C,
@@ -156,30 +167,32 @@ CAP_CAPABLE = [
 CAS_CAPABLE = [
     A_10C_2,
     A_10C,
-    B_1B,
-    F_14B,
-    F_14A_135_GR,
+    Hercules,
     Su_25TM,
     Su_25T,
     Su_25,
     F_15E,
     F_16C_50,
     FA_18C_hornet,
-    Rafale_A_S,
-    Rafale_B,
     Tornado_GR4,
     Tornado_IDS,
+    JAS39Gripen_AG,
     JF_17,
+    AV8BNA,
     A_10A,
+    B_1B,
     A_4E_C,
+    F_14B,
+    F_14A_135_GR,
     AJS37,
     Su_24MR,
     Su_24M,
     Su_17M4,
-    AV8BNA,
+    F_4E,
     S_3B,
     Su_34,
     Su_30,
+    MiG_19P,
     MiG_29S,
     MiG_27K,
     MiG_29A,
@@ -202,6 +215,7 @@ CAS_CAPABLE = [
     MB_339PAN,
     L_39ZA,
     A_20G,
+    Ju_88A4,
     P_47D_40,
     P_47D_30bl1,
     P_47D_30,
@@ -219,7 +233,7 @@ CAS_CAPABLE = [
 ]
 
 
-# Aircraft used for SEAD tasks
+# Aircraft used for SEAD and SEAD Escort tasks. Must be capable of the CAS DCS task.
 SEAD_CAPABLE = [
     JF_17,
     F_16C_50,
@@ -227,10 +241,11 @@ SEAD_CAPABLE = [
     Tornado_IDS,
     Su_25T,
     Su_25TM,
-    Rafale_A_S,
-    Rafale_B,
     F_4E,
     A_4E_C,
+    F_14B,
+    F_14A_135_GR,
+    JAS39Gripen_AG,
     AV8BNA,
     Su_24M,
     Su_17M4,
@@ -238,9 +253,21 @@ SEAD_CAPABLE = [
     Su_30,
     MiG_27K,
     Tornado_GR4,
-    F_117A,
-    B_17G,
+]
+
+
+# Aircraft used for DEAD tasks. Must be capable of the CAS DCS task.
+DEAD_CAPABLE = [
+    AJS37,
+    F_14B,
+    F_14A_135_GR,
+    JAS39Gripen_AG,
+    B_1B,
+    B_52H,
+    Tu_160,
+    Tu_95MS,
     A_20G,
+    Ju_88A4,
     P_47D_40,
     P_47D_30bl1,
     P_47D_30,
@@ -251,18 +278,6 @@ SEAD_CAPABLE = [
     Bf_109K_4,
     FW_190D9,
     FW_190A8,
-]
-
-
-# Aircraft used for DEAD tasks
-DEAD_CAPABLE = [
-    AJS37,
-    F_14B,
-    F_14A_135_GR,
-    B_1B,
-    B_52H,
-    Tu_160,
-    Tu_95MS,
 ] + SEAD_CAPABLE
 
 
@@ -276,14 +291,13 @@ STRIKE_CAPABLE = [
     Tu_22M3,
     F_15E,
     AJS37,
-    Rafale_A_S,
-    Rafale_B,
     Tornado_GR4,
     F_16C_50,
     FA_18C_hornet,
     F_16A,
     F_14B,
     F_14A_135_GR,
+    JAS39Gripen_AG,
     Tornado_IDS,
     Su_17M4,
     Su_24MR,
@@ -296,10 +310,10 @@ STRIKE_CAPABLE = [
     Su_30,
     Su_27,
     MiG_29S,
-    MiG_29K,
     MiG_29G,
     MiG_29A,
     JF_17,
+    F_4E,
     A_10C_2,
     A_10C,
     AV8BNA,
@@ -316,6 +330,7 @@ STRIKE_CAPABLE = [
     L_39ZA,
     B_17G,
     A_20G,
+    Ju_88A4,
     P_47D_40,
     P_47D_30bl1,
     P_47D_30,
@@ -333,8 +348,7 @@ ANTISHIP_CAPABLE = [
     AJS37,
     Tu_22M3,
     FA_18C_hornet,
-    Rafale_A_S,
-    Rafale_B,
+    JAS39Gripen_AG,
     Su_24M,
     Su_17M4,
     JF_17,
@@ -362,20 +376,34 @@ RUNWAY_ATTACK_CAPABLE = [
 # For any aircraft that isn't necessarily directly involved in strike
 # missions in a direct combat sense, but can transport objects and infantry.
 TRANSPORT_CAPABLE = [
+    C_17A,
     Hercules,
-    Mi_8MT,
+    C_130,
+    IL_76MD,
+    An_26B,
+    Yak_40,
+    CH_53E,
+    CH_47D,
+    SH_60B,
+    UH_60A,
     UH_1H,
+    Mi_8MT,
+    Mi_8MT,
+    Mi_26,
 ]
 
-DRONES = [
-    MQ_9_Reaper,
-    RQ_1A_Predator,
-    WingLoong_I
+DRONES = [MQ_9_Reaper, RQ_1A_Predator, WingLoong_I]
+
+AEWC_CAPABLE = [
+    E_3A,
+    E_2C,
+    A_50,
+    KJ_2000,
 ]
 
 
 def aircraft_for_task(task: FlightType) -> List[Type[FlyingType]]:
-    cap_missions = (FlightType.BARCAP, FlightType.TARCAP)
+    cap_missions = (FlightType.BARCAP, FlightType.TARCAP, FlightType.SWEEP)
     if task in cap_missions:
         return CAP_CAPABLE
     elif task == FlightType.ANTISHIP:
@@ -386,6 +414,8 @@ def aircraft_for_task(task: FlightType) -> List[Type[FlyingType]]:
         return CAS_CAPABLE
     elif task == FlightType.SEAD:
         return SEAD_CAPABLE
+    elif task == FlightType.SEAD_ESCORT:
+        return SEAD_CAPABLE
     elif task == FlightType.DEAD:
         return DEAD_CAPABLE
     elif task == FlightType.OCA_AIRCRAFT:
@@ -396,6 +426,18 @@ def aircraft_for_task(task: FlightType) -> List[Type[FlyingType]]:
         return STRIKE_CAPABLE
     elif task == FlightType.ESCORT:
         return CAP_CAPABLE
+    elif task == FlightType.AEWC:
+        return AEWC_CAPABLE
+    elif task == FlightType.TRANSPORT:
+        return TRANSPORT_CAPABLE
     else:
         logging.error(f"Unplannable flight type: {task}")
         return []
+
+
+def tasks_for_aircraft(aircraft: Type[FlyingType]) -> list[FlightType]:
+    tasks = []
+    for task in FlightType:
+        if aircraft in aircraft_for_task(task):
+            tasks.append(task)
+    return tasks

gen/flights/closestairfields.py

@@ -12,12 +12,13 @@ if TYPE_CHECKING:
 class ClosestAirfields:
     """Precalculates which control points are closes to the given target."""
 
-    def __init__(self, target: MissionTarget,
-                 all_control_points: List[ControlPoint]) -> None:
+    def __init__(
+        self, target: MissionTarget, all_control_points: List[ControlPoint]
+    ) -> None:
         self.target = target
         # This cache is configured once on load, so it's important that it is
         # complete and deterministic to avoid different behaviors across loads.
-        # E.g. https://github.com/Khopa/dcs_liberation/issues/819
+        # E.g. https://github.com/dcs-liberation/dcs_liberation/issues/819
         self.closest_airfields: List[ControlPoint] = sorted(
             all_control_points, key=lambda c: self.target.distance_to(c)
         )
@@ -26,17 +27,35 @@ class ClosestAirfields:
     def operational_airfields(self) -> Iterator[ControlPoint]:
         return (c for c in self.closest_airfields if c.runway_is_operational())
 
-    def airfields_within(self, distance: Distance) -> Iterator[ControlPoint]:
+    def _airfields_within(
+        self, distance: Distance, operational: bool
+    ) -> Iterator[ControlPoint]:
+        airfields = (
+            self.operational_airfields if operational else self.closest_airfields
+        )
+        for cp in airfields:
+            if cp.distance_to(self.target) < distance.meters:
+                yield cp
+            else:
+                break
+
+    def operational_airfields_within(
+        self, distance: Distance
+    ) -> Iterator[ControlPoint]:
         """Iterates over all airfields within the given range of the target.
 
         Note that this iterates over *all* airfields, not just friendly
         airfields.
         """
-        for cp in self.closest_airfields:
-            if cp.distance_to(self.target) < distance.meters:
-                yield cp
-            else:
-                break
+        return self._airfields_within(distance, operational=True)
+
+    def all_airfields_within(self, distance: Distance) -> Iterator[ControlPoint]:
+        """Iterates over all airfields within the given range of the target.
+
+        Note that this iterates over *all* airfields, not just friendly
+        airfields.
+        """
+        return self._airfields_within(distance, operational=False)
 
 
 class ObjectiveDistanceCache:
@@ -52,9 +71,7 @@ class ObjectiveDistanceCache:
     @classmethod
     def get_closest_airfields(cls, location: MissionTarget) -> ClosestAirfields:
         if cls.theater is None:
-            raise RuntimeError(
-                "Call ObjectiveDistanceCache.set_theater before using"
-            )
+            raise RuntimeError("Call ObjectiveDistanceCache.set_theater before using")
 
         if location.name not in cls.closest_airfields:
             cls.closest_airfields[location.name] = ClosestAirfields(

gen/flights/flight.py

@@ -1,25 +1,58 @@
 from __future__ import annotations
 
-from collections import defaultdict
+from dataclasses import dataclass
 from datetime import timedelta
 from enum import Enum
-from typing import Dict, List, Optional, TYPE_CHECKING, Type
+from typing import List, Optional, TYPE_CHECKING, Type, Union
 
 from dcs.mapping import Point
 from dcs.point import MovingPoint, PointAction
+from dcs.unit import Unit
 from dcs.unittype import FlyingType
 
 from game import db
-from game.data.weapons import Weapon
+from game.squadrons import Pilot, Squadron
 from game.theater.controlpoint import ControlPoint, MissionTarget
 from game.utils import Distance, meters
+from gen.flights.loadouts import Loadout
 
 if TYPE_CHECKING:
+    from game.transfers import TransferOrder
     from gen.ato import Package
     from gen.flights.flightplan import FlightPlan
 
 
 class FlightType(Enum):
+    """Enumeration of mission types.
+
+    The value of each enumeration is the name that will be shown in the UI.
+
+    These values are persisted to the save game as well since they are a part of
+    each flight and thus a part of the ATO, so changing these values will break
+    save compat.
+
+    When adding new mission types to this list, you will also need to update:
+
+    * flightplan.py: Add waypoint population in generate_flight_plan. Add a new flight
+      plan type if necessary, though most are a subclass of StrikeFlightPlan.
+    * aircraft.py: Add a configuration method and call it in setup_flight_group. This is
+      responsible for configuring waypoint 0 actions like setting ROE, threat reaction,
+      and mission abort parameters (winchester, bingo, etc).
+    * Implementations of MissionTarget.mission_types: A mission type can only be planned
+      against compatible targets. The mission_types method of each target class defines
+      which missions may target it.
+    * ai_flight_planner_db.py: Add the new mission type to aircraft_for_task that
+      returns the list of compatible aircraft in order of preference.
+
+    You may also need to update:
+
+    * flight.py: Add a new waypoint type if necessary. Most mission types will need
+      these, as aircraft.py uses the ingress point type to specialize AI tasks, and non-
+      strike-like missions will need more specialized control.
+    * ai_flight_planner.py: Use the new mission type in propose_missions so the AI will
+      plan the new mission type.
+    """
+
     TARCAP = "TARCAP"
     BARCAP = "BARCAP"
     CAS = "CAS"
@@ -33,28 +66,52 @@ class FlightType(Enum):
     SWEEP = "Fighter sweep"
     OCA_RUNWAY = "OCA/Runway"
     OCA_AIRCRAFT = "OCA/Aircraft"
+    AEWC = "AEW&C"
+    TRANSPORT = "Transport"
+    SEAD_ESCORT = "SEAD Escort"
 
     def __str__(self) -> str:
         return self.value
 
+    @classmethod
+    def from_name(cls, name: str) -> FlightType:
+        for entry in cls:
+            if name == entry.value:
+                return entry
+        raise KeyError(f"No FlightType with name {name}")
+
 
 class FlightWaypointType(Enum):
-    TAKEOFF = 0             # Take off point
-    ASCEND_POINT = 1        # Ascension point after take off
-    PATROL = 2              # Patrol point
-    PATROL_TRACK = 3        # Patrol race track
-    NAV = 4                 # Nav point
-    INGRESS_STRIKE = 5      # Ingress strike (For generator, means that this should have bombing on next TARGET_POINT points)
-    INGRESS_SEAD = 6        # Ingress sead (For generator, means that this should attack groups on TARGET_GROUP_LOC points)
-    INGRESS_CAS = 7         # Ingress cas (should start CAS task)
-    CAS = 8                 # Should do CAS there
-    EGRESS = 9              # Should stop attack
-    DESCENT_POINT = 10       # Should start descending to pattern alt
-    LANDING_POINT = 11      # Should land there
-    TARGET_POINT = 12       # A target building or static object, position
-    TARGET_GROUP_LOC = 13   # A target group approximate location
-    TARGET_SHIP = 14        # A target ship known location
-    CUSTOM = 15             # User waypoint (no specific behaviour)
+    """Enumeration of waypoint types.
+
+    The value of the enum has no meaning but should remain stable to prevent breaking
+    save game compatibility.
+
+    When adding a new waypoint type, you will also need to update:
+
+    * waypointbuilder.py: Add a builder to simplify construction of the new waypoint
+      type unless the new waypoint type will be a parameter to an existing builder
+      method (such as how escort ingress waypoints work).
+    * aircraft.py: Associate AI actions with the new waypoint type by subclassing
+      PydcsWaypointBuilder and using it in PydcsWaypointBuilder.for_waypoint.
+    """
+
+    TAKEOFF = 0  # Take off point
+    ASCEND_POINT = 1  # Ascension point after take off
+    PATROL = 2  # Patrol point
+    PATROL_TRACK = 3  # Patrol race track
+    NAV = 4  # Nav point
+    INGRESS_STRIKE = 5  # Ingress strike (For generator, means that this should have bombing on next TARGET_POINT points)
+    INGRESS_SEAD = 6  # Ingress sead (For generator, means that this should attack groups on TARGET_GROUP_LOC points)
+    INGRESS_CAS = 7  # Ingress cas (should start CAS task)
+    CAS = 8  # Should do CAS there
+    EGRESS = 9  # Should stop attack
+    DESCENT_POINT = 10  # Should start descending to pattern alt
+    LANDING_POINT = 11  # Should land there
+    TARGET_POINT = 12  # A target building or static object, position
+    TARGET_GROUP_LOC = 13  # A target group approximate location
+    TARGET_SHIP = 14  # Unused.
+    CUSTOM = 15  # User waypoint (no specific behaviour)
     JOIN = 16
     SPLIT = 17
     LOITER = 18
@@ -65,12 +122,19 @@ class FlightWaypointType(Enum):
     DIVERT = 23
     INGRESS_OCA_RUNWAY = 24
     INGRESS_OCA_AIRCRAFT = 25
+    PICKUP = 26
+    DROP_OFF = 27
+    BULLSEYE = 28
 
 
 class FlightWaypoint:
-
-    def __init__(self, waypoint_type: FlightWaypointType, x: float, y: float,
-                 alt: Distance = meters(0)) -> None:
+    def __init__(
+        self,
+        waypoint_type: FlightWaypointType,
+        x: float,
+        y: float,
+        alt: Distance = meters(0),
+    ) -> None:
         """Creates a flight waypoint.
 
         Args:
@@ -90,7 +154,7 @@ class FlightWaypoint:
         # Only used in the waypoint list in the flight edit page. No sense
         # having three names. A short and long form is enough.
         self.description = ""
-        self.targets: List[MissionTarget] = []
+        self.targets: List[Union[MissionTarget, Unit]] = []
         self.obj_name = ""
         self.pretty_name = ""
         self.only_for_player = False
@@ -108,10 +172,13 @@ class FlightWaypoint:
         return Point(self.x, self.y)
 
     @classmethod
-    def from_pydcs(cls, point: MovingPoint,
-                   from_cp: ControlPoint) -> "FlightWaypoint":
-        waypoint = FlightWaypoint(FlightWaypointType.NAV, point.position.x,
-                                  point.position.y, meters(point.alt))
+    def from_pydcs(cls, point: MovingPoint, from_cp: ControlPoint) -> "FlightWaypoint":
+        waypoint = FlightWaypoint(
+            FlightWaypointType.NAV,
+            point.position.x,
+            point.position.y,
+            meters(point.alt),
+        )
         waypoint.alt_type = point.alt_type
         # Other actions exist... but none of them *should* be the first
         # waypoint for a flight.
@@ -134,39 +201,107 @@ class FlightWaypoint:
         return waypoint
 
 
-class Flight:
+class FlightRoster:
+    def __init__(self, squadron: Squadron, initial_size: int = 0) -> None:
+        self.squadron = squadron
+        self.pilots: list[Optional[Pilot]] = []
+        self.resize(initial_size)
 
-    def __init__(self, package: Package, country: str, unit_type: Type[FlyingType],
-                 count: int, flight_type: FlightType, start_type: str,
-                 departure: ControlPoint, arrival: ControlPoint,
-                 divert: Optional[ControlPoint],
-                 custom_name: Optional[str] = None) -> None:
+    @property
+    def max_size(self) -> int:
+        return len(self.pilots)
+
+    @property
+    def player_count(self) -> int:
+        return len([p for p in self.pilots if p is not None and p.player])
+
+    @property
+    def missing_pilots(self) -> int:
+        return len([p for p in self.pilots if p is None])
+
+    def resize(self, new_size: int) -> None:
+        if self.max_size > new_size:
+            self.squadron.return_pilots(
+                [p for p in self.pilots[new_size:] if p is not None]
+            )
+            self.pilots = self.pilots[:new_size]
+            return
+        self.pilots.extend(
+            [
+                self.squadron.claim_available_pilot()
+                for _ in range(new_size - self.max_size)
+            ]
+        )
+
+    def set_pilot(self, index: int, pilot: Optional[Pilot]) -> None:
+        if pilot is not None:
+            self.squadron.claim_pilot(pilot)
+        if (current_pilot := self.pilots[index]) is not None:
+            self.squadron.return_pilot(current_pilot)
+        self.pilots[index] = pilot
+
+    def clear(self) -> None:
+        self.squadron.return_pilots([p for p in self.pilots if p is not None])
+
+
+class Flight:
+    def __init__(
+        self,
+        package: Package,
+        country: str,
+        squadron: Squadron,
+        count: int,
+        flight_type: FlightType,
+        start_type: str,
+        departure: ControlPoint,
+        arrival: ControlPoint,
+        divert: Optional[ControlPoint],
+        custom_name: Optional[str] = None,
+        cargo: Optional[TransferOrder] = None,
+        roster: Optional[FlightRoster] = None,
+    ) -> None:
         self.package = package
         self.country = country
-        self.unit_type = unit_type
-        self.count = count
+        self.squadron = squadron
+        if roster is None:
+            self.roster = FlightRoster(self.squadron, initial_size=count)
+        else:
+            self.roster = roster
         self.departure = departure
         self.arrival = arrival
         self.divert = divert
         self.flight_type = flight_type
         # TODO: Replace with FlightPlan.
         self.targets: List[MissionTarget] = []
-        self.loadout: Dict[int, Optional[Weapon]] = {}
+        self.loadout = Loadout.default_for(self)
         self.start_type = start_type
         self.use_custom_loadout = False
-        self.client_count = 0
         self.custom_name = custom_name
 
+        # Only used by transport missions.
+        self.cargo = cargo
+
         # Will be replaced with a more appropriate FlightPlan by
         # FlightPlanBuilder, but an empty flight plan the flight begins with an
         # empty flight plan.
         from gen.flights.flightplan import CustomFlightPlan
+
         self.flight_plan: FlightPlan = CustomFlightPlan(
-            package=package,
-            flight=self,
-            custom_waypoints=[]
+            package=package, flight=self, custom_waypoints=[]
         )
 
+    @property
+    def count(self) -> int:
+        return self.roster.max_size
+
+    @property
+    def client_count(self) -> int:
+        return self.roster.player_count
+
+    @property
+    def unit_type(self) -> Type[FlyingType]:
+        return self.squadron.aircraft
+
     @property
     def from_cp(self) -> ControlPoint:
         return self.departure
@@ -175,6 +310,19 @@ class Flight:
     def points(self) -> List[FlightWaypoint]:
         return self.flight_plan.waypoints[1:]
 
+    def resize(self, new_size: int) -> None:
+        self.roster.resize(new_size)
+
+    def set_pilot(self, index: int, pilot: Optional[Pilot]) -> None:
+        self.roster.set_pilot(index, pilot)
+
+    @property
+    def missing_pilots(self) -> int:
+        return self.roster.missing_pilots
+
+    def clear_roster(self) -> None:
+        self.roster.clear()
+
     def __repr__(self):
         name = db.unit_type_name(self.unit_type)
         if self.custom_name:
@@ -182,7 +330,7 @@ class Flight:
         return f"[{self.flight_type}] {self.count} x {name}"
 
     def __str__(self):
-        name = db.unit_get_expanded_info(self.country, self.unit_type, 'name')
+        name = db.unit_get_expanded_info(self.country, self.unit_type, "name")
         if self.custom_name:
             return f"{self.custom_name} {self.count} x {name}"
         return f"[{self.flight_type}] {self.count} x {name}"