Merge pull request #1007 from Khopa/develop_2_5_x

Release 2.5.0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,8 +9,6 @@ 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.
 

.github/ISSUE_TEMPLATE/campaign_update.md

@@ -1,28 +0,0 @@
----
-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/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,8 +9,6 @@ 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/ISSUE_TEMPLATE/mod_support.md

@@ -1,12 +0,0 @@
----
-name: Mod support request
-about: Request Liberation support for new mods, or updates to existing mods 
-title: Add/update <mod name>
-labels: mod support
-assignees: ''
-
----
-
-* Mod name:
-* Mod URL:
-* Update or new mod?

.github/workflows/build.yml

@@ -11,10 +11,10 @@ jobs:
       with:
         submodules: true
 
-    - name: Set up Python 3.9
+    - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: 3.8
 
     - name: Install environment
       run: |
@@ -36,11 +36,6 @@ jobs:
       run: |
         ./venv/scripts/activate
         mypy gen
-
-    - name: mypy tests
-      run: |
-        ./venv/scripts/activate
-        mypy tests
       
     - name: update build number
       run: |

.github/workflows/release.yml

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

.github/workflows/test.yml

@@ -1,33 +0,0 @@
-name: Test
-
-on: [push, pull_request]
-
-jobs:
-
-  build:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.9
-
-    - name: Install environment
-      run: |
-        python -m venv ./venv
-
-    - name: Install dependencies
-      run: |
-        ./venv/scripts/activate
-        python -m pip install -r requirements.txt
-        # For some reason the shiboken2.abi3.dll is not found properly, so I copy it instead
-        Copy-Item .\venv\Lib\site-packages\shiboken2\shiboken2.abi3.dll .\venv\Lib\site-packages\PySide2\ -Force
-
-    - name: run tests
-      run: |
-        ./venv/scripts/activate
-        pytest tests

.gitignore

@@ -11,14 +11,12 @@ a.py
 resources/tools/a.miz
 # User-specific stuff
 .idea/
-.env
-env/
 
 /kneeboards
 /liberation_preferences.json
 /state.json
 
-/logs/
+logs/
 
 qt_ui/logs/liberation.log
 

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "pydcs"]
+	path = pydcs
+	url = https://github.com/pydcs/dcs
+	branch = master

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/dcs-liberation/dcs_liberation/wiki/Custom-Campaigns).
+You can create new campaigns : See [campaign creation wiki](https://github.com/Khopa/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,48 +1,39 @@
-[![Logo](https://i.imgur.com/HJBT4BL.png)](https://shdwp.github.io/ukraine/)
-
-(Github Readme Banner and Splash screen Artwork by Andriy Dankovych, CC BY-SA 4.0)
+![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/dcs-liberation/dcs_liberation/total?label=Download)](https://github.com/dcs-liberation/dcs_liberation/releases)
+[![Download](https://img.shields.io/github/downloads/khopa/dcs_liberation/total?label=Download)](https://github.com/Khopa/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/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)
+[![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)
 
 ## 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. 
 It is an external program that generates full and complex DCS missions and manage a persistent combat environment.  
 
-![Screenshot](https://user-images.githubusercontent.com/315852/120939254-0b4a9f80-c6cc-11eb-82f5-ce3f8d714bfe.png)
+![Logo](https://i.imgur.com/4hq0rLq.png)
 
 ## Downloads
 
-Latest release is available here : https://github.com/dcs-liberation/dcs_liberation/releases
+Latest release is available here : https://github.com/Khopa/dcs_liberation/releases
 
-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/)
+To download preview builds of the next version of DCS Liberation, see https://github.com/Khopa/dcs_liberation/wiki/Preview-builds.
 
 ## 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/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.
+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.
 
 ## Roadmap
 
-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.
+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.
 
 ## Resources
 
-Tutorials, contributors and developer's guides are available in the project's [Wiki](https://github.com/dcs-liberation/dcs_liberation/wiki/)
+Tutorials, contributors and developer's guides are available in the project's [Wiki](https://github.com/Khopa/dcs_liberation/wiki/)
 
 ## Special Thanks
 

changelog.md

@@ -1,268 +1,3 @@
-# 5.2.0
-
-Saves from 5.1.0 are compatible with 5.2.0
-
-## Features/Improvements
-
-* **[Modding]** Add UH-60L mod support
-* **[Campaign]** Vegas Nerve campaign update
-* **[Campaign]** Add 3 new campaigns from Sith1144
-## Fixes
-
-* **[Mission Generation]** Fixed incorrect SA-5 and NASAMS threat range when TR destroyed. It will not count as threat anymore when the TR is dead.
-* **[Mission Generation]** Fixed "Max Threat Range" error
-* **[Mission Generation]** Fix unculled zones not updating when needed
-* **[Data]** Removed Fw 190 A-8 and D-9 from Germany 1940 and 1942 faction list for historical accuracy.
-* **[Data]** Updated Loadouts for Tornado GR4, F-15E and F-16C
-* **[Data]** Corrected some unit data
-* **[UI]** Fixed various UI issues (for example Scaling and HighDPI)
-* **[UI]** Typhoon GR4 and IDS images
-
-
-# 5.1.0
-
-Saves from 5.0.0 are compatible with 5.1.0
-
-## Features/Improvements
-
-* **[Engine]** Support for DCS 2.7.9.17830 and newer, including the HTS and ECM pod.
-* **[Campaign]** Add option to manually add and remove squadrons and different aircraft type in the new game wizard / air wing configuration dialog.
-* **[Mission Generation]** Add Option to enforce the Easy Communication setting for the mission
-* **[Mission Generation]** Add Option to select between only night missions, day missions or any time (default).
-* **[Modding]** Add F-104 mod support
-
-## Fixes
-
-* **[Campaign]** Fixed some minor issues in campaigns which generated error messages in the log.
-* **[Campaign]** Changed the way how map object / scenery kills where tracked. This fixes issues with kill recognition after map updates from ED which change the object ids and therefore prevent correct kill recognition.
-* **[Mission Generation]** Fixed incorrect radio specification for the AN/ARC-222.
-* **[Mission Generation]** Fixed mission scripting error when using a dedicated server.
-* **[Mission Generation]** Fixed an issue where empty convoys lead to an index error when a point capture made a pending transfer of units not completable anymore.
-* **[Mission Generation]** Corrected Viggen FR22 & FR24 preset channels for the DCS 2.7.9 update
-* **[Mission Generation]** Fixed the SA-5 Generator to use the P-19 FlatFace SR as a Fallback radar if the faction does not have access to the TinShield SR.
-* **[UI]** Enable / Disable the settings, save and stats actions if no game is loaded to prevent an error as these functions can only be used on a valid game.
-* **[UI]** Added missing icons for Tornado GR4, and Tornado IDS.
-
-# 5.0.0
-
-Saves from 4.x are not compatible with 5.0.
-
-## Features/Improvements
-
-* **[Campaign]** Weather! Theaters now experience weather that is more realistic for the region and its current season. For example, Persian Gulf will have very hot, sunny summers and Marianas will experience lots of rain during fall. These changes affect pressure, temperature, clouds and precipitation. Additionally, temperature will drop during the night, by an amount that is somewhat realistic for the region.
-* **[Campaign]** Weapon data such as fallbacks and introduction years is now moddable. Due to the new architecture to support this, the old data was not automatically migrated.
-* **[Campaign]** Era-restricted loadouts will now skip LGBs when no TGP is available in the loadout. This only applies to default loadouts; buddy-lasing can be coordinated with custom loadouts.
-* **[Campaign]** FOBs control point can have FARP/helipad slot and host helicopters. To enable this feature on a FOB, add "Invisible FARP" statics objects near the FOB location in the campaign definition file.
-* **[Campaign]** Squadrons now have a home base and will not operate out of other bases. See https://github.com/dcs-liberation/dcs_liberation/issues/1145 for status.
-* **[Campaign]** Aircraft now belong to squadrons rather than bases to support squadron location transfers.
-* **[Campaign]** Skipped turns are no longer counted as defeats on front lines.
-* **[Campaign AI]** Overhauled campaign AI target prioritization.
-* **[Campaign AI]** Player front line stances can now be automated. Improved stance selection for AI.
-* **[Campaign AI]** Reworked layout of hold, join, split, and ingress points. Should result in much shorter flight plans in general while still maintaining safe join/split/hold points.
-* **[Campaign AI]** Auto-planning mission range limits are now specified per-aircraft. On average this means that longer range missions will now be plannable. The limit only accounts for the direct distance to the target, not the path taken.
-* **[Campaign AI]** Transport aircraft will now be bought only if necessary at control points which can produce ground units and are capable to operate transport aircraft.
-* **[Campaign AI]** Aircraft will now only be automatically purchased or assigned at appropriate bases. Naval aircraft will default to only operating from carriers, Harriers will default to LHAs and shore bases, helicopters will operate from anywhere. This can be customized per-squadron.
-* **[Engine]** Support for DCS 2.7.7.14727 and newer, including support for F-16 CBU-105s, SA-5s, and the Forrestal.
-* **[Kneeboard]** Minimum required fuel estimates have been added to the kneeboard for aircraft with supporting data (currently only the Hornet and Viper).
-* **[Kneeboard]** QNH (pressure MSL) and temperature have been added to the kneeboard.
-* **[Mission Generation]** EWRs are now also headed towards the center of the conflict
-* **[Mission Generation]** FACs can now use FC3 compatible laser codes. Note that this setting is global, not per FAC.
-* **[Modding]** Can now install custom campaigns to <DCS saved games>/Liberation/Campaigns instead of the Liberation install directory.
-* **[Modding]** Campaigns can now define a default start date.
-* **[Modding]** Campaigns now specify the squadrons that are present in the campaign, their roles, and their starting bases. Players can customize this at game start but the campaign will choose the defaults.
-* **[New Game Wizard]** Can now customize the player's air wing before campaign start to disable, relocate, or rename squadrons.
-* **[Plugins]** Updated SkynetIADS to 2.4.0 (adds SA-5 support).
-* **[UI]** Sell Button for aircraft will be disabled if there are no units available to be sold or all are already assigned to a mission
-* **[UI]** Enemy aircraft inventory now viewable in the air wing menu.
-
-## Fixes
-
-* **[Campaign]** Naval control points will no longer claim ground objectives during campaign generation and prevent them from spawning.
-* **[Campaign]** Units aboard sunk cargo ships will now have their losses tracked properly.
-* **[Mission Generation]** Mission results and other files will now be opened with enforced utf-8 encoding to prevent an issue where destroyed ground units were untracked because of special characters in their names.
-* **[Mission Generation]** Fixed generation of landing waypoints so that the AI obeys them.
-* **[Mission Generation]** AI carrier aircraft with a start time of T+0 will now start at T+1s to avoid traffic jams.
-* **[Mission Generation]** Fixed cases of unused aircraft not being spawned at airfields as soon as any airport filled up.
-* **[Mission Generation]** Fixed cases with multiple client flights of the same airframe all received the same preset channels.
-* **[Mission Generation]** F-14A is now generated with stored alignment.
-* **[Mission Generation]** Su-33s set to cold or warm start on the Kuznetsov will always be generated as runway starts to avoid the AI getting stuck.
-* **[Mission Generation]** Fixed AI not receiving anti-ship tasks against carriers and LHAs.
-* **[Mods]** Fixed broken A-4 support causing no weapons to be available.
-* **[UI]** Selling of Units is now visible again in the UI dialog and shows the correct amount of sold units
-* **[UI]** Fixed bug where an incompatible campaign could be generated if no action is taken on the campaign selection screen.
-
-# 4.1.1
-
-Saves from 4.1.0 are compatible with 4.1.1.
-
-## Fixes
-
-* **[Campaign]** Fixed broken support for Mariana Islands map.
-* **[Mission Generation]** Fix SAM sites pointing towards the center of the conflict.
-* **[Flight Planning]** No longer using Su-34 for CAP missions.
-
-# 4.1.0
-
-Saves from 4.0.0 are compatible with 4.1.0.
-
-## Features/Improvements
-
-* **[Campaign]** Air defense sites now generate a fixed number of launchers per type.
-* **[Campaign]** Added support for Mariana Islands map.
-* **[Campaign AI]** Adjustments to aircraft selection priorities for most mission types.
-* **[Engine]** Support for DCS 2.7.4.9632 and newer, including the Marianas map, F-16 JSOWs, NASAMS, and Tin Shield EWR.
-* **[Flight Planning]** CAP patrol altitudes are now set per-aircraft. By default the altitude will be set based on the aircraft's maximum speed.
-* **[Flight Planning]** CAP patrol speeds are now set per-aircraft to be more suitable/sensible. By default the speed will be set based on the aircraft's maximum speed.
-* **[Mission Generation]** Improvements for better support of the Skynet Plugin and long range SAMs are now acting as EWR
-* **[Mission Generation]** SAM sites are now headed towards the center of the conflict
-* **[Mods]** Support for latest version of Gripen mod. In-progress campaigns may need to re-plan Gripen flights to pick up updated loadouts.
-* **[Plugins]** Increased time JTAC Autolase messages stay visible on the UI.
-* **[Plugins]** Updated SkynetIADS to 2.2.0 (adds NASAMS support).  
-* **[UI]** Added ability to take notes and have those notes appear as a kneeboard page.
-* **[UI]** Hovering over the weather information now dispalys the cloud base (meters and feet).
-* **[UI]** Google search link added to unit information when there is no information provided.
-* **[UI]** Control point name displayed with ground object group name on map.
-* **[UI]** Buy or Replace will now show the correct price for generated ground objects like sams.
-* **[UI]** Improved logging for frontline movement to be more descriptive about what happened and why.
-* **[UI]** Brought ruler map module into source, which should fix file integrity issues with the module.
-
-## Fixes
-
-* **[Campaign]** Fixed the Silkworm generator to include launchers and not all radars.
-* **[Data]** Fixed Introduction dates for targeting pods (ATFLIR and LITENING were both a few years too early).
-* **[Data]** Removed SA-10 from Syria 2011 faction.
-* **[Economy]** EWRs can now be bought and sold for the correct price and can no longer be used to generate money
-* **[Flight Planning]** Helicopters are now correctly identified, and will fly ingress/CAS/BAI/egress and similar at low altitude.
-* **[Flight Planning]** Fixed potential issue with angles > 360° or < 0° being generated when summing two angles.
-* **[Mission Generation]** The lua data for other plugins is now generated correctly
-* **[Mission Generation]** Fixed problem with opfor planning missions against sold ground objects like SAMs
-* **[Mission Generation]** The legacy always-available tanker option no longer prevents mission creation.
-* **[Mission Generation]** Prevent the creation of a transfer order with 0 units for a rare situtation when a point was captured.
-* **[Mission Generation]** Planned transfers which will be impossible after a base capture will no longer prevent the mission result submit.
-* **[Mission Generation]** Fix occasional KeyError preventing mission generation when all units of the same type in a convoy were killed.
-* **[Mission Generation]** Fix for AAA Flak generator using Opel Blitz preventing the mission from being generated because duplicate unit names were used.
-* **[Mission Generation]** Fixed a potential bug with laser code generation where it would generate invalid codes.  
-* **[UI]** Statistics window tick marks are now always integers.
-* **[UI]** Statistics window now shows the correct info for the turn
-* **[UI]** Toggling custom loadout for an aircraft with no preset loadouts no longer breaks the flight.
-
-# 4.0.0
-
-Saves from 3.x are not compatible with 4.0.
-
-## Features/Improvements
-
-* **[Engine]** Support for DCS 2.7.2.7910.1 and newer, including Cyprus, F-16 JDAMs, and the Hind.
-* **[Campaign]** Squadrons now (optionally, off by default) have a maximum size and killed pilots replenish at a limited rate.
-* **[Campaign]** Added an option to disable levelling up of AI pilots.
-* **[Campaign]** Added Russian Intervention 2015 campaign on Syria, for a small and somewhat realistic Russian COIN scenario.
-* **[Campaign]** Added Operation Atilla campaign on Syria, for a reasonably large invasion of Cyprus scenario.
-* **[Campaign AI]** AI will plan Tanker flights.
-* **[Campaign AI]** Removed max distance for AEW&C auto planning.
-* **[Economy]** Adjusted prices for aircraft to balance out some price inconsistencies.
-* **[Factions]** Added more tankers to factions.
-* **[Flight Planner]** Added ability to plan Tankers.
-* **[Modding]** Campaign format version is now 7.0 to account for DCS map changes that made scenery strike targets incompatible with existing campaigns.
-* **[Mods]** Added support for the Gripen mod.
-* **[Mods]** Removes MB-339PAN support, as the mod is now deprecated and no longer works with DCS 2.7+.
-* **[Mission Generation]** Added support for "Neutral Dot" label options.
-* **[New Game Wizard]** Mods are now selected via checkboxes in the new game wizard, not as separate factions.
-* **[UI]** Ctrl click and shift click now buy or sell 5 or 10 units respectively.
-* **[UI]** Multiple waypoints can now be deleted simultaneously if multiple waypoints are selected.
-* **[UI]** Carriers and LHAs now match the colour of airfields, and their destination icons are translucent.
-* **[UI]** Updated intel box text for first turn.
-* **[UI]** Base Capture Cheat is now usable at all bases and can also be used to transfer player-owned bases to OPFOR.
-* **[UI]** Pass Turn button is relabled as "Begin Campaign" on Turn 0.  
-* **[UI]** Added a ruler to the map.
-* **[UI]** Liberation now saves games to `<DCS user directory>/Liberation/Saves` by default to declutter the main directory.
-
-## Fixes
-
-* **[Campaign AI]** Fix procurement for factions that lack some unit types.
-* **[Campaign AI]** Fix auto purchase of aircraft for factions that have no transport aircraft.
-* **[Campaign AI]** Fix refunding of pending aircraft purchases when a side has no factory available.  
-* **[Mission Generation]** Fixed problem with mission load when control point name contained an apostrophe.
-* **[Mission Generation]** Fixed EWR group names so they contribute to Skynet again.
-* **[Mission Generation]** Fixed duplicate name error when generating convoys and cargo ships when creating manual transfers after loading a game.
-* **[Mission Generation]** Fixed empty convoys not being disbanded when all units are killed/removed.
-* **[Mission Generation]** Fixed player losing frontline progress when skipping from turn 0 to turn 1.
-* **[Mission Generation]** Fixed issue where frontline would only search to the right for valid locations.
-* **[UI]** Made non-interactive map elements less obstructive.
-* **[UI]** Added support for Neutral Dot difficulty label
-* **[UI]** Clear skies at night no longer described as "Sunny" by the weather widget.
-* **[UI]** Removed ability to buy (useless) ground units at carriers and LHAs.
-* **[UI]** Fixed enable/disable of buy/sell buttons.
-* **[UI]** EWRs now appear in the custom waypoint list.
-
-# 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.

doc/fuel-consumption-measurement.md

@@ -1,80 +0,0 @@
-# Measuring estimated fuel consumption
-
-To estimate fuel consumption numbers for an aircraft, create a mission with a
-typical heavy load for the aircraft. For example, to measure for the F/A-18C, a
-loadout with two bags, two GBU-31s, two sidewinders, an AMRAAM, and an ATFLIR.
-Do **not** drop bags or weapons during the test flight.
-
-Start the aircraft on the ground at a large airport (for example, Akrotiri) at a
-parking space at the opposite end of the takeoff runway so you can estimate long
-taxi fuel consumption.
-
-When you enter the jet, note the amount of fuel below, then taxi to the far end
-of the runway. Hold short and note the remaining fuel below.
-
-Follow a typical takeoff pattern for the aircraft. For the F/A-18C, this might
-be AB takeoff, reduce to MIL at 350KIAS, and maintian 350KIAS/0.85 mach until
-cruise altitude (angles 25).
-
-Once you reach angels 25, pause the game. Note your remaining fuel below and
-measure the distance traveled from takeoff. Mark your location on the map.
-
-Level out and increase to cruise speed if needed. Liberation assumes 0.85 mach
-for supersonic aircraft, for subsonic aircraft it depends so pick something
-reasonable and note your descision in a comment in the file when done. Maintain
-speed, heading, and altitude for a long distance (the longer the distance, the
-more accurate the result, but be careful to leave enough fuel for the final
-section). Once complete, note the distance traveled and the remaining fuel.
-
-Finally, increase speed as you would for an attack. At least MIL power,
-potentially use AB sparingly, etc. The goal is to measure fuel consumption per
-mile traveled during an attack run.
-
-```
-start:
-taxi end:
-to 25k distance:
-at 25k fuel:
-cruise (.85 mach) distance:
-cruise (.85 mach) end fuel:
-combat distance:
-combat end fuel:
-```
-
-Finally, fill out the data in the aircraft data. Below is an example for the
-F/A-18C:
-
-```
-start: 15290
-taxi end: 15120
-climb distance: 40NM
-at 25k fuel: 13350
-cruise (.85 mach) distance: 100NM
-cruise (.85 mach) end fuel: 11140
-combat distance: 100NM
-combat end fuel: 8390
-
-taxi = start - taxi end = 15290 - 15120 = 170
-climb fuel = taxi end - at 25k fuel = 15120 - 13350 = 1770
-climb ppm = climb fuel / climb distance =  1770 / 40 = 44.25
-cruise fuel = at 25k fuel - cruise end fuel = 13350 - 11140 = 2210
-cruise ppm = cruise fuel / cruise distance = 2210 / 100 = 22.1
-combat fuel = cruise end fuel - combat end fuel = 11140 - 8390 = 2750
-combat ppm = combat fuel / combat distance = 2750 / 100 = 27.5
-```
-
-```yaml
-fuel:
-  # Parking A1 to RWY 32 at Akrotiri.
-  taxi: 170
-  # AB takeoff to 350/0.85, reduce to MIL and maintain 350 to 25k ft.
-  climb_ppm: 44.25
-  # 0.85 mach for 100NM.
-  cruise_ppm: 22.1
-  # ~0.9 mach for 100NM. Occasional AB use.
-  combat_ppm: 27.5
-  min_safe: 2000
-```
-
-The last entry (`min_safe`) is the minimum amount of fuel that the aircraft
-should land with.

game/campaignloader/__init__.py

@@ -1,2 +0,0 @@
-from .campaign import Campaign
-from .campaignairwingconfig import CampaignAirWingConfig, SquadronConfig

game/campaignloader/campaign.py

@@ -1,183 +0,0 @@
-from __future__ import annotations
-
-import datetime
-import json
-import logging
-from collections import Iterator
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Optional, Tuple, Dict, Any
-
-from packaging.version import Version
-import yaml
-
-from game.profiling import logged_duration
-from game.theater import (
-    ConflictTheater,
-    CaucasusTheater,
-    NevadaTheater,
-    PersianGulfTheater,
-    NormandyTheater,
-    TheChannelTheater,
-    SyriaTheater,
-    MarianaIslandsTheater,
-)
-from game.version import CAMPAIGN_FORMAT_VERSION
-from .campaignairwingconfig import CampaignAirWingConfig
-from .mizcampaignloader import MizCampaignLoader
-from .. import persistency
-
-PERF_FRIENDLY = 0
-PERF_MEDIUM = 1
-PERF_HARD = 2
-PERF_NASA = 3
-
-
-@dataclass(frozen=True)
-class Campaign:
-    name: str
-    icon_name: str
-    authors: str
-    description: str
-
-    #: The revision of the campaign format the campaign was built for. We do not attempt
-    #: to migrate old campaigns, but this is used to show a warning in the UI when
-    #: selecting a campaign that is not up to date.
-    version: Tuple[int, int]
-
-    recommended_player_faction: str
-    recommended_enemy_faction: str
-    recommended_start_date: Optional[datetime.date]
-    performance: int
-    data: Dict[str, Any]
-    path: Path
-
-    @classmethod
-    def from_file(cls, path: Path) -> Campaign:
-        with path.open() as campaign_file:
-            if path.suffix == ".yaml":
-                data = yaml.safe_load(campaign_file)
-            else:
-                data = json.load(campaign_file)
-
-        sanitized_theater = data["theater"].replace(" ", "")
-        version_field = data.get("version", "0")
-        try:
-            version = Version(version_field)
-        except TypeError:
-            logging.warning(
-                f"Non-string campaign version in {path}. Parse may be incorrect."
-            )
-            version = Version(str(version_field))
-
-        start_date_raw = data.get("recommended_start_date")
-
-        # YAML automatically parses dates, but while we still support JSON campaigns we
-        # need to be able to handle parsing dates from strings ourselves as well.
-        start_date: Optional[datetime.date]
-        if isinstance(start_date_raw, str):
-            start_date = datetime.date.fromisoformat(start_date_raw)
-        elif isinstance(start_date_raw, datetime.date):
-            start_date = start_date_raw
-        elif start_date_raw is None:
-            start_date = None
-        else:
-            raise RuntimeError(
-                f"Invalid value for recommended_start_date in {path}: {start_date_raw}"
-            )
-
-        return cls(
-            data["name"],
-            f"Terrain_{sanitized_theater}",
-            data.get("authors", "???"),
-            data.get("description", ""),
-            (version.major, version.minor),
-            data.get("recommended_player_faction", "USA 2005"),
-            data.get("recommended_enemy_faction", "Russia 1990"),
-            start_date,
-            data.get("performance", 0),
-            data,
-            path,
-        )
-
-    def load_theater(self) -> ConflictTheater:
-        theaters = {
-            "Caucasus": CaucasusTheater,
-            "Nevada": NevadaTheater,
-            "Persian Gulf": PersianGulfTheater,
-            "Normandy": NormandyTheater,
-            "The Channel": TheChannelTheater,
-            "Syria": SyriaTheater,
-            "MarianaIslands": MarianaIslandsTheater,
-        }
-        theater = theaters[self.data["theater"]]
-        t = theater()
-
-        try:
-            miz = self.data["miz"]
-        except KeyError as ex:
-            raise RuntimeError(
-                "Old format (non-miz) campaigns are no longer supported."
-            ) from ex
-
-        with logged_duration("Importing miz data"):
-            MizCampaignLoader(self.path.parent / miz, t).populate_theater()
-        return t
-
-    def load_air_wing_config(self, theater: ConflictTheater) -> CampaignAirWingConfig:
-        try:
-            squadron_data = self.data["squadrons"]
-        except KeyError:
-            logging.warning(f"Campaign {self.name} does not define any squadrons")
-            return CampaignAirWingConfig({})
-        return CampaignAirWingConfig.from_campaign_data(squadron_data, theater)
-
-    @property
-    def is_out_of_date(self) -> bool:
-        """Returns True if this campaign is not up to date with the latest format.
-
-        This is more permissive than is_from_future, which is sensitive to minor version
-        bumps (the old game definitely doesn't support the minor features added in the
-        new version, and the campaign may require them. However, the minor version only
-        indicates *optional* new features, so we do not need to mark out of date
-        campaigns as incompatible if they are within the same major version.
-        """
-        return self.version[0] < CAMPAIGN_FORMAT_VERSION[0]
-
-    @property
-    def is_from_future(self) -> bool:
-        """Returns True if this campaign is newer than the supported format."""
-        return self.version > CAMPAIGN_FORMAT_VERSION
-
-    @property
-    def is_compatible(self) -> bool:
-        """Returns True is this campaign was built for this version of the game."""
-        if self.version == (0, 0):
-            return False
-        if self.is_out_of_date:
-            return False
-        if self.is_from_future:
-            return False
-        return True
-
-    @staticmethod
-    def iter_campaigns_in_dir(path: Path) -> Iterator[Path]:
-        yield from path.glob("*.yaml")
-        yield from path.glob("*.json")
-
-    @classmethod
-    def iter_campaign_defs(cls) -> Iterator[Path]:
-        yield from cls.iter_campaigns_in_dir(
-            Path(persistency.base_path()) / "Liberation/Campaigns"
-        )
-        yield from cls.iter_campaigns_in_dir(Path("resources/campaigns"))
-
-    @classmethod
-    def load_each(cls) -> Iterator[Campaign]:
-        for path in cls.iter_campaign_defs():
-            try:
-                logging.debug(f"Loading campaign from {path}...")
-                campaign = Campaign.from_file(path)
-                yield campaign
-            except RuntimeError:
-                logging.exception(f"Unable to load campaign from {path}")

game/campaignloader/campaignairwingconfig.py

@@ -1,68 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections import defaultdict
-from dataclasses import dataclass
-from typing import Any, TYPE_CHECKING, Union
-
-from gen.flights.flight import FlightType
-from game.theater.controlpoint import ControlPoint
-
-if TYPE_CHECKING:
-    from game.theater import ConflictTheater
-
-
-@dataclass(frozen=True)
-class SquadronConfig:
-    primary: FlightType
-    secondary: list[FlightType]
-    aircraft: list[str]
-
-    @property
-    def auto_assignable(self) -> set[FlightType]:
-        return set(self.secondary) | {self.primary}
-
-    @classmethod
-    def from_data(cls, data: dict[str, Any]) -> SquadronConfig:
-        secondary_raw = data.get("secondary")
-        if secondary_raw is None:
-            secondary = []
-        elif isinstance(secondary_raw, str):
-            secondary = cls.expand_secondary_alias(secondary_raw)
-        else:
-            secondary = [FlightType(s) for s in secondary_raw]
-
-        return SquadronConfig(
-            FlightType(data["primary"]), secondary, data.get("aircraft", [])
-        )
-
-    @staticmethod
-    def expand_secondary_alias(alias: str) -> list[FlightType]:
-        if alias == "any":
-            return list(FlightType)
-        elif alias == "air-to-air":
-            return [t for t in FlightType if t.is_air_to_air]
-        elif alias == "air-to-ground":
-            return [t for t in FlightType if t.is_air_to_ground]
-        raise KeyError(f"Unknown secondary mission type: {alias}")
-
-
-@dataclass(frozen=True)
-class CampaignAirWingConfig:
-    by_location: dict[ControlPoint, list[SquadronConfig]]
-
-    @classmethod
-    def from_campaign_data(
-        cls, data: dict[Union[str, int], Any], theater: ConflictTheater
-    ) -> CampaignAirWingConfig:
-        by_location: dict[ControlPoint, list[SquadronConfig]] = defaultdict(list)
-        for base_id, squadron_configs in data.items():
-            if isinstance(base_id, int):
-                base = theater.find_control_point_by_id(base_id)
-            else:
-                base = theater.control_point_named(base_id)
-
-            for squadron_data in squadron_configs:
-                by_location[base].append(SquadronConfig.from_data(squadron_data))
-
-        return CampaignAirWingConfig(by_location)

game/campaignloader/defaultsquadronassigner.py

@@ -1,144 +0,0 @@
-from __future__ import annotations
-
-import logging
-from typing import Optional, TYPE_CHECKING
-
-from game.squadrons import Squadron
-from game.squadrons.squadrondef import SquadronDef
-from gen.flights.flight import FlightType
-from .campaignairwingconfig import CampaignAirWingConfig, SquadronConfig
-from ..dcs.aircrafttype import AircraftType
-from ..theater import ControlPoint
-
-if TYPE_CHECKING:
-    from game import Game
-    from game.coalition import Coalition
-
-
-class DefaultSquadronAssigner:
-    def __init__(
-        self, config: CampaignAirWingConfig, game: Game, coalition: Coalition
-    ) -> None:
-        self.config = config
-        self.game = game
-        self.coalition = coalition
-        self.air_wing = coalition.air_wing
-
-    def assign(self) -> None:
-        for control_point in self.game.theater.control_points_for(
-            self.coalition.player
-        ):
-            for squadron_config in self.config.by_location[control_point]:
-                squadron_def = self.find_squadron_for(squadron_config, control_point)
-                if squadron_def is None:
-                    logging.info(
-                        f"{self.coalition.faction.name} has no aircraft compatible "
-                        f"with {squadron_config.primary} at {control_point}"
-                    )
-                    continue
-
-                squadron = Squadron.create_from(
-                    squadron_def, control_point, self.coalition, self.game
-                )
-                squadron.set_auto_assignable_mission_types(
-                    squadron_config.auto_assignable
-                )
-                self.air_wing.add_squadron(squadron)
-
-    def find_squadron_for(
-        self, config: SquadronConfig, control_point: ControlPoint
-    ) -> Optional[SquadronDef]:
-        for preferred_aircraft in config.aircraft:
-            squadron_def = self.find_preferred_squadron(
-                preferred_aircraft, config.primary, control_point
-            )
-            if squadron_def is not None:
-                return squadron_def
-
-        # If we didn't find any of the preferred types we should use any squadron
-        # compatible with the primary task.
-        squadron_def = self.find_squadron_for_task(config.primary, control_point)
-        if squadron_def is not None:
-            return squadron_def
-
-        # If we can't find any squadron matching the requirement, we should
-        # create one.
-        return self.air_wing.squadron_def_generator.generate_for_task(
-            config.primary, control_point
-        )
-
-    def find_preferred_squadron(
-        self, preferred_aircraft: str, task: FlightType, control_point: ControlPoint
-    ) -> Optional[SquadronDef]:
-        # Attempt to find a squadron with the name in the request.
-        squadron_def = self.find_squadron_by_name(
-            preferred_aircraft, task, control_point
-        )
-        if squadron_def is not None:
-            return squadron_def
-
-        # If the name didn't match a squadron available to this coalition, try to find
-        # an aircraft with the matching name that meets the requirements.
-        try:
-            aircraft = AircraftType.named(preferred_aircraft)
-        except KeyError:
-            # No aircraft with this name.
-            return None
-
-        if aircraft not in self.coalition.faction.aircrafts:
-            return None
-
-        squadron_def = self.find_squadron_for_airframe(aircraft, task, control_point)
-        if squadron_def is not None:
-            return squadron_def
-
-        # No premade squadron available for this aircraft that meets the requirements,
-        # so generate one if possible.
-        return self.air_wing.squadron_def_generator.generate_for_aircraft(aircraft)
-
-    @staticmethod
-    def squadron_compatible_with(
-        squadron: SquadronDef,
-        task: FlightType,
-        control_point: ControlPoint,
-        ignore_base_preference: bool = False,
-    ) -> bool:
-        if ignore_base_preference:
-            return control_point.can_operate(squadron.aircraft)
-        return squadron.operates_from(control_point) and task in squadron.mission_types
-
-    def find_squadron_for_airframe(
-        self, aircraft: AircraftType, task: FlightType, control_point: ControlPoint
-    ) -> Optional[SquadronDef]:
-        for squadron in self.air_wing.squadron_defs[aircraft]:
-            if not squadron.claimed and self.squadron_compatible_with(
-                squadron, task, control_point
-            ):
-                return squadron
-        return None
-
-    def find_squadron_by_name(
-        self, name: str, task: FlightType, control_point: ControlPoint
-    ) -> Optional[SquadronDef]:
-        for squadrons in self.air_wing.squadron_defs.values():
-            for squadron in squadrons:
-                if (
-                    not squadron.claimed
-                    and squadron.name == name
-                    and self.squadron_compatible_with(
-                        squadron, task, control_point, ignore_base_preference=True
-                    )
-                ):
-                    return squadron
-        return None
-
-    def find_squadron_for_task(
-        self, task: FlightType, control_point: ControlPoint
-    ) -> Optional[SquadronDef]:
-        for squadrons in self.air_wing.squadron_defs.values():
-            for squadron in squadrons:
-                if not squadron.claimed and self.squadron_compatible_with(
-                    squadron, task, control_point
-                ):
-                    return squadron
-        return None

game/campaignloader/mizcampaignloader.py

@@ -1,473 +0,0 @@
-from __future__ import annotations
-
-import itertools
-from functools import cached_property
-from pathlib import Path
-from typing import Iterator, List, Dict, Tuple, TYPE_CHECKING
-
-from dcs import Mission
-from dcs.countries import CombinedJointTaskForcesBlue, CombinedJointTaskForcesRed
-from dcs.country import Country
-from dcs.planes import F_15C
-from dcs.ships import Stennis, LHA_Tarawa, HandyWind, USS_Arleigh_Burke_IIa
-from dcs.statics import Fortification, Warehouse
-from dcs.terrain import Airport
-from dcs.unitgroup import PlaneGroup, ShipGroup, VehicleGroup, StaticGroup
-from dcs.vehicles import Armor, Unarmed, MissilesSS, AirDefence
-
-from game.point_with_heading import PointWithHeading
-from game.positioned import Positioned
-from game.profiling import logged_duration
-from game.scenery_group import SceneryGroup
-from game.utils import Distance, meters, Heading
-from game.theater.controlpoint import (
-    Airfield,
-    Carrier,
-    ControlPoint,
-    Fob,
-    Lha,
-    OffMapSpawn,
-)
-
-if TYPE_CHECKING:
-    from game.theater.conflicttheater import ConflictTheater
-
-
-class MizCampaignLoader:
-    BLUE_COUNTRY = CombinedJointTaskForcesBlue()
-    RED_COUNTRY = CombinedJointTaskForcesRed()
-
-    OFF_MAP_UNIT_TYPE = F_15C.id
-
-    CV_UNIT_TYPE = Stennis.id
-    LHA_UNIT_TYPE = LHA_Tarawa.id
-    FRONT_LINE_UNIT_TYPE = Armor.M_113.id
-    SHIPPING_LANE_UNIT_TYPE = HandyWind.id
-
-    FOB_UNIT_TYPE = Unarmed.SKP_11.id
-    FARP_HELIPADS_TYPE = ["Invisible FARP", "SINGLE_HELIPAD"]
-
-    OFFSHORE_STRIKE_TARGET_UNIT_TYPE = Fortification.Oil_platform.id
-    SHIP_UNIT_TYPE = USS_Arleigh_Burke_IIa.id
-    MISSILE_SITE_UNIT_TYPE = MissilesSS.Scud_B.id
-    COASTAL_DEFENSE_UNIT_TYPE = MissilesSS.Hy_launcher.id
-
-    # Multiple options for air defenses so campaign designers can more accurately see
-    # the coverage of their IADS for the expected type.
-    LONG_RANGE_SAM_UNIT_TYPES = {
-        AirDefence.Patriot_ln.id,
-        AirDefence.S_300PS_5P85C_ln.id,
-        AirDefence.S_300PS_5P85D_ln.id,
-    }
-
-    MEDIUM_RANGE_SAM_UNIT_TYPES = {
-        AirDefence.Hawk_ln.id,
-        AirDefence.S_75M_Volhov.id,
-        AirDefence._5p73_s_125_ln.id,
-    }
-
-    SHORT_RANGE_SAM_UNIT_TYPES = {
-        AirDefence.M1097_Avenger.id,
-        AirDefence.Rapier_fsa_launcher.id,
-        AirDefence._2S6_Tunguska.id,
-        AirDefence.Strela_1_9P31.id,
-    }
-
-    AAA_UNIT_TYPES = {
-        AirDefence.Flak18.id,
-        AirDefence.Vulcan.id,
-        AirDefence.ZSU_23_4_Shilka.id,
-    }
-
-    EWR_UNIT_TYPE = AirDefence._1L13_EWR.id
-
-    ARMOR_GROUP_UNIT_TYPE = Armor.M_1_Abrams.id
-
-    FACTORY_UNIT_TYPE = Fortification.Workshop_A.id
-
-    AMMUNITION_DEPOT_UNIT_TYPE = Warehouse._Ammunition_depot.id
-
-    STRIKE_TARGET_UNIT_TYPE = Fortification.Tech_combine.id
-
-    def __init__(self, miz: Path, theater: ConflictTheater) -> None:
-        self.theater = theater
-        self.mission = Mission()
-        with logged_duration("Loading miz"):
-            self.mission.load_file(str(miz))
-        self.control_point_id = itertools.count(1000)
-
-        # If there are no red carriers there usually aren't red units. Make sure
-        # both countries are initialized so we don't have to deal with None.
-        if self.mission.country(self.BLUE_COUNTRY.name) is None:
-            self.mission.coalition["blue"].add_country(self.BLUE_COUNTRY)
-        if self.mission.country(self.RED_COUNTRY.name) is None:
-            self.mission.coalition["red"].add_country(self.RED_COUNTRY)
-
-    @staticmethod
-    def control_point_from_airport(airport: Airport) -> ControlPoint:
-        cp = Airfield(airport, starts_blue=airport.is_blue())
-
-        # Use the unlimited aircraft option to determine if an airfield should
-        # be owned by the player when the campaign is "inverted".
-        cp.captured_invert = airport.unlimited_aircrafts
-
-        return cp
-
-    def country(self, blue: bool) -> Country:
-        country = self.mission.country(
-            self.BLUE_COUNTRY.name if blue else self.RED_COUNTRY.name
-        )
-        # Should be guaranteed because we initialized them.
-        assert country
-        return country
-
-    @property
-    def blue(self) -> Country:
-        return self.country(blue=True)
-
-    @property
-    def red(self) -> Country:
-        return self.country(blue=False)
-
-    def off_map_spawns(self, blue: bool) -> Iterator[PlaneGroup]:
-        for group in self.country(blue).plane_group:
-            if group.units[0].type == self.OFF_MAP_UNIT_TYPE:
-                yield group
-
-    def carriers(self, blue: bool) -> Iterator[ShipGroup]:
-        for group in self.country(blue).ship_group:
-            if group.units[0].type == self.CV_UNIT_TYPE:
-                yield group
-
-    def lhas(self, blue: bool) -> Iterator[ShipGroup]:
-        for group in self.country(blue).ship_group:
-            if group.units[0].type == self.LHA_UNIT_TYPE:
-                yield group
-
-    def fobs(self, blue: bool) -> Iterator[VehicleGroup]:
-        for group in self.country(blue).vehicle_group:
-            if group.units[0].type == self.FOB_UNIT_TYPE:
-                yield group
-
-    @property
-    def ships(self) -> Iterator[ShipGroup]:
-        for group in self.red.ship_group:
-            if group.units[0].type == self.SHIP_UNIT_TYPE:
-                yield group
-
-    @property
-    def offshore_strike_targets(self) -> Iterator[StaticGroup]:
-        for group in self.red.static_group:
-            if group.units[0].type == self.OFFSHORE_STRIKE_TARGET_UNIT_TYPE:
-                yield group
-
-    @property
-    def missile_sites(self) -> Iterator[VehicleGroup]:
-        for group in self.red.vehicle_group:
-            if group.units[0].type == self.MISSILE_SITE_UNIT_TYPE:
-                yield group
-
-    @property
-    def coastal_defenses(self) -> Iterator[VehicleGroup]:
-        for group in self.red.vehicle_group:
-            if group.units[0].type == self.COASTAL_DEFENSE_UNIT_TYPE:
-                yield group
-
-    @property
-    def long_range_sams(self) -> Iterator[VehicleGroup]:
-        for group in self.red.vehicle_group:
-            if group.units[0].type in self.LONG_RANGE_SAM_UNIT_TYPES:
-                yield group
-
-    @property
-    def medium_range_sams(self) -> Iterator[VehicleGroup]:
-        for group in self.red.vehicle_group:
-            if group.units[0].type in self.MEDIUM_RANGE_SAM_UNIT_TYPES:
-                yield group
-
-    @property
-    def short_range_sams(self) -> Iterator[VehicleGroup]:
-        for group in self.red.vehicle_group:
-            if group.units[0].type in self.SHORT_RANGE_SAM_UNIT_TYPES:
-                yield group
-
-    @property
-    def aaa(self) -> Iterator[VehicleGroup]:
-        for group in itertools.chain(self.blue.vehicle_group, self.red.vehicle_group):
-            if group.units[0].type in self.AAA_UNIT_TYPES:
-                yield group
-
-    @property
-    def ewrs(self) -> Iterator[VehicleGroup]:
-        for group in self.red.vehicle_group:
-            if group.units[0].type in self.EWR_UNIT_TYPE:
-                yield group
-
-    @property
-    def armor_groups(self) -> Iterator[VehicleGroup]:
-        for group in itertools.chain(self.blue.vehicle_group, self.red.vehicle_group):
-            if group.units[0].type in self.ARMOR_GROUP_UNIT_TYPE:
-                yield group
-
-    @property
-    def helipads(self) -> Iterator[StaticGroup]:
-        for group in itertools.chain(self.blue.static_group, self.red.static_group):
-            if group.units[0].type in self.FARP_HELIPADS_TYPE:
-                yield group
-
-    @property
-    def factories(self) -> Iterator[StaticGroup]:
-        for group in self.blue.static_group:
-            if group.units[0].type in self.FACTORY_UNIT_TYPE:
-                yield group
-
-    @property
-    def ammunition_depots(self) -> Iterator[StaticGroup]:
-        for group in itertools.chain(self.blue.static_group, self.red.static_group):
-            if group.units[0].type in self.AMMUNITION_DEPOT_UNIT_TYPE:
-                yield group
-
-    @property
-    def strike_targets(self) -> Iterator[StaticGroup]:
-        for group in itertools.chain(self.blue.static_group, self.red.static_group):
-            if group.units[0].type in self.STRIKE_TARGET_UNIT_TYPE:
-                yield group
-
-    @property
-    def scenery(self) -> List[SceneryGroup]:
-        return SceneryGroup.from_trigger_zones(self.mission.triggers._zones)
-
-    @cached_property
-    def control_points(self) -> Dict[int, ControlPoint]:
-        control_points = {}
-        for airport in self.mission.terrain.airport_list():
-            if airport.is_blue() or airport.is_red():
-                control_point = self.control_point_from_airport(airport)
-                control_points[control_point.id] = control_point
-
-        for blue in (False, True):
-            for group in self.off_map_spawns(blue):
-                control_point = OffMapSpawn(
-                    next(self.control_point_id),
-                    str(group.name),
-                    group.position,
-                    starts_blue=blue,
-                )
-                control_point.captured_invert = group.late_activation
-                control_points[control_point.id] = control_point
-            for ship in self.carriers(blue):
-                control_point = Carrier(
-                    ship.name,
-                    ship.position,
-                    next(self.control_point_id),
-                    starts_blue=blue,
-                )
-                control_point.captured_invert = ship.late_activation
-                control_points[control_point.id] = control_point
-            for ship in self.lhas(blue):
-                control_point = Lha(
-                    ship.name,
-                    ship.position,
-                    next(self.control_point_id),
-                    starts_blue=blue,
-                )
-                control_point.captured_invert = ship.late_activation
-                control_points[control_point.id] = control_point
-            for fob in self.fobs(blue):
-                control_point = Fob(
-                    str(fob.name),
-                    fob.position,
-                    next(self.control_point_id),
-                    starts_blue=blue,
-                )
-                control_point.captured_invert = fob.late_activation
-                control_points[control_point.id] = control_point
-
-        return control_points
-
-    @property
-    def front_line_path_groups(self) -> Iterator[VehicleGroup]:
-        for group in self.country(blue=True).vehicle_group:
-            if group.units[0].type == self.FRONT_LINE_UNIT_TYPE:
-                yield group
-
-    @property
-    def shipping_lane_groups(self) -> Iterator[ShipGroup]:
-        for group in self.country(blue=True).ship_group:
-            if group.units[0].type == self.SHIPPING_LANE_UNIT_TYPE:
-                yield group
-
-    def add_supply_routes(self) -> None:
-        for group in self.front_line_path_groups:
-            # The unit will have its first waypoint at the source CP and the final
-            # waypoint at the destination CP. Each waypoint defines the path of the
-            # cargo ship.
-            waypoints = [p.position for p in group.points]
-            origin = self.theater.closest_control_point(waypoints[0])
-            if origin is None:
-                raise RuntimeError(
-                    f"No control point near the first waypoint of {group.name}"
-                )
-            destination = self.theater.closest_control_point(waypoints[-1])
-            if destination is None:
-                raise RuntimeError(
-                    f"No control point near the final waypoint of {group.name}"
-                )
-
-            self.control_points[origin.id].create_convoy_route(destination, waypoints)
-            self.control_points[destination.id].create_convoy_route(
-                origin, list(reversed(waypoints))
-            )
-
-    def add_shipping_lanes(self) -> None:
-        for group in self.shipping_lane_groups:
-            # The unit will have its first waypoint at the source CP and the final
-            # waypoint at the destination CP. Each waypoint defines the path of the
-            # cargo ship.
-            waypoints = [p.position for p in group.points]
-            origin = self.theater.closest_control_point(waypoints[0])
-            if origin is None:
-                raise RuntimeError(
-                    f"No control point near the first waypoint of {group.name}"
-                )
-            destination = self.theater.closest_control_point(waypoints[-1])
-            if destination is None:
-                raise RuntimeError(
-                    f"No control point near the final waypoint of {group.name}"
-                )
-
-            self.control_points[origin.id].create_shipping_lane(destination, waypoints)
-            self.control_points[destination.id].create_shipping_lane(
-                origin, list(reversed(waypoints))
-            )
-
-    def objective_info(
-        self, near: Positioned, allow_naval: bool = False
-    ) -> Tuple[ControlPoint, Distance]:
-        closest = self.theater.closest_control_point(near.position, allow_naval)
-        distance = meters(closest.position.distance_to_point(near.position))
-        return closest, distance
-
-    def add_preset_locations(self) -> None:
-        for static in self.offshore_strike_targets:
-            closest, distance = self.objective_info(static)
-            closest.preset_locations.offshore_strike_locations.append(
-                PointWithHeading.from_point(
-                    static.position, Heading.from_degrees(static.units[0].heading)
-                )
-            )
-
-        for ship in self.ships:
-            closest, distance = self.objective_info(ship, allow_naval=True)
-            closest.preset_locations.ships.append(
-                PointWithHeading.from_point(
-                    ship.position, Heading.from_degrees(ship.units[0].heading)
-                )
-            )
-
-        for group in self.missile_sites:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.missile_sites.append(
-                PointWithHeading.from_point(
-                    group.position, Heading.from_degrees(group.units[0].heading)
-                )
-            )
-
-        for group in self.coastal_defenses:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.coastal_defenses.append(
-                PointWithHeading.from_point(
-                    group.position, Heading.from_degrees(group.units[0].heading)
-                )
-            )
-
-        for group in self.long_range_sams:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.long_range_sams.append(
-                PointWithHeading.from_point(
-                    group.position, Heading.from_degrees(group.units[0].heading)
-                )
-            )
-
-        for group in self.medium_range_sams:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.medium_range_sams.append(
-                PointWithHeading.from_point(
-                    group.position, Heading.from_degrees(group.units[0].heading)
-                )
-            )
-
-        for group in self.short_range_sams:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.short_range_sams.append(
-                PointWithHeading.from_point(
-                    group.position, Heading.from_degrees(group.units[0].heading)
-                )
-            )
-
-        for group in self.aaa:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.aaa.append(
-                PointWithHeading.from_point(
-                    group.position, Heading.from_degrees(group.units[0].heading)
-                )
-            )
-
-        for group in self.ewrs:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.ewrs.append(
-                PointWithHeading.from_point(
-                    group.position, Heading.from_degrees(group.units[0].heading)
-                )
-            )
-
-        for group in self.armor_groups:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.armor_groups.append(
-                PointWithHeading.from_point(
-                    group.position, Heading.from_degrees(group.units[0].heading)
-                )
-            )
-
-        for static in self.helipads:
-            closest, distance = self.objective_info(static)
-            closest.helipads.append(
-                PointWithHeading.from_point(
-                    static.position, Heading.from_degrees(static.units[0].heading)
-                )
-            )
-
-        for static in self.factories:
-            closest, distance = self.objective_info(static)
-            closest.preset_locations.factories.append(
-                PointWithHeading.from_point(
-                    static.position, Heading.from_degrees(static.units[0].heading)
-                )
-            )
-
-        for static in self.ammunition_depots:
-            closest, distance = self.objective_info(static)
-            closest.preset_locations.ammunition_depots.append(
-                PointWithHeading.from_point(
-                    static.position, Heading.from_degrees(static.units[0].heading)
-                )
-            )
-
-        for static in self.strike_targets:
-            closest, distance = self.objective_info(static)
-            closest.preset_locations.strike_locations.append(
-                PointWithHeading.from_point(
-                    static.position, Heading.from_degrees(static.units[0].heading)
-                )
-            )
-
-        for scenery_group in self.scenery:
-            closest, distance = self.objective_info(scenery_group)
-            closest.preset_locations.scenery.append(scenery_group)
-
-    def populate_theater(self) -> None:
-        for control_point in self.control_points.values():
-            self.theater.add_controlpoint(control_point)
-        self.add_preset_locations()
-        self.add_supply_routes()
-        self.add_shipping_lanes()

game/campaignloader/squadrondefgenerator.py

@@ -1,325 +0,0 @@
-from __future__ import annotations
-
-import itertools
-import random
-from typing import TYPE_CHECKING, Optional
-
-from game.dcs.aircrafttype import AircraftType
-from game.squadrons.operatingbases import OperatingBases
-from game.squadrons.squadrondef import SquadronDef
-from game.theater import ControlPoint
-from gen.flights.ai_flight_planner_db import aircraft_for_task, tasks_for_aircraft
-from gen.flights.flight import FlightType
-
-if TYPE_CHECKING:
-    from game.factions.faction import Faction
-
-
-class SquadronDefGenerator:
-    def __init__(self, faction: Faction) -> None:
-        self.faction = faction
-        self.count = itertools.count(1)
-        self.used_nicknames: set[str] = set()
-
-    def generate_for_task(
-        self, task: FlightType, control_point: ControlPoint
-    ) -> Optional[SquadronDef]:
-        aircraft_choice: Optional[AircraftType] = None
-        for aircraft in aircraft_for_task(task):
-            if aircraft not in self.faction.aircrafts:
-                continue
-            if not control_point.can_operate(aircraft):
-                continue
-            aircraft_choice = aircraft
-            # 50/50 chance to keep looking for an aircraft that isn't as far up the
-            # priority list to maintain some unit variety.
-            if random.choice([True, False]):
-                break
-
-        if aircraft_choice is None:
-            return None
-        return self.generate_for_aircraft(aircraft_choice)
-
-    def generate_for_aircraft(self, aircraft: AircraftType) -> SquadronDef:
-        return SquadronDef(
-            name=f"Squadron {next(self.count):03}",
-            nickname=self.random_nickname(),
-            country=self.faction.country,
-            role="Flying Squadron",
-            aircraft=aircraft,
-            livery=None,
-            mission_types=tuple(tasks_for_aircraft(aircraft)),
-            operating_bases=OperatingBases.default_for_aircraft(aircraft),
-            pilot_pool=[],
-        )
-
-    @staticmethod
-    def _make_random_nickname() -> str:
-        from gen.naming import ANIMALS
-
-        animal = random.choice(ANIMALS)
-        adjective = random.choice(
-            (
-                None,
-                "Aggressive",
-                "Alpha",
-                "Ancient",
-                "Angelic",
-                "Angry",
-                "Apoplectic",
-                "Aquamarine",
-                "Astral",
-                "Avenging",
-                "Azure",
-                "Badass",
-                "Barbaric",
-                "Battle",
-                "Battling",
-                "Bellicose",
-                "Belligerent",
-                "Big",
-                "Bionic",
-                "Black",
-                "Bladed",
-                "Blazoned",
-                "Blood",
-                "Bloody",
-                "Blue",
-                "Bold",
-                "Boxing",
-                "Brash",
-                "Brass",
-                "Brave",
-                "Brazen",
-                "Bronze",
-                "Brown",
-                "Brutal",
-                "Burning",
-                "Buzzing",
-                "Celestial",
-                "Clever",
-                "Cloud",
-                "Cobalt",
-                "Copper",
-                "Coral",
-                "Crazy",
-                "Crimson",
-                "Crouching",
-                "Cursed",
-                "Cyan",
-                "Danger",
-                "Dangerous",
-                "Dapper",
-                "Daring",
-                "Dark",
-                "Dawn",
-                "Day",
-                "Deadly",
-                "Death",
-                "Defiant",
-                "Demon",
-                "Desert",
-                "Devil",
-                "Devil's",
-                "Diabolical",
-                "Diamond",
-                "Dire",
-                "Dirty",
-                "Doom",
-                "Doomed",
-                "Double",
-                "Drunken",
-                "Dusk",
-                "Dusty",
-                "Eager",
-                "Ebony",
-                "Electric",
-                "Emerald",
-                "Eternal",
-                "Evil",
-                "Faithful",
-                "Famous",
-                "Fanged",
-                "Fearless",
-                "Feisty",
-                "Ferocious",
-                "Fierce",
-                "Fiery",
-                "Fighting",
-                "Fire",
-                "First",
-                "Flame",
-                "Flaming",
-                "Flying",
-                "Forest",
-                "Frenzied",
-                "Frosty",
-                "Frozen",
-                "Furious",
-                "Gallant",
-                "Ghost",
-                "Giant",
-                "Gigantic",
-                "Glaring",
-                "Global",
-                "Gold",
-                "Golden",
-                "Green",
-                "Grey",
-                "Grim",
-                "Grizzly",
-                "Growling",
-                "Grumpy",
-                "Hammer",
-                "Hard",
-                "Hardy",
-                "Heavy",
-                "Hell",
-                "Hell's",
-                "Hidden",
-                "Homicidal",
-                "Hostile",
-                "Howling",
-                "Hyper",
-                "Ice",
-                "Icy",
-                "Immortal",
-                "Indignant",
-                "Infamous",
-                "Invincible",
-                "Iron",
-                "Jolly",
-                "Laser",
-                "Lava",
-                "Lavender",
-                "Lethal",
-                "Light",
-                "Lightning",
-                "Livid",
-                "Lucky",
-                "Mad",
-                "Magenta",
-                "Magma",
-                "Maroon",
-                "Menacing",
-                "Merciless",
-                "Metal",
-                "Midnight",
-                "Mighty",
-                "Mithril",
-                "Mocking",
-                "Moon",
-                "Mountain",
-                "Muddy",
-                "Nasty",
-                "Naughty",
-                "Night",
-                "Nova",
-                "Nutty",
-                "Obsidian",
-                "Ocean",
-                "Oddball",
-                "Old",
-                "Omega",
-                "Onyx",
-                "Orange",
-                "Perky",
-                "Pink",
-                "Power",
-                "Prickly",
-                "Proud",
-                "Puckered",
-                "Pugnacious",
-                "Puking",
-                "Purple",
-                "Ragged",
-                "Raging",
-                "Rainbow",
-                "Rampant",
-                "Razor",
-                "Ready",
-                "Reaper",
-                "Reckless",
-                "Red",
-                "Roaring",
-                "Rocky",
-                "Rolling",
-                "Royal",
-                "Rusty",
-                "Sable",
-                "Salty",
-                "Sand",
-                "Sarcastic",
-                "Saucy",
-                "Scarlet",
-                "Scarred",
-                "Scary",
-                "Screaming",
-                "Scythed",
-                "Shadow",
-                "Shiny",
-                "Shocking",
-                "Silver",
-                "Sky",
-                "Smoke",
-                "Smokin'",
-                "Snapping",
-                "Snappy",
-                "Snarling",
-                "Snow",
-                "Soaring",
-                "Space",
-                "Spiky",
-                "Spiny",
-                "Star",
-                "Steady",
-                "Steel",
-                "Stone",
-                "Storm",
-                "Striking",
-                "Strong",
-                "Stubborn",
-                "Sun",
-                "Super",
-                "Terrible",
-                "Thorny",
-                "Thunder",
-                "Top",
-                "Tough",
-                "Toxic",
-                "Tricky",
-                "Turquoise",
-                "Typhoon",
-                "Ultimate",
-                "Ultra",
-                "Ultramarine",
-                "Vengeful",
-                "Venom",
-                "Vermillion",
-                "Vicious",
-                "Victorious",
-                "Vigilant",
-                "Violent",
-                "Violet",
-                "War",
-                "Water",
-                "Whistling",
-                "White",
-                "Wicked",
-                "Wild",
-                "Wizard",
-                "Wrathful",
-                "Yellow",
-                "Young",
-            )
-        )
-        if adjective is None:
-            return animal.title()
-        return f"{adjective} {animal}".title()
-
-    def random_nickname(self) -> str:
-        while True:
-            nickname = self._make_random_nickname()
-            if nickname not in self.used_nicknames:
-                self.used_nicknames.add(nickname)
-                return nickname

game/coalition.py

@@ -1,235 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any, Optional
-
-from dcs import Point
-from faker import Faker
-
-from game.campaignloader import CampaignAirWingConfig
-from game.campaignloader.defaultsquadronassigner import DefaultSquadronAssigner
-from game.commander import TheaterCommander
-from game.commander.missionscheduler import MissionScheduler
-from game.income import Income
-from game.navmesh import NavMesh
-from game.orderedset import OrderedSet
-from game.profiling import logged_duration, MultiEventTracer
-from game.squadrons import AirWing
-from game.threatzones import ThreatZones
-from game.transfers import PendingTransfers
-
-if TYPE_CHECKING:
-    from game import Game
-from game.data.doctrine import Doctrine
-from game.factions.faction import Faction
-from game.procurement import AircraftProcurementRequest, ProcurementAi
-from game.theater.bullseye import Bullseye
-from game.theater.transitnetwork import TransitNetwork, TransitNetworkBuilder
-from gen.ato import AirTaskingOrder
-
-
-class Coalition:
-    def __init__(
-        self, game: Game, faction: Faction, budget: float, player: bool
-    ) -> None:
-        self.game = game
-        self.player = player
-        self.faction = faction
-        self.budget = budget
-        self.ato = AirTaskingOrder()
-        self.transit_network = TransitNetwork()
-        self.procurement_requests: OrderedSet[AircraftProcurementRequest] = OrderedSet()
-        self.bullseye = Bullseye(Point(0, 0))
-        self.faker = Faker(self.faction.locales)
-        self.air_wing = AirWing(player, game, self.faction)
-        self.transfers = PendingTransfers(game, player)
-
-        # Late initialized because the two coalitions in the game are mutually
-        # dependent, so must be both constructed before this property can be set.
-        self._opponent: Optional[Coalition] = None
-
-        # Volatile properties that are not persisted to the save file since they can be
-        # recomputed on load. Keeping this data out of the save file makes save compat
-        # breaks less frequent. Each of these properties has a non-underscore-prefixed
-        # @property that should be used for non-Optional access.
-        #
-        # All of these are late-initialized (whether via on_load or called later), but
-        # will be non-None after the game has finished loading.
-        self._threat_zone: Optional[ThreatZones] = None
-        self._navmesh: Optional[NavMesh] = None
-        self.on_load()
-
-    @property
-    def doctrine(self) -> Doctrine:
-        return self.faction.doctrine
-
-    @property
-    def coalition_id(self) -> int:
-        if self.player:
-            return 2
-        return 1
-
-    @property
-    def country_name(self) -> str:
-        return self.faction.country
-
-    @property
-    def opponent(self) -> Coalition:
-        assert self._opponent is not None
-        return self._opponent
-
-    @property
-    def threat_zone(self) -> ThreatZones:
-        assert self._threat_zone is not None
-        return self._threat_zone
-
-    @property
-    def nav_mesh(self) -> NavMesh:
-        assert self._navmesh is not None
-        return self._navmesh
-
-    def __getstate__(self) -> dict[str, Any]:
-        state = self.__dict__.copy()
-        # Avoid persisting any volatile types that can be deterministically
-        # recomputed on load for the sake of save compatibility.
-        del state["_threat_zone"]
-        del state["_navmesh"]
-        del state["faker"]
-        return state
-
-    def __setstate__(self, state: dict[str, Any]) -> None:
-        self.__dict__.update(state)
-        # Regenerate any state that was not persisted.
-        self.on_load()
-
-    def on_load(self) -> None:
-        self.faker = Faker(self.faction.locales)
-
-    def set_opponent(self, opponent: Coalition) -> None:
-        if self._opponent is not None:
-            raise RuntimeError("Double-initialization of Coalition.opponent")
-        self._opponent = opponent
-
-    def configure_default_air_wing(
-        self, air_wing_config: CampaignAirWingConfig
-    ) -> None:
-        DefaultSquadronAssigner(air_wing_config, self.game, self).assign()
-
-    def adjust_budget(self, amount: float) -> None:
-        self.budget += amount
-
-    def compute_threat_zones(self) -> None:
-        self._threat_zone = ThreatZones.for_faction(self.game, self.player)
-
-    def compute_nav_meshes(self) -> None:
-        self._navmesh = NavMesh.from_threat_zones(
-            self.opponent.threat_zone, self.game.theater
-        )
-
-    def update_transit_network(self) -> None:
-        self.transit_network = TransitNetworkBuilder(
-            self.game.theater, self.player
-        ).build()
-
-    def set_bullseye(self, bullseye: Bullseye) -> None:
-        self.bullseye = bullseye
-
-    def end_turn(self) -> None:
-        """Processes coalition-specific turn finalization.
-
-        For more information on turn finalization in general, see the documentation for
-        `Game.finish_turn`.
-        """
-        self.air_wing.end_turn()
-        self.budget += Income(self.game, self.player).total
-
-        # 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.update_transit_network()
-
-        # Must happen *before* unit deliveries are handled, or else new units will spawn
-        # one hop ahead. ControlPoint.process_turn handles unit deliveries. The
-        # coalition-specific turn-end happens before the theater-wide turn-end, so this
-        # is handled correctly.
-        self.transfers.perform_transfers()
-
-    def preinit_turn_0(self) -> None:
-        """Runs final Coalition initialization.
-
-        Final initialization occurs before Game.initialize_turn runs for turn 0.
-        """
-        self.air_wing.populate_for_turn_0()
-
-    def initialize_turn(self) -> None:
-        """Processes coalition-specific turn initialization.
-
-        For more information on turn initialization in general, see the documentation
-        for `Game.initialize_turn`.
-        """
-        # Needs to happen *before* planning transfers so we don't cancel them.
-        self.ato.clear()
-        self.air_wing.reset()
-        self.refund_outstanding_orders()
-        self.procurement_requests.clear()
-
-        with logged_duration("Transit network identification"):
-            self.update_transit_network()
-        with logged_duration("Procurement of airlift assets"):
-            self.transfers.order_airlift_assets()
-        with logged_duration("Transport planning"):
-            self.transfers.plan_transports()
-
-        self.plan_missions()
-        self.plan_procurement()
-
-    def refund_outstanding_orders(self) -> None:
-        # TODO: Split orders between air and ground units.
-        # This isn't quite right. If the player has ground purchases automated we should
-        # be refunding the ground units, and if they have air automated but not ground
-        # we should be refunding air units.
-        if self.player and not self.game.settings.automate_aircraft_reinforcements:
-            return
-
-        for cp in self.game.theater.control_points_for(self.player):
-            cp.ground_unit_orders.refund_all(self)
-        for squadron in self.air_wing.iter_squadrons():
-            squadron.refund_orders()
-
-    def plan_missions(self) -> None:
-        color = "Blue" if self.player else "Red"
-        with MultiEventTracer() as tracer:
-            with tracer.trace(f"{color} mission planning"):
-                with tracer.trace(f"{color} mission identification"):
-                    TheaterCommander(self.game, self.player).plan_missions(tracer)
-                with tracer.trace(f"{color} mission scheduling"):
-                    MissionScheduler(
-                        self, self.game.settings.desired_player_mission_duration
-                    ).schedule_missions()
-
-    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. After that the budget will be spent
-        # proportionally based on how much is already invested.
-
-        if self.player:
-            manage_runways = self.game.settings.automate_runway_repair
-            manage_front_line = self.game.settings.automate_front_line_reinforcements
-            manage_aircraft = self.game.settings.automate_aircraft_reinforcements
-        else:
-            manage_runways = True
-            manage_front_line = True
-            manage_aircraft = True
-
-        self.budget = ProcurementAi(
-            self.game,
-            self.player,
-            self.faction,
-            manage_runways,
-            manage_front_line,
-            manage_aircraft,
-        ).spend_budget(self.budget)
-
-    def add_procurement_request(self, request: AircraftProcurementRequest) -> None:
-        self.procurement_requests.add(request)

game/commander/__init__.py

@@ -1 +0,0 @@
-from .theatercommander import TheaterCommander

game/commander/garrisons.py

@@ -1,52 +0,0 @@
-from __future__ import annotations
-
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.theater import ControlPoint
-from game.theater.theatergroundobject import VehicleGroupGroundObject
-from game.utils import meters
-
-
-@dataclass
-class Garrisons:
-    blocking_capture: list[VehicleGroupGroundObject]
-    defending_front_line: list[VehicleGroupGroundObject]
-
-    @property
-    def in_priority_order(self) -> Iterator[VehicleGroupGroundObject]:
-        yield from self.blocking_capture
-        yield from self.defending_front_line
-
-    def eliminate(self, garrison: VehicleGroupGroundObject) -> None:
-        if garrison in self.blocking_capture:
-            self.blocking_capture.remove(garrison)
-        if garrison in self.defending_front_line:
-            self.defending_front_line.remove(garrison)
-
-    def __contains__(self, item: VehicleGroupGroundObject) -> bool:
-        return item in self.in_priority_order
-
-    @classmethod
-    def for_control_point(cls, control_point: ControlPoint) -> Garrisons:
-        """Categorize garrison groups based on target priority.
-
-        Any garrisons blocking base capture are the highest priority.
-        """
-        blocking = []
-        defending = []
-        garrisons = [
-            tgo
-            for tgo in control_point.ground_objects
-            if isinstance(tgo, VehicleGroupGroundObject) and not tgo.is_dead
-        ]
-        for garrison in garrisons:
-            if (
-                meters(garrison.distance_to(control_point))
-                < ControlPoint.CAPTURE_DISTANCE
-            ):
-                blocking.append(garrison)
-            else:
-                defending.append(garrison)
-
-        return Garrisons(blocking, defending)

game/commander/missionproposals.py

@@ -1,58 +0,0 @@
-from dataclasses import field, dataclass
-from enum import Enum, auto
-from typing import Optional
-
-from game.theater import MissionTarget
-from gen.flights.flight import FlightType
-
-
-class EscortType(Enum):
-    AirToAir = auto()
-    Sead = auto()
-
-
-@dataclass(frozen=True)
-class ProposedFlight:
-    """A flight outline proposed by the mission planner.
-
-    Proposed flights haven't been assigned specific aircraft yet. They have only
-    a task, a required number of aircraft, and a maximum distance allowed
-    between the objective and the departure airfield.
-    """
-
-    #: The flight's role.
-    task: FlightType
-
-    #: The number of aircraft required.
-    num_aircraft: int
-
-    #: The type of threat this flight defends against if it is an escort. Escort
-    #: flights will be pruned if the rest of the package is not threatened by
-    #: the threat they defend against. If this flight is not an escort, this
-    #: field is None.
-    escort_type: Optional[EscortType] = field(default=None)
-
-    def __str__(self) -> str:
-        return f"{self.task} {self.num_aircraft} ship"
-
-
-@dataclass(frozen=True)
-class ProposedMission:
-    """A mission outline proposed by the mission planner.
-
-    Proposed missions haven't been assigned aircraft yet. They have only an
-    objective location and a list of proposed flights that are required for the
-    mission.
-    """
-
-    #: The mission objective.
-    location: MissionTarget
-
-    #: 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])
-        return f"{self.location.name}: {flights}"

game/commander/missionscheduler.py

@@ -1,76 +0,0 @@
-from __future__ import annotations
-
-import logging
-import random
-from collections import defaultdict
-from datetime import timedelta
-from typing import Iterator, Dict, TYPE_CHECKING
-
-from game.theater import MissionTarget
-from gen.flights.flight import FlightType
-from gen.flights.traveltime import TotEstimator
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class MissionScheduler:
-    def __init__(self, coalition: Coalition, desired_mission_length: timedelta) -> None:
-        self.coalition = coalition
-        self.desired_mission_length = desired_mission_length
-
-    def schedule_missions(self) -> None:
-        """Identifies and plans mission for the turn."""
-
-        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(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.coalition.ato.packages if p.primary_task not in dca_types
-        ]
-
-        start_time = start_time_generator(
-            count=len(non_dca_packages),
-            earliest=5 * 60,
-            latest=int(self.desired_mission_length.total_seconds()),
-            margin=5 * 60,
-        )
-        for package in self.coalition.ato.packages:
-            tot = TotEstimator(package).earliest_tot()
-            if package.primary_task in dca_types:
-                previous_end_time = previous_cap_end_time[package.target]
-                if tot > previous_end_time:
-                    # Can't get there exactly on time, so get there ASAP. This
-                    # will typically only happen for the first CAP at each
-                    # target.
-                    package.time_over_target = tot
-                else:
-                    package.time_over_target = previous_end_time
-
-                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}")
-                    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
-                # mission start. This makes it more worthwhile to attack enemy
-                # airfields to hit grounded aircraft, since they're more likely
-                # to be present. Runway and air started aircraft will be
-                # delayed until their takeoff time by AirConflictGenerator.
-                package.time_over_target = next(start_time) + tot

game/commander/objectivefinder.py

@@ -1,246 +0,0 @@
-from __future__ import annotations
-
-import math
-import operator
-from collections import Iterator, Iterable
-from typing import TypeVar, TYPE_CHECKING
-
-from game.theater import (
-    ControlPoint,
-    OffMapSpawn,
-    MissionTarget,
-    Fob,
-    FrontLine,
-    Airfield,
-)
-from game.theater.theatergroundobject import (
-    BuildingGroundObject,
-    IadsGroundObject,
-    NavalGroundObject,
-)
-from game.utils import meters, nautical_miles
-from gen.flights.closestairfields import ObjectiveDistanceCache, ClosestAirfields
-
-if TYPE_CHECKING:
-    from game import Game
-    from game.transfers import CargoShip, Convoy
-
-MissionTargetType = TypeVar("MissionTargetType", bound=MissionTarget)
-
-
-class ObjectiveFinder:
-    """Identifies potential objectives for the mission planner."""
-
-    # TODO: Merge into doctrine.
-    AIRFIELD_THREAT_RANGE = nautical_miles(150)
-    SAM_THREAT_RANGE = nautical_miles(100)
-
-    def __init__(self, game: Game, is_player: bool) -> None:
-        self.game = game
-        self.is_player = is_player
-
-    def enemy_air_defenses(self) -> Iterator[IadsGroundObject]:
-        """Iterates over all enemy SAM sites."""
-        for cp in self.enemy_control_points():
-            for ground_object in cp.ground_objects:
-                if ground_object.is_dead:
-                    continue
-
-                if isinstance(ground_object, IadsGroundObject):
-                    yield ground_object
-
-    def enemy_ships(self) -> Iterator[NavalGroundObject]:
-        for cp in self.enemy_control_points():
-            for ground_object in cp.ground_objects:
-                if not isinstance(ground_object, NavalGroundObject):
-                    continue
-
-                if ground_object.is_dead:
-                    continue
-
-                yield ground_object
-
-    def threatening_ships(self) -> Iterator[NavalGroundObject]:
-        """Iterates over enemy ships near friendly control points.
-
-        Groups are sorted by their closest proximity to any friendly control
-        point (airfield or fleet).
-        """
-        return self._targets_by_range(self.enemy_ships())
-
-    def _targets_by_range(
-        self, targets: Iterable[MissionTargetType]
-    ) -> Iterator[MissionTargetType]:
-        target_ranges: list[tuple[MissionTargetType, float]] = []
-        for target in targets:
-            ranges: list[float] = []
-            for cp in self.friendly_control_points():
-                ranges.append(target.distance_to(cp))
-            target_ranges.append((target, min(ranges)))
-
-        target_ranges = sorted(target_ranges, key=operator.itemgetter(1))
-        for target, _range in target_ranges:
-            yield target
-
-    def strike_targets(self) -> Iterator[BuildingGroundObject]:
-        """Iterates over enemy strike targets.
-
-        Targets are sorted by their closest proximity to any friendly control
-        point (airfield or fleet).
-        """
-        targets: list[tuple[BuildingGroundObject, float]] = []
-        # Building objectives are made of several individual TGOs (one per
-        # building).
-        found_targets: set[str] = set()
-        for enemy_cp in self.enemy_control_points():
-            for ground_object in enemy_cp.ground_objects:
-                # TODO: Reuse ground_object.mission_types.
-                # The mission types for ground objects are currently not
-                # accurate because we include things like strike and BAI for all
-                # targets since they have different planning behavior (waypoint
-                # generation is better for players with strike when the targets
-                # are stationary, AI behavior against weaker air defenses is
-                # better with BAI), so that's not a useful filter. Once we have
-                # better control over planning profiles and target dependent
-                # loadouts we can clean this up.
-                if not isinstance(ground_object, BuildingGroundObject):
-                    # Other group types (like ships, SAMs, garrisons, etc) have better
-                    # suited mission types like anti-ship, DEAD, and BAI.
-                    continue
-
-                if isinstance(enemy_cp, 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.
-                    continue
-
-                if ground_object.is_dead:
-                    continue
-                if ground_object.name in found_targets:
-                    continue
-                ranges: list[float] = []
-                for friendly_cp in self.friendly_control_points():
-                    ranges.append(ground_object.distance_to(friendly_cp))
-                targets.append((ground_object, min(ranges)))
-                found_targets.add(ground_object.name)
-        targets = sorted(targets, key=operator.itemgetter(1))
-        for target, _range in targets:
-            yield target
-
-    def front_lines(self) -> Iterator[FrontLine]:
-        """Iterates over all active front lines in the theater."""
-        yield from self.game.theater.conflicts()
-
-    def vulnerable_control_points(self) -> Iterator[ControlPoint]:
-        """Iterates over friendly CPs that are vulnerable to enemy CPs.
-
-        Vulnerability is defined as any enemy CP within threat range of of the
-        CP.
-        """
-        for cp in self.friendly_control_points():
-            if isinstance(cp, OffMapSpawn):
-                # Off-map spawn locations don't need protection.
-                continue
-            airfields_in_proximity = self.closest_airfields_to(cp)
-            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):
-                    yield cp
-                    break
-
-    def oca_targets(self, min_aircraft: int) -> Iterator[ControlPoint]:
-        airfields = []
-        for control_point in self.enemy_control_points():
-            if not isinstance(control_point, Airfield):
-                continue
-            if control_point.allocated_aircraft().total_present >= min_aircraft:
-                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.coalition_for(
-                self.is_player
-            ).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.coalition_for(
-                self.is_player
-            ).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)
-        )
-
-    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 closest_friendly_control_point(self) -> ControlPoint:
-        """Finds the friendly control point that is closest to any threats."""
-        threat_zones = self.game.threat_zone_for(not self.is_player)
-
-        closest = None
-        min_distance = meters(math.inf)
-        for cp in self.friendly_control_points():
-            if isinstance(cp, OffMapSpawn):
-                continue
-            distance = threat_zones.distance_to_threat(cp.position)
-            if distance < min_distance:
-                closest = cp
-                min_distance = distance
-
-        if closest is None:
-            raise RuntimeError("Found no friendly control points. You probably lost.")
-        return closest
-
-    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)
-        )
-
-    def prioritized_unisolated_points(self) -> list[ControlPoint]:
-        prioritized = []
-        capturable_later = []
-        for cp in self.game.theater.control_points_for(not self.is_player):
-            if cp.is_isolated:
-                continue
-            if cp.has_active_frontline:
-                prioritized.append(cp)
-            else:
-                capturable_later.append(cp)
-        prioritized.extend(self._targets_by_range(capturable_later))
-        return prioritized
-
-    @staticmethod
-    def closest_airfields_to(location: MissionTarget) -> ClosestAirfields:
-        """Returns the closest airfields to the given location."""
-        return ObjectiveDistanceCache.get_closest_airfields(location)

game/commander/packagebuilder.py

@@ -1,94 +0,0 @@
-from __future__ import annotations
-
-from typing import Optional, TYPE_CHECKING
-
-from game.utils import nautical_miles
-from gen.ato import Package
-from game.theater import MissionTarget, OffMapSpawn, ControlPoint
-from gen.flights.flight import Flight
-
-
-if TYPE_CHECKING:
-    from game.dcs.aircrafttype import AircraftType
-    from game.squadrons.airwing import AirWing
-    from gen.flights.closestairfields import ClosestAirfields
-    from .missionproposals import ProposedFlight
-
-
-class PackageBuilder:
-    """Builds a Package for the flights it receives."""
-
-    def __init__(
-        self,
-        location: MissionTarget,
-        closest_airfields: ClosestAirfields,
-        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, auto_asap=asap)
-        self.air_wing = air_wing
-        self.start_type = start_type
-
-    def plan_flight(self, plan: ProposedFlight) -> bool:
-        """Allocates aircraft for the given flight and adds them to the package.
-
-        If no suitable aircraft are available, False is returned. If the failed
-        flight was critical and the rest of the mission will be scrubbed, the
-        caller should return any previously planned flights to the inventory
-        using release_planned_aircraft.
-        """
-        squadron = self.air_wing.best_squadron_for(
-            self.package.target, plan.task, plan.num_aircraft, this_turn=True
-        )
-        if squadron is None:
-            return False
-        start_type = squadron.location.required_aircraft_start_type
-        if start_type is None:
-            start_type = self.start_type
-
-        flight = Flight(
-            self.package,
-            self.package_country,
-            squadron,
-            plan.num_aircraft,
-            plan.task,
-            start_type,
-            divert=self.find_divert_field(squadron.aircraft, squadron.location),
-        )
-        self.package.add_flight(flight)
-        return True
-
-    def find_divert_field(
-        self, aircraft: AircraftType, arrival: ControlPoint
-    ) -> Optional[ControlPoint]:
-        divert_limit = nautical_miles(150)
-        for airfield in self.closest_airfields.operational_airfields_within(
-            divert_limit
-        ):
-            if airfield.captured != self.is_player:
-                continue
-            if airfield == arrival:
-                continue
-            if not airfield.can_operate(aircraft):
-                continue
-            if isinstance(airfield, OffMapSpawn):
-                continue
-            return airfield
-        return None
-
-    def build(self) -> Package:
-        """Returns the built package."""
-        return self.package
-
-    def release_planned_aircraft(self) -> None:
-        """Returns any planned flights to the inventory."""
-        flights = list(self.package.flights)
-        for flight in flights:
-            flight.return_pilots_and_aircraft()
-            self.package.remove_flight(flight)

game/commander/packagefulfiller.py

@@ -1,221 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections import defaultdict
-from typing import Set, Iterable, Dict, TYPE_CHECKING, Optional
-
-from game.commander.missionproposals import ProposedMission, ProposedFlight, EscortType
-from game.commander.packagebuilder import PackageBuilder
-from game.data.doctrine import Doctrine
-from game.procurement import AircraftProcurementRequest
-from game.profiling import MultiEventTracer
-from game.settings import Settings
-from game.squadrons import AirWing
-from game.theater import ConflictTheater
-from game.threatzones import ThreatZones
-from gen.ato import AirTaskingOrder, Package
-from gen.flights.closestairfields import ObjectiveDistanceCache
-from gen.flights.flight import FlightType
-from gen.flights.flightplan import FlightPlanBuilder
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class PackageFulfiller:
-    """Responsible for package aircraft allocation and flight plan layout."""
-
-    def __init__(
-        self, coalition: Coalition, theater: ConflictTheater, settings: Settings
-    ) -> None:
-        self.coalition = coalition
-        self.theater = theater
-        self.player_missions_asap = settings.auto_ato_player_missions_asap
-        self.default_start_type = settings.default_start_type
-
-    @property
-    def is_player(self) -> bool:
-        return self.coalition.player
-
-    @property
-    def ato(self) -> AirTaskingOrder:
-        return self.coalition.ato
-
-    @property
-    def air_wing(self) -> AirWing:
-        return self.coalition.air_wing
-
-    @property
-    def doctrine(self) -> Doctrine:
-        return self.coalition.doctrine
-
-    @property
-    def threat_zones(self) -> ThreatZones:
-        return self.coalition.opponent.threat_zone
-
-    def add_procurement_request(self, request: AircraftProcurementRequest) -> None:
-        self.coalition.add_procurement_request(request)
-
-    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.
-        """
-        return self.air_wing.can_auto_plan(mission_type)
-
-    def plan_flight(
-        self,
-        mission: ProposedMission,
-        flight: ProposedFlight,
-        builder: PackageBuilder,
-        missing_types: Set[FlightType],
-        purchase_multiplier: int,
-    ) -> None:
-        if not builder.plan_flight(flight):
-            missing_types.add(flight.task)
-            purchase_order = AircraftProcurementRequest(
-                near=mission.location,
-                task_capability=flight.task,
-                number=flight.num_aircraft * purchase_multiplier,
-            )
-            # Reserves are planned for critical missions, so prioritize those orders
-            # over aircraft needed for non-critical missions.
-            self.add_procurement_request(purchase_order)
-
-    def scrub_mission_missing_aircraft(
-        self,
-        mission: ProposedMission,
-        builder: PackageBuilder,
-        missing_types: Set[FlightType],
-        not_attempted: Iterable[ProposedFlight],
-        purchase_multiplier: int,
-    ) -> 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, purchase_multiplier
-            )
-
-        missing_types_str = ", ".join(sorted([t.name for t in missing_types]))
-        builder.release_planned_aircraft()
-        color = "Blue" if self.is_player else "Red"
-        logging.debug(
-            f"{color}: not enough aircraft in range for {mission.location.name} "
-            f"capable of: {missing_types_str}"
-        )
-
-    def check_needed_escorts(self, builder: PackageBuilder) -> Dict[EscortType, bool]:
-        threats = defaultdict(bool)
-        for flight in builder.package.flights:
-            if self.threat_zones.waypoints_threatened_by_aircraft(
-                flight.flight_plan.escorted_waypoints()
-            ):
-                threats[EscortType.AirToAir] = True
-            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,
-        purchase_multiplier: int,
-        tracer: MultiEventTracer,
-    ) -> Optional[Package]:
-        """Allocates aircraft for a proposed mission and adds it to the ATO."""
-        builder = PackageBuilder(
-            mission.location,
-            ObjectiveDistanceCache.get_closest_airfields(mission.location),
-            self.air_wing,
-            self.is_player,
-            self.coalition.country_name,
-            self.default_start_type,
-            mission.asap,
-        )
-
-        # Attempt to plan all the main elements of the mission first. Escorts
-        # will be planned separately so we can prune escorts for packages that
-        # are not expected to encounter that type of threat.
-        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
-            with tracer.trace("Flight planning"):
-                self.plan_flight(
-                    mission,
-                    proposed_flight,
-                    builder,
-                    missing_types,
-                    purchase_multiplier,
-                )
-
-        if missing_types:
-            self.scrub_mission_missing_aircraft(
-                mission, builder, missing_types, escorts, purchase_multiplier
-            )
-            return None
-
-        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 None
-
-        # Create flight plans for the main flights of the package so we can
-        # determine threats. This is done *after* creating all of the flights
-        # rather than as each flight is added because the flight plan for
-        # 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(
-            builder.package, self.coalition, self.theater
-        )
-        for flight in builder.package.flights:
-            with tracer.trace("Flight plan population"):
-                flight_plan_builder.populate_flight_plan(flight)
-
-        needed_escorts = self.check_needed_escorts(builder)
-        for escort in escorts:
-            # This list was generated from the not None set, so this should be
-            # impossible.
-            assert escort.escort_type is not None
-            if needed_escorts[escort.escort_type]:
-                with tracer.trace("Flight planning"):
-                    self.plan_flight(
-                        mission, escort, builder, missing_types, purchase_multiplier
-                    )
-
-        # 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, purchase_multiplier
-            )
-            return None
-
-        package = builder.build()
-        # Add flight plans for escorts.
-        for flight in package.flights:
-            if not flight.flight_plan.waypoints:
-                with tracer.trace("Flight plan population"):
-                    flight_plan_builder.populate_flight_plan(flight)
-
-        if package.has_players and self.player_missions_asap:
-            package.auto_asap = True
-            package.set_tot_asap()
-
-        return package

game/commander/tasks/compound/aewcsupport.py

@@ -1,11 +0,0 @@
-from collections import Iterator
-
-from game.commander.tasks.primitive.aewc import PlanAewc
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-class PlanAewcSupport(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for target in state.aewc_targets:
-            yield [PlanAewc(target)]

game/commander/tasks/compound/attackairinfrastructure.py

@@ -1,15 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.primitive.oca import PlanOcaStrike
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-@dataclass(frozen=True)
-class AttackAirInfrastructure(CompoundTask[TheaterState]):
-    aircraft_cold_start: bool
-
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for garrison in state.oca_targets:
-            yield [PlanOcaStrike(garrison, self.aircraft_cold_start)]

game/commander/tasks/compound/attackbuildings.py

@@ -1,15 +0,0 @@
-from collections import Iterator
-
-from game.commander.tasks.primitive.strike import PlanStrike
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-class AttackBuildings(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for building in state.strike_targets:
-            # Ammo depots are targeted based on the needs of the front line by
-            # ReduceEnemyFrontLineCapacity. No reason to target them before that front
-            # line is active.
-            if not building.is_ammo_depot:
-                yield [PlanStrike(building)]

game/commander/tasks/compound/attackgarrisons.py

@@ -1,12 +0,0 @@
-from collections import Iterator
-
-from game.commander.tasks.primitive.bai import PlanBai
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-class AttackGarrisons(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for garrisons in state.enemy_garrisons.values():
-            for garrison in garrisons.in_priority_order:
-                yield [PlanBai(garrison)]

game/commander/tasks/compound/capturebase.py

@@ -1,51 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.compound.destroyenemygroundunits import (
-    DestroyEnemyGroundUnits,
-)
-from game.commander.tasks.compound.reduceenemyfrontlinecapacity import (
-    ReduceEnemyFrontLineCapacity,
-)
-from game.commander.tasks.primitive.breakthroughattack import BreakthroughAttack
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-from game.theater import FrontLine, ControlPoint
-
-
-@dataclass(frozen=True)
-class CaptureBase(CompoundTask[TheaterState]):
-    front_line: FrontLine
-
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        yield [BreakthroughAttack(self.front_line, state.context.coalition.player)]
-        yield [DestroyEnemyGroundUnits(self.front_line)]
-        if self.worth_destroying_ammo_depots(state):
-            yield [ReduceEnemyFrontLineCapacity(self.enemy_cp(state))]
-
-    def enemy_cp(self, state: TheaterState) -> ControlPoint:
-        return self.front_line.control_point_hostile_to(state.context.coalition.player)
-
-    def units_deployable(self, state: TheaterState, player: bool) -> int:
-        cp = self.front_line.control_point_friendly_to(player)
-        ammo_depots = list(state.ammo_dumps_at(cp))
-        return cp.deployable_front_line_units_with(len(ammo_depots))
-
-    def unit_cap(self, state: TheaterState, player: bool) -> int:
-        cp = self.front_line.control_point_friendly_to(player)
-        ammo_depots = list(state.ammo_dumps_at(cp))
-        return cp.front_line_capacity_with(len(ammo_depots))
-
-    def enemy_has_ammo_dumps(self, state: TheaterState) -> bool:
-        return bool(state.ammo_dumps_at(self.enemy_cp(state)))
-
-    def worth_destroying_ammo_depots(self, state: TheaterState) -> bool:
-        if not self.enemy_has_ammo_dumps(state):
-            return False
-
-        friendly_cap = self.unit_cap(state, state.context.coalition.player)
-        enemy_deployable = self.units_deployable(state, state.context.coalition.player)
-
-        # If the enemy can currently deploy 50% more units than we possibly could, it's
-        # worth killing an ammo depot.
-        return enemy_deployable / friendly_cap > 1.5

game/commander/tasks/compound/capturebases.py

@@ -1,13 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.compound.capturebase import CaptureBase
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-@dataclass(frozen=True)
-class CaptureBases(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for front in state.active_front_lines:
-            yield [CaptureBase(front)]

game/commander/tasks/compound/defendbase.py

@@ -1,19 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.primitive.cas import PlanCas
-from game.commander.tasks.primitive.defensivestance import DefensiveStance
-from game.commander.tasks.primitive.retreatstance import RetreatStance
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-from game.theater import FrontLine
-
-
-@dataclass(frozen=True)
-class DefendBase(CompoundTask[TheaterState]):
-    front_line: FrontLine
-
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        yield [DefensiveStance(self.front_line, state.context.coalition.player)]
-        yield [RetreatStance(self.front_line, state.context.coalition.player)]
-        yield [PlanCas(self.front_line)]

game/commander/tasks/compound/defendbases.py

@@ -1,13 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.compound.defendbase import DefendBase
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-@dataclass(frozen=True)
-class DefendBases(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for front in state.active_front_lines:
-            yield [DefendBase(front)]

game/commander/tasks/compound/degradeiads.py

@@ -1,24 +0,0 @@
-from collections import Iterator
-from typing import Union
-
-from game.commander.tasks.primitive.antiship import PlanAntiShip
-from game.commander.tasks.primitive.dead import PlanDead
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-from game.theater.theatergroundobject import IadsGroundObject, NavalGroundObject
-
-
-class DegradeIads(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for air_defense in state.threatening_air_defenses:
-            yield [self.plan_against(air_defense)]
-        for detector in state.detecting_air_defenses:
-            yield [self.plan_against(detector)]
-
-    @staticmethod
-    def plan_against(
-        target: Union[IadsGroundObject, NavalGroundObject]
-    ) -> Union[PlanDead, PlanAntiShip]:
-        if isinstance(target, IadsGroundObject):
-            return PlanDead(target)
-        return PlanAntiShip(target)

game/commander/tasks/compound/destroyenemygroundunits.py

@@ -1,19 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.primitive.aggressiveattack import AggressiveAttack
-from game.commander.tasks.primitive.cas import PlanCas
-from game.commander.tasks.primitive.eliminationattack import EliminationAttack
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-from game.theater import FrontLine
-
-
-@dataclass(frozen=True)
-class DestroyEnemyGroundUnits(CompoundTask[TheaterState]):
-    front_line: FrontLine
-
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        yield [EliminationAttack(self.front_line, state.context.coalition.player)]
-        yield [AggressiveAttack(self.front_line, state.context.coalition.player)]
-        yield [PlanCas(self.front_line)]

game/commander/tasks/compound/frontlinedefense.py

@@ -1,11 +0,0 @@
-from collections import Iterator
-
-from game.commander.tasks.primitive.cas import PlanCas
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-class FrontLineDefense(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for front_line in state.vulnerable_front_lines:
-            yield [PlanCas(front_line)]

game/commander/tasks/compound/interdictreinforcements.py

@@ -1,27 +0,0 @@
-from collections import Iterator
-
-from game.commander.tasks.primitive.antishipping import PlanAntiShipping
-from game.commander.tasks.primitive.convoyinterdiction import PlanConvoyInterdiction
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-class InterdictReinforcements(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        # 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 state.enemy_convoys:
-            yield [PlanConvoyInterdiction(convoy)]
-        for ship in state.enemy_shipping:
-            yield [PlanAntiShipping(ship)]

game/commander/tasks/compound/nextaction.py

@@ -1,34 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.compound.attackairinfrastructure import (
-    AttackAirInfrastructure,
-)
-from game.commander.tasks.compound.attackbuildings import AttackBuildings
-from game.commander.tasks.compound.attackgarrisons import AttackGarrisons
-from game.commander.tasks.compound.capturebases import CaptureBases
-from game.commander.tasks.compound.defendbases import DefendBases
-from game.commander.tasks.compound.degradeiads import DegradeIads
-from game.commander.tasks.compound.interdictreinforcements import (
-    InterdictReinforcements,
-)
-from game.commander.tasks.compound.protectairspace import ProtectAirSpace
-from game.commander.tasks.compound.theatersupport import TheaterSupport
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-@dataclass(frozen=True)
-class PlanNextAction(CompoundTask[TheaterState]):
-    aircraft_cold_start: bool
-
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        yield [TheaterSupport()]
-        yield [ProtectAirSpace()]
-        yield [CaptureBases()]
-        yield [DefendBases()]
-        yield [InterdictReinforcements()]
-        yield [AttackGarrisons()]
-        yield [AttackAirInfrastructure(self.aircraft_cold_start)]
-        yield [AttackBuildings()]
-        yield [DegradeIads()]

game/commander/tasks/compound/protectairspace.py

@@ -1,12 +0,0 @@
-from collections import Iterator
-
-from game.commander.tasks.primitive.barcap import PlanBarcap
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-class ProtectAirSpace(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for cp, needed in state.barcaps_needed.items():
-            if needed > 0:
-                yield [PlanBarcap(cp, needed)]

game/commander/tasks/compound/reduceenemyfrontlinecapacity.py

@@ -1,16 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.primitive.strike import PlanStrike
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-from game.theater import ControlPoint
-
-
-@dataclass(frozen=True)
-class ReduceEnemyFrontLineCapacity(CompoundTask[TheaterState]):
-    control_point: ControlPoint
-
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for ammo_dump in state.ammo_dumps_at(self.control_point):
-            yield [PlanStrike(ammo_dump)]

game/commander/tasks/compound/refuelingsupport.py

@@ -1,11 +0,0 @@
-from collections import Iterator
-
-from game.commander.tasks.primitive.refueling import PlanRefueling
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-class PlanRefuelingSupport(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        for target in state.refueling_targets:
-            yield [PlanRefueling(target)]

game/commander/tasks/compound/theatersupport.py

@@ -1,14 +0,0 @@
-from collections import Iterator
-from dataclasses import dataclass
-
-from game.commander.tasks.compound.aewcsupport import PlanAewcSupport
-from game.commander.tasks.compound.refuelingsupport import PlanRefuelingSupport
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-@dataclass(frozen=True)
-class TheaterSupport(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        yield [PlanAewcSupport()]
-        yield [PlanRefuelingSupport()]

game/commander/tasks/frontlinestancetask.py

@@ -1,77 +0,0 @@
-from __future__ import annotations
-
-import math
-from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING
-
-from game.commander.tasks.theatercommandertask import TheaterCommanderTask
-from game.commander.theaterstate import TheaterState
-from game.theater import FrontLine
-from gen.ground_forces.combat_stance import CombatStance
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class FrontLineStanceTask(TheaterCommanderTask, ABC):
-    def __init__(self, front_line: FrontLine, player: bool) -> None:
-        self.front_line = front_line
-        self.friendly_cp = self.front_line.control_point_friendly_to(player)
-        self.enemy_cp = self.front_line.control_point_hostile_to(player)
-
-    @property
-    @abstractmethod
-    def stance(self) -> CombatStance:
-        ...
-
-    @staticmethod
-    def management_allowed(state: TheaterState) -> bool:
-        return (
-            not state.context.coalition.player
-            or state.context.settings.automate_front_line_stance
-        )
-
-    def better_stance_already_set(self, state: TheaterState) -> bool:
-        current_stance = state.front_line_stances[self.front_line]
-        if current_stance is None:
-            return False
-        preference = (
-            CombatStance.RETREAT,
-            CombatStance.DEFENSIVE,
-            CombatStance.AMBUSH,
-            CombatStance.AGGRESSIVE,
-            CombatStance.ELIMINATION,
-            CombatStance.BREAKTHROUGH,
-        )
-        current_rating = preference.index(current_stance)
-        new_rating = preference.index(self.stance)
-        return current_rating >= new_rating
-
-    @property
-    @abstractmethod
-    def have_sufficient_front_line_advantage(self) -> bool:
-        ...
-
-    @property
-    def ground_force_balance(self) -> float:
-        # TODO: Planned CAS missions should reduce the expected opposing force size.
-        friendly_forces = self.friendly_cp.deployable_front_line_units
-        enemy_forces = self.enemy_cp.deployable_front_line_units
-        if enemy_forces == 0:
-            return math.inf
-        return friendly_forces / enemy_forces
-
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if not self.management_allowed(state):
-            return False
-        if self.better_stance_already_set(state):
-            return False
-        if self.friendly_cp.deployable_front_line_units == 0:
-            return False
-        return self.have_sufficient_front_line_advantage
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.front_line_stances[self.front_line] = self.stance
-
-    def execute(self, coalition: Coalition) -> None:
-        self.friendly_cp.stances[self.enemy_cp.id] = self.stance

game/commander/tasks/packageplanningtask.py

@@ -1,174 +0,0 @@
-from __future__ import annotations
-
-import itertools
-import operator
-from abc import abstractmethod
-from dataclasses import dataclass, field
-from enum import unique, IntEnum, auto
-from typing import TYPE_CHECKING, Optional, Generic, TypeVar, Iterator, Union
-
-from game.commander.missionproposals import ProposedFlight, EscortType, ProposedMission
-from game.commander.packagefulfiller import PackageFulfiller
-from game.commander.tasks.theatercommandertask import TheaterCommanderTask
-from game.commander.theaterstate import TheaterState
-from game.settings import AutoAtoBehavior
-from game.theater import MissionTarget
-from game.theater.theatergroundobject import IadsGroundObject, NavalGroundObject
-from game.utils import Distance, meters
-from gen.ato import Package
-from gen.flights.flight import FlightType
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-MissionTargetT = TypeVar("MissionTargetT", bound=MissionTarget)
-
-
-@unique
-class RangeType(IntEnum):
-    Detection = auto()
-    Threat = auto()
-
-
-# TODO: Refactor so that we don't need to call up to the mission planner.
-# Bypass type checker due to https://github.com/python/mypy/issues/5374
-@dataclass  # type: ignore
-class PackagePlanningTask(TheaterCommanderTask, Generic[MissionTargetT]):
-    target: MissionTargetT
-    flights: list[ProposedFlight] = field(init=False)
-    package: Optional[Package] = field(init=False, default=None)
-
-    def __post_init__(self) -> None:
-        self.flights = []
-        self.package = Package(self.target)
-
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if (
-            state.context.coalition.player
-            and state.context.settings.auto_ato_behavior is AutoAtoBehavior.Disabled
-        ):
-            return False
-        return self.fulfill_mission(state)
-
-    def execute(self, coalition: Coalition) -> None:
-        if self.package is None:
-            raise RuntimeError("Attempted to execute failed package planning task")
-        coalition.ato.add_package(self.package)
-
-    @abstractmethod
-    def propose_flights(self) -> None:
-        ...
-
-    def propose_flight(
-        self,
-        task: FlightType,
-        num_aircraft: int,
-        escort_type: Optional[EscortType] = None,
-    ) -> None:
-        self.flights.append(ProposedFlight(task, num_aircraft, escort_type))
-
-    @property
-    def asap(self) -> bool:
-        return False
-
-    @property
-    def purchase_multiplier(self) -> int:
-        """The multiplier for aircraft quantity when missions could not be fulfilled.
-
-        For missions that do not schedule in rounds like BARCAPs do, this should be one
-        to ensure that the we only purchase enough aircraft to plan the mission once.
-
-        For missions that repeat within the same turn, however, we may need to buy for
-        the same mission more than once. If three rounds of BARCAP still need to be
-        fulfilled, this would return 3, and we'd triplicate the purchase order.
-
-        There is a small misbehavior here that's not symptomatic for our current mission
-        planning: multi-round, multi-flight packages will only purchase multiple sets of
-        aircraft for whatever is unavailable for the *first* failed package. For
-        example, if we extend this to CAS and have no CAS aircraft but enough TARCAP
-        aircraft for one round, we'll order CAS for every round but will not order any
-        TARCAP aircraft, since we can't know that TARCAP aircraft are needed until we
-        attempt to plan the second mission *without returning the first round aircraft*.
-        """
-        return 1
-
-    def fulfill_mission(self, state: TheaterState) -> bool:
-        self.propose_flights()
-        fulfiller = PackageFulfiller(
-            state.context.coalition,
-            state.context.theater,
-            state.context.settings,
-        )
-        self.package = fulfiller.plan_mission(
-            ProposedMission(self.target, self.flights),
-            self.purchase_multiplier,
-            state.context.tracer,
-        )
-        return self.package is not None
-
-    def propose_common_escorts(self) -> None:
-        self.propose_flight(FlightType.SEAD_ESCORT, 2, EscortType.Sead)
-        self.propose_flight(FlightType.ESCORT, 2, EscortType.AirToAir)
-
-    def iter_iads_ranges(
-        self, state: TheaterState, range_type: RangeType
-    ) -> Iterator[Union[IadsGroundObject, NavalGroundObject]]:
-        target_ranges: list[
-            tuple[Union[IadsGroundObject, NavalGroundObject], Distance]
-        ] = []
-        all_iads: Iterator[
-            Union[IadsGroundObject, NavalGroundObject]
-        ] = itertools.chain(state.enemy_air_defenses, state.enemy_ships)
-        for target in all_iads:
-            distance = meters(target.distance_to(self.target))
-            if range_type is RangeType.Detection:
-                target_range = target.max_detection_range()
-            elif range_type is RangeType.Threat:
-                target_range = target.max_threat_range()
-            else:
-                raise ValueError(f"Unknown RangeType: {range_type}")
-            if not target_range:
-                continue
-
-            # IADS out of range of our target area will have a positive
-            # distance_to_threat and should be pruned. The rest have a decreasing
-            # distance_to_threat as overlap increases. The most negative distance has
-            # the greatest coverage of the target and should be treated as the highest
-            # priority threat.
-            distance_to_threat = distance - target_range
-            if distance_to_threat > meters(0):
-                continue
-            target_ranges.append((target, distance_to_threat))
-
-        # TODO: Prioritize IADS by vulnerability?
-        target_ranges = sorted(target_ranges, key=operator.itemgetter(1))
-        for target, _range in target_ranges:
-            yield target
-
-    def iter_detecting_iads(
-        self, state: TheaterState
-    ) -> Iterator[Union[IadsGroundObject, NavalGroundObject]]:
-        return self.iter_iads_ranges(state, RangeType.Detection)
-
-    def iter_iads_threats(
-        self, state: TheaterState
-    ) -> Iterator[Union[IadsGroundObject, NavalGroundObject]]:
-        return self.iter_iads_ranges(state, RangeType.Threat)
-
-    def target_area_preconditions_met(
-        self, state: TheaterState, ignore_iads: bool = False
-    ) -> bool:
-        """Checks if the target area has been cleared of threats."""
-        threatened = False
-
-        # Non-blocking, but analyzed so we can pick detectors worth eliminating.
-        for detector in self.iter_detecting_iads(state):
-            if detector not in state.detecting_air_defenses:
-                state.detecting_air_defenses.append(detector)
-
-        if not ignore_iads:
-            for iads_threat in self.iter_iads_threats(state):
-                threatened = True
-                if iads_threat not in state.threatening_air_defenses:
-                    state.threatening_air_defenses.append(iads_threat)
-        return not threatened

game/commander/tasks/primitive/aewc.py

@@ -1,27 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater import MissionTarget
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanAewc(PackagePlanningTask[MissionTarget]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if not super().preconditions_met(state):
-            return False
-        return self.target in state.aewc_targets
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.aewc_targets.remove(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.AEWC, 1)
-
-    @property
-    def asap(self) -> bool:
-        # Supports all the early CAP flights, so should be in the air ASAP.
-        return True

game/commander/tasks/primitive/aggressiveattack.py

@@ -1,14 +0,0 @@
-from __future__ import annotations
-
-from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from gen.ground_forces.combat_stance import CombatStance
-
-
-class AggressiveAttack(FrontLineStanceTask):
-    @property
-    def stance(self) -> CombatStance:
-        return CombatStance.AGGRESSIVE
-
-    @property
-    def have_sufficient_front_line_advantage(self) -> bool:
-        return self.ground_force_balance >= 0.8

game/commander/tasks/primitive/antiship.py

@@ -1,26 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.missionproposals import EscortType
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater.theatergroundobject import NavalGroundObject
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanAntiShip(PackagePlanningTask[NavalGroundObject]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if self.target not in state.threatening_air_defenses:
-            return False
-        if not self.target_area_preconditions_met(state, ignore_iads=True):
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.eliminate_ship(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.ANTISHIP, 2)
-        self.propose_flight(FlightType.ESCORT, 2, EscortType.AirToAir)

game/commander/tasks/primitive/antishipping.py

@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.transfers import CargoShip
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanAntiShipping(PackagePlanningTask[CargoShip]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if self.target not in state.enemy_shipping:
-            return False
-        if not self.target_area_preconditions_met(state):
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.enemy_shipping.remove(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.ANTISHIP, 2)
-        self.propose_common_escorts()

game/commander/tasks/primitive/bai.py

@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater.theatergroundobject import VehicleGroupGroundObject
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanBai(PackagePlanningTask[VehicleGroupGroundObject]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if not state.has_garrison(self.target):
-            return False
-        if not self.target_area_preconditions_met(state):
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.eliminate_garrison(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.BAI, 2)
-        self.propose_common_escorts()

game/commander/tasks/primitive/barcap.py

@@ -1,28 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater import ControlPoint
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanBarcap(PackagePlanningTask[ControlPoint]):
-    max_orders: int
-
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if not state.barcaps_needed[self.target]:
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.barcaps_needed[self.target] -= 1
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.BARCAP, 2)
-
-    @property
-    def purchase_multiplier(self) -> int:
-        return self.max_orders

game/commander/tasks/primitive/breakthroughattack.py

@@ -1,28 +0,0 @@
-from __future__ import annotations
-
-from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from game.commander.theaterstate import TheaterState
-from gen.ground_forces.combat_stance import CombatStance
-
-
-class BreakthroughAttack(FrontLineStanceTask):
-    @property
-    def stance(self) -> CombatStance:
-        return CombatStance.BREAKTHROUGH
-
-    @property
-    def have_sufficient_front_line_advantage(self) -> bool:
-        return self.ground_force_balance >= 2.0
-
-    def opposing_garrisons_eliminated(self, state: TheaterState) -> bool:
-        garrisons = state.enemy_garrisons[self.enemy_cp]
-        return not bool(garrisons.blocking_capture)
-
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if not super().preconditions_met(state):
-            return False
-        return self.opposing_garrisons_eliminated(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        super().apply_effects(state)
-        state.active_front_lines.remove(self.front_line)

game/commander/tasks/primitive/cas.py

@@ -1,33 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater import FrontLine
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanCas(PackagePlanningTask[FrontLine]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if self.target not in state.vulnerable_front_lines:
-            return False
-
-        # Do not bother planning CAS when there are no enemy ground units at the front.
-        # An exception is made for turn zero since that's not being truly planned, but
-        # just to determine what missions should be planned on turn 1 (when there *will*
-        # be ground units) and what aircraft should be ordered.
-        enemy_cp = self.target.control_point_friendly_to(
-            player=not state.context.coalition.player
-        )
-        if enemy_cp.deployable_front_line_units == 0 and state.context.turn > 0:
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.vulnerable_front_lines.remove(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.CAS, 2)
-        self.propose_flight(FlightType.TARCAP, 2)

game/commander/tasks/primitive/convoyinterdiction.py

@@ -1,26 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.data.doctrine import Doctrine
-from game.transfers import Convoy
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanConvoyInterdiction(PackagePlanningTask[Convoy]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if self.target not in state.enemy_convoys:
-            return False
-        if not self.target_area_preconditions_met(state):
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.enemy_convoys.remove(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.BAI, 2)
-        self.propose_common_escorts()

game/commander/tasks/primitive/dead.py

@@ -1,46 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.missionproposals import EscortType
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater.theatergroundobject import IadsGroundObject
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanDead(PackagePlanningTask[IadsGroundObject]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if (
-            self.target not in state.threatening_air_defenses
-            and self.target not in state.detecting_air_defenses
-        ):
-            return False
-        if not self.target_area_preconditions_met(state, ignore_iads=True):
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.eliminate_air_defense(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.DEAD, 2)
-
-        # 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 self.target.has_live_radar_sam:
-            self.propose_flight(FlightType.SEAD, 2)
-        else:
-            self.propose_flight(FlightType.SEAD_ESCORT, 2, EscortType.Sead)
-        self.propose_flight(FlightType.ESCORT, 2, EscortType.AirToAir)

game/commander/tasks/primitive/defensivestance.py

@@ -1,14 +0,0 @@
-from __future__ import annotations
-
-from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from gen.ground_forces.combat_stance import CombatStance
-
-
-class DefensiveStance(FrontLineStanceTask):
-    @property
-    def stance(self) -> CombatStance:
-        return CombatStance.DEFENSIVE
-
-    @property
-    def have_sufficient_front_line_advantage(self) -> bool:
-        return self.ground_force_balance >= 0.5

game/commander/tasks/primitive/eliminationattack.py

@@ -1,14 +0,0 @@
-from __future__ import annotations
-
-from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from gen.ground_forces.combat_stance import CombatStance
-
-
-class EliminationAttack(FrontLineStanceTask):
-    @property
-    def stance(self) -> CombatStance:
-        return CombatStance.ELIMINATION
-
-    @property
-    def have_sufficient_front_line_advantage(self) -> bool:
-        return self.ground_force_balance >= 1.5

game/commander/tasks/primitive/oca.py

@@ -1,29 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater import ControlPoint
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanOcaStrike(PackagePlanningTask[ControlPoint]):
-    aircraft_cold_start: bool
-
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if self.target not in state.oca_targets:
-            return False
-        if not self.target_area_preconditions_met(state):
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.oca_targets.remove(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.OCA_RUNWAY, 2)
-        if self.aircraft_cold_start:
-            self.propose_flight(FlightType.OCA_AIRCRAFT, 2)
-        self.propose_common_escorts()

game/commander/tasks/primitive/refueling.py

@@ -1,22 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater import MissionTarget
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanRefueling(PackagePlanningTask[MissionTarget]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if not super().preconditions_met(state):
-            return False
-        return self.target in state.refueling_targets
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.refueling_targets.remove(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.REFUELING, 1)

game/commander/tasks/primitive/retreatstance.py

@@ -1,14 +0,0 @@
-from __future__ import annotations
-
-from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from gen.ground_forces.combat_stance import CombatStance
-
-
-class RetreatStance(FrontLineStanceTask):
-    @property
-    def stance(self) -> CombatStance:
-        return CombatStance.RETREAT
-
-    @property
-    def have_sufficient_front_line_advantage(self) -> bool:
-        return True

game/commander/tasks/primitive/strike.py

@@ -1,26 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Any
-
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater.theatergroundobject import TheaterGroundObject
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanStrike(PackagePlanningTask[TheaterGroundObject[Any]]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if self.target not in state.strike_targets:
-            return False
-        if not self.target_area_preconditions_met(state):
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.strike_targets.remove(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.STRIKE, 2)
-        self.propose_common_escorts()

game/commander/tasks/theatercommandertask.py

@@ -1,16 +0,0 @@
-from __future__ import annotations
-
-from abc import abstractmethod
-from typing import TYPE_CHECKING
-
-from game.commander.theaterstate import TheaterState
-from game.htn import PrimitiveTask
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class TheaterCommanderTask(PrimitiveTask[TheaterState]):
-    @abstractmethod
-    def execute(self, coalition: Coalition) -> None:
-        ...

game/commander/theatercommander.py

@@ -1,88 +0,0 @@
-"""The Theater Commander is the highest level campaign AI.
-
-Target selection is performed with a hierarchical-task-network (HTN, linked below).
-These work by giving the planner an initial "task" which decomposes into other tasks
-until a concrete set of actions is formed. For example, the "capture base" task may
-decompose in the following manner:
-
-* Defend
-  * Reinforce front line
-  * Set front line stance to defend
-  * Destroy enemy front line units
-      * Set front line stance to elimination
-      * Plan CAS at front line
-* Prepare
-  * Destroy enemy IADS
-    * Plan DEAD against SAM Armadillo
-    * ...
-  * Destroy enemy front line units
-      * Set front line stance to elimination
-      * Plan CAS at front line
-* Inhibit
-  * Destroy enemy unit production infrastructure
-    * Destroy factory at Palmyra
-    * ...
-  * Destroy enemy front line units
-      * Set front line stance to elimination
-      * Plan CAS at front line
-* Attack
-  * Set front line stance to breakthrough
-  * Destroy enemy front line units
-      * Set front line stance to elimination
-      * Plan CAS at front line
-
-This is not a reflection of the actual task composition but illustrates the capability
-of the system. Each task has preconditions which are checked before the task is
-decomposed. If preconditions are not met the task is ignored and the next is considered.
-For example the task to destroy the factory at Palmyra might be excluded until the air
-defenses protecting it are eliminated; or defensive air operations might be excluded if
-the enemy does not have sufficient air forces, or if the protected target has sufficient
-SAM coverage.
-
-Each action updates the world state, which causes each action to account for the result
-of the tasks executed before it. Above, the preconditions for attacking the factory at
-Palmyra may not have been met due to the IADS coverage, leading the planning to decide
-on an attack against the IADS in the area instead. When planning the next task in the
-same turn, the world state will have been updated to account for the (hopefully)
-destroyed SAM sites, allowing the planner to choose the mission to attack the factory.
-
-Preconditions can be aware of previous actions as well. A precondition for "Plan CAS at
-front line" can be "No CAS missions planned at front line" to avoid over-planning CAS
-even though it is a primitive task used by many other tasks.
-
-https://en.wikipedia.org/wiki/Hierarchical_task_network
-"""
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from game.commander.tasks.compound.nextaction import PlanNextAction
-from game.commander.tasks.theatercommandertask import TheaterCommanderTask
-from game.commander.theaterstate import TheaterState
-from game.htn import Planner
-from game.profiling import MultiEventTracer
-
-if TYPE_CHECKING:
-    from game import Game
-
-
-class TheaterCommander(Planner[TheaterState, TheaterCommanderTask]):
-    def __init__(self, game: Game, player: bool) -> None:
-        super().__init__(
-            PlanNextAction(
-                aircraft_cold_start=game.settings.default_start_type == "Cold"
-            )
-        )
-        self.game = game
-        self.player = player
-
-    def plan_missions(self, tracer: MultiEventTracer) -> None:
-        state = TheaterState.from_game(self.game, self.player, tracer)
-        while True:
-            result = self.plan(state)
-            if result is None:
-                # Planned all viable tasks this turn.
-                return
-            for task in result.tasks:
-                task.execute(self.game.coalition_for(self.player))
-            state = result.end_state

game/commander/theaterstate.py

@@ -1,176 +0,0 @@
-from __future__ import annotations
-
-import dataclasses
-import itertools
-import math
-from collections import Iterator
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Union, Optional
-
-from game.commander.garrisons import Garrisons
-from game.commander.objectivefinder import ObjectiveFinder
-from game.htn import WorldState
-from game.profiling import MultiEventTracer
-from game.settings import Settings
-from game.squadrons import AirWing
-from game.theater import ControlPoint, FrontLine, MissionTarget, ConflictTheater
-from game.theater.theatergroundobject import (
-    TheaterGroundObject,
-    NavalGroundObject,
-    IadsGroundObject,
-    VehicleGroupGroundObject,
-    BuildingGroundObject,
-)
-from game.threatzones import ThreatZones
-from gen.ground_forces.combat_stance import CombatStance
-
-if TYPE_CHECKING:
-    from game import Game
-    from game.coalition import Coalition
-    from game.transfers import Convoy, CargoShip
-
-
-@dataclass(frozen=True)
-class PersistentContext:
-    coalition: Coalition
-    theater: ConflictTheater
-    turn: int
-    settings: Settings
-    tracer: MultiEventTracer
-
-
-@dataclass
-class TheaterState(WorldState["TheaterState"]):
-    context: PersistentContext
-    barcaps_needed: dict[ControlPoint, int]
-    active_front_lines: list[FrontLine]
-    front_line_stances: dict[FrontLine, Optional[CombatStance]]
-    vulnerable_front_lines: list[FrontLine]
-    aewc_targets: list[MissionTarget]
-    refueling_targets: list[MissionTarget]
-    enemy_air_defenses: list[IadsGroundObject]
-    threatening_air_defenses: list[Union[IadsGroundObject, NavalGroundObject]]
-    detecting_air_defenses: list[Union[IadsGroundObject, NavalGroundObject]]
-    enemy_convoys: list[Convoy]
-    enemy_shipping: list[CargoShip]
-    enemy_ships: list[NavalGroundObject]
-    enemy_garrisons: dict[ControlPoint, Garrisons]
-    oca_targets: list[ControlPoint]
-    strike_targets: list[TheaterGroundObject[Any]]
-    enemy_barcaps: list[ControlPoint]
-    threat_zones: ThreatZones
-
-    def _rebuild_threat_zones(self) -> None:
-        """Recreates the theater's threat zones based on the current planned state."""
-        self.threat_zones = ThreatZones.for_threats(
-            self.context.coalition.opponent.doctrine,
-            barcap_locations=self.enemy_barcaps,
-            air_defenses=itertools.chain(self.enemy_air_defenses, self.enemy_ships),
-        )
-
-    def eliminate_air_defense(self, target: IadsGroundObject) -> None:
-        if target in self.threatening_air_defenses:
-            self.threatening_air_defenses.remove(target)
-        if target in self.detecting_air_defenses:
-            self.detecting_air_defenses.remove(target)
-        self.enemy_air_defenses.remove(target)
-        self._rebuild_threat_zones()
-
-    def eliminate_ship(self, target: NavalGroundObject) -> None:
-        if target in self.threatening_air_defenses:
-            self.threatening_air_defenses.remove(target)
-        if target in self.detecting_air_defenses:
-            self.detecting_air_defenses.remove(target)
-        self.enemy_ships.remove(target)
-        self._rebuild_threat_zones()
-
-    def has_garrison(self, target: VehicleGroupGroundObject) -> bool:
-        return target in self.enemy_garrisons[target.control_point]
-
-    def eliminate_garrison(self, target: VehicleGroupGroundObject) -> None:
-        self.enemy_garrisons[target.control_point].eliminate(target)
-
-    def ammo_dumps_at(
-        self, control_point: ControlPoint
-    ) -> Iterator[BuildingGroundObject]:
-        for target in self.strike_targets:
-            if target.control_point != control_point:
-                continue
-            if target.is_ammo_depot:
-                assert isinstance(target, BuildingGroundObject)
-                yield target
-
-    def clone(self) -> TheaterState:
-        # Do not use copy.deepcopy. Copying every TGO, control point, etc is absurdly
-        # expensive.
-        return TheaterState(
-            context=self.context,
-            barcaps_needed=dict(self.barcaps_needed),
-            active_front_lines=list(self.active_front_lines),
-            front_line_stances=dict(self.front_line_stances),
-            vulnerable_front_lines=list(self.vulnerable_front_lines),
-            aewc_targets=list(self.aewc_targets),
-            refueling_targets=list(self.refueling_targets),
-            enemy_air_defenses=list(self.enemy_air_defenses),
-            enemy_convoys=list(self.enemy_convoys),
-            enemy_shipping=list(self.enemy_shipping),
-            enemy_ships=list(self.enemy_ships),
-            enemy_garrisons={
-                cp: dataclasses.replace(g) for cp, g in self.enemy_garrisons.items()
-            },
-            oca_targets=list(self.oca_targets),
-            strike_targets=list(self.strike_targets),
-            enemy_barcaps=list(self.enemy_barcaps),
-            threat_zones=self.threat_zones,
-            # Persistent properties are not copied. These are a way for failed subtasks
-            # to communicate requirements to other tasks. For example, the task to
-            # attack enemy garrisons might fail because the target area has IADS
-            # protection. In that case, the preconditions of PlanBai would fail, but
-            # would add the IADS that prevented it from being planned to the list of
-            # IADS threats so that DegradeIads will consider it a threat later.
-            threatening_air_defenses=self.threatening_air_defenses,
-            detecting_air_defenses=self.detecting_air_defenses,
-        )
-
-    @classmethod
-    def from_game(
-        cls, game: Game, player: bool, tracer: MultiEventTracer
-    ) -> TheaterState:
-        coalition = game.coalition_for(player)
-        finder = ObjectiveFinder(game, player)
-        ordered_capturable_points = finder.prioritized_unisolated_points()
-
-        context = PersistentContext(
-            coalition, game.theater, game.turn, game.settings, tracer
-        )
-
-        # Plan enough rounds of CAP that the target has coverage over the expected
-        # mission duration.
-        mission_duration = game.settings.desired_player_mission_duration.total_seconds()
-        barcap_duration = coalition.doctrine.cap_duration.total_seconds()
-        barcap_rounds = math.ceil(mission_duration / barcap_duration)
-
-        return TheaterState(
-            context=context,
-            barcaps_needed={
-                cp: barcap_rounds for cp in finder.vulnerable_control_points()
-            },
-            active_front_lines=list(finder.front_lines()),
-            front_line_stances={f: None for f in finder.front_lines()},
-            vulnerable_front_lines=list(finder.front_lines()),
-            aewc_targets=[finder.farthest_friendly_control_point()],
-            refueling_targets=[finder.closest_friendly_control_point()],
-            enemy_air_defenses=list(finder.enemy_air_defenses()),
-            threatening_air_defenses=[],
-            detecting_air_defenses=[],
-            enemy_convoys=list(finder.convoys()),
-            enemy_shipping=list(finder.cargo_ships()),
-            enemy_ships=list(finder.enemy_ships()),
-            enemy_garrisons={
-                cp: Garrisons.for_control_point(cp) for cp in ordered_capturable_points
-            },
-            oca_targets=list(finder.oca_targets(min_aircraft=20)),
-            strike_targets=list(finder.strike_targets()),
-            enemy_barcaps=list(game.theater.control_points_for(not player)),
-            threat_zones=game.threat_zone_for(not player),
-        )

game/data/aaa_db.py

@@ -0,0 +1,22 @@
+from dcs.vehicles import AirDefence
+
+AAA_UNITS = [
+    AirDefence.SPAAA_Gepard,
+    AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish,
+    AirDefence.SPAAA_Vulcan_M163,
+    AirDefence.AAA_ZU_23_Closed_Emplacement,
+    AirDefence.AAA_ZU_23_Emplacement,
+    AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375,
+    AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent,
+    AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375,
+    AirDefence.AAA_ZU_23_Insurgent,
+    AirDefence.AAA_8_8cm_Flak_18,
+    AirDefence.AAA_Flak_38_20mm,
+    AirDefence.AAA_8_8cm_Flak_36,
+    AirDefence.AAA_8_8cm_Flak_37,
+    AirDefence.AAA_Flak_Vierling_38_Quad_20mm,
+    AirDefence.AAA_SP_Kdo_G_40,
+    AirDefence.AAA_8_8cm_Flak_41,
+    AirDefence.AAA_40mm_Bofors,
+    AirDefence.AAA_S_60_57mm,
+]

game/data/alic.py

@@ -1,42 +0,0 @@
-from dcs.unit import Unit
-from dcs.vehicles import AirDefence
-
-
-class AlicCodes:
-    CODES = {
-        AirDefence._1L13_EWR.id: 101,
-        AirDefence._55G6_EWR.id: 102,
-        AirDefence.S_300PS_40B6MD_sr.id: 103,
-        AirDefence.S_300PS_64H6E_sr.id: 104,
-        AirDefence.SA_11_Buk_SR_9S18M1.id: 107,
-        AirDefence.Kub_1S91_str.id: 108,
-        AirDefence.Dog_Ear_radar.id: 109,
-        AirDefence.S_300PS_40B6M_tr.id: 110,
-        AirDefence.SA_11_Buk_LN_9A310M1.id: 115,
-        AirDefence.Osa_9A33_ln.id: 117,
-        AirDefence.Strela_10M3.id: 118,
-        AirDefence.Tor_9A331.id: 119,
-        AirDefence._2S6_Tunguska.id: 120,
-        AirDefence.ZSU_23_4_Shilka.id: 121,
-        AirDefence.P_19_s_125_sr.id: 122,
-        AirDefence.Snr_s_125_tr.id: 123,
-        AirDefence.Rapier_fsa_blindfire_radar.id: 124,
-        AirDefence.Rapier_fsa_launcher.id: 125,
-        AirDefence.SNR_75V.id: 126,
-        AirDefence.HQ_7_LN_SP.id: 127,
-        AirDefence.HQ_7_STR_SP.id: 128,
-        AirDefence.RLS_19J6.id: 130,
-        AirDefence.Roland_ADS.id: 201,
-        AirDefence.Patriot_str.id: 202,
-        AirDefence.Hawk_sr.id: 203,
-        AirDefence.Hawk_tr.id: 204,
-        AirDefence.Roland_Radar.id: 205,
-        AirDefence.Hawk_cwar.id: 206,
-        AirDefence.Gepard.id: 207,
-        AirDefence.Vulcan.id: 208,
-        AirDefence.NASAMS_Radar_MPQ64F1.id: 209,
-    }
-
-    @classmethod
-    def code_for(cls, unit: Unit) -> int:
-        return cls.CODES[unit.type]

game/data/building_data.py

@@ -3,30 +3,37 @@ import dcs
 
 DEFAULT_AVAILABLE_BUILDINGS = [
     "fuel",
+    "ammo",
     "comms",
     "oil",
     "ware",
     "farp",
+    "fob",
     "power",
+    "factory",
     "derrick",
 ]
 
-WW2_FREE = ["fuel", "ware"]
+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",
 ]
 
 FORTIFICATION_BUILDINGS = [

game/data/cap_capabilities_db.py

@@ -0,0 +1,51 @@
+from dcs.planes import (
+    Bf_109K_4,
+    C_101CC,
+    FW_190A8,
+    FW_190D9,
+    F_5E_3,
+    F_86F_Sabre,
+    I_16,
+    L_39ZA,
+    MiG_15bis,
+    MiG_19P,
+    MiG_21Bis,
+    P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
+    P_51D,
+    P_51D_30_NA,
+    SpitfireLFMkIX,
+    SpitfireLFMkIXCW,
+)
+
+from pydcs_extensions.a4ec.a4ec import A_4E_C
+
+"""
+This list contains the aircraft that do not use the guns as the last resort weapons, but as a main weapon
+They'll RTB when they don't have gun ammo left
+"""
+GUNFIGHTERS = [
+    # Cold War
+    MiG_15bis,
+    MiG_19P,
+    MiG_21Bis,
+    F_86F_Sabre,
+    A_4E_C,
+    F_5E_3,
+    # Trainers
+    C_101CC,
+    L_39ZA,
+    # WW2
+    P_51D_30_NA,
+    P_51D,
+    P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
+    SpitfireLFMkIXCW,
+    SpitfireLFMkIX,
+    Bf_109K_4,
+    FW_190D9,
+    FW_190A8,
+    I_16,
+]

game/data/doctrine.py

@@ -1,21 +1,9 @@
 from dataclasses import dataclass
 from datetime import timedelta
 
-from game.data.groundunitclass import GroundUnitClass
 from game.utils import Distance, feet, nautical_miles
 
 
-@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)
 class Doctrine:
     cas: bool
@@ -25,26 +13,13 @@ class Doctrine:
     antiship: bool
 
     rendezvous_altitude: Distance
-
-    #: The minimum distance between the departure airfield and the hold point.
     hold_distance: Distance
-
-    #: The minimum distance between the hold point and the join point.
     push_distance: Distance
-
-    #: The distance between the join point and the ingress point. Only used for the
-    #: fallback flight plan layout (when the departure airfield is near a threat zone).
     join_distance: Distance
-
-    #: The maximum distance between the ingress point (beginning of the attack) and
-    #: target.
-    max_ingress_distance: Distance
-
-    #: The minimum distance between the ingress point (beginning of the attack) and
-    #: target.
-    min_ingress_distance: Distance
-
+    split_distance: Distance
+    ingress_egress_distance: Distance
     ingress_altitude: Distance
+    egress_altitude: Distance
 
     min_patrol_altitude: Distance
     max_patrol_altitude: Distance
@@ -75,8 +50,6 @@ class Doctrine:
 
     sweep_distance: Distance
 
-    ground_unit_procurement_ratios: GroundUnitProcurementRatios
-
 
 MODERN_DOCTRINE = Doctrine(
     cap=True,
@@ -85,12 +58,13 @@ MODERN_DOCTRINE = Doctrine(
     strike=True,
     antiship=True,
     rendezvous_altitude=feet(25000),
-    hold_distance=nautical_miles(25),
+    hold_distance=nautical_miles(15),
     push_distance=nautical_miles(20),
     join_distance=nautical_miles(20),
-    max_ingress_distance=nautical_miles(45),
-    min_ingress_distance=nautical_miles(10),
+    split_distance=nautical_miles(20),
+    ingress_egress_distance=nautical_miles(45),
     ingress_altitude=feet(20000),
+    egress_altitude=feet(20000),
     min_patrol_altitude=feet(15000),
     max_patrol_altitude=feet(33000),
     pattern_altitude=feet(5000),
@@ -102,17 +76,6 @@ 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(
@@ -122,12 +85,13 @@ COLDWAR_DOCTRINE = Doctrine(
     strike=True,
     antiship=True,
     rendezvous_altitude=feet(22000),
-    hold_distance=nautical_miles(15),
+    hold_distance=nautical_miles(10),
     push_distance=nautical_miles(10),
     join_distance=nautical_miles(10),
-    max_ingress_distance=nautical_miles(30),
-    min_ingress_distance=nautical_miles(10),
+    split_distance=nautical_miles(10),
+    ingress_egress_distance=nautical_miles(30),
     ingress_altitude=feet(18000),
+    egress_altitude=feet(18000),
     min_patrol_altitude=feet(10000),
     max_patrol_altitude=feet(24000),
     pattern_altitude=feet(5000),
@@ -139,17 +103,6 @@ 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(
@@ -158,13 +111,14 @@ WWII_DOCTRINE = Doctrine(
     sead=False,
     strike=True,
     antiship=True,
-    hold_distance=nautical_miles(10),
+    hold_distance=nautical_miles(5),
     push_distance=nautical_miles(5),
     join_distance=nautical_miles(5),
+    split_distance=nautical_miles(5),
     rendezvous_altitude=feet(10000),
-    max_ingress_distance=nautical_miles(7),
-    min_ingress_distance=nautical_miles(5),
+    ingress_egress_distance=nautical_miles(7),
     ingress_altitude=feet(8000),
+    egress_altitude=feet(8000),
     min_patrol_altitude=feet(4000),
     max_patrol_altitude=feet(15000),
     pattern_altitude=feet(5000),
@@ -176,14 +130,4 @@ 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

@@ -1,17 +0,0 @@
-from __future__ import annotations
-
-from enum import unique, Enum
-
-
-@unique
-class GroundUnitClass(Enum):
-    Tank = "Tank"
-    Atgm = "ATGM"
-    Ifv = "IFV"
-    Apc = "APC"
-    Artillery = "Artillery"
-    Logistics = "Logistics"
-    Recon = "Recon"
-    Infantry = "Infantry"
-    Shorads = "SHORADS"
-    Manpads = "MANPADS"

game/data/radar_db.py

@@ -1,117 +1,72 @@
 from dcs.ships import (
-    Forrestal,
-    PIOTR,
-    MOSCOW,
-    VINSON,
-    CVN_71,
-    CVN_72,
-    CVN_73,
-    Stennis,
-    KUZNECOW,
-    CV_1143_5,
-    NEUSTRASH,
-    ALBATROS,
-    REZKY,
-    MOLNIYA,
-    LHA_Tarawa,
-    PERRY,
-    TICONDEROG,
-    Type_052B,
-    Type_052C,
-    Type_054A,
-    USS_Arleigh_Burke_IIa,
+    Battlecruiser_1144_2_Pyotr_Velikiy,
+    Cruiser_1164_Moskva,
+    CVN_70_Carl_Vinson,
+    CVN_71_Theodore_Roosevelt,
+    CVN_72_Abraham_Lincoln,
+    CVN_73_George_Washington,
+    CVN_74_John_C__Stennis,
+    CV_1143_5_Admiral_Kuznetsov,
+    CV_1143_5_Admiral_Kuznetsov_2017,
+    Frigate_11540_Neustrashimy,
+    Corvette_1124_4_Grisha,
+    Frigate_1135M_Rezky,
+    Corvette_1241_1_Molniya,
+    LHA_1_Tarawa,
+    FFG_Oliver_Hazzard_Perry,
+    CG_Ticonderoga,
+    Type_052B_Destroyer,
+    Type_052C_Destroyer,
+    Type_054A_Frigate,
+    DDG_Arleigh_Burke_IIa,
 )
 from dcs.vehicles import AirDefence
 
-TELARS = {
-    AirDefence._2S6_Tunguska,
-    AirDefence.SA_11_Buk_LN_9A310M1,
-    AirDefence.Osa_9A33_ln,
-    AirDefence.Tor_9A331,
-    AirDefence.Roland_ADS,
-}
-
-TRACK_RADARS = {
-    AirDefence.Kub_1S91_str,
-    AirDefence.Snr_s_125_tr,
-    AirDefence.S_300PS_40B6M_tr,
-    AirDefence.Hawk_tr,
-    AirDefence.Patriot_str,
-    AirDefence.SNR_75V,
-    AirDefence.RPC_5N62V,
-    AirDefence.Rapier_fsa_blindfire_radar,
-    AirDefence.HQ_7_STR_SP,
-    AirDefence.NASAMS_Radar_MPQ64F1,
-}
-
-LAUNCHER_TRACKER_PAIRS = {
-    AirDefence.Kub_2P25_ln: AirDefence.Kub_1S91_str,
-    AirDefence._5p73_s_125_ln: AirDefence.Snr_s_125_tr,
-    AirDefence.S_300PS_5P85C_ln: AirDefence.S_300PS_40B6M_tr,
-    AirDefence.S_300PS_5P85D_ln: AirDefence.S_300PS_40B6M_tr,
-    AirDefence.Hawk_ln: AirDefence.Hawk_tr,
-    AirDefence.Patriot_ln: AirDefence.Patriot_str,
-    AirDefence.S_75M_Volhov: AirDefence.SNR_75V,
-    AirDefence.Rapier_fsa_launcher: AirDefence.Rapier_fsa_blindfire_radar,
-    AirDefence.HQ_7_LN_SP: AirDefence.HQ_7_STR_SP,
-    AirDefence.S_200_Launcher: AirDefence.RPC_5N62V,
-    AirDefence.NASAMS_LN_B: AirDefence.NASAMS_Radar_MPQ64F1,
-    AirDefence.NASAMS_LN_C: AirDefence.NASAMS_Radar_MPQ64F1,
-}
-
-UNITS_WITH_RADAR = {
+UNITS_WITH_RADAR = [
     # Radars
-    AirDefence._2S6_Tunguska,
-    AirDefence.SA_11_Buk_LN_9A310M1,
-    AirDefence.Osa_9A33_ln,
-    AirDefence.Tor_9A331,
-    AirDefence.Gepard,
-    AirDefence.Vulcan,
-    AirDefence.Roland_ADS,
-    AirDefence.ZSU_23_4_Shilka,
-    AirDefence._1L13_EWR,
-    AirDefence.Kub_1S91_str,
-    AirDefence.S_300PS_40B6M_tr,
-    AirDefence.S_300PS_40B6MD_sr,
-    AirDefence._55G6_EWR,
-    AirDefence.S_300PS_64H6E_sr,
-    AirDefence.SA_11_Buk_SR_9S18M1,
-    AirDefence.Dog_Ear_radar,
-    AirDefence.Hawk_tr,
-    AirDefence.Hawk_sr,
-    AirDefence.Patriot_str,
-    AirDefence.Hawk_cwar,
-    AirDefence.P_19_s_125_sr,
-    AirDefence.Roland_Radar,
-    AirDefence.Snr_s_125_tr,
-    AirDefence.SNR_75V,
-    AirDefence.RLS_19J6,
-    AirDefence.RPC_5N62V,
-    AirDefence.Rapier_fsa_blindfire_radar,
-    AirDefence.HQ_7_LN_SP,
-    AirDefence.HQ_7_STR_SP,
-    AirDefence.FuMG_401,
-    AirDefence.FuSe_65,
+    AirDefence.SAM_SA_15_Tor_Gauntlet,
+    AirDefence.SAM_SA_11_Buk_Gadfly_C2,
+    AirDefence.SAM_Patriot_CR__AMG_AN_MRC_137,
+    AirDefence.SAM_Patriot_ECS,
+    AirDefence.SPAAA_Gepard,
+    AirDefence.SPAAA_Vulcan_M163,
+    AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish,
+    AirDefence.EWR_1L13,
+    AirDefence.SAM_SA_6_Kub_Long_Track_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.HQ_7_Self_Propelled_STR,
     # Ships
-    ALBATROS,
-    CVN_71,
-    CVN_72,
-    CVN_73,
-    CV_1143_5,
-    Forrestal,
-    KUZNECOW,
-    LHA_Tarawa,
-    MOLNIYA,
-    MOSCOW,
-    NEUSTRASH,
-    PERRY,
-    PIOTR,
-    REZKY,
-    Stennis,
-    TICONDEROG,
-    Type_052B,
-    Type_052C,
-    Type_054A,
-    USS_Arleigh_Burke_IIa,
-    VINSON,
-}
+    CVN_70_Carl_Vinson,
+    FFG_Oliver_Hazzard_Perry,
+    CG_Ticonderoga,
+    Corvette_1124_4_Grisha,
+    CV_1143_5_Admiral_Kuznetsov,
+    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,
+    DDG_Arleigh_Burke_IIa,
+    LHA_1_Tarawa,
+    Type_052B_Destroyer,
+    Type_054A_Frigate,
+    Type_052C_Destroyer,
+]

game/dcs/aircrafttype.py

@@ -1,394 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections import defaultdict
-from dataclasses import dataclass
-from functools import cached_property
-from pathlib import Path
-from typing import ClassVar, Type, Iterator, TYPE_CHECKING, Optional, Any
-
-import yaml
-from dcs.helicopters import helicopter_map
-from dcs.planes import plane_map
-from dcs.unittype import FlyingType
-
-from game.dcs.unittype import UnitType
-from game.radio.channels import (
-    ChannelNamer,
-    RadioChannelAllocator,
-    CommonRadioChannelAllocator,
-    HueyChannelNamer,
-    SCR522ChannelNamer,
-    ViggenChannelNamer,
-    ViperChannelNamer,
-    TomcatChannelNamer,
-    MirageChannelNamer,
-    SingleRadioChannelNamer,
-    FarmerRadioChannelAllocator,
-    SCR522RadioChannelAllocator,
-    ViggenRadioChannelAllocator,
-    NoOpChannelAllocator,
-)
-from game.utils import (
-    Distance,
-    SPEED_OF_SOUND_AT_SEA_LEVEL,
-    Speed,
-    feet,
-    kph,
-    knots,
-    nautical_miles,
-)
-
-if TYPE_CHECKING:
-    from gen.aircraft import FlightData
-    from gen.airsupport import AirSupport
-    from gen.radios import Radio, RadioFrequency, RadioRegistry
-
-
-@dataclass(frozen=True)
-class RadioConfig:
-    inter_flight: Optional[Radio]
-    intra_flight: Optional[Radio]
-    channel_allocator: Optional[RadioChannelAllocator]
-    channel_namer: Type[ChannelNamer]
-
-    @classmethod
-    def from_data(cls, data: dict[str, Any]) -> RadioConfig:
-        return RadioConfig(
-            cls.make_radio(data.get("inter_flight", None)),
-            cls.make_radio(data.get("intra_flight", None)),
-            cls.make_allocator(data.get("channels", {})),
-            cls.make_namer(data.get("channels", {})),
-        )
-
-    @classmethod
-    def make_radio(cls, name: Optional[str]) -> Optional[Radio]:
-        from gen.radios import get_radio
-
-        if name is None:
-            return None
-        return get_radio(name)
-
-    @classmethod
-    def make_allocator(cls, data: dict[str, Any]) -> Optional[RadioChannelAllocator]:
-        try:
-            alloc_type = data["type"]
-        except KeyError:
-            return None
-        allocator_type: Type[RadioChannelAllocator] = {
-            "SCR-522": SCR522RadioChannelAllocator,
-            "common": CommonRadioChannelAllocator,
-            "farmer": FarmerRadioChannelAllocator,
-            "noop": NoOpChannelAllocator,
-            "viggen": ViggenRadioChannelAllocator,
-        }[alloc_type]
-        return allocator_type.from_cfg(data)
-
-    @classmethod
-    def make_namer(cls, config: dict[str, Any]) -> Type[ChannelNamer]:
-        return {
-            "SCR-522": SCR522ChannelNamer,
-            "default": ChannelNamer,
-            "huey": HueyChannelNamer,
-            "mirage": MirageChannelNamer,
-            "single": SingleRadioChannelNamer,
-            "tomcat": TomcatChannelNamer,
-            "viggen": ViggenChannelNamer,
-            "viper": ViperChannelNamer,
-        }[config.get("namer", "default")]
-
-
-@dataclass(frozen=True)
-class PatrolConfig:
-    altitude: Optional[Distance]
-    speed: Optional[Speed]
-
-    @classmethod
-    def from_data(cls, data: dict[str, Any]) -> PatrolConfig:
-        altitude = data.get("altitude", None)
-        speed = data.get("speed", None)
-        return PatrolConfig(
-            feet(altitude) if altitude is not None else None,
-            knots(speed) if speed is not None else None,
-        )
-
-
-@dataclass(frozen=True)
-class FuelConsumption:
-    #: The estimated taxi fuel requirement, in pounds.
-    taxi: int
-
-    #: The estimated fuel consumption for a takeoff climb, in pounds per nautical mile.
-    climb: float
-
-    #: The estimated fuel consumption for cruising, in pounds per nautical mile.
-    cruise: float
-
-    #: The estimated fuel consumption for combat speeds, in pounds per nautical mile.
-    combat: float
-
-    #: The minimum amount of fuel that the aircraft should land with, in pounds. This is
-    #: a reserve amount for landing delays or emergencies.
-    min_safe: int
-
-    @classmethod
-    def from_data(cls, data: dict[str, Any]) -> FuelConsumption:
-        return FuelConsumption(
-            int(data["taxi"]),
-            float(data["climb_ppm"]),
-            float(data["cruise_ppm"]),
-            float(data["combat_ppm"]),
-            int(data["min_safe"]),
-        )
-
-
-# TODO: Split into PlaneType and HelicopterType?
-@dataclass(frozen=True)
-class AircraftType(UnitType[Type[FlyingType]]):
-    carrier_capable: bool
-    lha_capable: bool
-    always_keeps_gun: bool
-
-    # If true, the aircraft does not use the guns as the last resort weapons, but as a
-    # main weapon. It'll RTB when it doesn't have gun ammo left.
-    gunfighter: bool
-
-    max_group_size: int
-    patrol_altitude: Optional[Distance]
-    patrol_speed: Optional[Speed]
-
-    #: The maximum range between the origin airfield and the target for which the auto-
-    #: planner will consider this aircraft usable for a mission.
-    max_mission_range: Distance
-
-    fuel_consumption: Optional[FuelConsumption]
-
-    intra_flight_radio: Optional[Radio]
-    channel_allocator: Optional[RadioChannelAllocator]
-    channel_namer: Type[ChannelNamer]
-
-    _by_name: ClassVar[dict[str, AircraftType]] = {}
-    _by_unit_type: ClassVar[dict[Type[FlyingType], list[AircraftType]]] = defaultdict(
-        list
-    )
-    _loaded: ClassVar[bool] = False
-
-    def __str__(self) -> str:
-        return self.name
-
-    @property
-    def dcs_id(self) -> str:
-        return self.dcs_unit_type.id
-
-    @property
-    def flyable(self) -> bool:
-        return self.dcs_unit_type.flyable
-
-    @property
-    def helicopter(self) -> bool:
-        return self.dcs_unit_type.helicopter
-
-    @cached_property
-    def max_speed(self) -> Speed:
-        return kph(self.dcs_unit_type.max_speed)
-
-    @property
-    def preferred_patrol_altitude(self) -> Distance:
-        if self.patrol_altitude is not None:
-            return self.patrol_altitude
-        else:
-            # Estimate based on max speed.
-            # Aircaft with max speed 600 kph will prefer patrol at 10 000 ft
-            # Aircraft with max speed 2800 kph will prefer pratrol at 33 000 ft
-            altitude_for_lowest_speed = feet(10 * 1000)
-            altitude_for_highest_speed = feet(33 * 1000)
-            lowest_speed = kph(600)
-            highest_speed = kph(2800)
-            factor = (self.max_speed - lowest_speed).kph / (
-                highest_speed - lowest_speed
-            ).kph
-            altitude = (
-                altitude_for_lowest_speed
-                + (altitude_for_highest_speed - altitude_for_lowest_speed) * factor
-            )
-            logging.debug(
-                f"Preferred patrol altitude for {self.dcs_unit_type.id}: {altitude.feet}"
-            )
-            rounded_altitude = feet(round(1000 * round(altitude.feet / 1000)))
-            return max(
-                altitude_for_lowest_speed,
-                min(altitude_for_highest_speed, rounded_altitude),
-            )
-
-    def preferred_patrol_speed(self, altitude: Distance) -> Speed:
-        """Preferred true airspeed when patrolling"""
-        if self.patrol_speed is not None:
-            return self.patrol_speed
-        else:
-            # Estimate based on max speed.
-            max_speed = self.max_speed
-            if max_speed > SPEED_OF_SOUND_AT_SEA_LEVEL * 1.6:
-                # Fast airplanes, should manage pretty high patrol speed
-                return (
-                    Speed.from_mach(0.85, altitude)
-                    if altitude.feet > 20000
-                    else Speed.from_mach(0.7, altitude)
-                )
-            elif max_speed > SPEED_OF_SOUND_AT_SEA_LEVEL * 1.2:
-                # Medium-fast like F/A-18C
-                return (
-                    Speed.from_mach(0.8, altitude)
-                    if altitude.feet > 20000
-                    else Speed.from_mach(0.65, altitude)
-                )
-            elif max_speed > SPEED_OF_SOUND_AT_SEA_LEVEL * 0.7:
-                # Semi-fast like airliners or similar
-                return (
-                    Speed.from_mach(0.5, altitude)
-                    if altitude.feet > 20000
-                    else Speed.from_mach(0.4, altitude)
-                )
-            else:
-                # Slow like warbirds or helicopters
-                # Use whichever is slowest - mach 0.35 or 70% of max speed
-                logging.debug(f"{self.name} max_speed * 0.7 is {max_speed * 0.7}")
-                return min(Speed.from_mach(0.35, altitude), max_speed * 0.7)
-
-    def alloc_flight_radio(self, radio_registry: RadioRegistry) -> RadioFrequency:
-        from gen.radios import ChannelInUseError, kHz
-
-        if self.intra_flight_radio is not None:
-            return radio_registry.alloc_for_radio(self.intra_flight_radio)
-
-        # The default radio frequency is set in megahertz. For some aircraft, it is a
-        # floating point value. For all current aircraft, adjusting to kilohertz will be
-        # sufficient to convert to an integer.
-        in_khz = float(self.dcs_unit_type.radio_frequency) * 1000
-        if not in_khz.is_integer():
-            logging.warning(
-                f"Found unexpected sub-kHz default radio for {self}: {in_khz} kHz. "
-                "Truncating to integer. The truncated frequency may not be valid for "
-                "the aircraft."
-            )
-
-        freq = kHz(int(in_khz))
-        try:
-            radio_registry.reserve(freq)
-        except ChannelInUseError:
-            pass
-        return freq
-
-    def assign_channels_for_flight(
-        self, flight: FlightData, air_support: AirSupport
-    ) -> None:
-        if self.channel_allocator is not None:
-            self.channel_allocator.assign_channels_for_flight(flight, air_support)
-
-    def channel_name(self, radio_id: int, channel_id: int) -> str:
-        return self.channel_namer.channel_name(radio_id, channel_id)
-
-    def __setstate__(self, state: dict[str, Any]) -> None:
-        # Update any existing models with new data on load.
-        updated = AircraftType.named(state["name"])
-        state.update(updated.__dict__)
-        self.__dict__.update(state)
-
-    @classmethod
-    def register(cls, aircraft_type: AircraftType) -> None:
-        cls._by_name[aircraft_type.name] = aircraft_type
-        cls._by_unit_type[aircraft_type.dcs_unit_type].append(aircraft_type)
-
-    @classmethod
-    def named(cls, name: str) -> AircraftType:
-        if not cls._loaded:
-            cls._load_all()
-        return cls._by_name[name]
-
-    @classmethod
-    def for_dcs_type(cls, dcs_unit_type: Type[FlyingType]) -> Iterator[AircraftType]:
-        if not cls._loaded:
-            cls._load_all()
-        yield from cls._by_unit_type[dcs_unit_type]
-
-    @staticmethod
-    def _each_unit_type() -> Iterator[Type[FlyingType]]:
-        yield from helicopter_map.values()
-        yield from plane_map.values()
-
-    @classmethod
-    def _load_all(cls) -> None:
-        for unit_type in cls._each_unit_type():
-            for data in cls._each_variant_of(unit_type):
-                cls.register(data)
-        cls._loaded = True
-
-    @classmethod
-    def _each_variant_of(cls, aircraft: Type[FlyingType]) -> Iterator[AircraftType]:
-        data_path = Path("resources/units/aircraft") / f"{aircraft.id}.yaml"
-        if not data_path.exists():
-            logging.warning(f"No data for {aircraft.id}; it will not be available")
-            return
-
-        with data_path.open(encoding="utf-8") as data_file:
-            data = yaml.safe_load(data_file)
-
-        try:
-            price = data["price"]
-        except KeyError as ex:
-            raise KeyError(f"Missing required price field: {data_path}") from ex
-
-        radio_config = RadioConfig.from_data(data.get("radios", {}))
-        patrol_config = PatrolConfig.from_data(data.get("patrol", {}))
-
-        try:
-            mission_range = nautical_miles(int(data["max_range"]))
-        except (KeyError, ValueError):
-            mission_range = (
-                nautical_miles(50) if aircraft.helicopter else nautical_miles(150)
-            )
-            logging.warning(
-                f"{aircraft.id} does not specify a max_range. Defaulting to "
-                f"{mission_range.nautical_miles}NM"
-            )
-
-        fuel_data = data.get("fuel")
-        if fuel_data is not None:
-            fuel_consumption: Optional[FuelConsumption] = FuelConsumption.from_data(
-                fuel_data
-            )
-        else:
-            fuel_consumption = None
-
-        try:
-            introduction = data["introduced"]
-            if introduction is None:
-                introduction = "N/A"
-        except KeyError:
-            introduction = "No data."
-
-        for variant in data.get("variants", [aircraft.id]):
-            yield AircraftType(
-                dcs_unit_type=aircraft,
-                name=variant,
-                description=data.get(
-                    "description",
-                    f"No data. <a href=\"https://google.com/search?q=DCS+{variant.replace(' ', '+')}\"><span style=\"color:#FFFFFF\">Google {variant}</span></a>",
-                ),
-                year_introduced=introduction,
-                country_of_origin=data.get("origin", "No data."),
-                manufacturer=data.get("manufacturer", "No data."),
-                role=data.get("role", "No data."),
-                price=price,
-                carrier_capable=data.get("carrier_capable", False),
-                lha_capable=data.get("lha_capable", False),
-                always_keeps_gun=data.get("always_keeps_gun", False),
-                gunfighter=data.get("gunfighter", False),
-                max_group_size=data.get("max_group_size", aircraft.group_size_max),
-                patrol_altitude=patrol_config.altitude,
-                patrol_speed=patrol_config.speed,
-                max_mission_range=mission_range,
-                fuel_consumption=fuel_consumption,
-                intra_flight_radio=radio_config.intra_flight,
-                channel_allocator=radio_config.channel_allocator,
-                channel_namer=radio_config.channel_namer,
-            )

game/dcs/groundunittype.py

@@ -1,100 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections import defaultdict
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Type, Optional, ClassVar, Iterator
-
-import yaml
-from dcs.unittype import VehicleType
-from dcs.vehicles import vehicle_map
-
-from game.data.groundunitclass import GroundUnitClass
-from game.dcs.unittype import UnitType
-
-
-@dataclass(frozen=True)
-class GroundUnitType(UnitType[Type[VehicleType]]):
-    unit_class: Optional[GroundUnitClass]
-    spawn_weight: int
-
-    _by_name: ClassVar[dict[str, GroundUnitType]] = {}
-    _by_unit_type: ClassVar[
-        dict[Type[VehicleType], list[GroundUnitType]]
-    ] = defaultdict(list)
-    _loaded: ClassVar[bool] = False
-
-    def __str__(self) -> str:
-        return self.name
-
-    @property
-    def dcs_id(self) -> str:
-        return self.dcs_unit_type.id
-
-    @classmethod
-    def register(cls, aircraft_type: GroundUnitType) -> None:
-        cls._by_name[aircraft_type.name] = aircraft_type
-        cls._by_unit_type[aircraft_type.dcs_unit_type].append(aircraft_type)
-
-    @classmethod
-    def named(cls, name: str) -> GroundUnitType:
-        if not cls._loaded:
-            cls._load_all()
-        return cls._by_name[name]
-
-    @classmethod
-    def for_dcs_type(cls, dcs_unit_type: Type[VehicleType]) -> Iterator[GroundUnitType]:
-        if not cls._loaded:
-            cls._load_all()
-        yield from cls._by_unit_type[dcs_unit_type]
-
-    @staticmethod
-    def _each_unit_type() -> Iterator[Type[VehicleType]]:
-        yield from vehicle_map.values()
-
-    @classmethod
-    def _load_all(cls) -> None:
-        for unit_type in cls._each_unit_type():
-            for data in cls._each_variant_of(unit_type):
-                cls.register(data)
-        cls._loaded = True
-
-    @classmethod
-    def _each_variant_of(cls, vehicle: Type[VehicleType]) -> Iterator[GroundUnitType]:
-        data_path = Path("resources/units/ground_units") / f"{vehicle.id}.yaml"
-        if not data_path.exists():
-            logging.warning(f"No data for {vehicle.id}; it will not be available")
-            return
-
-        with data_path.open(encoding="utf-8") as data_file:
-            data = yaml.safe_load(data_file)
-
-        try:
-            introduction = data["introduced"]
-            if introduction is None:
-                introduction = "N/A"
-        except KeyError:
-            introduction = "No data."
-
-        class_name = data.get("class")
-        unit_class: Optional[GroundUnitClass] = None
-        if class_name is not None:
-            unit_class = GroundUnitClass(class_name)
-
-        for variant in data.get("variants", [vehicle.id]):
-            yield GroundUnitType(
-                dcs_unit_type=vehicle,
-                unit_class=unit_class,
-                spawn_weight=data.get("spawn_weight", 0),
-                name=variant,
-                description=data.get(
-                    "description",
-                    f"No data. <a href=\"https://google.com/search?q=DCS+{variant.replace(' ', '+')}\"><span style=\"color:#FFFFFF\">Google {variant}</span></a>",
-                ),
-                year_introduced=introduction,
-                country_of_origin=data.get("origin", "No data."),
-                manufacturer=data.get("manufacturer", "No data."),
-                role=data.get("role", "No data."),
-                price=data.get("price", 1),
-            )

game/dcs/unittype.py

@@ -1,26 +0,0 @@
-from dataclasses import dataclass
-from functools import cached_property
-from typing import TypeVar, Generic, Type
-
-from dcs.unittype import UnitType as DcsUnitType
-
-DcsUnitTypeT = TypeVar("DcsUnitTypeT", bound=Type[DcsUnitType])
-
-
-@dataclass(frozen=True)
-class UnitType(Generic[DcsUnitTypeT]):
-    dcs_unit_type: DcsUnitTypeT
-    name: str
-    description: str
-    year_introduced: str
-    country_of_origin: str
-    manufacturer: str
-    role: str
-    price: int
-
-    def __str__(self) -> str:
-        return self.name
-
-    @cached_property
-    def eplrs_capable(self) -> bool:
-        return getattr(self.dcs_unit_type, "eplrs", False)

game/debriefing.py

@@ -14,23 +14,15 @@ from typing import (
     Dict,
     Iterator,
     List,
+    Type,
     TYPE_CHECKING,
-    Union,
 )
 
-from game.dcs.aircrafttype import AircraftType
-from game.dcs.groundunittype import GroundUnitType
+from dcs.unittype import FlyingType, UnitType
+
+from game import db
 from game.theater import Airfield, ControlPoint
-from game.transfers import CargoShip
-from game.unitmap import (
-    AirliftUnits,
-    Building,
-    ConvoyUnit,
-    FrontLineUnit,
-    GroundObjectUnit,
-    UnitMap,
-    FlyingUnit,
-)
+from game.unitmap import Building, FrontLineUnit, GroundObjectUnit, UnitMap
 from gen.flights.flight import Flight
 
 if TYPE_CHECKING:
@@ -41,24 +33,24 @@ DEBRIEFING_LOG_EXTENSION = "log"
 
 @dataclass(frozen=True)
 class AirLosses:
-    player: List[FlyingUnit]
-    enemy: List[FlyingUnit]
+    player: List[Flight]
+    enemy: List[Flight]
 
     @property
-    def losses(self) -> Iterator[FlyingUnit]:
+    def losses(self) -> Iterator[Flight]:
         return itertools.chain(self.player, self.enemy)
 
-    def by_type(self, player: bool) -> Dict[AircraftType, int]:
-        losses_by_type: Dict[AircraftType, int] = defaultdict(int)
+    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.flight.unit_type] += 1
+            losses_by_type[loss.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 == flight:
+            if loss == flight:
                 losses += 1
         return flight.count - losses
 
@@ -68,17 +60,8 @@ 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[Any]] = field(default_factory=list)
-    enemy_ground_objects: List[GroundObjectUnit[Any]] = field(default_factory=list)
+    player_ground_objects: List[GroundObjectUnit] = field(default_factory=list)
+    enemy_ground_objects: List[GroundObjectUnit] = field(default_factory=list)
 
     player_buildings: List[Building] = field(default_factory=list)
     enemy_buildings: List[Building] = field(default_factory=list)
@@ -87,12 +70,6 @@ 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.
@@ -101,12 +78,11 @@ class StateData:
     #: Names of aircraft units that were killed during the mission.
     killed_aircraft: List[str]
 
-    #: Names of vehicles, ships or buildings that were killed during the mission.
+    #: Names of vehicle (and ship) units that were killed during the mission.
     killed_ground_units: List[str]
 
-    #: List of descriptions of destroyed statics. Format of each element is a mapping of
-    #: the coordinate type ("x", "y", "z", "type", "orientation") to the value.
-    destroyed_statics: List[dict[str, Union[float, str]]]
+    #: Names of static units that were destroyed during the mission.
+    destroyed_statics: List[str]
 
     #: Mangled names of bases that were captured during the mission.
     base_capture_events: List[str]
@@ -118,10 +94,7 @@ 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.
-            #
-            # 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"]}),
+            killed_ground_units=list(set(data["killed_ground_units"])),
             destroyed_statics=data["destroyed_objects_positions"],
             base_capture_events=data["base_capture_events"],
         )
@@ -132,15 +105,15 @@ class Debriefing:
         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.blue.country_name
-        self.enemy_country = game.red.country_name
+        self.player_country = game.player_country
+        self.enemy_country = game.enemy_country
+        self.player_country_id = db.country_id_from_name(game.player_country)
+        self.enemy_country_id = db.country_id_from_name(game.enemy_country)
 
         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]:
@@ -148,22 +121,7 @@ class Debriefing:
         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[Any]]:
+    def ground_object_losses(self) -> Iterator[GroundObjectUnit]:
         yield from self.ground_losses.player_ground_objects
         yield from self.ground_losses.enemy_ground_objects
 
@@ -180,8 +138,8 @@ class Debriefing:
     def casualty_count(self, control_point: ControlPoint) -> int:
         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[GroundUnitType, int]:
-        losses_by_type: dict[GroundUnitType, int] = defaultdict(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
         else:
@@ -190,38 +148,6 @@ class Debriefing:
             losses_by_type[loss.unit_type] += 1
         return losses_by_type
 
-    def convoy_losses_by_type(self, player: bool) -> dict[GroundUnitType, int]:
-        losses_by_type: dict[GroundUnitType, 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[GroundUnitType, int]:
-        losses_by_type: dict[GroundUnitType, 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[GroundUnitType, int]:
-        losses_by_type: dict[GroundUnitType, 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:
@@ -239,14 +165,14 @@ class Debriefing:
         player_losses = []
         enemy_losses = []
         for unit_name in self.state_data.killed_aircraft:
-            aircraft = self.unit_map.flight(unit_name)
-            if aircraft is None:
+            flight = self.unit_map.flight(unit_name)
+            if flight is None:
                 logging.error(f"Could not find Flight matching {unit_name}")
                 continue
-            if aircraft.flight.departure.captured:
-                player_losses.append(aircraft)
+            if flight.departure.captured:
+                player_losses.append(flight)
             else:
-                enemy_losses.append(aircraft)
+                enemy_losses.append(flight)
         return AirLosses(player_losses, enemy_losses)
 
     def dead_ground_units(self) -> GroundLosses:
@@ -260,22 +186,6 @@ 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:
@@ -314,46 +224,17 @@ class Debriefing:
                 "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
 
-    def base_capture_events(self) -> List[BaseCaptureEvent]:
+    @property
+    def base_capture_events(self):
         """Keeps only the last instance of a base capture event for each base ID."""
-        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
+        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]
 
 
 class PollDebriefingFileThread(threading.Thread):
@@ -369,38 +250,32 @@ class PollDebriefingFileThread(threading.Thread):
         self.game = game
         self.unit_map = unit_map
 
-    def stop(self) -> None:
+    def stop(self):
         self._stop_event.set()
 
-    def stopped(self) -> bool:
+    def stopped(self):
         return self._stop_event.is_set()
 
-    def run(self) -> None:
+    def run(self):
         if os.path.isfile("state.json"):
             last_modified = os.path.getmtime("state.json")
         else:
             last_modified = 0
         while not self.stopped():
-            try:
-                if (
-                    os.path.isfile("state.json")
-                    and os.path.getmtime("state.json") > last_modified
-                ):
-                    with open("state.json", "r", encoding="utf-8") as json_file:
-                        json_data = json.load(json_file)
-                        debriefing = Debriefing(json_data, self.game, self.unit_map)
-                        self.callback(debriefing)
-                    break
-            except json.JSONDecodeError:
-                logging.exception(
-                    "Failed to decode state.json. Probably attempted read while DCS "
-                    "was still writing the file. Will retry in 5 seconds."
-                )
+            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)
+                    self.callback(debriefing)
+                break
             time.sleep(5)
 
 
 def wait_for_debriefing(
-    callback: Callable[[Debriefing], None], game: Game, unit_map: UnitMap
+    callback: Callable[[Debriefing], None], game: Game, unit_map
 ) -> PollDebriefingFileThread:
     thread = PollDebriefingFileThread(callback, game, unit_map)
     thread.start()

game/event/airwar.py

@@ -1,10 +1,14 @@
 from __future__ import annotations
+from typing import TYPE_CHECKING
 
 from .event import Event
 
+if TYPE_CHECKING:
+    from game.theater import ConflictTheater
+
 
 class AirWarEvent(Event):
     """Event handler for the air battle"""
 
-    def __str__(self) -> str:
+    def __str__(self):
         return "AirWar"

game/event/event.py

@@ -1,17 +1,21 @@
 from __future__ import annotations
 
 import logging
-from typing import List, TYPE_CHECKING, Type
+import math
+from typing import Dict, Iterator, List, TYPE_CHECKING, Tuple, Type
 
 from dcs.mapping import Point
 from dcs.task import Task
+from dcs.unittype import UnitType, VehicleType
 
 from game import persistency
-from game.debriefing import Debriefing
+from game.debriefing import AirLosses, Debriefing
+from game.infos.information import Information
 from game.operation.operation import Operation
 from game.theater import ControlPoint
-from gen.ato import AirTaskingOrder
+from gen import AirTaskingOrder
 from gen.ground_forces.combat_stance import CombatStance
+from ..db import PRICES
 from ..unitmap import UnitMap
 
 if TYPE_CHECKING:
@@ -35,13 +39,13 @@ class Event:
 
     def __init__(
         self,
-        game: Game,
+        game,
         from_cp: ControlPoint,
         target_cp: ControlPoint,
         location: Point,
         attacker_name: str,
         defender_name: str,
-    ) -> None:
+    ):
         self.game = game
         self.from_cp = from_cp
         self.to_cp = target_cp
@@ -51,7 +55,7 @@ class Event:
 
     @property
     def is_player_attacking(self) -> bool:
-        return self.attacker_name == self.game.blue.faction.name
+        return self.attacker_name == self.game.player_name
 
     @property
     def tasks(self) -> List[Type[Task]]:
@@ -65,42 +69,74 @@ class Event:
         )
         return unit_map
 
-    def commit_air_losses(self, debriefing: Debriefing) -> None:
+    @staticmethod
+    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.
+                if flight.departure == flight.arrival:
+                    continue
+
+                # Don't transfer to bases that were captured. Note that if the
+                # airfield was back-filling transfers it may overflow. We could
+                # attempt to be smarter in the future by performing transfers in
+                # order up a graph to prevent transfers to full airports and
+                # send overflow off-map, but overflow is fine for now.
+                if flight.arrival.captured != for_player:
+                    logging.info(
+                        f"Not transferring {flight} because {flight.arrival} "
+                        "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."
+                    )
+                    continue
+
+                aircraft = flight.unit_type
+                available = flight.departure.base.total_units_of_type(aircraft)
+                if available < transfer_count:
+                    logging.error(
+                        f"Found killed {aircraft} from {flight.departure} but "
+                        f"that airbase has only {available} available."
+                    )
+                    continue
+
+                flight.departure.base.aircraft[aircraft] -= transfer_count
+                if aircraft not in flight.arrival.base.aircraft:
+                    # TODO: Should use defaultdict.
+                    flight.arrival.base.aircraft[aircraft] = 0
+                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
+        )
+
+    @staticmethod
+    def commit_air_losses(debriefing: Debriefing) -> None:
         for loss in debriefing.air_losses.losses:
-            if loss.pilot is not None and (
-                not loss.pilot.player
-                or not self.game.settings.invulnerable_player_pilots
-            ):
-                loss.pilot.kill()
-            squadron = loss.flight.squadron
-            aircraft = loss.flight.unit_type
-            available = squadron.owned_aircraft
+            aircraft = loss.unit_type
+            cp = loss.departure
+            available = cp.base.total_units_of_type(aircraft)
             if available <= 0:
                 logging.error(
-                    f"Found killed {aircraft} from {squadron} but that airbase has "
+                    f"Found killed {aircraft} from {cp} but that airbase has "
                     "none available."
                 )
                 continue
 
-            logging.info(f"{aircraft} destroyed from {squadron}")
-            squadron.owned_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)
+            logging.info(f"{aircraft} destroyed from {cp}")
+            cp.base.aircraft[aircraft] -= 1
 
     @staticmethod
     def commit_front_line_losses(debriefing: Debriefing) -> None:
@@ -118,64 +154,26 @@ class Event:
             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:
             # TODO: This should be stored in the TGO, not in the pydcs Group.
             if not hasattr(loss.group, "units_losts"):
-                loss.group.units_losts = []  # type: ignore
+                loss.group.units_losts = []
 
             loss.group.units.remove(loss.unit)
-            loss.group.units_losts.append(loss.unit)  # type: ignore
+            loss.group.units_losts.append(loss.unit)
 
     def commit_building_losses(self, debriefing: Debriefing) -> None:
         for loss in debriefing.building_losses:
             loss.ground_object.kill()
-            self.game.message(
-                "Building destroyed",
-                f"{loss.ground_object.dcs_identifier} has been destroyed at "
-                f"location {loss.ground_object.obj_name}",
+            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
@@ -183,39 +181,63 @@ class Event:
         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:
-                    self.game.message(
-                        f"{captured.control_point} captured!",
-                        f"We took control of {captured.control_point}.",
-                    )
-                else:
-                    self.game.message(
-                        f"{captured.control_point} lost!",
-                        f"The enemy took control of {captured.control_point}.",
-                    )
-
-                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) -> None:
+    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_cargo_ship_losses(debriefing)
-        self.commit_airlift_losses(debriefing)
         self.commit_ground_object_losses(debriefing)
         self.commit_building_losses(debriefing)
         self.commit_damaged_runways(debriefing)
-        self.commit_captures(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.complete_aircraft_transfers(debriefing)
 
         # Destroyed units carcass
         # -------------------------
@@ -236,16 +258,15 @@ class Event:
 
                 delta = 0.0
                 player_won = True
-                status_msg: str = ""
                 ally_casualties = debriefing.casualty_count(cp)
                 enemy_casualties = debriefing.casualty_count(enemy_cp)
                 ally_units_alive = cp.base.total_armor
                 enemy_units_alive = enemy_cp.base.total_armor
 
-                print(f"Remaining allied units: {ally_units_alive}")
-                print(f"Remaining enemy units: {enemy_units_alive}")
-                print(f"Allied casualties {ally_casualties}")
-                print(f"Enemy casualties {enemy_casualties}")
+                print(ally_units_alive)
+                print(enemy_units_alive)
+                print(ally_casualties)
+                print(enemy_casualties)
 
                 ratio = (1.0 + enemy_casualties) / (1.0 + ally_casualties)
 
@@ -258,31 +279,24 @@ class Event:
                 if ally_units_alive == 0:
                     player_won = False
                     delta = STRONG_DEFEAT_INFLUENCE
-                    status_msg = f"No allied units alive at {cp.name}-{enemy_cp.name} frontline.  Allied ground forces suffer a strong defeat."
                 elif enemy_units_alive == 0:
                     player_won = True
                     delta = STRONG_DEFEAT_INFLUENCE
-                    status_msg = f"No enemy units alive at {cp.name}-{enemy_cp.name} frontline.  Allied ground forces win a strong victory."
                 elif cp.stances[enemy_cp.id] == CombatStance.RETREAT:
                     player_won = False
                     delta = STRONG_DEFEAT_INFLUENCE
-                    status_msg = f"Allied forces are retreating along the {cp.name}-{enemy_cp.name} frontline, suffering a strong defeat."
                 else:
                     if enemy_casualties > ally_casualties:
                         player_won = True
                         if cp.stances[enemy_cp.id] == CombatStance.BREAKTHROUGH:
                             delta = STRONG_DEFEAT_INFLUENCE
-                            status_msg = f"Allied forces break through the {cp.name}-{enemy_cp.name} frontline, winning a strong victory"
                         else:
                             if ratio > 3:
                                 delta = STRONG_DEFEAT_INFLUENCE
-                                status_msg = f"Enemy casualties massively outnumber allied casualties along the {cp.name}-{enemy_cp.name} frontline.  Allied forces win a strong victory."
                             elif ratio < 1.5:
                                 delta = MINOR_DEFEAT_INFLUENCE
-                                status_msg = f"Enemy casualties minorly outnumber allied casualties along the {cp.name}-{enemy_cp.name} frontline.  Allied forces win a minor victory."
                             else:
                                 delta = DEFEAT_INFLUENCE
-                                status_msg = f"Enemy casualties outnumber allied casualties along the {cp.name}-{enemy_cp.name} frontline.  Allied forces claim a victory."
                     elif ally_casualties > enemy_casualties:
 
                         if (
@@ -292,60 +306,54 @@ class Event:
                             # Even with casualties if the enemy is overwhelmed, they are going to lose ground
                             player_won = True
                             delta = MINOR_DEFEAT_INFLUENCE
-                            status_msg = f"Despite suffering losses, allied forces still outnumber enemy forces along the {cp.name}-{enemy_cp.name} frontline.  Due to allied force's aggressive posture, allied forces claim a minor victory."
                         elif (
                             ally_units_alive > 3 * enemy_units_alive
                             and player_aggresive
                         ):
                             player_won = True
                             delta = STRONG_DEFEAT_INFLUENCE
-                            status_msg = f"Despite suffering losses, allied forces still heavily outnumber enemy forces along the {cp.name}-{enemy_cp.name} frontline.  Due to allied force's aggressive posture, allied forces claim a major victory."
                         else:
-                            # But if the enemy is not outnumbered, we lose
+                            # But is the enemy is not outnumbered, we lose
                             player_won = False
                             if cp.stances[enemy_cp.id] == CombatStance.BREAKTHROUGH:
                                 delta = STRONG_DEFEAT_INFLUENCE
-                                status_msg = f"Allied casualties outnumber enemy casualties along the {cp.name}-{enemy_cp.name} frontline.  Allied forces have overextended themselves, suffering a major defeat."
                             else:
-                                delta = DEFEAT_INFLUENCE
-                                status_msg = f"Allied casualties outnumber enemy casualties along the {cp.name}-{enemy_cp.name} frontline.  Allied forces suffer a defeat."
+                                delta = STRONG_DEFEAT_INFLUENCE
 
                     # No progress with defensive strategies
                     if player_won and cp.stances[enemy_cp.id] in [
                         CombatStance.DEFENSIVE,
                         CombatStance.AMBUSH,
                     ]:
-                        print(
-                            f"Allied forces have adopted a defensive stance along the {cp.name}-{enemy_cp.name} "
-                            f"frontline, making only limited progress."
-                        )
+                        print("Defensive stance, progress is limited")
                         delta = MINOR_DEFEAT_INFLUENCE
 
-                # Handle the case where there are no casualties at all on either side but both sides still have units
-                if delta == 0.0:
-                    print(status_msg)
-                    self.game.message(
+                if player_won:
+                    print(cp.name + " won !  factor > " + str(delta))
+                    cp.base.affect_strength(delta)
+                    enemy_cp.base.affect_strength(-delta)
+                    info = Information(
                         "Frontline Report",
-                        f"Our ground forces from {cp.name} reached a stalemate with enemy forces from {enemy_cp.name}.",
+                        "Our ground forces from "
+                        + cp.name
+                        + " are making progress toward "
+                        + enemy_cp.name,
+                        self.game.turn,
                     )
+                    self.game.informations.append(info)
                 else:
-                    if player_won:
-                        print(status_msg)
-                        cp.base.affect_strength(delta)
-                        enemy_cp.base.affect_strength(-delta)
-                        self.game.message(
-                            "Frontline Report",
-                            f"Our ground forces from {cp.name} are making progress toward {enemy_cp.name}. {status_msg}",
-                        )
-                    else:
-                        print(status_msg)
-                        enemy_cp.base.affect_strength(delta)
-                        cp.base.affect_strength(-delta)
-                        self.game.message(
-                            "Frontline Report",
-                            f"Our ground forces from {cp.name} are losing ground against the enemy forces from "
-                            f"{enemy_cp.name}. {status_msg}",
-                        )
+                    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,
+                    )
+                    self.game.informations.append(info)
 
     def redeploy_units(self, cp: ControlPoint) -> None:
         """ "
@@ -387,19 +395,86 @@ class Event:
             moved_units[frontline_unit] = int(count * move_factor)
             total_units_redeployed = total_units_redeployed + int(count * move_factor)
 
-        destination.base.commission_units(moved_units)
+        destination.base.commision_units(moved_units)
         source.base.commit_losses(moved_units)
 
         # Also transfer pending deliveries.
-        for unit_type, count in source.ground_unit_orders.units.items():
+        for unit_type, count in source.pending_unit_deliveries.units.items():
+            if not issubclass(unit_type, VehicleType):
+                continue
+            if count <= 0:
+                # Don't transfer *sales*...
+                continue
             move_count = int(count * move_factor)
-            source.ground_unit_orders.sell({unit_type: move_count})
-            destination.ground_unit_orders.order({unit_type: move_count})
+            source.pending_unit_deliveries.sell({unit_type: move_count})
+            destination.pending_unit_deliveries.order({unit_type: move_count})
             total_units_redeployed += move_count
 
         if total_units_redeployed > 0:
-            self.game.message(
-                "Units redeployed",
+            text = (
                 f"{total_units_redeployed}  units have been redeployed from "
-                f"{source.name} to {destination.name}",
+                f"{source.name} to {destination.name}"
             )
+            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

@@ -8,5 +8,5 @@ class FrontlineAttackEvent(Event):
     future unique Event handling
     """
 
-    def __str__(self) -> str:
+    def __str__(self):
         return "Frontline attack"

game/factions/faction.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
-import itertools
 import logging
 from dataclasses import dataclass, field
-from typing import Optional, Dict, Type, List, Any, Iterator, TYPE_CHECKING
+from typing import Optional, Dict, Type, List, Any, cast
 
 import dcs
 from dcs.countries import country_dict
-from dcs.unittype import ShipType, UnitType
+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,
@@ -21,19 +22,11 @@ from game.data.doctrine import (
     COLDWAR_DOCTRINE,
     WWII_DOCTRINE,
 )
-from game.data.groundunitclass import GroundUnitClass
-from game.dcs.aircrafttype import AircraftType
-from game.dcs.groundunittype import GroundUnitType
-
-if TYPE_CHECKING:
-    from game.theater.start_generator import ModSettings
+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="")
@@ -48,25 +41,25 @@ class Faction:
     description: str = field(default="")
 
     # Available aircraft
-    aircrafts: List[AircraftType] = field(default_factory=list)
+    aircrafts: List[Type[FlyingType]] = field(default_factory=list)
 
     # Available awacs aircraft
-    awacs: List[AircraftType] = field(default_factory=list)
+    awacs: List[Type[FlyingType]] = field(default_factory=list)
 
     # Available tanker aircraft
-    tankers: List[AircraftType] = field(default_factory=list)
+    tankers: List[Type[FlyingType]] = field(default_factory=list)
 
     # Available frontline units
-    frontline_units: List[GroundUnitType] = field(default_factory=list)
+    frontline_units: List[Type[VehicleType]] = field(default_factory=list)
 
     # Available artillery units
-    artillery_units: List[GroundUnitType] = field(default_factory=list)
+    artillery_units: List[Type[VehicleType]] = field(default_factory=list)
 
     # Infantry units used
-    infantry_units: List[GroundUnitType] = field(default_factory=list)
+    infantry_units: List[Type[VehicleType]] = field(default_factory=list)
 
     # Logistics units used
-    logistics_units: List[GroundUnitType] = field(default_factory=list)
+    logistics_units: List[Type[VehicleType]] = field(default_factory=list)
 
     # Possible SAMS site generators for this faction
     air_defenses: List[str] = field(default_factory=list)
@@ -84,10 +77,10 @@ class Faction:
     requirements: Dict[str, str] = field(default_factory=dict)
 
     # possible aircraft carrier units
-    aircraft_carrier: List[Type[ShipType]] = field(default_factory=list)
+    aircraft_carrier: List[Type[UnitType]] = field(default_factory=list)
 
     # possible helicopter carrier units
-    helicopter_carrier: List[Type[ShipType]] = field(default_factory=list)
+    helicopter_carrier: List[Type[UnitType]] = field(default_factory=list)
 
     # Possible carrier names
     carrier_names: List[str] = field(default_factory=list)
@@ -117,7 +110,7 @@ class Faction:
     has_jtac: bool = field(default=False)
 
     # Unit to use as JTAC for this faction
-    jtac_unit: Optional[AircraftType] = field(default=None)
+    jtac_unit: Optional[Type[FlyingType]] = field(default=None)
 
     # doctrine
     doctrine: Doctrine = field(default=MODERN_DOCTRINE)
@@ -126,7 +119,7 @@ class Faction:
     building_set: List[str] = field(default_factory=list)
 
     # List of default livery overrides
-    liveries_overrides: Dict[AircraftType, 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
@@ -137,15 +130,10 @@ class Faction:
     #: both will use it.
     unrestricted_satnav: bool = False
 
-    def has_access_to_unittype(self, unit_class: GroundUnitClass) -> bool:
-        for vehicle in itertools.chain(self.frontline_units, self.artillery_units):
-            if vehicle.unit_class is unit_class:
-                return True
-        return False
-
     @classmethod
     def from_json(cls: Type[Faction], json: Dict[str, Any]) -> Faction:
-        faction = Faction(locales=json.get("locales"))
+
+        faction = Faction()
 
         faction.country = json.get("country", "/")
         if faction.country not in [c.name for c in country_dict.values()]:
@@ -162,26 +150,14 @@ class Faction:
         faction.authors = json.get("authors", "")
         faction.description = json.get("description", "")
 
-        faction.aircrafts = [AircraftType.named(n) for n in json.get("aircrafts", [])]
-        faction.awacs = [AircraftType.named(n) for n in json.get("awacs", [])]
-        faction.tankers = [AircraftType.named(n) for n in json.get("tankers", [])]
+        faction.aircrafts = load_all_aircraft(json.get("aircrafts", []))
+        faction.awacs = load_all_aircraft(json.get("awacs", []))
+        faction.tankers = load_all_aircraft(json.get("tankers", []))
 
-        faction.aircrafts = list(
-            set(faction.aircrafts + faction.awacs + faction.tankers)
-        )
-
-        faction.frontline_units = [
-            GroundUnitType.named(n) for n in json.get("frontline_units", [])
-        ]
-        faction.artillery_units = [
-            GroundUnitType.named(n) for n in json.get("artillery_units", [])
-        ]
-        faction.infantry_units = [
-            GroundUnitType.named(n) for n in json.get("infantry_units", [])
-        ]
-        faction.logistics_units = [
-            GroundUnitType.named(n) for n in json.get("logistics_units", [])
-        ]
+        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", [])
 
@@ -205,7 +181,7 @@ class Faction:
         faction.has_jtac = json.get("has_jtac", False)
         jtac_name = json.get("jtac_unit", None)
         if jtac_name is not None:
-            faction.jtac_unit = AircraftType.named(jtac_name)
+            faction.jtac_unit = load_aircraft(jtac_name)
         else:
             faction.jtac_unit = None
         faction.navy_group_count = int(json.get("navy_group_count", 1))
@@ -239,120 +215,90 @@ class Faction:
         # Load liveries override
         faction.liveries_overrides = {}
         liveries_overrides = json.get("liveries_overrides", {})
-        for name, livery in liveries_overrides.items():
-            aircraft = AircraftType.named(name)
-            faction.liveries_overrides[aircraft] = [s.lower() for s in livery]
+        for k, v in liveries_overrides.items():
+            k = load_aircraft(k)
+            if k is not None:
+                faction.liveries_overrides[k] = [s.lower() for s in v]
 
         faction.unrestricted_satnav = json.get("unrestricted_satnav", False)
 
         return faction
 
     @property
-    def ground_units(self) -> Iterator[GroundUnitType]:
-        yield from self.artillery_units
-        yield from self.frontline_units
-        yield from self.logistics_units
+    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
+        )
 
-    def infantry_with_class(
-        self, unit_class: GroundUnitClass
-    ) -> Iterator[GroundUnitType]:
-        for unit in self.infantry_units:
-            if unit.unit_class is unit_class:
-                yield unit
 
-    def apply_mod_settings(self, mod_settings: ModSettings) -> Faction:
-        # aircraft
-        if not mod_settings.a4_skyhawk:
-            self.remove_aircraft("A-4E-C")
-        if not mod_settings.hercules:
-            self.remove_aircraft("Hercules")
-        if not mod_settings.uh_60l:
-            self.remove_aircraft("UH-60L")
-            self.remove_aircraft("KC130J")
-        if not mod_settings.f22_raptor:
-            self.remove_aircraft("F-22A")
-        if not mod_settings.f104_starfighter:
-            self.remove_aircraft("VSN_F104G")
-            self.remove_aircraft("VSN_F104S")
-            self.remove_aircraft("VSN_F104S_AG")
-        if not mod_settings.jas39_gripen:
-            self.remove_aircraft("JAS39Gripen")
-            self.remove_aircraft("JAS39Gripen_AG")
-        if not mod_settings.su57_felon:
-            self.remove_aircraft("Su-57")
-        # frenchpack
-        if not mod_settings.frenchpack:
-            self.remove_vehicle("AMX10RCR")
-            self.remove_vehicle("SEPAR")
-            self.remove_vehicle("ERC")
-            self.remove_vehicle("M120")
-            self.remove_vehicle("AA20")
-            self.remove_vehicle("TRM2000")
-            self.remove_vehicle("TRM2000_Citerne")
-            self.remove_vehicle("TRM2000_AA20")
-            self.remove_vehicle("TRMMISTRAL")
-            self.remove_vehicle("VABH")
-            self.remove_vehicle("VAB_RADIO")
-            self.remove_vehicle("VAB_50")
-            self.remove_vehicle("VIB_VBR")
-            self.remove_vehicle("VAB_HOT")
-            self.remove_vehicle("VAB_MORTIER")
-            self.remove_vehicle("VBL50")
-            self.remove_vehicle("VBLANF1")
-            self.remove_vehicle("VBL-radio")
-            self.remove_vehicle("VBAE")
-            self.remove_vehicle("VBAE_MMP")
-            self.remove_vehicle("AMX-30B2")
-            self.remove_vehicle("Tracma")
-            self.remove_vehicle("JTACFP")
-            self.remove_vehicle("SHERIDAN")
-            self.remove_vehicle("Leclerc_XXI")
-            self.remove_vehicle("Toyota_bleu")
-            self.remove_vehicle("Toyota_vert")
-            self.remove_vehicle("Toyota_desert")
-            self.remove_vehicle("Kamikaze")
-            self.remove_vehicle("AMX1375")
-            self.remove_vehicle("AMX1390")
-            self.remove_vehicle("VBCI")
-            self.remove_vehicle("T62")
-            self.remove_vehicle("T64BV")
-            self.remove_vehicle("T72M")
-            self.remove_vehicle("KORNET")
-        # high digit sams
-        if not mod_settings.high_digit_sams:
-            self.remove_air_defenses("SA10BGenerator")
-            self.remove_air_defenses("SA12Generator")
-            self.remove_air_defenses("SA20Generator")
-            self.remove_air_defenses("SA20BGenerator")
-            self.remove_air_defenses("SA23Generator")
-            self.remove_air_defenses("SA17Generator")
-            self.remove_air_defenses("KS19Generator")
-        return self
+def unit_loader(unit: str, class_repository: List[Any]) -> Optional[Type[UnitType]]:
+    """
+    Find unit by name
+    :param unit: Unit name as string
+    :param class_repository: Repository of classes (Either a module, a class, or a list of classes)
+    :return: The unit as a PyDCS type
+    """
+    if unit is None:
+        return None
+    elif unit in plane_map.keys():
+        return plane_map[unit]
+    else:
+        for mother_class in class_repository:
+            if getattr(mother_class, unit, None) is not None:
+                return getattr(mother_class, unit)
+            if type(mother_class) is list:
+                for m in mother_class:
+                    if m.__name__ == unit:
+                        return m
+        logging.error(f"FACTION ERROR : Unable to find {unit} in pydcs")
+        return None
 
-    def remove_aircraft(self, name: str) -> None:
-        for i in self.aircrafts:
-            if i.dcs_unit_type.id == name:
-                self.aircrafts.remove(i)
 
-    def remove_air_defenses(self, name: str) -> None:
-        for i in self.air_defenses:
-            if i == name:
-                self.air_defenses.remove(i)
+def load_aircraft(name: str) -> Optional[Type[FlyingType]]:
+    return cast(
+        Optional[FlyingType],
+        unit_loader(name, [dcs.planes, dcs.helicopters, MODDED_AIRPLANES]),
+    )
 
-    def remove_vehicle(self, name: str) -> None:
-        for i in self.frontline_units:
-            if i.dcs_unit_type.id == name:
-                self.frontline_units.remove(i)
+
+def load_all_aircraft(data) -> List[Type[FlyingType]]:
+    items = []
+    for name in data:
+        item = load_aircraft(name)
+        if item is not None:
+            items.append(item)
+    return items
+
+
+def load_vehicle(name: str) -> Optional[Type[VehicleType]]:
+    return cast(
+        Optional[FlyingType],
+        unit_loader(
+            name, [Infantry, Unarmed, Armor, AirDefence, Artillery, MODDED_VEHICLES]
+        ),
+    )
+
+
+def load_all_vehicles(data) -> List[Type[VehicleType]]:
+    items = []
+    for name in data:
+        item = load_vehicle(name)
+        if item is not None:
+            items.append(item)
+    return items
 
 
 def load_ship(name: str) -> Optional[Type[ShipType]]:
-    if (ship := getattr(dcs.ships, name, None)) is not None:
-        return ship
-    logging.error(f"FACTION ERROR : Unable to find {name} in dcs.ships")
-    return None
+    return cast(Optional[FlyingType], unit_loader(name, [dcs.ships]))
 
 
-def load_all_ships(data: list[str]) -> List[Type[ShipType]]:
+def load_all_ships(data) -> List[Type[ShipType]]:
     items = []
     for name in data:
         item = load_ship(name)

game/factions/faction_loader.py

@@ -2,9 +2,8 @@ from __future__ import annotations
 import json
 import logging
 from pathlib import Path
-from typing import Dict, Iterator, List, Optional, Type
+from typing import Dict, Iterator, Optional, Type
 
-from game import persistency
 from game.factions.faction import Faction
 
 FACTION_DIRECTORY = Path("./resources/factions/")
@@ -24,22 +23,15 @@ 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]:
-        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)
+        files = [f for f in FACTION_DIRECTORY.glob("*.json") if f.is_file()]
         factions = {}
 
         for f in files:
             try:
                 with f.open("r", encoding="utf-8") as fdata:
-                    data = json.load(fdata)
+                    data = json.load(fdata, encoding="utf-8")
                     factions[data["name"]] = Faction.from_json(data)
                     logging.info("Loaded faction : " + str(f))
             except Exception:

game/flightplan/__init__.py

@@ -1,3 +0,0 @@
-from .holdzonegeometry import HoldZoneGeometry
-from .ipzonegeometry import IpZoneGeometry
-from .joinzonegeometry import JoinZoneGeometry

game/flightplan/holdzonegeometry.py

@@ -1,108 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import shapely.ops
-from dcs import Point
-from shapely.geometry import Point as ShapelyPoint, Polygon, MultiPolygon
-
-from game.theater import ConflictTheater
-from game.utils import nautical_miles
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class HoldZoneGeometry:
-    """Defines the zones used for finding optimal hold point placement.
-
-    The zones themselves are stored in the class rather than just the resulting hold
-    point so that the zones can be drawn in the map for debugging purposes.
-    """
-
-    def __init__(
-        self,
-        target: Point,
-        home: Point,
-        ip: Point,
-        join: Point,
-        coalition: Coalition,
-        theater: ConflictTheater,
-    ) -> None:
-        # Hold points are placed one of two ways. Either approach guarantees:
-        #
-        # * Safe hold point.
-        # * Minimum distance to the join point.
-        # * Not closer to the target than the join point.
-        #
-        # 1. As near the join point as possible with a specific distance from the
-        #    departure airfield. This prevents loitering directly above the airfield but
-        #    also keeps the hold point close to the departure airfield.
-        #
-        # 2. Alternatively, if the entire home zone is excluded by the above criteria,
-        #    as neat the departure airfield as possible within a minimum distance from
-        #    the join point, with a restricted turn angle at the join point. This
-        #    handles the case where we need to backtrack from the departure airfield and
-        #    the join point to place the hold point, but the turn angle limit restricts
-        #    the maximum distance of the backtrack while maintaining the direction of
-        #    the flight plan.
-        self.threat_zone = coalition.opponent.threat_zone.all
-        self.home = ShapelyPoint(home.x, home.y)
-
-        self.join = ShapelyPoint(join.x, join.y)
-
-        self.join_bubble = self.join.buffer(coalition.doctrine.push_distance.meters)
-
-        join_to_target_distance = join.distance_to_point(target)
-        self.target_bubble = ShapelyPoint(target.x, target.y).buffer(
-            join_to_target_distance
-        )
-
-        self.home_bubble = self.home.buffer(coalition.doctrine.hold_distance.meters)
-
-        excluded_zones = shapely.ops.unary_union(
-            [self.join_bubble, self.target_bubble, self.threat_zone]
-        )
-        if not isinstance(excluded_zones, MultiPolygon):
-            excluded_zones = MultiPolygon([excluded_zones])
-        self.excluded_zones = excluded_zones
-
-        join_heading = ip.heading_between_point(join)
-
-        # Arbitrarily large since this is later constrained by the map boundary, and
-        # we'll be picking a location close to the IP anyway. Just used to avoid real
-        # distance calculations to project to the map edge.
-        large_distance = nautical_miles(400).meters
-        turn_limit = 40
-        join_limit_ccw = join.point_from_heading(
-            join_heading - turn_limit, large_distance
-        )
-        join_limit_cw = join.point_from_heading(
-            join_heading + turn_limit, large_distance
-        )
-
-        join_direction_limit_wedge = Polygon(
-            [
-                (join.x, join.y),
-                (join_limit_ccw.x, join_limit_ccw.y),
-                (join_limit_cw.x, join_limit_cw.y),
-            ]
-        )
-
-        permissible_zones = (
-            coalition.nav_mesh.map_bounds(theater)
-            .intersection(join_direction_limit_wedge)
-            .difference(self.excluded_zones)
-            .difference(self.home_bubble)
-        )
-        if not isinstance(permissible_zones, MultiPolygon):
-            permissible_zones = MultiPolygon([permissible_zones])
-        self.permissible_zones = permissible_zones
-        self.preferred_lines = self.home_bubble.boundary.difference(self.excluded_zones)
-
-    def find_best_hold_point(self) -> Point:
-        if self.preferred_lines.is_empty:
-            hold, _ = shapely.ops.nearest_points(self.permissible_zones, self.home)
-        else:
-            hold, _ = shapely.ops.nearest_points(self.preferred_lines, self.join)
-        return Point(hold.x, hold.y)

game/flightplan/ipzonegeometry.py

@@ -1,118 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import shapely.ops
-from dcs import Point
-from shapely.geometry import Point as ShapelyPoint, MultiPolygon
-
-from game.utils import nautical_miles, meters
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class IpZoneGeometry:
-    """Defines the zones used for finding optimal IP placement.
-
-    The zones themselves are stored in the class rather than just the resulting IP so
-    that the zones can be drawn in the map for debugging purposes.
-    """
-
-    def __init__(
-        self,
-        target: Point,
-        home: Point,
-        coalition: Coalition,
-    ) -> None:
-        self.threat_zone = coalition.opponent.threat_zone.all
-        self.home = ShapelyPoint(home.x, home.y)
-
-        max_ip_distance = coalition.doctrine.max_ingress_distance
-        min_ip_distance = coalition.doctrine.min_ingress_distance
-
-        # The minimum distance between the home location and the IP.
-        min_distance_from_home = nautical_miles(5)
-
-        # The distance that is expected to be needed between the beginning of the attack
-        # and weapon release. This buffers the threat zone to give a 5nm window between
-        # the edge of the "safe" zone and the actual threat so that "safe" IPs are less
-        # likely to end up with the attacker entering a threatened area.
-        attack_distance_buffer = nautical_miles(5)
-
-        home_threatened = coalition.opponent.threat_zone.threatened(home)
-
-        shapely_target = ShapelyPoint(target.x, target.y)
-        home_to_target_distance = meters(home.distance_to_point(target))
-
-        self.home_bubble = self.home.buffer(home_to_target_distance.meters).difference(
-            self.home.buffer(min_distance_from_home.meters)
-        )
-
-        # If the home zone is not threatened and home is within LAR, constrain the max
-        # range to the home-to-target distance to prevent excessive backtracking.
-        #
-        # If the home zone *is* threatened, we need to back out of the zone to
-        # rendezvous anyway.
-        if not home_threatened and (
-            min_ip_distance < home_to_target_distance < max_ip_distance
-        ):
-            max_ip_distance = home_to_target_distance
-        max_ip_bubble = shapely_target.buffer(max_ip_distance.meters)
-        min_ip_bubble = shapely_target.buffer(min_ip_distance.meters)
-        self.ip_bubble = max_ip_bubble.difference(min_ip_bubble)
-
-        # The intersection of the home bubble and IP bubble will be all the points that
-        # are within the valid IP range that are not farther from home than the target
-        # is. However, if the origin airfield is threatened but there are safe
-        # placements for the IP, we should not constrain to the home zone. In this case
-        # we'll either end up with a safe zone outside the home zone and pick the
-        # closest point in to to home (minimizing backtracking), or we'll have no safe
-        # IP anywhere within range of the target, and we'll later pick the IP nearest
-        # the edge of the threat zone.
-        if home_threatened:
-            self.permissible_zone = self.ip_bubble
-        else:
-            self.permissible_zone = self.ip_bubble.intersection(self.home_bubble)
-
-        if self.permissible_zone.is_empty:
-            # If home is closer to the target than the min range, there will not be an
-            # IP solution that's close enough to home, in which case we need to ignore
-            # the home bubble.
-            self.permissible_zone = self.ip_bubble
-
-        safe_zones = self.permissible_zone.difference(
-            self.threat_zone.buffer(attack_distance_buffer.meters)
-        )
-
-        if not isinstance(safe_zones, MultiPolygon):
-            safe_zones = MultiPolygon([safe_zones])
-        self.safe_zones = safe_zones
-
-    def _unsafe_ip(self) -> ShapelyPoint:
-        unthreatened_home_zone = self.home_bubble.difference(self.threat_zone)
-        if unthreatened_home_zone.is_empty:
-            # Nowhere in our home zone is safe. The package will need to exit the
-            # threatened area to hold and rendezvous. Pick the IP closest to the
-            # edge of the threat zone.
-            return shapely.ops.nearest_points(
-                self.permissible_zone, self.threat_zone.boundary
-            )[0]
-
-        # No safe point in the IP zone, but the home zone is safe. Pick the max-
-        # distance IP that's closest to the untreatened home zone.
-        return shapely.ops.nearest_points(
-            self.permissible_zone, unthreatened_home_zone
-        )[0]
-
-    def _safe_ip(self) -> ShapelyPoint:
-        # We have a zone of possible IPs that are safe, close enough, and in range. Pick
-        # the IP in the zone that's closest to the target.
-        return shapely.ops.nearest_points(self.safe_zones, self.home)[0]
-
-    def find_best_ip(self) -> Point:
-        if self.safe_zones.is_empty:
-            ip = self._unsafe_ip()
-        else:
-            ip = self._safe_ip()
-        return Point(ip.x, ip.y)

game/flightplan/joinzonegeometry.py

@@ -1,103 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import shapely.ops
-from dcs import Point
-from shapely.geometry import (
-    Point as ShapelyPoint,
-    Polygon,
-    MultiPolygon,
-    MultiLineString,
-)
-
-from game.utils import nautical_miles
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class JoinZoneGeometry:
-    """Defines the zones used for finding optimal join point placement.
-
-    The zones themselves are stored in the class rather than just the resulting join
-    point so that the zones can be drawn in the map for debugging purposes.
-    """
-
-    def __init__(
-        self, target: Point, home: Point, ip: Point, coalition: Coalition
-    ) -> None:
-        # Normal join placement is based on the path from home to the IP. If no path is
-        # found it means that the target is on a direct path. In that case we instead
-        # want to enforce that the join point is:
-        #
-        # * Not closer to the target than the IP.
-        # * Not too close to the home airfield.
-        # * Not threatened.
-        # * A minimum distance from the IP.
-        # * Not too sharp a turn at the ingress point.
-        self.ip = ShapelyPoint(ip.x, ip.y)
-        self.threat_zone = coalition.opponent.threat_zone.all
-        self.home = ShapelyPoint(home.x, home.y)
-
-        self.ip_bubble = self.ip.buffer(coalition.doctrine.join_distance.meters)
-
-        ip_distance = ip.distance_to_point(target)
-        self.target_bubble = ShapelyPoint(target.x, target.y).buffer(ip_distance)
-
-        # The minimum distance between the home location and the IP.
-        min_distance_from_home = nautical_miles(5)
-
-        self.home_bubble = self.home.buffer(min_distance_from_home.meters)
-
-        excluded_zones = shapely.ops.unary_union(
-            [self.ip_bubble, self.target_bubble, self.threat_zone]
-        )
-
-        if not isinstance(excluded_zones, MultiPolygon):
-            excluded_zones = MultiPolygon([excluded_zones])
-        self.excluded_zones = excluded_zones
-
-        ip_heading = target.heading_between_point(ip)
-
-        # Arbitrarily large since this is later constrained by the map boundary, and
-        # we'll be picking a location close to the IP anyway. Just used to avoid real
-        # distance calculations to project to the map edge.
-        large_distance = nautical_miles(400).meters
-        turn_limit = 40
-        ip_limit_ccw = ip.point_from_heading(ip_heading - turn_limit, large_distance)
-        ip_limit_cw = ip.point_from_heading(ip_heading + turn_limit, large_distance)
-
-        ip_direction_limit_wedge = Polygon(
-            [
-                (ip.x, ip.y),
-                (ip_limit_ccw.x, ip_limit_ccw.y),
-                (ip_limit_cw.x, ip_limit_cw.y),
-            ]
-        )
-
-        permissible_zones = ip_direction_limit_wedge.difference(
-            self.excluded_zones
-        ).difference(self.home_bubble)
-        if permissible_zones.is_empty:
-            permissible_zones = MultiPolygon([])
-        if not isinstance(permissible_zones, MultiPolygon):
-            permissible_zones = MultiPolygon([permissible_zones])
-        self.permissible_zones = permissible_zones
-
-        preferred_lines = ip_direction_limit_wedge.intersection(
-            self.excluded_zones.boundary
-        ).difference(self.home_bubble)
-
-        if preferred_lines.is_empty:
-            preferred_lines = MultiLineString([])
-        if not isinstance(preferred_lines, MultiLineString):
-            preferred_lines = MultiLineString([preferred_lines])
-        self.preferred_lines = preferred_lines
-
-    def find_best_join_point(self) -> Point:
-        if self.preferred_lines.is_empty:
-            join, _ = shapely.ops.nearest_points(self.permissible_zones, self.ip)
-        else:
-            join, _ = shapely.ops.nearest_points(self.preferred_lines, self.home)
-        return Point(join.x, join.y)

game/game.py

@@ -1,49 +1,42 @@
-from __future__ import annotations
-
 import itertools
 import logging
-import math
-from collections import Iterator
+import random
+import sys
 from datetime import date, datetime, timedelta
 from enum import Enum
-from typing import Any, List, Type, Union, cast, TYPE_CHECKING
+from typing import Any, Dict, List
 
-from dcs.countries import Switzerland, UnitedNationsPeacekeepers, USAFAggressors
-from dcs.country import Country
+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 gen import naming
 from gen.ato import AirTaskingOrder
 from gen.conflictgen import Conflict
+from gen.flights.ai_flight_planner import CoalitionMissionPlanner
 from gen.flights.closestairfields import ObjectiveDistanceCache
 from gen.flights.flight import FlightType
 from gen.ground_forces.ai_ground_planner import GroundPlanner
 from . import persistency
-from .campaignloader import CampaignAirWingConfig
-from .coalition import Coalition
 from .debriefing import Debriefing
-from .event.event import Event
+from .event.event import Event, UnitsDeliveryEvent
 from .event.frontlineattack import FrontlineAttackEvent
 from .factions.faction import Faction
+from .income import Income
 from .infos.information import Information
 from .navmesh import NavMesh
-from .profiling import logged_duration
+from .procurement import ProcurementAi
 from .settings import Settings
-from .theater import ConflictTheater, ControlPoint
-from .theater.bullseye import Bullseye
-from .theater.transitnetwork import TransitNetwork, TransitNetworkBuilder
+from .theater import ConflictTheater, ControlPoint, TheaterGroundObject
+from game.theater.theatergroundobject import MissileSiteGroundObject
 from .threatzones import ThreatZones
 from .unitmap import UnitMap
 from .weather import Conditions, TimeOfDay
 
-if TYPE_CHECKING:
-    from .squadrons import AirWing
-
 COMMISION_UNIT_VARIETY = 4
 COMMISION_LIMITS_SCALE = 1.5
 COMMISION_LIMITS_FACTORS = {
@@ -87,10 +80,9 @@ class TurnState(Enum):
 class Game:
     def __init__(
         self,
-        player_faction: Faction,
-        enemy_faction: Faction,
+        player_name: str,
+        enemy_name: str,
         theater: ConflictTheater,
-        air_wing_config: CampaignAirWingConfig,
         start_date: datetime,
         settings: Settings,
         player_budget: float,
@@ -99,136 +91,145 @@ class Game:
         self.settings = settings
         self.events: List[Event] = []
         self.theater = theater
+        self.player_name = player_name
+        self.player_country = db.FACTIONS[player_name].country
+        self.enemy_name = enemy_name
+        self.enemy_country = db.FACTIONS[enemy_name].country
         self.turn = 0
         # 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.notes = ""
-        self.ground_planners: dict[int, GroundPlanner] = {}
-        self.informations: list[Information] = []
-        self.message("Game Start", "-" * 40)
+        self.game_stats.update(self)
+        self.ground_planners: Dict[int, GroundPlanner] = {}
+        self.informations = []
+        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] = []
-        self.__destroyed_units: list[dict[str, Union[float, str]]] = []
+        # 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
+        self.enemy_budget = enemy_budget
         self.current_unit_id = 0
         self.current_group_id = 0
-        self.name_generator = naming.namegen
 
         self.conditions = self.generate_conditions()
 
-        self.sanitize_sides(player_faction, enemy_faction)
-        self.blue = Coalition(self, player_faction, player_budget, player=True)
-        self.red = Coalition(self, enemy_faction, enemy_budget, player=False)
-        self.blue.set_opponent(self.red)
-        self.red.set_opponent(self.blue)
+        self.blue_ato = AirTaskingOrder()
+        self.red_ato = AirTaskingOrder()
 
-        for control_point in self.theater.controlpoints:
-            control_point.finish_init(self)
+        self.aircraft_inventory = GlobalAircraftInventory(self.theater.controlpoints)
 
-        self.blue.configure_default_air_wing(air_wing_config)
-        self.red.configure_default_air_wing(air_wing_config)
+        self.sanitize_sides()
 
-        self.on_load(game_still_initializing=True)
+        self.on_load()
 
-    def __setstate__(self, state: dict[str, Any]) -> None:
+        # 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()
+
+        red_planner = CoalitionMissionPlanner(self, is_player=False)
+        red_planner.plan_missions()
+
+        self.plan_procurement(blue_planner, red_planner)
+
+    def __getstate__(self) -> Dict[str, Any]:
+        state = self.__dict__.copy()
+        # Avoid persisting any volatile types that can be deterministically
+        # recomputed on load for the sake of save compatibility.
+        del state["blue_threat_zone"]
+        del state["red_threat_zone"]
+        del state["blue_navmesh"]
+        del state["red_navmesh"]
+        return state
+
+    def __setstate__(self, state: Dict[str, Any]) -> None:
         self.__dict__.update(state)
         # Regenerate any state that was not persisted.
         self.on_load()
 
-    @property
-    def coalitions(self) -> Iterator[Coalition]:
-        yield self.blue
-        yield self.red
-
-    def ato_for(self, player: bool) -> AirTaskingOrder:
-        return self.coalition_for(player).ato
-
-    def transit_network_for(self, player: bool) -> TransitNetwork:
-        return self.coalition_for(player).transit_network
-
     def generate_conditions(self) -> Conditions:
         return Conditions.generate(
             self.theater, self.current_day, self.current_turn_time_of_day, self.settings
         )
 
-    @staticmethod
-    def sanitize_sides(player_faction: Faction, enemy_faction: Faction) -> None:
+    def sanitize_sides(self):
         """
         Make sure the opposing factions are using different countries
         :return:
         """
-        if player_faction.country == enemy_faction.country:
-            if player_faction.country == "USA":
-                enemy_faction.country = "USAF Aggressors"
-            elif player_faction.country == "Russia":
-                enemy_faction.country = "USSR"
+        if self.player_country == self.enemy_country:
+            if self.player_country == "USA":
+                self.enemy_country = "USAF Aggressors"
+            elif self.player_country == "Russia":
+                self.enemy_country = "USSR"
             else:
-                enemy_faction.country = "Russia"
+                self.enemy_country = "Russia"
+
+    @property
+    def player_faction(self) -> Faction:
+        return db.FACTIONS[self.player_name]
+
+    @property
+    def enemy_faction(self) -> Faction:
+        return db.FACTIONS[self.enemy_name]
 
     def faction_for(self, player: bool) -> Faction:
-        return self.coalition_for(player).faction
+        if player:
+            return self.player_faction
+        return self.enemy_faction
 
-    def faker_for(self, player: bool) -> Faker:
-        return self.coalition_for(player).faker
+    def _roll(self, prob, mult):
+        if self.settings.version == "dev":
+            # always generate all events for dev
+            return 100
+        else:
+            return random.randint(1, 100) <= prob * mult
 
-    def air_wing_for(self, player: bool) -> AirWing:
-        return self.coalition_for(player).air_wing
-
-    def country_for(self, player: bool) -> str:
-        return self.coalition_for(player).country_name
-
-    def bullseye_for(self, player: bool) -> Bullseye:
-        return self.coalition_for(player).bullseye
-
-    def _generate_player_event(
-        self, event_class: Type[Event], player_cp: ControlPoint, enemy_cp: ControlPoint
-    ) -> None:
+    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.blue.faction.name,
-                self.red.faction.name,
+                self.player_name,
+                self.enemy_name,
             )
         )
 
-    @property
-    def neutral_country(self) -> Type[Country]:
-        """Return the best fitting country that can be used as neutral faction in the generated mission"""
-        countries_in_use = [self.red.country_name, self.blue.country_name]
-        if UnitedNationsPeacekeepers not in countries_in_use:
-            return UnitedNationsPeacekeepers
-        elif Switzerland.name not in countries_in_use:
-            return Switzerland
-        else:
-            return USAFAggressors
-
-    def _generate_events(self) -> None:
-        for front_line in self.theater.conflicts():
+    def _generate_events(self):
+        for front_line in self.theater.conflicts(True):
             self._generate_player_event(
                 FrontlineAttackEvent,
-                front_line.blue_cp,
-                front_line.red_cp,
+                front_line.control_point_a,
+                front_line.control_point_b,
             )
 
-    def coalition_for(self, player: bool) -> Coalition:
-        if player:
-            return self.blue
-        return self.red
-
     def adjust_budget(self, amount: float, player: bool) -> None:
-        self.coalition_for(player).adjust_budget(amount)
+        if player:
+            self.budget += amount
+        else:
+            self.enemy_budget += amount
 
-    @staticmethod
-    def initiate_event(event: Event) -> UnitMap:
+    def process_player_income(self):
+        self.budget += Income(self, player=True).total
+
+    def process_enemy_income(self):
+        # TODO: Clean up save compat.
+        if not hasattr(self, "enemy_budget"):
+            self.enemy_budget = 0
+        self.enemy_budget += Income(self, player=False).total
+
+    def initiate_event(self, event: Event) -> UnitMap:
         # assert event in self.events
         logging.info("Generating {} (regular)".format(event))
         return event.generate()
 
-    def finish_event(self, event: Event, debriefing: Debriefing) -> None:
+    def finish_event(self, event: Event, debriefing: Debriefing):
         logging.info("Finishing event {}".format(event))
         event.commit(debriefing)
 
@@ -237,92 +238,52 @@ class Game:
         else:
             logging.info("finish_event: event not in the events!")
 
-    def on_load(self, game_still_initializing: bool = False) -> None:
-        if not hasattr(self, "name_generator"):
-            self.name_generator = naming.namegen
-        # Hack: Replace the global name generator state with the state from the save
-        # game.
-        #
-        # We need to persist this state so that names generated after game load don't
-        # conflict with those generated before exit.
-        naming.namegen = self.name_generator
+    def is_player_attack(self, event):
+        if isinstance(event, Event):
+            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:
         LuaPluginManager.load_settings(self.settings)
         ObjectiveDistanceCache.set_theater(self.theater)
-        self.compute_unculled_zones()
-        if not game_still_initializing:
-            self.compute_threat_zones()
+        self.compute_conflicts_position()
+        self.compute_threat_zones()
 
-    def finish_turn(self, skipped: bool = False) -> None:
-        """Finalizes the current turn and advances to the next turn.
-
-        This handles the turn-end portion of passing a turn. Initialization of the next
-        turn is handled by `initialize_turn`. These are separate processes because while
-        turns may be initialized more than once under some circumstances (see the
-        documentation for `initialize_turn`), `finish_turn` performs the work that
-        should be guaranteed to happen only once per turn:
-
-        * Turn counter increment.
-        * Delivering units ordered the previous turn.
-        * Transfer progress.
-        * Squadron replenishment.
-        * Income distribution.
-        * Base strength (front line position) adjustment.
-        * Weather/time-of-day generation.
-
-        Some actions (like transit network assembly) will happen both here and in
-        `initialize_turn`. We need the network to be up to date so we can account for
-        base captures when processing the transfers that occurred last turn, but we also
-        need it to be up to date in the case of a re-initialization in `initialize_turn`
-        (such as to account for a cheat base capture) so that orders are only placed
-        where a supply route exists to the destination. This is a relatively cheap
-        operation so duplicating the effort is not a problem.
-
-        Args:
-            skipped: True if the turn was skipped.
-        """
-        self.message("End of turn #" + str(self.turn), "-" * 40)
+    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)
+        )
         self.turn += 1
 
-        # The coalition-specific turn finalization *must* happen before unit deliveries,
-        # since the coalition-specific finalization handles transit network updates and
-        # transfer processing. If in the other order, units may be delivered to captured
-        # bases, and freshly delivered units will spawn one leg through their journey.
-        self.blue.end_turn()
-        self.red.end_turn()
-
         for control_point in self.theater.controlpoints:
             control_point.process_turn(self)
 
-        if not skipped:
+        self.process_enemy_income()
+
+        self.process_player_income()
+
+        if not no_action and self.turn > 1:
             for cp in self.theater.player_points():
                 cp.base.affect_strength(+PLAYER_BASE_STRENGTH_RECOVERY)
+        else:
+            for cp in self.theater.player_points():
+                if not cp.is_carrier and not cp.is_lha:
+                    cp.base.affect_strength(-PLAYER_BASE_STRENGTH_RECOVERY)
 
         self.conditions = self.generate_conditions()
 
-    def begin_turn_0(self) -> None:
-        """Initialization for the first turn of the game."""
-        self.blue.preinit_turn_0()
-        self.red.preinit_turn_0()
         self.initialize_turn()
 
-    def pass_turn(self, no_action: bool = False) -> None:
-        """Ends the current turn and initializes the new turn.
-
-        Called both when skipping a turn or by ending the turn as the result of combat.
-
-        Args:
-            no_action: True if the turn was skipped.
-        """
-        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) -> TurnState:
+    def check_win_loss(self):
         player_airbases = {
             cp for cp in self.theater.player_points() if cp.runway_is_operational()
         }
@@ -337,81 +298,76 @@ class Game:
 
         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, for_red: bool = True, for_blue: bool = True) -> None:
-        """Performs turn initialization for the specified players.
-
-        Turn initialization performs all of the beginning-of-turn actions. *End-of-turn*
-        processing happens in `pass_turn` (despite the name, it's called both for
-        skipping the turn and ending the turn after combat).
-
-        Special care needs to be taken here because initialization can occur more than
-        once per turn. A number of events can require re-initializing a turn:
-
-        * Cheat capture. Bases changing hands invalidates many missions in both ATOs,
-          purchase orders, threat zones, transit networks, etc. Practically speaking,
-          after a base capture the turn needs to be treated as fully new. The game might
-          even be over after a capture.
-        * Cheat front line position. CAS missions are no longer in the correct location,
-          and the ground planner may also need changes.
-        * Selling/buying units at TGOs. Selling a TGO might leave missions in the ATO
-          with invalid targets. Buying a new SAM (or even replacing some units in a SAM)
-          potentially changes the threat zone and may alter mission priorities and
-          flight planning.
-
-        Most of the work is delegated to initialize_turn_for, which handles the
-        coalition-specific turn initialization. In some cases only one coalition will be
-        (re-) initialized. This is the case when buying or selling TGO units, since we
-        don't want to force the player to redo all their planning just because they
-        repaired a SAM, but should replan opfor when that happens. On the other hand,
-        base captures are significant enough (and likely enough to be the first thing
-        the player does in a turn) that we replan blue as well. Front lines are less
-        impactful but also likely to be early, so they also cause a blue replan.
-
-        Args:
-            for_red: True if opfor should be re-initialized.
-            for_blue: True if the player coalition should be re-initialized.
-        """
+    def initialize_turn(self) -> None:
         self.events = []
         self._generate_events()
-        self.set_bullseye()
 
         # Update statistics
         self.game_stats.update(self)
 
+        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):
             return self.process_win_loss(turn_state)
 
         # Plan flights & combat for next turn
-        with logged_duration("Threat zone computation"):
-            self.compute_threat_zones()
-
-        # Plan Coalition specific turn
-        if for_blue:
-            self.blue.initialize_turn()
-        if for_red:
-            self.red.initialize_turn()
-
-        # Plan GroundWar
+        self.compute_conflicts_position()
+        self.compute_threat_zones()
         self.ground_planners = {}
+        self.blue_ato.clear()
+        self.red_ato.clear()
+
+        blue_planner = CoalitionMissionPlanner(self, is_player=True)
+        blue_planner.plan_missions()
+
+        red_planner = CoalitionMissionPlanner(self, is_player=False)
+        red_planner.plan_missions()
+
         for cp in self.theater.controlpoints:
             if cp.has_frontline:
                 gplanner = GroundPlanner(cp, self)
                 gplanner.plan_groundwar()
                 self.ground_planners[cp.id] = gplanner
 
-        # Update cull zones
-        with logged_duration("Computing culling positions"):
-            self.compute_unculled_zones()
+        self.plan_procurement(blue_planner, red_planner)
 
-    def message(self, title: str, text: str = "") -> None:
-        self.informations.append(Information(title, text, turn=self.turn))
+    def plan_procurement(
+        self,
+        blue_planner: CoalitionMissionPlanner,
+        red_planner: CoalitionMissionPlanner,
+    ) -> 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
+        self.budget = ProcurementAi(
+            self,
+            for_player=True,
+            faction=self.player_faction,
+            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)
+
+        self.enemy_budget = ProcurementAi(
+            self,
+            for_player=False,
+            faction=self.enemy_faction,
+            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)
+
+    def message(self, text: str) -> None:
+        self.informations.append(Information(text, turn=self.turn))
 
     @property
     def current_turn_time_of_day(self) -> TimeOfDay:
@@ -421,49 +377,63 @@ class Game:
     def current_day(self) -> date:
         return self.date + timedelta(days=self.turn // 4)
 
-    def next_unit_id(self) -> int:
+    def next_unit_id(self):
         """
         Next unit id for pre-generated units
         """
         self.current_unit_id += 1
         return self.current_unit_id
 
-    def next_group_id(self) -> int:
+    def next_group_id(self):
         """
         Next unit id for pre-generated units
         """
         self.current_group_id += 1
         return self.current_group_id
 
-    def compute_transit_network_for(self, player: bool) -> TransitNetwork:
-        return TransitNetworkBuilder(self.theater, player).build()
-
     def compute_threat_zones(self) -> None:
-        self.blue.compute_threat_zones()
-        self.red.compute_threat_zones()
-        self.blue.compute_nav_meshes()
-        self.red.compute_nav_meshes()
+        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
+        )
 
     def threat_zone_for(self, player: bool) -> ThreatZones:
-        return self.coalition_for(player).threat_zone
+        if player:
+            return self.blue_threat_zone
+        return self.red_threat_zone
 
     def navmesh_for(self, player: bool) -> NavMesh:
-        return self.coalition_for(player).nav_mesh
+        if player:
+            return self.blue_navmesh
+        return self.red_navmesh
 
-    def compute_unculled_zones(self) -> None:
+    def compute_conflicts_position(self):
         """
-        Compute the current conflict position(s) used for culling calculation
+        Compute the current conflict center position(s), mainly used for culling calculation
+        :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, self.theater)
+            position = Conflict.frontline_position(
+                front_line.control_point_a, front_line.control_point_b, self.theater
+            )
             zones.append(position[0])
-            zones.append(front_line.blue_cp.position)
-            zones.append(front_line.red_cp.position)
+            zones.append(front_line.control_point_a.position)
+            zones.append(front_line.control_point_b.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:
@@ -472,7 +442,7 @@ class Game:
         # If there is no conflict take the center point between the two nearest opposing bases
         if len(zones) == 0:
             cpoint = None
-            min_distance = math.inf
+            min_distance = sys.maxsize
             for cp in self.theater.player_points():
                 for cp2 in self.theater.enemy_points():
                     d = cp.position.distance_to_point(cp2.position)
@@ -490,7 +460,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,
@@ -507,39 +477,75 @@ class Game:
             zones.append(Point(0, 0))
 
         self.__culling_zones = zones
+        self.__culling_points = points
 
-    def add_destroyed_units(self, data: dict[str, Union[float, str]]) -> None:
-        pos = Point(cast(float, data["x"]), cast(float, data["z"]))
+    def add_destroyed_units(self, data):
+        pos = Point(data["x"], data["z"])
         if self.theater.is_on_land(pos):
             self.__destroyed_units.append(data)
 
-    def get_destroyed_units(self) -> list[dict[str, Union[float, str]]]:
+    def get_destroyed_units(self):
         return self.__destroyed_units
 
-    def position_culled(self, pos: Point) -> bool:
+    def position_culled(self, pos):
         """
         Check if unit can be generated at given position depending on culling performance settings
         :param pos: Position you are tryng to spawn stuff at
         :return: True if units can not be added at given position
         """
-        if not self.settings.perf_culling:
+        if self.settings.perf_culling == False:
             return False
-        for z in self.__culling_zones:
-            if z.distance_to_point(pos) < self.settings.perf_culling_distance * 1000:
-                return False
-        return True
+        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
 
-    def get_culling_zones(self) -> list[Point]:
+    def get_culling_zones(self):
         """
         Check culling points
         :return: List of culling zones
         """
         return self.__culling_zones
 
-    def process_win_loss(self, turn_state: TurnState) -> None:
+    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
+
+    def get_enemy_coalition_id(self):
+        return 1
+
+    def get_player_coalition(self):
+        return Coalition.Blue
+
+    def get_enemy_coalition(self):
+        return Coalition.Red
+
+    def get_player_color(self):
+        return "blue"
+
+    def get_enemy_color(self):
+        return "red"
+
+    def process_win_loss(self, turn_state: TurnState):
         if turn_state is TurnState.WIN:
-            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:
-            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/groundunitorders.py

@@ -1,150 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections import defaultdict
-from typing import Optional, TYPE_CHECKING
-
-from game.theater import ControlPoint
-from .coalition import Coalition
-from .dcs.groundunittype import GroundUnitType
-from .theater.transitnetwork import (
-    NoPathError,
-    TransitNetwork,
-)
-from .transfers import TransferOrder
-
-if TYPE_CHECKING:
-    from .game import Game
-
-
-class GroundUnitOrders:
-    def __init__(self, destination: ControlPoint) -> None:
-        self.destination = destination
-
-        # Maps unit type to order quantity.
-        self.units: dict[GroundUnitType, int] = defaultdict(int)
-
-    def __str__(self) -> str:
-        return f"Pending ground unit delivery to {self.destination}"
-
-    def order(self, units: dict[GroundUnitType, int]) -> None:
-        for k, v in units.items():
-            self.units[k] += v
-
-    def sell(self, units: dict[GroundUnitType, int]) -> None:
-        for k, v in units.items():
-            self.units[k] -= v
-            if self.units[k] == 0:
-                del self.units[k]
-
-    def refund_all(self, coalition: Coalition) -> None:
-        self._refund(coalition, self.units)
-        self.units = defaultdict(int)
-
-    def _refund(self, coalition: Coalition, units: dict[GroundUnitType, int]) -> None:
-        for unit_type, count in units.items():
-            logging.info(f"Refunding {count} {unit_type} at {self.destination.name}")
-            coalition.adjust_budget(unit_type.price * count)
-
-    def pending_orders(self, unit_type: GroundUnitType) -> int:
-        pending_units = self.units.get(unit_type)
-        if pending_units is None:
-            pending_units = 0
-        return pending_units
-
-    def process(self, game: Game) -> None:
-        coalition = game.coalition_for(self.destination.captured)
-        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(coalition)
-
-        bought_units: dict[GroundUnitType, int] = {}
-        units_needing_transfer: dict[GroundUnitType, int] = {}
-        for unit_type, count in self.units.items():
-            allegiance = "Ally" if self.destination.captured else "Enemy"
-            d: dict[GroundUnitType, int]
-            if self.destination != ground_unit_source:
-                source = ground_unit_source
-                d = units_needing_transfer
-            else:
-                source = self.destination
-                d = bought_units
-
-            if count < 0:
-                logging.error(
-                    f"Attempted sale of {unit_type} at {self.destination} but ground "
-                    "units cannot be sold"
-                )
-            elif count > 0:
-                d[unit_type] = count
-                game.message(
-                    f"{allegiance} reinforcements: {unit_type} x {count} at {source}"
-                )
-
-        self.units = defaultdict(int)
-        self.destination.base.commission_units(bought_units)
-
-        if units_needing_transfer:
-            if ground_unit_source is None:
-                raise RuntimeError(
-                    f"Ground unit source could not be found for {self.destination} but "
-                    "still tried to transfer units to there"
-                )
-            ground_unit_source.base.commission_units(units_needing_transfer)
-            self.create_transfer(coalition, ground_unit_source, units_needing_transfer)
-
-    def create_transfer(
-        self,
-        coalition: Coalition,
-        source: ControlPoint,
-        units: dict[GroundUnitType, int],
-    ) -> None:
-        coalition.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/htn.py

@@ -1,127 +0,0 @@
-from __future__ import annotations
-
-from abc import ABC, abstractmethod
-from collections import Iterator, deque, Sequence
-from dataclasses import dataclass
-from typing import Any, Generic, Optional, TypeVar
-
-WorldStateT = TypeVar("WorldStateT", bound="WorldState[Any]")
-
-
-class WorldState(ABC, Generic[WorldStateT]):
-    @abstractmethod
-    def clone(self) -> WorldStateT:
-        ...
-
-
-class Task(Generic[WorldStateT]):
-    pass
-
-
-Method = Sequence[Task[WorldStateT]]
-
-
-class PrimitiveTask(Task[WorldStateT], Generic[WorldStateT], ABC):
-    @abstractmethod
-    def preconditions_met(self, state: WorldStateT) -> bool:
-        ...
-
-    @abstractmethod
-    def apply_effects(self, state: WorldStateT) -> None:
-        ...
-
-
-class CompoundTask(Task[WorldStateT], Generic[WorldStateT], ABC):
-    @abstractmethod
-    def each_valid_method(self, state: WorldStateT) -> Iterator[Method[WorldStateT]]:
-        ...
-
-
-PrimitiveTaskT = TypeVar("PrimitiveTaskT", bound=PrimitiveTask[Any])
-
-
-@dataclass
-class PlanningState(Generic[WorldStateT, PrimitiveTaskT]):
-    state: WorldStateT
-    tasks_to_process: deque[Task[WorldStateT]]
-    plan: list[PrimitiveTaskT]
-    methods: Optional[Iterator[Method[WorldStateT]]]
-
-
-@dataclass(frozen=True)
-class PlanningResult(Generic[WorldStateT, PrimitiveTaskT]):
-    tasks: list[PrimitiveTaskT]
-    end_state: WorldStateT
-
-
-class PlanningHistory(Generic[WorldStateT, PrimitiveTaskT]):
-    def __init__(self) -> None:
-        self.states: list[PlanningState[WorldStateT, PrimitiveTaskT]] = []
-
-    def push(self, planning_state: PlanningState[WorldStateT, PrimitiveTaskT]) -> None:
-        self.states.append(planning_state)
-
-    def pop(self) -> PlanningState[WorldStateT, PrimitiveTaskT]:
-        return self.states.pop()
-
-
-class Planner(Generic[WorldStateT, PrimitiveTaskT]):
-    def __init__(self, main_task: Task[WorldStateT]) -> None:
-        self.main_task = main_task
-
-    def plan(
-        self, initial_state: WorldStateT
-    ) -> Optional[PlanningResult[WorldStateT, PrimitiveTaskT]]:
-        planning_state: PlanningState[WorldStateT, PrimitiveTaskT] = PlanningState(
-            initial_state, deque([self.main_task]), [], None
-        )
-        history: PlanningHistory[WorldStateT, PrimitiveTaskT] = PlanningHistory()
-        while planning_state.tasks_to_process:
-            task = planning_state.tasks_to_process.popleft()
-            if isinstance(task, PrimitiveTask):
-                if task.preconditions_met(planning_state.state):
-                    task.apply_effects(planning_state.state)
-                    # Ignore type erasure. We've already verified that this is a Planner
-                    # with a WorldStateT and a PrimitiveTaskT, so we know that the task
-                    # list is a list of CompoundTask[WorldStateT] and PrimitiveTaskT. We
-                    # could scatter more unions throughout to be more explicit but
-                    # there's no way around the type erasure that mypy uses for
-                    # isinstance.
-                    planning_state.plan.append(task)  # type: ignore
-                else:
-                    planning_state = history.pop()
-            else:
-                assert isinstance(task, CompoundTask)
-                # If the methods field of our current state is not None that means we're
-                # resuming a prior attempt to execute this task after a subtask of the
-                # previously selected method failed.
-                #
-                # Otherwise this is the first exectution of this task so we need to
-                # create the generator.
-                if planning_state.methods is None:
-                    methods = task.each_valid_method(planning_state.state)
-                else:
-                    methods = planning_state.methods
-                try:
-                    method = next(methods)
-                    # Push the current node back onto the stack so that we resume
-                    # handling this task when we pop back to this state.
-                    resume_tasks: deque[Task[WorldStateT]] = deque([task])
-                    resume_tasks.extend(planning_state.tasks_to_process)
-                    history.push(
-                        PlanningState(
-                            planning_state.state.clone(),
-                            resume_tasks,
-                            planning_state.plan,
-                            methods,
-                        )
-                    )
-                    planning_state.methods = None
-                    planning_state.tasks_to_process.extendleft(reversed(method))
-                except StopIteration:
-                    try:
-                        planning_state = history.pop()
-                    except IndexError:
-                        # No valid plan was found.
-                        return None
-        return PlanningResult(planning_state.plan, planning_state.state)

game/income.py

@@ -14,10 +14,10 @@ class BuildingIncome:
     name: str
     category: str
     number: int
-    income_per_building: float
+    income_per_building: int
 
     @property
-    def income(self) -> float:
+    def income(self) -> int:
         return self.number * self.income_per_building
 
 

game/infos/information.py

@@ -2,13 +2,13 @@ import datetime
 
 
 class Information:
-    def __init__(self, title: str = "", text: str = "", turn: int = 0) -> None:
+    def __init__(self, title="", text="", turn=0):
         self.title = title
         self.text = text
         self.turn = turn
         self.timestamp = datetime.datetime.now()
 
-    def __str__(self) -> str:
+    def __str__(self):
         return "[{}][{}] {} {}".format(
             self.timestamp.strftime("%Y-%m-%d %H:%M:%S")
             if self.timestamp is not None

game/inventory.py

@@ -0,0 +1,130 @@
+"""Inventory management APIs."""
+from __future__ import annotations
+
+from collections import defaultdict
+from typing import Dict, Iterable, Iterator, Set, Tuple, TYPE_CHECKING, Type
+
+from dcs.unittype import FlyingType
+
+from gen.flights.flight import Flight
+
+if TYPE_CHECKING:
+    from game.theater import ControlPoint
+
+
+class ControlPointAircraftInventory:
+    """Aircraft inventory for a single control point."""
+
+    def __init__(self, control_point: ControlPoint) -> None:
+        self.control_point = control_point
+        self.inventory: Dict[Type[FlyingType], int] = defaultdict(int)
+
+    def add_aircraft(self, aircraft: Type[FlyingType], count: int) -> None:
+        """Adds aircraft to the inventory.
+
+        Args:
+            aircraft: The type of aircraft to add.
+            count: The number of aircraft to add.
+        """
+        self.inventory[aircraft] += count
+
+    def remove_aircraft(self, aircraft: Type[FlyingType], count: int) -> None:
+        """Removes aircraft from the inventory.
+
+        Args:
+            aircraft: The type of aircraft to remove.
+            count: The number of aircraft to remove.
+
+        Raises:
+            ValueError: The control point cannot fulfill the requested number of
+            aircraft.
+        """
+        available = self.inventory[aircraft]
+        if available < count:
+            raise ValueError(
+                f"Cannot remove {count} {aircraft.id} from "
+                f"{self.control_point.name}. Only have {available}."
+            )
+        self.inventory[aircraft] -= count
+
+    def available(self, aircraft: Type[FlyingType]) -> int:
+        """Returns the number of available aircraft of the given type.
+
+        Args:
+            aircraft: The type of aircraft to query.
+        """
+        try:
+            return self.inventory[aircraft]
+        except KeyError:
+            return 0
+
+    @property
+    def types_available(self) -> Iterator[Type[FlyingType]]:
+        """Iterates over all available aircraft types."""
+        for aircraft, count in self.inventory.items():
+            if count > 0:
+                yield aircraft
+
+    @property
+    def all_aircraft(self) -> Iterator[Tuple[Type[FlyingType], int]]:
+        """Iterates over all available aircraft types, including amounts."""
+        for aircraft, count in self.inventory.items():
+            if count > 0:
+                yield aircraft, count
+
+    def clear(self) -> None:
+        """Clears all aircraft from the inventory."""
+        self.inventory.clear()
+
+
+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
+        }
+
+    def reset(self) -> None:
+        """Clears all control points and their inventories."""
+        for inventory in self.inventories.values():
+            inventory.clear()
+
+    def set_from_control_point(self, control_point: ControlPoint) -> None:
+        """Set the control point's aircraft inventory.
+
+        If the inventory for the given control point has already been set for
+        the turn, it will be overwritten.
+        """
+        inventory = self.inventories[control_point]
+        for aircraft, count in control_point.base.aircraft.items():
+            inventory.add_aircraft(aircraft, count)
+
+    def for_control_point(
+        self, control_point: ControlPoint
+    ) -> ControlPointAircraftInventory:
+        """Returns the inventory specific to the given control point."""
+        return self.inventories[control_point]
+
+    @property
+    def available_types_for_player(self) -> Iterator[Type[FlyingType]]:
+        """Iterates over all aircraft types available to the player."""
+        seen: Set[Type[FlyingType]] = set()
+        for control_point, inventory in self.inventories.items():
+            if control_point.captured:
+                for aircraft in inventory.types_available:
+                    if not control_point.can_operate(aircraft):
+                        continue
+                    if aircraft not in seen:
+                        seen.add(aircraft)
+                        yield aircraft
+
+    def claim_for_flight(self, flight: Flight) -> None:
+        """Removes aircraft from the inventory for the given flight."""
+        inventory = self.for_control_point(flight.from_cp)
+        inventory.remove_aircraft(flight.unit_type, flight.count)
+
+    def return_from_flight(self, flight: Flight) -> None:
+        """Returns a flight's aircraft to the inventory."""
+        inventory = self.for_control_point(flight.from_cp)
+        inventory.add_aircraft(flight.unit_type, flight.count)

game/models/destroyed_units.py

@@ -0,0 +1,13 @@
+class DestroyedUnit:
+    """
+    Store info about a destroyed unit
+    """
+
+    x: int
+    y: int
+    name: str
+
+    def __init__(self, x, y, name):
+        self.x = x
+        self.y = y
+        self.name = name

game/models/frontline_data.py

@@ -0,0 +1,13 @@
+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,9 +1,4 @@
-from __future__ import annotations
-
-from typing import List, TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from game import Game
+from typing import List
 
 
 class FactionTurnMetadata:
@@ -15,7 +10,7 @@ class FactionTurnMetadata:
     vehicles_count: int = 0
     sam_count: int = 0
 
-    def __init__(self) -> None:
+    def __init__(self):
         self.aircraft_count = 0
         self.vehicles_count = 0
         self.sam_count = 0
@@ -29,7 +24,7 @@ class GameTurnMetadata:
     allied_units: FactionTurnMetadata
     enemy_units: FactionTurnMetadata
 
-    def __init__(self) -> None:
+    def __init__(self):
         self.allied_units = FactionTurnMetadata()
         self.enemy_units = FactionTurnMetadata()
 
@@ -39,29 +34,23 @@ class GameStats:
     Store statistics for the current game
     """
 
-    def __init__(self) -> None:
+    def __init__(self):
         self.data_per_turn: List[GameTurnMetadata] = []
 
-    def update(self, game: Game) -> None:
+    def update(self, game):
         """
         Save data for current turn
         :param game: Game we want to save the data about
         """
 
-        # Remove the current turn if its just an update for this turn
-        if 0 < game.turn < len(self.data_per_turn):
-            del self.data_per_turn[-1]
-
         turn_data = GameTurnMetadata()
 
         for cp in game.theater.controlpoints:
             if cp.captured:
-                for squadron in cp.squadrons:
-                    turn_data.allied_units.aircraft_count += squadron.owned_aircraft
+                turn_data.allied_units.aircraft_count += sum(cp.base.aircraft.values())
                 turn_data.allied_units.vehicles_count += sum(cp.base.armor.values())
             else:
-                for squadron in cp.squadrons:
-                    turn_data.enemy_units.aircraft_count += squadron.owned_aircraft
+                turn_data.enemy_units.aircraft_count += sum(cp.base.aircraft.values())
                 turn_data.enemy_units.vehicles_count += sum(cp.base.armor.values())
 
         self.data_per_turn.append(turn_data)

game/navmesh.py

@@ -103,7 +103,7 @@ class NavMesh:
         # currently.
         p = ShapelyPoint(point.x, point.y)
         for navpoly in self.polys:
-            if navpoly.poly.intersects(p):
+            if navpoly.poly.contains(p):
                 return navpoly
         return None
 

game/operation/operation.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
+from game.theater.theatergroundobject import TheaterGroundObject
 
 import logging
 import os
 from pathlib import Path
-from typing import List, Set, TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, Iterable, List, Optional, Set
 
 from dcs import Mission
 from dcs.action import DoScript, DoScriptFile
@@ -13,33 +14,25 @@ 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.aircraft import AircraftConflictGenerator, FlightData
+from gen import Conflict, FlightType, VisualGenerator
+from gen.aircraft import AIRCRAFT_DATA, AircraftConflictGenerator, FlightData
 from gen.airfields import AIRFIELD_DATA
-from gen.airsupport import AirSupport
-from gen.airsupportgen import AirSupportConflictGenerator
-from gen.armor import GroundConflictGenerator
+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.conflictgen import Conflict
-from gen.convoygen import ConvoyGenerator
 from gen.environmentgen import EnvironmentGenerator
-from gen.flights.flight import FlightType
 from gen.forcedoptionsgen import ForcedOptionsGenerator
 from gen.groundobjectsgen import GroundObjectsGenerator
 from gen.kneeboard import KneeboardGenerator
-from gen.lasercoderegistry import LaserCodeRegistry
 from gen.naming import namegen
 from gen.radios import RadioFrequency, RadioRegistry
-from gen.tacan import TacanRegistry, TacanUsage
+from gen.tacan import TacanRegistry
 from gen.triggergen import TRIGGER_RADIUS_MEDIUM, TriggersGenerator
-from gen.visualgen import VisualGenerator
+
 from .. import db
-from ..theater import Airfield, FrontLine
-from ..theater.bullseye import Bullseye
+from ..theater import Airfield
 from ..unitmap import UnitMap
 
 if TYPE_CHECKING:
@@ -49,14 +42,18 @@ if TYPE_CHECKING:
 class Operation:
     """Static class for managing the final Mission generation"""
 
-    current_mission: Mission
-    airgen: AircraftConflictGenerator
-    airsupportgen: AirSupportConflictGenerator
-    groundobjectgen: GroundObjectsGenerator
-    radio_registry: RadioRegistry
-    tacan_registry: TacanRegistry
-    laser_code_registry: LaserCodeRegistry
-    game: Game
+    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
     trigger_radius = TRIGGER_RADIUS_MEDIUM
     is_quick = None
     player_awacs_enabled = True
@@ -64,18 +61,33 @@ class Operation:
     enemy_awacs_enabled = True
     ca_slots = 1
     unit_map: UnitMap
+    jtacs: List[JtacInfo] = []
     plugin_scripts: List[str] = []
-    air_support = AirSupport()
 
     @classmethod
-    def prepare(cls, game: Game) -> None:
-        with open("resources/default_options.lua", "r", encoding="utf-8") as f:
+    def prepare(cls, game: Game):
+        with open("resources/default_options.lua", "r") as f:
             options_dict = loads(f.read())["options"]
         cls._set_mission(Mission(game.theater.terrain))
         cls.game = game
         cls._setup_mission_coalitions()
         cls.current_mission.options.load_from_dict(options_dict)
 
+    @classmethod
+    def conflicts(cls) -> Iterable[Conflict]:
+        assert cls.game
+        for frontline in cls.game.theater.conflicts():
+            yield Conflict(
+                cls.game.theater,
+                frontline.control_point_a,
+                frontline.control_point_b,
+                cls.game.player_name,
+                cls.game.enemy_name,
+                cls.game.player_country,
+                cls.game.enemy_country,
+                frontline.position,
+            )
+
     @classmethod
     def air_conflict(cls) -> Conflict:
         assert cls.game
@@ -86,11 +98,12 @@ class Operation:
         )
         return Conflict(
             cls.game.theater,
-            FrontLine(player_cp, enemy_cp),
-            cls.game.blue.faction.name,
-            cls.game.red.faction.name,
-            cls.current_mission.country(cls.game.blue.country_name),
-            cls.current_mission.country(cls.game.red.country_name),
+            player_cp,
+            enemy_cp,
+            cls.game.player_name,
+            cls.game.enemy_name,
+            cls.game.player_country,
+            cls.game.enemy_country,
             mid_point,
         )
 
@@ -99,19 +112,12 @@ class Operation:
         cls.current_mission = mission
 
     @classmethod
-    def _setup_mission_coalitions(cls) -> None:
-        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()
-        )
-        cls.current_mission.coalition["neutrals"] = Coalition(
-            "neutrals", bullseye=Bullseye(Point(0, 0)).to_pydcs()
-        )
+    def _setup_mission_coalitions(cls):
+        cls.current_mission.coalition["blue"] = Coalition("blue")
+        cls.current_mission.coalition["red"] = Coalition("red")
 
-        p_country = cls.game.blue.country_name
-        e_country = cls.game.red.country_name
+        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)]()
         )
@@ -119,16 +125,6 @@ class Operation:
             country_dict[db.country_id_from_name(e_country)]()
         )
 
-        belligerents = [
-            db.country_id_from_name(p_country),
-            db.country_id_from_name(e_country),
-        ]
-        for country in country_dict.keys():
-            if country not in belligerents:
-                cls.current_mission.coalition["neutrals"].add_country(
-                    country_dict[country]()
-                )
-
     @classmethod
     def inject_lua_trigger(cls, contents: str, comment: str) -> None:
         trigger = TriggerStart(comment=comment)
@@ -165,9 +161,10 @@ class Operation:
     def notify_info_generators(
         cls,
         groundobjectgen: GroundObjectsGenerator,
-        air_support: AirSupport,
+        airsupportgen: AirSupportConflictGenerator,
+        jtacs: List[JtacInfo],
         airgen: AircraftConflictGenerator,
-    ) -> None:
+    ):
         """Generates subscribed MissionInfoGenerator objects (currently kneeboards and briefings)"""
 
         gens: List[MissionInfoGenerator] = [
@@ -178,17 +175,14 @@ class Operation:
             for dynamic_runway in groundobjectgen.runways.values():
                 gen.add_dynamic_runway(dynamic_runway)
 
-            for tanker in air_support.tankers:
-                if tanker.blue:
-                    gen.add_tanker(tanker)
+            for tanker in airsupportgen.air_support.tankers:
+                gen.add_tanker(tanker)
 
-            for aewc in air_support.awacs:
-                if aewc.blue:
-                    gen.add_awacs(aewc)
+            for aewc in airsupportgen.air_support.awacs:
+                gen.add_awacs(aewc)
 
-            for jtac in air_support.jtacs:
-                if jtac.blue:
-                    gen.add_jtac(jtac)
+            for jtac in jtacs:
+                gen.add_jtac(jtac)
 
             for flight in airgen.flights:
                 gen.add_flight(flight)
@@ -211,10 +205,6 @@ class Operation:
         for frequency in unique_map_frequencies:
             cls.radio_registry.reserve(frequency)
 
-    @classmethod
-    def create_laser_code_registry(cls) -> None:
-        cls.laser_code_registry = LaserCodeRegistry()
-
     @classmethod
     def assign_channels_to_flights(
         cls, flights: List[FlightData], air_support: AirSupport
@@ -223,7 +213,23 @@ class Operation:
         for flight in flights:
             if not flight.client_units:
                 continue
-            flight.aircraft_type.assign_channels_for_flight(flight, air_support)
+            cls.assign_channels_to_flight(flight, air_support)
+
+    @staticmethod
+    def assign_channels_to_flight(flight: FlightData, air_support: AirSupport) -> None:
+        """Assigns preset radio channels for a client flight."""
+        airframe = flight.aircraft_type
+
+        try:
+            aircraft_data = AIRCRAFT_DATA[airframe.id]
+        except KeyError:
+            logging.warning(f"No aircraft data for {airframe.id}")
+            return
+
+        if aircraft_data.channel_allocator is not None:
+            aircraft_data.channel_allocator.assign_channels_for_flight(
+                flight, air_support
+            )
 
     @classmethod
     def _create_tacan_registry(
@@ -242,7 +248,7 @@ class Operation:
                 if beacon.channel is None:
                     logging.error(f"TACAN beacon has no channel: {beacon.callsign}")
                 else:
-                    cls.tacan_registry.mark_unavailable(beacon.tacan_channel)
+                    cls.tacan_registry.reserve(beacon.tacan_channel)
 
     @classmethod
     def _create_radio_registry(
@@ -259,7 +265,7 @@ class Operation:
                 # beacon list.
 
     @classmethod
-    def _generate_ground_units(cls) -> None:
+    def _generate_ground_units(cls):
         cls.groundobjectgen = GroundObjectsGenerator(
             cls.current_mission,
             cls.game,
@@ -274,23 +280,18 @@ class Operation:
         """Add destroyed units to the Mission"""
         for d in cls.game.get_destroyed_units():
             try:
-                type_name = d["type"]
-                if not isinstance(type_name, str):
-                    raise TypeError(
-                        "Expected the type of the destroyed static to be a string"
-                    )
-                utype = db.unit_type_from_name(type_name)
+                utype = db.unit_type_from_name(d["type"])
             except KeyError:
                 continue
 
-            pos = Point(cast(float, d["x"]), cast(float, d["z"]))
+            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
             ):
                 cls.current_mission.static_group(
-                    country=cls.current_mission.country(cls.game.blue.country_name),
+                    country=cls.current_mission.country(cls.game.player_country),
                     name="",
                     _type=utype,
                     hidden=True,
@@ -302,22 +303,17 @@ class Operation:
     @classmethod
     def generate(cls) -> UnitMap:
         """Build the final Mission to be exported"""
-        cls.air_support = AirSupport()
         cls.create_unit_map()
         cls.create_radio_registries()
-        cls.create_laser_code_registry()
         # Set mission time and weather conditions.
         EnvironmentGenerator(cls.current_mission, cls.game.conditions).generate()
         cls._generate_ground_units()
-        cls._generate_transports()
         cls._generate_destroyed_units()
-        # Generate ground conflicts first so the JTACs get the first laser code (1688)
-        # rather than the first player flight with a TGP.
-        cls._generate_ground_conflicts()
         cls._generate_air_units()
         cls.assign_channels_to_flights(
             cls.airgen.flights, cls.airsupportgen.air_support
         )
+        cls._generate_ground_conflicts()
 
         # Triggers
         triggersgen = TriggersGenerator(cls.current_mission, cls.game)
@@ -325,8 +321,13 @@ class Operation:
 
         # Setup combined arms parameters
         cls.current_mission.groundControl.pilot_can_control_vehicles = cls.ca_slots > 0
-        cls.current_mission.groundControl.blue_tactical_commander = cls.ca_slots
-        cls.current_mission.groundControl.blue_observer = 1
+        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
 
         # Options
         forcedoptionsgen = ForcedOptionsGenerator(cls.current_mission, cls.game)
@@ -337,7 +338,7 @@ class Operation:
         if cls.game.settings.perf_smoke_gen:
             visualgen.generate()
 
-        cls.generate_lua(cls.airgen, cls.air_support)
+        cls.generate_lua(cls.airgen, cls.airsupportgen, cls.jtacs)
 
         # Inject Plugins Lua Scripts and data
         cls.plugin_scripts.clear()
@@ -349,7 +350,9 @@ class Operation:
         cls.assign_channels_to_flights(
             cls.airgen.flights, cls.airsupportgen.air_support
         )
-        cls.notify_info_generators(cls.groundobjectgen, cls.air_support, cls.airgen)
+        cls.notify_info_generators(
+            cls.groundobjectgen, cls.airsupportgen, cls.jtacs, cls.airgen
+        )
         cls.reset_naming_ids()
         return cls.unit_map
 
@@ -365,7 +368,6 @@ class Operation:
             cls.game,
             cls.radio_registry,
             cls.tacan_registry,
-            cls.air_support,
         )
         cls.airsupportgen.generate()
 
@@ -375,42 +377,40 @@ class Operation:
             cls.game.settings,
             cls.game,
             cls.radio_registry,
-            cls.tacan_registry,
-            cls.laser_code_registry,
             cls.unit_map,
             air_support=cls.airsupportgen.air_support,
-            helipads=cls.groundobjectgen.helipads,
         )
 
         cls.airgen.clear_parking_slots()
 
         cls.airgen.generate_flights(
-            cls.current_mission.country(cls.game.blue.country_name),
-            cls.game.blue.ato,
+            cls.current_mission.country(cls.game.player_country),
+            cls.game.blue_ato,
             cls.groundobjectgen.runways,
         )
         cls.airgen.generate_flights(
-            cls.current_mission.country(cls.game.red.country_name),
-            cls.game.red.ato,
+            cls.current_mission.country(cls.game.enemy_country),
+            cls.game.red_ato,
             cls.groundobjectgen.runways,
         )
         cls.airgen.spawn_unused_aircraft(
-            cls.current_mission.country(cls.game.blue.country_name),
-            cls.current_mission.country(cls.game.red.country_name),
+            cls.current_mission.country(cls.game.player_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():
-            player_cp = front_line.blue_cp
-            enemy_cp = front_line.red_cp
+        for front_line in cls.game.theater.conflicts(True):
+            player_cp = front_line.control_point_a
+            enemy_cp = front_line.control_point_b
             conflict = Conflict.frontline_cas_conflict(
-                cls.game.blue.faction.name,
-                cls.game.red.faction.name,
-                cls.current_mission.country(cls.game.blue.country_name),
-                cls.current_mission.country(cls.game.red.country_name),
-                front_line,
+                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,
             )
             # Generate frontline ops
@@ -423,27 +423,21 @@ class Operation:
                 player_gp,
                 enemy_gp,
                 player_cp.stances[enemy_cp.id],
-                enemy_cp.stances[player_cp.id],
                 cls.unit_map,
-                cls.radio_registry,
-                cls.air_support,
-                cls.laser_code_registry,
             )
             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) -> None:
+    def reset_naming_ids(cls):
         namegen.reset_numbers()
 
     @classmethod
     def generate_lua(
-        cls, airgen: AircraftConflictGenerator, air_support: AirSupport
+        cls,
+        airgen: AircraftConflictGenerator,
+        airsupportgen: AirSupportConflictGenerator,
+        jtacs: List[JtacInfo],
     ) -> None:
         #  TODO: Refactor this
         luaData = {
@@ -456,32 +450,32 @@ class Operation:
             "BlueAA": {},
         }  # type: ignore
 
-        for i, tanker in enumerate(air_support.tankers):
-            luaData["Tankers"][i] = {
-                "dcsGroupName": tanker.group_name,
+        for tanker in airsupportgen.air_support.tankers:
+            luaData["Tankers"][tanker.callsign] = {
+                "dcsGroupName": tanker.dcsGroupName,
                 "callsign": tanker.callsign,
                 "variant": tanker.variant,
                 "radio": tanker.freq.mhz,
                 "tacan": str(tanker.tacan.number) + tanker.tacan.band.name,
             }
 
-        for i, awacs in enumerate(air_support.awacs):
-            luaData["AWACs"][i] = {
-                "dcsGroupName": awacs.group_name,
-                "callsign": awacs.callsign,
-                "radio": awacs.freq.mhz,
-            }
+        if airsupportgen.air_support.awacs:
+            for awacs in airsupportgen.air_support.awacs:
+                luaData["AWACs"][awacs.callsign] = {
+                    "dcsGroupName": awacs.dcsGroupName,
+                    "callsign": awacs.callsign,
+                    "radio": awacs.freq.mhz,
+                }
 
-        for i, jtac in enumerate(air_support.jtacs):
-            luaData["JTACs"][i] = {
-                "dcsGroupName": jtac.group_name,
+        for jtac in jtacs:
+            luaData["JTACs"][jtac.callsign] = {
+                "dcsGroupName": jtac.dcsGroupName,
                 "callsign": jtac.callsign,
                 "zone": jtac.region,
                 "dcsUnit": jtac.unit_name,
                 "laserCode": jtac.code,
-                "radio": jtac.freq.mhz,
             }
-        flight_count = 0
+
         for flight in airgen.flights:
             if flight.friendly and flight.flight_type in [
                 FlightType.ANTISHIP,
@@ -502,7 +496,7 @@ class Operation:
                     elif hasattr(flightTarget, "name"):
                         flightTargetName = flightTarget.name
                         flightTargetType = flightType + " TGT (Airbase)"
-                    luaData["TargetPoints"][flight_count] = {
+                    luaData["TargetPoints"][flightTargetName] = {
                         "name": flightTargetName,
                         "type": flightTargetType,
                         "position": {
@@ -510,7 +504,6 @@ class Operation:
                             "y": flightTarget.position.y,
                         },
                     }
-                    flight_count += 1
 
         for cp in cls.game.theater.controlpoints:
             for ground_object in cp.ground_objects:
@@ -596,8 +589,8 @@ class Operation:
             zone = data["zone"]
             laserCode = data["laserCode"]
             dcsUnit = data["dcsUnit"]
-            radio = data["radio"]
-            lua += f"    {{dcsGroupName='{dcsGroupName}', callsign='{callsign}', zone={repr(zone)}, laserCode='{laserCode}', dcsUnit='{dcsUnit}', radio='{radio}' }}, \n"
+            lua += f"    {{dcsGroupName='{dcsGroupName}', callsign='{callsign}', zone='{zone}', laserCode='{laserCode}', dcsUnit='{dcsUnit}' }}, \n"
+            # lua += f"    {{name='{dcsGroupName}', description='JTAC {callsign} ', information='Laser:{laserCode}', jtac={laserCode} }}, \n"
         lua += "}"
 
         # Process the Target Points