Use python, not py.

py is a shortcut that launches the *latest* version of Python on the
machine. https://stackoverflow.com/a/50896577/632035

The build machines were updated to include python 3.9, so we were
doing everything with 3.9 instead of 3.8. pyproj doesn't have a binary
wheel for 3.9 on pypi yet, so we were falling back to building it from
source, which we aren't able to do, breaking the build.

.git-blame-ignore-revs

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-Before filing, please search the issue tracker to see if the issue has already been reported.
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Additional information**
-
-We will usually need more information for debugging. Include as much of the following as you are able:
-
-- DCS Liberation save file (the `.liberation` file you save from the DCS Liberation window). By default these are located in your DCS saved games directory (`%USERPROFILE%/Saved Games/DCS`).
-- The generated mission file (the `.miz` file that you load in DCS to play the turn). By default these are located in your missions directory (`%USERPROFILE%/Saved Games/DCS/Missions`).
-- A tacview track file, especially when demonstrating an issue with AI behavior. By default these are located in your Tacview tracks directory (`%USERPROFILE%/Documents/Tacview`).
-- The state.json file from the finished mission when the problem is related to results processing. By default these are located in your Liberation install directory.
-
-**Version information (please complete the following information):**
- - DCS Liberation [e.g. 2.3.1]:
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,19 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-Before filing, please search the issue tracker to see if this feature has already been requested.
-
-**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 [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/workflows/black.yml

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

.github/workflows/build.yml

@@ -27,20 +27,6 @@ jobs:
         # 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: mypy game
-      run: |
-        ./venv/scripts/activate
-        mypy game
-
-    - name: mypy gen
-      run: |
-        ./venv/scripts/activate
-        mypy gen
-      
-    - name: update build number
-      run: |
-        [IO.File]::WriteAllLines($pwd.path + "\resources\buildnumber", $env:GITHUB_RUN_NUMBER)
-
     - name: Build binaries
       run: |
         ./venv/scripts/activate

.github/workflows/release.yml

@@ -29,20 +29,6 @@ jobs:
         # 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: Finalize version
-      run: |
-        New-Item -ItemType file resources\final
-
-    - name: mypy game
-      run: |
-        ./venv/scripts/activate
-        mypy game
-
-    - name: mypy gen
-      run: |
-        ./venv/scripts/activate
-        mypy gen
-
     - name: Build binaries
       run: |
         ./venv/scripts/activate
@@ -53,6 +39,11 @@ jobs:
       env:
         TAG_NAME: ${{ github.ref }}
       run: |
+        $version = ($env:TAG_NAME -split "/") | Select-Object -Last 1
+        (Get-Content .\installer\dcs_liberation.iss) -replace "{{version}}",$version | Out-File .\build\installer.iss
+        cd .\installer
+        iscc.exe ..\build\installer.iss
+        cd ..
         Copy-Item .\changelog.md .\dist
 
     - uses: actions/upload-artifact@v2
@@ -95,7 +86,15 @@ jobs:
         body_path: releasenotes.md
         draft: false
         prerelease: ${{ steps.version.outputs.prerelease }}
-
+    
+    - uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./dcs_liberation.exe
+        asset_name: dcs_liberation.${{ steps.version.outputs.number }}.exe
+        asset_content_type: application/exe
 
     - uses: actions/upload-release-asset@v1
       env:

.gitignore

@@ -5,20 +5,20 @@ resources/payloads/*.lua
 venv
 logs.txt
 .DS_Store
-.vscode/settings.json
 dist/**
 a.py
 resources/tools/a.miz
+tests/**
 # User-specific stuff
 .idea/
-.env
 
 /kneeboards
 /liberation_preferences.json
 /state.json
 
-logs/
+logs/liberation.log
 
 qt_ui/logs/liberation.log
 
 *.psd
+resources/scripts/plugins/*

.pre-commit-config.yaml

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

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "python.pythonPath": "g:\\python\\dcs_liberation\\venv\\Scripts\\python.exe",
+  "vsintellicode.python.completionsEnabled": true
+}

CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at khopa.studio@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -1,26 +0,0 @@
-First, note that we have a code of conduct, please follow it in all your interactions with the project.
-
-## Contributing as a non-developer
- 
-* Report bugs by opening issues here on Github.
-* Help others users on Discord by answering their questions.
-* Raise awareness about the project, by making a video and/or a tutorial.
-
-Should you report a bug, 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.
-
-## Making content for Liberation
-
-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. 
-
-## Develop new features
-
-If you want to develop a new feature, we recommend you first open an issue describing the new feature and discuss it with us on Discord before starting development.
-However, feel free to work on any existing issue.
-
-## Pull requests
-
-Please submit your pull requests on the **develop** branch. We expect a description of its content, and when applicable, a reference to the issue(s) it is resolving.

LICENSE

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

README.md

@@ -12,25 +12,15 @@
 ![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. 
+DCS Liberation is a [DCS World](https://www.digitalcombatsimulator.com/en/products/world/) turn based single-player semi dynamic campaign. 
 It is an external program that generates full and complex DCS missions and manage a persistent combat environment.  
 
-![Logo](https://i.imgur.com/4hq0rLq.png)
+![Logo](https://imgur.com/B6tvlBJ.png)
 
 ## Downloads
 
 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/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/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/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/Khopa/dcs_liberation/wiki/)
@@ -41,10 +31,6 @@ First, a big thanks to shdwp, for starting the original DCS Liberation project.
 
 Then, DCS Liberation uses [pydcs](http://github.com/pydcs/dcs) for mission generation, and nothing would be possible without this.
 It also uses the popular [Mist](https://github.com/mrSkortch/MissionScriptingTools) lua framework for mission scripting.
-
-Excellent lua scripts DCS Liberation uses as plugins:
-
-* For the JTAC feature, DCS Liberation embeds Ciribob's JTAC Autolase [script](https://github.com/ciribob/DCS-JTACAutoLaze).
-* Walder's [Skynet-IADS](https://github.com/walder/Skynet-IADS) is used for Integrated Air Defense System.
+And for the JTAC feature, DCS Liberation embed Ciribob's JTAC Autolase [script](https://github.com/ciribob/DCS-JTACAutoLaze).
 
 Please also show some support to these projects ! 

changelog.md

@@ -1,325 +1,3 @@
-# 2.5.1
-
-## Features/Improvements
-
-* **[UI]** Engagement ranges are now displayed by default.
-* **[UI]** Engagement range display generalized to work for all patrolling flight plans (BARCAP, TARCAP, and CAS).
-* **[Flight Planner]** Front lines no longer project threat zones to avoid pushing BARCAPs back so much. TARCAPs will be forcibly planned but strike packages will not route around front lines even if it is reasonable to do so.
-
-## Fixes
-
-* **[Campaigns]** EWRs associated with a base will now only be generated near the base.
-* **[Flight Planner]** Fixed error when generating AEW&C flight plans in campaigns with no front lines.
-
-# 2.5.0
-
-Saves from 2.4 are not compatible with 2.5.
-
-## Features/Improvements
-
-* **[Engine]** DCS 2.7 Support
-* **[UI]** Improved FOB menu, added a custom banner, and do not display aircraft recruitment menu
-* **[Flight Planner]** Added AEW&C missions. (by siKruger)
-* **[Kneeboard]** Added dark kneeboard option (by GvonH)
-* **[Campaigns]** Multiple EWR sites may now be generated, and EWR sites may be generated outside bases (by SnappyComebacks)
-* **[Mission Generation]** Cloudy and rainy (but not thunderstorm) weather will use the cloud presets from DCS 2.7.
-* **[Plugins]** Added LotATC export plugin (by drsoran)
-* **[Plugins]** Added Splash Damage Plugin (by Wheelijoe)
-* **[Loadouts]** Replaced Litening with ATFLIR for all default F/A-18C loadouts.
-
-## Fixes
-
-* **[Flight Planner]** Front lines now project threat zones, so TARCAP/escorts will not be pruned for flights near the front. Packages may also route around the front line when practical.
-* **[Flight Planner]** Fixed error when planning BAI at SAMs with dead subgroups.
-* **[Flight Planner]** Mig-19 was not allowed for CAS roles fixed
-* **[Flight Planner]** Increased size of navigation planning area to avoid plannign failures with distant waypoints.
-* **[Flight Planner]** Fixed UI refresh when unchecking the "default loadout" box in the loadout editor.
-* **[Objective names]** Fixed typos in objective name : ARMADILLLO -> ARMADILLO (by SnappyComebacks)
-* **[Payloads]** F-86 Sabre was missing a custom payload
-* **[Payloads]** Added GAR-8 period restrictions (by Mustang-25)
-* **[Campaign]** Date now progresses.
-* **[Campaign]** Added game over message when a coalition runs out of functioning airbases.
-* **[Mission Generation]** Fixed "invalid face handle" error in kneeboard generation that occurred on some machines.
-
-## Regressions
-
-* **[Mod Support]** Stopped support for 2.5.5 Rafale Mode, and removed factions that were using it
-* **[Mod Support]** Su-57 mod support might be out of date
-
-# 2.4.3
-
-## Features/Improvements
-
-* **[New Game Wizard]** Added the possibility to setup custom start date
-
-## Fixes
-
-* **[Mods]** Updated C-130J mod data to version 6.4
-* **[Mods]** Updated F-22A mod to latest version
-
-# 2.4.2
-
-## Features/Improvements
-
-* **[Factions]** Introduction dates and fallback weapons added for US, Russian, UK, and French weapons. Huge thanks to @TheCandianVendingMachine for the massive amount of data entry!
-* **[Campaigns]** Added 1995 start dates.
-
-## Fixes
-
-* **[Economy]** Pending ground unit purchases will also be transferred when a connected base is captured.
-* **[UI]** Fixed rounding of budget in recruitment menu.
-
-# 2.4.1
-
-## Fixes
-
-* **[Units]** Fixed syntax error with the SH-60B payload file.
-* **[Culling]** Missile sites generate reasonably sized non-cull zones rather than 100km ones.
-* **[UI]** Budget display is also now rounded to 2 decimal places.
-* **[UI]** Fixed some areas where the old, non-pretty name was displayed to users.
-
-# 2.4.0
-
-Saves from 2.3 are not compatible with 2.4.
-
-## Highlights
-
-* Improved flight plan generation to avoid loitering in or traveling through threatened areas when practical.
-* Improved AI aircraft purchasing behavior.
-* Era-restricted weapons (work in progress).
-* Tons of UI polish.
-* Rebalanced economy to keep opfor competitive over the course of the game.
-
-## Features/Improvements
-
-* **[Flight Planner]** Air-to-air and SEAD escorts will no longer be automatically planned for packages that are not in range of threats.
-* **[Flight Planner]** Non-custom flight plans will now navigate around threat areas en route to the target area when practical.
-* **[Flight Planner]** Flight plans along front lines now ensure that the race track start is closer to the departure airfield than the race track end.
-* **[Campaign AI]** Auto-purchase now prefers airfields that are not within range of the enemy.
-* **[Campaign AI]** Auto-purchase now prefers the best aircraft for the task, but will attempt to maintain some variety.
-* **[Campaign AI]** Opfor now sells off odd aircraft since they're unlikely to be used.
-* **[Campaign AI]** Multiple rounds of CAP will be planned (roughly 90 minutes of coverage). Default starting budget has increased to account for the increased need for aircraft.
-* **[Mission Generator]** Multiple groups are created for complex SAM sites (SAMs with additional point defense or SHORADS), improving Skynet behavior.
-* **[Mission Generator]** Default start type can now be chosen in the settings. This replaces the non-functional "AI Parking Start" option. **Selecting any type other than cold will break OCA/Aircraft missions.**
-* **[Cheat Menu]** Added ability to toggle base capture and frontline advance/retreat cheats.
-* **[Skynet]** Updated to 2.0.1.
-* **[Skynet]** Point defenses are now configured to remain on to protect the site they accompany.
-* **[Hercules]** Updated the Hercules Cargo list file.
-* **[Balance]** Opfor now gains income using the same rules as the player, significantly increasing their income relative to the player for most campaigns.
-* **[Balance]** Units now retreat from captured bases when able. Units with no retreat path will be captured and sold.
-* **[Economy]** FOBs generate only $10M per turn (previously $20M like airbases).
-* **[Economy]** Carriers and off-map spawns generate no income (previously $20M like airbases).
-* **[Economy]** Sales of aircraft and ground vehicles can now be cancelled before the next turn begins.
-* **[UI]** Multi-SAM objectives now show threat and detection rings per group.
-* **[UI]** New icon for AA sites with no active threat.
-* **[UI]** Unit names are now prettier and more accurate, and can now be set per-country for added historical flavour.
-* **[UI]** Default loadout is now shown for flights with no custom loadout selected.
-* **[UI]** Aircraft for a new flight are now only selectable if they match the task type for that flight.
-* **[UI]** WIP - There is now a unit info button for each unit in the recruitment list, that should help newer players learn what each unit does.
-* **[UI]** Docs for time-on-target and creating new theaters/factions/loadouts are now linked in the UI at the appropriate places.
-* **[UI]** ASAP is now a checkbox rather than a button. Enabling this will disable the TOT selector but changes to the package structure will automatically re-ASAP the package.
-* **[UI]** Arrival airfield is now shown in the flight list if it differs from the departure airfield.
-* **[UI]** Start type can now be selected when creating a flight.
-* **[UI]** Arrival and divert airfields can be edited after the flight is created.
-* **[Factions]** Added option for date-based loadout restriction. Active radar homing missiles are handled, patches welcome for the other thousand weapons.
-* **[Factions]** Added Poland 2010 faction.
-* **[Factions]** Added Greece 2005 faction.
-* **[Factions]** Added Iran 1988 faction.
-* **[Units]** Support for E-2 Hawkeye, SH-60B Seahawk, S-3B Viking (thanks to awinterquest) and SpGH Dana - these are now being used by appropriate factions.
-* **[Culling]** Missile sites are no longer culled.
-* **[Campaigns]** Added campaign "Black Sea Lite" by Starfire
-* **[Campaigns]** Added campaign "Exercise Vegas Nerve" by Starfire 
-* **[New game Wizard]** The theater page is now the first page of the campaign wizard, recommended factions will be selected automatically on the faction selection page
-* **[New game Wizard]** Added information text about the selected campaign performance.
-* **[Mod Support]** Added support for High Digit SAMs mod 1.4.0
-* **[Mod Support]** Added SAMs sites generator : KS19Generator, SA10BGenerator, SA12Generator, SA17Generator, SA20Generator, SA20BGenerator, SA23Generator    
-
-## Fixes
-
-* **[Hercules]** Updated the default Hercules radio frequency.
-* **[Economy]** Pending unit orders at captured bases will be refunded.
-* **[UI]** Carrier group SAM threat rings now move with the carrier.
-* **[UI]** Base intel menu no longer compresses text, and is now scrollable.
-* **[UI]** Edit Flight window is now dynamically sized to adapt to the width of waypoint names, so they no longer get truncated.
-* **[UI]** Budget income display is now rounded to 2 decimal places.
-* **[UI]** Fixed incorrect income per turn displayed for strike target tooltip.
-* **[Factions]** USA with C-130 faction now links to the required mod.
-* **[Campaign]** Fixed issue where destroyed buildings would sometimes not count as destroyed and thus respawn.
-* **[Campaign]** Fixed issue where destroyed runways were not registered.
-* **[Units]** J-11A is no longer spawned with empty loadout.
-* **[Units]** F-14B is no longer spawned with empty loadout for fighter sweep tasks.
-* **[Units]** Pyotr Velikiy cruiser has been removed for now as it's nearly unkillable.
-* **[Units]** Submarines have been removed for now as they aren't wholly functional.
-* **[Units]** Fixed "FACTION ERROR : Unable to find OliverHazardPerryGroupGenerator in pydcs" error at startup.
-* **[Mission Generator]** Fixed a bug where units set to Aggressive stance sometimes did not move.
-* **[Mission Generator]** Flyover points for OCA/Aircraft missions are now generated correctly.
-* **[Flight Planner]** Fixed not being able to create custom waypoints for buildings.
-* **[Flight Planner]** Strike missions will no longer be automatically planned against SAMs.
-* **[Flight Planner]** Strike missions will no longer be automatically planned against FOB structures.
-
-# 2.3.4
-
-## Fixes:
-[Mission Generator] Mission generator would crash when generating fire missions for destroyed SCUD sites - fixed
-
-# 2.3.3
-
-## Features/Improvements
-* **[Campaigns]** Reworked Golan Heights campaign on Syria, (Added FOB and preset locations for SAMS)
-* **[Campaigns]** Added a lite version of the Golan Heights campaign
-* **[Campaigns]** Reworked Syrian Civil War campaign (Added FOB and preset locations for SAMS)
-* **[Campaigns]** Reworked Emirates campaign
-* **[Campaigns]** AA units added to frontlines and updated all factions to include some frontline AA units.
-* **[Mission Generator]** Infantry will only be generated for APC and IFV groups
-* **[Mission Generator]** Infantry squads size is not randomized anymore
-* **[Mission Generator]** Infantry squads can have a mortar. 
-* **[Mission Generator]** SCUD missiles sites will now fire on enemy controls points in range when possible
-* **[Factions]** Updated Nato Desert Storm to include F-14A
-* **[Factions]** Updated Iraq 1991 factions to include Zsu-57 and Mig-29A
-* **[Factions]** Germany 1944, added Stug III and Stug IV
-* **[Factions]** Added factions Insurgents (Hard) with better and more weapons
-* **[Plugins]** [The EWRS plugin](https://github.com/Bob7heBuilder/EWRS) is now included.
-* **[UI]** Added enemy intelligence summary and details window.
-
-## Fixes:
-* **[Factions]** AI would never buy artillery units for the frontline - fixed
-* **[Factions]** Removed the F-111 unit from the NATO desert storm faction. (Recruiting it would cause crashes in DCS, since it is not a valid unit)
-* **[Campaign]** Automatic redeployment of ground units would sometimes fail - fixed
-* **[Mission Generator]** Artillery groups would retreat in the wrong direction - fixed
-* **[Units]** Fixed SPG_Stryker_M1128_MGS not being in db
-* **[UI]** Fixed and added many missing ground units icons
-* **[UI]** Ship groups could be replaced by SAM sites in the UI, which would lead to broken mission being generated - fixed 
-* **[New Game Wizard]** Removed the "mid game" campaign generator option which is currently broken
-* **[Mission Generator]** Empty navy groups will no longer be generated
-* **[Mission Generator]** Fixed BAI, SEAD, and DEAD flights ocassionally being assigned the wrong targets.
-* **[Flight Planner]** Fixed not being able to plan packages against opfor carriers
-* **[UI]** Repaired SAMs no longer show as dead.
-* **[UI]** Fixed not being able to manage a disbanded site after disbanding and closing the base menu.
-
-# 2.3.2
-
-## Features/Improvements
-* **[Units]** Support for newly added BTR-82A, T-72B3
-* **[Units]** Added ZSU-57 AAA sites
-* **[Culling]** BARCAP missions no longer create culling exclusion zones.
-* **[Flight Planner]** Improved TOT planning. Negative start times no longer occur with TARCAPs and hold times no longer affect planning for flight plans without hold points.
-* **[Factions]** Added Iraq 1991 faction (thanks again to Hawkmoon!)
-
-## Fixes:
-* **[Mission Generator]** Fix mission generation error when there are too many radio frequency to setup for the Mig-21
-* **[Mission Generator]** Fix ground units not moving forward
-* **[Mission Generator]** Fixed assigned radio channels overlapping with beacons.
-* **[Flight Planner]** Fix creation of custom waypoints.
-* **[Campaigns]** Fixed many cases of SAMs spawning on the runways/taxiways in Syria Full.
-
-# 2.3.1
-
-## Features/Improvements
-* **[UX]** Added a warning message when the player is attempting to buy more planes at an already full airbase. 
-* **[Campaigns]** Migrated Syria full map to new format. (Thanks to Hawkmoon)
-* **[Faction]** Added NATO desert Storm faction (Thanks to Hawkmoon)
-
-## Fixes:
-* **[AI]** CAP flights will engage enemies again.
-* **[Campaigns]** Fixed a missing path on the Caucasus Full Map campaign
-
-# 2.3.0
-
-## Features/Improvements
-* **[Campaign Map]** Overhauled the campaign model
-* **[Campaign Map]** Possible to add FOB as control points
-* **[Campaign Map]** Added off-map spawn locations
-* **[Campaign AI]** Overhauled AI recruiting behaviour
-* **[Campaign AI]** Added AI procurement for Blue
-* **[Campaign]** New Campaign: "Black Sea"
-* **[Mission Planner]** Possible to move carrier and tarawa on the campaign map
-* **[Mission Generator]** Infantry squads on frontline can have manpads
-* **[Mission Generator]** Unused aircraft now spawned to allow for OCA strikes
-* **[Mission Generator]** Opfor now obeys parking limits
-* **[Mission Generator]** Support for Anubis C-130 Hercules mod
-* **[Flight Planner]** Added fighter sweep missions.
-* **[Flight Planner]** Added BAI missions.
-* **[Flight Planner]** Added anti-ship missions.
-* **[Flight Planner]** Differentiated BARCAP and TARCAP. TARCAP is now for hostile areas and will arrive before the package.
-* **[Flight Planner]** Added OCA missions
-* **[Flight Planner]** Added Alternate/divert airfields
-* **[Culling]** Added possibility to include/exclude carriers from culling zones
-* **[QOL]** On liberation startup, your latest save game is loaded automatically
-* **[Units]** Reduced starting fuel load for C101
-* **[UI]** Inform the user of the weather
-* **[UI]** Added toolbar buttons to change map display settings
-* **[Game]** Added new Economy options for adjusting income multipliers and starting budgets.
-
-## Fixes :
-* **[Map]** Missiles sites now have a proper icon and will not re-use the SAM sites icon
-* **[Mission Generator]** Ground unit waypoints improperly set to "On Road" - fixed
-* **[Mission Generator]** Target waypoints not at ground level - fixed
-* **[Mission Generator]** Selected skill not applied to Helicopters - fixed
-* **[Mission Generator]** Ground units do not always spawn - fixed
-* **[Kneeboard]** Briefing waypoints off by one - fixed
-* **[Game]** Destroyed buildings still granting budget - fixed
-
-# 2.2.1
-
-## Features/Improvements
-* **[Factions]** Added factions : Georgia 2008, USN 1985, France 2005 Frenchpack by HerrTom
-* **[Factions]** Added map Persian Gulf full by Plob
-* **[Flight Planner]** Player flights with start delays under ten minutes will spawn immediately.
-* **[UI]** Mission start screen now informs players about delayed flights.
-* **[Units]** Added support for F-14A-135-GR
-* **[Modding]** Possible to setup liveries overrides in factions definition files
-
-## Fixes :
-* **[Flight Planner]** Hold, join, and split points are planned cautiously near enemy airfields. Ascend/descend points are no longer planned.
-* **[Flight Planner]** Custom waypoints are usable again. Not that in most cases custom flight plans will revert to the 2.1 flight planning behavior.
-* **[Flight Planner]** Fixed UI bug that made it possible to create empty flights which would throw an error.
-* **[Flight Planner]** Player flights from carriers will now be delayed correctly according to the player's settings.
-* **[Misc]** Spitfire variant with clipped wings was not seen as flyable by DCS Liberation (hence could not be setup as client/player slot)
-* **[Misc]** Updated Syria terrain parking slots database, the out-of-date database could end up generating aircraft in wrong slots (We are still experiencing issues with somes airbases, such as Khalkhalah though)
-
-# 2.2.0
-
-## Features/Improvements :
-* **[Campaign Generator]** Added early warning radar generation
-* **[Campaign Generator]** Added scud launcher sites
-* **[Cheat Menu]** Added ability to capture base from mission planner
-* **[Cheat Menu]** Added ability to show red ATO
-* **[Factions]** Added WW2 factions that do not depend on WW2 asset pack
-* **[Factions]** Cold War / Middle eastern factions will use Flak sites
-* **[Flight Planner]** Flight planner overhaul, with package and TOT system
-* **[Flight Planner]** Pick runways and ascent/descent based on headwind
-* **[Map]** Added polygon debug mode display
-* **[Map]** Highlight the selected flight path on the map
-* **[Map]** Improved SAM display settings
-* **[Map]** Improved flight plan display settings
-* **[Map]** Caucasus and The Channel map use a new system to generate SAM and strike target location to reduce probability of targets generated in the middle of a forests
-* **[Misc]** Flexible Dedicated Hosting Options for Mission Files via environment variables
-* **[Moddability]** Custom campaigns can be designed through json files
-* **[Moddability]** LUA plugins can now be injected into Liberation missions.
-* **[Moddability]** Optional Skynet IADS lua plugin now included
-* **[New Game]** Starting budget can be freely selected
-* **[New Game]** Exanded information for faction and campaign selection in the new game wizard
-* **[UI]** Add double and right click actions to many UI elements.
-* **[UI]** Add polygon drawing mode for map background
-* **[UI]** Added a warning if you press takeoff with no player enabled flights
-* **[UI]** Packages and flights now visible in the main window sidebar
-* **[Units/Factions]** Added bombers to some coalitions
-* **[Units/Factions]** Added support for SU-57 mod by Cubanace
-* **[Units]** Added Freya EWR sites to german WW2 factions
-* **[Units]** Added support for many bombers (B-52H, B-1B, Tu-22, Tu-142)
-* **[Units]** Added support for new P-47 variants
-
-## Fixes :
-* **[Campaign Generator]** Big airbases could end up without any airbase defense.
-* **[Campaign generator]** Ship group and offshore buildings should not be generated on land anymore
-* **[Flight Planner]** Fix waypoint alitudes for helicopters
-* **[Flight Planner]** Fixed CAS aircraft wandering away from frontline
-* **[Maps]** Incirlik airbase was missing exclusions zones, so SAMS could end up being generated on the runway
-* **[Mission Generator]** Fixed player/client confusion when a flight had only one player slot.
-* **[Radios]** Fix A-10C radio
-* **[UI]** Many missing unit icons were added
-* **[UI]** Missing TER weapons in custom payload now selectable.
-
 # 2.1.5
 
 ## Features/Improvements :
@@ -332,7 +10,9 @@ Saves from 2.3 are not compatible with 2.4.
 # 2.1.4
 
 ## Fixes :
-* **[UI]** Fixed an issue that prevented generating the mission (take off button no working) on old savegames.
+* **[UI]** Fixed an issue that prevent generating the mission (take off button no working) on old savegames.
+
+# 2.1.3
 
 ## Features/Improvements :
 * **[Units/Factions]** Added A-10C_2 to USA 2005 and Bluefor modern factions
@@ -596,4 +276,4 @@ Sorry :(
 * **[Mission Generator]** Planned flights will spawn even if their home base has been captured or is being contested by enemy ground units. 
 * **[Campaign Generator]** Base defenses would not be generated on Normandy map and in some rare cases on others maps as well
 * **[Mission Planning]** CAS waypoints created from the "Predefined waypoint selector" would not be at the exact location of the frontline
-* **[Naming]** CAP mission flown from airbase are not named BARCAP anymore (CAP from carrier is still named BARCAP)
+* **[Naming]** CAP mission flown from airbase are not named BARCAP anymore (CAP from carrier is still named BARCAP)

game/__init__.py

@@ -1,3 +1,2 @@
 from .game import Game
-from . import db
-from .version import VERSION
+from . import db

game/data/aaa_db.py

@@ -2,21 +2,20 @@ 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.SPAAA_ZSU_23_4_Shilka,
+    AirDefence.AAA_Vulcan_M163,
+    AirDefence.AAA_ZU_23_Closed,
     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_on_Ural_375,
+    AirDefence.AAA_ZU_23_Insurgent_Closed,
+    AirDefence.AAA_ZU_23_Insurgent_on_Ural_375,
     AirDefence.AAA_ZU_23_Insurgent,
     AirDefence.AAA_8_8cm_Flak_18,
-    AirDefence.AAA_Flak_38_20mm,
+    AirDefence.AAA_Flak_38,
     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_Flak_Vierling_38,
+    AirDefence.AAA_Kdo_G_40,
     AirDefence.AAA_8_8cm_Flak_41,
-    AirDefence.AAA_40mm_Bofors,
-    AirDefence.AAA_S_60_57mm,
-]
+    AirDefence.AAA_Bofors_40mm
+]

game/data/building_data.py

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

game/data/cap_capabilities_db.py

@@ -1,24 +1,4 @@
-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 dcs.planes import *
 from pydcs_extensions.a4ec.a4ec import A_4E_C
 
 """
@@ -26,6 +6,7 @@ This list contains the aircraft that do not use the guns as the last resort weap
 They'll RTB when they don't have gun ammo left
 """
 GUNFIGHTERS = [
+
     # Cold War
     MiG_15bis,
     MiG_19P,
@@ -33,19 +14,20 @@ GUNFIGHTERS = [
     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,133 +1,95 @@
-from dataclasses import dataclass
-from datetime import timedelta
+from game.utils import nm_to_meter, feet_to_meter
 
-from game.utils import Distance, feet, nautical_miles
+MODERN_DOCTRINE = {
 
+    "GENERATORS": {
+        "CAS": True,
+        "CAP": True,
+        "SEAD": True,
+        "STRIKE": True,
+        "ANTISHIP": True,
+    },
 
-@dataclass(frozen=True)
-class Doctrine:
-    cas: bool
-    cap: bool
-    sead: bool
-    strike: bool
-    antiship: bool
+    "STRIKE_MAX_RANGE": 1500000,
+    "SEAD_MAX_RANGE": 1500000,
 
-    rendezvous_altitude: Distance
-    hold_distance: Distance
-    push_distance: Distance
-    join_distance: Distance
-    split_distance: Distance
-    ingress_egress_distance: Distance
-    ingress_altitude: Distance
-    egress_altitude: Distance
+    "CAP_EVERY_X_MINUTES": 20,
+    "CAS_EVERY_X_MINUTES": 30,
+    "SEAD_EVERY_X_MINUTES": 40,
+    "STRIKE_EVERY_X_MINUTES": 40,
 
-    min_patrol_altitude: Distance
-    max_patrol_altitude: Distance
-    pattern_altitude: Distance
+    "INGRESS_EGRESS_DISTANCE": nm_to_meter(45),
+    "INGRESS_ALT": feet_to_meter(20000),
+    "EGRESS_ALT": feet_to_meter(20000),
+    "PATROL_ALT_RANGE": (feet_to_meter(15000), feet_to_meter(33000)),
+    "PATTERN_ALTITUDE": feet_to_meter(5000),
 
-    #: The duration that CAP flights will remain on-station.
-    cap_duration: timedelta
+    "CAP_PATTERN_LENGTH": (nm_to_meter(15), nm_to_meter(40)),
+    "FRONTLINE_CAP_DISTANCE_FROM_FRONTLINE": (nm_to_meter(6), nm_to_meter(15)),
+    "CAP_DISTANCE_FROM_CP": (nm_to_meter(10), nm_to_meter(40)),
 
-    #: The minimum length of the CAP race track.
-    cap_min_track_length: Distance
+    "MAX_NUMBER_OF_INTERCEPTION_GROUP": 3,
+}
 
-    #: The maximum length of the CAP race track.
-    cap_max_track_length: Distance
+COLDWAR_DOCTRINE = {
 
-    #: The minimum distance between the defended position and the *end* of the
-    #: CAP race track.
-    cap_min_distance_from_cp: Distance
+    "GENERATORS": {
+        "CAS": True,
+        "CAP": True,
+        "SEAD": True,
+        "STRIKE": True,
+        "ANTISHIP": True,
+    },
 
-    #: The maximum distance between the defended position and the *end* of the
-    #: CAP race track.
-    cap_max_distance_from_cp: Distance
+    "STRIKE_MAX_RANGE": 1500000,
+    "SEAD_MAX_RANGE": 1500000,
 
-    #: The engagement range of CAP flights. Any enemy aircraft within this range
-    #: of the CAP's current position will be engaged by the CAP.
-    cap_engagement_range: Distance
+    "CAP_EVERY_X_MINUTES": 20,
+    "CAS_EVERY_X_MINUTES": 30,
+    "SEAD_EVERY_X_MINUTES": 40,
+    "STRIKE_EVERY_X_MINUTES": 40,
 
-    cas_duration: timedelta
+    "INGRESS_EGRESS_DISTANCE": nm_to_meter(30),
+    "INGRESS_ALT": feet_to_meter(18000),
+    "EGRESS_ALT": feet_to_meter(18000),
+    "PATROL_ALT_RANGE": (feet_to_meter(10000), feet_to_meter(24000)),
+    "PATTERN_ALTITUDE": feet_to_meter(5000),
 
-    sweep_distance: Distance
+    "CAP_PATTERN_LENGTH": (nm_to_meter(12), nm_to_meter(24)),
+    "FRONTLINE_CAP_DISTANCE_FROM_FRONTLINE": (nm_to_meter(2), nm_to_meter(8)),
+    "CAP_DISTANCE_FROM_CP": (nm_to_meter(8), nm_to_meter(25)),
 
+    "MAX_NUMBER_OF_INTERCEPTION_GROUP": 3,
+}
 
-MODERN_DOCTRINE = Doctrine(
-    cap=True,
-    cas=True,
-    sead=True,
-    strike=True,
-    antiship=True,
-    rendezvous_altitude=feet(25000),
-    hold_distance=nautical_miles(15),
-    push_distance=nautical_miles(20),
-    join_distance=nautical_miles(20),
-    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),
-    cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nautical_miles(15),
-    cap_max_track_length=nautical_miles(40),
-    cap_min_distance_from_cp=nautical_miles(10),
-    cap_max_distance_from_cp=nautical_miles(40),
-    cap_engagement_range=nautical_miles(50),
-    cas_duration=timedelta(minutes=30),
-    sweep_distance=nautical_miles(60),
-)
+WWII_DOCTRINE = {
 
-COLDWAR_DOCTRINE = Doctrine(
-    cap=True,
-    cas=True,
-    sead=True,
-    strike=True,
-    antiship=True,
-    rendezvous_altitude=feet(22000),
-    hold_distance=nautical_miles(10),
-    push_distance=nautical_miles(10),
-    join_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),
-    cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nautical_miles(12),
-    cap_max_track_length=nautical_miles(24),
-    cap_min_distance_from_cp=nautical_miles(8),
-    cap_max_distance_from_cp=nautical_miles(25),
-    cap_engagement_range=nautical_miles(35),
-    cas_duration=timedelta(minutes=30),
-    sweep_distance=nautical_miles(40),
-)
+    "GENERATORS": {
+        "CAS": True,
+        "CAP": True,
+        "SEAD": False,
+        "STRIKE": True,
+        "ANTISHIP": True,
+    },
 
-WWII_DOCTRINE = Doctrine(
-    cap=True,
-    cas=True,
-    sead=False,
-    strike=True,
-    antiship=True,
-    hold_distance=nautical_miles(5),
-    push_distance=nautical_miles(5),
-    join_distance=nautical_miles(5),
-    split_distance=nautical_miles(5),
-    rendezvous_altitude=feet(10000),
-    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),
-    cap_duration=timedelta(minutes=30),
-    cap_min_track_length=nautical_miles(8),
-    cap_max_track_length=nautical_miles(18),
-    cap_min_distance_from_cp=nautical_miles(0),
-    cap_max_distance_from_cp=nautical_miles(5),
-    cap_engagement_range=nautical_miles(20),
-    cas_duration=timedelta(minutes=30),
-    sweep_distance=nautical_miles(10),
-)
+    "STRIKE_MAX_RANGE": 1500000,
+    "SEAD_MAX_RANGE": 1500000,
+
+    "CAP_EVERY_X_MINUTES": 20,
+    "CAS_EVERY_X_MINUTES": 30,
+    "SEAD_EVERY_X_MINUTES": 40,
+    "STRIKE_EVERY_X_MINUTES": 40,
+
+    "INGRESS_EGRESS_DISTANCE": nm_to_meter(7),
+    "INGRESS_ALT": feet_to_meter(8000),
+    "EGRESS_ALT": feet_to_meter(8000),
+    "PATROL_ALT_RANGE": (feet_to_meter(4000), feet_to_meter(15000)),
+    "PATTERN_ALTITUDE": feet_to_meter(5000),
+
+    "CAP_PATTERN_LENGTH": (nm_to_meter(8), nm_to_meter(18)),
+    "FRONTLINE_CAP_DISTANCE_FROM_FRONTLINE": (nm_to_meter(1), nm_to_meter(6)),
+    "CAP_DISTANCE_FROM_CP": (nm_to_meter(0), nm_to_meter(5)),
+
+    "MAX_NUMBER_OF_INTERCEPTION_GROUP": 3,
+
+}

game/data/radar_db.py

@@ -1,72 +1,53 @@
-from dcs.ships import (
-    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
+from dcs.ships import *
 
 UNITS_WITH_RADAR = [
+
     # Radars
-    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.SAM_SA_15_Tor_9A331,
+    AirDefence.SAM_SA_11_Buk_CC_9S470M1,
+    AirDefence.SAM_Patriot_AMG_AN_MRC_137,
+    AirDefence.SAM_Patriot_ECS_AN_MSQ_104,
     AirDefence.SPAAA_Gepard,
-    AirDefence.SPAAA_Vulcan_M163,
-    AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish,
+    AirDefence.AAA_Vulcan_M163,
+    AirDefence.SPAAA_ZSU_23_4_Shilka,
     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.SAM_SA_6_Kub_STR_9S91,
+    AirDefence.SAM_SA_10_S_300PS_TR_30N6,
+    AirDefence.SAM_SA_10_S_300PS_SR_5N66M,
     AirDefence.EWR_55G6,
-    AirDefence.SAM_SA_10_S_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_SA_10_S_300PS_SR_64H6E,
+    AirDefence.SAM_SA_11_Buk_SR_9S18M1,
+    AirDefence.CP_9S80M1_Sborka,
+    AirDefence.SAM_Hawk_TR_AN_MPQ_46,
+    AirDefence.SAM_Hawk_SR_AN_MPQ_50,
+    AirDefence.SAM_Patriot_STR_AN_MPQ_53,
     AirDefence.SAM_Hawk_CWAR_AN_MPQ_55,
-    AirDefence.SAM_P19_Flat_Face_SR__SA_2_3,
+    AirDefence.SAM_SR_P_19,
     AirDefence.SAM_Roland_EWR,
-    AirDefence.SAM_SA_3_S_125_Low_Blow_TR,
-    AirDefence.SAM_SA_2_S_75_Fan_Song_TR,
+    AirDefence.SAM_SA_3_S_125_TR_SNR,
+    AirDefence.SAM_SA_2_TR_SNR_75_Fan_Song,
     AirDefence.HQ_7_Self_Propelled_STR,
+
     # Ships
     CVN_70_Carl_Vinson,
-    FFG_Oliver_Hazzard_Perry,
-    CG_Ticonderoga,
-    Corvette_1124_4_Grisha,
+    Oliver_Hazzard_Perry_class,
+    Ticonderoga_class,
+    FFL_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,
+    FSG_1241_1MP_Molniya,
+    CG_1164_Moskva,
+    FFG_11540_Neustrashimy,
+    CGN_1144_2_Pyotr_Velikiy,
+    FF_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,
+    USS_Arleigh_Burke_IIa,
     LHA_1_Tarawa,
     Type_052B_Destroyer,
     Type_054A_Frigate,
-    Type_052C_Destroyer,
-]
+    Type_052C_Destroyer
+]

game/debriefing.py

@@ -1,282 +0,0 @@
-from __future__ import annotations
-
-import itertools
-import json
-import logging
-import os
-import threading
-import time
-from collections import defaultdict
-from dataclasses import dataclass, field
-from typing import (
-    Any,
-    Callable,
-    Dict,
-    Iterator,
-    List,
-    Type,
-    TYPE_CHECKING,
-)
-
-from dcs.unittype import FlyingType, UnitType
-
-from game import db
-from game.theater import Airfield, ControlPoint
-from game.unitmap import Building, FrontLineUnit, GroundObjectUnit, UnitMap
-from gen.flights.flight import Flight
-
-if TYPE_CHECKING:
-    from game import Game
-
-DEBRIEFING_LOG_EXTENSION = "log"
-
-
-@dataclass(frozen=True)
-class AirLosses:
-    player: List[Flight]
-    enemy: List[Flight]
-
-    @property
-    def losses(self) -> Iterator[Flight]:
-        return itertools.chain(self.player, self.enemy)
-
-    def by_type(self, player: bool) -> Dict[Type[FlyingType], int]:
-        losses_by_type: Dict[Type[FlyingType], int] = defaultdict(int)
-        losses = self.player if player else self.enemy
-        for loss in losses:
-            losses_by_type[loss.unit_type] += 1
-        return losses_by_type
-
-    def surviving_flight_members(self, flight: Flight) -> int:
-        losses = 0
-        for loss in self.losses:
-            if loss == flight:
-                losses += 1
-        return flight.count - losses
-
-
-@dataclass
-class GroundLosses:
-    player_front_line: List[FrontLineUnit] = field(default_factory=list)
-    enemy_front_line: List[FrontLineUnit] = 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)
-
-    player_airfields: List[Airfield] = field(default_factory=list)
-    enemy_airfields: List[Airfield] = field(default_factory=list)
-
-
-@dataclass(frozen=True)
-class StateData:
-    #: True if the mission ended. If False, the mission exited abnormally.
-    mission_ended: bool
-
-    #: Names of aircraft units that were killed during the mission.
-    killed_aircraft: List[str]
-
-    #: Names of vehicle (and ship) units that were killed during the mission.
-    killed_ground_units: List[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]
-
-    @classmethod
-    def from_json(cls, data: Dict[str, Any]) -> StateData:
-        return cls(
-            mission_ended=data["mission_ended"],
-            killed_aircraft=data["killed_aircrafts"],
-            # Airfields emit a new "dead" event every time a bomb is dropped on
-            # them when they've already dead. Dedup.
-            killed_ground_units=list(set(data["killed_ground_units"])),
-            destroyed_statics=data["destroyed_objects_positions"],
-            base_capture_events=data["base_capture_events"],
-        )
-
-
-class Debriefing:
-    def __init__(
-        self, state_data: Dict[str, Any], game: Game, unit_map: UnitMap
-    ) -> None:
-        self.state_data = StateData.from_json(state_data)
-        self.unit_map = unit_map
-
-        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()
-
-    @property
-    def front_line_losses(self) -> Iterator[FrontLineUnit]:
-        yield from self.ground_losses.player_front_line
-        yield from self.ground_losses.enemy_front_line
-
-    @property
-    def ground_object_losses(self) -> Iterator[GroundObjectUnit]:
-        yield from self.ground_losses.player_ground_objects
-        yield from self.ground_losses.enemy_ground_objects
-
-    @property
-    def building_losses(self) -> Iterator[Building]:
-        yield from self.ground_losses.player_buildings
-        yield from self.ground_losses.enemy_buildings
-
-    @property
-    def damaged_runways(self) -> Iterator[Airfield]:
-        yield from self.ground_losses.player_airfields
-        yield from self.ground_losses.enemy_airfields
-
-    def casualty_count(self, control_point: ControlPoint) -> int:
-        return len([x for x in self.front_line_losses if x.origin == control_point])
-
-    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:
-            losses = self.ground_losses.enemy_front_line
-        for loss in losses:
-            losses_by_type[loss.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:
-            losses = self.ground_losses.player_buildings
-        else:
-            losses = self.ground_losses.enemy_buildings
-        for loss in losses:
-            if loss.ground_object.control_point.captured != player:
-                continue
-
-            losses_by_type[loss.ground_object.dcs_identifier] += 1
-        return losses_by_type
-
-    def dead_aircraft(self) -> AirLosses:
-        player_losses = []
-        enemy_losses = []
-        for unit_name in self.state_data.killed_aircraft:
-            flight = self.unit_map.flight(unit_name)
-            if flight is None:
-                logging.error(f"Could not find Flight matching {unit_name}")
-                continue
-            if flight.departure.captured:
-                player_losses.append(flight)
-            else:
-                enemy_losses.append(flight)
-        return AirLosses(player_losses, enemy_losses)
-
-    def dead_ground_units(self) -> GroundLosses:
-        losses = GroundLosses()
-        for unit_name in self.state_data.killed_ground_units:
-            front_line_unit = self.unit_map.front_line_unit(unit_name)
-            if front_line_unit is not None:
-                if front_line_unit.origin.captured:
-                    losses.player_front_line.append(front_line_unit)
-                else:
-                    losses.enemy_front_line.append(front_line_unit)
-                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:
-                    losses.player_ground_objects.append(ground_object_unit)
-                else:
-                    losses.enemy_ground_objects.append(ground_object_unit)
-                continue
-
-            building = self.unit_map.building_or_fortification(unit_name)
-            # Try appending object to the name, because we do this for building statics.
-            if building is None:
-                building = self.unit_map.building_or_fortification(
-                    f"{unit_name} object"
-                )
-            if building is not None:
-                if building.ground_object.control_point.captured:
-                    losses.player_buildings.append(building)
-                else:
-                    losses.enemy_buildings.append(building)
-                continue
-
-            airfield = self.unit_map.airfield(unit_name)
-            if airfield is not None:
-                if airfield.captured:
-                    losses.player_airfields.append(airfield)
-                else:
-                    losses.enemy_airfields.append(airfield)
-                continue
-
-            # Only logging as debug because we don't currently track infantry
-            # deaths, so we expect to see quite a few unclaimed dead ground
-            # units. We should start tracking those and covert this to a
-            # warning.
-            logging.debug(
-                f"Death of untracked ground unit {unit_name} will "
-                "have no effect. This may be normal behavior."
-            )
-
-        return losses
-
-    @property
-    def base_capture_events(self):
-        """Keeps only the last instance of a base capture event for each base ID."""
-        reversed_captures = list(reversed(self.state_data.base_capture_events))
-        last_base_cap_indexes = []
-        for idx, base in enumerate(i.split("||")[0] for i in reversed_captures):
-            if base not in [x[1] for x in last_base_cap_indexes]:
-                last_base_cap_indexes.append((idx, base))
-        return [reversed_captures[idx[0]] for idx in last_base_cap_indexes]
-
-
-class PollDebriefingFileThread(threading.Thread):
-    """Thread class with a stop() method. The thread itself has to check
-    regularly for the stopped() condition."""
-
-    def __init__(
-        self, callback: Callable[[Debriefing], None], game: Game, unit_map: UnitMap
-    ) -> None:
-        super().__init__()
-        self._stop_event = threading.Event()
-        self.callback = callback
-        self.game = game
-        self.unit_map = unit_map
-
-    def stop(self):
-        self._stop_event.set()
-
-    def stopped(self):
-        return self._stop_event.is_set()
-
-    def run(self):
-        if os.path.isfile("state.json"):
-            last_modified = os.path.getmtime("state.json")
-        else:
-            last_modified = 0
-        while not self.stopped():
-            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
-) -> PollDebriefingFileThread:
-    thread = PollDebriefingFileThread(callback, game, unit_map)
-    thread.start()
-    return thread

game/event/airwar.py

@@ -1,14 +0,0 @@
-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):
-        return "AirWar"

game/event/event.py

@@ -1,52 +1,53 @@
-from __future__ import annotations
-
+import typing
 import logging
-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 dcs.action import Coalition
+from dcs.unittype import UnitType
+from dcs.task import *
+from dcs.vehicles import AirDefence
+from dcs.unittype import UnitType
 
-from game import persistency
-from game.debriefing import AirLosses, Debriefing
+from game import *
 from game.infos.information import Information
-from game.operation.operation import Operation
-from game.theater import ControlPoint
-from gen import AirTaskingOrder
-from gen.ground_forces.combat_stance import CombatStance
-from ..db import PRICES
-from ..unitmap import UnitMap
+from theater import *
+from gen.environmentgen import EnvironmentSettings
+from gen.conflictgen import Conflict
+from game.db import assigned_units_from, unitdict_from
+from theater.start_generator import generate_airbase_defense_group
 
-if TYPE_CHECKING:
-    from ..game import Game
+from userdata.debriefing import Debriefing
+from userdata import persistency
+
+import game.db as db
+
+DIFFICULTY_LOG_BASE = 1.1
+EVENT_DEPARTURE_MAX_DISTANCE = 340000
 
 
 MINOR_DEFEAT_INFLUENCE = 0.1
 DEFEAT_INFLUENCE = 0.3
 STRONG_DEFEAT_INFLUENCE = 0.5
 
-
 class Event:
     silent = False
     informational = False
+    is_awacs_enabled = False
+    ca_slots = 0
 
     game = None  # type: Game
     location = None  # type: Point
     from_cp = None  # type: ControlPoint
+    departure_cp = None  # type: ControlPoint
     to_cp = None  # type: ControlPoint
-    difficulty = 1  # type: int
 
-    def __init__(
-        self,
-        game,
-        from_cp: ControlPoint,
-        target_cp: ControlPoint,
-        location: Point,
-        attacker_name: str,
-        defender_name: str,
-    ):
+    operation = None  # type: Operation
+    difficulty = 1  # type: int
+    environment_settings = None  # type: EnvironmentSettings
+    BONUS_BASE = 5
+
+    def __init__(self, game, from_cp: ControlPoint, target_cp: ControlPoint, location: Point, attacker_name: str, defender_name: str):
         self.game = game
+        self.departure_cp = None
         self.from_cp = from_cp
         self.to_cp = target_cp
         self.location = location
@@ -58,143 +59,144 @@ class Event:
         return self.attacker_name == self.game.player_name
 
     @property
-    def tasks(self) -> List[Type[Task]]:
+    def enemy_cp(self) -> ControlPoint:
+        if self.attacker_name == self.game.player_name:
+            return self.to_cp
+        else:
+            return self.departure_cp
+
+    @property
+    def tasks(self) -> typing.Collection[typing.Type[Task]]:
         return []
 
-    def generate(self) -> UnitMap:
-        Operation.prepare(self.game)
-        unit_map = Operation.generate()
-        Operation.current_mission.save(
-            persistency.mission_path_for("liberation_nextturn.miz")
-        )
-        return unit_map
+    @property
+    def global_cp_available(self) -> bool:
+        return False
 
-    @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
+    def is_departure_available_from(self, cp: ControlPoint) -> bool:
+        if not cp.captured:
+            return False
 
-                # 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
+        if self.location.distance_to_point(cp.position) > EVENT_DEPARTURE_MAX_DISTANCE:
+            return False
 
-                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
+        if cp.is_global and not self.global_cp_available:
+            return False
 
-                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
+        return True
 
-                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 bonus(self) -> int:
+        return int(math.log(self.to_cp.importance + 1, DIFFICULTY_LOG_BASE) * self.BONUS_BASE)
 
-    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
-        )
+    def is_successfull(self, debriefing: Debriefing) -> bool:
+        return self.operation.is_successfull(debriefing)
 
-    @staticmethod
-    def commit_air_losses(debriefing: Debriefing) -> None:
-        for loss in debriefing.air_losses.losses:
-            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 {cp} but that airbase has "
-                    "none available."
-                )
-                continue
+    def player_attacking(self, cp: ControlPoint, flights: db.TaskForceDict):
+        if self.is_player_attacking:
+            self.departure_cp = cp
+        else:
+            self.to_cp = cp
 
-            logging.info(f"{aircraft} destroyed from {cp}")
-            cp.base.aircraft[aircraft] -= 1
+    def player_defending(self, cp: ControlPoint, flights: db.TaskForceDict):
+        if self.is_player_attacking:
+            self.departure_cp = cp
+        else:
+            self.to_cp = cp
 
-    @staticmethod
-    def commit_front_line_losses(debriefing: Debriefing) -> None:
-        for loss in debriefing.front_line_losses:
-            unit_type = loss.unit_type
-            control_point = loss.origin
-            available = control_point.base.total_units_of_type(unit_type)
-            if available <= 0:
-                logging.error(
-                    f"Found killed {unit_type} from {control_point} but that "
-                    "airbase has none available."
-                )
-                continue
+    def generate(self):
+        self.operation.is_awacs_enabled = self.is_awacs_enabled
+        self.operation.ca_slots = self.ca_slots
 
-            logging.info(f"{unit_type} destroyed from {control_point}")
-            control_point.base.armor[unit_type] -= 1
-
-    @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 = []
-
-            loss.group.units.remove(loss.unit)
-            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.informations.append(
-                Information(
-                    "Building destroyed",
-                    f"{loss.ground_object.dcs_identifier} has been destroyed at "
-                    f"location {loss.ground_object.obj_name}",
-                    self.game.turn,
-                )
-            )
-
-    @staticmethod
-    def commit_damaged_runways(debriefing: Debriefing) -> None:
-        for damaged_runway in debriefing.damaged_runways:
-            damaged_runway.damage_runway()
+        self.operation.prepare(self.game.theater.terrain, is_quick=False)
+        self.operation.generate()
+        self.operation.current_mission.save(persistency.mission_path_for("liberation_nextturn.miz"))
+        self.environment_settings = self.operation.environment_settings
 
     def commit(self, debriefing: Debriefing):
-        logging.info("Committing mission results")
 
-        self.commit_air_losses(debriefing)
-        self.commit_front_line_losses(debriefing)
-        self.commit_ground_object_losses(debriefing)
-        self.commit_building_losses(debriefing)
-        self.commit_damaged_runways(debriefing)
+        logging.info("Commiting mission results")
+
+        # ------------------------------
+        # Destroyed aircrafts
+        cp_map = {cp.id: cp for cp in self.game.theater.controlpoints}
+        for destroyed_aircraft in debriefing.killed_aircrafts:
+            try:
+                cpid = int(destroyed_aircraft.split("|")[3])
+                type = db.unit_type_from_name(destroyed_aircraft.split("|")[4])
+                if cpid in cp_map.keys():
+                    cp = cp_map[cpid]
+                    if type in cp.base.aircraft.keys():
+                        logging.info("Aircraft destroyed : " + str(type))
+                        cp.base.aircraft[type] = max(0, cp.base.aircraft[type]-1)
+            except Exception as e:
+                print(e)
+
+        # ------------------------------
+        # Destroyed ground units
+        killed_unit_count_by_cp = {cp.id: 0 for cp in self.game.theater.controlpoints}
+        cp_map = {cp.id: cp for cp in self.game.theater.controlpoints}
+        for killed_ground_unit in debriefing.killed_ground_units:
+            try:
+                cpid = int(killed_ground_unit.split("|")[3])
+                type = db.unit_type_from_name(killed_ground_unit.split("|")[4])
+                if cpid in cp_map.keys():
+                    killed_unit_count_by_cp[cpid] = killed_unit_count_by_cp[cpid] + 1
+                    cp = cp_map[cpid]
+                    if type in cp.base.armor.keys():
+                        logging.info("Ground unit destroyed : " + str(type))
+                        cp.base.armor[type] = max(0, cp.base.armor[type] - 1)
+            except Exception as e:
+                print(e)
+
+        # ------------------------------
+        # Static ground objects
+        for destroyed_ground_unit_name in debriefing.killed_ground_units:
+            for cp in self.game.theater.controlpoints:
+                if not cp.ground_objects:
+                    continue
+
+                # -- Static ground objects
+                for i, ground_object in enumerate(cp.ground_objects):
+                    if ground_object.is_dead:
+                        continue
+
+                    if ground_object.matches_string_identifier(destroyed_ground_unit_name):
+                        logging.info("cp {} killing ground object {}".format(cp, ground_object.string_identifier))
+                        cp.ground_objects[i].is_dead = True
+
+                        info = Information("Building destroyed",
+                                           ground_object.dcs_identifier + " has been destroyed at location " + ground_object.obj_name,
+                                           self.game.turn)
+                        self.game.informations.append(info)
+
+
+                # -- AA Site groups
+                destroyed_units = 0
+                info = Information("Units destroyed at " + ground_object.obj_name,
+                                   "",
+                                   self.game.turn)
+                for i, ground_object in enumerate(cp.ground_objects):
+                    if ground_object.dcs_identifier in ["AA", "CARRIER", "LHA"]:
+                        for g in ground_object.groups:
+                            if not hasattr(g, "units_losts"):
+                                g.units_losts = []
+                            for u in g.units:
+                                if u.name == destroyed_ground_unit_name:
+                                    g.units.remove(u)
+                                    g.units_losts.append(u)
+                                    destroyed_units = destroyed_units + 1
+                                    info.text = u.type
+                        ucount = sum([len(g.units) for g in ground_object.groups])
+                        if ucount == 0:
+                            ground_object.is_dead = True
+                if destroyed_units > 0:
+                    self.game.informations.append(info)
 
         # ------------------------------
         # Captured bases
-        # if self.game.player_country in db.BLUEFOR_FACTIONS:
-        coalition = 2  # Value in DCS mission event for BLUE
-        # else:
+        #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:
@@ -207,41 +209,41 @@ class Event:
                     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,
-                            )
+                            cp.captured = False
+                            info = Information(cp.name + " lost !", "The ennemy took control of " + cp.name + "\nShame on us !", self.game.turn)
                             self.game.informations.append(info)
+                            pname = self.game.enemy_name
                             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,
-                            )
+                        elif not(cp.captured) and new_owner_coalition == coalition:
+                            cp.captured = True
+                            info = Information(cp.name + " captured !", "We took control of " + cp.name + "! Great job !", self.game.turn)
                             self.game.informations.append(info)
+                            pname = self.game.player_name
                             captured_cps.append(cp)
                         else:
                             continue
 
-                        cp.capture(self.game, for_player)
+                        cp.base.aircraft = {}
+                        cp.base.armor = {}
+
+                        airbase_def_id = 0
+                        for g in cp.ground_objects:
+                            g.groups = []
+                            if g.airbase_group and pname != "":
+                                generate_airbase_defense_group(airbase_def_id, g, pname, self.game, cp)
+                                airbase_def_id = airbase_def_id + 1
 
                 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)
+
+            except Exception as e:
+                print(e)
 
         # Destroyed units carcass
         # -------------------------
-        for destroyed_unit in debriefing.state_data.destroyed_statics:
+        for destroyed_unit in debriefing.destroyed_units:
             self.game.add_destroyed_units(destroyed_unit)
 
         # -----------------------------------
@@ -249,17 +251,12 @@ class Event:
         for cp in self.game.theater.player_points():
             enemy_cps = [e for e in cp.connected_points if not e.captured]
             for enemy_cp in enemy_cps:
-                print(
-                    "Compute frontline progression for : "
-                    + cp.name
-                    + " to "
-                    + enemy_cp.name
-                )
+                print("Compute frontline progression for : " + cp.name + " to " + enemy_cp.name)
 
-                delta = 0.0
+                delta = 0
                 player_won = True
-                ally_casualties = debriefing.casualty_count(cp)
-                enemy_casualties = debriefing.casualty_count(enemy_cp)
+                ally_casualties = killed_unit_count_by_cp[cp.id]
+                enemy_casualties = killed_unit_count_by_cp[enemy_cp.id]
                 ally_units_alive = cp.base.total_armor
                 enemy_units_alive = enemy_cp.base.total_armor
 
@@ -270,11 +267,7 @@ class Event:
 
                 ratio = (1.0 + enemy_casualties) / (1.0 + ally_casualties)
 
-                player_aggresive = cp.stances[enemy_cp.id] in [
-                    CombatStance.AGGRESSIVE,
-                    CombatStance.ELIMINATION,
-                    CombatStance.BREAKTHROUGH,
-                ]
+                player_aggresive = cp.stances[enemy_cp.id] in [CombatStance.AGGRESSIVE, CombatStance.ELIMINATION, CombatStance.BREAKTHROUGH]
 
                 if ally_units_alive == 0:
                     player_won = False
@@ -299,17 +292,11 @@ class Event:
                                 delta = DEFEAT_INFLUENCE
                     elif ally_casualties > enemy_casualties:
 
-                        if (
-                            ally_units_alive > 2 * enemy_units_alive
-                            and player_aggresive
-                        ):
+                        if ally_units_alive > 2*enemy_units_alive and player_aggresive:
                             # Even with casualties if the enemy is overwhelmed, they are going to lose ground
                             player_won = True
                             delta = MINOR_DEFEAT_INFLUENCE
-                        elif (
-                            ally_units_alive > 3 * enemy_units_alive
-                            and player_aggresive
-                        ):
+                        elif ally_units_alive > 3*enemy_units_alive and player_aggresive:
                             player_won = True
                             delta = STRONG_DEFEAT_INFLUENCE
                         else:
@@ -321,10 +308,7 @@ class Event:
                                 delta = STRONG_DEFEAT_INFLUENCE
 
                     # No progress with defensive strategies
-                    if player_won and cp.stances[enemy_cp.id] in [
-                        CombatStance.DEFENSIVE,
-                        CombatStance.AMBUSH,
-                    ]:
+                    if player_won and cp.stances[enemy_cp.id] in [CombatStance.DEFENSIVE, CombatStance.AMBUSH]:
                         print("Defensive stance, progress is limited")
                         delta = MINOR_DEFEAT_INFLUENCE
 
@@ -332,149 +316,89 @@ class Event:
                     print(cp.name + " won !  factor > " + str(delta))
                     cp.base.affect_strength(delta)
                     enemy_cp.base.affect_strength(-delta)
-                    info = Information(
-                        "Frontline Report",
-                        "Our ground forces from "
-                        + cp.name
-                        + " are making progress toward "
-                        + enemy_cp.name,
-                        self.game.turn,
-                    )
+                    info = Information("Frontline Report",
+                                       "Our ground forces from " + cp.name + " are making progress toward " + enemy_cp.name,
+                                       self.game.turn)
                     self.game.informations.append(info)
                 else:
                     print(cp.name + " lost !  factor > " + str(delta))
                     enemy_cp.base.affect_strength(delta)
                     cp.base.affect_strength(-delta)
-                    info = Information(
-                        "Frontline Report",
-                        "Our ground forces from "
-                        + cp.name
-                        + " are losing ground against the enemy forces from "
-                        + enemy_cp.name,
-                        self.game.turn,
-                    )
+                    info = Information("Frontline Report",
+                                       "Our ground forces from " + cp.name + " are losing ground against the enemy forces from " + enemy_cp.name,
+                                       self.game.turn)
                     self.game.informations.append(info)
 
-    def redeploy_units(self, cp: ControlPoint) -> None:
-        """ "
+    def skip(self):
+        pass
+
+    def redeploy_units(self, cp):
+        """"
         Auto redeploy units to newly captured base
         """
 
-        ally_connected_cps = [
-            ocp for ocp in cp.connected_points if cp.captured == ocp.captured
-        ]
-        enemy_connected_cps = [
-            ocp for ocp in cp.connected_points if cp.captured != ocp.captured
-        ]
+        ally_connected_cps = [ocp for ocp in cp.connected_points if cp.captured == ocp.captured]
+        enemy_connected_cps = [ocp for ocp in cp.connected_points if cp.captured != ocp.captured]
 
         # If the newly captured cp does not have enemy connected cp,
         # then it is not necessary to redeploy frontline units there.
         if len(enemy_connected_cps) == 0:
             return
-
-        # From each ally cp, send reinforcements
-        for ally_cp in ally_connected_cps:
-            self.redeploy_between(cp, ally_cp)
-
-    def redeploy_between(self, destination: ControlPoint, source: ControlPoint) -> None:
-        total_units_redeployed = 0
-        moved_units = {}
-
-        if source.has_active_frontline or not destination.captured:
-            # If there are still active front lines to defend at the
-            # transferring CP we should not transfer all units.
-            #
-            # Opfor also does not transfer all of their units.
-            # TODO: Balance the CPs rather than moving half from everywhere.
-            move_factor = 0.5
         else:
-            # Otherwise we can move everything.
-            move_factor = 1
+            # From each ally cp, send reinforcements
+            for ally_cp in ally_connected_cps:
+                total_units_redeployed = 0
+                own_enemy_cp = [ocp for ocp in ally_cp.connected_points if ally_cp.captured != ocp.captured]
 
-        for frontline_unit, count in source.base.armor.items():
-            moved_units[frontline_unit] = int(count * move_factor)
-            total_units_redeployed = total_units_redeployed + int(count * move_factor)
+                moved_units = {}
 
-        destination.base.commision_units(moved_units)
-        source.base.commit_losses(moved_units)
+                # If the connected base, does not have any more enemy cp connected.
+                # Or if it is not the opponent redeploying forces there (enemy AI will never redeploy all their forces at once)
+                if len(own_enemy_cp) > 0 or not cp.captured:
+                    for frontline_unit, count in ally_cp.base.armor.items():
+                        moved_units[frontline_unit] = int(count/2)
+                        total_units_redeployed = total_units_redeployed + int(count/2)
+                else: # So if the old base, does not have any more enemy cp connected, or if it is an enemy base
+                    for frontline_unit, count in ally_cp.base.armor.items():
+                        moved_units[frontline_unit] = count
+                        total_units_redeployed = total_units_redeployed + count
 
-        # Also transfer pending deliveries.
-        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.pending_unit_deliveries.sell({unit_type: move_count})
-            destination.pending_unit_deliveries.order({unit_type: move_count})
-            total_units_redeployed += move_count
+                cp.base.commision_units(moved_units)
+                ally_cp.base.commit_losses(moved_units)
 
-        if total_units_redeployed > 0:
-            text = (
-                f"{total_units_redeployed}  units have been redeployed from "
-                f"{source.name} to {destination.name}"
-            )
-            info = Information("Units redeployed", text, self.game.turn)
-            self.game.informations.append(info)
-            logging.info(text)
+                if total_units_redeployed > 0:
+                    info = Information("Units redeployed", "", self.game.turn)
+                    info.text = str(total_units_redeployed) + " units have been redeployed from " + ally_cp.name + " to " + cp.name
+                    self.game.informations.append(info)
+                    logging.info(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:
+class UnitsDeliveryEvent(Event):
+    informational = True
+    units = None  # type: typing.Dict[UnitType, int]
+
+    def __init__(self, attacker_name: str, defender_name: str, from_cp: ControlPoint, to_cp: ControlPoint, game):
+        super(UnitsDeliveryEvent, self).__init__(game=game,
+                                                 location=to_cp.position,
+                                                 from_cp=from_cp,
+                                                 target_cp=to_cp,
+                                                 attacker_name=attacker_name,
+                                                 defender_name=defender_name)
+
+        self.units = {}
+
+    def __str__(self):
         return "Pending delivery to {}".format(self.to_cp)
 
-    def order(self, units: Dict[Type[UnitType], int]) -> None:
+    def deliver(self, units: typing.Dict[UnitType, int]):
         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 skip(self):
 
-    def consume_each_order(self) -> Iterator[Tuple[Type[UnitType], int]]:
-        while self.units:
-            yield self.units.popitem()
+        for k, v in self.units.items():
+            info = Information("Ally Reinforcement", str(k.id) + " x " + str(v) + " at " + self.to_cp.name, self.game.turn)
+            self.game.informations.append(info)
 
-    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 = {}
+        self.to_cp.base.commision_units(self.units)

game/event/frontlineattack.py

@@ -1,12 +1,53 @@
-from .event import Event
+from game.event import *
+from game.operation.frontlineattack import FrontlineAttackOperation
+from userdata.debriefing import Debriefing
 
 
 class FrontlineAttackEvent(Event):
-    """
-    An event centered on a FrontLine Conflict.
-    Currently the same as its parent, but here for legacy compatibility as well as to allow for
-    future unique Event handling
-    """
+
+    @property
+    def tasks(self) -> typing.Collection[typing.Type[Task]]:
+        if self.is_player_attacking:
+            return [CAS, CAP]
+        else:
+            return [CAP]
+
+    @property
+    def global_cp_available(self) -> bool:
+        return True
 
     def __str__(self):
         return "Frontline attack"
+
+    def is_successfull(self, debriefing: Debriefing):
+        attackers_success = True
+        if self.from_cp.captured:
+            return attackers_success
+        else:
+            return not attackers_success
+
+    def commit(self, debriefing: Debriefing):
+        super(FrontlineAttackEvent, self).commit(debriefing)
+
+    def skip(self):
+        if self.to_cp.captured:
+            self.to_cp.base.affect_strength(-0.1)
+
+    def player_attacking(self, flights: db.TaskForceDict):
+        op = FrontlineAttackOperation(game=self.game,
+                                      attacker_name=self.attacker_name,
+                                      defender_name=self.defender_name,
+                                      from_cp=self.from_cp,
+                                      departure_cp=self.departure_cp,
+                                      to_cp=self.to_cp)
+        self.operation = op
+
+    def player_defending(self, flights: db.TaskForceDict):
+        op = FrontlineAttackOperation(game=self.game,
+                                      attacker_name=self.attacker_name,
+                                      defender_name=self.defender_name,
+                                      from_cp=self.from_cp,
+                                      departure_cp=self.departure_cp,
+                                      to_cp=self.to_cp)
+        self.operation = op
+

game/factions/australia_2005.py

@@ -0,0 +1,50 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Australia_2005 = {
+    "country": "Australia",
+    "side": "blue",
+    "units": [
+        FA_18C_hornet,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        Armor.MBT_M1A2_Abrams,
+        Armor.MBT_Leopard_1A3,
+        Armor.APC_M113,
+        Armor.IFV_LAV_25,
+        Armor.IFV_MCV_80,
+
+        UH_1H,
+        AH_1W, # Standing as EC Tiger
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.Rapier_FSA_Launcher,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.Rapier_FSA_Launcher,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "destroyer": [
+        USS_Arleigh_Burke_IIa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "lhanames": [
+        "HMAS Canberra",
+        "HMAS Adelaide"
+    ], "boat":[
+        "ArleighBurkeGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/bluefor_coldwar.py

@@ -0,0 +1,58 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+BLUEFOR_COLDWAR = {
+    "country": "Combined Joint Task Forces Blue",
+    "side": "blue",
+    "units": [
+
+        F_14B,
+        F_4E,
+        F_5E_3,
+        A_10A,
+        AJS37,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        SA342M,
+        SA342L,
+
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Chaparral_M48,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.AAA_Vulcan_M163,
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "carrier_names": [
+        "CVN-71 Theodore Roosevelt",
+        "CVN-72 Abraham Lincoln",
+        "CVN-73 George Washington",
+        "CVN-74 John C. Stennis",
+    ], "lhanames": [
+        "LHA-1 Tarawa",
+        "LHA-2 Saipan",
+        "LHA-3 Belleau Wood",
+        "LHA-4 Nassau",
+        "LHA-5 Peleliu"
+    ], "boat": [
+    ], "has_jtac": True
+}

game/factions/bluefor_coldwar_a4.py

@@ -0,0 +1,65 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+from pydcs_extensions.a4ec.a4ec import A_4E_C
+
+BLUEFOR_COLDWAR_A4 = {
+    "country": "Combined Joint Task Forces Blue",
+    "side": "blue",
+    "units": [
+
+        F_14B,
+        F_4E,
+        F_5E_3,
+        A_10A,
+        AJS37,
+        A_4E_C,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        SA342M,
+        SA342L,
+
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Chaparral_M48,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.AAA_Vulcan_M163,
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "CVN-71 Theodore Roosevelt",
+        "CVN-72 Abraham Lincoln",
+        "CVN-73 George Washington",
+        "CVN-74 John C. Stennis",
+    ], "lhanames": [
+        "LHA-1 Tarawa",
+        "LHA-2 Saipan",
+        "LHA-3 Belleau Wood",
+        "LHA-4 Nassau",
+        "LHA-5 Peleliu"
+    ], "boat": [
+    ], "requirements": {
+        "Community A-4E": "https://heclak.github.io/community-a4e-c/",
+    }, "has_jtac": True
+}

game/factions/bluefor_coldwar_mods.py

@@ -0,0 +1,68 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+from pydcs_extensions.a4ec.a4ec import A_4E_C
+from pydcs_extensions.mb339.mb339 import MB_339PAN
+
+BLUEFOR_COLDWAR_MODS = {
+    "country": "USA",
+    "side": "blue",
+    "units": [
+
+        F_14B,
+        F_4E,
+        F_5E_3,
+        A_10A,
+        AJS37,
+        A_4E_C,
+        MB_339PAN,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        SA342M,
+        SA342L,
+
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Chaparral_M48,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.AAA_Vulcan_M163,
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "CVN-71 Theodore Roosevelt",
+        "CVN-72 Abraham Lincoln",
+        "CVN-73 George Washington",
+        "CVN-74 John C. Stennis",
+    ], "lhanames": [
+        "LHA-1 Tarawa",
+        "LHA-2 Saipan",
+        "LHA-3 Belleau Wood",
+        "LHA-4 Nassau",
+        "LHA-5 Peleliu"
+    ], "boat": [
+    ], "requirements": {
+        "MB-339A": "http://www.freccetricolorivirtuali.net/",
+        "Community A-4E": "https://heclak.github.io/community-a4e-c/",
+    }, "has_jtac": True
+}

game/factions/bluefor_modern.py

@@ -0,0 +1,83 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+BLUEFOR_MODERN = {
+    "country": "Combined Joint Task Forces Blue",
+    "side": "blue",
+    "units": [
+
+        F_15C,
+        F_14B,
+        FA_18C_hornet,
+        F_16C_50,
+        JF_17,
+        M_2000C,
+        F_5E_3,
+        Su_27,
+
+        Su_25T,
+        A_10A,
+        A_10C,
+        A_10C_2,
+        AV8BNA,
+        AJS37,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        AH_64D,
+        Ka_50,
+        SA342M,
+        SA342L,
+
+        Armor.MBT_M1A2_Abrams,
+        Armor.MBT_Leopard_2,
+        Armor.ATGM_M1134_Stryker,
+        Armor.IFV_M2A2_Bradley,
+        Armor.IFV_Marder,
+        Armor.APC_M1043_HMMWV_Armament,
+
+        Artillery.MLRS_M270,
+        Artillery.SPH_M109_Paladin,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Patriot_EPP_III,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.SAM_Avenger_M1097,
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+        USS_Arleigh_Burke_IIa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "CVN-71 Theodore Roosevelt",
+        "CVN-72 Abraham Lincoln",
+        "CVN-73 George Washington",
+        "CVN-74 John C. Stennis",
+    ], "lhanames": [
+        "LHA-1 Tarawa",
+        "LHA-2 Saipan",
+        "LHA-3 Belleau Wood",
+        "LHA-4 Nassau",
+        "LHA-5 Peleliu"
+    ], "boat":[
+        "ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/canada_2005.py

@@ -0,0 +1,43 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Canada_2005 = {
+    "country": "Canada",
+    "side": "blue",
+    "units": [
+        FA_18C_hornet,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        Armor.MBT_Leopard_1A3,
+        Armor.MBT_Leopard_2,
+        Armor.IFV_LAV_25,
+        Armor.APC_M113,
+        Armor.IFV_MCV_80,
+
+        UH_1H,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Avenger_M1097,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.SAM_Avenger_M1097,
+    ], "destroyer": [
+        USS_Arleigh_Burke_IIa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "boat":[
+        "ArleighBurkeGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/china_2010.py

@@ -0,0 +1,80 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+China_2010 = {
+    "country": "China",
+    "side": "red",
+    "units": [
+
+        MiG_21Bis, # Standing as J-7
+        Su_30,
+        Su_33,
+        J_11A,
+        JF_17,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        KJ_2000,
+
+        Mi_8MT,
+        Mi_28N,
+
+        AirDefence.SAM_SA_10_S_300PS_LN_5P85C, # Standing as HQ-9+
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.HQ_7_Self_Propelled_LN,
+
+        Armor.ZTZ_96B,
+        Armor.MBT_T_55,
+        Armor.ZBD_04A,
+        Armor.IFV_BMP_1,
+        Artillery.MLRS_9A52_Smerch,
+        Artillery.SPH_2S9_Nona,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
+
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.SPAAA_ZSU_23_4_Shilka,
+        AirDefence.Rapier_FSA_Launcher, # Standing as PL-9C Shorad
+        AirDefence.HQ_7_Self_Propelled_LN
+    ], "aircraft_carrier": [
+        CV_1143_5_Admiral_Kuznetsov,
+    ], "destroyer": [
+        Type_052B_Destroyer,
+        Type_052C_Destroyer
+    ], "cruiser": [
+        Type_054A_Frigate,
+    ], "helicopter_carrier": [
+        Type_071_Amphibious_Transport_Dock,
+    ], "lhanames": [
+        "Kunlun Shan",
+        "Jinggang Shan",
+        "Changbai Shan",
+        "Yimeng Shan",
+        "Longhu Shan",
+        "Wuzhi Shan",
+        "Wudang Shan"
+    ], "carrier_names": [
+        "001 Liaoning",
+        "002 Shandong",
+    ], "boat":[
+        "Type54GroupGenerator"
+    ],
+    "has_jtac": True,
+    "jtac_unit": WingLoong_I
+}

game/factions/faction.py

@@ -1,307 +0,0 @@
-from __future__ import annotations
-
-import logging
-from dataclasses import dataclass, field
-from typing import Optional, Dict, Type, List, Any, cast
-
-import dcs
-from dcs.countries import country_dict
-from dcs.planes import plane_map
-from dcs.unittype import FlyingType, ShipType, VehicleType, UnitType
-from dcs.vehicles import Armor, Unarmed, Infantry, Artillery, AirDefence
-
-from game.data.building_data import (
-    WW2_ALLIES_BUILDINGS,
-    DEFAULT_AVAILABLE_BUILDINGS,
-    WW2_GERMANY_BUILDINGS,
-    WW2_FREE,
-)
-from game.data.doctrine import (
-    Doctrine,
-    MODERN_DOCTRINE,
-    COLDWAR_DOCTRINE,
-    WWII_DOCTRINE,
-)
-from pydcs_extensions.mod_units import MODDED_VEHICLES, MODDED_AIRPLANES
-
-
-@dataclass
-class Faction:
-
-    # Country used by this faction
-    country: str = field(default="")
-
-    # Nice name of the faction
-    name: str = field(default="")
-
-    # List of faction file authors
-    authors: str = field(default="")
-
-    # A description of the faction
-    description: str = field(default="")
-
-    # Available aircraft
-    aircrafts: List[Type[FlyingType]] = field(default_factory=list)
-
-    # Available awacs aircraft
-    awacs: List[Type[FlyingType]] = field(default_factory=list)
-
-    # Available tanker aircraft
-    tankers: List[Type[FlyingType]] = field(default_factory=list)
-
-    # Available frontline units
-    frontline_units: List[Type[VehicleType]] = field(default_factory=list)
-
-    # Available artillery units
-    artillery_units: List[Type[VehicleType]] = field(default_factory=list)
-
-    # Infantry units used
-    infantry_units: List[Type[VehicleType]] = field(default_factory=list)
-
-    # Logistics units used
-    logistics_units: List[Type[VehicleType]] = field(default_factory=list)
-
-    # Possible SAMS site generators for this faction
-    air_defenses: List[str] = field(default_factory=list)
-
-    # Possible EWR generators for this faction.
-    ewrs: List[str] = field(default_factory=list)
-
-    # Possible Missile site generators for this faction
-    missiles: List[str] = field(default_factory=list)
-
-    # Possible costal site generators for this faction
-    coastal_defenses: List[str] = field(default_factory=list)
-
-    # Required mods or asset packs
-    requirements: Dict[str, str] = field(default_factory=dict)
-
-    # possible aircraft carrier units
-    aircraft_carrier: List[Type[UnitType]] = field(default_factory=list)
-
-    # possible helicopter carrier units
-    helicopter_carrier: List[Type[UnitType]] = field(default_factory=list)
-
-    # Possible carrier names
-    carrier_names: List[str] = field(default_factory=list)
-
-    # Possible helicopter carrier names
-    helicopter_carrier_names: List[str] = field(default_factory=list)
-
-    # Navy group generators
-    navy_generators: List[str] = field(default_factory=list)
-
-    # Available destroyers
-    destroyers: List[Type[ShipType]] = field(default_factory=list)
-
-    # Available cruisers
-    cruisers: List[Type[ShipType]] = field(default_factory=list)
-
-    # How many navy group should we try to generate per CP on startup for this faction
-    navy_group_count: int = field(default=1)
-
-    # How many missiles group should we try to generate per CP on startup for this faction
-    missiles_group_count: int = field(default=1)
-
-    # How many coastal group should we try to generate per CP on startup for this faction
-    coastal_group_count: int = field(default=1)
-
-    # Whether this faction has JTAC access
-    has_jtac: bool = field(default=False)
-
-    # Unit to use as JTAC for this faction
-    jtac_unit: Optional[Type[FlyingType]] = field(default=None)
-
-    # doctrine
-    doctrine: Doctrine = field(default=MODERN_DOCTRINE)
-
-    # List of available buildings for this faction
-    building_set: List[str] = field(default_factory=list)
-
-    # List of default livery overrides
-    liveries_overrides: Dict[Type[UnitType], List[str]] = field(default_factory=dict)
-
-    #: Set to True if the faction should force the "Unrestricted satnav" option
-    #: for the mission. This option enables GPS for capable aircraft regardless
-    #: of the time period or operator. For example, the CJTF "countries" don't
-    #: appear to have GPS capability, so they need this.
-    #:
-    #: Note that this option cannot be set per-side. If either faction needs it,
-    #: both will use it.
-    unrestricted_satnav: bool = False
-
-    @classmethod
-    def from_json(cls: Type[Faction], json: Dict[str, Any]) -> Faction:
-
-        faction = Faction()
-
-        faction.country = json.get("country", "/")
-        if faction.country not in [c.name for c in country_dict.values()]:
-            raise AssertionError(
-                'Faction\'s country ("{}") is not a valid DCS country ID'.format(
-                    faction.country
-                )
-            )
-
-        faction.name = json.get("name", "")
-        if not faction.name:
-            raise AssertionError("Faction has no valid name")
-
-        faction.authors = json.get("authors", "")
-        faction.description = json.get("description", "")
-
-        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.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", [])
-
-        faction.air_defenses = json.get("air_defenses", [])
-        # Compatibility for older factions. All air defenses now belong to a
-        # single group and the generator decides what belongs where.
-        faction.air_defenses.extend(json.get("sams", []))
-        faction.air_defenses.extend(json.get("shorads", []))
-
-        faction.missiles = json.get("missiles", [])
-        faction.coastal_defenses = json.get("coastal_defenses", [])
-        faction.requirements = json.get("requirements", {})
-
-        faction.carrier_names = json.get("carrier_names", [])
-        faction.helicopter_carrier_names = json.get("helicopter_carrier_names", [])
-        faction.navy_generators = json.get("navy_generators", [])
-        faction.aircraft_carrier = load_all_ships(json.get("aircraft_carrier", []))
-        faction.helicopter_carrier = load_all_ships(json.get("helicopter_carrier", []))
-        faction.destroyers = load_all_ships(json.get("destroyers", []))
-        faction.cruisers = load_all_ships(json.get("cruisers", []))
-        faction.has_jtac = json.get("has_jtac", False)
-        jtac_name = json.get("jtac_unit", None)
-        if jtac_name is not None:
-            faction.jtac_unit = load_aircraft(jtac_name)
-        else:
-            faction.jtac_unit = None
-        faction.navy_group_count = int(json.get("navy_group_count", 1))
-        faction.missiles_group_count = int(json.get("missiles_group_count", 0))
-        faction.coastal_group_count = int(json.get("coastal_group_count", 0))
-
-        # Load doctrine
-        doctrine = json.get("doctrine", "modern")
-        if doctrine == "modern":
-            faction.doctrine = MODERN_DOCTRINE
-        elif doctrine == "coldwar":
-            faction.doctrine = COLDWAR_DOCTRINE
-        elif doctrine == "ww2":
-            faction.doctrine = WWII_DOCTRINE
-        else:
-            faction.doctrine = MODERN_DOCTRINE
-
-        # Load the building set
-        building_set = json.get("building_set", "default")
-        if building_set == "default":
-            faction.building_set = DEFAULT_AVAILABLE_BUILDINGS
-        elif building_set == "ww2free":
-            faction.building_set = WW2_FREE
-        elif building_set == "ww2ally":
-            faction.building_set = WW2_ALLIES_BUILDINGS
-        elif building_set == "ww2germany":
-            faction.building_set = WW2_GERMANY_BUILDINGS
-        else:
-            faction.building_set = DEFAULT_AVAILABLE_BUILDINGS
-
-        # Load liveries override
-        faction.liveries_overrides = {}
-        liveries_overrides = json.get("liveries_overrides", {})
-        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 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 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 load_aircraft(name: str) -> Optional[Type[FlyingType]]:
-    return cast(
-        Optional[FlyingType],
-        unit_loader(name, [dcs.planes, dcs.helicopters, MODDED_AIRPLANES]),
-    )
-
-
-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]]:
-    return cast(Optional[FlyingType], unit_loader(name, [dcs.ships]))
-
-
-def load_all_ships(data) -> List[Type[ShipType]]:
-    items = []
-    for name in data:
-        item = load_ship(name)
-        if item is not None:
-            items.append(item)
-    return items

game/factions/faction_loader.py

@@ -1,46 +0,0 @@
-from __future__ import annotations
-import json
-import logging
-from pathlib import Path
-from typing import Dict, Iterator, Optional, Type
-
-from game.factions.faction import Faction
-
-FACTION_DIRECTORY = Path("./resources/factions/")
-
-
-class FactionLoader:
-    def __init__(self) -> None:
-        self._factions: Optional[Dict[str, Faction]] = None
-
-    @property
-    def factions(self) -> Dict[str, Faction]:
-        self.initialize()
-        assert self._factions is not None
-        return self._factions
-
-    def initialize(self) -> None:
-        if self._factions is None:
-            self._factions = self.load_factions()
-
-    @classmethod
-    def load_factions(cls: Type[FactionLoader]) -> Dict[str, Faction]:
-        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)
-                    factions[data["name"]] = Faction.from_json(data)
-                    logging.info("Loaded faction : " + str(f))
-            except Exception:
-                logging.exception(f"Unable to load faction : {f}")
-
-        return factions
-
-    def __getitem__(self, name: str) -> Faction:
-        return self.factions[name]
-
-    def __iter__(self) -> Iterator[str]:
-        return iter(self.factions.keys())

game/factions/france_1995.py

@@ -0,0 +1,47 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+France_1995 = {
+    "country": "France",
+    "side": "blue",
+    "units": [
+        M_2000C,
+        Mirage_2000_5,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        SA342M,
+        SA342L,
+        SA342Mistral,
+
+        Armor.MBT_Leclerc,
+        Armor.TPz_Fuchs,  # Standing as VAB
+        Armor.APC_Cobra,  # Standing as VBL
+        Armor.ATGM_M1134_Stryker,  # Standing as VAB Mephisto
+        Artillery.SPH_M109_Paladin,  # Standing as AMX30 AuF1
+        Artillery.MLRS_M270,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Roland_ADS,
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.HQ_7_Self_Propelled_LN,  # Standing as Crotale
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+
+    ], "shorad": [
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.SAM_Roland_ADS
+    ], "boat":[
+        "ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/france_2005.py

@@ -0,0 +1,62 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+France_2005 = {
+    "country": "France",
+    "side": "blue",
+    "units":[
+        M_2000C,
+        Mirage_2000_5,
+        FA_18C_hornet, # Standing as Rafale M
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        SA342M,
+        SA342L,
+        SA342Mistral,
+
+        Armor.MBT_Leclerc,
+        Armor.TPz_Fuchs, # Standing as VAB
+        Armor.APC_Cobra, # Standing as VBL
+        Armor.ATGM_M1134_Stryker, # Standing as VAB Mephisto
+        Artillery.SPH_M109_Paladin, # Standing as AMX30 AuF1
+        Artillery.MLRS_M270,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Roland_ADS,
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.HQ_7_Self_Propelled_LN, # Standing as Crotale
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+        
+    ], "shorad":[
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.SAM_Roland_ADS
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis, # Standing as CDG Aircraft Carrier
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa, # Standing as Mistral Class
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "PA Charles de Gaulle",
+    ], "lhanames": [
+        "L9013 Mistral",
+        "L9014 Tonerre",
+        "L9015 Dixmude"
+    ], "boat":[
+        "ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/france_modded.py

@@ -0,0 +1,80 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+import pydcs_extensions.frenchpack.frenchpack as frenchpack
+from pydcs_extensions.rafale.rafale import Rafale_M, Rafale_A_S
+
+France_2005_Modded = {
+    "country": "France",
+    "side": "blue",
+    "units": [
+        M_2000C,
+        Mirage_2000_5,
+        Rafale_M,
+        Rafale_A_S,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        SA342M,
+        SA342L,
+        SA342Mistral,
+
+        Armor.MBT_Leclerc,
+        Artillery.SPH_M109_Paladin,  # Standing as AMX30 AuF1
+        Artillery.MLRS_M270,
+
+        frenchpack.AMX_10RCR,
+        frenchpack.AMX_10RCR_SEPAR,
+        frenchpack.ERC_90,
+        frenchpack.TRM_2000_PAMELA,
+        frenchpack.VAB__50,
+        frenchpack.VAB_MEPHISTO,
+        frenchpack.VAB_T20_13,
+        frenchpack.VBL__50,
+        frenchpack.VBL_AANF1,
+        frenchpack.VBAE_CRAB,
+        frenchpack.VBAE_CRAB_MMP,
+        frenchpack.AMX_30B2,
+        frenchpack.Leclerc_Serie_XXI,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Roland_ADS,
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.HQ_7_Self_Propelled_LN,  # Standing as Crotale
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+
+    ], "shorad": [
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.SAM_Roland_ADS
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis,  # Standing as CDG Aircraft Carrier
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,  # Standing as Mistral Class
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "PA Charles de Gaulle",
+    ], "lhanames": [
+        "L9013 Mistral",
+        "L9014 Tonerre",
+        "L9015 Dixmude"
+    ], "boat": [
+        "ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator"
+    ], "requirements": {
+        "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974",
+        "RAFALE 2.5.5": "https://www.digitalcombatsimulator.com/fr/files/3307478/",
+    }, "has_jtac": True
+}

game/factions/germany_1944.py

@@ -0,0 +1,47 @@
+from dcs.planes import *
+from dcs.vehicles import *
+
+from game.data.building_data import WW2_GERMANY_BUILDINGS
+from game.data.doctrine import WWII_DOCTRINE
+
+Germany_1944 = {
+    "country": "Third Reich",
+    "side": "red",
+    "units": [
+
+        FW_190A8,
+        FW_190D9,
+        Bf_109K_4,
+        Ju_88A4,
+
+        Armor.MT_Pz_Kpfw_V_Panther_Ausf_G,
+        Armor.MT_Pz_Kpfw_IV_Ausf_H,
+        Armor.HT_Pz_Kpfw_VI_Tiger_I,
+        Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II,
+        Armor.APC_Sd_Kfz_251,
+        Armor.IFV_Sd_Kfz_234_2_Puma,
+        Armor.Sd_Kfz_184_Elefant,
+        Armor.TD_Jagdpanther_G1,
+        Armor.TD_Jagdpanzer_IV,
+
+        Artillery.Sturmpanzer_IV_Brummbär,
+
+        Unarmed.Sd_Kfz_2,
+        Unarmed.Sd_Kfz_7,
+        Unarmed.Kübelwagen_82,
+
+        Infantry.Infantry_Mauser_98,
+        AirDefence.AAA_8_8cm_Flak_36,
+    ],"requirements":{
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    },
+    "shorad": [
+        AirDefence.AAA_8_8cm_Flak_36,
+    ],
+    "objects": WW2_GERMANY_BUILDINGS,
+    "doctrine": WWII_DOCTRINE,
+    "boat": ["UBoatGroupGenerator", "SchnellbootGroupGenerator"],
+    "boat_count": 2,
+    "missiles": ["V1GroupGenerator"],
+    "missiles_count": 1
+}

game/factions/germany_1944_easy.py

@@ -0,0 +1,40 @@
+from dcs.planes import *
+from dcs.vehicles import *
+
+from game.data.building_data import WW2_GERMANY_BUILDINGS
+from game.data.doctrine import WWII_DOCTRINE
+
+Germany_1944_Easy = {
+    "country": "Third Reich",
+    "side": "red",
+    "units": [
+
+        FW_190A8,
+        FW_190D9,
+        Bf_109K_4,
+        Ju_88A4,
+
+        Armor.MT_Pz_Kpfw_IV_Ausf_H,
+        Armor.APC_Sd_Kfz_251,
+        Armor.IFV_Sd_Kfz_234_2_Puma,
+        Artillery.Sturmpanzer_IV_Brummbär,
+
+        Unarmed.Sd_Kfz_2,
+        Unarmed.Sd_Kfz_7,
+        Unarmed.Kübelwagen_82,
+
+        Infantry.Infantry_Mauser_98,
+        AirDefence.AAA_8_8cm_Flak_36,
+    ],"requirements":{
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    },
+    "shorad":[
+        AirDefence.AAA_8_8cm_Flak_36,
+    ],
+    "objects": WW2_GERMANY_BUILDINGS,
+    "doctrine": WWII_DOCTRINE,
+    "boat": ["UBoatGroupGenerator", "SchnellbootGroupGenerator"],
+    "boat_count": 1,
+    "missiles": ["V1GroupGenerator"],
+    "missiles_count": 1
+}

game/factions/germany_1990.py

@@ -0,0 +1,45 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Germany_1990 = {
+    "country": "Germany",
+    "side": "blue",
+    "units":[
+        MiG_29G,
+        Tornado_IDS,
+        F_4E,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        SA342M,
+        SA342L,
+
+        Armor.TPz_Fuchs,
+        Armor.MBT_Leopard_1A3,
+        Armor.MBT_Leopard_2,
+        Armor.IFV_Marder,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Roland_ADS,
+        AirDefence.SAM_Hawk_PCP,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.SPAAA_Gepard,
+        AirDefence.SAM_Roland_ADS,
+    ], "boat":[
+        "OliverHazardPerryGroupGenerator"
+    ]
+}

game/factions/india_2010.py

@@ -0,0 +1,55 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+India_2010 = {
+    "country": "India",
+    "side": "blue",
+    "units": [
+        Mirage_2000_5,
+        M_2000C,
+        MiG_27K,
+        MiG_21Bis,
+        MiG_29S,
+        Su_30,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        AH_64A,
+        Mi_8MT,
+
+        Armor.MBT_T_90,
+        Armor.MBT_T_72B,
+        Armor.IFV_BMP_2,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.SAM_SA_8_Osa_9A33,
+        AirDefence.AAA_ZU_23_Emplacement,
+        AirDefence.SPAAA_ZSU_23_4_Shilka,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3,
+        AirDefence.SAM_SA_8_Osa_9A33,
+        AirDefence.SAM_SA_19_Tunguska_2S6
+    ], "aircraft_carrier": [
+        CV_1143_5_Admiral_Kuznetsov,
+    ], "destroyer": [
+        FSG_1241_1MP_Molniya,
+    ], "carrier_names": [
+        "INS Vikramaditya"
+    ], "boat":[
+        "ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator", "MolniyaGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/insurgent.py

@@ -0,0 +1,27 @@
+from dcs.vehicles import *
+from dcs.ships import *
+from dcs.planes import *
+from dcs.helicopters import *
+
+Insurgent = {
+    "country": "Insurgents",
+    "side": "red",
+    "units": [
+
+        AirDefence.AAA_ZU_23_Insurgent_Closed,
+        AirDefence.AAA_ZU_23_Insurgent_on_Ural_375,
+
+        Armor.APC_Cobra,
+        Armor.APC_MTLB,
+        Armor.ARV_BRDM_2,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+        Infantry.Infantry_Soldier_Insurgents,
+        Infantry.Soldier_RPG,
+
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160
+    ]
+}

game/factions/insurgent_modded.py

@@ -0,0 +1,33 @@
+from dcs.ships import *
+from dcs.vehicles import *
+
+from pydcs_extensions.frenchpack.frenchpack import DIM__TOYOTA_BLUE, DIM__TOYOTA_DESERT, DIM__TOYOTA_GREEN, \
+    DIM__KAMIKAZE
+
+Insurgent_modded = {
+    "country": "Insurgents",
+    "side": "red",
+    "units": [
+
+        AirDefence.AAA_ZU_23_Insurgent_Closed,
+        AirDefence.AAA_ZU_23_Insurgent_on_Ural_375,
+
+        DIM__TOYOTA_BLUE,
+        DIM__TOYOTA_DESERT,
+        DIM__TOYOTA_GREEN,
+        DIM__KAMIKAZE,
+        Armor.ARV_BRDM_2,
+        Armor.APC_Cobra,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+        Infantry.Soldier_AK,
+        Infantry.Infantry_Soldier_Insurgents,
+
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160
+    ], "requirements": {
+        "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974",
+    }
+}

game/factions/iran_2015.py

@@ -0,0 +1,58 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Iran_2015 = {
+    "country": "Iran",
+    "side": "red",
+    "units": [
+
+        MiG_29A,
+        F_4E,
+        F_14B,
+        F_5E_3,
+
+        MiG_21Bis,
+        Su_24M,
+        Su_25,
+        Su_17M4,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        A_50,
+
+        Mi_28N,
+        Mi_24V,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_SA_2_LN_SM_90,
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.SAM_SA_11_Buk_LN_9A310M1,
+
+        Armor.APC_M113,
+        Armor.APC_BTR_80,
+        Armor.MBT_M60A3_Patton,
+        Armor.MBT_T_72B,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+        Infantry.Soldier_AK,
+
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.AAA_ZU_23_Insurgent_Closed
+    ], "boat":[
+        "GrishaGroupGenerator", "MolniyaGroupGenerator", "KiloSubGroupGenerator"
+    ]
+}

game/factions/israel_1948.py

@@ -0,0 +1,33 @@
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Israel_1948 = {
+    "country": "Israel",
+    "side": "blue",
+    "units":[
+        SpitfireLFMkIXCW,
+        SpitfireLFMkIX,
+        P_51D,
+        P_51D_30_NA,
+        Bf_109K_4, # Standing as Avia S-199
+        B_17G,
+
+        Armor.MT_M4A4_Sherman_Firefly,
+        Armor.APC_M2A1,
+        Armor.MT_M4_Sherman,
+        Armor.LAC_M8_Greyhound,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_SMLE_No_4_Mk_1,
+
+        AirDefence.AAA_Bofors_40mm,
+        Armed_speedboat,
+    ],"requirements":{
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    },
+    "shorad": [
+        AirDefence.AAA_Bofors_40mm
+    ], "boat": [
+    ], "has_jtac": False
+}

game/factions/israel_1973.py

@@ -0,0 +1,112 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+from pydcs_extensions.a4ec.a4ec import A_4E_C
+
+Israel_1973 = {
+    "country": "Israel",
+    "side": "blue",
+    "units":[
+        F_4E,
+        A_4E_C,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+
+        Armor.MT_M4A4_Sherman_Firefly,
+        Armor.APC_M2A1,
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.AAA_Bofors_40mm,
+        AirDefence.SAM_Chaparral_M48,
+
+        Armed_speedboat,
+    ], "requirements": {
+        "Community A-4E": "https://heclak.github.io/community-a4e-c/",
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    }, "shorad": [
+        AirDefence.SAM_Chaparral_M48,
+        AirDefence.AAA_Bofors_40mm
+    ], "boat": [
+    ], "has_jtac": True
+}
+
+Israel_1973_NO_WW2_UNITS = {
+    "country": "Israel",
+    "side": "blue",
+    "units":[
+        F_4E,
+        A_4E_C,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Chaparral_M48,
+
+        Armed_speedboat,
+    ], "requirements": {
+        "Community A-4E": "https://heclak.github.io/community-a4e-c/",
+    }, "shorad": [
+        AirDefence.SAM_Chaparral_M48,
+    ], "boat": [
+    ], "has_jtac": True
+}
+
+Israel_1982 = {
+    "country": "Israel",
+    "side": "blue",
+    "units":[
+        F_4E,
+        A_4E_C,
+        F_15C,
+        F_16A,
+        F_16C_50,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        AH_1W,
+
+        Armor.APC_M113,
+        Armor.MBT_M60A3_Patton,
+        Armor.MBT_Merkava_Mk__4,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Chaparral_M48,
+
+        Armed_speedboat,
+    ], "requirements": {
+        "Community A-4E": "https://heclak.github.io/community-a4e-c/",
+    }, "shorad": [
+        AirDefence.SAM_Chaparral_M48,
+    ], "boat": [
+    ], "has_jtac": True
+}

game/factions/israel_2000.py

@@ -0,0 +1,44 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Israel_2000 = {
+    "country": "Israel",
+    "side": "blue",
+    "units":[
+        F_16C_50,
+        F_15C,
+        F_15E,
+        F_4E,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        AH_1W,
+        AH_64D,
+
+        Armor.MBT_Merkava_Mk__4,
+        Armor.APC_M113,
+        Armor.APC_M1043_HMMWV_Armament,
+        Armor.ATGM_M1045_HMMWV_TOW,
+        Artillery.SPH_M109_Paladin,
+        Artillery.MLRS_M270,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_Patriot_EPP_III,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ],
+    "shorad": [
+        AirDefence.SAM_Avenger_M1097
+    ], "boat": [
+        "ArleighBurkeGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/italy_1990.py

@@ -0,0 +1,48 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Italy_1990 = {
+     "country": "Italy",
+     "side": "blue",
+     "units": [
+         Tornado_IDS,
+         AV8BNA,
+         # MB339,
+
+         KC_135,
+         S_3B_Tanker,
+         C_130,
+         E_3A,
+
+         AH_1W,
+         UH_1H,
+
+         Armor.MBT_Leopard_1A3,  # OF-40 MBT
+         Armor.APC_M113,
+
+         Unarmed.Transport_M818,
+         Infantry.Infantry_M4,
+
+         AirDefence.SAM_Hawk_PCP,
+         AirDefence.SAM_Avenger_M1097,
+
+         CVN_74_John_C__Stennis,
+         LHA_1_Tarawa,
+         Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "lhanames": [
+        "Giuseppe Garibaldi",
+        "Cavour",
+    ], "boat":[
+        "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/italy_1990_mb339.py

@@ -0,0 +1,52 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+from pydcs_extensions.mb339.mb339 import MB_339PAN
+
+Italy_1990_MB339 = {
+     "country": "Italy",
+     "side": "blue",
+     "units": [
+         Tornado_IDS,
+         AV8BNA,
+         MB_339PAN,
+
+         KC_135,
+         S_3B_Tanker,
+         C_130,
+         E_3A,
+
+         AH_1W,
+         UH_1H,
+
+         Armor.MBT_Leopard_1A3,  # OF-40 MBT
+         Armor.APC_M113,
+
+         Unarmed.Transport_M818,
+         Infantry.Infantry_M4,
+
+         AirDefence.SAM_Hawk_PCP,
+         AirDefence.SAM_Avenger_M1097,
+
+         CVN_74_John_C__Stennis,
+         LHA_1_Tarawa,
+         Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "lhanames": [
+        "Giuseppe Garibaldi",
+        "Cavour",
+    ], "boat": [
+        "OliverHazardPerryGroupGenerator"
+    ], "requirements": {
+        "MB-339A": "http://www.freccetricolorivirtuali.net/",
+    }, "has_jtac": True
+}

game/factions/japan_2005.py

@@ -0,0 +1,54 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Japan_2005 = {
+    "country": "Japan",
+    "side": "blue",
+    "units": [
+        F_15C,     # F-15J/DJ
+        F_16C_50,  # F-2A/B
+        F_4E,      # F-4EJ
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        AH_1W,
+        AH_64D,
+
+        Armor.MBT_Merkava_Mk__4,  # Standing as Type 10 MBT
+        Armor.MBT_M1A2_Abrams,    # Standing as Type 90 MBT
+        Armor.IFV_Marder,         # Standing as Type 89 IFV
+        Armor.TPz_Fuchs,          # Standing as Type 96 APC
+        Armor.IFV_LAV_25,         # Standing as Type 16 or Type 87
+        Armor.APC_M1043_HMMWV_Armament,
+
+        Artillery.MLRS_M270,
+        Artillery.SPH_M109_Paladin,  # Standing as Type 99 SPH
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Patriot_EPP_III,
+
+        LHA_1_Tarawa,
+    ], "shorad": [
+        AirDefence.SPAAA_Gepard,  # Type 87 SPAG
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa, # Standing as Hyuga-class helicopter carrier
+    ], "destroyer": [
+        USS_Arleigh_Burke_IIa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "lhanames": [
+        "Hyuga",
+        "Ise",
+    ], "boat":[
+        "ArleighBurkeGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/libya_2011.py

@@ -0,0 +1,49 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.vehicles import *
+
+Libya_2011 = {
+    "country": "Libya",
+    "side": "red",
+    "units": [
+
+        MiG_21Bis,
+        MiG_23MLD,
+        Su_24M,
+        Su_17M4,
+        Mi_24V,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+        A_50,
+
+        AirDefence.SAM_SA_8_Osa_9A33,
+        AirDefence.SAM_SA_2_LN_SM_90,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.HQ_7_Self_Propelled_LN,
+
+        Armor.IFV_BMP_1,
+        Armor.FDDM_Grad,
+        Armor.ARV_BRDM_2,
+        Armor.MBT_T_55,
+        Armor.MBT_T_72B,
+        Artillery.MLRS_BM_21_Grad,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        Infantry.Paratrooper_RPG_16,
+        Infantry.Infantry_Soldier_Insurgents
+
+    ],
+    "shorad":[
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.SAM_SA_8_Osa_9A33,
+    ], "boat": [
+        "GrishaGroupGenerator", "MolniyaGroupGenerator"
+    ]
+}

game/factions/netherlands_1990.py

@@ -0,0 +1,38 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Netherlands_1990 = {
+    "country": "The Netherlands",
+    "side": "blue",
+    "units": [
+        F_16C_50,
+        F_5E_3,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        AH_64A,
+
+        Armor.APC_M113,
+        Armor.MBT_Leopard_1A3,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Avenger_M1097,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ],
+    "shorad": [
+        AirDefence.SAM_Avenger_M1097
+    ], "boat": [
+        "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/north_korea_2000.py

@@ -0,0 +1,53 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+NorthKorea_2000 = {
+    "country": "North Korea",
+    "side": "red",
+    "units":[
+        MiG_29A,
+        Su_25,
+        MiG_15bis,
+        MiG_21Bis,
+        MiG_23MLD,
+        MiG_19P,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        A_50,
+
+        Mi_8MT,
+        Mi_24V,
+
+        Armor.MBT_T_55,
+        Armor.MBT_T_72B,
+        Armor.MBT_T_80U,
+        Armor.IFV_BMP_1,
+        Armor.APC_BTR_80,
+        Armor.ARV_BRDM_2,
+
+        Unarmed.Transport_M818,
+        Infantry.Soldier_AK,
+
+        AirDefence.SAM_SA_2_LN_SM_90,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.AAA_ZU_23_Emplacement,
+        AirDefence.SPAAA_ZSU_23_4_Shilka
+    ],
+    "boat": [
+        "GrishaGroupGenerator", "MolniyaGroupGenerator"
+    ]
+}

game/factions/pakistan_2015.py

@@ -0,0 +1,42 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Pakistan_2015 = {
+    "country": "Pakistan",
+    "side": "blue",
+    "units": [
+        JF_17,
+        F_16C_50,
+        MiG_21Bis, # Standing as J-7
+        MiG_19P, # Standing as J-6
+        IL_78M,
+        E_3A,
+
+        UH_1H,
+        AH_1W,
+
+        Armor.MBT_T_80U,
+        Armor.MBT_T_55, # Standing as Al-Zarrar / Type 59 MBT
+        Armor.ZBD_04A,
+        Armor.APC_BTR_80,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_SA_2_LN_SM_90,          # Standing as HQ-2
+        AirDefence.SAM_SA_10_S_300PS_LN_5P85C, # Standing as HQ-9
+
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.AAA_ZU_23_Insurgent_on_Ural_375,
+        AirDefence.AAA_ZU_23_Closed
+    ], "boat": [
+        "Type54GroupGenerator", "OliverHazardPerryGroupGenerator"
+    ],
+    "has_jtac": True,
+    "jtac_unit": WingLoong_I
+}

game/factions/private_miltary_companies.py

@@ -0,0 +1,91 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+from pydcs_extensions.mb339.mb339 import MB_339PAN
+
+PMC_WESTERN_A = {
+     "country": "USA",
+     "side": "blue",
+     "units": [
+         C_101CC,
+
+         UH_1H,
+         Mi_8MT,
+         OH_58D,
+         SA342M,
+
+         Armor.APC_M1043_HMMWV_Armament,
+         Armor.IFV_MCV_80,
+
+         Unarmed.Transport_M818,
+         Infantry.Infantry_M4,
+         Infantry.Soldier_M249,
+
+         AirDefence.SAM_Avenger_M1097,
+
+         Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
+    ], "has_jtac": True
+}
+
+PMC_WESTERN_B = {
+     "country": "USA",
+     "side": "blue",
+     "units": [
+         MB_339PAN,
+         C_101CC,
+
+         UH_1H,
+         Mi_8MT,
+         OH_58D,
+         SA342M,
+
+         Armor.APC_M1043_HMMWV_Armament,
+         Armor.IFV_MCV_80,
+
+         Unarmed.Transport_M818,
+         Infantry.Infantry_M4,
+         Infantry.Soldier_M249,
+
+         AirDefence.SAM_Avenger_M1097,
+
+         Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
+    ], "has_jtac": True,
+    "requirements": {
+        "MB-339A": "http://www.freccetricolorivirtuali.net/",
+    }
+}
+
+PMC_RUSSIAN = {
+     "country": "Russia",
+     "side": "blue",
+     "units": [
+         L_39C,
+         L_39ZA,
+
+         Mi_8MT,
+         Mi_24V,
+         Ka_50,
+
+         Armor.APC_Cobra,
+         Armor.APC_BTR_80,
+         Armor.ARV_BRDM_2,
+
+         Unarmed.Transport_Ural_375,
+         Infantry.Paratrooper_AKS,
+         Infantry.Paratrooper_RPG_16,
+
+         AirDefence.AAA_ZU_23_on_Ural_375,
+
+         Armed_speedboat,
+    ], "shorad":[
+        AirDefence.AAA_ZU_23_on_Ural_375,
+        AirDefence.AAA_ZU_23_Closed,
+    ], "has_jtac": True
+}
+

game/factions/russia_1955.py

@@ -0,0 +1,38 @@
+from dcs.planes import MiG_15bis, IL_76MD, IL_78M, An_26B, An_30M, Yak_40
+from dcs.ships import CV_1143_5_Admiral_Kuznetsov, Bulk_cargo_ship_Yakushev, Dry_cargo_ship_Ivanov, Tanker_Elnya_160
+from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry, Artillery
+
+Russia_1955 = {
+    "country": "Russia",
+    "side": "red",
+    "units": [
+        MiG_15bis,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        AirDefence.AAA_ZU_23_Closed,
+        AirDefence.AAA_ZU_23_on_Ural_375,
+        Armor.ARV_BRDM_2,
+        Armor.FDDM_Grad,
+        Armor.APC_MTLB,
+        Armor.MBT_T_55,
+        Artillery.MLRS_BM_21_Grad,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
+    ]
+}

game/factions/russia_1965.py

@@ -0,0 +1,55 @@
+from dcs.helicopters import Mi_8MT
+from dcs.planes import MiG_15bis, MiG_19P, MiG_21Bis, IL_76MD, IL_78M, An_26B, An_30M, Yak_40, A_50
+from dcs.ships import CV_1143_5_Admiral_Kuznetsov, Bulk_cargo_ship_Yakushev, Dry_cargo_ship_Ivanov, Tanker_Elnya_160
+from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry, Artillery
+
+Russia_1965 = {
+    "country": "Russia",
+    "side": "red",
+    "units": [
+        MiG_15bis,
+        MiG_19P,
+        MiG_21Bis,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        A_50,
+
+        Mi_8MT,
+
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.SAM_SA_2_LN_SM_90,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+
+        Armor.ARV_BRDM_2,
+        Armor.APC_BTR_80,
+        Armor.ARV_BTR_RD,
+        Armor.IFV_BMD_1,
+        Armor.IFV_BMP_1,
+        Armor.MBT_T_55,
+        Artillery.MLRS_BM_21_Grad,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
+
+    ],
+    "shorad":[
+        AirDefence.AAA_ZU_23_Closed
+    ], "boat": [
+        "GrishaGroupGenerator"
+    ]
+}

game/factions/russia_1975.py

@@ -0,0 +1,71 @@
+from dcs.helicopters import Mi_8MT, Mi_24V
+from dcs.planes import MiG_21Bis, MiG_23MLD, MiG_25PD, MiG_29A, Su_17M4, Su_24M, Su_25, IL_76MD, IL_78M, An_26B, An_30M, \
+    Yak_40, A_50
+from dcs.ships import *
+from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry, Artillery
+
+Russia_1975 = {
+    "country": "Russia",
+    "side": "red",
+    "units": [
+
+        MiG_21Bis,
+        MiG_23MLD,
+        MiG_25PD,
+        MiG_29A,
+
+        Su_17M4,
+        Su_24M,
+        Su_25,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        A_50,
+
+        Mi_8MT,
+        Mi_24V,
+
+        AirDefence.AAA_ZU_23_Closed,
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+
+        Armor.ARV_BRDM_2,
+        Armor.APC_BTR_80,
+        Armor.IFV_BMD_1,
+        Armor.IFV_BMP_1,
+        Armor.MBT_T_55,
+
+        Artillery.SPH_2S9_Nona,
+        Artillery.SPH_2S1_Gvozdika,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
+
+    ],
+    "shorad": [
+        AirDefence.AAA_ZU_23_Emplacement,
+        AirDefence.SPAAA_ZSU_23_4_Shilka
+    ], "aircraft_carrier": [
+        CV_1143_5_Admiral_Kuznetsov,
+    ], "destroyer": [
+        FF_1135M_Rezky,
+    ], "cruiser": [
+        CGN_1144_2_Pyotr_Velikiy,
+    ], "boat": [
+        "RussianNavyGroupGenerator", "KiloSubGroupGenerator", "MolniyaGroupGenerator"
+    ]
+}

game/factions/russia_1990.py

@@ -0,0 +1,74 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Russia_1990 = {
+    "country": "Russia",
+    "side": "red",
+    "units": [
+
+        MiG_23MLD,
+        MiG_25PD,
+        MiG_29A,
+        MiG_29S,
+        MiG_31,
+        Su_27,
+
+        Su_24M,
+        Su_25,
+        Ka_50,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        A_50,
+
+        Mi_8MT,
+        Mi_24V,
+
+        AirDefence.AAA_ZU_23_Closed,
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+
+        Armor.ARV_BRDM_2,
+        Armor.APC_BTR_80,
+        Armor.IFV_BMD_1,
+        Armor.IFV_BMP_1,
+        Armor.MBT_T_55,
+        Artillery.MLRS_9K57_Uragan_BM_27,
+        Artillery.SPH_2S19_Msta,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
+    ],
+    "shorad":[
+        AirDefence.SAM_SA_9_Strela_1_9P31,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3,
+        AirDefence.SPAAA_ZSU_23_4_Shilka
+    ], "carrier_names": [
+        "Admiral Kuznetov",
+        "Admiral Gorshkov"
+    ], "aircraft_carrier": [
+        CV_1143_5_Admiral_Kuznetsov,
+    ], "destroyer": [
+        FF_1135M_Rezky,
+    ], "cruiser": [
+        FSG_1241_1MP_Molniya,
+    ], "boat":[
+        "RussianNavyGroupGenerator", "KiloSubGroupGenerator"
+    ]
+}

game/factions/russia_2010.py

@@ -0,0 +1,77 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Russia_2010 = {
+    "country": "Russia",
+    "side": "red",
+    "units": [
+
+        Su_27,
+        Su_30,
+        Su_33,
+        MiG_29S,
+        MiG_31,
+
+        Su_25,
+        Su_25T,
+        Su_34,
+        Su_24M,
+        L_39ZA,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+        A_50,
+
+        Ka_50,
+        Mi_8MT,
+        Mi_24V,
+        Mi_28N,
+
+        AirDefence.SAM_SA_19_Tunguska_2S6,
+        AirDefence.SAM_SA_11_Buk_LN_9A310M1,
+        AirDefence.SAM_SA_10_S_300PS_LN_5P85C,
+
+        Armor.APC_BTR_80,
+        Armor.MBT_T_90,
+        Armor.MBT_T_80U,
+        Armor.MBT_T_72B,
+        Armor.IFV_BMP_1,
+        Armor.IFV_BMP_2,
+        Armor.IFV_BMP_3,
+
+        Artillery.MLRS_9K57_Uragan_BM_27,
+        Artillery.SPH_2S19_Msta,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
+    ],
+    "shorad":[
+        AirDefence.SAM_SA_19_Tunguska_2S6,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3
+    ], "aircraft_carrier": [
+        CV_1143_5_Admiral_Kuznetsov,
+    ], "carrier_names": [
+        "Admiral Kuznetov"
+    ], "destroyer": [
+        FF_1135M_Rezky,
+    ], "cruiser": [
+        FSG_1241_1MP_Molniya,
+    ], "boat": [
+        "RussianNavyGroupGenerator", "KiloSubGroupGenerator"
+    ]
+}

game/factions/spain_1990.py

@@ -0,0 +1,50 @@
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Spain_1990 = {
+    "country": "Spain",
+    "side": "blue",
+    "units": [
+        FA_18C_hornet,
+        AV8BNA,
+        F_5E_3,
+        C_101CC,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        Armor.MBT_M60A3_Patton,
+        Armor.MBT_Leopard_2,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Avenger_M1097,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis, # Standing as Principe de Asturias
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa, # Standing as Juan Carlos
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "Principe de Asturias",
+    ], "lhanames": [
+        "Juan Carlos I",
+    ], "boat":[
+        "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/sweden_1990.py

@@ -0,0 +1,31 @@
+from dcs.vehicles import *
+from dcs.ships import *
+from dcs.planes import *
+from dcs.helicopters import *
+
+Sweden_1990 = {
+    "country": "Sweden",
+    "side": "blue",
+    "units": [
+        AJS37,
+
+        UH_1H,
+
+        AirDefence.SAM_Hawk_PCP,
+
+        Armor.IFV_MCV_80, # Standing  as Strf 90
+        Armor.MBT_Leopard_2,
+        Armor.APC_M1126_Stryker_ICV, # Closest thing available
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+        Infantry.Soldier_AK,
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160,
+    ],
+    "shorad": [
+        AirDefence.SAM_Avenger_M1097
+    ], "has_jtac": True
+}

game/factions/syria.py

@@ -0,0 +1,267 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.vehicles import *
+
+Syria_2011 = {
+    "country": "Syria",
+    "side": "red",
+    "units": [
+
+        MiG_21Bis,
+        MiG_23MLD,
+        MiG_25PD,
+        MiG_29S,
+
+        Su_17M4,
+        Su_24M,
+
+        L_39ZA,
+
+        Mi_24V,
+        Mi_8MT,
+        SA342M,
+        SA342L,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+        A_50,
+
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+        AirDefence.SAM_SA_2_LN_SM_90,
+        AirDefence.SAM_SA_8_Osa_9A33,
+        AirDefence.SAM_SA_11_Buk_LN_9A310M1,
+        AirDefence.SAM_SA_10_S_300PS_LN_5P85C,
+
+        Armor.IFV_BMP_1,
+        Armor.IFV_BMP_2,
+        Armor.APC_BTR_80,
+        Armor.ARV_BRDM_2,
+        Armor.APC_MTLB,
+        Armor.APC_Cobra,
+        Armor.MBT_T_55,
+        Armor.MBT_T_72B,
+        Armor.MBT_T_90,
+        Artillery.MLRS_BM_21_Grad,
+        Artillery.MLRS_9K57_Uragan_BM_27,
+        Artillery.SPH_2S1_Gvozdika,
+        Artillery.SPH_2S9_Nona,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        Infantry.Paratrooper_RPG_16,
+        Infantry.Soldier_AK
+
+    ],
+    "shorad": [
+        AirDefence.SAM_SA_8_Osa_9A33,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3,
+        AirDefence.SAM_SA_9_Strela_1_9P31,
+        AirDefence.SAM_SA_19_Tunguska_2S6,
+        AirDefence.AAA_ZU_23_on_Ural_375,
+    ], "boat": [
+        "GrishaGroupGenerator", "MolniyaGroupGenerator"
+    ]
+}
+
+Syria_1973 = {
+    "country": "Syria",
+    "side": "red",
+    "units": [
+
+        MiG_21Bis,
+        MiG_19P,
+        MiG_15bis,  # Standing as Mig-17
+
+        Su_17M4,  # Standing as Su-7
+        Mi_8MT,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+        AirDefence.SAM_SA_2_LN_SM_90,
+
+        Armor.IFV_BMP_1,
+        Armor.APC_MTLB,
+        Armor.MBT_T_55,
+        Artillery.MLRS_BM_21_Grad,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        Infantry.Paratrooper_RPG_16,
+        Infantry.Soldier_AK
+
+    ],
+    "shorad": [
+        AirDefence.AAA_ZU_23_on_Ural_375,
+    ], "boat": [
+        "GrishaGroupGenerator"
+    ]
+}
+
+
+Syria_1982 = {
+    "country": "Syria",
+    "side": "red",
+    "units": [
+
+        MiG_21Bis,
+        MiG_23MLD,
+        MiG_25PD,
+        MiG_19P,
+
+        Su_17M4,  # Standing as Su-7
+        Mi_8MT,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        AirDefence.SAM_SA_6_Kub_LN_2P25,
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+        AirDefence.SAM_SA_2_LN_SM_90,
+
+        Armor.IFV_BMP_1,
+        Armor.APC_MTLB,
+        Armor.MBT_T_55,
+        Armor.MBT_T_72B,
+        Artillery.MLRS_BM_21_Grad,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        Infantry.Paratrooper_RPG_16,
+        Infantry.Soldier_AK
+
+    ],
+    "shorad": [
+        AirDefence.AAA_ZU_23_on_Ural_375,
+    ], "boat": [
+        "GrishaGroupGenerator"
+    ]
+}
+
+
+Syria_1967 = {
+    "country": "Syria",
+    "side": "red",
+    "units": [
+
+        MiG_21Bis,
+        MiG_19P,
+        MiG_15bis,  # Standing as Mig-17
+
+        Su_17M4,  # Standing as Su-7
+        Mi_8MT,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        AirDefence.SAM_SA_2_LN_SM_90,
+
+        Armor.ARV_BRDM_2,
+        Armor.MBT_T_55,
+        Artillery.MLRS_BM_21_Grad,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        Infantry.Paratrooper_RPG_16,
+        Infantry.Soldier_AK
+
+    ],
+    "shorad": [
+        AirDefence.AAA_ZU_23_on_Ural_375,
+    ], "boat": [
+        "GrishaGroupGenerator"
+    ]
+}
+
+Syria_1967_WW2_Weapons = {
+    "country": "Syria",
+    "side": "red",
+    "units": [
+
+        MiG_21Bis,
+        MiG_19P,
+        MiG_15bis,  # Standing as Mig-17
+
+        Su_17M4,  # Standing as Su-7
+        Mi_8MT,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+
+        AirDefence.SAM_SA_2_LN_SM_90,
+
+        Armor.ARV_BRDM_2,
+        Armor.MBT_T_55,
+        Armor.MT_Pz_Kpfw_IV_Ausf_H,
+        Armor.StuG_III_Ausf__G,
+        Armor.TD_Jagdpanzer_IV,
+        Artillery.MLRS_BM_21_Grad,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        Infantry.Soldier_RPG,
+        Infantry.Soldier_AK
+
+    ], "requirements": {
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    },
+    "shorad": [
+        AirDefence.AAA_ZU_23_on_Ural_375,
+    ], "boat": [
+        "GrishaGroupGenerator"
+    ]
+}
+
+Arab_Armies_1948 = {
+    "country": "Syria",
+    "side": "red",
+    "units": [
+        SpitfireLFMkIX,
+        SpitfireLFMkIXCW,
+
+        AirDefence.SAM_SA_2_LN_SM_90,
+
+        Armor.MT_M4_Sherman,
+        Armor.MT_Pz_Kpfw_IV_Ausf_H,
+        Armor.APC_Sd_Kfz_251,
+        Armor.IFV_Sd_Kfz_234_2_Puma,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+
+        Infantry.Infantry_SMLE_No_4_Mk_1,
+
+        AirDefence.AAA_8_8cm_Flak_36,
+
+    ], "requirements": {
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    },
+    "shorad": [
+        AirDefence.AAA_8_8cm_Flak_36,
+    ], "boat": [
+        "GrishaGroupGenerator"
+    ]
+}

game/factions/turkey_2005.py

@@ -0,0 +1,41 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Turkey_2005 = {
+    "country": "Turkey",
+    "side": "blue",
+    "units":[
+        F_16C_50,
+        F_4E,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        AH_1W,
+
+        Armor.MBT_Leopard_2,
+        Armor.MBT_Leopard_1A3,
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_Cobra,
+        Armor.APC_BTR_80,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.SAM_Avenger_M1097,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad":[
+        AirDefence.AAA_ZU_23_Emplacement,
+        AirDefence.SPAAA_ZSU_23_4_Shilka
+    ], "boat":[
+        "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/uae_2005.py

@@ -0,0 +1,38 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+UAE_2005 = {
+    "country": "United Arab Emirates",
+    "side": "blue",
+    "units":[
+        M_2000C,
+        Mirage_2000_5,
+        F_16C_50,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        AH_64D,
+
+        Armor.MBT_Leclerc,
+        Armor.IFV_BMP_3,
+        Armor.TPz_Fuchs,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.Rapier_FSA_Launcher,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "boat":[
+        "OliverHazardPerryGroupGenerator"
+    ],
+    "has_jtac": True,
+    "jtac_unit": WingLoong_I
+}

game/factions/uk_1944.py

@@ -0,0 +1,44 @@
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+from game.data.building_data import WW2_ALLIES_BUILDINGS
+from game.data.doctrine import WWII_DOCTRINE
+
+UK_1944 = {
+    "country": "UK",
+    "side": "blue",
+    "units": [
+        P_51D,
+        P_51D_30_NA,
+        P_47D_30,
+        SpitfireLFMkIX,
+        SpitfireLFMkIXCW,
+        A_20G,
+        B_17G,
+
+        Armor.MT_M4A4_Sherman_Firefly,
+        Armor.MT_M4_Sherman,
+        Armor.APC_M2A1,
+        Armor.CT_Cromwell_IV,
+        Armor.ST_Centaur_IV,
+        Armor.HIT_Churchill_VII,
+
+        Infantry.Infantry_SMLE_No_4_Mk_1,
+
+        LS_Samuel_Chase,
+        LST_Mk_II,
+        LCVP__Higgins_boat,
+
+        Unarmed.CCKW_353,
+        AirDefence.AAA_Bofors_40mm,
+    ], "shorad":[
+        AirDefence.AAA_Bofors_40mm,
+    ],"requirements":{
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    },
+    "objects": WW2_ALLIES_BUILDINGS,
+    "doctrine": WWII_DOCTRINE,
+    "boat": ["WW2LSTGroupGenerator"],
+    "boat_count": 1
+}

game/factions/uk_1990.py

@@ -0,0 +1,52 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+UnitedKingdom_1990 = {
+    "country": "UK",
+    "side": "blue",
+    "units":[
+        AV8BNA, # Standing as BAE Harrier 2
+        Tornado_GR4,
+        F_4E,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        SA342M,
+        AH_64A,
+
+        Armor.MBT_Challenger_II,
+        Armor.IFV_MCV_80,
+        Armor.APC_M1043_HMMWV_Armament,
+        Armor.ATGM_M1045_HMMWV_TOW,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.Rapier_FSA_Launcher,
+        AirDefence.SAM_Avenger_M1097, # Standing as Starstreak
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "lhanames": [
+        "HMS Invincible",
+        "HMS Illustrious",
+        "HMS Ark Royal",
+    ], "boat":[
+        "ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/ukraine_2010.py

@@ -0,0 +1,53 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+Ukraine_2010 = {
+    "country": "Ukraine",
+    "side": "blue",
+    "units": [
+        Su_25,
+        Su_25T,
+        Su_24M,
+        Su_27,
+        MiG_29S,
+        L_39ZA,
+
+        IL_76MD,
+        IL_78M,
+        An_26B,
+        An_30M,
+        Yak_40,
+        A_50,
+
+        Mi_8MT,
+        Mi_24V,
+
+        AirDefence.SAM_SA_3_S_125_LN_5P73,
+        AirDefence.SAM_SA_11_Buk_LN_9A310M1,
+        AirDefence.SAM_SA_10_S_300PS_LN_5P85C,
+
+        Armor.APC_M1043_HMMWV_Armament,
+        Armor.IFV_BMP_3,
+        Armor.IFV_BMP_2,
+        Armor.APC_BTR_80,
+        Armor.MBT_T_80U,
+        Armor.MBT_T_72B,
+
+        Unarmed.Transport_Ural_375,
+        Unarmed.Transport_UAZ_469,
+        Infantry.Soldier_AK,
+        CV_1143_5_Admiral_Kuznetsov,
+        Bulk_cargo_ship_Yakushev,
+        Dry_cargo_ship_Ivanov,
+        Tanker_Elnya_160,
+    ],
+    "shorad":[
+        AirDefence.SAM_SA_19_Tunguska_2S6,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3,
+        AirDefence.AAA_ZU_23_on_Ural_375
+    ], "boat":[
+        "GrishaGroupGenerator"
+    ]
+}

game/factions/us_aggressors.py

@@ -0,0 +1,72 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+US_Aggressors = {
+    "country": "USAF Aggressors",
+    "side": "red",
+    "units": [
+
+        F_15C,
+        F_5E_3,
+        FA_18C_hornet,
+        F_16C_50,
+        Su_27,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        AH_64D,
+        Ka_50,
+        SA342M,
+        SA342L,
+
+        Armor.MBT_M1A2_Abrams,
+        Armor.MBT_Leopard_2,
+        Armor.ATGM_M1134_Stryker,
+        Armor.IFV_M2A2_Bradley,
+        Armor.APC_M1043_HMMWV_Armament,
+
+        Artillery.MLRS_M270,
+        Artillery.SPH_M109_Paladin,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Patriot_EPP_III,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.SAM_Avenger_M1097,
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+        USS_Arleigh_Burke_IIa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "CVN-71 Theodore Roosevelt",
+        "CVN-72 Abraham Lincoln",
+        "CVN-73 George Washington",
+        "CVN-74 John C. Stennis",
+    ], "lhanames": [
+        "LHA-1 Tarawa",
+        "LHA-2 Saipan",
+        "LHA-3 Belleau Wood",
+        "LHA-4 Nassau",
+        "LHA-5 Peleliu"
+    ], "boat":[
+        "ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator"
+    ]
+}

game/factions/usa_1944.py

@@ -0,0 +1,86 @@
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+from game.data.building_data import WW2_ALLIES_BUILDINGS
+from game.data.doctrine import WWII_DOCTRINE
+
+USA_1944 = {
+    "country": "USA",
+    "side": "blue",
+    "units": [
+        P_51D,
+        P_51D_30_NA,
+        P_47D_30,
+        A_20G,
+        B_17G,
+
+        Armor.MT_M4_Sherman,
+        Armor.M30_Cargo_Carrier,
+        Armor.APC_M2A1,
+        Armor.LAC_M8_Greyhound,
+        Armor.TD_M10_GMC,
+        Artillery.M12_GMC,
+
+        Infantry.Infantry_M1_Garand,
+
+        LS_Samuel_Chase,
+        LST_Mk_II,
+        LCVP__Higgins_boat,
+
+        Unarmed.CCKW_353,
+        AirDefence.AAA_Bofors_40mm,
+    ], "shorad":[
+        AirDefence.AAA_Bofors_40mm,
+    ],"requirements":{
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    },
+    "objects": WW2_ALLIES_BUILDINGS,
+    "doctrine": WWII_DOCTRINE,
+    "boat": ["WW2LSTGroupGenerator"],
+    "boat_count": 2
+}
+
+ALLIES_1944 = {
+    "country": "USA",
+    "side": "blue",
+    "units": [
+        P_51D,
+        P_51D_30_NA,
+        P_47D_30,
+        SpitfireLFMkIX,
+        SpitfireLFMkIXCW,
+        A_20G,
+        B_17G,
+
+        Armor.MT_M4_Sherman,
+        Armor.MT_M4A4_Sherman_Firefly,
+        Armor.CT_Cromwell_IV,
+        Armor.M30_Cargo_Carrier,
+        Armor.APC_M2A1,
+        Armor.CT_Cromwell_IV,
+        Armor.ST_Centaur_IV,
+        Armor.HIT_Churchill_VII,
+        Armor.LAC_M8_Greyhound,
+        Armor.TD_M10_GMC,
+        Artillery.M12_GMC,
+
+        Infantry.Infantry_M1_Garand,
+        Infantry.Infantry_SMLE_No_4_Mk_1,
+
+        LS_Samuel_Chase,
+        LST_Mk_II,
+        LCVP__Higgins_boat,
+
+        Unarmed.CCKW_353,
+        AirDefence.AAA_Bofors_40mm,
+    ], "shorad":[
+        AirDefence.AAA_Bofors_40mm,
+    ],"requirements":{
+        "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/",
+    },
+    "objects": WW2_ALLIES_BUILDINGS,
+    "doctrine": WWII_DOCTRINE,
+    "boat": ["WW2LSTGroupGenerator"],
+    "boat_count": 2
+}

game/factions/usa_1955.py

@@ -0,0 +1,33 @@
+from dcs.vehicles import *
+from dcs.ships import *
+from dcs.planes import *
+from dcs.helicopters import *
+
+USA_1955 = {
+    "country": "USA",
+    "side": "blue",
+    "units": [
+        F_86F_Sabre,
+        P_51D,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        Armor.MT_M4A4_Sherman_Firefly,
+        Armor.MT_M4_Sherman,
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_M2A1,
+        Armor.M30_Cargo_Carrier,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+
+        AirDefence.AAA_Bofors_40mm,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ]
+}

game/factions/usa_1960.py

@@ -0,0 +1,36 @@
+from dcs.vehicles import *
+from dcs.ships import *
+from dcs.planes import *
+from dcs.helicopters import *
+
+USA_1960 = {
+    "country": "USA",
+    "side": "blue",
+    "units": [
+        F_86F_Sabre,
+        P_51D,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_M113,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.AAA_Vulcan_M163,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.AAA_Vulcan_M163
+    ]
+}

game/factions/usa_1965.py

@@ -0,0 +1,41 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+USA_1965 = {
+    "country": "USA",
+    "side": "blue",
+    "units": [
+
+        F_5E_3,
+        F_4E,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        B_52H,
+
+        UH_1H,
+
+        Armor.MBT_M60A3_Patton,
+        Armor.APC_M113,
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Chaparral_M48,
+        AirDefence.SAM_Hawk_PCP,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.AAA_Vulcan_M163,
+        AirDefence.SAM_Chaparral_M48
+    ], "boat":[
+    ]
+}

game/factions/usa_1990.py

@@ -0,0 +1,65 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+USA_1990 = {
+    "country": "USA",
+    "side": "blue",
+    "units": [
+        F_15C,
+        F_15E,
+        F_14B,
+        FA_18C_hornet,
+        F_16C_50,
+
+        A_10A,
+        AV8BNA,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        AH_64A,
+
+        Armor.MBT_M1A2_Abrams,
+        Armor.IFV_LAV_25,
+        Armor.APC_M1043_HMMWV_Armament,
+        Armor.ATGM_M1045_HMMWV_TOW,
+        Armor.ATGM_M1134_Stryker,
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "destroyer": [
+        Oliver_Hazzard_Perry_class,
+        USS_Arleigh_Burke_IIa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "CVN-72 Abraham Lincoln",
+        "CVN-73 Georges Washington",
+        "CVN-74 John C. Stennis",
+    ], "lhanames": [
+        "LHA-1 Tarawa",
+        "LHA-2 Saipan",
+        "LHA-3 Belleau Wood",
+        "LHA-4 Nassau",
+        "LHA-5 Peleliu"
+    ], "boat":[
+        "ArleighBurkeGroupGenerator", "OliverHazardPerryGroupGenerator"
+    ], "has_jtac": True
+}

game/factions/usa_2005.py

@@ -0,0 +1,73 @@
+from dcs.helicopters import *
+from dcs.planes import *
+from dcs.ships import *
+from dcs.vehicles import *
+
+USA_2005 = {
+    "country": "USA",
+    "side": "blue",
+    "units": [
+        F_15C,
+        F_15E,
+        F_14B,
+        FA_18C_hornet,
+        F_16C_50,
+        A_10C,
+        A_10C_2,
+        AV8BNA,
+        MQ_9_Reaper,
+
+        KC_135,
+        KC130,
+        C_130,
+        E_3A,
+
+        UH_1H,
+        AH_64D,
+
+        Armor.MBT_M1A2_Abrams,
+        Armor.ATGM_M1134_Stryker,
+        Armor.APC_M1126_Stryker_ICV,
+        Armor.IFV_M2A2_Bradley,
+        Armor.IFV_LAV_25,
+        Armor.APC_M1043_HMMWV_Armament,
+        Armor.ATGM_M1045_HMMWV_TOW,
+
+        Artillery.MLRS_M270,
+        Artillery.SPH_M109_Paladin,
+
+        Unarmed.Transport_M818,
+        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,
+
+        AirDefence.SAM_Hawk_PCP,
+        AirDefence.SAM_Patriot_EPP_III,
+
+        CVN_74_John_C__Stennis,
+        LHA_1_Tarawa,
+        Armed_speedboat,
+    ], "shorad": [
+        AirDefence.SAM_Avenger_M1097,
+    ], "aircraft_carrier": [
+        CVN_74_John_C__Stennis,
+    ], "helicopter_carrier": [
+        LHA_1_Tarawa,
+    ], "destroyer": [
+        USS_Arleigh_Burke_IIa,
+    ], "cruiser": [
+        Ticonderoga_class,
+    ], "carrier_names": [
+        "CVN-71 Theodore Roosevelt",
+        "CVN-72 Abraham Lincoln",
+        "CVN-73 George Washington",
+        "CVN-74 John C. Stennis",
+    ], "lhanames": [
+        "LHA-1 Tarawa",
+        "LHA-2 Saipan",
+        "LHA-3 Belleau Wood",
+        "LHA-4 Nassau",
+        "LHA-5 Peleliu"
+    ], "boat":[
+        "ArleighBurkeGroupGenerator"
+    ], "has_jtac": True
+}

game/game.py

@@ -1,41 +1,11 @@
-import itertools
-import logging
-import random
-import sys
-from datetime import date, datetime, timedelta
-from enum import Enum
-from typing import Any, Dict, List
+from datetime import datetime, timedelta
 
-from dcs.action import Coalition
-from dcs.mapping import Point
-from dcs.task import CAP, CAS, PinpointStrike
-from dcs.vehicles import AirDefence
-
-from game import db
-from game.inventory import GlobalAircraftInventory
+from game.db import REWARDS, PLAYER_BUDGET_BASE, sys
 from game.models.game_stats import GameStats
-from game.plugins import LuaPluginManager
-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.flights.ai_flight_planner import FlightPlanner
 from gen.ground_forces.ai_ground_planner import GroundPlanner
-from . import persistency
-from .debriefing import Debriefing
-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 .procurement import ProcurementAi
+from .event import *
 from .settings import Settings
-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
 
 COMMISION_UNIT_VARIETY = 4
 COMMISION_LIMITS_SCALE = 1.5
@@ -67,94 +37,49 @@ ENEMY_BASE_STRENGTH_RECOVERY = 0.05
 # cost of AWACS for single operation
 AWACS_BUDGET_COST = 4
 
+# Initial budget value
+PLAYER_BUDGET_INITIAL = 650
+
 # Bonus multiplier logarithm base
 PLAYER_BUDGET_IMPORTANCE_LOG = 2
 
 
-class TurnState(Enum):
-    WIN = 0
-    LOSS = 1
-    CONTINUE = 2
-
-
 class Game:
-    def __init__(
-        self,
-        player_name: str,
-        enemy_name: str,
-        theater: ConflictTheater,
-        start_date: datetime,
-        settings: Settings,
-        player_budget: float,
-        enemy_budget: float,
-    ) -> None:
+    settings = None  # type: Settings
+    budget = PLAYER_BUDGET_INITIAL
+    events = None  # type: typing.List[Event]
+    pending_transfers = None  # type: typing.Dict[]
+    ignored_cps = None  # type: typing.Collection[ControlPoint]
+    turn = 0
+    game_stats: GameStats = None
+
+    current_unit_id = 0
+    current_group_id = 0
+
+    def __init__(self, player_name: str, enemy_name: str, theater: ConflictTheater, start_date: datetime, settings):
         self.settings = settings
-        self.events: List[Event] = []
+        self.events = []
         self.theater = theater
         self.player_name = player_name
-        self.player_country = db.FACTIONS[player_name].country
+        self.player_country = db.FACTIONS[player_name]["country"]
         self.enemy_name = enemy_name
-        self.enemy_country = db.FACTIONS[enemy_name].country
+        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.date = datetime(start_date.year, start_date.month, start_date.day)
         self.game_stats = GameStats()
         self.game_stats.update(self)
-        self.ground_planners: Dict[int, GroundPlanner] = {}
+        self.planners = {}
+        self.ground_planners = {}
         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] = []
-        # 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.__culling_points = self.compute_conflicts_position()
+        self.__frontlineData = []
+        self.__destroyed_units = []
+        self.jtacs = []
         self.savepath = ""
-        self.budget = player_budget
-        self.enemy_budget = enemy_budget
-        self.current_unit_id = 0
-        self.current_group_id = 0
-
-        self.conditions = self.generate_conditions()
-
-        self.blue_ato = AirTaskingOrder()
-        self.red_ato = AirTaskingOrder()
-
-        self.aircraft_inventory = GlobalAircraftInventory(self.theater.controlpoints)
 
         self.sanitize_sides()
 
-        self.on_load()
-
-        # 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()
-
-    def generate_conditions(self) -> Conditions:
-        return Conditions.generate(
-            self.theater, self.current_day, self.current_turn_time_of_day, self.settings
-        )
 
     def sanitize_sides(self):
         """
@@ -170,18 +95,13 @@ class Game:
                 self.enemy_country = "Russia"
 
     @property
-    def player_faction(self) -> Faction:
+    def player_faction(self):
         return db.FACTIONS[self.player_name]
 
     @property
-    def enemy_faction(self) -> Faction:
+    def enemy_faction(self):
         return db.FACTIONS[self.enemy_name]
 
-    def faction_for(self, player: bool) -> Faction:
-        if player:
-            return self.player_faction
-        return self.enemy_faction
-
     def _roll(self, prob, mult):
         if self.settings.version == "dev":
             # always generate all events for dev
@@ -190,48 +110,78 @@ class Game:
             return random.randint(1, 100) <= prob * mult
 
     def _generate_player_event(self, event_class, player_cp, enemy_cp):
-        self.events.append(
-            event_class(
-                self,
-                player_cp,
-                enemy_cp,
-                enemy_cp.position,
-                self.player_name,
-                self.enemy_name,
-            )
-        )
+        self.events.append(event_class(self, player_cp, enemy_cp, enemy_cp.position, self.player_name, self.enemy_name))
 
     def _generate_events(self):
-        for front_line in self.theater.conflicts(True):
-            self._generate_player_event(
-                FrontlineAttackEvent,
-                front_line.control_point_a,
-                front_line.control_point_b,
-            )
+        for player_cp, enemy_cp in self.theater.conflicts(True):
+            self._generate_player_event(FrontlineAttackEvent, player_cp, enemy_cp)
 
-    def adjust_budget(self, amount: float, player: bool) -> None:
-        if player:
-            self.budget += amount
+    def commision_unit_types(self, cp: ControlPoint, for_task: Task) -> typing.Collection[UnitType]:
+        importance_factor = (cp.importance - IMPORTANCE_LOW) / (IMPORTANCE_HIGH - IMPORTANCE_LOW)
+
+        if for_task == AirDefence and not self.settings.sams:
+            return [x for x in db.find_unittype(AirDefence, self.enemy_name) if x not in db.SAM_BAN]
         else:
-            self.enemy_budget += amount
+            return db.choose_units(for_task, importance_factor, COMMISION_UNIT_VARIETY, self.enemy_name)
 
-    def process_player_income(self):
-        self.budget += Income(self, player=True).total
+    def _commision_units(self, cp: ControlPoint):
+        for for_task in [CAS, CAP, AirDefence]:
+            limit = COMMISION_LIMITS_FACTORS[for_task] * math.pow(cp.importance,
+                                                                  COMMISION_LIMITS_SCALE) * self.settings.multiplier
+            missing_units = limit - cp.base.total_units(for_task)
+            if missing_units > 0:
+                awarded_points = COMMISION_AMOUNTS_FACTORS[for_task] * math.pow(cp.importance,
+                                                                                COMMISION_AMOUNTS_SCALE) * self.settings.multiplier
+                points_to_spend = cp.base.append_commision_points(for_task, awarded_points)
+                if points_to_spend > 0:
+                    unittypes = self.commision_unit_types(cp, for_task)
+                    if len(unittypes) > 0:
+                        d = {random.choice(unittypes): points_to_spend}
+                        logging.info("Commision {}: {}".format(cp, d))
+                        cp.base.commision_units(d)
 
-    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
+    @property
+    def budget_reward_amount(self):
+        reward = 0
+        if len(self.theater.player_points()) > 0:
+            reward = PLAYER_BUDGET_BASE * len(self.theater.player_points())
+            for cp in self.theater.player_points():
+                for g in cp.ground_objects:
+                    if g.category in REWARDS.keys():
+                        reward = reward + REWARDS[g.category]
+            return reward
+        else:
+            return reward
 
-    def initiate_event(self, event: Event) -> UnitMap:
-        # assert event in self.events
+    def _budget_player(self):
+        self.budget += self.budget_reward_amount
+
+    def awacs_expense_commit(self):
+        self.budget -= AWACS_BUDGET_COST
+
+    def units_delivery_event(self, to_cp: ControlPoint) -> UnitsDeliveryEvent:
+        event = UnitsDeliveryEvent(attacker_name=self.player_name,
+                                   defender_name=self.player_name,
+                                   from_cp=to_cp,
+                                   to_cp=to_cp,
+                                   game=self)
+        self.events.append(event)
+        return event
+
+    def units_delivery_remove(self, event: Event):
+        if event in self.events:
+            self.events.remove(event)
+
+    def initiate_event(self, event: Event):
+        #assert event in self.events
         logging.info("Generating {} (regular)".format(event))
-        return event.generate()
+        event.generate()
 
     def finish_event(self, event: Event, debriefing: Debriefing):
         logging.info("Finishing event {}".format(event))
         event.commit(debriefing)
+        if event.is_successfull(debriefing):
+            self.budget += event.bonus()
 
         if event in self.events:
             self.events.remove(event)
@@ -240,33 +190,26 @@ class Game:
 
     def is_player_attack(self, event):
         if isinstance(event, Event):
-            return (
-                event
-                and event.attacker_name
-                and event.attacker_name == self.player_name
-            )
+            return event and event.attacker_name and event.attacker_name == self.player_name
         else:
-            raise RuntimeError(f"{event} was passed when an Event type was expected")
+            return event and event.name and event.name == self.player_name
 
-    def on_load(self) -> None:
-        LuaPluginManager.load_settings(self.settings)
-        ObjectiveDistanceCache.set_theater(self.theater)
-        self.compute_conflicts_position()
-        self.compute_threat_zones()
+    def pass_turn(self, no_action=False, ignored_cps: typing.Collection[ControlPoint] = None):
 
-    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
+        self.informations.append(Information("End of turn #" + str(self.turn), "-" * 40, 0))
+        self.turn = self.turn + 1
 
-        for control_point in self.theater.controlpoints:
-            control_point.process_turn(self)
+        for event in self.events:
+            if self.settings.version == "dev":
+                # don't damage player CPs in by skipping in dev mode
+                if isinstance(event, UnitsDeliveryEvent):
+                    event.skip()
+            else:
+                event.skip()
 
-        self.process_enemy_income()
-
-        self.process_player_income()
+        self._enemy_reinforcement()
+        self._budget_player()
 
         if not no_action and self.turn > 1:
             for cp in self.theater.player_points():
@@ -276,105 +219,111 @@ class Game:
                 if not cp.is_carrier and not cp.is_lha:
                     cp.base.affect_strength(-PLAYER_BASE_STRENGTH_RECOVERY)
 
-        self.conditions = self.generate_conditions()
+        self.ignored_cps = []
+        if ignored_cps:
+            self.ignored_cps = ignored_cps
 
-        self.initialize_turn()
-
-        # Autosave progress
-        persistency.autosave(self)
-
-    def check_win_loss(self):
-        player_airbases = {
-            cp for cp in self.theater.player_points() if cp.runway_is_operational()
-        }
-        if not player_airbases:
-            return TurnState.LOSS
-
-        enemy_airbases = {
-            cp for cp in self.theater.enemy_points() if cp.runway_is_operational()
-        }
-        if not enemy_airbases:
-            return TurnState.WIN
-
-        return TurnState.CONTINUE
-
-    def initialize_turn(self) -> None:
-        self.events = []
+        self.events = []  # type: typing.List[Event]
         self._generate_events()
 
         # 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
-        self.compute_conflicts_position()
-        self.compute_threat_zones()
+        self.__culling_points = self.compute_conflicts_position()
+        self.planners = {}
         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_runway():
+                planner = FlightPlanner(cp, self)
+                planner.plan_flights()
+                self.planners[cp.id] = planner
+
             if cp.has_frontline:
                 gplanner = GroundPlanner(cp, self)
                 gplanner.plan_groundwar()
                 self.ground_planners[cp.id] = gplanner
 
-        self.plan_procurement(blue_planner, red_planner)
+        # Autosave progress
+        persistency.autosave(self)
 
-    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)
+    def _enemy_reinforcement(self):
+        """
+        Compute and commision reinforcement for enemy bases
+        """
 
-        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)
+        MAX_ARMOR = 30 * self.settings.multiplier
+        MAX_AIRCRAFT = 25 * self.settings.multiplier
 
-    def message(self, text: str) -> None:
-        self.informations.append(Information(text, turn=self.turn))
+        production = 0.0
+        for enemy_point in self.theater.enemy_points():
+            for g in enemy_point.ground_objects:
+                if g.category in REWARDS.keys():
+                    production = production + REWARDS[g.category]
+
+        production = production * 0.75
+        budget_for_armored_units = production / 2
+        budget_for_aircraft = production / 2
+
+        potential_cp_armor = []
+        for cp in self.theater.enemy_points():
+            for cpe in cp.connected_points:
+                if cpe.captured and cp.base.total_armor < MAX_ARMOR:
+                    potential_cp_armor.append(cp)
+        if len(potential_cp_armor) == 0:
+            potential_cp_armor = self.theater.enemy_points()
+
+        i = 0
+        potential_units = [u for u in db.FACTIONS[self.enemy_name]["units"] if u in db.UNIT_BY_TASK[PinpointStrike]]
+
+        print("Enemy Recruiting")
+        print(potential_cp_armor)
+        print(budget_for_armored_units)
+        print(potential_units)
+
+        if len(potential_units) > 0 and len(potential_cp_armor) > 0:
+            while budget_for_armored_units > 0:
+                i = i + 1
+                if i > 50 or budget_for_armored_units <= 0:
+                    break
+                target_cp = random.choice(potential_cp_armor)
+                if target_cp.base.total_armor >= MAX_ARMOR:
+                    continue
+                unit = random.choice(potential_units)
+                price = db.PRICES[unit] * 2
+                budget_for_armored_units -= price * 2
+                target_cp.base.armor[unit] = target_cp.base.armor.get(unit, 0) + 2
+                info = Information("Enemy Reinforcement", unit.id + " x 2 at " + target_cp.name, self.turn)
+                print(str(info))
+                self.informations.append(info)
+
+        if budget_for_armored_units > 0:
+            budget_for_aircraft += budget_for_armored_units
+
+        potential_units = [u for u in db.FACTIONS[self.enemy_name]["units"] if
+                           u in db.UNIT_BY_TASK[CAS] or u in db.UNIT_BY_TASK[CAP]]
+        if len(potential_units) > 0 and len(potential_cp_armor) > 0:
+            while budget_for_aircraft > 0:
+                i = i + 1
+                if i > 50 or budget_for_aircraft <= 0:
+                    break
+                target_cp = random.choice(potential_cp_armor)
+                if target_cp.base.total_planes >= MAX_AIRCRAFT:
+                    continue
+                unit = random.choice(potential_units)
+                price = db.PRICES[unit] * 2
+                budget_for_aircraft -= price * 2
+                target_cp.base.aircraft[unit] = target_cp.base.aircraft.get(unit, 0) + 2
+                info = Information("Enemy Reinforcement", unit.id + " x 2 at " + target_cp.name, self.turn)
+                print(str(info))
+                self.informations.append(info)
 
     @property
-    def current_turn_time_of_day(self) -> TimeOfDay:
-        return list(TimeOfDay)[self.turn % 4]
+    def current_turn_daytime(self):
+        return ["dawn", "day", "dusk", "night"][self.turn % 4]
 
     @property
-    def current_day(self) -> date:
+    def current_day(self):
         return self.date + timedelta(days=self.turn // 4)
 
     def next_unit_id(self):
@@ -391,56 +340,21 @@ class Game:
         self.current_group_id += 1
         return self.current_group_id
 
-    def compute_threat_zones(self) -> None:
-        self.blue_threat_zone = ThreatZones.for_faction(self, player=True)
-        self.red_threat_zone = ThreatZones.for_faction(self, player=False)
-        self.blue_navmesh = NavMesh.from_threat_zones(
-            self.red_threat_zone, self.theater
-        )
-        self.red_navmesh = NavMesh.from_threat_zones(
-            self.blue_threat_zone, self.theater
-        )
-
-    def threat_zone_for(self, player: bool) -> ThreatZones:
-        if player:
-            return self.blue_threat_zone
-        return self.red_threat_zone
-
-    def navmesh_for(self, player: bool) -> NavMesh:
-        if player:
-            return self.blue_navmesh
-        return self.red_navmesh
-
     def compute_conflicts_position(self):
         """
         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.control_point_a, front_line.control_point_b, self.theater
-            )
-            zones.append(position[0])
-            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:
-                    zones.append(cp.position)
+        for conflict in self.theater.conflicts():
+            points.append(Conflict.frontline_position(self.theater, conflict[0], conflict[1])[0])
+            points.append(conflict[0].position)
+            points.append(conflict[1].position)
 
         # If there is no conflict take the center point between the two nearest opposing bases
-        if len(zones) == 0:
+        if len(points) == 0:
             cpoint = None
             min_distance = sys.maxsize
             for cp in self.theater.player_points():
@@ -448,36 +362,21 @@ class Game:
                     d = cp.position.distance_to_point(cp2.position)
                     if d < min_distance:
                         min_distance = d
-                        cpoint = Point(
-                            (cp.position.x + cp2.position.x) / 2,
-                            (cp.position.y + cp2.position.y) / 2,
-                        )
-                        zones.append(cp.position)
-                        zones.append(cp2.position)
+                        cpoint = Point((cp.position.x + cp2.position.x) / 2, (cp.position.y + cp2.position.y) / 2)
+                        points.append(cp.position)
+                        points.append(cp2.position)
                         break
                 if cpoint is not None:
                     break
             if cpoint is not None:
-                zones.append(cpoint)
-
-        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,
-                # rendering culling fairly useless. BARCAP packages don't really
-                # need the ground detail since they're defensive. SAMs nearby
-                # are only interesting if there are enemies in the area, and if
-                # there are they won't be culled because of the enemy's mission.
-                continue
-            zones.append(package.target.position)
+                points.append(cpoint)
 
         # Else 0,0, since we need a default value
         # (in this case this means the whole map is owned by the same player, so it is not an issue)
-        if len(zones) == 0:
-            zones.append(Point(0, 0))
+        if len(points) == 0:
+            points.append(Point(0, 0))
 
-        self.__culling_zones = zones
-        self.__culling_points = points
+        return points
 
     def add_destroyed_units(self, data):
         pos = Point(data["x"], data["z"])
@@ -496,31 +395,11 @@ class Game:
         if self.settings.perf_culling == False:
             return False
         else:
-            for z in self.__culling_zones:
-                if (
-                    z.distance_to_point(pos)
-                    < self.settings.perf_culling_distance * 1000
-                ):
-                    return False
-            for p in self.__culling_points:
-                if p.distance_to_point(pos) < 2500:
+            for c in self.__culling_points:
+                if c.distance_to_point(pos) < self.settings.perf_culling_distance * 1000:
                     return False
             return True
 
-    def get_culling_zones(self):
-        """
-        Check culling points
-        :return: List of culling zones
-        """
-        return self.__culling_zones
-
-    def get_culling_points(self):
-        """
-        Check culling points
-        :return: List of culling points
-        """
-        return self.__culling_points
-
     # 1 = red, 2 = blue
     def get_player_coalition_id(self):
         return 2
@@ -529,23 +408,13 @@ class Game:
         return 1
 
     def get_player_coalition(self):
-        return Coalition.Blue
+        return dcs.action.Coalition.Blue
 
     def get_enemy_coalition(self):
-        return Coalition.Red
+        return dcs.action.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:
-            return self.message(
-                "Congratulations, you are victorious!  Start a new campaign to continue."
-            )
-        elif turn_state is TurnState.LOSS:
-            return self.message(
-                "Game Over, you lose. Start a new campaign to continue."
-            )
+        return "red"

game/income.py

@@ -1,55 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-from game.db import REWARDS
-
-if TYPE_CHECKING:
-    from game import Game
-
-
-@dataclass(frozen=True)
-class BuildingIncome:
-    name: str
-    category: str
-    number: int
-    income_per_building: int
-
-    @property
-    def income(self) -> int:
-        return self.number * self.income_per_building
-
-
-class Income:
-    def __init__(self, game: Game, player: bool) -> None:
-        if player:
-            self.multiplier = game.settings.player_income_multiplier
-        else:
-            self.multiplier = game.settings.enemy_income_multiplier
-        self.control_points = []
-        self.buildings = []
-
-        names = set()
-        for cp in game.theater.control_points_for(player):
-            if cp.income_per_turn:
-                self.control_points.append(cp)
-            for tgo in cp.ground_objects:
-                names.add(tgo.obj_name)
-
-        for name in names:
-            count = 0
-            tgos = game.theater.find_ground_objects_by_obj_name(name)
-            category = tgos[0].category
-            if category not in REWARDS:
-                continue
-            for tgo in tgos:
-                if not tgo.is_dead:
-                    count += 1
-            self.buildings.append(
-                BuildingIncome(name, category, count, REWARDS[category])
-            )
-
-        self.from_bases = sum(cp.income_per_turn for cp in self.control_points)
-        self.total_buildings = sum(b.income for b in self.buildings)
-        self.total = (self.total_buildings + self.from_bases) * self.multiplier

game/infos/information.py

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

game/inventory.py

@@ -1,130 +0,0 @@
-"""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

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

game/models/frontline_data.py

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

game/models/game_stats.py

@@ -1,6 +1,3 @@
-from typing import List
-
-
 class FactionTurnMetadata:
     """
     Store metadata about a faction
@@ -21,8 +18,8 @@ class GameTurnMetadata:
     Store metadata about a game turn
     """
 
-    allied_units: FactionTurnMetadata
-    enemy_units: FactionTurnMetadata
+    allied_units:FactionTurnMetadata
+    enemy_units:FactionTurnMetadata
 
     def __init__(self):
         self.allied_units = FactionTurnMetadata()
@@ -34,8 +31,10 @@ class GameStats:
     Store statistics for the current game
     """
 
+    data_per_turn: [GameTurnMetadata] = []
+
     def __init__(self):
-        self.data_per_turn: List[GameTurnMetadata] = []
+        self.data_per_turn = []
 
     def update(self, game):
         """
@@ -54,3 +53,4 @@ class GameStats:
                 turn_data.enemy_units.vehicles_count += sum(cp.base.armor.values())
 
         self.data_per_turn.append(turn_data)
+

game/navmesh.py

@@ -1,273 +0,0 @@
-from __future__ import annotations
-
-import heapq
-import math
-from collections import defaultdict
-from dataclasses import dataclass, field
-from typing import Dict, List, Optional, Set, Tuple, Union
-
-from dcs.mapping import Point
-from shapely.geometry import (
-    LineString,
-    MultiPolygon,
-    Point as ShapelyPoint,
-    Polygon,
-    box,
-)
-from shapely.ops import nearest_points, triangulate
-
-from game.theater import ConflictTheater
-from game.threatzones import ThreatZones
-from game.utils import nautical_miles
-
-
-class NavMeshError(RuntimeError):
-    pass
-
-
-class NavMeshPoly:
-    def __init__(self, ident: int, poly: Polygon, threatened: bool) -> None:
-        self.ident = ident
-        self.poly = poly
-        self.threatened = threatened
-        self.neighbors: Dict[NavMeshPoly, Union[LineString, ShapelyPoint]] = {}
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, NavMeshPoly):
-            return False
-        return self.ident == other.ident
-
-    def __hash__(self) -> int:
-        return self.ident
-
-
-@dataclass(frozen=True)
-class NavPoint:
-    point: ShapelyPoint
-    poly: NavMeshPoly
-
-    @property
-    def world_point(self) -> Point:
-        return Point(self.point.x, self.point.y)
-
-    def __hash__(self) -> int:
-        return hash(self.poly.ident)
-
-    def __eq__(self, other: object) -> bool:
-        if id(self) == id(other):
-            return True
-
-        if not isinstance(other, NavPoint):
-            return False
-
-        if not self.point.almost_equals(other.point):
-            return False
-
-        return self.poly == other.poly
-
-    def __str__(self) -> str:
-        return f"{self.point} in {self.poly.ident}"
-
-
-@dataclass(frozen=True, order=True)
-class FrontierNode:
-    cost: float
-    point: NavPoint = field(compare=False)
-
-
-class NavFrontier:
-    def __init__(self) -> None:
-        self.nodes: List[FrontierNode] = []
-
-    def push(self, poly: NavPoint, cost: float) -> None:
-        heapq.heappush(self.nodes, FrontierNode(cost, poly))
-
-    def pop(self) -> Optional[NavPoint]:
-        try:
-            return heapq.heappop(self.nodes).point
-        except IndexError:
-            return None
-
-
-class NavMesh:
-    def __init__(self, polys: List[NavMeshPoly]) -> None:
-        self.polys = polys
-
-    def localize(self, point: Point) -> Optional[NavMeshPoly]:
-        # This is a naive implementation but it's O(n). Runs at about 10k
-        # lookups a second on a 5950X. Flights usually have 5-10 waypoints, so
-        # that's 1k-2k flights before we lose a full second to localization as a
-        # part of flight plan creation.
-        #
-        # Can improve the algorithm later if needed, but that seems unnecessary
-        # currently.
-        p = ShapelyPoint(point.x, point.y)
-        for navpoly in self.polys:
-            if navpoly.poly.contains(p):
-                return navpoly
-        return None
-
-    @staticmethod
-    def travel_cost(a: NavPoint, b: NavPoint) -> float:
-        modifier = 1.0
-        if a.poly.threatened:
-            modifier = 3.0
-        return a.point.distance(b.point) * modifier
-
-    def travel_heuristic(self, a: NavPoint, b: NavPoint) -> float:
-        return self.travel_cost(a, b)
-
-    @staticmethod
-    def reconstruct_path(
-        came_from: Dict[NavPoint, Optional[NavPoint]],
-        origin: NavPoint,
-        destination: NavPoint,
-    ) -> List[Point]:
-        current = destination
-        path: List[Point] = []
-        while current != origin:
-            path.append(current.world_point)
-            previous = came_from[current]
-            if previous is None:
-                raise NavMeshError(
-                    f"Could not reconstruct path to {destination} from {origin}"
-                )
-            current = previous
-        path.append(origin.world_point)
-        path.reverse()
-        return path
-
-    @staticmethod
-    def dcs_to_shapely_point(point: Point) -> ShapelyPoint:
-        return ShapelyPoint(point.x, point.y)
-
-    def shortest_path(self, origin: Point, destination: Point) -> List[Point]:
-        origin_poly = self.localize(origin)
-        if origin_poly is None:
-            raise NavMeshError(f"Origin point {origin} is outside the navmesh")
-        destination_poly = self.localize(destination)
-        if destination_poly is None:
-            raise NavMeshError(
-                f"Destination point {destination} is outside the navmesh"
-            )
-
-        return self._shortest_path(
-            NavPoint(self.dcs_to_shapely_point(origin), origin_poly),
-            NavPoint(self.dcs_to_shapely_point(destination), destination_poly),
-        )
-
-    def _shortest_path(self, origin: NavPoint, destination: NavPoint) -> List[Point]:
-        # Adapted from
-        # https://www.redblobgames.com/pathfinding/a-star/implementation.py.
-        frontier = NavFrontier()
-        frontier.push(origin, 0.0)
-        came_from: Dict[NavPoint, Optional[NavPoint]] = {origin: None}
-
-        best_known: Dict[NavPoint, float] = defaultdict(lambda: math.inf)
-        best_known[origin] = 0.0
-
-        while (current := frontier.pop()) is not None:
-            if current == destination:
-                break
-
-            if current.poly == destination.poly:
-                # Made it to the correct nav poly. Add the leg from the border
-                # to the target.
-                cost = best_known[current] + self.travel_cost(current, destination)
-                if cost < best_known[destination]:
-                    best_known[destination] = cost
-                    estimated = cost
-                    frontier.push(destination, estimated)
-                    came_from[destination] = current
-
-            for neighbor, boundary in current.poly.neighbors.items():
-                previous = came_from[current]
-                if previous is not None and previous.poly == neighbor:
-                    # Don't backtrack.
-                    continue
-                if previous is None and current != origin:
-                    raise RuntimeError
-                _, neighbor_point = nearest_points(current.point, boundary)
-                neighbor_nav = NavPoint(neighbor_point, neighbor)
-                cost = best_known[current] + self.travel_cost(current, neighbor_nav)
-                if cost < best_known[neighbor_nav]:
-                    best_known[neighbor_nav] = cost
-                    estimated = cost + self.travel_heuristic(neighbor_nav, destination)
-                    frontier.push(neighbor_nav, estimated)
-                    came_from[neighbor_nav] = current
-
-        return self.reconstruct_path(came_from, origin, destination)
-
-    @staticmethod
-    def map_bounds(theater: ConflictTheater) -> Polygon:
-        points = []
-        for cp in theater.controlpoints:
-            points.append(ShapelyPoint(cp.position.x, cp.position.y))
-            for tgo in cp.ground_objects:
-                points.append(ShapelyPoint(tgo.position.x, tgo.position.y))
-        # Needs to be a large enough boundary beyond the known points so that
-        # threatened airbases at the map edges have room to retreat from the
-        # threat without running off the navmesh.
-        return box(*LineString(points).bounds).buffer(
-            nautical_miles(200).meters, resolution=1
-        )
-
-    @staticmethod
-    def create_navpolys(
-        polys: List[Polygon], threat_zones: ThreatZones
-    ) -> List[NavMeshPoly]:
-        return [
-            NavMeshPoly(i, p, threat_zones.threatened(p)) for i, p in enumerate(polys)
-        ]
-
-    @staticmethod
-    def associate_neighbors(polys: List[NavMeshPoly]) -> None:
-        # Maps (rounded) points to polygons that have a vertex at that point.
-        # The points are rounded to the nearest int so we can use them as dict
-        # keys. This allows us to perform approximate neighbor lookups more
-        # efficiently than comparing each poly to every other poly by finding
-        # approximate neighbors before checking if the polys actually touch.
-        points_map: Dict[Tuple[int, int], Set[NavMeshPoly]] = defaultdict(set)
-
-        for navpoly in polys:
-            # The coordinates of the polygon's boundary are a sequence of
-            # coordinates that define the polygon. The first point is repeated
-            # at the end, so skip the last vertex.
-            for x, y in navpoly.poly.boundary.coords[:-1]:
-                point = (int(x), int(y))
-                neighbors = {}
-                for potential_neighbor in points_map[point]:
-                    intersection = navpoly.poly.intersection(potential_neighbor.poly)
-                    if not intersection.is_empty:
-                        potential_neighbor.neighbors[navpoly] = intersection
-                        neighbors[potential_neighbor] = intersection
-                navpoly.neighbors.update(neighbors)
-                points_map[point].add(navpoly)
-
-    @classmethod
-    def from_threat_zones(
-        cls, threat_zones: ThreatZones, theater: ConflictTheater
-    ) -> NavMesh:
-        # Simplify the threat poly to reduce the number of nav zones. Increase
-        # the size of the zone and then simplify it with the buffer size as the
-        # error margin. This will create a simpler poly around the threat zone.
-        buffer = nautical_miles(10).meters
-        threat_poly = threat_zones.all.buffer(buffer).simplify(buffer)
-
-        # Threat zones can be disconnected. Create a list of threat zones.
-        if isinstance(threat_poly, MultiPolygon):
-            polys = list(threat_poly.geoms)
-        else:
-            polys = [threat_poly]
-
-        # Subtract the threat zones from the whole-map poly to build a navmesh
-        # for the *safe* areas. Navigation within threatened regions is always
-        # a straight line to the target or out of the threatened region.
-        bounds = cls.map_bounds(theater)
-        for poly in polys:
-            bounds = bounds.difference(poly)
-
-        # Triangulate the safe-region to build the navmesh.
-        navpolys = cls.create_navpolys(triangulate(bounds), threat_zones)
-        cls.associate_neighbors(navpolys)
-        return cls(navpolys)

game/operation/frontlineattack.py

@@ -0,0 +1,39 @@
+from game.db import assigned_units_split
+
+from .operation import *
+
+
+MAX_DISTANCE_BETWEEN_GROUPS = 12000
+
+
+class FrontlineAttackOperation(Operation):
+    interceptors = None  # type: db.AssignedUnitsDict
+    escort = None  # type: db.AssignedUnitsDict
+    strikegroup = None  # type: db.AssignedUnitsDict
+
+    attackers = None  # type: db.ArmorDict
+    defenders = None  # type: db.ArmorDict
+
+    def prepare(self, terrain: Terrain, is_quick: bool):
+        super(FrontlineAttackOperation, self).prepare(terrain, is_quick)
+        if self.defender_name == self.game.player_name:
+            self.attackers_starting_position = None
+            self.defenders_starting_position = None
+
+        conflict = Conflict.frontline_cas_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
+            attacker=self.current_mission.country(self.attacker_country),
+            defender=self.current_mission.country(self.defender_country),
+            from_cp=self.from_cp,
+            to_cp=self.to_cp,
+            theater=self.game.theater
+        )
+
+        self.initialize(mission=self.current_mission,
+                        conflict=conflict)
+
+    def generate(self):
+        self.briefinggen.title = "Frontline CAS"
+        self.briefinggen.description = "Provide CAS for the ground forces attacking enemy lines. Operation will be considered successful if total number of enemy units will be lower than your own by a factor of 1.5 (i.e. with 12 units from both sides, enemy forces need to be reduced to at least 8), meaning that you (and, probably, your wingmans) should concentrate on destroying the enemy units. Target base strength will be lowered as a result. Be advised that your flight will not attack anything until you explicitly tell them so by comms menu."
+        super(FrontlineAttackOperation, self).generate()

game/operation/operation.py

@@ -1,222 +1,372 @@
-from __future__ import annotations
-from game.theater.theatergroundobject import TheaterGroundObject
+from typing import Set
 
-import logging
-import os
-from pathlib import Path
-from typing import TYPE_CHECKING, Iterable, List, Optional, Set
-
-from dcs import Mission
-from dcs.action import DoScript, DoScriptFile
-from dcs.coalition import Coalition
+from gen import *
+from gen.airfields import AIRFIELD_DATA
+from gen.beacons import load_beacons_for_terrain
+from gen.radios import RadioRegistry
+from gen.tacan import TacanRegistry
 from dcs.countries import country_dict
 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 gen import Conflict, FlightType, VisualGenerator
-from gen.aircraft import AIRCRAFT_DATA, AircraftConflictGenerator, FlightData
-from gen.airfields import AIRFIELD_DATA
-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.environmentgen import EnvironmentGenerator
-from gen.forcedoptionsgen import ForcedOptionsGenerator
-from gen.groundobjectsgen import GroundObjectsGenerator
-from gen.kneeboard import KneeboardGenerator
-from gen.naming import namegen
-from gen.radios import RadioFrequency, RadioRegistry
-from gen.tacan import TacanRegistry
-from gen.triggergen import TRIGGER_RADIUS_MEDIUM, TriggersGenerator
-
-from .. import db
-from ..theater import Airfield
-from ..unitmap import UnitMap
-
-if TYPE_CHECKING:
-    from game import Game
+from dcs.terrain.terrain import Terrain
+from userdata.debriefing import *
 
 
 class Operation:
-    """Static class for managing the final Mission generation"""
+    attackers_starting_position = None  # type: db.StartingPosition
+    defenders_starting_position = None  # type: db.StartingPosition
 
-    current_mission = None  # type: Mission
+    current_mission = None  # type: dcs.Mission
+    regular_mission = None  # type: dcs.Mission
+    quick_mission = None  # type: dcs.Mission
+    conflict = None  # type: Conflict
+    armorgen = None  # type: ArmorConflictGenerator
     airgen = None  # type: AircraftConflictGenerator
     triggersgen = None  # type: TriggersGenerator
     airsupportgen = None  # type: AirSupportConflictGenerator
     visualgen = None  # type: VisualGenerator
+    envgen = None  # type: EnvironmentGenerator
     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
-    #  TODO: #436 Generate Air Support for red
-    enemy_awacs_enabled = True
-    ca_slots = 1
-    unit_map: UnitMap
-    jtacs: List[JtacInfo] = []
-    plugin_scripts: List[str] = []
+    is_awacs_enabled = False
+    ca_slots = 0
 
-    @classmethod
-    def prepare(cls, game: Game):
+    def __init__(self,
+                 game,
+                 attacker_name: str,
+                 defender_name: str,
+                 from_cp: ControlPoint,
+                 departure_cp: ControlPoint,
+                 to_cp: ControlPoint = None):
+        self.game = game
+        self.attacker_name = attacker_name
+        self.attacker_country = db.FACTIONS[attacker_name]["country"]
+        self.defender_name = defender_name
+        self.defender_country = db.FACTIONS[defender_name]["country"]
+        print(self.defender_country, self.attacker_country)
+        self.from_cp = from_cp
+        self.departure_cp = departure_cp
+        self.to_cp = to_cp
+        self.is_quick = False
+
+    def units_of(self, country_name: str) -> typing.Collection[UnitType]:
+        return []
+
+    def is_successfull(self, debriefing: Debriefing) -> bool:
+        return True
+
+    @property
+    def is_player_attack(self) -> bool:
+        return self.from_cp.captured
+
+    def initialize(self, mission: Mission, conflict: Conflict):
+        self.current_mission = mission
+        self.conflict = conflict
+        self.briefinggen = BriefingGenerator(self.current_mission,
+                                             self.conflict, self.game)
+
+    def prepare(self, terrain: Terrain, is_quick: bool):
         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,
-            )
+        self.current_mission = dcs.Mission(terrain)
 
-    @classmethod
-    def air_conflict(cls) -> Conflict:
-        assert cls.game
-        player_cp, enemy_cp = cls.game.theater.closest_opposing_control_points()
-        mid_point = player_cp.position.point_from_heading(
-            player_cp.position.heading_between_point(enemy_cp.position),
-            player_cp.position.distance_to_point(enemy_cp.position) / 2,
-        )
-        return Conflict(
-            cls.game.theater,
-            player_cp,
-            enemy_cp,
-            cls.game.player_name,
-            cls.game.enemy_name,
-            cls.game.player_country,
-            cls.game.enemy_country,
-            mid_point,
-        )
+        print(self.game.player_country)
+        print(country_dict[db.country_id_from_name(self.game.player_country)])
+        print(country_dict[db.country_id_from_name(self.game.player_country)]())
 
-    @classmethod
-    def _set_mission(cls, mission: Mission) -> None:
-        cls.current_mission = mission
+        # Setup coalition :
+        self.current_mission.coalition["blue"] = Coalition("blue")
+        self.current_mission.coalition["red"] = Coalition("red")
 
-    @classmethod
-    def _setup_mission_coalitions(cls):
-        cls.current_mission.coalition["blue"] = Coalition("blue")
-        cls.current_mission.coalition["red"] = Coalition("red")
+        p_country = self.game.player_country
+        e_country = self.game.enemy_country
+        self.current_mission.coalition["blue"].add_country(country_dict[db.country_id_from_name(p_country)]())
+        self.current_mission.coalition["red"].add_country(country_dict[db.country_id_from_name(e_country)]())
 
-        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)]()
-        )
-        cls.current_mission.coalition["red"].add_country(
-            country_dict[db.country_id_from_name(e_country)]()
-        )
+        print([c for c in self.current_mission.coalition["blue"].countries.keys()])
+        print([c for c in self.current_mission.coalition["red"].countries.keys()])
 
-    @classmethod
-    def inject_lua_trigger(cls, contents: str, comment: str) -> None:
-        trigger = TriggerStart(comment=comment)
-        trigger.add_action(DoScript(String(contents)))
-        cls.current_mission.triggerrules.triggers.append(trigger)
-
-    @classmethod
-    def bypass_plugin_script(cls, mnemonic: str) -> None:
-        cls.plugin_scripts.append(mnemonic)
-
-    @classmethod
-    def inject_plugin_script(
-        cls, plugin_mnemonic: str, script: str, script_mnemonic: str
-    ) -> None:
-        if script_mnemonic in cls.plugin_scripts:
-            logging.debug(f"Skipping already loaded {script} for {plugin_mnemonic}")
+        if is_quick:
+            self.quick_mission = self.current_mission
         else:
-            cls.plugin_scripts.append(script_mnemonic)
+            self.regular_mission = self.current_mission
 
-            plugin_path = Path("./resources/plugins", plugin_mnemonic)
+        self.current_mission.options.load_from_dict(options_dict)
+        self.is_quick = is_quick
 
-            script_path = Path(plugin_path, script)
-            if not script_path.exists():
-                logging.error(f"Cannot find {script_path} for plugin {plugin_mnemonic}")
-                return
+        if is_quick:
+            self.attackers_starting_position = None
+            self.defenders_starting_position = None
+        else:
+            self.attackers_starting_position = self.departure_cp.at
+            self.defenders_starting_position = self.to_cp.at
 
-            trigger = TriggerStart(comment=f"Load {script_mnemonic}")
-            filename = script_path.resolve()
-            fileref = cls.current_mission.map_resource.add_resource_file(filename)
-            trigger.add_action(DoScriptFile(fileref))
-            cls.current_mission.triggerrules.triggers.append(trigger)
+    def generate(self):
+        radio_registry = RadioRegistry()
+        tacan_registry = TacanRegistry()
 
-    @classmethod
-    def notify_info_generators(
-        cls,
-        groundobjectgen: GroundObjectsGenerator,
-        airsupportgen: AirSupportConflictGenerator,
-        jtacs: List[JtacInfo],
-        airgen: AircraftConflictGenerator,
-    ):
-        """Generates subscribed MissionInfoGenerator objects (currently kneeboards and briefings)"""
-
-        gens: List[MissionInfoGenerator] = [
-            KneeboardGenerator(cls.current_mission, cls.game),
-            BriefingGenerator(cls.current_mission, cls.game),
-        ]
-        for gen in gens:
-            for dynamic_runway in groundobjectgen.runways.values():
-                gen.add_dynamic_runway(dynamic_runway)
-
-            for tanker in airsupportgen.air_support.tankers:
-                gen.add_tanker(tanker)
-
-            for aewc in airsupportgen.air_support.awacs:
-                gen.add_awacs(aewc)
-
-            for jtac in jtacs:
-                gen.add_jtac(jtac)
-
-            for flight in airgen.flights:
-                gen.add_flight(flight)
-            gen.generate()
-
-    @classmethod
-    def create_unit_map(cls) -> None:
-        cls.unit_map = UnitMap()
-        for control_point in cls.game.theater.controlpoints:
-            if isinstance(control_point, Airfield):
-                cls.unit_map.add_airfield(control_point)
-
-    @classmethod
-    def create_radio_registries(cls) -> None:
+        # Dedup beacon/radio frequencies, since some maps have some frequencies
+        # used multiple times.
+        beacons = load_beacons_for_terrain(self.game.theater.terrain.name)
         unique_map_frequencies: Set[RadioFrequency] = set()
-        cls._create_tacan_registry(unique_map_frequencies)
-        cls._create_radio_registry(unique_map_frequencies)
+        for beacon in beacons:
+            unique_map_frequencies.add(beacon.frequency)
+            if beacon.is_tacan:
+                if beacon.channel is None:
+                    logging.error(
+                        f"TACAN beacon has no channel: {beacon.callsign}")
+                else:
+                    tacan_registry.reserve(beacon.tacan_channel)
+
+        for airfield, data in AIRFIELD_DATA.items():
+            if data.theater == self.game.theater.terrain.name:
+                unique_map_frequencies.add(data.atc.hf)
+                unique_map_frequencies.add(data.atc.vhf_fm)
+                unique_map_frequencies.add(data.atc.vhf_am)
+                unique_map_frequencies.add(data.atc.uhf)
+                # No need to reserve ILS or TACAN because those are in the
+                # beacon list.
 
-        assert cls.radio_registry is not None
         for frequency in unique_map_frequencies:
-            cls.radio_registry.reserve(frequency)
+            radio_registry.reserve(frequency)
 
-    @classmethod
-    def assign_channels_to_flights(
-        cls, flights: List[FlightData], air_support: AirSupport
-    ) -> None:
+        # Generate meteo
+        envgen = EnviromentGenerator(self.current_mission, self.conflict,
+                                     self.game)
+        if self.environment_settings is None:
+            self.environment_settings = envgen.generate()
+        else:
+            envgen.load(self.environment_settings)
+
+        # Generate ground object first
+
+        groundobjectgen = GroundObjectsGenerator(
+            self.current_mission,
+            self.conflict,
+            self.game,
+            radio_registry,
+            tacan_registry
+        )
+        groundobjectgen.generate()
+
+        # Generate destroyed units
+        for d in self.game.get_destroyed_units():
+            try:
+                utype = db.unit_type_from_name(d["type"])
+            except KeyError:
+                continue
+
+            pos = Point(d["x"], d["z"])
+            if utype is not None and not self.game.position_culled(pos) and self.game.settings.perf_destroyed_units:
+                self.current_mission.static_group(
+                    country=self.current_mission.country(self.game.player_country),
+                    name="",
+                    _type=utype,
+                    hidden=True,
+                    position=pos,
+                    heading=d["orientation"],
+                    dead=True,
+                )
+
+        # Air Support (Tanker & Awacs)
+        airsupportgen = AirSupportConflictGenerator(
+            self.current_mission, self.conflict, self.game, radio_registry,
+            tacan_registry)
+        airsupportgen.generate(self.is_awacs_enabled)
+
+        # Generate Activity on the map
+        airgen = AircraftConflictGenerator(
+            self.current_mission, self.conflict, self.game.settings, self.game,
+            radio_registry)
+        for cp in self.game.theater.controlpoints:
+            side = cp.captured
+            if side:
+                country = self.current_mission.country(self.game.player_country)
+            else:
+                country = self.current_mission.country(self.game.enemy_country)
+            if cp.id in self.game.planners.keys():
+                airgen.generate_flights(
+                    cp,
+                    country,
+                    self.game.planners[cp.id],
+                    groundobjectgen.runways
+                )
+
+        # Generate ground units on frontline everywhere
+        jtacs: List[JtacInfo] = []
+        for player_cp, enemy_cp in self.game.theater.conflicts(True):
+            conflict = Conflict.frontline_cas_conflict(self.attacker_name, self.defender_name,
+                                                       self.current_mission.country(self.attacker_country),
+                                                       self.current_mission.country(self.defender_country),
+                                                       player_cp, enemy_cp, self.game.theater)
+            # Generate frontline ops
+            player_gp = self.game.ground_planners[player_cp.id].units_per_cp[enemy_cp.id]
+            enemy_gp = self.game.ground_planners[enemy_cp.id].units_per_cp[player_cp.id]
+            groundConflictGen = GroundConflictGenerator(self.current_mission, conflict, self.game, player_gp, enemy_gp, player_cp.stances[enemy_cp.id])
+            groundConflictGen.generate()
+            jtacs.extend(groundConflictGen.jtacs)
+
+        # Setup combined arms parameters
+        self.current_mission.groundControl.pilot_can_control_vehicles = self.ca_slots > 0
+        if self.game.player_country in [country.name for country in self.current_mission.coalition["blue"].countries.values()]:
+            self.current_mission.groundControl.blue_tactical_commander = self.ca_slots
+        else:
+            self.current_mission.groundControl.red_tactical_commander = self.ca_slots
+
+        # Triggers
+        triggersgen = TriggersGenerator(self.current_mission, self.conflict,
+                                        self.game)
+        triggersgen.generate()
+
+        # Options
+        forcedoptionsgen = ForcedOptionsGenerator(self.current_mission,
+                                                  self.conflict, self.game)
+        forcedoptionsgen.generate()
+
+        # Generate Visuals Smoke Effects
+        visualgen = VisualGenerator(self.current_mission, self.conflict,
+                                    self.game)
+        if self.game.settings.perf_smoke_gen:
+            visualgen.generate()
+
+        # Inject Plugins Lua Scripts
+        listOfPluginsScripts = []
+        plugin_file_path = Path("./resources/scripts/plugins/__plugins.lst")
+        if plugin_file_path.exists():
+            for line in plugin_file_path.read_text().splitlines():
+                name = line.strip()
+                if not name.startswith( '#' ):
+                    trigger = TriggerStart(comment="Load " + name)
+                    listOfPluginsScripts.append(name)
+                    fileref = self.current_mission.map_resource.add_resource_file("./resources/scripts/plugins/" + name)
+                    trigger.add_action(DoScriptFile(fileref))
+                    self.current_mission.triggerrules.triggers.append(trigger)
+        else:
+            logging.info(
+                f"Not loading plugins, {plugin_file_path} does not exist")
+
+        # Inject Mist Script if not done already in the plugins
+        if not "mist.lua" in listOfPluginsScripts and not "mist_4_3_74.lua" in listOfPluginsScripts: # don't load the script twice
+            trigger = TriggerStart(comment="Load Mist Lua framework")
+            fileref = self.current_mission.map_resource.add_resource_file("./resources/scripts/mist_4_3_74.lua")
+            trigger.add_action(DoScriptFile(fileref))
+            self.current_mission.triggerrules.triggers.append(trigger)
+
+        # Inject JSON library if not done already in the plugins
+        if not "json.lua" in listOfPluginsScripts : # don't load the script twice
+            trigger = TriggerStart(comment="Load JSON Lua library")
+            fileref = self.current_mission.map_resource.add_resource_file("./resources/scripts/json.lua")
+            trigger.add_action(DoScriptFile(fileref))
+            self.current_mission.triggerrules.triggers.append(trigger)
+
+        # Inject Ciribob's JTACAutoLase if not done already in the plugins
+        if not "JTACAutoLase.lua" in listOfPluginsScripts : # don't load the script twice
+            trigger = TriggerStart(comment="Load JTACAutoLase.lua script")
+            fileref = self.current_mission.map_resource.add_resource_file("./resources/scripts/JTACAutoLase.lua")
+            trigger.add_action(DoScriptFile(fileref))
+            self.current_mission.triggerrules.triggers.append(trigger)
+
+        # set a LUA table with data from Liberation that we want to set
+        # at the moment it contains Liberation's install path, and an overridable definition for the JTACAutoLase function
+        # later, we'll add data about the units and points having been generated, in order to facilitate the configuration of the plugin lua scripts
+        state_location = "[[" + os.path.abspath("state.json") + "]]"
+        lua = """
+        -- setting configuration table
+        env.info("DCSLiberation|: setting configuration table")
+        
+        -- all data in this table is overridable.
+        dcsLiberation = {}
+        
+        -- the base location for state.json; if non-existent, it'll be replaced with LIBERATION_EXPORT_DIR, TEMP, or DCS working directory
+        dcsLiberation.installPath=""" + state_location + """
+        
+        -- you can override dcsLiberation.JTACAutoLase to make it use your own function ; it will be called with these parameters : ({jtac.unit_name}, {jtac.code}, {smoke}, 'vehicle') for all JTACs
+        if ctld then
+            dcsLiberation.JTACAutoLase=ctld.JTACAutoLase
+        elseif JTACAutoLase then
+            dcsLiberation.JTACAutoLase=JTACAutoLase
+        end
+        
+        -- later, we'll add more data to the table
+        --dcsLiberation.POIs = {}
+        --dcsLiberation.BASEs = {}
+        --dcsLiberation.JTACs = {}
+        """
+
+        trigger = TriggerStart(comment="Set DCS Liberation data")
+        trigger.add_action(DoScript(String(lua)))
+        self.current_mission.triggerrules.triggers.append(trigger)
+
+        # Inject DCS-Liberation script if not done already in the plugins
+        if not "dcs_liberation.lua" in listOfPluginsScripts : # don't load the script twice
+            trigger = TriggerStart(comment="Load DCS Liberation script")
+            fileref = self.current_mission.map_resource.add_resource_file("./resources/scripts/dcs_liberation.lua")
+            trigger.add_action(DoScriptFile(fileref))
+            self.current_mission.triggerrules.triggers.append(trigger)
+
+        # add a configuration for JTACAutoLase and start lasing for all JTACs
+        smoke = "true"
+        if hasattr(self.game.settings, "jtac_smoke_on"):
+            if not self.game.settings.jtac_smoke_on:
+                smoke = "false"
+
+        lua = """
+        -- setting and starting JTACs
+        env.info("DCSLiberation|: setting and starting JTACs")
+        """
+
+        for jtac in jtacs:
+            lua += f"if dcsLiberation.JTACAutoLase then dcsLiberation.JTACAutoLase('{jtac.unit_name}', {jtac.code}, {smoke}, 'vehicle') end\n"
+
+        trigger = TriggerStart(comment="Start JTACs")
+        trigger.add_action(DoScript(String(lua)))
+        self.current_mission.triggerrules.triggers.append(trigger)
+
+        self.assign_channels_to_flights(airgen.flights,
+                                        airsupportgen.air_support)
+
+        kneeboard_generator = KneeboardGenerator(self.current_mission)
+
+        for dynamic_runway in groundobjectgen.runways.values():
+            self.briefinggen.add_dynamic_runway(dynamic_runway)
+
+        for tanker in airsupportgen.air_support.tankers:
+            self.briefinggen.add_tanker(tanker)
+            kneeboard_generator.add_tanker(tanker)
+
+        if self.is_awacs_enabled:
+            for awacs in airsupportgen.air_support.awacs:
+                self.briefinggen.add_awacs(awacs)
+                kneeboard_generator.add_awacs(awacs)
+
+        for jtac in jtacs:
+            self.briefinggen.add_jtac(jtac)
+            kneeboard_generator.add_jtac(jtac)
+
+        for flight in airgen.flights:
+            self.briefinggen.add_flight(flight)
+            kneeboard_generator.add_flight(flight)
+
+        self.briefinggen.generate()
+        kneeboard_generator.generate()
+
+    def assign_channels_to_flights(self, flights: List[FlightData],
+                                   air_support: AirSupport) -> None:
         """Assigns preset radio channels for client flights."""
         for flight in flights:
             if not flight.client_units:
                 continue
-            cls.assign_channels_to_flight(flight, air_support)
+            self.assign_channels_to_flight(flight, air_support)
 
-    @staticmethod
-    def assign_channels_to_flight(flight: FlightData, air_support: AirSupport) -> None:
+    def assign_channels_to_flight(self, flight: FlightData,
+                                  air_support: AirSupport) -> None:
         """Assigns preset radio channels for a client flight."""
         airframe = flight.aircraft_type
 
@@ -226,427 +376,6 @@ class Operation:
             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(
-        cls, unique_map_frequencies: Set[RadioFrequency]
-    ) -> None:
-        """
-        Dedup beacon/radio frequencies, since some maps have some frequencies
-        used multiple times.
-        """
-        cls.tacan_registry = TacanRegistry()
-        beacons = load_beacons_for_terrain(cls.game.theater.terrain.name)
-
-        for beacon in beacons:
-            unique_map_frequencies.add(beacon.frequency)
-            if beacon.is_tacan:
-                if beacon.channel is None:
-                    logging.error(f"TACAN beacon has no channel: {beacon.callsign}")
-                else:
-                    cls.tacan_registry.reserve(beacon.tacan_channel)
-
-    @classmethod
-    def _create_radio_registry(
-        cls, unique_map_frequencies: Set[RadioFrequency]
-    ) -> None:
-        cls.radio_registry = RadioRegistry()
-        for data in AIRFIELD_DATA.values():
-            if data.theater == cls.game.theater.terrain.name and data.atc:
-                unique_map_frequencies.add(data.atc.hf)
-                unique_map_frequencies.add(data.atc.vhf_fm)
-                unique_map_frequencies.add(data.atc.vhf_am)
-                unique_map_frequencies.add(data.atc.uhf)
-                # No need to reserve ILS or TACAN because those are in the
-                # beacon list.
-
-    @classmethod
-    def _generate_ground_units(cls):
-        cls.groundobjectgen = GroundObjectsGenerator(
-            cls.current_mission,
-            cls.game,
-            cls.radio_registry,
-            cls.tacan_registry,
-            cls.unit_map,
+        aircraft_data.channel_allocator.assign_channels_for_flight(
+            flight, air_support
         )
-        cls.groundobjectgen.generate()
-
-    @classmethod
-    def _generate_destroyed_units(cls) -> None:
-        """Add destroyed units to the Mission"""
-        for d in cls.game.get_destroyed_units():
-            try:
-                utype = db.unit_type_from_name(d["type"])
-            except KeyError:
-                continue
-
-            pos = Point(d["x"], d["z"])
-            if (
-                utype is not None
-                and not cls.game.position_culled(pos)
-                and cls.game.settings.perf_destroyed_units
-            ):
-                cls.current_mission.static_group(
-                    country=cls.current_mission.country(cls.game.player_country),
-                    name="",
-                    _type=utype,
-                    hidden=True,
-                    position=pos,
-                    heading=d["orientation"],
-                    dead=True,
-                )
-
-    @classmethod
-    def generate(cls) -> UnitMap:
-        """Build the final Mission to be exported"""
-        cls.create_unit_map()
-        cls.create_radio_registries()
-        # Set mission time and weather conditions.
-        EnvironmentGenerator(cls.current_mission, cls.game.conditions).generate()
-        cls._generate_ground_units()
-        cls._generate_destroyed_units()
-        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)
-        triggersgen.generate()
-
-        # Setup combined arms parameters
-        cls.current_mission.groundControl.pilot_can_control_vehicles = cls.ca_slots > 0
-        if cls.game.player_country in [
-            country.name
-            for country in cls.current_mission.coalition["blue"].countries.values()
-        ]:
-            cls.current_mission.groundControl.blue_tactical_commander = cls.ca_slots
-        else:
-            cls.current_mission.groundControl.red_tactical_commander = cls.ca_slots
-
-        # Options
-        forcedoptionsgen = ForcedOptionsGenerator(cls.current_mission, cls.game)
-        forcedoptionsgen.generate()
-
-        # Generate Visuals Smoke Effects
-        visualgen = VisualGenerator(cls.current_mission, cls.game)
-        if cls.game.settings.perf_smoke_gen:
-            visualgen.generate()
-
-        cls.generate_lua(cls.airgen, cls.airsupportgen, cls.jtacs)
-
-        # Inject Plugins Lua Scripts and data
-        cls.plugin_scripts.clear()
-        for plugin in LuaPluginManager.plugins():
-            if plugin.enabled:
-                plugin.inject_scripts(cls)
-                plugin.inject_configuration(cls)
-
-        cls.assign_channels_to_flights(
-            cls.airgen.flights, cls.airsupportgen.air_support
-        )
-        cls.notify_info_generators(
-            cls.groundobjectgen, cls.airsupportgen, cls.jtacs, cls.airgen
-        )
-        cls.reset_naming_ids()
-        return cls.unit_map
-
-    @classmethod
-    def _generate_air_units(cls) -> None:
-        """Generate the air units for the Operation"""
-
-        # Air Support (Tanker & Awacs)
-        assert cls.radio_registry and cls.tacan_registry
-        cls.airsupportgen = AirSupportConflictGenerator(
-            cls.current_mission,
-            cls.air_conflict(),
-            cls.game,
-            cls.radio_registry,
-            cls.tacan_registry,
-        )
-        cls.airsupportgen.generate()
-
-        # Generate Aircraft Activity on the map
-        cls.airgen = AircraftConflictGenerator(
-            cls.current_mission,
-            cls.game.settings,
-            cls.game,
-            cls.radio_registry,
-            cls.unit_map,
-            air_support=cls.airsupportgen.air_support,
-        )
-
-        cls.airgen.clear_parking_slots()
-
-        cls.airgen.generate_flights(
-            cls.current_mission.country(cls.game.player_country),
-            cls.game.blue_ato,
-            cls.groundobjectgen.runways,
-        )
-        cls.airgen.generate_flights(
-            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.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(True):
-            player_cp = front_line.control_point_a
-            enemy_cp = front_line.control_point_b
-            conflict = Conflict.frontline_cas_conflict(
-                cls.game.player_name,
-                cls.game.enemy_name,
-                cls.current_mission.country(cls.game.player_country),
-                cls.current_mission.country(cls.game.enemy_country),
-                player_cp,
-                enemy_cp,
-                cls.game.theater,
-            )
-            # Generate frontline ops
-            player_gp = cls.game.ground_planners[player_cp.id].units_per_cp[enemy_cp.id]
-            enemy_gp = cls.game.ground_planners[enemy_cp.id].units_per_cp[player_cp.id]
-            ground_conflict_gen = GroundConflictGenerator(
-                cls.current_mission,
-                conflict,
-                cls.game,
-                player_gp,
-                enemy_gp,
-                player_cp.stances[enemy_cp.id],
-                cls.unit_map,
-            )
-            ground_conflict_gen.generate()
-            cls.jtacs.extend(ground_conflict_gen.jtacs)
-
-    @classmethod
-    def reset_naming_ids(cls):
-        namegen.reset_numbers()
-
-    @classmethod
-    def generate_lua(
-        cls,
-        airgen: AircraftConflictGenerator,
-        airsupportgen: AirSupportConflictGenerator,
-        jtacs: List[JtacInfo],
-    ) -> None:
-        #  TODO: Refactor this
-        luaData = {
-            "AircraftCarriers": {},
-            "Tankers": {},
-            "AWACs": {},
-            "JTACs": {},
-            "TargetPoints": {},
-            "RedAA": {},
-            "BlueAA": {},
-        }  # type: ignore
-
-        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,
-            }
-
-        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 jtac in jtacs:
-            luaData["JTACs"][jtac.callsign] = {
-                "dcsGroupName": jtac.dcsGroupName,
-                "callsign": jtac.callsign,
-                "zone": jtac.region,
-                "dcsUnit": jtac.unit_name,
-                "laserCode": jtac.code,
-            }
-
-        for flight in airgen.flights:
-            if flight.friendly and flight.flight_type in [
-                FlightType.ANTISHIP,
-                FlightType.DEAD,
-                FlightType.SEAD,
-                FlightType.STRIKE,
-            ]:
-                flightType = str(flight.flight_type)
-                flightTarget = flight.package.target
-                if flightTarget:
-                    flightTargetName = None
-                    flightTargetType = None
-                    if isinstance(flightTarget, TheaterGroundObject):
-                        flightTargetName = flightTarget.obj_name
-                        flightTargetType = (
-                            flightType + f" TGT ({flightTarget.category})"
-                        )
-                    elif hasattr(flightTarget, "name"):
-                        flightTargetName = flightTarget.name
-                        flightTargetType = flightType + " TGT (Airbase)"
-                    luaData["TargetPoints"][flightTargetName] = {
-                        "name": flightTargetName,
-                        "type": flightTargetType,
-                        "position": {
-                            "x": flightTarget.position.x,
-                            "y": flightTarget.position.y,
-                        },
-                    }
-
-        for cp in cls.game.theater.controlpoints:
-            for ground_object in cp.ground_objects:
-                if ground_object.might_have_aa and not ground_object.is_dead:
-                    for g in ground_object.groups:
-                        threat_range = ground_object.threat_range(g)
-
-                        if not threat_range:
-                            continue
-
-                        faction = "BlueAA" if cp.captured else "RedAA"
-
-                        luaData[faction][g.name] = {
-                            "name": ground_object.name,
-                            "range": threat_range.meters,
-                            "position": {
-                                "x": ground_object.position.x,
-                                "y": ground_object.position.y,
-                            },
-                        }
-
-        # set a LUA table with data from Liberation that we want to set
-        # at the moment it contains Liberation's install path, and an overridable definition for the JTACAutoLase function
-        # later, we'll add data about the units and points having been generated, in order to facilitate the configuration of the plugin lua scripts
-        state_location = "[[" + os.path.abspath(".") + "]]"
-        lua = (
-            """
-        -- setting configuration table
-        env.info("DCSLiberation|: setting configuration table")
-
-        -- all data in this table is overridable.
-        dcsLiberation = {}
-
-        -- the base location for state.json; if non-existent, it'll be replaced with LIBERATION_EXPORT_DIR, TEMP, or DCS working directory
-        dcsLiberation.installPath="""
-            + state_location
-            + """
-
-        """
-        )
-        # Process the tankers
-        lua += """
-
-        -- list the tankers generated by Liberation
-        dcsLiberation.Tankers = {
-        """
-        for key in luaData["Tankers"]:
-            data = luaData["Tankers"][key]
-            dcsGroupName = data["dcsGroupName"]
-            callsign = data["callsign"]
-            variant = data["variant"]
-            tacan = data["tacan"]
-            radio = data["radio"]
-            lua += f"    {{dcsGroupName='{dcsGroupName}', callsign='{callsign}', variant='{variant}', tacan='{tacan}', radio='{radio}' }}, \n"
-            # lua += f"    {{name='{dcsGroupName}', description='{callsign} ({variant})', information='Tacan:{tacan} Radio:{radio}' }}, \n"
-        lua += "}"
-
-        # Process the AWACSes
-        lua += """
-
-        -- list the AWACs generated by Liberation
-        dcsLiberation.AWACs = {
-        """
-        for key in luaData["AWACs"]:
-            data = luaData["AWACs"][key]
-            dcsGroupName = data["dcsGroupName"]
-            callsign = data["callsign"]
-            radio = data["radio"]
-            lua += f"    {{dcsGroupName='{dcsGroupName}', callsign='{callsign}', radio='{radio}' }}, \n"
-            # lua += f"    {{name='{dcsGroupName}', description='{callsign} (AWACS)', information='Radio:{radio}' }}, \n"
-        lua += "}"
-
-        # Process the JTACs
-        lua += """
-
-        -- list the JTACs generated by Liberation
-        dcsLiberation.JTACs = {
-        """
-        for key in luaData["JTACs"]:
-            data = luaData["JTACs"][key]
-            dcsGroupName = data["dcsGroupName"]
-            callsign = data["callsign"]
-            zone = data["zone"]
-            laserCode = data["laserCode"]
-            dcsUnit = data["dcsUnit"]
-            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
-        lua += """
-
-        -- list the target points generated by Liberation
-        dcsLiberation.TargetPoints = {
-        """
-        for key in luaData["TargetPoints"]:
-            data = luaData["TargetPoints"][key]
-            name = data["name"]
-            pointType = data["type"]
-            positionX = data["position"]["x"]
-            positionY = data["position"]["y"]
-            lua += f"    {{name='{name}', pointType='{pointType}', positionX='{positionX}', positionY='{positionY}' }}, \n"
-            # lua += f"    {{name='{pointType} {name}', point{{x={positionX}, z={positionY} }} }}, \n"
-        lua += "}"
-
-        lua += """
-
-        -- list the airbases generated by Liberation
-        -- dcsLiberation.Airbases = {}
-
-        -- list the aircraft carriers generated by Liberation
-        -- dcsLiberation.Carriers = {}
-
-        -- list the Red AA generated by Liberation
-        dcsLiberation.RedAA = {
-        """
-        for key in luaData["RedAA"]:
-            data = luaData["RedAA"][key]
-            name = data["name"]
-            radius = data["range"]
-            positionX = data["position"]["x"]
-            positionY = data["position"]["y"]
-            lua += f"    {{dcsGroupName='{key}', name='{name}', range='{radius}', positionX='{positionX}', positionY='{positionY}' }}, \n"
-        lua += "}"
-
-        lua += """
-
-        -- list the Blue AA generated by Liberation
-        dcsLiberation.BlueAA = {
-        """
-        for key in luaData["BlueAA"]:
-            data = luaData["BlueAA"][key]
-            name = data["name"]
-            radius = data["range"]
-            positionX = data["position"]["x"]
-            positionY = data["position"]["y"]
-            lua += f"    {{dcsGroupName='{key}', name='{name}', range='{radius}', positionX='{positionX}', positionY='{positionY}' }}, \n"
-        lua += "}"
-
-        lua += """
-
-        """
-
-        trigger = TriggerStart(comment="Set DCS Liberation data")
-        trigger.add_action(DoScript(String(lua)))
-        Operation.current_mission.triggerrules.triggers.append(trigger)

game/plugins/__init__.py

@@ -1,2 +0,0 @@
-from .luaplugin import LuaPlugin
-from .manager import LuaPluginManager

game/plugins/luaplugin.py

@@ -1,187 +0,0 @@
-from __future__ import annotations
-
-import json
-import logging
-import textwrap
-from dataclasses import dataclass
-from pathlib import Path
-from typing import List, Optional, TYPE_CHECKING, Type
-
-from game.settings import Settings
-
-if TYPE_CHECKING:
-    from game.operation.operation import Operation
-
-
-class LuaPluginWorkOrder:
-    def __init__(
-        self, parent_mnemonic: str, filename: str, mnemonic: str, disable: bool
-    ) -> None:
-        self.parent_mnemonic = parent_mnemonic
-        self.filename = filename
-        self.mnemonic = mnemonic
-        self.disable = disable
-
-    def work(self, operation: Type[Operation]) -> None:
-        if self.disable:
-            operation.bypass_plugin_script(self.mnemonic)
-        else:
-            operation.inject_plugin_script(
-                self.parent_mnemonic, self.filename, self.mnemonic
-            )
-
-
-class PluginSettings:
-    def __init__(self, identifier: str, enabled_by_default: bool) -> None:
-        self.identifier = identifier
-        self.enabled_by_default = enabled_by_default
-        self.settings = Settings()
-        self.initialize_settings()
-
-    def set_settings(self, settings: Settings):
-        self.settings = settings
-        self.initialize_settings()
-
-    def initialize_settings(self) -> None:
-        # Plugin options are saved in the game's Settings, but it's possible for
-        # plugins to change across loads. If new plugins are added or new
-        # options added to those plugins, initialize the new settings.
-        self.settings.initialize_plugin_option(self.identifier, self.enabled_by_default)
-
-    @property
-    def enabled(self) -> bool:
-        return self.settings.plugin_option(self.identifier)
-
-    def set_enabled(self, enabled: bool) -> None:
-        self.settings.set_plugin_option(self.identifier, enabled)
-
-
-class LuaPluginOption(PluginSettings):
-    def __init__(self, identifier: str, name: str, enabled_by_default: bool) -> None:
-        super().__init__(identifier, enabled_by_default)
-        self.name = name
-
-
-@dataclass(frozen=True)
-class LuaPluginDefinition:
-    identifier: str
-    name: str
-    present_in_ui: bool
-    enabled_by_default: bool
-    options: List[LuaPluginOption]
-    work_orders: List[LuaPluginWorkOrder]
-    config_work_orders: List[LuaPluginWorkOrder]
-
-    @classmethod
-    def from_json(cls, name: str, path: Path) -> LuaPluginDefinition:
-        data = json.loads(path.read_text())
-
-        options = []
-        for option in data.get("specificOptions"):
-            option_id = option["mnemonic"]
-            options.append(
-                LuaPluginOption(
-                    identifier=f"{name}.{option_id}",
-                    name=option.get("nameInUI", name),
-                    enabled_by_default=option.get("defaultValue"),
-                )
-            )
-
-        work_orders = []
-        for work_order in data.get("scriptsWorkOrders"):
-            work_orders.append(
-                LuaPluginWorkOrder(
-                    name,
-                    work_order.get("file"),
-                    work_order["mnemonic"],
-                    work_order.get("disable", False),
-                )
-            )
-        config_work_orders = []
-        for work_order in data.get("configurationWorkOrders"):
-            config_work_orders.append(
-                LuaPluginWorkOrder(
-                    name,
-                    work_order.get("file"),
-                    work_order["mnemonic"],
-                    work_order.get("disable", False),
-                )
-            )
-
-        return cls(
-            identifier=name,
-            name=data["nameInUI"],
-            present_in_ui=not data.get("skipUI", False),
-            enabled_by_default=data.get("defaultValue", False),
-            options=options,
-            work_orders=work_orders,
-            config_work_orders=config_work_orders,
-        )
-
-
-class LuaPlugin(PluginSettings):
-    def __init__(self, definition: LuaPluginDefinition) -> None:
-        self.definition = definition
-        super().__init__(self.definition.identifier, self.definition.enabled_by_default)
-
-    @property
-    def name(self) -> str:
-        return self.definition.name
-
-    @property
-    def show_in_ui(self) -> bool:
-        return self.definition.present_in_ui
-
-    @property
-    def options(self) -> List[LuaPluginOption]:
-        return self.definition.options
-
-    @classmethod
-    def from_json(cls, name: str, path: Path) -> Optional[LuaPlugin]:
-        try:
-            definition = LuaPluginDefinition.from_json(name, path)
-        except KeyError:
-            logging.exception("Required plugin configuration value missing")
-            return None
-
-        return cls(definition)
-
-    def set_settings(self, settings: Settings):
-        super().set_settings(settings)
-        for option in self.definition.options:
-            option.set_settings(self.settings)
-
-    def inject_scripts(self, operation: Type[Operation]) -> None:
-        for work_order in self.definition.work_orders:
-            work_order.work(operation)
-
-    def inject_configuration(self, operation: Type[Operation]) -> None:
-        # inject the plugin options
-        if self.options:
-            option_decls = []
-            for option in self.options:
-                enabled = str(option.enabled).lower()
-                name = option.identifier
-                option_decls.append(f"    dcsLiberation.plugins.{name} = {enabled}")
-
-            joined_options = "\n".join(option_decls)
-
-            lua = textwrap.dedent(
-                f"""\
-                -- {self.identifier} plugin configuration.
-
-                if dcsLiberation then
-                    if not dcsLiberation.plugins then
-                        dcsLiberation.plugins = {{}}
-                    end
-                    dcsLiberation.plugins.{self.identifier} = {{}}
-                    {joined_options}
-                end
-
-            """
-            )
-
-            operation.inject_lua_trigger(lua, f"{self.identifier} plugin configuration")
-
-        for work_order in self.definition.config_work_orders:
-            work_order.work(operation)

game/plugins/manager.py

@@ -1,51 +0,0 @@
-import json
-import logging
-from pathlib import Path
-from typing import Dict, List, Optional
-
-from game.settings import Settings
-from game.plugins.luaplugin import LuaPlugin
-
-
-class LuaPluginManager:
-    _plugins_loaded = False
-    _plugins: Dict[str, LuaPlugin] = {}
-
-    @classmethod
-    def _load_plugins(cls) -> None:
-        plugins_path = Path("resources/plugins")
-
-        path = plugins_path / "plugins.json"
-        if not path.exists():
-            raise RuntimeError(f"{path} does not exist. Cannot continue.")
-
-        logging.info(f"Reading plugins list from {path}")
-
-        data = json.loads(path.read_text())
-        for name in data:
-            plugin_path = plugins_path / name / "plugin.json"
-            if not plugin_path.exists():
-                raise RuntimeError(
-                    f"Invalid plugin configuration: required plugin {name} "
-                    f"does not exist at {plugin_path}"
-                )
-            logging.info(f"Loading plugin {name} from {plugin_path}")
-            plugin = LuaPlugin.from_json(name, plugin_path)
-            if plugin is not None:
-                cls._plugins[name] = plugin
-        cls._plugins_loaded = True
-
-    @classmethod
-    def _get_plugins(cls) -> Dict[str, LuaPlugin]:
-        if not cls._plugins_loaded:
-            cls._load_plugins()
-        return cls._plugins
-
-    @classmethod
-    def plugins(cls) -> List[LuaPlugin]:
-        return list(cls._get_plugins().values())
-
-    @classmethod
-    def load_settings(cls, settings: Settings) -> None:
-        for plugin in cls.plugins():
-            plugin.set_settings(settings)

game/point_with_heading.py

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

game/procurement.py

@@ -1,269 +0,0 @@
-from __future__ import annotations
-
-import math
-import random
-from dataclasses import dataclass
-from typing import Iterator, List, Optional, TYPE_CHECKING, Type
-
-from dcs.unittype import FlyingType, VehicleType
-
-from game import db
-from game.factions.faction import Faction
-from game.theater import ControlPoint, MissionTarget
-from game.utils import Distance
-from gen.flights.ai_flight_planner_db import aircraft_for_task
-from gen.flights.closestairfields import ObjectiveDistanceCache
-from gen.flights.flight import FlightType
-from gen.ground_forces.ai_ground_planner_db import TYPE_SHORAD
-
-if TYPE_CHECKING:
-    from game import Game
-
-
-@dataclass(frozen=True)
-class AircraftProcurementRequest:
-    near: MissionTarget
-    range: Distance
-    task_capability: FlightType
-    number: int
-
-    def __str__(self) -> str:
-        task = self.task_capability.value
-        distance = self.range.nautical_miles
-        target = self.near.name
-        return f"{self.number} ship {task} within {distance} nm of {target}"
-
-
-class ProcurementAi:
-    def __init__(
-        self,
-        game: Game,
-        for_player: bool,
-        faction: Faction,
-        manage_runways: bool,
-        manage_front_line: bool,
-        manage_aircraft: bool,
-        front_line_budget_share: float,
-    ) -> None:
-        if front_line_budget_share > 1.0:
-            raise ValueError
-
-        self.game = game
-        self.is_player = for_player
-        self.faction = faction
-        self.manage_runways = manage_runways
-        self.manage_front_line = manage_front_line
-        self.manage_aircraft = manage_aircraft
-        self.front_line_budget_share = front_line_budget_share
-        self.threat_zones = self.game.threat_zone_for(not self.is_player)
-
-    def spend_budget(
-        self, budget: float, aircraft_requests: List[AircraftProcurementRequest]
-    ) -> float:
-        if self.manage_runways:
-            budget = self.repair_runways(budget)
-        if self.manage_front_line:
-            armor_budget = math.ceil(budget * self.front_line_budget_share)
-            budget -= armor_budget
-            budget += self.reinforce_front_line(armor_budget)
-
-        # Don't sell overstock aircraft until after we've bought runways and
-        # front lines. Any budget we free up should be earmarked for aircraft.
-        if not self.is_player:
-            budget += self.sell_incomplete_squadrons()
-        if self.manage_aircraft:
-            budget = self.purchase_aircraft(budget, aircraft_requests)
-        return budget
-
-    def sell_incomplete_squadrons(self) -> float:
-        # Selling incomplete squadrons gives us more money to spend on the next
-        # turn. This serves as a short term fix for
-        # https://github.com/Khopa/dcs_liberation/issues/41.
-        #
-        # Only incomplete squadrons which are unlikely to get used will be sold
-        # rather than all unused aircraft because the unused aircraft are what
-        # make OCA strikes worthwhile.
-        #
-        # This option is only used by the AI since players cannot cancel sales
-        # (https://github.com/Khopa/dcs_liberation/issues/365).
-        total = 0.0
-        for cp in self.game.theater.control_points_for(self.is_player):
-            inventory = self.game.aircraft_inventory.for_control_point(cp)
-            for aircraft, available in inventory.all_aircraft:
-                # We only ever plan even groups, so the odd aircraft is unlikely
-                # to get used.
-                if available % 2 == 0:
-                    continue
-                inventory.remove_aircraft(aircraft, 1)
-                total += db.PRICES[aircraft]
-        return total
-
-    def repair_runways(self, budget: float) -> float:
-        for control_point in self.owned_points:
-            if budget < db.RUNWAY_REPAIR_COST:
-                break
-            if control_point.runway_can_be_repaired:
-                control_point.begin_runway_repair()
-                budget -= db.RUNWAY_REPAIR_COST
-                if self.is_player:
-                    self.game.message(
-                        "OPFOR has begun repairing the runway at " f"{control_point}"
-                    )
-                else:
-                    self.game.message(
-                        "We have begun repairing the runway at " f"{control_point}"
-                    )
-        return budget
-
-    def random_affordable_ground_unit(
-        self, budget: float, cp: ControlPoint
-    ) -> Optional[Type[VehicleType]]:
-        affordable_units = [
-            u
-            for u in self.faction.frontline_units + self.faction.artillery_units
-            if db.PRICES[u] <= budget
-        ]
-
-        total_number_aa = (
-            cp.base.total_frontline_aa + cp.pending_frontline_aa_deliveries_count
-        )
-        total_non_aa = (
-            cp.base.total_armor + cp.pending_deliveries_count - total_number_aa
-        )
-        max_aa = math.ceil(total_non_aa / 8)
-
-        # Limit the number of AA units the AI will buy
-        if not total_number_aa < max_aa:
-            for unit in [u for u in affordable_units if u in TYPE_SHORAD]:
-                affordable_units.remove(unit)
-
-        if not affordable_units:
-            return None
-        return random.choice(affordable_units)
-
-    def reinforce_front_line(self, budget: float) -> float:
-        if not self.faction.frontline_units and not self.faction.artillery_units:
-            return budget
-
-        while budget > 0:
-            candidates = self.front_line_candidates()
-            if not candidates:
-                break
-
-            cp = random.choice(candidates)
-            unit = self.random_affordable_ground_unit(budget, cp)
-            if unit is None:
-                # Can't afford any more units.
-                break
-
-            budget -= db.PRICES[unit]
-            cp.pending_unit_deliveries.order({unit: 1})
-
-        return budget
-
-    def _affordable_aircraft_of_types(
-        self,
-        types: List[Type[FlyingType]],
-        airbase: ControlPoint,
-        number: int,
-        max_price: float,
-    ) -> Optional[Type[FlyingType]]:
-        best_choice: Optional[Type[FlyingType]] = None
-        for unit in [u for u in self.faction.aircrafts if u in types]:
-            if db.PRICES[unit] * number > max_price:
-                continue
-            if not airbase.can_operate(unit):
-                continue
-
-            # Affordable and compatible. To keep some variety, skip with a 50/50
-            # chance. Might be a good idea to have the chance to skip based on
-            # the price compared to the rest of the choices.
-            best_choice = unit
-            if random.choice([True, False]):
-                break
-        return best_choice
-
-    def affordable_aircraft_for(
-        self, request: AircraftProcurementRequest, airbase: ControlPoint, budget: float
-    ) -> Optional[Type[FlyingType]]:
-        return self._affordable_aircraft_of_types(
-            aircraft_for_task(request.task_capability), airbase, request.number, budget
-        )
-
-    def purchase_aircraft(
-        self, budget: float, aircraft_requests: List[AircraftProcurementRequest]
-    ) -> float:
-        for request in aircraft_requests:
-            for airbase in self.best_airbases_for(request):
-                unit = self.affordable_aircraft_for(request, airbase, budget)
-                if unit is None:
-                    # Can't afford any aircraft capable of performing the
-                    # required mission that can operate from this airbase. We
-                    # might be able to afford aircraft at other airbases though,
-                    # in the case where the airbase we attempted to use is only
-                    # able to operate expensive aircraft.
-                    continue
-
-                budget -= db.PRICES[unit] * request.number
-                airbase.pending_unit_deliveries.order({unit: request.number})
-
-        return budget
-
-    @property
-    def owned_points(self) -> List[ControlPoint]:
-        if self.is_player:
-            return self.game.theater.player_points()
-        else:
-            return self.game.theater.enemy_points()
-
-    def best_airbases_for(
-        self, request: AircraftProcurementRequest
-    ) -> Iterator[ControlPoint]:
-        distance_cache = ObjectiveDistanceCache.get_closest_airfields(request.near)
-        threatened = []
-        for cp in distance_cache.airfields_within(request.range):
-            if not cp.is_friendly(self.is_player):
-                continue
-            if not cp.runway_is_operational():
-                continue
-            if cp.unclaimed_parking(self.game) < request.number:
-                continue
-            if self.threat_zones.threatened(cp.position):
-                threatened.append(cp)
-            yield cp
-        yield from threatened
-
-    def front_line_candidates(self) -> List[ControlPoint]:
-        candidates = []
-
-        # Prefer to buy front line units at active front lines that are not
-        # already overloaded.
-        for cp in self.owned_points:
-            if cp.expected_ground_units_next_turn.total >= 30:
-                # Control point is already sufficiently defended.
-                continue
-            for connected in cp.connected_points:
-                if not connected.is_friendly(to_player=self.is_player):
-                    candidates.append(cp)
-
-        if not candidates:
-            # Otherwise buy reserves, but don't exceed 10 reserve units per CP.
-            # These units do not exist in the world until the CP becomes
-            # connected to an active front line, at which point all these units
-            # will suddenly appear at the gates of the newly captured CP.
-            #
-            # To avoid sudden overwhelming numbers of units we avoid buying
-            # many.
-            #
-            # Also, do not bother buying units at bases that will never connect
-            # to a front line.
-            for cp in self.owned_points:
-                if not cp.can_deploy_ground_units:
-                    continue
-                if cp.expected_ground_units_next_turn.total >= 10:
-                    continue
-                if cp.is_global:
-                    continue
-                candidates.append(cp)
-
-        return candidates

game/settings.py

@@ -1,83 +1,43 @@
-from dataclasses import dataclass, field
-from typing import Dict, Optional
 
-from dcs.forcedoptions import ForcedOptions
-
-
-@dataclass
 class Settings:
 
-    # Difficulty settings
-    player_skill: str = "Good"
-    enemy_skill: str = "Average"
-    enemy_vehicle_skill: str = "Average"
-    map_coalition_visibility: ForcedOptions.Views = ForcedOptions.Views.All
-    labels: str = "Full"
-    only_player_takeoff: bool = True  # Legacy parameter do not use
-    night_disabled: bool = False
-    external_views_allowed: bool = True
-    supercarrier: bool = False
-    generate_marks: bool = True
-    manpads: bool = True
-    version: Optional[str] = None
-    player_income_multiplier: float = 1.0
-    enemy_income_multiplier: float = 1.0
+    def __init__(self):
+        # Generator settings
+        self.inverted = False
+        self.do_not_generate_carrier = False # TODO : implement
+        self.do_not_generate_lha = False     # TODO : implement
+        self.do_not_generate_player_navy = True          # TODO : implement
+        self.do_not_generate_enemy_navy = True           # TODO : implement
 
-    default_start_type: str = "Cold"
+        # Difficulty settings
+        self.player_skill = "Good"
+        self.enemy_skill = "Average"
+        self.enemy_vehicle_skill = "Average"
+        self.map_coalition_visibility = "All Units"
+        self.labels = "Full"
+        self.only_player_takeoff = True  # Legacy parameter do not use
+        self.night_disabled = False
+        self.external_views_allowed = True
+        self.supercarrier = False
+        self.multiplier = 1
+        self.generate_marks = True
+        self.sams = True # Legacy parameter do not use
+        self.cold_start = False # Legacy parameter do not use
+        self.version = None
+        self.include_jtac_if_available = True
+        self.jtac_smoke_on = True
 
-    # Campaign management
-    automate_runway_repair: bool = False
-    automate_front_line_reinforcements: bool = False
-    automate_aircraft_reinforcements: bool = False
-    restrict_weapons_by_date: bool = False
-    disable_legacy_aewc: bool = False
-    generate_dark_kneeboard: bool = False
+        # Performance oriented
+        self.perf_red_alert_state = True
+        self.perf_smoke_gen = True
+        self.perf_artillery = True
+        self.perf_moving_units = True
+        self.perf_infantry = True
+        self.perf_ai_parking_start = True
+        self.perf_destroyed_units = True
 
-    # Performance oriented
-    perf_red_alert_state: bool = True
-    perf_smoke_gen: bool = True
-    perf_artillery: bool = True
-    perf_moving_units: bool = True
-    perf_infantry: bool = True
-    perf_destroyed_units: bool = True
+        # Performance culling
+        self.perf_culling = False
+        self.perf_culling_distance = 100
 
-    # Performance culling
-    perf_culling: bool = False
-    perf_culling_distance: int = 100
-    perf_do_not_cull_carrier = True
 
-    # LUA Plugins system
-    plugins: Dict[str, bool] = field(default_factory=dict)
-
-    # Cheating
-    show_red_ato: bool = False
-    enable_frontline_cheats: bool = False
-    enable_base_capture_cheat: bool = False
-
-    never_delay_player_flights: bool = False
-
-    @staticmethod
-    def plugin_settings_key(identifier: str) -> str:
-        return f"plugins.{identifier}"
-
-    def initialize_plugin_option(self, identifier: str, default_value: bool) -> None:
-        try:
-            self.plugin_option(identifier)
-        except KeyError:
-            self.set_plugin_option(identifier, default_value)
-
-    def plugin_option(self, identifier: str) -> bool:
-        return self.plugins[self.plugin_settings_key(identifier)]
-
-    def set_plugin_option(self, identifier: str, enabled: bool) -> None:
-        self.plugins[self.plugin_settings_key(identifier)] = enabled
-
-    def __setstate__(self, state) -> None:
-        # __setstate__ is called with the dict of the object being unpickled. We
-        # can provide save compatibility for new settings options (which
-        # normally would not be present in the unpickled object) by creating a
-        # new settings object, updating it with the unpickled state, and
-        # updating our dict with that.
-        new_state = Settings().__dict__
-        new_state.update(state)
-        self.__dict__.update(new_state)

game/theater/__init__.py

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

game/theater/controlpoint.py

@@ -1,973 +0,0 @@
-from __future__ import annotations
-
-import heapq
-import itertools
-import logging
-import random
-from abc import ABC, abstractmethod
-from dataclasses import dataclass, field
-from enum import Enum
-from functools import total_ordering
-from typing import Any, Dict, Iterator, List, Optional, TYPE_CHECKING, Type
-
-from dcs.mapping import Point
-from dcs.ships import (
-    CVN_74_John_C__Stennis,
-    CV_1143_5_Admiral_Kuznetsov,
-    LHA_1_Tarawa,
-    Type_071_Amphibious_Transport_Dock,
-)
-from dcs.terrain.terrain import Airport, ParkingSlot
-from dcs.unittype import FlyingType
-
-from game import db
-from gen.flights.closestairfields import ObjectiveDistanceCache
-from gen.ground_forces.ai_ground_planner_db import TYPE_SHORAD
-from gen.ground_forces.combat_stance import CombatStance
-from gen.runways import RunwayAssigner, RunwayData
-from .base import Base
-from .missiontarget import MissionTarget
-from game.point_with_heading import PointWithHeading
-from .theatergroundobject import (
-    BaseDefenseGroundObject,
-    EwrGroundObject,
-    GenericCarrierGroundObject,
-    SamGroundObject,
-    TheaterGroundObject,
-    VehicleGroupGroundObject,
-)
-from ..db import PRICES
-from ..utils import nautical_miles
-from ..weather import Conditions
-
-if TYPE_CHECKING:
-    from game import Game
-    from gen.flights.flight import FlightType
-
-
-class ControlPointType(Enum):
-    #: An airbase with slots for everything.
-    AIRBASE = 0
-    #: A group with a Stennis type carrier (F/A-18, F-14 compatible).
-    AIRCRAFT_CARRIER_GROUP = 1
-    #: A group with a Tarawa carrier (Helicopters & Harrier).
-    LHA_GROUP = 2
-    #: A FARP, with slots for helicopters
-    FARP = 4
-    #: A FOB (ground units only)
-    FOB = 5
-    OFF_MAP = 6
-
-
-class LocationType(Enum):
-    BaseAirDefense = "base air defense"
-    Coastal = "coastal defense"
-    Ewr = "EWR"
-    BaseEwr = "Base EWR"
-    Garrison = "garrison"
-    MissileSite = "missile site"
-    OffshoreStrikeTarget = "offshore strike target"
-    Sam = "SAM"
-    Ship = "ship"
-    Shorad = "SHORAD"
-    StrikeTarget = "strike target"
-
-
-@dataclass
-class PresetLocations:
-    """Defines the preset locations loaded from the campaign mission file."""
-
-    #: Locations used for spawning ground defenses for bases.
-    base_garrisons: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations used for spawning air defenses for bases. Used by SAMs, AAA,
-    #: and SHORADs.
-    base_air_defense: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations used by EWRs.
-    ewrs: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations used by Base EWRs.
-    base_ewrs: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations used by non-carrier ships. Carriers and LHAs are not random.
-    ships: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations used by coastal defenses.
-    coastal_defenses: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations used by ground based strike objectives.
-    strike_locations: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations used by offshore strike objectives.
-    offshore_strike_locations: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations used by missile sites like scuds and V-2s.
-    missile_sites: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations of long range SAMs which should always be spawned.
-    required_long_range_sams: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations of medium range SAMs which should always be spawned.
-    required_medium_range_sams: List[PointWithHeading] = field(default_factory=list)
-
-    #: Locations of EWRs which should always be spawned.
-    required_ewrs: List[PointWithHeading] = field(default_factory=list)
-
-    @staticmethod
-    def _random_from(points: List[PointWithHeading]) -> Optional[PointWithHeading]:
-        """Finds, removes, and returns a random position from the given list."""
-        if not points:
-            return None
-        point = random.choice(points)
-        points.remove(point)
-        return point
-
-    def random_for(self, location_type: LocationType) -> Optional[PointWithHeading]:
-        """Returns a position suitable for the given location type.
-
-        The location, if found, will be claimed by the caller and not available
-        to subsequent calls.
-        """
-        if location_type == LocationType.BaseAirDefense:
-            return self._random_from(self.base_air_defense)
-        if location_type == LocationType.Coastal:
-            return self._random_from(self.coastal_defenses)
-        if location_type == LocationType.Ewr:
-            return self._random_from(self.ewrs)
-        if location_type == LocationType.BaseEwr:
-            return self._random_from(self.base_ewrs)
-        if location_type == LocationType.Garrison:
-            return self._random_from(self.base_garrisons)
-        if location_type == LocationType.MissileSite:
-            return self._random_from(self.missile_sites)
-        if location_type == LocationType.OffshoreStrikeTarget:
-            return self._random_from(self.offshore_strike_locations)
-        if location_type == LocationType.Sam:
-            return self._random_from(self.strike_locations)
-        if location_type == LocationType.Ship:
-            return self._random_from(self.ships)
-        if location_type == LocationType.Shorad:
-            return self._random_from(self.base_garrisons)
-        if location_type == LocationType.StrikeTarget:
-            return self._random_from(self.strike_locations)
-        logging.error(f"Unknown location type: {location_type}")
-        return None
-
-
-@dataclass(frozen=True)
-class PendingOccupancy:
-    present: int
-    ordered: int
-    transferring: int
-
-    @property
-    def total(self) -> int:
-        return self.present + self.ordered + self.transferring
-
-
-@dataclass
-class RunwayStatus:
-    damaged: bool = False
-    repair_turns_remaining: Optional[int] = None
-
-    def damage(self) -> None:
-        self.damaged = True
-        # If the runway is already under repair and is damaged again, progress
-        # is reset.
-        self.repair_turns_remaining = None
-
-    def begin_repair(self) -> None:
-        if self.repair_turns_remaining is not None:
-            logging.error("Runway already under repair. Restarting.")
-        self.repair_turns_remaining = 4
-
-    def process_turn(self) -> None:
-        if self.repair_turns_remaining is not None:
-            if self.repair_turns_remaining == 1:
-                self.repair_turns_remaining = None
-                self.damaged = False
-            else:
-                self.repair_turns_remaining -= 1
-
-    @property
-    def needs_repair(self) -> bool:
-        return self.damaged and self.repair_turns_remaining is None
-
-    def __str__(self) -> str:
-        if not self.damaged:
-            return "Runway operational"
-
-        turns_remaining = self.repair_turns_remaining
-        if turns_remaining is None:
-            return "Runway damaged"
-
-        return f"Runway repairing, {turns_remaining} turns remaining"
-
-
-@total_ordering
-class GroundUnitDestination:
-    def __init__(self, control_point: ControlPoint) -> None:
-        self.control_point = control_point
-
-    @property
-    def total_value(self) -> float:
-        return self.control_point.base.total_armor_value
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, GroundUnitDestination):
-            raise TypeError
-
-        return self.total_value == other.total_value
-
-    def __lt__(self, other: Any) -> bool:
-        if not isinstance(other, GroundUnitDestination):
-            raise TypeError
-
-        return self.total_value < other.total_value
-
-
-class ControlPoint(MissionTarget, ABC):
-
-    position = None  # type: Point
-    name = None  # type: str
-
-    captured = False
-    has_frontline = True
-
-    alt = 0
-
-    # TODO: Only airbases have IDs.
-    # TODO: has_frontline is only reasonable for airbases.
-    # TODO: cptype is obsolete.
-    def __init__(
-        self,
-        cp_id: int,
-        name: str,
-        position: Point,
-        at: db.StartingPosition,
-        size: int,
-        importance: float,
-        has_frontline=True,
-        cptype=ControlPointType.AIRBASE,
-    ):
-        super().__init__(name, position)
-        # TODO: Should be Airbase specific.
-        self.id = cp_id
-        self.full_name = name
-        self.at = at
-        self.connected_objectives: List[TheaterGroundObject] = []
-        self.base_defenses: List[BaseDefenseGroundObject] = []
-        self.preset_locations = PresetLocations()
-        self.helipads: List[PointWithHeading] = []
-
-        # TODO: Should be Airbase specific.
-        self.size = size
-        self.importance = importance
-        self.captured = False
-        self.captured_invert = False
-        # TODO: Should be Airbase specific.
-        self.has_frontline = has_frontline
-        self.connected_points: List[ControlPoint] = []
-        self.base: Base = Base()
-        self.cptype = cptype
-        # TODO: Should be Airbase specific.
-        self.stances: Dict[int, CombatStance] = {}
-        from ..event import UnitsDeliveryEvent
-
-        self.pending_unit_deliveries = UnitsDeliveryEvent(self)
-
-        self.target_position: Optional[Point] = None
-
-    def __repr__(self):
-        return f"<{__class__}: {self.name}>"
-
-    @property
-    def ground_objects(self) -> List[TheaterGroundObject]:
-        return list(itertools.chain(self.connected_objectives, self.base_defenses))
-
-    @property
-    @abstractmethod
-    def heading(self) -> int:
-        ...
-
-    def __str__(self):
-        return self.name
-
-    @property
-    def is_global(self):
-        return not self.connected_points
-
-    @property
-    def is_carrier(self):
-        """
-        :return: Whether this control point is an aircraft carrier
-        """
-        return False
-
-    @property
-    def is_fleet(self):
-        """
-        :return: Whether this control point is a boat (mobile)
-        """
-        return False
-
-    @property
-    def is_lha(self):
-        """
-        :return: Whether this control point is an LHA
-        """
-        return False
-
-    @property
-    def moveable(self) -> bool:
-        """
-        :return: Whether this control point can be moved around
-        """
-        return False
-
-    @property
-    @abstractmethod
-    def can_deploy_ground_units(self) -> bool:
-        ...
-
-    @property
-    @abstractmethod
-    def total_aircraft_parking(self):
-        """
-        :return: The maximum number of aircraft that can be stored in this
-                 control point
-        """
-        ...
-
-    # TODO: Should be Airbase specific.
-    def connect(self, to: ControlPoint) -> None:
-        self.connected_points.append(to)
-        self.stances[to.id] = CombatStance.DEFENSIVE
-
-    @abstractmethod
-    def runway_is_operational(self) -> bool:
-        """
-        Check whether this control point supports taking offs and landings.
-        :return:
-        """
-        ...
-
-    # TODO: Should be naval specific.
-    def get_carrier_group_name(self):
-        """
-        Get the carrier group name if the airbase is a carrier
-        :return: Carrier group name
-        """
-        if self.cptype in [
-            ControlPointType.AIRCRAFT_CARRIER_GROUP,
-            ControlPointType.LHA_GROUP,
-        ]:
-            for g in self.ground_objects:
-                if g.dcs_identifier == "CARRIER":
-                    for group in g.groups:
-                        for u in group.units:
-                            if db.unit_type_from_name(u.type) in [
-                                CVN_74_John_C__Stennis,
-                                CV_1143_5_Admiral_Kuznetsov,
-                            ]:
-                                return group.name
-                elif g.dcs_identifier == "LHA":
-                    for group in g.groups:
-                        for u in group.units:
-                            if db.unit_type_from_name(u.type) in [LHA_1_Tarawa]:
-                                return group.name
-        return None
-
-    # TODO: Should be Airbase specific.
-    def is_connected(self, to) -> bool:
-        return to in self.connected_points
-
-    def find_ground_objects_by_obj_name(self, obj_name):
-        found = []
-        for g in self.ground_objects:
-            if g.obj_name == obj_name:
-                found.append(g)
-        return found
-
-    def is_friendly(self, to_player: bool) -> bool:
-        return self.captured == to_player
-
-    # TODO: Should be Airbase specific.
-    def clear_base_defenses(self) -> None:
-        for base_defense in self.base_defenses:
-            p = PointWithHeading.from_point(base_defense.position, base_defense.heading)
-            if isinstance(base_defense, EwrGroundObject):
-                self.preset_locations.base_ewrs.append(p)
-            elif isinstance(base_defense, SamGroundObject):
-                self.preset_locations.base_air_defense.append(p)
-            elif isinstance(base_defense, VehicleGroupGroundObject):
-                self.preset_locations.base_garrisons.append(p)
-            else:
-                logging.error(
-                    "Could not determine preset location type for "
-                    f"{base_defense}. Assuming garrison type."
-                )
-                self.preset_locations.base_garrisons.append(p)
-        self.base_defenses = []
-
-    def capture_equipment(self, game: Game) -> None:
-        total = self.base.total_armor_value
-        self.base.armor.clear()
-        game.adjust_budget(total, player=not self.captured)
-        game.message(
-            f"{self.name} is not connected to any friendly points. Ground "
-            f"vehicles have been captured and sold for ${total}M."
-        )
-
-    def retreat_ground_units(self, game: Game):
-        # When there are multiple valid destinations, deliver units to whichever
-        # base is least defended first. The closest approximation of unit
-        # strength we have is price
-        destinations = [
-            GroundUnitDestination(cp)
-            for cp in self.connected_points
-            if cp.captured == self.captured
-        ]
-        if not destinations:
-            self.capture_equipment(game)
-            return
-
-        heapq.heapify(destinations)
-        destination = heapq.heappop(destinations)
-        while self.base.armor:
-            unit_type, count = self.base.armor.popitem()
-            for _ in range(count):
-                destination.control_point.base.commision_units({unit_type: 1})
-                destination = heapq.heappushpop(destinations, destination)
-
-    def capture_aircraft(
-        self, game: Game, airframe: Type[FlyingType], count: int
-    ) -> None:
-        try:
-            value = PRICES[airframe] * count
-        except KeyError:
-            logging.exception(f"Unknown price for {airframe.id}")
-            return
-
-        game.adjust_budget(value, player=not self.captured)
-        game.message(
-            f"No valid retreat destination in range of {self.name} for "
-            f"{airframe.id}. {count} aircraft have been captured and sold for "
-            f"${value}M."
-        )
-
-    def aircraft_retreat_destination(
-        self, game: Game, airframe: Type[FlyingType]
-    ) -> Optional[ControlPoint]:
-        closest = ObjectiveDistanceCache.get_closest_airfields(self)
-        # TODO: Should be airframe dependent.
-        max_retreat_distance = nautical_miles(200)
-        # Skip the first airbase because that's the airbase we're retreating
-        # from.
-        airfields = list(closest.airfields_within(max_retreat_distance))[1:]
-        for airbase in airfields:
-            if not airbase.can_operate(airframe):
-                continue
-            if airbase.captured != self.captured:
-                continue
-            if airbase.unclaimed_parking(game) > 0:
-                return airbase
-        return None
-
-    def _retreat_air_units(
-        self, game: Game, airframe: Type[FlyingType], count: int
-    ) -> None:
-        while count:
-            logging.debug(f"Retreating {count} {airframe.id} from {self.name}")
-            destination = self.aircraft_retreat_destination(game, airframe)
-            if destination is None:
-                self.capture_aircraft(game, airframe, count)
-                return
-            parking = destination.unclaimed_parking(game)
-            transfer_amount = min([parking, count])
-            destination.base.commision_units({airframe: transfer_amount})
-            count -= transfer_amount
-
-    def retreat_air_units(self, game: Game) -> None:
-        # TODO: Capture in order of price to retain maximum value?
-        while self.base.aircraft:
-            airframe, count = self.base.aircraft.popitem()
-            self._retreat_air_units(game, airframe, count)
-
-    # TODO: Should be Airbase specific.
-    def capture(self, game: Game, for_player: bool) -> None:
-        self.pending_unit_deliveries.refund_all(game)
-        self.retreat_ground_units(game)
-        self.retreat_air_units(game)
-
-        if for_player:
-            self.captured = True
-        else:
-            self.captured = False
-
-        self.base.set_strength_to_minimum()
-
-        self.clear_base_defenses()
-        from .start_generator import BaseDefenseGenerator
-
-        BaseDefenseGenerator(game, self).generate()
-
-    @abstractmethod
-    def can_operate(self, aircraft: Type[FlyingType]) -> bool:
-        ...
-
-    def aircraft_transferring(self, game: Game) -> int:
-        if self.captured:
-            ato = game.blue_ato
-        else:
-            ato = game.red_ato
-
-        total = 0
-        for package in ato.packages:
-            for flight in package.flights:
-                if flight.departure == flight.arrival:
-                    continue
-                if flight.departure == self:
-                    total -= flight.count
-                elif flight.arrival == self:
-                    total += flight.count
-        return total
-
-    def expected_aircraft_next_turn(self, game: Game) -> PendingOccupancy:
-        on_order = 0
-        for unit_bought in self.pending_unit_deliveries.units:
-            if issubclass(unit_bought, FlyingType):
-                on_order += self.pending_unit_deliveries.units[unit_bought]
-
-        return PendingOccupancy(
-            self.base.total_aircraft, on_order, self.aircraft_transferring(game)
-        )
-
-    def unclaimed_parking(self, game: Game) -> int:
-        return (
-            self.total_aircraft_parking - self.expected_aircraft_next_turn(game).total
-        )
-
-    @abstractmethod
-    def active_runway(
-        self, conditions: Conditions, dynamic_runways: Dict[str, RunwayData]
-    ) -> RunwayData:
-        ...
-
-    @property
-    def parking_slots(self) -> Iterator[ParkingSlot]:
-        yield from []
-
-    @property
-    @abstractmethod
-    def runway_status(self) -> RunwayStatus:
-        ...
-
-    @property
-    def runway_can_be_repaired(self) -> bool:
-        return self.runway_status.needs_repair
-
-    def begin_runway_repair(self) -> None:
-        if not self.runway_can_be_repaired:
-            logging.error(f"Cannot repair runway at {self}")
-            return
-        self.runway_status.begin_repair()
-
-    def process_turn(self, game: Game) -> None:
-        self.pending_unit_deliveries.process(game)
-
-        runway_status = self.runway_status
-        if runway_status is not None:
-            runway_status.process_turn()
-
-        # Process movements for ships control points group
-        if self.target_position is not None:
-            delta = self.target_position - self.position
-            self.position = self.target_position
-            self.target_position = None
-
-            # Move the linked unit groups
-            for ground_object in self.ground_objects:
-                if isinstance(ground_object, GenericCarrierGroundObject):
-                    ground_object.position.x = ground_object.position.x + delta.x
-                    ground_object.position.y = ground_object.position.y + delta.y
-                    for group in ground_object.groups:
-                        for u in group.units:
-                            u.position.x = u.position.x + delta.x
-                            u.position.y = u.position.y + delta.y
-
-    @property
-    def pending_frontline_aa_deliveries_count(self):
-        """
-        Get number of pending frontline aa units
-        """
-        if self.pending_unit_deliveries:
-            return sum(
-                [
-                    v
-                    for k, v in self.pending_unit_deliveries.units.items()
-                    if k in TYPE_SHORAD
-                ]
-            )
-        else:
-            return 0
-
-    @property
-    def pending_deliveries_count(self):
-        """
-        Get number of pending units
-        """
-        if self.pending_unit_deliveries:
-            return sum([v for k, v in self.pending_unit_deliveries.units.items()])
-        else:
-            return 0
-
-    @property
-    def expected_ground_units_next_turn(self) -> PendingOccupancy:
-        on_order = 0
-        for unit_bought in self.pending_unit_deliveries.units:
-            if issubclass(unit_bought, FlyingType):
-                continue
-            if unit_bought in TYPE_SHORAD:
-                continue
-            on_order += self.pending_unit_deliveries.units[unit_bought]
-
-        return PendingOccupancy(
-            self.base.total_armor,
-            on_order,
-            # Ground unit transfers not yet implemented.
-            transferring=0,
-        )
-
-    @property
-    def income_per_turn(self) -> int:
-        return 0
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if self.is_friendly(for_player):
-            yield from [
-                FlightType.AEWC,
-            ]
-        yield from super().mission_types(for_player)
-
-    @property
-    def has_active_frontline(self) -> bool:
-        return any(not c.is_friendly(self.captured) for c in self.connected_points)
-
-
-class Airfield(ControlPoint):
-    def __init__(
-        self, airport: Airport, size: int, importance: float, has_frontline=True
-    ):
-        super().__init__(
-            airport.id,
-            airport.name,
-            airport.position,
-            airport,
-            size,
-            importance,
-            has_frontline,
-            cptype=ControlPointType.AIRBASE,
-        )
-        self.airport = airport
-        self._runway_status = RunwayStatus()
-
-    def can_operate(self, aircraft: FlyingType) -> bool:
-        # TODO: Allow helicopters.
-        # Need to implement ground spawns so the helos don't use the runway.
-        # TODO: Allow harrier.
-        # Needs ground spawns just like helos do, but also need to be able to
-        # limit takeoff weight to ~20500 lbs or it won't be able to take off.
-        return self.runway_is_operational()
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if self.is_friendly(for_player):
-            yield from [
-                # TODO: FlightType.INTERCEPTION
-                # TODO: FlightType.LOGISTICS
-            ]
-        else:
-            yield from [
-                FlightType.OCA_AIRCRAFT,
-                FlightType.OCA_RUNWAY,
-            ]
-        yield from super().mission_types(for_player)
-
-    @property
-    def total_aircraft_parking(self) -> int:
-        return len(self.airport.parking_slots)
-
-    @property
-    def heading(self) -> int:
-        return self.airport.runways[0].heading
-
-    def runway_is_operational(self) -> bool:
-        return not self.runway_status.damaged
-
-    @property
-    def runway_status(self) -> RunwayStatus:
-        return self._runway_status
-
-    def damage_runway(self) -> None:
-        self.runway_status.damage()
-
-    def active_runway(
-        self, conditions: Conditions, dynamic_runways: Dict[str, RunwayData]
-    ) -> RunwayData:
-        assigner = RunwayAssigner(conditions)
-        return assigner.get_preferred_runway(self.airport)
-
-    @property
-    def parking_slots(self) -> Iterator[ParkingSlot]:
-        yield from self.airport.parking_slots
-
-    @property
-    def can_deploy_ground_units(self) -> bool:
-        return True
-
-    @property
-    def income_per_turn(self) -> int:
-        return 20
-
-
-class NavalControlPoint(ControlPoint, ABC):
-    @property
-    def is_fleet(self) -> bool:
-        return True
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if self.is_friendly(for_player):
-            yield from [
-                # TODO: FlightType.INTERCEPTION
-                # TODO: Buddy tanking for the A-4?
-                # TODO: Rescue chopper?
-                # TODO: Inter-ship logistics?
-            ]
-        else:
-            yield FlightType.ANTISHIP
-        yield from super().mission_types(for_player)
-
-    @property
-    def heading(self) -> int:
-        return 0  # TODO compute heading
-
-    def runway_is_operational(self) -> bool:
-        # Necessary because it's possible for the carrier itself to have sunk
-        # while its escorts are still alive.
-        for g in self.ground_objects:
-            if g.dcs_identifier in ["CARRIER", "LHA"]:
-                for group in g.groups:
-                    for u in group.units:
-                        if db.unit_type_from_name(u.type) in [
-                            CVN_74_John_C__Stennis,
-                            LHA_1_Tarawa,
-                            CV_1143_5_Admiral_Kuznetsov,
-                            Type_071_Amphibious_Transport_Dock,
-                        ]:
-                            return True
-        return False
-
-    def active_runway(
-        self, conditions: Conditions, dynamic_runways: Dict[str, RunwayData]
-    ) -> RunwayData:
-        # TODO: Assign TACAN and ICLS earlier so we don't need this.
-        fallback = RunwayData(self.full_name, runway_heading=0, runway_name="")
-        return dynamic_runways.get(self.name, fallback)
-
-    @property
-    def runway_status(self) -> RunwayStatus:
-        return RunwayStatus(damaged=not self.runway_is_operational())
-
-    @property
-    def runway_can_be_repaired(self) -> bool:
-        return False
-
-    @property
-    def moveable(self) -> bool:
-        return True
-
-    @property
-    def can_deploy_ground_units(self) -> bool:
-        return False
-
-
-class Carrier(NavalControlPoint):
-    def __init__(self, name: str, at: Point, cp_id: int):
-        import game.theater.conflicttheater
-
-        super().__init__(
-            cp_id,
-            name,
-            at,
-            at,
-            game.theater.conflicttheater.SIZE_SMALL,
-            1,
-            has_frontline=False,
-            cptype=ControlPointType.AIRCRAFT_CARRIER_GROUP,
-        )
-
-    def capture(self, game: Game, for_player: bool) -> None:
-        raise RuntimeError("Carriers cannot be captured")
-
-    @property
-    def is_carrier(self):
-        return True
-
-    def can_operate(self, aircraft: FlyingType) -> bool:
-        return aircraft in db.CARRIER_CAPABLE
-
-    @property
-    def total_aircraft_parking(self) -> int:
-        return 90
-
-
-class Lha(NavalControlPoint):
-    def __init__(self, name: str, at: Point, cp_id: int):
-        import game.theater.conflicttheater
-
-        super().__init__(
-            cp_id,
-            name,
-            at,
-            at,
-            game.theater.conflicttheater.SIZE_SMALL,
-            1,
-            has_frontline=False,
-            cptype=ControlPointType.LHA_GROUP,
-        )
-
-    def capture(self, game: Game, for_player: bool) -> None:
-        raise RuntimeError("LHAs cannot be captured")
-
-    @property
-    def is_lha(self) -> bool:
-        return True
-
-    def can_operate(self, aircraft: FlyingType) -> bool:
-        return aircraft in db.LHA_CAPABLE
-
-    @property
-    def total_aircraft_parking(self) -> int:
-        return 20
-
-
-class OffMapSpawn(ControlPoint):
-    def runway_is_operational(self) -> bool:
-        return True
-
-    def __init__(self, cp_id: int, name: str, position: Point):
-        from . import IMPORTANCE_MEDIUM, SIZE_REGULAR
-
-        super().__init__(
-            cp_id,
-            name,
-            position,
-            at=position,
-            size=SIZE_REGULAR,
-            importance=IMPORTANCE_MEDIUM,
-            has_frontline=False,
-            cptype=ControlPointType.OFF_MAP,
-        )
-
-    def capture(self, game: Game, for_player: bool) -> None:
-        raise RuntimeError("Off map control points cannot be captured")
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        yield from []
-
-    @property
-    def total_aircraft_parking(self) -> int:
-        return 1000
-
-    def can_operate(self, aircraft: FlyingType) -> bool:
-        return True
-
-    @property
-    def heading(self) -> int:
-        return 0
-
-    def active_runway(
-        self, conditions: Conditions, dynamic_runways: Dict[str, RunwayData]
-    ) -> RunwayData:
-        logging.warning("TODO: Off map spawns have no runways.")
-        return RunwayData(self.full_name, runway_heading=0, runway_name="")
-
-    @property
-    def runway_status(self) -> RunwayStatus:
-        return RunwayStatus()
-
-    @property
-    def can_deploy_ground_units(self) -> bool:
-        return False
-
-
-class Fob(ControlPoint):
-    def __init__(self, name: str, at: Point, cp_id: int):
-        import game.theater.conflicttheater
-
-        super().__init__(
-            cp_id,
-            name,
-            at,
-            at,
-            game.theater.conflicttheater.SIZE_SMALL,
-            1,
-            has_frontline=True,
-            cptype=ControlPointType.FOB,
-        )
-        self.name = name
-
-    def runway_is_operational(self) -> bool:
-        return False
-
-    def active_runway(
-        self, conditions: Conditions, dynamic_runways: Dict[str, RunwayData]
-    ) -> RunwayData:
-        logging.warning("TODO: FOBs have no runways.")
-        return RunwayData(self.full_name, runway_heading=0, runway_name="")
-
-    @property
-    def runway_status(self) -> RunwayStatus:
-        return RunwayStatus()
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if self.is_friendly(for_player):
-            yield from [
-                FlightType.BARCAP,
-                # TODO: FlightType.LOGISTICS
-            ]
-        else:
-            yield from [
-                FlightType.STRIKE,
-                FlightType.SWEEP,
-                FlightType.ESCORT,
-                FlightType.SEAD,
-            ]
-
-    @property
-    def total_aircraft_parking(self) -> int:
-        return 0
-
-    def can_operate(self, aircraft: FlyingType) -> bool:
-        return False
-
-    @property
-    def heading(self) -> int:
-        return 0
-
-    @property
-    def can_deploy_ground_units(self) -> bool:
-        return True
-
-    @property
-    def income_per_turn(self) -> int:
-        return 10

game/theater/landmap.py

@@ -1,48 +0,0 @@
-from dataclasses import dataclass
-import pickle
-from functools import cached_property
-from typing import Optional, Tuple, Union
-import logging
-
-from shapely import geometry
-from shapely.geometry import MultiPolygon, Polygon
-
-
-@dataclass(frozen=True)
-class Landmap:
-    inclusion_zones: MultiPolygon
-    exclusion_zones: MultiPolygon
-    sea_zones: MultiPolygon
-
-    def __post_init__(self):
-        if not self.inclusion_zones.is_valid:
-            raise RuntimeError("Inclusion zones not valid")
-        if not self.exclusion_zones.is_valid:
-            raise RuntimeError("Exclusion zones not valid")
-        if not self.sea_zones.is_valid:
-            raise RuntimeError("Sea zones not valid")
-
-    @cached_property
-    def inclusion_zone_only(self) -> MultiPolygon:
-        return self.inclusion_zones - self.exclusion_zones - self.sea_zones
-
-
-def load_landmap(filename: str) -> Optional[Landmap]:
-    try:
-        with open(filename, "rb") as f:
-            return pickle.load(f)
-    except:
-        logging.exception(f"Failed to load landmap {filename}")
-        return None
-
-
-def poly_contains(x, y, poly: Union[MultiPolygon, Polygon]):
-    return poly.contains(geometry.Point(x, y))
-
-
-def poly_centroid(poly) -> Tuple[float, float]:
-    x_list = [vertex[0] for vertex in poly]
-    y_list = [vertex[1] for vertex in poly]
-    x = sum(x_list) / len(poly)
-    y = sum(y_list) / len(poly)
-    return (x, y)

game/theater/missiontarget.py

@@ -1,44 +0,0 @@
-from __future__ import annotations
-
-from typing import Iterator, TYPE_CHECKING
-
-from dcs.mapping import Point
-
-if TYPE_CHECKING:
-    from gen.flights.flight import FlightType
-
-
-class MissionTarget:
-    def __init__(self, name: str, position: Point) -> None:
-        """Initializes a mission target.
-
-        Args:
-            name: The name of the mission target.
-            position: The location of the mission target.
-        """
-        self.name = name
-        self.position = position
-
-    def distance_to(self, other: MissionTarget) -> int:
-        """Computes the distance to the given mission target."""
-        return self.position.distance_to_point(other.position)
-
-    def is_friendly(self, to_player: bool) -> bool:
-        """Returns True if the objective is in friendly territory."""
-        raise NotImplementedError
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if self.is_friendly(for_player):
-            yield FlightType.BARCAP
-        else:
-            yield from [
-                FlightType.ESCORT,
-                FlightType.TARCAP,
-                FlightType.SEAD,
-                FlightType.SWEEP,
-                # TODO: FlightType.ELINT,
-                # TODO: FlightType.EWAR,
-                # TODO: FlightType.RECON,
-            ]

game/theater/start_generator.py

@@ -1,907 +0,0 @@
-from __future__ import annotations
-
-import logging
-import pickle
-import random
-from dataclasses import dataclass
-from datetime import datetime
-from typing import Any, Dict, Iterable, List, Optional, Set
-
-from dcs.mapping import Point
-from dcs.task import CAP, CAS, PinpointStrike
-from dcs.vehicles import AirDefence
-
-from game import Game, db
-from game.factions.faction import Faction
-from game.theater import Carrier, Lha, LocationType, PointWithHeading
-from game.theater.theatergroundobject import (
-    BuildingGroundObject,
-    CarrierGroundObject,
-    EwrGroundObject,
-    LhaGroundObject,
-    MissileSiteGroundObject,
-    SamGroundObject,
-    ShipGroundObject,
-    VehicleGroupGroundObject,
-    CoastalSiteGroundObject,
-)
-from game.version import VERSION
-from gen import namegen
-from gen.coastal.coastal_group_generator import generate_coastal_group
-from gen.defenses.armor_group_generator import generate_armor_group
-from gen.fleet.ship_group_generator import (
-    generate_carrier_group,
-    generate_lha_group,
-    generate_ship_group,
-)
-from gen.locations.preset_location_finder import MizDataLocationFinder
-from gen.missiles.missiles_group_generator import generate_missile_group
-from gen.sam.airdefensegroupgenerator import AirDefenseRange
-from gen.sam.sam_group_generator import generate_anti_air_group
-from gen.sam.ewr_group_generator import generate_ewr_group
-from . import (
-    ConflictTheater,
-    ControlPoint,
-    ControlPointType,
-    Fob,
-    OffMapSpawn,
-)
-from ..settings import Settings
-
-GroundObjectTemplates = Dict[str, Dict[str, Any]]
-
-UNIT_VARIETY = 6
-UNIT_AMOUNT_FACTOR = 16
-UNIT_COUNT_IMPORTANCE_LOG = 1.3
-
-COUNT_BY_TASK = {
-    PinpointStrike: 12,
-    CAP: 8,
-    CAS: 4,
-    AirDefence: 1,
-}
-
-
-@dataclass(frozen=True)
-class GeneratorSettings:
-    start_date: datetime
-    player_budget: int
-    enemy_budget: int
-    midgame: bool
-    inverted: bool
-    no_carrier: bool
-    no_lha: bool
-    no_player_navy: bool
-    no_enemy_navy: bool
-
-
-class GameGenerator:
-    def __init__(
-        self,
-        player: str,
-        enemy: str,
-        theater: ConflictTheater,
-        settings: Settings,
-        generator_settings: GeneratorSettings,
-    ) -> None:
-        self.player = player
-        self.enemy = enemy
-        self.theater = theater
-        self.settings = settings
-        self.generator_settings = generator_settings
-
-    def generate(self) -> Game:
-        # Reset name generator
-        namegen.reset()
-        self.prepare_theater()
-        game = Game(
-            player_name=self.player,
-            enemy_name=self.enemy,
-            theater=self.theater,
-            start_date=self.generator_settings.start_date,
-            settings=self.settings,
-            player_budget=self.generator_settings.player_budget,
-            enemy_budget=self.generator_settings.enemy_budget,
-        )
-
-        GroundObjectGenerator(game, self.generator_settings).generate()
-        game.settings.version = VERSION
-        return game
-
-    def prepare_theater(self) -> None:
-        to_remove: List[ControlPoint] = []
-        # Auto-capture half the bases if midgame.
-        if self.generator_settings.midgame:
-            control_points = self.theater.controlpoints
-            for control_point in control_points[: len(control_points) // 2]:
-                control_point.captured = True
-
-        # Remove carrier and lha, invert situation if needed
-        for cp in self.theater.controlpoints:
-            if isinstance(cp, Carrier) and self.generator_settings.no_carrier:
-                to_remove.append(cp)
-            elif isinstance(cp, Lha) and self.generator_settings.no_lha:
-                to_remove.append(cp)
-
-            if self.generator_settings.inverted:
-                cp.captured = cp.captured_invert
-
-        # do remove
-        for cp in to_remove:
-            self.theater.controlpoints.remove(cp)
-
-        # TODO: Fix this. This captures all bases for blue.
-        # reapply midgame inverted if needed
-        if self.generator_settings.midgame and self.generator_settings.inverted:
-            for i, cp in enumerate(reversed(self.theater.controlpoints)):
-                if i > len(self.theater.controlpoints):
-                    break
-                else:
-                    cp.captured = True
-
-
-class LocationFinder:
-    def __init__(self, game: Game, control_point: ControlPoint) -> None:
-        self.game = game
-        self.control_point = control_point
-        self.miz_data = MizDataLocationFinder.compute_possible_locations(
-            game.theater.terrain.name, control_point.full_name
-        )
-
-    def location_for(self, location_type: LocationType) -> Optional[PointWithHeading]:
-        position = self.control_point.preset_locations.random_for(location_type)
-        if position is not None:
-            return position
-
-        logging.warning(
-            f"No campaign location for %s Mat %s",
-            location_type.value,
-            self.control_point,
-        )
-        position = self.random_from_miz_data(
-            location_type == LocationType.OffshoreStrikeTarget
-        )
-        if position is not None:
-            return position
-
-        logging.debug(
-            f"No mizdata location for %s at %s", location_type.value, self.control_point
-        )
-        position = self.random_position(location_type)
-        if position is not None:
-            return position
-
-        logging.error(
-            f"Could not find position for %s at %s",
-            location_type.value,
-            self.control_point,
-        )
-        return None
-
-    def random_from_miz_data(self, offshore: bool) -> Optional[PointWithHeading]:
-        if offshore:
-            locations = self.miz_data.offshore_locations
-        else:
-            locations = self.miz_data.ashore_locations
-        if self.miz_data.offshore_locations:
-            preset = random.choice(locations)
-            locations.remove(preset)
-            return PointWithHeading.from_point(preset.position, preset.heading)
-        return None
-
-    def random_position(
-        self, location_type: LocationType
-    ) -> Optional[PointWithHeading]:
-        # TODO: Flesh out preset locations so we never hit this case.
-
-        if location_type == LocationType.Coastal:
-            # No coastal locations generated randomly
-            return None
-
-        logging.warning(
-            "Falling back to random location for %s at %s",
-            location_type.value,
-            self.control_point,
-        )
-
-        is_base_defense = location_type in {
-            LocationType.BaseAirDefense,
-            LocationType.Garrison,
-            LocationType.Shorad,
-        }
-
-        on_land = location_type not in {
-            LocationType.OffshoreStrikeTarget,
-            LocationType.Ship,
-        }
-
-        avoid_others = location_type not in {
-            LocationType.Garrison,
-            LocationType.MissileSite,
-            LocationType.Sam,
-            LocationType.Ship,
-            LocationType.Shorad,
-        }
-
-        if is_base_defense:
-            min_range = 400
-            max_range = 3200
-        elif location_type == LocationType.Ship:
-            min_range = 5000
-            max_range = 40000
-        elif location_type == LocationType.MissileSite:
-            min_range = 2500
-            max_range = 40000
-        else:
-            min_range = 10000
-            max_range = 40000
-
-        position = self._find_random_position(
-            min_range, max_range, on_land, is_base_defense, avoid_others
-        )
-
-        # Retry once, searching a bit further (On some big airbases, 3200 is too
-        # short (Ex : Incirlik)), but searching farther on every base would be
-        # problematic, as some base defense units would end up very far away
-        # from small airfields.
-        if position is None and is_base_defense:
-            position = self._find_random_position(
-                3200, 4800, on_land, is_base_defense, avoid_others
-            )
-        return position
-
-    def _find_random_position(
-        self,
-        min_range: int,
-        max_range: int,
-        on_ground: bool,
-        is_base_defense: bool,
-        avoid_others: bool,
-    ) -> Optional[PointWithHeading]:
-        """
-        Find a valid ground object location
-        :param on_ground: Whether it should be on ground or on sea (True = on
-        ground)
-        :param min_range: Minimal range from point
-        :param max_range: Max range from point
-        :param is_base_defense: True if the location is for base defense.
-        :return:
-        """
-        near = self.control_point.position
-        others = self.control_point.ground_objects
-
-        def is_valid(point: Optional[PointWithHeading]) -> bool:
-            if point is None:
-                return False
-
-            if on_ground and not self.game.theater.is_on_land(point):
-                return False
-            elif not on_ground and not self.game.theater.is_in_sea(point):
-                return False
-
-            if avoid_others:
-                for other in others:
-                    if other.position.distance_to_point(point) < 10000:
-                        return False
-
-            if is_base_defense:
-                # If it's a base defense we don't care how close it is to other
-                # points.
-                return True
-
-            # Else verify that it's not too close to another control point.
-            for control_point in self.game.theater.controlpoints:
-                if control_point != self.control_point:
-                    if control_point.position.distance_to_point(point) < 30000:
-                        return False
-                    for ground_obj in control_point.ground_objects:
-                        if ground_obj.position.distance_to_point(point) < 10000:
-                            return False
-            return True
-
-        for _ in range(300):
-            # Check if on land or sea
-            p = PointWithHeading.from_point(
-                near.random_point_within(max_range, min_range), random.randint(0, 360)
-            )
-            if is_valid(p):
-                return p
-        return None
-
-
-class ControlPointGroundObjectGenerator:
-    def __init__(
-        self,
-        game: Game,
-        generator_settings: GeneratorSettings,
-        control_point: ControlPoint,
-    ) -> None:
-        self.game = game
-        self.generator_settings = generator_settings
-        self.control_point = control_point
-        self.location_finder = LocationFinder(game, control_point)
-
-    @property
-    def faction_name(self) -> str:
-        if self.control_point.captured:
-            return self.game.player_name
-        else:
-            return self.game.enemy_name
-
-    @property
-    def faction(self) -> Faction:
-        return db.FACTIONS[self.faction_name]
-
-    def generate(self) -> bool:
-        self.control_point.connected_objectives = []
-        if self.faction.navy_generators:
-            # Even airbases can generate navies if they are close enough to the
-            # water. This is not controlled by the control point definition, but
-            # rather by whether or not the generator can find a valid position
-            # for the ship.
-            self.generate_navy()
-
-        return True
-
-    def generate_navy(self) -> None:
-        skip_player_navy = self.generator_settings.no_player_navy
-        if self.control_point.captured and skip_player_navy:
-            return
-
-        skip_enemy_navy = self.generator_settings.no_enemy_navy
-        if not self.control_point.captured and skip_enemy_navy:
-            return
-
-        for _ in range(self.faction.navy_group_count):
-            self.generate_ship()
-
-    def generate_ship(self) -> None:
-        point = self.location_finder.location_for(LocationType.OffshoreStrikeTarget)
-        if point is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = ShipGroundObject(
-            namegen.random_objective_name(), group_id, point, self.control_point
-        )
-
-        group = generate_ship_group(self.game, g, self.faction_name)
-        g.groups = []
-        if group is not None:
-            g.groups.append(group)
-            self.control_point.connected_objectives.append(g)
-
-
-class NoOpGroundObjectGenerator(ControlPointGroundObjectGenerator):
-    def generate(self) -> bool:
-        return True
-
-
-class CarrierGroundObjectGenerator(ControlPointGroundObjectGenerator):
-    def generate(self) -> bool:
-        if not super().generate():
-            return False
-
-        carrier_names = self.faction.carrier_names
-        if not carrier_names:
-            logging.info(
-                f"Skipping generation of {self.control_point.name} because "
-                f"{self.faction_name} has no carriers"
-            )
-            return False
-
-        # Create ground object group
-        group_id = self.game.next_group_id()
-        g = CarrierGroundObject(
-            namegen.random_objective_name(), group_id, self.control_point
-        )
-        group = generate_carrier_group(self.faction_name, self.game, g)
-        g.groups = []
-        if group is not None:
-            g.groups.append(group)
-        self.control_point.connected_objectives.append(g)
-        self.control_point.name = random.choice(carrier_names)
-        return True
-
-
-class LhaGroundObjectGenerator(ControlPointGroundObjectGenerator):
-    def generate(self) -> bool:
-        if not super().generate():
-            return False
-
-        lha_names = self.faction.helicopter_carrier_names
-        if not lha_names:
-            logging.info(
-                f"Skipping generation of {self.control_point.name} because "
-                f"{self.faction_name} has no LHAs"
-            )
-            return False
-
-        # Create ground object group
-        group_id = self.game.next_group_id()
-        g = LhaGroundObject(
-            namegen.random_objective_name(), group_id, self.control_point
-        )
-        group = generate_lha_group(self.faction_name, self.game, g)
-        g.groups = []
-        if group is not None:
-            g.groups.append(group)
-        self.control_point.connected_objectives.append(g)
-        self.control_point.name = random.choice(lha_names)
-        return True
-
-
-class BaseDefenseGenerator:
-    def __init__(self, game: Game, control_point: ControlPoint) -> None:
-        self.game = game
-        self.control_point = control_point
-        self.location_finder = LocationFinder(game, control_point)
-
-    @property
-    def faction_name(self) -> str:
-        if self.control_point.captured:
-            return self.game.player_name
-        else:
-            return self.game.enemy_name
-
-    @property
-    def faction(self) -> Faction:
-        return db.FACTIONS[self.faction_name]
-
-    def generate(self) -> None:
-        self.generate_ewr()
-        self.generate_garrison()
-        self.generate_base_defenses()
-
-    def generate_ewr(self) -> None:
-        position = self.location_finder.location_for(LocationType.BaseEwr)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = EwrGroundObject(
-            namegen.random_objective_name(),
-            group_id,
-            position,
-            self.control_point,
-            True,
-        )
-
-        group = generate_ewr_group(self.game, g, self.faction)
-        if group is None:
-            logging.error(f"Could not generate EWR at {self.control_point}")
-            return
-
-        g.groups = [group]
-        self.control_point.base_defenses.append(g)
-
-    def generate_base_defenses(self) -> None:
-        # First group has a 1/2 chance of being a SAM, 1/6 chance of SHORAD,
-        # and a 1/6 chance of a garrison.
-        #
-        # Further groups have a 1/3 chance of being SHORAD and 2/3 chance of
-        # being a garrison.
-        for i in range(random.randint(2, 5)):
-            if i == 0 and random.randint(0, 1) == 0:
-                self.generate_sam()
-            elif random.randint(0, 2) == 1:
-                self.generate_shorad()
-            else:
-                self.generate_garrison()
-
-    def generate_garrison(self) -> None:
-        position = self.location_finder.location_for(LocationType.Garrison)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = VehicleGroupGroundObject(
-            namegen.random_objective_name(),
-            group_id,
-            position,
-            self.control_point,
-            for_airbase=True,
-        )
-
-        group = generate_armor_group(self.faction_name, self.game, g)
-        if group is None:
-            logging.error(f"Could not generate garrison at {self.control_point}")
-            return
-        g.groups.append(group)
-        self.control_point.base_defenses.append(g)
-
-    def generate_sam(self) -> None:
-        position = self.location_finder.location_for(LocationType.BaseAirDefense)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = SamGroundObject(
-            namegen.random_objective_name(),
-            group_id,
-            position,
-            self.control_point,
-            for_airbase=True,
-        )
-
-        groups = generate_anti_air_group(self.game, g, self.faction)
-        if not groups:
-            logging.error(f"Could not generate SAM at {self.control_point}")
-            return
-        g.groups = groups
-        self.control_point.base_defenses.append(g)
-
-    def generate_shorad(self) -> None:
-        position = self.location_finder.location_for(LocationType.BaseAirDefense)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = SamGroundObject(
-            namegen.random_objective_name(),
-            group_id,
-            position,
-            self.control_point,
-            for_airbase=True,
-        )
-
-        groups = generate_anti_air_group(
-            self.game, g, self.faction, ranges=[{AirDefenseRange.Short}]
-        )
-        if not groups:
-            logging.error(f"Could not generate SHORAD group at {self.control_point}")
-            return
-        g.groups = groups
-        self.control_point.base_defenses.append(g)
-
-
-class FobDefenseGenerator(BaseDefenseGenerator):
-    def generate(self) -> None:
-        self.generate_garrison()
-        self.generate_fob_defenses()
-
-    def generate_fob_defenses(self):
-        # First group has a 1/2 chance of being a SHORAD,
-        # and a 1/2 chance of a garrison.
-        #
-        # Further groups have a 1/3 chance of being SHORAD and 2/3 chance of
-        # being a garrison.
-        for i in range(random.randint(2, 5)):
-            if i == 0 and random.randint(0, 1) == 0:
-                self.generate_shorad()
-            elif i == 0 and random.randint(0, 1) == 0:
-                self.generate_garrison()
-            elif random.randint(0, 2) == 1:
-                self.generate_shorad()
-            else:
-                self.generate_garrison()
-
-
-class AirbaseGroundObjectGenerator(ControlPointGroundObjectGenerator):
-    def __init__(
-        self,
-        game: Game,
-        generator_settings: GeneratorSettings,
-        control_point: ControlPoint,
-        templates: GroundObjectTemplates,
-    ) -> None:
-        super().__init__(game, generator_settings, control_point)
-        self.templates = templates
-
-    def generate(self) -> bool:
-        if not super().generate():
-            return False
-
-        BaseDefenseGenerator(self.game, self.control_point).generate()
-        self.generate_ground_points()
-
-        if self.faction.missiles:
-            self.generate_missile_sites()
-
-        if self.faction.coastal_defenses:
-            self.generate_coastal_sites()
-
-        return True
-
-    def generate_ground_points(self) -> None:
-        """Generate ground objects and AA sites for the control point."""
-        skip_sams = self.generate_required_aa()
-        skip_ewrs = self.generate_required_ewr()
-
-        if self.control_point.is_global:
-            return
-
-        # Always generate at least one AA point.
-        self.generate_aa_site()
-
-        # And between 2 and 7 other objectives.
-        amount = random.randrange(2, 7)
-        for i in range(amount):
-            # 1 in 4 additional objectives are AA.
-            if random.randint(0, 3) == 0:
-                if skip_sams > 0:
-                    skip_sams -= 1
-                else:
-                    self.generate_aa_site()
-            # 1 in 4 additional objectives are EWR.
-            elif random.randint(0, 3) == 0:
-                if skip_ewrs > 0:
-                    skip_ewrs -= 1
-                else:
-                    self.generate_ewr_site()
-            else:
-                self.generate_ground_point()
-
-    def generate_required_aa(self) -> int:
-        """Generates the AA sites that are required by the campaign.
-
-        Returns:
-            The number of AA sites that were generated.
-        """
-        presets = self.control_point.preset_locations
-        for position in presets.required_long_range_sams:
-            self.generate_aa_at(
-                position,
-                ranges=[
-                    {AirDefenseRange.Long},
-                    {AirDefenseRange.Medium},
-                    {AirDefenseRange.Short},
-                ],
-            )
-        for position in presets.required_medium_range_sams:
-            self.generate_aa_at(
-                position,
-                ranges=[
-                    {AirDefenseRange.Medium},
-                    {AirDefenseRange.Short},
-                ],
-            )
-        return len(presets.required_long_range_sams) + len(
-            presets.required_medium_range_sams
-        )
-
-    def generate_required_ewr(self) -> int:
-        """Generates the EWR sites that are required by the campaign.
-
-        Returns:
-            The number of EWR sites that were generated.
-        """
-        presets = self.control_point.preset_locations
-        for position in presets.required_ewrs:
-            self.generate_ewr_at(position)
-        return len(presets.required_ewrs)
-
-    def generate_ground_point(self) -> None:
-        try:
-            category = random.choice(self.faction.building_set)
-        except IndexError:
-            logging.exception("Faction has no buildings defined")
-            return
-
-        obj_name = namegen.random_objective_name()
-        template = random.choice(list(self.templates[category].values()))
-
-        if category == "oil":
-            location_type = LocationType.OffshoreStrikeTarget
-        else:
-            location_type = LocationType.StrikeTarget
-
-        # Pick from preset locations
-        point = self.location_finder.location_for(location_type)
-        if point is None:
-            return
-
-        object_id = 0
-        group_id = self.game.next_group_id()
-
-        # TODO: Create only one TGO per objective, each with multiple units.
-        for unit in template:
-            object_id += 1
-
-            template_point = Point(unit["offset"].x, unit["offset"].y)
-            g = BuildingGroundObject(
-                obj_name,
-                category,
-                group_id,
-                object_id,
-                point + template_point,
-                unit["heading"],
-                self.control_point,
-                unit["type"],
-            )
-
-            self.control_point.connected_objectives.append(g)
-
-    def generate_aa_site(self) -> None:
-        position = self.location_finder.location_for(LocationType.Sam)
-        if position is None:
-            return
-        self.generate_aa_at(
-            position,
-            ranges=[
-                # Prefer to use proper SAMs, but fall back to SHORADs if needed.
-                {AirDefenseRange.Long, AirDefenseRange.Medium},
-                {AirDefenseRange.Short},
-            ],
-        )
-
-    def generate_aa_at(
-        self, position: Point, ranges: Iterable[Set[AirDefenseRange]]
-    ) -> None:
-        group_id = self.game.next_group_id()
-
-        g = SamGroundObject(
-            namegen.random_objective_name(),
-            group_id,
-            position,
-            self.control_point,
-            for_airbase=False,
-        )
-        groups = generate_anti_air_group(self.game, g, self.faction, ranges)
-        if not groups:
-            logging.error(
-                "Could not generate air defense group for %s at %s",
-                g.name,
-                self.control_point,
-            )
-            return
-        g.groups = groups
-        self.control_point.connected_objectives.append(g)
-
-    def generate_ewr_site(self) -> None:
-        position = self.location_finder.location_for(LocationType.Ewr)
-        if position is None:
-            return
-        self.generate_ewr_at(position)
-
-    def generate_ewr_at(self, position: Point) -> None:
-        group_id = self.game.next_group_id()
-
-        g = EwrGroundObject(
-            namegen.random_objective_name(),
-            group_id,
-            position,
-            self.control_point,
-            for_airbase=False,
-        )
-        group = generate_ewr_group(self.game, g, self.faction)
-        if group is None:
-            logging.error(
-                "Could not generate ewr group for %s at %s",
-                g.name,
-                self.control_point,
-            )
-            return
-        g.groups = [group]
-        self.control_point.connected_objectives.append(g)
-
-    def generate_missile_sites(self) -> None:
-        for i in range(self.faction.missiles_group_count):
-            self.generate_missile_site()
-
-    def generate_missile_site(self) -> None:
-        position = self.location_finder.location_for(LocationType.MissileSite)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = MissileSiteGroundObject(
-            namegen.random_objective_name(), group_id, position, self.control_point
-        )
-        group = generate_missile_group(self.game, g, self.faction_name)
-        g.groups = []
-        if group is not None:
-            g.groups.append(group)
-            self.control_point.connected_objectives.append(g)
-        return
-
-    def generate_coastal_sites(self) -> None:
-        for i in range(self.faction.coastal_group_count):
-            self.generate_coastal_site()
-
-    def generate_coastal_site(self) -> None:
-        position = self.location_finder.location_for(LocationType.Coastal)
-        if position is None:
-            return
-
-        group_id = self.game.next_group_id()
-
-        g = CoastalSiteGroundObject(
-            namegen.random_objective_name(),
-            group_id,
-            position,
-            self.control_point,
-            position.heading,
-        )
-        group = generate_coastal_group(self.game, g, self.faction_name)
-        g.groups = []
-        if group is not None:
-            g.groups.append(group)
-            self.control_point.connected_objectives.append(g)
-        return
-
-
-class FobGroundObjectGenerator(AirbaseGroundObjectGenerator):
-    def generate(self) -> bool:
-        self.generate_fob()
-        FobDefenseGenerator(self.game, self.control_point).generate()
-        self.generate_required_aa()
-        return True
-
-    def generate_fob(self) -> None:
-        try:
-            category = self.faction.building_set[self.faction.building_set.index("fob")]
-        except IndexError:
-            logging.exception("Faction has no fob buildings defined")
-            return
-
-        obj_name = self.control_point.name
-        template = random.choice(list(self.templates[category].values()))
-        point = self.control_point.position
-        # Pick from preset locations
-        object_id = 0
-        group_id = self.game.next_group_id()
-
-        # TODO: Create only one TGO per objective, each with multiple units.
-        for unit in template:
-            object_id += 1
-
-            template_point = Point(unit["offset"].x, unit["offset"].y)
-            g = BuildingGroundObject(
-                obj_name,
-                category,
-                group_id,
-                object_id,
-                point + template_point,
-                unit["heading"],
-                self.control_point,
-                unit["type"],
-                airbase_group=True,
-            )
-            self.control_point.connected_objectives.append(g)
-
-
-class GroundObjectGenerator:
-    def __init__(self, game: Game, generator_settings: GeneratorSettings) -> None:
-        self.game = game
-        self.generator_settings = generator_settings
-        with open("resources/groundobject_templates.p", "rb") as f:
-            self.templates: GroundObjectTemplates = pickle.load(f)
-
-    def generate(self) -> None:
-        # Copied so we can remove items from the original list without breaking
-        # the iterator.
-        control_points = list(self.game.theater.controlpoints)
-        for control_point in control_points:
-            if not self.generate_for_control_point(control_point):
-                self.game.theater.controlpoints.remove(control_point)
-
-    def generate_for_control_point(self, control_point: ControlPoint) -> bool:
-        generator: ControlPointGroundObjectGenerator
-        if control_point.cptype == ControlPointType.AIRCRAFT_CARRIER_GROUP:
-            generator = CarrierGroundObjectGenerator(
-                self.game, self.generator_settings, control_point
-            )
-        elif control_point.cptype == ControlPointType.LHA_GROUP:
-            generator = LhaGroundObjectGenerator(
-                self.game, self.generator_settings, control_point
-            )
-        elif isinstance(control_point, OffMapSpawn):
-            generator = NoOpGroundObjectGenerator(
-                self.game, self.generator_settings, control_point
-            )
-        elif isinstance(control_point, Fob):
-            generator = FobGroundObjectGenerator(
-                self.game, self.generator_settings, control_point, self.templates
-            )
-        else:
-            generator = AirbaseGroundObjectGenerator(
-                self.game, self.generator_settings, control_point, self.templates
-            )
-        return generator.generate()

game/theater/theatergroundobject.py

@@ -1,501 +0,0 @@
-from __future__ import annotations
-
-import itertools
-import logging
-from typing import Iterator, List, TYPE_CHECKING
-
-from dcs.mapping import Point
-from dcs.unit import Unit
-from dcs.unitgroup import Group
-
-from .. import db
-from ..data.radar_db import UNITS_WITH_RADAR
-from ..utils import Distance, meters
-
-if TYPE_CHECKING:
-    from .controlpoint import ControlPoint
-    from gen.flights.flight import FlightType
-
-from .missiontarget import MissionTarget
-
-NAME_BY_CATEGORY = {
-    "power": "Power plant",
-    "ammo": "Ammo depot",
-    "fuel": "Fuel depot",
-    "aa": "AA Defense Site",
-    "ware": "Warehouse",
-    "farp": "FARP",
-    "fob": "FOB",
-    "factory": "Factory",
-    "comms": "Comms. tower",
-    "oil": "Oil platform",
-    "derrick": "Derrick",
-    "ww2bunker": "Bunker",
-    "village": "Village",
-    "allycamp": "Camp",
-    "EWR": "EWR",
-}
-
-ABBREV_NAME = {
-    "power": "PLANT",
-    "ammo": "AMMO",
-    "fuel": "FUEL",
-    "aa": "AA",
-    "ware": "WARE",
-    "farp": "FARP",
-    "fob": "FOB",
-    "factory": "FACTORY",
-    "comms": "COMMST",
-    "oil": "OILP",
-    "derrick": "DERK",
-    "ww2bunker": "BUNK",
-    "village": "VLG",
-    "allycamp": "CMP",
-}
-
-CATEGORY_MAP = {
-    # Special cases
-    "CARRIER": ["CARRIER"],
-    "LHA": ["LHA"],
-    "aa": ["AA"],
-    # Buildings
-    "power": [
-        "Workshop A",
-        "Electric power box",
-        "Garage small A",
-        "Farm B",
-        "Repair workshop",
-        "Garage B",
-    ],
-    "ware": ["Warehouse", "Hangar A"],
-    "fuel": ["Tank", "Tank 2", "Tank 3", "Fuel tank"],
-    "ammo": [".Ammunition depot", "Hangar B"],
-    "farp": [
-        "FARP Tent",
-        "FARP Ammo Dump Coating",
-        "FARP Fuel Depot",
-        "FARP Command Post",
-        "FARP CP Blindage",
-    ],
-    "fob": ["Bunker 2", "Bunker 1", "Garage small B", ".Command Center", "Barracks 2"],
-    "factory": ["Tech combine", "Tech hangar A"],
-    "comms": ["TV tower", "Comms tower M"],
-    "oil": ["Oil platform"],
-    "derrick": ["Oil derrick", "Pump station", "Subsidiary structure 2"],
-    "ww2bunker": [
-        "Siegfried Line",
-        "Fire Control Bunker",
-        "SK_C_28_naval_gun",
-        "Concertina Wire",
-        "Czech hedgehogs 1",
-    ],
-    "village": ["Small house 1B", "Small House 1A", "Small warehouse 1"],
-    "allycamp": [],
-}
-
-
-class TheaterGroundObject(MissionTarget):
-    def __init__(
-        self,
-        name: str,
-        category: str,
-        group_id: int,
-        position: Point,
-        heading: int,
-        control_point: ControlPoint,
-        dcs_identifier: str,
-        airbase_group: bool,
-        sea_object: bool,
-    ) -> None:
-        super().__init__(name, position)
-        self.category = category
-        self.group_id = group_id
-        self.heading = heading
-        self.control_point = control_point
-        self.dcs_identifier = dcs_identifier
-        self.airbase_group = airbase_group
-        self.sea_object = sea_object
-        self.groups: List[Group] = []
-
-    @property
-    def is_dead(self) -> bool:
-        return self.alive_unit_count == 0
-
-    @property
-    def units(self) -> List[Unit]:
-        """
-        :return: all the units at this location
-        """
-        return list(itertools.chain.from_iterable([g.units for g in self.groups]))
-
-    @property
-    def group_name(self) -> str:
-        """The name of the unit group."""
-        return f"{self.category}|{self.group_id}"
-
-    @property
-    def waypoint_name(self) -> str:
-        return f"[{self.name}] {self.category}"
-
-    def __str__(self) -> str:
-        return NAME_BY_CATEGORY[self.category]
-
-    def is_same_group(self, identifier: str) -> bool:
-        return self.group_id == identifier
-
-    @property
-    def obj_name(self) -> str:
-        return self.name
-
-    @property
-    def faction_color(self) -> str:
-        return "BLUE" if self.control_point.captured else "RED"
-
-    def is_friendly(self, to_player: bool) -> bool:
-        return self.control_point.is_friendly(to_player)
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if self.is_friendly(for_player):
-            yield from [
-                # TODO: FlightType.LOGISTICS
-                # TODO: FlightType.TROOP_TRANSPORT
-            ]
-        else:
-            yield from [
-                FlightType.STRIKE,
-                FlightType.BAI,
-            ]
-        yield from super().mission_types(for_player)
-
-    @property
-    def alive_unit_count(self) -> int:
-        return sum(len(g.units) for g in self.groups)
-
-    @property
-    def might_have_aa(self) -> bool:
-        return False
-
-    @property
-    def has_radar(self) -> bool:
-        """Returns True if the ground object contains a unit with radar."""
-        for group in self.groups:
-            for unit in group.units:
-                if db.unit_type_from_name(unit.type) in UNITS_WITH_RADAR:
-                    return True
-        return False
-
-    def _max_range_of_type(self, group: Group, range_type: str) -> Distance:
-        if not self.might_have_aa:
-            return meters(0)
-
-        max_range = meters(0)
-        for u in group.units:
-            unit = db.unit_type_from_name(u.type)
-            if unit is None:
-                logging.error(f"Unknown unit type {u.type}")
-                continue
-
-            # Some units in pydcs have detection_range/threat_range defined,
-            # but explicitly set to None.
-            unit_range = getattr(unit, range_type, None)
-            if unit_range is not None:
-                max_range = max(max_range, meters(unit_range))
-        return max_range
-
-    def detection_range(self, group: Group) -> Distance:
-        return self._max_range_of_type(group, "detection_range")
-
-    def threat_range(self, group: Group) -> Distance:
-        if not self.detection_range(group):
-            # For simple SAMs like shilkas, the unit has both a threat and
-            # detection range. For complex sites like SA-2s, the launcher has a
-            # threat range and the search/track radars have detection ranges. If
-            # the site has no detection range it has no radars and can't fire,
-            # so it's not actually a threat even if it still has launchers.
-            return meters(0)
-        return self._max_range_of_type(group, "threat_range")
-
-
-class BuildingGroundObject(TheaterGroundObject):
-    def __init__(
-        self,
-        name: str,
-        category: str,
-        group_id: int,
-        object_id: int,
-        position: Point,
-        heading: int,
-        control_point: ControlPoint,
-        dcs_identifier: str,
-        airbase_group=False,
-    ) -> None:
-        super().__init__(
-            name=name,
-            category=category,
-            group_id=group_id,
-            position=position,
-            heading=heading,
-            control_point=control_point,
-            dcs_identifier=dcs_identifier,
-            airbase_group=airbase_group,
-            sea_object=False,
-        )
-        self.object_id = object_id
-        # Other TGOs track deadness based on the number of alive units, but
-        # buildings don't have groups assigned to the TGO.
-        self._dead = False
-
-    @property
-    def group_name(self) -> str:
-        """The name of the unit group."""
-        return f"{self.category}|{self.group_id}|{self.object_id}"
-
-    @property
-    def waypoint_name(self) -> str:
-        return f"{super().waypoint_name} #{self.object_id}"
-
-    @property
-    def is_dead(self) -> bool:
-        if not hasattr(self, "_dead"):
-            self._dead = False
-        return self._dead
-
-    def kill(self) -> None:
-        self._dead = True
-
-
-class NavalGroundObject(TheaterGroundObject):
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if not self.is_friendly(for_player):
-            yield FlightType.ANTISHIP
-        yield from super().mission_types(for_player)
-
-    @property
-    def might_have_aa(self) -> bool:
-        return True
-
-
-class GenericCarrierGroundObject(NavalGroundObject):
-    pass
-
-
-# TODO: Why is this both a CP and a TGO?
-class CarrierGroundObject(GenericCarrierGroundObject):
-    def __init__(self, name: str, group_id: int, control_point: ControlPoint) -> None:
-        super().__init__(
-            name=name,
-            category="CARRIER",
-            group_id=group_id,
-            position=control_point.position,
-            heading=0,
-            control_point=control_point,
-            dcs_identifier="CARRIER",
-            airbase_group=True,
-            sea_object=True,
-        )
-
-    @property
-    def group_name(self) -> str:
-        # Prefix the group names with the side color so Skynet can find them,
-        # add to EWR.
-        return f"{self.faction_color}|EWR|{super().group_name}"
-
-
-# TODO: Why is this both a CP and a TGO?
-class LhaGroundObject(GenericCarrierGroundObject):
-    def __init__(self, name: str, group_id: int, control_point: ControlPoint) -> None:
-        super().__init__(
-            name=name,
-            category="LHA",
-            group_id=group_id,
-            position=control_point.position,
-            heading=0,
-            control_point=control_point,
-            dcs_identifier="LHA",
-            airbase_group=True,
-            sea_object=True,
-        )
-
-    @property
-    def group_name(self) -> str:
-        # Prefix the group names with the side color so Skynet can find them,
-        # add to EWR.
-        return f"{self.faction_color}|EWR|{super().group_name}"
-
-
-class MissileSiteGroundObject(TheaterGroundObject):
-    def __init__(
-        self, name: str, group_id: int, position: Point, control_point: ControlPoint
-    ) -> None:
-        super().__init__(
-            name=name,
-            category="aa",
-            group_id=group_id,
-            position=position,
-            heading=0,
-            control_point=control_point,
-            dcs_identifier="AA",
-            airbase_group=False,
-            sea_object=False,
-        )
-
-
-class CoastalSiteGroundObject(TheaterGroundObject):
-    def __init__(
-        self,
-        name: str,
-        group_id: int,
-        position: Point,
-        control_point: ControlPoint,
-        heading,
-    ) -> None:
-        super().__init__(
-            name=name,
-            category="aa",
-            group_id=group_id,
-            position=position,
-            heading=heading,
-            control_point=control_point,
-            dcs_identifier="AA",
-            airbase_group=False,
-            sea_object=False,
-        )
-
-
-class BaseDefenseGroundObject(TheaterGroundObject):
-    """Base type for all base defenses."""
-
-
-# TODO: Differentiate types.
-# This type gets used both for AA sites (SAM, AAA, or SHORAD). These should each
-# be split into their own types.
-class SamGroundObject(BaseDefenseGroundObject):
-    def __init__(
-        self,
-        name: str,
-        group_id: int,
-        position: Point,
-        control_point: ControlPoint,
-        for_airbase: bool,
-    ) -> None:
-        super().__init__(
-            name=name,
-            category="aa",
-            group_id=group_id,
-            position=position,
-            heading=0,
-            control_point=control_point,
-            dcs_identifier="AA",
-            airbase_group=for_airbase,
-            sea_object=False,
-        )
-        # Set by the SAM unit generator if the generated group is compatible
-        # with Skynet.
-        self.skynet_capable = False
-
-    @property
-    def group_name(self) -> str:
-        if self.skynet_capable:
-            # Prefix the group names of SAM sites with the side color so Skynet
-            # can find them.
-            return f"{self.faction_color}|SAM|{self.group_id}"
-        else:
-            return super().group_name
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if not self.is_friendly(for_player):
-            yield FlightType.DEAD
-        yield from super().mission_types(for_player)
-
-    @property
-    def might_have_aa(self) -> bool:
-        return True
-
-
-class VehicleGroupGroundObject(BaseDefenseGroundObject):
-    def __init__(
-        self,
-        name: str,
-        group_id: int,
-        position: Point,
-        control_point: ControlPoint,
-        for_airbase: bool,
-    ) -> None:
-        super().__init__(
-            name=name,
-            category="aa",
-            group_id=group_id,
-            position=position,
-            heading=0,
-            control_point=control_point,
-            dcs_identifier="AA",
-            airbase_group=for_airbase,
-            sea_object=False,
-        )
-
-
-class EwrGroundObject(BaseDefenseGroundObject):
-    def __init__(
-        self,
-        name: str,
-        group_id: int,
-        position: Point,
-        control_point: ControlPoint,
-        for_airbase: bool,
-    ) -> None:
-        super().__init__(
-            name=name,
-            category="EWR",
-            group_id=group_id,
-            position=position,
-            heading=0,
-            control_point=control_point,
-            dcs_identifier="EWR",
-            airbase_group=for_airbase,
-            sea_object=False,
-        )
-
-    @property
-    def group_name(self) -> str:
-        # Prefix the group names with the side color so Skynet can find them.
-        return f"{self.faction_color}|{super().group_name}"
-
-    def mission_types(self, for_player: bool) -> Iterator[FlightType]:
-        from gen.flights.flight import FlightType
-
-        if not self.is_friendly(for_player):
-            yield FlightType.DEAD
-        yield from super().mission_types(for_player)
-
-    @property
-    def might_have_aa(self) -> bool:
-        return True
-
-
-class ShipGroundObject(NavalGroundObject):
-    def __init__(
-        self, name: str, group_id: int, position: Point, control_point: ControlPoint
-    ) -> None:
-        super().__init__(
-            name=name,
-            category="aa",
-            group_id=group_id,
-            position=position,
-            heading=0,
-            control_point=control_point,
-            dcs_identifier="AA",
-            airbase_group=False,
-            sea_object=True,
-        )
-
-    @property
-    def group_name(self) -> str:
-        # Prefix the group names with the side color so Skynet can find them,
-        # add to EWR.
-        return f"{self.faction_color}|EWR|{super().group_name}"

game/threatzones.py

@@ -1,161 +0,0 @@
-from __future__ import annotations
-
-from functools import singledispatchmethod
-from typing import Optional, TYPE_CHECKING, Union
-
-from dcs.mapping import Point as DcsPoint
-from shapely.geometry import (
-    LineString,
-    MultiPolygon,
-    Point as ShapelyPoint,
-    Polygon,
-)
-from shapely.geometry.base import BaseGeometry
-from shapely.ops import nearest_points, unary_union
-
-from game.theater import ControlPoint
-from game.utils import Distance, meters, nautical_miles
-from gen import Conflict
-from gen.flights.closestairfields import ObjectiveDistanceCache
-from gen.flights.flight import Flight
-
-if TYPE_CHECKING:
-    from game import Game
-
-
-ThreatPoly = Union[MultiPolygon, Polygon]
-
-
-class ThreatZones:
-    def __init__(self, airbases: ThreatPoly, air_defenses: ThreatPoly) -> None:
-        self.airbases = airbases
-        self.air_defenses = air_defenses
-        self.all = unary_union([airbases, air_defenses])
-
-    def closest_boundary(self, point: DcsPoint) -> DcsPoint:
-        boundary, _ = nearest_points(
-            self.all.boundary, self.dcs_to_shapely_point(point)
-        )
-        return DcsPoint(boundary.x, boundary.y)
-
-    @singledispatchmethod
-    def threatened(self, position) -> bool:
-        raise NotImplementedError
-
-    @threatened.register
-    def _threatened_geometry(self, position: BaseGeometry) -> bool:
-        return self.all.intersects(position)
-
-    @threatened.register
-    def _threatened_dcs_point(self, position: DcsPoint) -> bool:
-        return self.all.intersects(self.dcs_to_shapely_point(position))
-
-    def path_threatened(self, a: DcsPoint, b: DcsPoint) -> bool:
-        return self.threatened(
-            LineString([self.dcs_to_shapely_point(a), self.dcs_to_shapely_point(b)])
-        )
-
-    @singledispatchmethod
-    def threatened_by_aircraft(self, target) -> bool:
-        raise NotImplementedError
-
-    @threatened_by_aircraft.register
-    def _threatened_by_aircraft_geom(self, position: BaseGeometry) -> bool:
-        return self.airbases.intersects(position)
-
-    @threatened_by_aircraft.register
-    def _threatened_by_aircraft_flight(self, flight: Flight) -> bool:
-        return self.threatened_by_aircraft(
-            LineString((self.dcs_to_shapely_point(p.position) for p in flight.points))
-        )
-
-    @singledispatchmethod
-    def threatened_by_air_defense(self, target) -> bool:
-        raise NotImplementedError
-
-    @threatened_by_air_defense.register
-    def _threatened_by_air_defense_geom(self, position: BaseGeometry) -> bool:
-        return self.air_defenses.intersects(position)
-
-    @threatened_by_air_defense.register
-    def _threatened_by_air_defense_flight(self, flight: Flight) -> bool:
-        return self.threatened_by_air_defense(
-            LineString((self.dcs_to_shapely_point(p.position) for p in flight.points))
-        )
-
-    @classmethod
-    def closest_enemy_airbase(
-        cls, location: ControlPoint, max_distance: Distance
-    ) -> Optional[ControlPoint]:
-        airfields = ObjectiveDistanceCache.get_closest_airfields(location)
-        for airfield in airfields.airfields_within(max_distance):
-            if airfield.captured != location.captured:
-                return airfield
-        return None
-
-    @classmethod
-    def barcap_threat_range(cls, game: Game, control_point: ControlPoint) -> Distance:
-        doctrine = game.faction_for(control_point.captured).doctrine
-        cap_threat_range = (
-            doctrine.cap_max_distance_from_cp + doctrine.cap_engagement_range
-        )
-        opposing_airfield = cls.closest_enemy_airbase(
-            control_point, cap_threat_range * 2
-        )
-        if opposing_airfield is None:
-            return cap_threat_range
-
-        airfield_distance = meters(
-            opposing_airfield.position.distance_to_point(control_point.position)
-        )
-
-        # BARCAPs should not commit further than halfway to the closest enemy
-        # airfield (with some breathing room) to avoid those missions becoming
-        # offensive. For dissimilar doctrines we could weight this so that, as
-        # an example, modern US goes no closer than 70% of the way to the WW2
-        # German base, and the Germans go no closer than 30% of the way to the
-        # US base, but for now equal weighting is fine.
-        max_distance = airfield_distance * 0.45
-        return min(cap_threat_range, max_distance)
-
-    @classmethod
-    def for_faction(cls, game: Game, player: bool) -> ThreatZones:
-        """Generates the threat zones projected by the given coalition.
-
-        Args:
-            game: The game to generate the threat zone for.
-            player: True if the coalition projecting the threat zone belongs to
-            the player.
-
-        Returns:
-            The threat zones projected by the given coalition. If the threat
-            zone belongs to the player, it is the zone that will be avoided by
-            the enemy and vice versa.
-        """
-        air_threats = []
-        air_defenses = []
-        for control_point in game.theater.controlpoints:
-            if control_point.captured != player:
-                continue
-            if control_point.runway_is_operational():
-                point = ShapelyPoint(control_point.position.x, control_point.position.y)
-                cap_threat_range = cls.barcap_threat_range(game, control_point)
-                air_threats.append(point.buffer(cap_threat_range.meters))
-
-            for tgo in control_point.ground_objects:
-                for group in tgo.groups:
-                    threat_range = tgo.threat_range(group)
-                    # Any system with a shorter range than this is not worth
-                    # even avoiding.
-                    if threat_range > nautical_miles(3):
-                        point = ShapelyPoint(tgo.position.x, tgo.position.y)
-                        threat_zone = point.buffer(threat_range.meters)
-                        air_defenses.append(threat_zone)
-
-        return cls(
-            airbases=unary_union(air_threats), air_defenses=unary_union(air_defenses)
-        )
-
-    @staticmethod
-    def dcs_to_shapely_point(point: DcsPoint) -> ShapelyPoint:
-        return ShapelyPoint(point.x, point.y)