added whatever was necessary to generate

the new IADS CPs on the map

.github/workflows/build.yml

@@ -0,0 +1,54 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+
+  build:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install environment
+      run: |
+        python -m venv ./venv
+
+    - name: Install dependencies
+      run: |
+        ./venv/scripts/activate
+        python -m pip install -r requirements.txt
+        # For some reason the shiboken2.abi3.dll is not found properly, so I copy it instead
+        Copy-Item .\venv\Lib\site-packages\shiboken2\shiboken2.abi3.dll .\venv\Lib\site-packages\PySide2\ -Force
+
+    - name: mypy game
+      run: |
+        ./venv/scripts/activate
+        mypy game
+
+    - name: mypy gen
+      run: |
+        ./venv/scripts/activate
+        mypy gen
+
+    - name: mypy theater
+      run: |
+        ./venv/scripts/activate
+        mypy theater
+
+    - name: Build binaries
+      run: |
+        ./venv/scripts/activate
+        $env:PYTHONPATH=".;./pydcs"
+        pyinstaller pyinstaller.spec
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: dcs_liberation
+        path: dist/

.github/workflows/release.yml

@@ -20,15 +20,30 @@ jobs:
 
     - name: Install environment
       run: |
-        py -m venv ./venv
+        python -m venv ./venv
 
     - name: Install dependencies
       run: |
         ./venv/scripts/activate
-        pip install -r requirements.txt
+        python -m pip install -r requirements.txt
         # For some reason the shiboken2.abi3.dll is not found properly, so I copy it instead
         Copy-Item .\venv\Lib\site-packages\shiboken2\shiboken2.abi3.dll .\venv\Lib\site-packages\PySide2\ -Force
 
+    - name: mypy game
+      run: |
+        ./venv/scripts/activate
+        mypy game
+
+    - name: mypy gen
+      run: |
+        ./venv/scripts/activate
+        mypy gen
+
+    - name: mypy theater
+      run: |
+        ./venv/scripts/activate
+        mypy theater
+
     - name: Build binaries
       run: |
         ./venv/scripts/activate

.gitignore

@@ -8,13 +8,14 @@ logs.txt
 dist/**
 a.py
 resources/tools/a.miz
-tests/**
 # User-specific stuff
 .idea/
 
-liberation_preferences.json
+/kneeboards
+/liberation_preferences.json
+/state.json
 
-logs/liberation.log
+logs/
 
 qt_ui/logs/liberation.log
 

.vscode/launch.json

@@ -0,0 +1,42 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+
+    {
+      "name": "Python: Main",
+      "type": "python",
+      "request": "launch",
+      "program": "qt_ui\\main.py",
+      "console": "integratedTerminal",
+      "env": {
+        "PYTHONPATH": ".;./pydcs"
+      },
+      "preLaunchTask": "Prepare Environment"
+    },
+    {
+      "name": "Python: build ground objects templates",
+      "type": "python",
+      "request": "launch",
+      "program": "resources\\tools\\generate_groundobject_templates.py",
+      "console": "integratedTerminal",
+      "env": {
+        "PYTHONPATH": ".;./pydcs"
+      },
+      "preLaunchTask": "Prepare Environment"
+    },
+    {
+      "name": "Python: Make Release",
+      "type": "python",
+      "request": "launch",
+      "program": "resources\\tools\\mkrelease.py",
+      "console": "integratedTerminal",
+      "env": {
+        "PYTHONPATH": ".;./pydcs"
+      },
+      "preLaunchTask": "Prepare Environment"
+    }
+  ]
+}

.vscode/settings.json

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

.vscode/tasks.json

@@ -0,0 +1,35 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Prepare Environment",
+      "type": "shell",
+      "isBackground":  false,
+      "problemMatcher": [],
+      "command": "powershell",
+      "args": [
+        "-Command",
+        "& {if (-not (Test-Path ${workspaceFolder}\\venv)) { python -m venv ${workspaceFolder}\\venv; . ${workspaceFolder}\\venv\\scripts\\activate.ps1; pip install -r requirements.txt; Copy-Item ${workspaceFolder}\\venv\\Lib\\site-packages\\shiboken2\\shiboken2.abi3.dll ${workspaceFolder}\\venv\\Lib\\site-packages\\PySide2 } }",
+      ],
+      "group": "build",
+      "options": {
+        "env": {
+          "PYTHONPATH": ".;./pydcs"
+        }
+      },
+      "presentation": {
+        "echo": true,
+        "reveal": "never",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": false
+      },
+      "runOptions": {
+        "runOn": "folderOpen"
+      }
+    }
+  ]
+}

changelog.md

@@ -1,14 +1,87 @@
+# 2.2.X
+
+## Features/Improvements :
+* **[Flight Planner]** Flight planner overhaul, with package and TOT system
+* **[Map]** Highlight the selected flight path on the map
+* **[Map]** Improved flight plan display settings 
+* **[Map]** Improved SAM display settings
+* **[Map]** Added polygon debug mode display
+* **[New Game]** Starting budget can be freely selected 
+* **[Moddability]** Custom campaigns can be designed through json files 
+
+## Fixes :
+* **[Campaign generator]** Ship group and offshore buildings should not be generated on land anymore 
+* **[UI]** Missing TER weapons in custom payload now selectable.
+
+# 2.1.5
+
+## Features/Improvements :
+* **[Units/Factions]** Enabled EPLRS for ground units that supports it (so they appear on A-10C II TAD and Helmet)
+
+## Fixes :
+* **[UI]** Fixed an issue that prevent saving after aborting a mission
+* **[Mission Generator]** Fixed aircraft landing point type being wrong
+
+# 2.1.4
+
+## Fixes :
+* **[UI]** Fixed an issue that prevented generating the mission (take off button no working) on old savegames.
+
+## Features/Improvements :
+* **[Units/Factions]** Added A-10C_2 to USA 2005 and Bluefor modern factions
+* **[UI]** Limit number of aircraft that can be bought to the number of available parking slots.
+* **[Mission Generator]** Use inline loading of the JSON.lua library, and save to either %LIBERATION_EXPORT_DIR%, or to DCS working directory
+
+## Changes :
+* **[Units/Factions]** Bluefor generic factions will now use the new "Combined Joint Task Forces Blue" country in the generated mission instead of "USA"
+
+## Fixes :
+* **[UI]** Fixed icon for Viggen
+* **[UI]** Added icons for some ground units
+* **[Misc]** Fixed issue with Chinese characters in pydcs preventing generating the mission. (Take Off button not working) (thanks to spark135246)
+* **[Misc]** Fixed an error causing with ATC frequency preventing generating the mission. (Take Off button not working) (thanks to danalbert)
+
+# 2.1.2
+
+## Fixes :
+* **[Mission Generator]** Fix mission generation issues with radio frequencies (Thanks to contributors davidp57 and danalbert)
+* **[Mission Generator]** AI should now properly plan flights for Tornados
+
 # 2.1.1
 
-## Features/Imrpovements :
-* **[Other]** Added an installer option
+## Features/Improvements :
+* **[Other]** Added an installer option (thanks to contributor parithon)
+* **[Kneeboards]** Generate mission kneeboards for player flights. Kneeboards include
+  airfield/carrier information (ATC frequencies, ILS, TACAN, and runway
+  assignments), assigned radio channels, waypoint lists, and AWACS/JTAC/tanker
+  information. (Thanks to contributor danalbert)
+* **[Radios]** Allocate separate intra-flight channels for most aircraft to reduce global
+  chatter. (Thanks to contributor danalbert)
+* **[Radios]** Configure radio channel presets for most aircraft. Currently supported are:
+  * AJS37
+  * AV-8B
+  * F-14B
+  * F-16C
+  * F/A-18C
+  * JF-17
+  * M-2000C (Thanks to contributor danalbert)
+* **[Base Menu]** Added possibility to repair destroyed SAM and base defenses units for the player (Click on a SAM site to fix it)
+* **[Base Menu]** Added possibility to buy/sell/replace SAM units
+* **[Map]** Added recon images for buildings on strike targets, click on a Strike target to get detailled informations
+* **[Units/Factions]** Added F-16C to USA 1990
+* **[Units/Factions]** Added MQ-9 Reaper as CAS unit for USA 2005
+* **[Units/Factions]** Added Mig-21, Mig-23, SA-342L to Syria 2011
+* **[Cheat Menu]** Added buttons to remove money
 
 ## Fixed issues :
-* **[UI/UX]** Spelling issues
-* **[Campaign Generator]** Tarawa was placed on land in Syrian Civil War campaign
+* **[UI/UX]** Spelling issues (Thanks to contributor steveveepee)
+* **[Campaign Generator]** LHA was placed on land in Syrian Civil War campaign
 * **[Campaign Generator]** Fixed inverted configuration for Syria full map
-* **[Units/Factions]** Minor changes to USA 1990
-* **[Units/Factions]** AH-64A now has default payloads. AH-64D has payloads for more mission types. 
+* **[Campaign Generator]** Syria "Inherent Resolve" campaign, added Incirlik Air Base
+* **[Mission Generator]** AH-1W was not used by AI to generate CAS mission by default
+* **[Mission Generator]** Fixed F-16C targeting pod not being added to payload
+* **[Mission Generator]** AH-64A and AH-64D payloads fix. 
+* **[Units/Factions]** China will use KJ-2000 as awacs instead of A-50
 
 # 2.1.0
 

game/data/building_data.py

@@ -1,12 +1,12 @@
 import inspect
-from pydcs import dcs
+import dcs
 
-DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick', 'aa']
+DEFAULT_AVAILABLE_BUILDINGS = ['fuel', 'ammo', 'comms', 'oil', 'ware', 'farp', 'fob', 'power', 'factory', 'derrick', 'aa', 'iads-controlcenter', 'iads-ewr', 'iads-commnode', 'iads-power']
 
 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', 'Czech hedgehogs 1', 'Czech hedgehogs 2',
+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',

game/data/cap_capabilities_db.py

@@ -1,4 +1,22 @@
-from dcs.planes import *
+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_51D,
+    P_51D_30_NA,
+    SpitfireLFMkIX,
+    SpitfireLFMkIXCW,
+)
+
 from pydcs_extensions.a4ec.a4ec import A_4E_C
 
 """

game/data/doctrine.py

@@ -1,95 +1,101 @@
+from dataclasses import dataclass
+
 from game.utils import nm_to_meter, feet_to_meter
 
-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,
+    strike_max_range: int
+    sead_max_range: int
 
-    "CAP_EVERY_X_MINUTES": 20,
-    "CAS_EVERY_X_MINUTES": 30,
-    "SEAD_EVERY_X_MINUTES": 40,
-    "STRIKE_EVERY_X_MINUTES": 40,
+    rendezvous_altitude: int
+    join_distance: int
+    split_distance: int
+    ingress_egress_distance: int
+    ingress_altitude: int
+    egress_altitude: int
 
-    "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),
+    min_patrol_altitude: int
+    max_patrol_altitude: int
+    pattern_altitude: int
 
-    "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)),
+    cap_min_track_length: int
+    cap_max_track_length: int
+    cap_min_distance_from_cp: int
+    cap_max_distance_from_cp: int
 
-    "MAX_NUMBER_OF_INTERCEPTION_GROUP": 3,
-}
 
-COLDWAR_DOCTRINE = {
+MODERN_DOCTRINE = Doctrine(
+    cap=True,
+    cas=True,
+    sead=True,
+    strike=True,
+    antiship=True,
+    strike_max_range=1500000,
+    sead_max_range=1500000,
+    rendezvous_altitude=feet_to_meter(25000),
+    join_distance=nm_to_meter(20),
+    split_distance=nm_to_meter(20),
+    ingress_egress_distance=nm_to_meter(45),
+    ingress_altitude=feet_to_meter(20000),
+    egress_altitude=feet_to_meter(20000),
+    min_patrol_altitude=feet_to_meter(15000),
+    max_patrol_altitude=feet_to_meter(33000),
+    pattern_altitude=feet_to_meter(5000),
+    cap_min_track_length=nm_to_meter(15),
+    cap_max_track_length=nm_to_meter(40),
+    cap_min_distance_from_cp=nm_to_meter(10),
+    cap_max_distance_from_cp=nm_to_meter(40),
+)
 
-    "GENERATORS": {
-        "CAS": True,
-        "CAP": True,
-        "SEAD": True,
-        "STRIKE": True,
-        "ANTISHIP": True,
-    },
+COLDWAR_DOCTRINE = Doctrine(
+    cap=True,
+    cas=True,
+    sead=True,
+    strike=True,
+    antiship=True,
+    strike_max_range=1500000,
+    sead_max_range=1500000,
+    rendezvous_altitude=feet_to_meter(22000),
+    join_distance=nm_to_meter(10),
+    split_distance=nm_to_meter(10),
+    ingress_egress_distance=nm_to_meter(30),
+    ingress_altitude=feet_to_meter(18000),
+    egress_altitude=feet_to_meter(18000),
+    min_patrol_altitude=feet_to_meter(10000),
+    max_patrol_altitude=feet_to_meter(24000),
+    pattern_altitude=feet_to_meter(5000),
+    cap_min_track_length=nm_to_meter(12),
+    cap_max_track_length=nm_to_meter(24),
+    cap_min_distance_from_cp=nm_to_meter(8),
+    cap_max_distance_from_cp=nm_to_meter(25),
+)
 
-    "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(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),
-
-    "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,
-}
-
-WWII_DOCTRINE = {
-
-    "GENERATORS": {
-        "CAS": True,
-        "CAP": True,
-        "SEAD": False,
-        "STRIKE": True,
-        "ANTISHIP": True,
-    },
-
-    "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,
-
-}
+WWII_DOCTRINE = Doctrine(
+    cap=True,
+    cas=True,
+    sead=False,
+    strike=True,
+    antiship=True,
+    strike_max_range=1500000,
+    sead_max_range=1500000,
+    join_distance=nm_to_meter(5),
+    split_distance=nm_to_meter(5),
+    rendezvous_altitude=feet_to_meter(10000),
+    ingress_egress_distance=nm_to_meter(7),
+    ingress_altitude=feet_to_meter(8000),
+    egress_altitude=feet_to_meter(8000),
+    min_patrol_altitude=feet_to_meter(4000),
+    max_patrol_altitude=feet_to_meter(15000),
+    pattern_altitude=feet_to_meter(5000),
+    cap_min_track_length=nm_to_meter(8),
+    cap_max_track_length=nm_to_meter(18),
+    cap_min_distance_from_cp=nm_to_meter(0),
+    cap_max_distance_from_cp=nm_to_meter(5),
+)

game/data/radar_db.py

@@ -1,5 +1,26 @@
+from dcs.ships import (
+    CGN_1144_2_Pyotr_Velikiy,
+    CG_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,
+    FFG_11540_Neustrashimy,
+    FFL_1124_4_Grisha,
+    FF_1135M_Rezky,
+    FSG_1241_1MP_Molniya,
+    LHA_1_Tarawa,
+    Oliver_Hazzard_Perry_class,
+    Ticonderoga_class,
+    Type_052B_Destroyer,
+    Type_052C_Destroyer,
+    Type_054A_Frigate,
+    USS_Arleigh_Burke_IIa,
+)
 from dcs.vehicles import AirDefence
-from dcs.ships import *
 
 UNITS_WITH_RADAR = [
 

game/db.py

@@ -1,77 +1,171 @@
-import typing
-import enum
 from datetime import datetime
+from enum import Enum
+from typing import Dict, List, Optional, Tuple, Type, Union
 
-from dcs.countries import get_by_id, country_dict
-from dcs.vehicles import *
-from dcs.ships import *
-from dcs.planes import *
-from dcs.helicopters import *
-
-from dcs.task import *
-from dcs.unit import *
-from dcs.unittype import *
-from dcs.unitgroup import *
-
-from game.factions.australia_2005 import Australia_2005
-from game.factions.bluefor_coldwar import BLUEFOR_COLDWAR
-from game.factions.bluefor_coldwar_a4 import BLUEFOR_COLDWAR_A4
-from game.factions.bluefor_coldwar_mods import BLUEFOR_COLDWAR_MODS
-from game.factions.canada_2005 import Canada_2005
-from game.factions.china_2010 import China_2010
-from game.factions.france_1995 import France_1995
-from game.factions.france_2005 import France_2005
-from game.factions.france_modded import France_2005_Modded
-from game.factions.germany_1944_easy import Germany_1944_Easy
-from game.factions.germany_1990 import Germany_1990
-from game.factions.insurgent import Insurgent
-from game.factions.insurgent_modded import Insurgent_modded
-from game.factions.iran_2015 import Iran_2015
-from game.factions.israel_1948 import Israel_1948
-from game.factions.israel_1973 import Israel_1973, Israel_1973_NO_WW2_UNITS, Israel_1982
-from game.factions.israel_2000 import Israel_2000
-from game.factions.italy_1990 import Italy_1990
-from game.factions.italy_1990_mb339 import Italy_1990_MB339
-from game.factions.japan_2005 import Japan_2005
-from game.factions.libya_2011 import Libya_2011
-from game.factions.netherlands_1990 import Netherlands_1990
-from game.factions.north_korea_2000 import NorthKorea_2000
-from game.factions.pakistan_2015 import Pakistan_2015
-from game.factions.private_miltary_companies import PMC_WESTERN_B, PMC_RUSSIAN, PMC_WESTERN_A
-from game.factions.russia_1975 import Russia_1975
-from game.factions.germany_1944 import Germany_1944
-from game.factions.india_2010 import India_2010
-from game.factions.russia_1955 import Russia_1955
-from game.factions.russia_1965 import Russia_1965
-from game.factions.russia_1990 import Russia_1990
-from game.factions.russia_2010 import Russia_2010
-from game.factions.spain_1990 import Spain_1990
-from game.factions.sweden_1990 import Sweden_1990
-from game.factions.syria import Syria_2011, Syria_1967, Syria_1967_WW2_Weapons, Syria_1973, Arab_Armies_1948, Syria_1982
-from game.factions.turkey_2005 import Turkey_2005
-from game.factions.uae_2005 import UAE_2005
-from game.factions.uk_1944 import UK_1944
-from game.factions.uk_1990 import UnitedKingdom_1990
-from game.factions.ukraine_2010 import Ukraine_2010
-from game.factions.us_aggressors import US_Aggressors
-from game.factions.usa_1944 import USA_1944, ALLIES_1944
-from game.factions.usa_1955 import USA_1955
-from game.factions.usa_1960 import USA_1960
-from game.factions.usa_1965 import USA_1965
-from game.factions.usa_1990 import USA_1990
-from game.factions.usa_2005 import USA_2005
-from game.factions.bluefor_modern import BLUEFOR_MODERN
+from dcs.countries import country_dict
+from dcs.helicopters import (
+    AH_1W,
+    AH_64A,
+    AH_64D,
+    HelicopterType,
+    Ka_50,
+    Mi_24V,
+    Mi_28N,
+    Mi_8MT,
+    OH_58D,
+    SA342L,
+    SA342M,
+    SA342Minigun,
+    SA342Mistral,
+    UH_1H,
+    UH_60A,
+    helicopter_map,
+)
+from dcs.mapping import Point
+# mypy can't resolve these if they're wildcard imports for some reason.
+from dcs.planes import (
+    AJS37,
+    AV8BNA,
+    A_10A,
+    A_10C,
+    A_10C_2,
+    A_20G,
+    A_50,
+    An_26B,
+    An_30M,
+    B_17G,
+    B_1B,
+    B_52H,
+    Bf_109K_4,
+    C_101CC,
+    C_130,
+    E_3A,
+    FA_18C_hornet,
+    FW_190A8,
+    FW_190D9,
+    F_117A,
+    F_14B,
+    F_15C,
+    F_15E,
+    F_16A,
+    F_16C_50,
+    F_4E,
+    F_5E_3,
+    F_86F_Sabre,
+    F_A_18C,
+    IL_76MD,
+    IL_78M,
+    JF_17,
+    J_11A,
+    Ju_88A4,
+    KC130,
+    KC_135,
+    KJ_2000,
+    L_39C,
+    L_39ZA,
+    MQ_9_Reaper,
+    M_2000C,
+    MiG_15bis,
+    MiG_19P,
+    MiG_21Bis,
+    MiG_23MLD,
+    MiG_25PD,
+    MiG_27K,
+    MiG_29A,
+    MiG_29G,
+    MiG_29S,
+    MiG_31,
+    Mirage_2000_5,
+    P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
+    P_51D,
+    P_51D_30_NA,
+    PlaneType,
+    RQ_1A_Predator,
+    S_3B_Tanker,
+    SpitfireLFMkIX,
+    SpitfireLFMkIXCW,
+    Su_17M4,
+    Su_24M,
+    Su_24MR,
+    Su_25,
+    Su_25T,
+    Su_25TM,
+    Su_27,
+    Su_30,
+    Su_33,
+    Su_34,
+    Tornado_GR4,
+    Tornado_IDS,
+    Tu_160,
+    Tu_22M3,
+    Tu_95MS,
+    WingLoong_I,
+    Yak_40,
+    plane_map,
+)
+from dcs.ships import (
+    Armed_speedboat,
+    Bulk_cargo_ship_Yakushev,
+    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,
+    Dry_cargo_ship_Ivanov,
+    LHA_1_Tarawa,
+    Tanker_Elnya_160,
+    ship_map,
+)
+from dcs.task import (
+    AWACS,
+    AntishipStrike,
+    CAP,
+    CAS,
+    CargoTransportation,
+    Embarking,
+    Escort,
+    GroundAttack,
+    Intercept,
+    MainTask,
+    Nothing,
+    PinpointStrike,
+    Reconnaissance,
+    Refueling,
+    SEAD,
+    Task,
+    Transport,
+)
+from dcs.terrain.terrain import Airport
+from dcs.unit import Ship, Unit, Vehicle
+from dcs.unitgroup import ShipGroup, StaticGroup
+from dcs.unittype import FlyingType, ShipType, UnitType, VehicleType
+from dcs.vehicles import (
+    AirDefence,
+    Armor,
+    Artillery,
+    Carriage,
+    Infantry,
+    Unarmed,
+    vehicle_map,
+)
 
+import pydcs_extensions.frenchpack.frenchpack as frenchpack
+from game.factions.faction import Faction
 # PATCH pydcs data with MODS
+from game.factions.faction_loader import FactionLoader
 from pydcs_extensions.a4ec.a4ec import A_4E_C
 from pydcs_extensions.mb339.mb339 import MB_339PAN
-import pydcs_extensions.frenchpack.frenchpack as frenchpack
 from pydcs_extensions.rafale.rafale import Rafale_A_S, Rafale_M
+from pydcs_extensions.su57.su57 import Su_57
 
 plane_map["A-4E-C"] = A_4E_C
 plane_map["MB-339PAN"] = MB_339PAN
 plane_map["Rafale_M"] = Rafale_M
 plane_map["Rafale_A_S"] = Rafale_A_S
+plane_map["Su-57"] = Su_57
 
 vehicle_map["FieldHL"] = frenchpack._FIELD_HIDE
 vehicle_map["HARRIERH"] = frenchpack._FIELD_HIDE_SMALL
@@ -148,6 +242,7 @@ PRICES = {
     J_11A: 26,
     JF_17: 20,
     Su_30: 24,
+    Su_57: 40,
 
     SpitfireLFMkIX: 14,
     SpitfireLFMkIXCW: 14,
@@ -192,6 +287,7 @@ PRICES = {
 
     A_10A: 16,
     A_10C: 22,
+    A_10C_2: 24,
 
     # heli
     Ka_50: 13,
@@ -211,6 +307,10 @@ PRICES = {
     # Bombers
     B_52H: 35,
     B_1B: 50,
+    F_117A: 100,
+    Tu_160: 50,
+    Tu_22M3: 40,
+    Tu_95MS: 35,
 
     # special
     IL_76MD: 30,
@@ -223,13 +323,16 @@ PRICES = {
     KC130: 25,
 
     A_50: 50,
+    KJ_2000: 50,
     E_3A: 50,
     C_130: 25,
 
     # WW2
     P_51D_30_NA: 18,
     P_51D: 16,
-    P_47D_30: 18,
+    P_47D_30: 17,
+    P_47D_30bl1: 16,
+    P_47D_40: 18,
     B_17G: 30,
 
     # Drones
@@ -295,23 +398,6 @@ PRICES = {
 
     Unarmed.Transport_M818: 3,
 
-    AirDefence.AAA_Vulcan_M163: 5,
-    AirDefence.SAM_Linebacker_M6: 10,
-
-    AirDefence.AAA_ZU_23_Closed: 2,
-    AirDefence.SPAAA_ZSU_23_4_Shilka: 4,
-    AirDefence.SAM_SA_9_Strela_1_9P31: 8,
-    AirDefence.SAM_SA_19_Tunguska_2S6: 15,
-    AirDefence.SAM_SA_6_Kub_LN_2P25: 22,
-    AirDefence.SAM_SA_8_Osa_9A33: 12,
-    AirDefence.SAM_SA_3_S_125_LN_5P73: 20,
-    AirDefence.SAM_SA_2_LN_SM_90: 15,
-    AirDefence.SAM_SA_11_Buk_LN_9A310M1: 25,
-    AirDefence.SAM_Hawk_PCP: 20,
-    AirDefence.SAM_Patriot_LN_M901: 60,
-    AirDefence.SAM_SA_10_S_300PS_LN_5P85C: 60,
-    AirDefence.SAM_Chaparral_M48: 10,
-
     # WW2
     Armor.MT_Pz_Kpfw_V_Panther_Ausf_G:24,
     Armor.MT_Pz_Kpfw_IV_Ausf_H:16,
@@ -332,9 +418,6 @@ PRICES = {
     Armor.LAC_M8_Greyhound: 8,
     Armor.TD_M10_GMC: 14,
     Armor.StuG_III_Ausf__G: 12,
-    AirDefence.AAA_Bofors_40mm: 8,
-    AirDefence.AAA_8_8cm_Flak_36: 8,
-    AirDefence.AAA_8_8cm_Flak_18: 12,
     Artillery.M12_GMC: 10,
     Artillery.Sturmpanzer_IV_Brummbär: 10,
 
@@ -348,6 +431,79 @@ PRICES = {
     Dry_cargo_ship_Ivanov: 10,
     Tanker_Elnya_160: 10,
 
+    # Air Defence units
+    AirDefence.SAM_SA_19_Tunguska_2S6: 30,
+    AirDefence.SAM_SA_6_Kub_LN_2P25: 20,
+    AirDefence.SAM_SA_3_S_125_LN_5P73: 6,
+    AirDefence.SAM_SA_10_S_300PS_LN_5P85C: 22,
+    AirDefence.SAM_SA_10_S_300PS_LN_5P85D: 22,
+    AirDefence.SAM_SA_11_Buk_LN_9A310M1: 30,
+    AirDefence.SAM_SA_8_Osa_9A33: 28,
+    AirDefence.SAM_SA_15_Tor_9A331: 40,
+    AirDefence.SAM_SA_13_Strela_10M3_9A35M3: 16,
+    AirDefence.SAM_SA_9_Strela_1_9P31: 12,
+    AirDefence.SAM_SA_11_Buk_CC_9S470M1: 25,
+    AirDefence.SAM_SA_8_Osa_LD_9T217: 22,
+    AirDefence.SAM_Patriot_AMG_AN_MRC_137: 35,
+    AirDefence.SAM_Patriot_ECS_AN_MSQ_104: 30,
+    AirDefence.SPAAA_Gepard: 24,
+    AirDefence.SAM_Hawk_PCP: 14,
+    AirDefence.AAA_Vulcan_M163: 10,
+    AirDefence.SAM_Hawk_LN_M192: 8,
+    AirDefence.SAM_Chaparral_M48: 16,
+    AirDefence.SAM_Linebacker_M6: 18,
+    AirDefence.SAM_Patriot_LN_M901: 15,
+    AirDefence.SAM_Avenger_M1097: 20,
+    AirDefence.SAM_Patriot_EPP_III: 15,
+    AirDefence.SAM_Patriot_ICC: 18,
+    AirDefence.SAM_Roland_ADS: 12,
+    AirDefence.SAM_SA_10_S_300PS_CP_54K6: 18,
+    AirDefence.Stinger_MANPADS: 6,
+    AirDefence.SAM_Stinger_comm_dsr: 4,
+    AirDefence.SAM_Stinger_comm: 4,
+    AirDefence.SPAAA_ZSU_23_4_Shilka: 10,
+    AirDefence.AAA_ZU_23_Closed: 6,
+    AirDefence.AAA_ZU_23_Emplacement: 6,
+    AirDefence.AAA_ZU_23_on_Ural_375: 8,
+    AirDefence.AAA_ZU_23_Insurgent_Closed: 6,
+    AirDefence.AAA_ZU_23_Insurgent_on_Ural_375: 8,
+    AirDefence.AAA_ZU_23_Insurgent: 6,
+    AirDefence.SAM_SA_18_Igla_MANPADS: 10,
+    AirDefence.SAM_SA_18_Igla_comm: 8,
+    AirDefence.SAM_SA_18_Igla_S_MANPADS: 12,
+    AirDefence.SAM_SA_18_Igla_S_comm: 8,
+    AirDefence.EWR_1L13: 30,
+    AirDefence.SAM_SA_6_Kub_STR_9S91: 22,
+    AirDefence.SAM_SA_10_S_300PS_TR_30N6: 24,
+    AirDefence.SAM_SA_10_S_300PS_SR_5N66M: 30,
+    AirDefence.EWR_55G6: 30,
+    AirDefence.SAM_SA_10_S_300PS_SR_64H6E: 30,
+    AirDefence.SAM_SA_11_Buk_SR_9S18M1: 28,
+    AirDefence.CP_9S80M1_Sborka: 10,
+    AirDefence.SAM_Hawk_TR_AN_MPQ_46: 14,
+    AirDefence.SAM_Hawk_SR_AN_MPQ_50: 18,
+    AirDefence.SAM_Patriot_STR_AN_MPQ_53: 22,
+    AirDefence.SAM_Hawk_CWAR_AN_MPQ_55: 20,
+    AirDefence.SAM_SR_P_19: 14,
+    AirDefence.SAM_Roland_EWR: 16,
+    AirDefence.SAM_SA_3_S_125_TR_SNR: 14,
+    AirDefence.SAM_SA_2_LN_SM_90: 8,
+    AirDefence.SAM_SA_2_TR_SNR_75_Fan_Song: 12,
+    AirDefence.Rapier_FSA_Launcher: 6,
+    AirDefence.Rapier_FSA_Optical_Tracker: 6,
+    AirDefence.Rapier_FSA_Blindfire_Tracker: 8,
+    AirDefence.HQ_7_Self_Propelled_LN: 20,
+    AirDefence.HQ_7_Self_Propelled_STR: 24,
+    AirDefence.AAA_8_8cm_Flak_18: 6,
+    AirDefence.AAA_Flak_38: 6,
+    AirDefence.AAA_8_8cm_Flak_36: 8,
+    AirDefence.AAA_8_8cm_Flak_37: 9,
+    AirDefence.AAA_Flak_Vierling_38:6,
+    AirDefence.AAA_Kdo_G_40: 8,
+    AirDefence.Flak_Searchlight_37: 4,
+    AirDefence.Maschinensatz_33: 10,
+    AirDefence.AAA_8_8cm_Flak_41: 10,
+    AirDefence.AAA_Bofors_40mm: 8,
 
     # FRENCH PACK MOD
     frenchpack.AMX_10RCR: 10,
@@ -402,6 +558,7 @@ UNIT_BY_TASK = {
         F_5E_3,
         Su_27,
         Su_33,
+        Su_57,
         MiG_19P,
         MiG_21Bis,
         MiG_23MLD,
@@ -434,46 +591,53 @@ UNIT_BY_TASK = {
         SA342Mistral
     ],
     CAS: [
-        F_15E,
-        F_86F_Sabre,
-        MiG_15bis,
-        L_39ZA,
-        AV8BNA,
+        AH_1W,
+        AH_64A,
+        AH_64D,
         AJS37,
+        AV8BNA,
         A_10A,
         A_10C,
+        A_10C_2,
+        A_20G,
+        B_17G,
+        B_1B,
+        B_52H,
+        F_117A,
+        F_15E,
+        F_86F_Sabre,
+        Ju_88A4,
+        Ka_50,
+        L_39ZA,
+        MB_339PAN,
+        MQ_9_Reaper,
+        MiG_15bis,
+        MiG_27K,
+        Mi_24V,
+        Mi_28N,
+        Mi_8MT,
+        OH_58D,
+        P_47D_30,
+        P_47D_30bl1,
+        P_47D_40,
+        RQ_1A_Predator,
+        Rafale_A_S,
+        SA342L,
+        SA342M,
+        SA342Minigun,
         Su_17M4,
+        Su_24M,
+        Su_24MR,
         Su_25,
         Su_25T,
         Su_34,
-        Ka_50,
-        SA342M,
-        SA342L,
-        SA342Minigun,
-        Su_24M,
-        Su_24MR,
-        AH_64A,
-        AH_64D,
-        OH_58D,
-        B_52H,
-        B_1B,
-        Tornado_IDS,
         Tornado_GR4,
+        Tornado_IDS,
+        Tu_160,
+        Tu_22M3,
+        Tu_95MS,
         UH_1H,
-        Mi_8MT,
-        Mi_28N,
-        Mi_24V,
-        MiG_27K,
-        A_20G,
-        P_47D_30,
-        Ju_88A4,
-        B_17G,
-        MB_339PAN,
-        Rafale_A_S,
         WingLoong_I,
-        MQ_9_Reaper,
-        RQ_1A_Predator,
-        AH_1W
     ],
     Transport: [
         IL_76MD,
@@ -489,7 +653,7 @@ UNIT_BY_TASK = {
         KC130,
         S_3B_Tanker,
     ],
-    AWACS: [E_3A, A_50, ],
+    AWACS: [E_3A, A_50, KJ_2000],
     PinpointStrike: [
         Armor.APC_MTLB,
         Armor.APC_MTLB,
@@ -733,13 +897,13 @@ SAM_CONVERT = {
 """
 Units that will always be spawned in the air
 """
-TAKEOFF_BAN = [
+TAKEOFF_BAN: List[Type[FlyingType]] = [
 ]
 
 """
 Units that will be always spawned in the air if launched from the carrier
 """
-CARRIER_TAKEOFF_BAN = [
+CARRIER_TAKEOFF_BAN: List[Type[FlyingType]] = [
    Su_33,  # Kuznecow is bugged in a way that only 2 aircraft could be spawned
 ]
 
@@ -747,98 +911,7 @@ CARRIER_TAKEOFF_BAN = [
 Units separated by country. 
 country : DCS Country name
 """
-FACTIONS = {
-
-    "Bluefor Modern": BLUEFOR_MODERN,
-    "Bluefor Cold War 1970s": BLUEFOR_COLDWAR,
-    "Bluefor Cold War (with A-4)": BLUEFOR_COLDWAR_A4,
-    "Bluefor Cold War (with A-4 and MB339)": BLUEFOR_COLDWAR_MODS,
-
-    "USA 1955 (WW2 Pack)": USA_1955,
-    "USA 1960": USA_1960,
-    "USA 1965": USA_1965,
-    "USA 1990": USA_1990,
-    "USA 2005": USA_2005,
-    "USA Aggressors 2005": US_Aggressors,
-
-    "Russia 1955": Russia_1955,
-    "Russia 1965": Russia_1965,
-    "Russia 1975": Russia_1975,
-    "Russia 1990": Russia_1990,
-    "Russia 2010": Russia_2010,
-
-    "France 1995": France_1995,
-    "France 2005": France_2005,
-    "France 2005 (Modded)": France_2005_Modded,
-
-    "Germany 1990": Germany_1990,
-
-    "Netherlands 1990": Netherlands_1990,
-
-    "United Kingdom 1990": UnitedKingdom_1990,
-
-    "Spain 1990": Spain_1990,
-
-    "Italy 1990": Italy_1990,
-    "Italy 1990 (With MB339)": Italy_1990_MB339,
-
-    "Israel 2000": Israel_2000,
-    "Israel 1982": Israel_1982,
-    "Israel 1973 (WW2 Pack)": Israel_1973,
-    "Israel 1973": Israel_1973_NO_WW2_UNITS,
-    "Israel 1948": Israel_1948,
-
-    "Arab Armies 1982": Syria_1982,
-    "Arab Armies 1973": Syria_1973,
-    "Arab Armies 1967 (WW2 Pack)": Syria_1967_WW2_Weapons,
-    "Arab Armies 1967": Syria_1967,
-    "Arab League 1948": Arab_Armies_1948,
-
-    "China 2010": China_2010,
-
-    "Sweden 1990": Sweden_1990,
-
-    "Australia 2005": Australia_2005,
-
-    "Canada 2005": Canada_2005,
-
-    "Japan 2005": Japan_2005,
-
-    "Turkey 2005": Turkey_2005,
-
-    "United Arab Emirates 2005": UAE_2005,
-
-    "Ukraine 2010": Ukraine_2010,
-
-    "India 2010": India_2010,
-
-    "Libya 2011": Libya_2011,
-
-    "Syria 2011": Syria_2011,
-
-
-    "Pakistan 2015": Pakistan_2015,
-
-    "Iran 2015": Iran_2015,
-
-    "North Korea 2000": NorthKorea_2000,
-
-    "Insurgent": Insurgent,
-    "Insurgent (Modded)": Insurgent_modded,
-
-    "PMC (American)": PMC_WESTERN_A,
-    "PMC (American) - MB339": PMC_WESTERN_B,
-    "PMC (Russian)": PMC_RUSSIAN,
-
-    "Allies 1944 (WW2 Pack)": USA_1944,
-    "USA 1944 (WW2 Pack)": ALLIES_1944,
-    "UK 1944 (WW2 Pack)": UK_1944,
-
-    "Germany 1944 (WW2 Pack)": Germany_1944,
-    "Germany 1944 Easy (WW2 Pack)": Germany_1944_Easy,
-
-}
-
+FACTIONS: Dict[str, Faction] = FactionLoader.load_factions()
 
 CARRIER_TYPE_BY_PLANE = {
     FA_18C_hornet: CVN_74_John_C__Stennis,
@@ -874,11 +947,29 @@ COMMON_OVERRIDE = {
     PinpointStrike: "STRIKE",
     SEAD: "SEAD",
     AntishipStrike: "ANTISHIP",
-    GroundAttack: "STRIKE"
+    GroundAttack: "STRIKE",
+    Escort: "CAP",
 }
 
-PLANE_PAYLOAD_OVERRIDES = {
+PLANE_PAYLOAD_OVERRIDES: Dict[Type[PlaneType], Dict[Type[Task], str]] = {
 
+    B_1B: {
+        CAS: "GBU-38*16, CBU-97*20",
+        PinpointStrike: "GBU-31*8, GBU-38*32",
+        GroundAttack: "GBU-31*8, GBU-38*32",
+    },
+    B_52H: {
+        PinpointStrike: "AGM-86C*20",
+        GroundAttack: "Mk 82*51",
+    },
+    F_117A: {
+        PinpointStrike: "GBU-10*2",
+    },
+    F_15E: {
+        CAS: "AIM-120B*2,AIM-9M*2,FUEL,GBU-12*4,GBU-38*4,AGM-65D*2",
+        GroundAttack: "AIM-120B*2,AIM-9M*2,FUEL*3,CBU-97*12",
+        PinpointStrike: "AIM-120B*2,AIM-9M*2,FUEL,GBU-31*4,AGM-154C*2",
+    },
     FA_18C_hornet: {
         CAP: "CAP HEAVY",
         Intercept: "CAP HEAVY",
@@ -886,7 +977,8 @@ PLANE_PAYLOAD_OVERRIDES = {
         PinpointStrike: "STRIKE",
         SEAD: "SEAD",
         AntishipStrike: "ANTISHIP",
-        GroundAttack: "STRIKE"
+        GroundAttack: "STRIKE",
+        Escort: "CAP HEAVY",
     },
     F_A_18C: {
         CAP: "CAP HEAVY",
@@ -895,16 +987,26 @@ PLANE_PAYLOAD_OVERRIDES = {
         PinpointStrike: "STRIKE",
         SEAD: "SEAD",
         AntishipStrike: "ANTISHIP",
-        GroundAttack: "STRIKE"
+        GroundAttack: "STRIKE",
+        Escort: "CAP HEAVY",
+    },
+    Tu_160: {
+        PinpointStrike: "Kh-65*12",
+    },
+    Tu_22M3: {
+        GroundAttack: "FAB-500*33, FAB-250*36",
+    },
+    Tu_95MS: {
+        PinpointStrike: "Kh-65*6",
     },
     A_10A: COMMON_OVERRIDE,
     A_10C: COMMON_OVERRIDE,
+    A_10C_2: COMMON_OVERRIDE,
     AV8BNA: COMMON_OVERRIDE,
     C_101CC: COMMON_OVERRIDE,
     F_5E_3: COMMON_OVERRIDE,
     F_14B: COMMON_OVERRIDE,
     F_15C: COMMON_OVERRIDE,
-    F_15E: COMMON_OVERRIDE,
     F_16C_50: COMMON_OVERRIDE,
     JF_17: COMMON_OVERRIDE,
     M_2000C: COMMON_OVERRIDE,
@@ -922,6 +1024,7 @@ PLANE_PAYLOAD_OVERRIDES = {
     Su_24M:COMMON_OVERRIDE,
     Su_30: COMMON_OVERRIDE,
     Su_34: COMMON_OVERRIDE,
+    Su_57: COMMON_OVERRIDE,
     MiG_23MLD: COMMON_OVERRIDE,
     MiG_27K: COMMON_OVERRIDE,
     Tornado_GR4: COMMON_OVERRIDE,
@@ -940,6 +1043,8 @@ PLANE_PAYLOAD_OVERRIDES = {
     Su_17M4: COMMON_OVERRIDE,
     F_4E: COMMON_OVERRIDE,
     P_47D_30:COMMON_OVERRIDE,
+    P_47D_30bl1:COMMON_OVERRIDE,
+    P_47D_40:COMMON_OVERRIDE,
     B_17G: COMMON_OVERRIDE,
     P_51D: COMMON_OVERRIDE,
     P_51D_30_NA: COMMON_OVERRIDE,
@@ -1036,6 +1141,7 @@ CARRIER_CAPABLE = [
     AV8BNA,
     Su_33,
     A_4E_C,
+    Rafale_M,
 
     UH_1H,
     Mi_8MT,
@@ -1071,17 +1177,17 @@ LHA_CAPABLE = [
 ---------- END OF CONFIGURATION SECTION
 """
 
-UnitsDict = typing.Dict[UnitType, int]
-PlaneDict = typing.Dict[FlyingType, int]
-HeliDict = typing.Dict[HelicopterType, int]
-ArmorDict = typing.Dict[VehicleType, int]
-ShipDict = typing.Dict[ShipType, int]
-AirDefenseDict = typing.Dict[AirDefence, int]
+UnitsDict = Dict[UnitType, int]
+PlaneDict = Dict[FlyingType, int]
+HeliDict = Dict[HelicopterType, int]
+ArmorDict = Dict[VehicleType, int]
+ShipDict = Dict[ShipType, int]
+AirDefenseDict = Dict[AirDefence, int]
 
-AssignedUnitsDict = typing.Dict[typing.Type[UnitType], typing.Tuple[int, int]]
-TaskForceDict = typing.Dict[typing.Type[Task], AssignedUnitsDict]
+AssignedUnitsDict = Dict[Type[UnitType], Tuple[int, int]]
+TaskForceDict = Dict[Type[MainTask], AssignedUnitsDict]
 
-StartingPosition = typing.Optional[typing.Union[ShipGroup, StaticGroup, Airport, Point]]
+StartingPosition = Union[ShipGroup, StaticGroup, Airport, Point]
 
 
 def upgrade_to_supercarrier(unit, name: str):
@@ -1099,7 +1205,8 @@ def upgrade_to_supercarrier(unit, name: str):
     else:
         return unit
 
-def unit_task(unit: UnitType) -> Task:
+
+def unit_task(unit: UnitType) -> Optional[Task]:
     for task, units in UNIT_BY_TASK.items():
         if unit in units:
             return task
@@ -1110,10 +1217,12 @@ def unit_task(unit: UnitType) -> Task:
     print(unit.name + " cause issue")
     return None
 
-def find_unittype(for_task: Task, country_name: str) -> typing.List[UnitType]:
-    return [x for x in UNIT_BY_TASK[for_task] if x in FACTIONS[country_name]["units"]]
 
-def find_infantry(country_name: str) -> typing.List[UnitType]:
+def find_unittype(for_task: Task, country_name: str) -> List[UnitType]:
+    return [x for x in UNIT_BY_TASK[for_task] if x in FACTIONS[country_name].units]
+
+
+def find_infantry(country_name: str) -> List[UnitType]:
     inf = [
         Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS,
         Infantry.Soldier_RPG,
@@ -1128,15 +1237,18 @@ def find_infantry(country_name: str) -> typing.List[UnitType]:
         Infantry.Infantry_M1_Garand, Infantry.Infantry_M1_Garand, Infantry.Infantry_M1_Garand,
         Infantry.Infantry_Soldier_Insurgents, Infantry.Infantry_Soldier_Insurgents, Infantry.Infantry_Soldier_Insurgents
     ]
-    return [x for x in inf if x in FACTIONS[country_name]["units"]]
+    return [x for x in inf if x in FACTIONS[country_name].infantry_units]
+
 
 def unit_type_name(unit_type) -> str:
     return unit_type.id and unit_type.id or unit_type.name
 
+
 def unit_type_name_2(unit_type) -> str:
     return unit_type.name and unit_type.name or unit_type.id
 
-def unit_type_from_name(name: str) -> UnitType:
+
+def unit_type_from_name(name: str) -> Optional[UnitType]:
     if name in vehicle_map:
         return vehicle_map[name]
     elif name in plane_map:
@@ -1169,7 +1281,7 @@ def task_name(task) -> str:
         return task.name
 
 
-def choose_units(for_task: Task, factor: float, count: int, country: str) -> typing.Collection[UnitType]:
+def choose_units(for_task: Task, factor: float, count: int, country: str) -> List[UnitType]:
     suitable_unittypes = find_unittype(for_task, country)
     suitable_unittypes = [x for x in suitable_unittypes if x not in helicopter_map.values()]
     suitable_unittypes.sort(key=lambda x: PRICES[x])
@@ -1195,7 +1307,7 @@ def unitdict_merge(a: UnitsDict, b: UnitsDict) -> UnitsDict:
 
 
 def unitdict_split(unit_dict: UnitsDict, count: int):
-    buffer_dict = {}
+    buffer_dict: Dict[UnitType, int] = {}
     for unit_type, unit_count in unit_dict.items():
         for _ in range(unit_count):
             unitdict_append(buffer_dict, unit_type, 1)
@@ -1218,7 +1330,7 @@ def unitdict_restrict_count(unit_dict: UnitsDict, total_count: int) -> UnitsDict
         return {}
 
 
-def assigned_units_split(fd: AssignedUnitsDict) -> typing.Tuple[PlaneDict, PlaneDict]:
+def assigned_units_split(fd: AssignedUnitsDict) -> Tuple[PlaneDict, PlaneDict]:
     return {k: v1 for k, (v1, v2) in fd.items()}, {k: v2 for k, (v1, v2) in fd.items()},
 
 
@@ -1227,7 +1339,7 @@ def assigned_units_from(d: PlaneDict) -> AssignedUnitsDict:
 
 
 def assignedunits_split_to_count(dict: AssignedUnitsDict, count: int):
-    buffer_dict = {}
+    buffer_dict: Dict[Type[UnitType], Tuple[int, int]] = {}
     for unit_type, (unit_count, client_count) in dict.items():
         for _ in range(unit_count):
             new_count, new_client_count = buffer_dict.get(unit_type, (0, 0))

game/event/event.py

@@ -1,24 +1,23 @@
-import typing
+from __future__ import annotations
+
 import logging
+import math
+from typing import Dict, List, Optional, Type, TYPE_CHECKING
 
-from dcs.action import Coalition
-from dcs.unittype import UnitType
-from dcs.task import *
-from dcs.vehicles import AirDefence
+from dcs.mapping import Point
+from dcs.task import Task
 from dcs.unittype import UnitType
 
-from game import *
+from game import db, persistency
+from game.debriefing import Debriefing
 from game.infos.information import Information
-from theater import *
-from gen.environmentgen import EnvironmentSettings
-from gen.conflictgen import Conflict
-from game.db import assigned_units_from, unitdict_from
+from game.operation.operation import Operation
+from gen.ground_forces.combat_stance import CombatStance
+from theater import ControlPoint
 from theater.start_generator import generate_airbase_defense_group
 
-from userdata.debriefing import Debriefing
-from userdata import persistency
-
-import game.db as db
+if TYPE_CHECKING:
+    from ..game import Game
 
 DIFFICULTY_LOG_BASE = 1.1
 EVENT_DEPARTURE_MAX_DISTANCE = 340000
@@ -28,6 +27,7 @@ MINOR_DEFEAT_INFLUENCE = 0.1
 DEFEAT_INFLUENCE = 0.3
 STRONG_DEFEAT_INFLUENCE = 0.5
 
+
 class Event:
     silent = False
     informational = False
@@ -37,17 +37,15 @@ class Event:
     game = None  # type: Game
     location = None  # type: Point
     from_cp = None  # type: ControlPoint
-    departure_cp = None  # type: ControlPoint
     to_cp = None  # type: ControlPoint
 
     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.departure_cp: Optional[ControlPoint] = None
         self.from_cp = from_cp
         self.to_cp = target_cp
         self.location = location
@@ -59,14 +57,14 @@ class Event:
         return self.attacker_name == self.game.player_name
 
     @property
-    def enemy_cp(self) -> ControlPoint:
+    def enemy_cp(self) -> Optional[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]]:
+    def tasks(self) -> List[Type[Task]]:
         return []
 
     @property
@@ -91,18 +89,6 @@ class Event:
     def is_successfull(self, debriefing: Debriefing) -> bool:
         return self.operation.is_successfull(debriefing)
 
-    def player_attacking(self, cp: ControlPoint, flights: db.TaskForceDict):
-        if self.is_player_attacking:
-            self.departure_cp = cp
-        else:
-            self.to_cp = cp
-
-    def player_defending(self, cp: ControlPoint, flights: db.TaskForceDict):
-        if self.is_player_attacking:
-            self.departure_cp = cp
-        else:
-            self.to_cp = cp
-
     def generate(self):
         self.operation.is_awacs_enabled = self.is_awacs_enabled
         self.operation.ca_slots = self.ca_slots
@@ -178,9 +164,12 @@ class Event:
                 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])
@@ -206,29 +195,19 @@ class Event:
                     if cp.id == id:
 
                         if cp.captured and new_owner_coalition != coalition:
-                            cp.captured = False
+                            for_player = False
                             info = Information(cp.name + " lost !", "The ennemy took control of " + cp.name + "\nShame on us !", self.game.turn)
                             self.game.informations.append(info)
-                            pname = self.game.enemy_name
                             captured_cps.append(cp)
                         elif not(cp.captured) and new_owner_coalition == coalition:
-                            cp.captured = True
+                            for_player = 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.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
+                        cp.capture(self.game, for_player)
 
                 for cp in captured_cps:
                     logging.info("Will run redeploy for " + cp.name)
@@ -250,7 +229,7 @@ class Event:
             for enemy_cp in enemy_cps:
                 print("Compute frontline progression for : " + cp.name + " to " + enemy_cp.name)
 
-                delta = 0
+                delta = 0.0
                 player_won = True
                 ally_casualties = killed_unit_count_by_cp[cp.id]
                 enemy_casualties = killed_unit_count_by_cp[enemy_cp.id]
@@ -264,7 +243,7 @@ class Event:
 
                 ratio = (1.0 + enemy_casualties) / (1.0 + ally_casualties)
 
-                player_aggresive = cp.stances[enemy_cp.id] in [CombatStance.AGGRESIVE, 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
@@ -373,7 +352,6 @@ class Event:
 
 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,
@@ -383,12 +361,12 @@ class UnitsDeliveryEvent(Event):
                                                  attacker_name=attacker_name,
                                                  defender_name=defender_name)
 
-        self.units = {}
+        self.units: Dict[UnitType, int] = {}
 
     def __str__(self):
         return "Pending delivery to {}".format(self.to_cp)
 
-    def deliver(self, units: typing.Dict[UnitType, int]):
+    def deliver(self, units: Dict[UnitType, int]):
         for k, v in units.items():
             self.units[k] = self.units.get(k, 0) + v
 

game/event/frontlineattack.py

@@ -1,12 +1,17 @@
-from game.event import *
+from typing import List, Type
+
+from dcs.task import CAP, CAS, Task
+
+from game import db
 from game.operation.frontlineattack import FrontlineAttackOperation
-from userdata.debriefing import Debriefing
+from .event import Event
+from ..debriefing import Debriefing
 
 
 class FrontlineAttackEvent(Event):
 
     @property
-    def tasks(self) -> typing.Collection[typing.Type[Task]]:
+    def tasks(self) -> List[Type[Task]]:
         if self.is_player_attacking:
             return [CAS, CAP]
         else:
@@ -34,6 +39,7 @@ class FrontlineAttackEvent(Event):
             self.to_cp.base.affect_strength(-0.1)
 
     def player_attacking(self, flights: db.TaskForceDict):
+        assert self.departure_cp is not None
         op = FrontlineAttackOperation(game=self.game,
                                       attacker_name=self.attacker_name,
                                       defender_name=self.defender_name,
@@ -41,13 +47,3 @@ class FrontlineAttackEvent(Event):
                                       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

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

@@ -1,58 +0,0 @@
-from dcs.helicopters import *
-from dcs.planes import *
-from dcs.ships import *
-from dcs.vehicles import *
-
-BLUEFOR_COLDWAR = {
-    "country": "USA",
-    "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

@@ -1,65 +0,0 @@
-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": "USA",
-    "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

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

@@ -1,82 +0,0 @@
-from dcs.helicopters import *
-from dcs.planes import *
-from dcs.ships import *
-from dcs.vehicles import *
-
-BLUEFOR_MODERN = {
-    "country": "USA",
-    "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,
-        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

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

@@ -1,80 +0,0 @@
-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,
-
-        A_50,
-
-        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

@@ -0,0 +1,252 @@
+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
+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[UnitType] = field(default_factory=list)
+
+    # Available awacs aircraft
+    awacs: List[UnitType] = field(default_factory=list)
+
+    # Available tanker aircraft
+    tankers: List[UnitType] = field(default_factory=list)
+
+    # Available frontline units
+    frontline_units: List[VehicleType] = field(default_factory=list)
+
+    # Available artillery units
+    artillery_units: List[VehicleType] = field(default_factory=list)
+
+    # Infantry units used
+    infantry_units: List[VehicleType] = field(default_factory=list)
+
+    # Logistics units used
+    logistics_units: List[VehicleType] = field(default_factory=list)
+
+    # List of units that can be deployed as SHORAD
+    shorads: List[str] = field(default_factory=list)
+
+    # Possible SAMS site generators for this faction
+    sams: List[str] = field(default_factory=list)
+
+    # Possible Missile site generators for this faction
+    missiles: 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[UnitType] = field(default_factory=list)
+
+    # possible helicopter carrier units
+    helicopter_carrier: List[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[str] = field(default_factory=list)
+
+    # Available cruisers
+    cruisers: List[str] = 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)
+
+    # Whether this faction has JTAC access
+    has_jtac: bool = field(default=False)
+
+    # Unit to use as JTAC for this faction
+    jtac_unit: Optional[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)
+
+    @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.sams = json.get("sams", [])
+        faction.shorads = json.get("shorads", [])
+        faction.missiles = json.get("missiles", [])
+        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))
+
+        # 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 == "ww2ally":
+            faction.building_set = WW2_ALLIES_BUILDINGS
+        elif building_set == "ww2germany":
+            faction.building_set = WW2_GERMANY_BUILDINGS
+        else:
+            faction.building_set = DEFAULT_AVAILABLE_BUILDINGS
+
+        return faction
+
+    @property
+    def units(self) -> List[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[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[FlyingType]:
+    return cast(Optional[FlyingType], unit_loader(
+        name, [dcs.planes, dcs.helicopters, MODDED_AIRPLANES]
+    ))
+
+
+def load_all_aircraft(data) -> List[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[VehicleType]:
+    return cast(Optional[FlyingType], unit_loader(
+        name, [Infantry, Unarmed, Armor, AirDefence, Artillery, MODDED_VEHICLES]
+    ))
+
+
+def load_all_vehicles(data) -> List[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[ShipType]:
+    return cast(Optional[FlyingType], unit_loader(name, [dcs.ships]))
+
+
+def load_all_ships(data) -> List[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

@@ -0,0 +1,28 @@
+from __future__ import annotations
+import json
+import logging
+from pathlib import Path
+from typing import Dict, Type
+
+from game.factions.faction import Faction
+
+FACTION_DIRECTORY = Path("./resources/factions/")
+
+
+class FactionLoader:
+
+    @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, encoding="utf-8")
+                    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

game/factions/france_1995.py

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,31 +0,0 @@
-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_LN_M192,
-
-        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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,72 +0,0 @@
-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,
-        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,11 +1,36 @@
-from datetime import datetime, timedelta
+import logging
+import math
+import random
+import sys
+from datetime import date, datetime, timedelta
+from typing import Any, Dict, List
 
-from game.db import REWARDS, PLAYER_BUDGET_BASE, sys
+from dcs.action import Coalition
+from dcs.mapping import Point
+from dcs.task import CAP, CAS, PinpointStrike, Task
+from dcs.unittype import UnitType
+from dcs.vehicles import AirDefence
+
+from game import db
+from game.db import PLAYER_BUDGET_BASE, REWARDS
+from game.inventory import GlobalAircraftInventory
 from game.models.game_stats import GameStats
-from gen.flights.ai_flight_planner import FlightPlanner
+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.ground_forces.ai_ground_planner import GroundPlanner
-from .event import *
+from theater import ConflictTheater, ControlPoint
+from theater.conflicttheater import IMPORTANCE_HIGH, IMPORTANCE_LOW
+from . import persistency
+from .debriefing import Debriefing
+from .event.event import Event, UnitsDeliveryEvent
+from .event.frontlineattack import FrontlineAttackEvent
+from .factions.faction import Faction
+from .infos.information import Information
 from .settings import Settings
+from plugin import LuaPluginManager
+from .weather import Conditions, TimeOfDay
 
 COMMISION_UNIT_VARIETY = 4
 COMMISION_LIMITS_SCALE = 1.5
@@ -45,41 +70,45 @@ PLAYER_BUDGET_IMPORTANCE_LOG = 2
 
 
 class Game:
-    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):
+    def __init__(self, player_name: str, enemy_name: str,
+                 theater: ConflictTheater, start_date: datetime,
+                 settings: Settings):
         self.settings = settings
-        self.events = []
+        self.events: List[Event] = []
         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
-        self.date = datetime(start_date.year, start_date.month, start_date.day)
+        self.date = date(start_date.year, start_date.month, start_date.day)
         self.game_stats = GameStats()
         self.game_stats.update(self)
-        self.planners = {}
-        self.ground_planners = {}
+        self.ground_planners: Dict[int, GroundPlanner] = {}
         self.informations = []
         self.informations.append(Information("Game Start", "-" * 40, 0))
         self.__culling_points = self.compute_conflicts_position()
-        self.__frontlineData = []
-        self.__destroyed_units = []
-        self.jtacs = []
+        self.__destroyed_units: List[str] = []
         self.savepath = ""
+        self.budget = PLAYER_BUDGET_INITIAL
+        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()
 
+    def generate_conditions(self) -> Conditions:
+        return Conditions.generate(self.theater, self.date,
+                                   self.current_turn_time_of_day, self.settings)
 
     def sanitize_sides(self):
         """
@@ -95,11 +124,11 @@ class Game:
                 self.enemy_country = "Russia"
 
     @property
-    def player_faction(self):
+    def player_faction(self) -> Faction:
         return db.FACTIONS[self.player_name]
 
     @property
-    def enemy_faction(self):
+    def enemy_faction(self) -> Faction:
         return db.FACTIONS[self.enemy_name]
 
     def _roll(self, prob, mult):
@@ -113,10 +142,12 @@ class Game:
         self.events.append(event_class(self, player_cp, enemy_cp, enemy_cp.position, self.player_name, self.enemy_name))
 
     def _generate_events(self):
-        for player_cp, enemy_cp in self.theater.conflicts(True):
-            self._generate_player_event(FrontlineAttackEvent, player_cp, enemy_cp)
+        for front_line in self.theater.conflicts(True):
+            self._generate_player_event(FrontlineAttackEvent,
+                                        front_line.control_point_a,
+                                        front_line.control_point_b)
 
-    def commision_unit_types(self, cp: ControlPoint, for_task: Task) -> typing.Collection[UnitType]:
+    def commision_unit_types(self, cp: ControlPoint, for_task: Task) -> List[UnitType]:
         importance_factor = (cp.importance - IMPORTANCE_LOW) / (IMPORTANCE_HIGH - IMPORTANCE_LOW)
 
         if for_task == AirDefence and not self.settings.sams:
@@ -190,15 +221,27 @@ class Game:
 
     def is_player_attack(self, event):
         if isinstance(event, Event):
-            return event.attacker_name == self.player_name
+            return event and event.attacker_name and event.attacker_name == self.player_name
         else:
-            return event.name == self.player_name
+            return event and event.name and event.name == self.player_name
 
-    def pass_turn(self, no_action=False, ignored_cps: typing.Collection[ControlPoint] = None):
+    def on_load(self) -> None:
+        ObjectiveDistanceCache.set_theater(self.theater)
+        
+        # set the settings in all plugins
+        for plugin in LuaPluginManager().getPlugins():
+            plugin.setSettings(self.settings)
 
+        # Save game compatibility.
+
+        # TODO: Remove in 2.3.
+        if not hasattr(self, "conditions"):
+            self.conditions = self.generate_conditions()
+
+    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 = self.turn + 1
+        self.turn += 1
 
         for event in self.events:
             if self.settings.version == "dev":
@@ -219,34 +262,37 @@ class Game:
                 if not cp.is_carrier and not cp.is_lha:
                     cp.base.affect_strength(-PLAYER_BASE_STRENGTH_RECOVERY)
 
-        self.ignored_cps = []
-        if ignored_cps:
-            self.ignored_cps = ignored_cps
+        self.conditions = self.generate_conditions()
 
-        self.events = []  # type: typing.List[Event]
+        self.initialize_turn()
+
+        # Autosave progress
+        persistency.autosave(self)
+
+    def initialize_turn(self) -> None:
+        self.events = []
         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)
+
         # Plan flights & combat for next turn
         self.__culling_points = self.compute_conflicts_position()
-        self.planners = {}
         self.ground_planners = {}
+        self.blue_ato.clear()
+        self.red_ato.clear()
+        CoalitionMissionPlanner(self, is_player=True).plan_missions()
+        CoalitionMissionPlanner(self, is_player=False).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
 
-        # Autosave progress
-        persistency.autosave(self)
-
     def _enemy_reinforcement(self):
         """
         Compute and commision reinforcement for enemy bases
@@ -274,7 +320,7 @@ class Game:
             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]]
+        potential_units = db.FACTIONS[self.enemy_name].frontline_units
 
         print("Enemy Recruiting")
         print(potential_cp_armor)
@@ -300,8 +346,9 @@ class Game:
         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]]
+        potential_units = [u for u in db.FACTIONS[self.enemy_name].aircrafts
+                           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
@@ -319,11 +366,11 @@ class Game:
                 self.informations.append(info)
 
     @property
-    def current_turn_daytime(self):
-        return ["dawn", "day", "dusk", "night"][self.turn % 4]
+    def current_turn_time_of_day(self) -> TimeOfDay:
+        return list(TimeOfDay)[self.turn % 4]
 
     @property
-    def current_day(self):
+    def current_day(self) -> date:
         return self.date + timedelta(days=self.turn // 4)
 
     def next_unit_id(self):
@@ -348,10 +395,13 @@ class Game:
         points = []
 
         # By default, use the existing frontline conflict 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)
+        for front_line in self.theater.conflicts():
+            position = Conflict.frontline_position(self.theater,
+                                                   front_line.control_point_a,
+                                                   front_line.control_point_b)
+            points.append(position[0])
+            points.append(front_line.control_point_a.position)
+            points.append(front_line.control_point_b.position)
 
         # If there is no conflict take the center point between the two nearest opposing bases
         if len(points) == 0:
@@ -400,6 +450,13 @@ class Game:
                     return False
             return True
 
+    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
@@ -408,10 +465,10 @@ class Game:
         return 1
 
     def get_player_coalition(self):
-        return dcs.action.Coalition.Blue
+        return Coalition.Blue
 
     def get_enemy_coalition(self):
-        return dcs.action.Coalition.Red
+        return Coalition.Red
 
     def get_player_color(self):
         return "blue"

game/inventory.py

@@ -0,0 +1,120 @@
+"""Inventory management APIs."""
+from collections import defaultdict
+from typing import Dict, Iterable, Iterator, Set, Tuple
+
+from dcs.unittype import UnitType
+
+from gen.flights.flight import Flight
+from 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[UnitType, int] = defaultdict(int)
+
+    def add_aircraft(self, aircraft: UnitType, 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: UnitType, 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: UnitType) -> int:
+        """Returns the number of available aircraft of the given type.
+
+        Args:
+            aircraft: The type of aircraft to query.
+        """
+        return self.inventory[aircraft]
+
+    @property
+    def types_available(self) -> Iterator[UnitType]:
+        """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[UnitType, 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[UnitType]:
+        """Iterates over all aircraft types available to the player."""
+        seen: Set[UnitType] = set()
+        for control_point, inventory in self.inventories.items():
+            if control_point.captured:
+                for aircraft in inventory.types_available:
+                    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/game_stats.py

@@ -1,3 +1,5 @@
+from typing import List
+
 class FactionTurnMetadata:
     """
     Store metadata about a faction
@@ -31,10 +33,8 @@ class GameStats:
     Store statistics for the current game
     """
 
-    data_per_turn: [GameTurnMetadata] = []
-
     def __init__(self):
-        self.data_per_turn = []
+        self.data_per_turn: List[GameTurnMetadata] = []
 
     def update(self, game):
         """

game/operation/frontlineattack.py

@@ -1,7 +1,8 @@
-from game.db import assigned_units_split
-
-from .operation import *
+from dcs.terrain.terrain import Terrain
 
+from gen.conflictgen import Conflict
+from .operation import Operation
+from .. import db
 
 MAX_DISTANCE_BETWEEN_GROUPS = 12000
 
@@ -36,6 +37,4 @@ class FrontlineAttackOperation(Operation):
     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."
-        self.briefinggen.append_waypoint("CAS AREA IP")
-        self.briefinggen.append_waypoint("CAS AREA EGRESS")
         super(FrontlineAttackOperation, self).generate()

game/operation/operation.py

@@ -1,30 +1,56 @@
+import logging
+import os
+from pathlib import Path
+from typing import List, Optional, Set
+
+from dcs import Mission
+from dcs.action import DoScript, DoScriptFile
+from dcs.coalition import Coalition
 from dcs.countries import country_dict
 from dcs.lua.parse import loads
-from dcs.terrain import Terrain
+from dcs.mapping import Point
+from dcs.terrain.terrain import Terrain
+from dcs.translation import String
+from dcs.triggers import TriggerStart
+from dcs.unittype import UnitType
 
-from gen import *
-from userdata.debriefing import *
-
-TANKER_CALLSIGNS = ["Texaco", "Arco", "Shell"]
+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
+from gen.environmentgen import EnvironmentGenerator
+from gen.forcedoptionsgen import ForcedOptionsGenerator
+from gen.groundobjectsgen import GroundObjectsGenerator
+from gen.kneeboard import KneeboardGenerator
+from gen.radios import RadioFrequency, RadioRegistry
+from gen.tacan import TacanRegistry
+from gen.triggergen import TRIGGER_RADIUS_MEDIUM, TriggersGenerator
+from plugin import LuaPluginManager
+from theater import ControlPoint
+from .. import db
+from ..debriefing import Debriefing
 
 
 class Operation:
     attackers_starting_position = None  # type: db.StartingPosition
     defenders_starting_position = None  # type: db.StartingPosition
 
-    current_mission = None  # type: dcs.Mission
-    regular_mission = None  # type: dcs.Mission
-    quick_mission = None  # type: dcs.Mission
+    current_mission = None  # type: Mission
+    regular_mission = None  # type: Mission
+    quick_mission = None  # type: 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
 
     environment_settings = None
     trigger_radius = TRIGGER_RADIUS_MEDIUM
@@ -38,19 +64,20 @@ class Operation:
                  defender_name: str,
                  from_cp: ControlPoint,
                  departure_cp: ControlPoint,
-                 to_cp: ControlPoint = None):
+                 to_cp: ControlPoint):
         self.game = game
         self.attacker_name = attacker_name
-        self.attacker_country = db.FACTIONS[attacker_name]["country"]
+        self.attacker_country = db.FACTIONS[attacker_name].country
         self.defender_name = defender_name
-        self.defender_country = db.FACTIONS[defender_name]["country"]
+        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
+        self.plugin_scripts: List[str] = []
 
-    def units_of(self, country_name: str) -> typing.Collection[UnitType]:
+    def units_of(self, country_name: str) -> List[UnitType]:
         return []
 
     def is_successfull(self, debriefing: Debriefing) -> bool:
@@ -63,20 +90,14 @@ class Operation:
     def initialize(self, mission: Mission, conflict: Conflict):
         self.current_mission = mission
         self.conflict = conflict
-        self.airgen = AircraftConflictGenerator(mission, conflict, self.game.settings, self.game)
-        self.airsupportgen = AirSupportConflictGenerator(mission, conflict, self.game)
-        self.triggersgen = TriggersGenerator(mission, conflict, self.game)
-        self.visualgen = VisualGenerator(mission, conflict, self.game)
-        self.envgen = EnviromentGenerator(mission, conflict, self.game)
-        self.forcedoptionsgen = ForcedOptionsGenerator(mission, conflict, self.game)
-        self.groundobjectgen = GroundObjectsGenerator(mission, conflict, self.game)
-        self.briefinggen = BriefingGenerator(mission, conflict, self.game)
+        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"]
 
-        self.current_mission = dcs.Mission(terrain)
+        self.current_mission = Mission(terrain)
 
         print(self.game.player_country)
         print(country_dict[db.country_id_from_name(self.game.player_country)])
@@ -107,18 +128,87 @@ class Operation:
             self.defenders_starting_position = None
         else:
             self.attackers_starting_position = self.departure_cp.at
-            self.defenders_starting_position = self.to_cp.at
+            # TODO: Is this possible?
+            if self.to_cp is not None:
+                self.defenders_starting_position = self.to_cp.at
+            else:
+                self.defenders_starting_position = None
+
+    def inject_lua_trigger(self, contents: str, comment: str) -> None:
+        trigger = TriggerStart(comment=comment)
+        trigger.add_action(DoScript(String(contents)))
+        self.current_mission.triggerrules.triggers.append(trigger)
+
+    def bypass_plugin_script(self, mnemonic: str) -> None:
+        self.plugin_scripts.append(mnemonic)
+
+    def inject_plugin_script(self, plugin_mnemonic: str, script: str,
+                             script_mnemonic: str) -> None:
+        if script_mnemonic in self.plugin_scripts:
+            logging.debug(
+                f"Skipping already loaded {script} for {plugin_mnemonic}"
+            )
+        else:
+            self.plugin_scripts.append(script_mnemonic)
+
+            plugin_path = Path("./resources/plugins", plugin_mnemonic)
+
+            script_path = Path(plugin_path, script)
+            if not script_path.exists():
+                logging.error(
+                    f"Cannot find {script_path} for plugin {plugin_mnemonic}"
+                )
+                return
+
+            trigger = TriggerStart(comment=f"Load {script_mnemonic}")
+            filename = script_path.resolve()
+            fileref = self.current_mission.map_resource.add_resource_file(filename)
+            trigger.add_action(DoScriptFile(fileref))
+            self.current_mission.triggerrules.triggers.append(trigger)
 
     def generate(self):
+        radio_registry = RadioRegistry()
+        tacan_registry = TacanRegistry()
 
-        # Generate meteo
-        if self.environment_settings is None:
-            self.environment_settings = self.envgen.generate()
-        else:
-            self.envgen.load(self.environment_settings)
+        # 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()
+        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.
+
+        for frequency in unique_map_frequencies:
+            radio_registry.reserve(frequency)
+
+        # Set mission time and weather conditions.
+        EnvironmentGenerator(self.current_mission,
+                             self.game.conditions).generate()
 
         # Generate ground object first
-        self.groundobjectgen.generate()
+
+        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():
@@ -139,23 +229,33 @@ class Operation:
                     dead=True,
                 )
 
-
         # Air Support (Tanker & Awacs)
-        self.airsupportgen.generate(self.is_awacs_enabled)
+        airsupportgen = AirSupportConflictGenerator(
+            self.current_mission, self.conflict, self.game, radio_registry,
+            tacan_registry)
+        airsupportgen.generate(self.is_awacs_enabled)
 
         # Generate Activity on the map
-        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():
-                self.airgen.generate_flights(cp, country, self.game.planners[cp.id])
+        airgen = AircraftConflictGenerator(
+            self.current_mission, self.conflict, self.game.settings, self.game,
+            radio_registry)
+
+        airgen.generate_flights(
+            self.current_mission.country(self.game.player_country),
+            self.game.blue_ato,
+            groundobjectgen.runways
+        )
+        airgen.generate_flights(
+            self.current_mission.country(self.game.enemy_country),
+            self.game.red_ato,
+            groundobjectgen.runways
+        )
 
         # Generate ground units on frontline everywhere
-        self.game.jtacs = []
-        for player_cp, enemy_cp in self.game.theater.conflicts(True):
+        jtacs: List[JtacInfo] = []
+        for front_line in self.game.theater.conflicts(True):
+            player_cp = front_line.control_point_a
+            enemy_cp = front_line.control_point_b
             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),
@@ -165,6 +265,7 @@ class Operation:
             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
@@ -174,64 +275,243 @@ class Operation:
             self.current_mission.groundControl.red_tactical_commander = self.ca_slots
 
         # Triggers
-        if self.game.is_player_attack(self.conflict.attackers_country):
-            cp = self.conflict.from_cp
-        else:
-            cp = self.conflict.to_cp
-        self.triggersgen.generate()
+        triggersgen = TriggersGenerator(self.current_mission, self.conflict,
+                                        self.game)
+        triggersgen.generate()
 
         # Options
-        self.forcedoptionsgen.generate()
+        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:
-            self.visualgen.generate()
+            visualgen.generate()
 
-        # Inject Lua Scripts
-        load_mist = TriggerStart(comment="Load Mist Lua Framework")
-        with open("./resources/scripts/mist_4_3_74.lua") as f:
-            load_mist.add_action(DoScript(String(f.read())))
-        self.current_mission.triggerrules.triggers.append(load_mist)
+        luaData = {}
+        luaData["AircraftCarriers"] = {}
+        luaData["Tankers"] = {}
+        luaData["AWACs"] = {}
+        luaData["JTACs"] = {}
+        luaData["TargetPoints"] = {}
 
-        # Load Ciribob's JTACAutoLase script
-        load_autolase = TriggerStart(comment="Load JTAC script")
-        with open("./resources/scripts/JTACAutoLase.lua") as f:
+        self.assign_channels_to_flights(airgen.flights,
+                                        airsupportgen.air_support)
 
-            script = f.read()
-            script = script + "\n"
+        kneeboard_generator = KneeboardGenerator(self.current_mission)
+        for dynamic_runway in groundobjectgen.runways.values():
+            self.briefinggen.add_dynamic_runway(dynamic_runway)
 
-            smoke = "true"
-            if hasattr(self.game.settings, "jtac_smoke_on"):
-                if not self.game.settings.jtac_smoke_on:
-                    smoke = "false"
-
-            for jtac in self.game.jtacs:
-                script = script + "\n" + "JTACAutoLase('" + str(jtac[2]) + "', " + str(jtac[1]) + ", " + smoke + ", \"vehicle\")" + "\n"
-
-            load_autolase.add_action(DoScript(String(script)))
-        self.current_mission.triggerrules.triggers.append(load_autolase)
-
-        load_dcs_libe = TriggerStart(comment="Load DCS Liberation Script")
-        with open("./resources/scripts/dcs_liberation.lua") as f:
-            script = f.read()
-            json_location = "[["+os.path.abspath("resources\\scripts\\json.lua")+"]]"
-            state_location = "[[" + os.path.abspath("state.json") + "]]"
-            script = script.replace("{{json_file_abs_location}}", json_location)
-            script = script.replace("{{debriefing_file_location}}", state_location)
-            load_dcs_libe.add_action(DoScript(String(script)))
-        self.current_mission.triggerrules.triggers.append(load_dcs_libe)
-
-        # Briefing Generation
-        for i, tanker_type in enumerate(self.airsupportgen.generated_tankers):
-            self.briefinggen.append_frequency("Tanker {} ({})".format(TANKER_CALLSIGNS[i], tanker_type), "{}X/{} MHz AM".format(60+i, 130+i))
+        for tanker in airsupportgen.air_support.tankers:
+            self.briefinggen.add_tanker(tanker)
+            kneeboard_generator.add_tanker(tanker)
+            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 self.is_awacs_enabled:
-            self.briefinggen.append_frequency("AWACS", "233 MHz AM")
+            for awacs in airsupportgen.air_support.awacs:
+                self.briefinggen.add_awacs(awacs)
+                kneeboard_generator.add_awacs(awacs)
+                luaData["AWACs"][awacs.callsign] = { 
+                    "dcsGroupName": awacs.dcsGroupName,
+                    "callsign": awacs.callsign,
+                    "radio": awacs.freq.mhz
+                }
 
-        self.briefinggen.append_frequency("Flight", "251 MHz AM")
+        for jtac in jtacs:
+            self.briefinggen.add_jtac(jtac)
+            kneeboard_generator.add_jtac(jtac)
+            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:
+            self.briefinggen.add_flight(flight)
+            kneeboard_generator.add_flight(flight)
+            if flight.friendly and flight.flight_type in [FlightType.ANTISHIP, FlightType.DEAD, FlightType.SEAD, FlightType.STRIKE]:
+                flightType = flight.flight_type.name
+                flightTarget = flight.package.target
+                if flightTarget:
+                    flightTargetName = None
+                    flightTargetType = None
+                    if hasattr(flightTarget, 'obj_name'):
+                        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}
+                    }
+                
 
-        # Generate the briefing
         self.briefinggen.generate()
+        kneeboard_generator.generate()
 
 
+        # 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 = {}
+
+-- later, we'll add more data to the table
+
+"""
+
+
+        trigger = TriggerStart(comment="Set DCS Liberation data")
+        trigger.add_action(DoScript(String(lua)))
+        self.current_mission.triggerrules.triggers.append(trigger)
+
+        # Inject Plugins Lua Scripts and data
+        for plugin in LuaPluginManager().getPlugins():
+            plugin.injectScripts(self)
+            plugin.injectConfiguration(self)
+
+        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
+            self.assign_channels_to_flight(flight, air_support)
+
+    def assign_channels_to_flight(self, flight: FlightData,
+                                  air_support: AirSupport) -> None:
+        """Assigns preset radio channels for a client flight."""
+        airframe = flight.aircraft_type
+
+        try:
+            aircraft_data = AIRCRAFT_DATA[airframe.id]
+        except KeyError:
+            logging.warning(f"No aircraft data for {airframe.id}")
+            return
+
+        if aircraft_data.channel_allocator is not None:
+            aircraft_data.channel_allocator.assign_channels_for_flight(
+                flight, air_support
+            )

game/persistency.py

@@ -2,8 +2,9 @@ import logging
 import os
 import pickle
 import shutil
+from typing import Optional
 
-_dcs_saved_game_folder = None  # type: str
+_dcs_saved_game_folder: Optional[str] = None
 _file_abs_path = None
 
 def setup(user_folder: str):
@@ -40,30 +41,33 @@ def restore_game():
         try:
             save = pickle.load(f)
             return save
-        except:
-            logging.error("Invalid Save game")
+        except Exception:
+            logging.exception("Invalid Save game")
             return None
 
+
 def load_game(path):
     with open(path, "rb") as f:
         try:
             save = pickle.load(f)
             save.savepath = path
             return save
-        except:
-            logging.error("Invalid Save game")
+        except Exception:
+            logging.exception("Invalid Save game")
             return None
 
+
 def save_game(game) -> bool:
     try:
         with open(_temporary_save_file(), "wb") as f:
             pickle.dump(game, f)
         shutil.copy(_temporary_save_file(), game.savepath)
         return True
-    except Exception as e:
-        logging.error(e)
+    except Exception:
+        logging.exception("Could not save game")
         return False
 
+
 def autosave(game) -> bool:
     """
     Autosave to the autosave location
@@ -74,7 +78,7 @@ def autosave(game) -> bool:
         with open(_autosave_path(), "wb") as f:
             pickle.dump(game, f)
         return True
-    except Exception as e:
-        logging.error(e)
+    except Exception:
+        logging.exception("Could not save game")
         return False
 

game/settings.py

@@ -1,3 +1,4 @@
+from plugin import LuaPluginManager
 
 class Settings:
 
@@ -24,8 +25,6 @@ class Settings:
         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
 
         # Performance oriented
         self.perf_red_alert_state = True
@@ -40,4 +39,21 @@ class Settings:
         self.perf_culling = False
         self.perf_culling_distance = 100
 
+        # LUA Plugins system
+        self.plugins = {}
+        for plugin in LuaPluginManager().getPlugins():
+            plugin.setSettings(self)
 
+
+        # Cheating
+        self.show_red_ato = False
+
+    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/utils.py

@@ -1,14 +1,14 @@
-def meter_to_feet(value_in_meter):
+def meter_to_feet(value_in_meter: float) -> int:
     return int(3.28084 * value_in_meter)
 
 
-def feet_to_meter(value_in_feet):
-    return int(float(value_in_feet)/3.048)
+def feet_to_meter(value_in_feet: float) -> int:
+    return int(value_in_feet / 3.28084)
 
 
-def meter_to_nm(value_in_meter):
-    return int(float(value_in_meter)*0.000539957)
+def meter_to_nm(value_in_meter: float) -> int:
+    return int(value_in_meter / 1852)
 
 
-def nm_to_meter(value_in_nm):
-    return int(float(value_in_nm)*1852)
+def nm_to_meter(value_in_nm: float) -> int:
+    return int(value_in_nm * 1852)

game/weather.py

@@ -0,0 +1,183 @@
+from __future__ import annotations
+
+import datetime
+import logging
+import random
+from dataclasses import dataclass
+from enum import Enum
+from typing import Optional
+
+from dcs.weather import Weather as PydcsWeather, Wind
+
+from game.settings import Settings
+from theater import ConflictTheater
+
+
+class TimeOfDay(Enum):
+    Dawn = "dawn"
+    Day = "day"
+    Dusk = "dusk"
+    Night = "night"
+
+
+@dataclass(frozen=True)
+class WindConditions:
+    at_0m: Wind
+    at_2000m: Wind
+    at_8000m: Wind
+
+
+@dataclass(frozen=True)
+class Clouds:
+    base: int
+    density: int
+    thickness: int
+    precipitation: PydcsWeather.Preceptions
+
+
+@dataclass(frozen=True)
+class Fog:
+    visibility: int
+    thickness: int
+
+
+class Weather:
+    def __init__(self) -> None:
+        self.clouds = self.generate_clouds()
+        self.fog = self.generate_fog()
+        self.wind = self.generate_wind()
+
+    def generate_clouds(self) -> Optional[Clouds]:
+        raise NotImplementedError
+
+    def generate_fog(self) -> Optional[Fog]:
+        if random.randrange(5) != 0:
+            return None
+        return Fog(
+            visibility=random.randint(2500, 5000),
+            thickness=random.randint(100, 500)
+        )
+
+    def generate_wind(self) -> WindConditions:
+        raise NotImplementedError
+
+    @staticmethod
+    def random_wind(minimum: int, maximum) -> WindConditions:
+        wind_direction = random.randint(0, 360)
+        at_0m_factor = 1
+        at_2000m_factor = 2
+        at_8000m_factor = 3
+        base_wind = random.randint(minimum, maximum)
+
+        return WindConditions(
+            # Always some wind to make the smoke move a bit.
+            at_0m=Wind(wind_direction, max(1, base_wind * at_0m_factor)),
+            at_2000m=Wind(wind_direction, base_wind * at_2000m_factor),
+            at_8000m=Wind(wind_direction, base_wind * at_8000m_factor)
+        )
+
+    @staticmethod
+    def random_cloud_base() -> int:
+        return random.randint(2000, 3000)
+
+    @staticmethod
+    def random_cloud_thickness() -> int:
+        return random.randint(100, 400)
+
+
+class ClearSkies(Weather):
+    def generate_clouds(self) -> Optional[Clouds]:
+        return None
+
+    def generate_fog(self) -> Optional[Fog]:
+        return None
+
+    def generate_wind(self) -> WindConditions:
+        return self.random_wind(0, 0)
+
+
+class Cloudy(Weather):
+    def generate_clouds(self) -> Optional[Clouds]:
+        return Clouds(
+            base=self.random_cloud_base(),
+            density=random.randint(1, 8),
+            thickness=self.random_cloud_thickness(),
+            precipitation=PydcsWeather.Preceptions.None_
+        )
+
+    def generate_wind(self) -> WindConditions:
+        return self.random_wind(0, 4)
+
+
+class Raining(Weather):
+    def generate_clouds(self) -> Optional[Clouds]:
+        return Clouds(
+            base=self.random_cloud_base(),
+            density=random.randint(5, 8),
+            thickness=self.random_cloud_thickness(),
+            precipitation=PydcsWeather.Preceptions.Rain
+        )
+
+    def generate_wind(self) -> WindConditions:
+        return self.random_wind(0, 6)
+
+
+class Thunderstorm(Weather):
+    def generate_clouds(self) -> Optional[Clouds]:
+        return Clouds(
+            base=self.random_cloud_base(),
+            density=random.randint(9, 10),
+            thickness=self.random_cloud_thickness(),
+            precipitation=PydcsWeather.Preceptions.Thunderstorm
+        )
+
+    def generate_wind(self) -> WindConditions:
+        return self.random_wind(0, 8)
+
+
+@dataclass
+class Conditions:
+    time_of_day: TimeOfDay
+    start_time: datetime.datetime
+    weather: Weather
+
+    @classmethod
+    def generate(cls, theater: ConflictTheater, day: datetime.date,
+                 time_of_day: TimeOfDay, settings: Settings) -> Conditions:
+        return cls(
+            time_of_day=time_of_day,
+            start_time=cls.generate_start_time(
+                theater, day, time_of_day, settings.night_disabled
+            ),
+            weather=cls.generate_weather()
+        )
+
+    @classmethod
+    def generate_start_time(cls, theater: ConflictTheater, day: datetime.date,
+                            time_of_day: TimeOfDay,
+                            night_disabled: bool) -> datetime.datetime:
+        if night_disabled:
+            logging.info("Skip Night mission due to user settings")
+            time_range = {
+                TimeOfDay.Dawn: (8, 9),
+                TimeOfDay.Day: (10, 12),
+                TimeOfDay.Dusk: (12, 14),
+                TimeOfDay.Night: (14, 17),
+            }[time_of_day]
+        else:
+            time_range = theater.daytime_map[time_of_day.value]
+
+        time = datetime.time(hour=random.randint(*time_range))
+        return datetime.datetime.combine(day, time)
+
+    @classmethod
+    def generate_weather(cls) -> Weather:
+        chances = {
+            Thunderstorm: 1,
+            Raining: 20,
+            Cloudy: 60,
+            ClearSkies: 20,
+        }
+        weather_type = random.choices(list(chances.keys()),
+                                      weights=list(chances.values()))[0]
+        return weather_type()

gen/__init__.py

@@ -1,4 +1,3 @@
-from .aaa import *
 from .aircraft import *
 from .armor import *
 from .airsupportgen import *
@@ -9,6 +8,6 @@ from .environmentgen import *
 from .groundobjectsgen import *
 from .briefinggen import *
 from .forcedoptionsgen import *
+from .kneeboard import *
 
 from . import naming
-

gen/aaa.py

@@ -1,51 +0,0 @@
-from .conflictgen import *
-from .naming import *
-
-from dcs.mission import *
-from dcs.mission import *
-
-from .conflictgen import *
-from .naming import *
-
-DISTANCE_FACTOR = 0.5, 1
-EXTRA_AA_MIN_DISTANCE = 50000
-EXTRA_AA_MAX_DISTANCE = 150000
-EXTRA_AA_POSITION_FROM_CP = 550
-
-class ExtraAAConflictGenerator:
-    def __init__(self, mission: Mission, conflict: Conflict, game, player_country: Country, enemy_country: Country):
-        self.mission = mission
-        self.game = game
-        self.conflict = conflict
-        self.player_country = player_country
-        self.enemy_country = enemy_country
-
-    def generate(self):
-
-        for cp in self.game.theater.controlpoints:
-            if cp.is_global:
-                continue
-
-            if cp.position.distance_to_point(self.conflict.position) < EXTRA_AA_MIN_DISTANCE:
-                continue
-
-            if cp.position.distance_to_point(self.conflict.from_cp.position) < EXTRA_AA_MIN_DISTANCE:
-                continue
-
-            if cp.position.distance_to_point(self.conflict.to_cp.position) < EXTRA_AA_MIN_DISTANCE:
-                continue
-
-            if cp.position.distance_to_point(self.conflict.position) > EXTRA_AA_MAX_DISTANCE:
-                continue
-
-            country_name = cp.captured and self.player_country or self.enemy_country
-            position = cp.position.point_from_heading(0, EXTRA_AA_POSITION_FROM_CP)
-
-            self.mission.vehicle_group(
-                country=self.mission.country(country_name),
-                name=namegen.next_basedefense_name(),
-                _type=db.EXTRA_AA[country_name],
-                position=position,
-                group_size=1
-            )
-

gen/airsupportgen.py

@@ -1,12 +1,23 @@
-from game import db
-from .conflictgen import *
-from .naming import *
+from dataclasses import dataclass, field
+from typing import List, Type
 
-from dcs.mission import *
-from dcs.unitgroup import *
-from dcs.unittype import *
-from dcs.task import *
-from dcs.terrain.terrain import NoParkingSlotError
+from dcs.mission import Mission, StartType
+from dcs.planes import IL_78M
+from dcs.task import (
+    AWACS,
+    ActivateBeaconCommand,
+    MainTask,
+    Refueling,
+    SetImmortalCommand,
+    SetInvisibleCommand,
+)
+
+from game import db
+from .naming import namegen
+from .callsigns import callsign_for_support_unit
+from .conflictgen import Conflict
+from .radios import RadioFrequency, RadioRegistry
+from .tacan import TacanBand, TacanChannel, TacanRegistry
 
 TANKER_DISTANCE = 15000
 TANKER_ALT = 4572
@@ -16,50 +27,102 @@ AWACS_DISTANCE = 150000
 AWACS_ALT = 13000
 
 
-class AirSupportConflictGenerator:
-    generated_tankers = None  # type: typing.List[str]
+@dataclass
+class AwacsInfo:
+    """AWACS information for the kneeboard."""
+    dcsGroupName: str
+    callsign: str
+    freq: RadioFrequency
 
-    def __init__(self, mission: Mission, conflict: Conflict, game):
+
+@dataclass
+class TankerInfo:
+    """Tanker information for the kneeboard."""
+    dcsGroupName: str
+    callsign: str
+    variant: str
+    freq: RadioFrequency
+    tacan: TacanChannel
+
+
+@dataclass
+class AirSupport:
+    awacs: List[AwacsInfo] = field(default_factory=list)
+    tankers: List[TankerInfo] = field(default_factory=list)
+
+
+class AirSupportConflictGenerator:
+
+    def __init__(self, mission: Mission, conflict: Conflict, game,
+                 radio_registry: RadioRegistry,
+                 tacan_registry: TacanRegistry) -> None:
         self.mission = mission
         self.conflict = conflict
         self.game = game
-        self.generated_tankers = []
+        self.air_support = AirSupport()
+        self.radio_registry = radio_registry
+        self.tacan_registry = tacan_registry
 
     @classmethod
-    def support_tasks(cls) -> typing.Collection[typing.Type[MainTask]]:
+    def support_tasks(cls) -> List[Type[MainTask]]:
         return [Refueling, AWACS]
 
     def generate(self, is_awacs_enabled):
         player_cp = self.conflict.from_cp if self.conflict.from_cp.captured else self.conflict.to_cp
 
-        CALLSIGNS = ["TKR", "TEX", "FUL", "FUE", ""]
+        fallback_tanker_number = 0
+
         for i, tanker_unit_type in enumerate(db.find_unittype(Refueling, self.conflict.attackers_side)):
-            self.generated_tankers.append(db.unit_type_name(tanker_unit_type))
+            variant = db.unit_type_name(tanker_unit_type)
+            freq = self.radio_registry.alloc_uhf()
+            tacan = self.tacan_registry.alloc_for_band(TacanBand.Y)
             tanker_heading = self.conflict.to_cp.position.heading_between_point(self.conflict.from_cp.position) + TANKER_HEADING_OFFSET * i
             tanker_position = player_cp.position.point_from_heading(tanker_heading, TANKER_DISTANCE)
             tanker_group = self.mission.refuel_flight(
                 country=self.mission.country(self.game.player_country),
-                name=namegen.next_tanker_name(self.mission.country(self.game.player_country)),
+                name=namegen.next_tanker_name(self.mission.country(self.game.player_country), tanker_unit_type),
                 airport=None,
                 plane_type=tanker_unit_type,
                 position=tanker_position,
                 altitude=TANKER_ALT,
                 race_distance=58000,
-                frequency=130 + i,
+                frequency=freq.mhz,
                 start_type=StartType.Warm,
                 speed=574,
-                tacanchannel="{}X".format(60 + i),
+                tacanchannel=str(tacan),
             )
+            tanker_group.set_frequency(freq.mhz)
+
+            callsign = callsign_for_support_unit(tanker_group)
+            tacan_callsign = {
+                "Texaco": "TEX",
+                "Arco": "ARC",
+                "Shell": "SHL",
+            }.get(callsign)
+            if tacan_callsign is None:
+                # The dict above is all the callsigns currently in the game, but
+                # non-Western countries don't use the callsigns and instead just
+                # use numbers. It's possible that none of those nations have
+                # TACAN compatible refueling aircraft, but fallback just in
+                # case.
+                tacan_callsign = f"TK{fallback_tanker_number}"
+                fallback_tanker_number += 1
 
             if tanker_unit_type != IL_78M:
-                tanker_group.points[0].tasks.pop() # Override PyDCS tacan channel
-                tanker_group.points[0].tasks.append(ActivateBeaconCommand(60 + i, "X", CALLSIGNS[i], True, tanker_group.units[0].id, True))
+                # Override PyDCS tacan channel.
+                tanker_group.points[0].tasks.pop()
+                tanker_group.points[0].tasks.append(ActivateBeaconCommand(
+                    tacan.number, tacan.band.value, tacan_callsign, True,
+                    tanker_group.units[0].id, True))
 
             tanker_group.points[0].tasks.append(SetInvisibleCommand(True))
             tanker_group.points[0].tasks.append(SetImmortalCommand(True))
 
+            self.air_support.tankers.append(TankerInfo(str(tanker_group.name), callsign, variant, freq, tacan))
+
         if is_awacs_enabled:
             try:
+                freq = self.radio_registry.alloc_uhf()
                 awacs_unit = db.find_unittype(AWACS, self.conflict.attackers_side)[0]
                 awacs_flight = self.mission.awacs_flight(
                     country=self.mission.country(self.game.player_country),
@@ -68,11 +131,15 @@ class AirSupportConflictGenerator:
                     altitude=AWACS_ALT,
                     airport=None,
                     position=self.conflict.position.random_point_within(AWACS_DISTANCE, AWACS_DISTANCE),
-                    frequency=233,
+                    frequency=freq.mhz,
                     start_type=StartType.Warm,
                 )
+                awacs_flight.set_frequency(freq.mhz)
+
                 awacs_flight.points[0].tasks.append(SetInvisibleCommand(True))
                 awacs_flight.points[0].tasks.append(SetImmortalCommand(True))
-            except:
-                print("No AWACS for faction")
 
+                self.air_support.awacs.append(AwacsInfo(
+                    str(awacs_flight.name), callsign_for_support_unit(awacs_flight), freq))
+            except:
+                print("No AWACS for faction")

gen/armor.py

@@ -1,11 +1,40 @@
-from dcs.action import AITaskPush, AITaskSet
-from dcs.condition import TimeAfter, UnitDamaged, Or, GroupLifeLess
-from dcs.task import *
-from dcs.triggers import TriggerOnce, Event
+import logging
+import random
+from dataclasses import dataclass
+from typing import List
 
-from gen import namegen
-from gen.ground_forces.ai_ground_planner import CombatGroupRole, DISTANCE_FROM_FRONTLINE
-from .conflictgen import *
+from dcs import Mission
+from dcs.action import AITaskPush
+from dcs.condition import GroupLifeLess, Or, TimeAfter, UnitDamaged
+from dcs.country import Country
+from dcs.mapping import Point
+from dcs.planes import MQ_9_Reaper
+from dcs.point import PointAction
+from dcs.task import (
+    AttackGroup,
+    ControlledTask,
+    EPLRS,
+    FireAtPoint,
+    GoToWaypoint,
+    Hold,
+    OrbitAction,
+    SetImmortalCommand,
+    SetInvisibleCommand,
+)
+from dcs.triggers import Event, TriggerOnce
+from dcs.unit import Vehicle
+from dcs.unittype import VehicleType
+
+from game import db
+from .naming import namegen
+from gen.ground_forces.ai_ground_planner import (
+    CombatGroupRole,
+    DISTANCE_FROM_FRONTLINE,
+)
+from .callsigns import callsign_for_support_unit
+from .conflictgen import Conflict
+from .ground_forces.combat_stance import CombatStance
+from plugin import LuaPluginManager
 
 SPREAD_DISTANCE_FACTOR = 0.1, 0.3
 SPREAD_DISTANCE_SIZE_FACTOR = 0.1
@@ -22,6 +51,18 @@ FIGHT_DISTANCE = 3500
 
 RANDOM_OFFSET_ATTACK = 250
 
+
+@dataclass(frozen=True)
+class JtacInfo:
+    """JTAC information."""
+    dcsGroupName: str
+    unit_name: str
+    callsign: str
+    region: str
+    code: str
+    # TODO: Radio info? Type?
+
+
 class GroundConflictGenerator:
 
     def __init__(self, mission: Mission, conflict: Conflict, game, player_planned_combat_groups, enemy_planned_combat_groups, player_stance):
@@ -30,11 +71,12 @@ class GroundConflictGenerator:
         self.enemy_planned_combat_groups = enemy_planned_combat_groups
         self.player_planned_combat_groups = player_planned_combat_groups
         self.player_stance = CombatStance(player_stance)
-        self.enemy_stance = random.choice([CombatStance.AGGRESIVE, CombatStance.AGGRESIVE, CombatStance.AGGRESIVE, CombatStance.ELIMINATION, CombatStance.BREAKTHROUGH]) if len(enemy_planned_combat_groups) > len(player_planned_combat_groups) else random.choice([CombatStance.DEFENSIVE, CombatStance.DEFENSIVE, CombatStance.DEFENSIVE, CombatStance.AMBUSH, CombatStance.AGGRESIVE])
+        self.enemy_stance = random.choice([CombatStance.AGGRESSIVE, CombatStance.AGGRESSIVE, CombatStance.AGGRESSIVE, CombatStance.ELIMINATION, CombatStance.BREAKTHROUGH]) if len(enemy_planned_combat_groups) > len(player_planned_combat_groups) else random.choice([CombatStance.DEFENSIVE, CombatStance.DEFENSIVE, CombatStance.DEFENSIVE, CombatStance.AMBUSH, CombatStance.AGGRESSIVE])
         self.game = game
+        self.jtacs: List[JtacInfo] = []
 
     def _group_point(self, point) -> Point:
-        distance = randint(
+        distance = random.randint(
                 int(self.conflict.size * SPREAD_DISTANCE_FACTOR[0]),
                 int(self.conflict.size * SPREAD_DISTANCE_FACTOR[1]),
                 )
@@ -98,13 +140,15 @@ class GroundConflictGenerator:
         self.plan_action_for_groups(self.enemy_stance, enemy_groups, player_groups, self.conflict.heading - 90, self.conflict.to_cp, self.conflict.from_cp)
 
         # Add JTAC
-        if "has_jtac" in self.game.player_faction and self.game.player_faction["has_jtac"] and self.game.settings.include_jtac_if_available:
+        jtacPlugin = LuaPluginManager().getPlugin("jtacautolase")
+        useJTAC = jtacPlugin and jtacPlugin.isEnabled()
+        if self.game.player_faction.has_jtac and useJTAC:
             n = "JTAC" + str(self.conflict.from_cp.id) + str(self.conflict.to_cp.id)
-            code = 1688 - len(self.game.jtacs)
+            code = 1688 - len(self.jtacs)
 
             utype = MQ_9_Reaper
-            if "jtac_unit" in self.game.player_faction:
-                utype = self.game.player_faction["jtac_unit"]
+            if self.game.player_faction.jtac_unit is not None:
+                utype = self.game.player_faction.jtac_unit
 
             jtac = self.mission.flight_group(country=self.mission.country(self.game.player_country),
                                              name=n,
@@ -115,7 +159,10 @@ class GroundConflictGenerator:
             jtac.points[0].tasks.append(SetInvisibleCommand(True))
             jtac.points[0].tasks.append(SetImmortalCommand(True))
             jtac.points[0].tasks.append(OrbitAction(5000, 300, OrbitAction.OrbitPattern.Circle))
-            self.game.jtacs.append(("Frontline " + self.conflict.from_cp.name + "/" + self.conflict.to_cp.name, code, n))
+            frontline = f"Frontline {self.conflict.from_cp.name}/{self.conflict.to_cp.name}"
+            # Note: Will need to change if we ever add ground based JTAC.
+            callsign = callsign_for_support_unit(jtac)
+            self.jtacs.append(JtacInfo(str(jtac.name), n, callsign, frontline, str(code)))
 
     def gen_infantry_group_for_group(self, group, is_player, side:Country, forward_heading):
 
@@ -148,7 +195,7 @@ class GroundConflictGenerator:
                 heading=forward_heading,
                 move_formation=PointAction.OffRoad)
 
-        for i in range(randint(3, 10)):
+        for i in range(random.randint(3, 10)):
             u = random.choice(possible_infantry_units)
             position = infantry_position.random_point_within(55, 5)
             self.mission.vehicle_group(
@@ -166,6 +213,11 @@ class GroundConflictGenerator:
             return
 
         for dcs_group, group in ally_groups:
+
+            if hasattr(group.units[0], 'eplrs'):
+                if group.units[0].eplrs:
+                    dcs_group.points[0].tasks.append(EPLRS(dcs_group.id))
+
             if group.role == CombatGroupRole.ARTILLERY:
                 # Fire on any ennemy in range
                 if self.game.settings.perf_artillery:
@@ -222,7 +274,7 @@ class GroundConflictGenerator:
                                 u.heading = forward_heading + random.randint(-5,5)
 
             elif group.role in [CombatGroupRole.TANK, CombatGroupRole.IFV]:
-                if stance == CombatStance.AGGRESIVE:
+                if stance == CombatStance.AGGRESSIVE:
                     # Attack nearest enemy if any
                     # Then move forward OR Attack enemy base if it is not too far away
                     target = self.find_nearest_enemy_group(dcs_group, enemy_groups)
@@ -263,7 +315,7 @@ class GroundConflictGenerator:
 
             elif group.role in [CombatGroupRole.APC, CombatGroupRole.ATGM]:
 
-                if stance in [CombatStance.AGGRESIVE, CombatStance.BREAKTHROUGH, CombatStance.ELIMINATION]:
+                if stance in [CombatStance.AGGRESSIVE, CombatStance.BREAKTHROUGH, CombatStance.ELIMINATION]:
                     # APC & ATGM will never move too much forward, but will follow along any offensive
                     if to_cp.position.distance_to_point(dcs_group.points[0].position) <= AGGRESIVE_MOVE_DISTANCE:
                         attack_point = to_cp.position.random_point_within(500, 0)

gen/ato.py

@@ -0,0 +1,144 @@
+"""Air Tasking Orders.
+
+The classes of the Air Tasking Order (ATO) define all of the missions that have
+been planned, and which aircraft have been assigned to them. Each planned
+mission, or "package" is composed of individual flights. The package may contain
+dissimilar aircraft performing different roles, but all for the same goal. For
+example, the package to strike an enemy airfield may contain an escort flight,
+a SEAD flight, and the strike aircraft themselves. CAP packages may contain only
+the single CAP flight.
+"""
+import logging
+from collections import defaultdict
+from dataclasses import dataclass, field
+from typing import Dict, List, Optional
+
+from dcs.mapping import Point
+
+from theater.missiontarget import MissionTarget
+from .flights.flight import Flight, FlightType
+
+
+@dataclass(frozen=True)
+class Task:
+    """The main task of a flight or package."""
+
+    #: The type of task.
+    task_type: FlightType
+
+    #: The location of the objective.
+    location: str
+
+
+@dataclass(frozen=True)
+class PackageWaypoints:
+    join: Point
+    ingress: Point
+    egress: Point
+    split: Point
+
+
+@dataclass
+class Package:
+    """A mission package."""
+
+    #: The mission target. Currently can be either a ControlPoint or a
+    #: TheaterGroundObject (non-ControlPoint map objectives).
+    target: MissionTarget
+
+    #: The set of flights in the package.
+    flights: List[Flight] = field(default_factory=list)
+
+    delay: int = field(default=0)
+
+    #: Desired TOT measured in seconds from mission start.
+    time_over_target: int = field(default=0)
+
+    waypoints: Optional[PackageWaypoints] = field(default=None)
+
+    def add_flight(self, flight: Flight) -> None:
+        """Adds a flight to the package."""
+        self.flights.append(flight)
+
+    def remove_flight(self, flight: Flight) -> None:
+        """Removes a flight from the package."""
+        self.flights.remove(flight)
+        if not self.flights:
+            self.waypoints = None
+
+    @property
+    def primary_task(self) -> Optional[FlightType]:
+        if not self.flights:
+            return None
+
+        flight_counts: Dict[FlightType, int] = defaultdict(lambda: 0)
+        for flight in self.flights:
+            flight_counts[flight.flight_type] += 1
+
+        # The package will contain a mix of mission types, but in general we can
+        # determine the goal of the mission because some mission types are more
+        # likely to be the main task than others. For example, a package with
+        # only CAP flights is a CAP package, a flight with CAP and strike is a
+        # strike package, a flight with CAP and DEAD is a DEAD package, and a
+        # flight with strike and SEAD is an OCA/Strike package. The type of
+        # package is determined by the highest priority flight in the package.
+        task_priorities = [
+            FlightType.CAS,
+            FlightType.STRIKE,
+            FlightType.ANTISHIP,
+            FlightType.BAI,
+            FlightType.EVAC,
+            FlightType.TROOP_TRANSPORT,
+            FlightType.RECON,
+            FlightType.ELINT,
+            FlightType.DEAD,
+            FlightType.SEAD,
+            FlightType.LOGISTICS,
+            FlightType.INTERCEPTION,
+            FlightType.TARCAP,
+            FlightType.CAP,
+            FlightType.BARCAP,
+            FlightType.EWAR,
+            FlightType.ESCORT,
+        ]
+        for task in task_priorities:
+            if flight_counts[task]:
+                return task
+
+        # If we get here, our task_priorities list above is incomplete. Log the
+        # issue and return the type of *any* flight in the package.
+        some_mission = next(iter(self.flights)).flight_type
+        logging.warning(f"Unhandled mission type: {some_mission}")
+        return some_mission
+
+    @property
+    def package_description(self) -> str:
+        """Generates a package description based on flight composition."""
+        task = self.primary_task
+        if task is None:
+            return "No mission"
+        return task.name
+
+    def __hash__(self) -> int:
+        # TODO: Far from perfect. Number packages?
+        return hash(self.target.name)
+
+
+@dataclass
+class AirTaskingOrder:
+    """The entire ATO for one coalition."""
+
+    #: The set of all planned packages in the ATO.
+    packages: List[Package] = field(default_factory=list)
+
+    def add_package(self, package: Package) -> None:
+        """Adds a package to the ATO."""
+        self.packages.append(package)
+
+    def remove_package(self, package: Package) -> None:
+        """Removes a package from the ATO."""
+        self.packages.remove(package)
+
+    def clear(self) -> None:
+        """Removes all packages from the ATO."""
+        self.packages.clear()

gen/beacons.py

@@ -0,0 +1,74 @@
+from dataclasses import dataclass
+from enum import auto, IntEnum
+import json
+from pathlib import Path
+from typing import Iterable, Optional
+
+from gen.radios import RadioFrequency
+from gen.tacan import TacanBand, TacanChannel
+
+
+BEACONS_RESOURCE_PATH = Path("resources/dcs/beacons")
+
+
+class BeaconType(IntEnum):
+    BEACON_TYPE_NULL = auto()
+    BEACON_TYPE_VOR = auto()
+    BEACON_TYPE_DME = auto()
+    BEACON_TYPE_VOR_DME = auto()
+    BEACON_TYPE_TACAN = auto()
+    BEACON_TYPE_VORTAC = auto()
+    BEACON_TYPE_RSBN = auto()
+    BEACON_TYPE_BROADCAST_STATION = auto()
+
+    BEACON_TYPE_HOMER = auto()
+    BEACON_TYPE_AIRPORT_HOMER = auto()
+    BEACON_TYPE_AIRPORT_HOMER_WITH_MARKER = auto()
+    BEACON_TYPE_ILS_FAR_HOMER = auto()
+    BEACON_TYPE_ILS_NEAR_HOMER = auto()
+
+    BEACON_TYPE_ILS_LOCALIZER = auto()
+    BEACON_TYPE_ILS_GLIDESLOPE = auto()
+
+    BEACON_TYPE_PRMG_LOCALIZER = auto()
+    BEACON_TYPE_PRMG_GLIDESLOPE = auto()
+
+    BEACON_TYPE_ICLS_LOCALIZER = auto()
+    BEACON_TYPE_ICLS_GLIDESLOPE = auto()
+
+    BEACON_TYPE_NAUTICAL_HOMER = auto()
+
+
+@dataclass(frozen=True)
+class Beacon:
+    name: str
+    callsign: str
+    beacon_type: BeaconType
+    hertz: int
+    channel: Optional[int]
+
+    @property
+    def frequency(self) -> RadioFrequency:
+        return RadioFrequency(self.hertz)
+
+    @property
+    def is_tacan(self) -> bool:
+        return self.beacon_type in (
+            BeaconType.BEACON_TYPE_VORTAC,
+            BeaconType.BEACON_TYPE_TACAN,
+        )
+
+    @property
+    def tacan_channel(self) -> TacanChannel:
+        assert self.is_tacan
+        assert self.channel is not None
+        return TacanChannel(self.channel, TacanBand.X)
+
+
+def load_beacons_for_terrain(name: str) -> Iterable[Beacon]:
+    beacons_file = BEACONS_RESOURCE_PATH / f"{name.lower()}.json"
+    if not beacons_file.exists():
+        raise RuntimeError(f"Beacon file {beacons_file.resolve()} is missing")
+
+    for beacon in json.loads(beacons_file.read_text()):
+        yield Beacon(**beacon)

gen/briefinggen.py

@@ -1,125 +1,190 @@
-import logging
+import datetime
+import os
+import random
+from collections import defaultdict
+from dataclasses import dataclass
+from typing import List
+
+from dcs.mission import Mission
 
 from game import db
-from .conflictgen import *
-from .naming import *
-
-from dcs.mission import *
+from .aircraft import FlightData
+from .airsupportgen import AwacsInfo, TankerInfo
+from .armor import JtacInfo
+from .conflictgen import Conflict
+from .ground_forces.combat_stance import CombatStance
+from .radios import RadioFrequency
+from .runways import RunwayData
 
 
-class BriefingGenerator:
-    freqs = None  # type: typing.List[typing.Tuple[str, str]]
-    title = ""  # type: str
-    description = ""  # type: str
-    targets = None  # type: typing.List[typing.Tuple[str, str]]
-    waypoints = None  # type: typing.List[str]
+@dataclass
+class CommInfo:
+    """Communications information for the kneeboard."""
+    name: str
+    freq: RadioFrequency
+
+
+class MissionInfoGenerator:
+    """Base type for generators of mission information for the player.
+
+    Examples of subtypes include briefing generators, kneeboard generators, etc.
+    """
+
+    def __init__(self, mission: Mission) -> None:
+        self.mission = mission
+        self.awacs: List[AwacsInfo] = []
+        self.comms: List[CommInfo] = []
+        self.flights: List[FlightData] = []
+        self.jtacs: List[JtacInfo] = []
+        self.tankers: List[TankerInfo] = []
+
+    def add_awacs(self, awacs: AwacsInfo) -> None:
+        """Adds an AWACS/GCI to the mission.
+
+        Args:
+            awacs: AWACS information.
+        """
+        self.awacs.append(awacs)
+
+    def add_comm(self, name: str, freq: RadioFrequency) -> None:
+        """Adds communications info to the mission.
+
+        Args:
+            name: Name of the radio channel.
+            freq: Frequency of the radio channel.
+        """
+        self.comms.append(CommInfo(name, freq))
+
+    def add_flight(self, flight: FlightData) -> None:
+        """Adds flight info to the mission.
+
+        Args:
+            flight: Flight information.
+        """
+        self.flights.append(flight)
+
+    def add_jtac(self, jtac: JtacInfo) -> None:
+        """Adds a JTAC to the mission.
+
+        Args:
+            jtac: JTAC information.
+        """
+        self.jtacs.append(jtac)
+
+    def add_tanker(self, tanker: TankerInfo) -> None:
+        """Adds a tanker to the mission.
+
+        Args:
+            tanker: Tanker information.
+        """
+        self.tankers.append(tanker)
+
+    def generate(self) -> None:
+        """Generates the mission information."""
+        raise NotImplementedError
+
+
+class BriefingGenerator(MissionInfoGenerator):
 
     def __init__(self, mission: Mission, conflict: Conflict, game):
-        self.m = mission
+        super().__init__(mission)
         self.conflict = conflict
         self.game = game
+        self.title = ""
         self.description = ""
+        self.dynamic_runways: List[RunwayData] = []
 
-        self.freqs = []
-        self.targets = []
-        self.waypoints = []
+    def add_dynamic_runway(self, runway: RunwayData) -> None:
+        """Adds a dynamically generated runway to the briefing.
 
-        self.jtacs = []
+        Dynamic runways are any valid landing point that is a unit rather than a
+        map feature. These include carriers, ships with a helipad, and FARPs.
+        """
+        self.dynamic_runways.append(runway)
 
-    def append_frequency(self, name: str, frequency: str):
-        self.freqs.append((name, frequency))
+    def add_flight_description(self, flight: FlightData):
+        assert flight.client_units
 
-    def append_target(self, description: str, markpoint: str = None):
-        self.targets.append((description, markpoint))
-
-    def append_waypoint(self, description: str):
-        self.waypoints.append(description)
-
-    def add_flight_description(self, flight):
-
-        if flight.client_count <= 0:
-            return
-
-        flight_unit_name = db.unit_type_name(flight.unit_type)
+        aircraft = flight.aircraft_type
+        flight_unit_name = db.unit_type_name(aircraft)
         self.description += "-" * 50 + "\n"
-        self.description += flight_unit_name + " x " + str(flight.count) + 2 * "\n"
+        self.description += f"{flight_unit_name} x {flight.size}\n\n"
 
-        self.description += "#0 -- TAKEOFF : Take off from " + flight.from_cp.name + "\n"
-        for i, wpt in enumerate(flight.points):
-            self.description += "#" + str(1+i) + " -- " + wpt.name + " : " + wpt.description + "\n"
-        self.description += "#" + str(len(flight.points) + 1) + " -- RTB\n\n"
+        for i, wpt in enumerate(flight.waypoints):
+            self.description += f"#{i + 1} -- {wpt.name} : {wpt.description}\n"
+        self.description += f"#{len(flight.waypoints) + 1} -- RTB\n\n"
 
-        group = flight.group
-        if group is not None:
-            for i, nav_target in enumerate(group.nav_target_points):
-                self.description += nav_target.text_comment + "\n"
-        self.description += "\n"
-        self.description += "-" * 50 + "\n"
-
-    def add_ally_flight_description(self, flight):
-        if flight.client_count == 0:
-            flight_unit_name = db.unit_type_name(flight.unit_type)
-            self.description += flight.flight_type.name + " " + flight_unit_name + " x " + str(flight.count) + ", departing in " + str(flight.scheduled_in) + " minutes \n"
+    def add_ally_flight_description(self, flight: FlightData):
+        assert not flight.client_units
+        aircraft = flight.aircraft_type
+        flight_unit_name = db.unit_type_name(aircraft)
+        delay = datetime.timedelta(seconds=flight.departure_delay)
+        self.description += (
+            f"{flight.flight_type.name} {flight_unit_name} x {flight.size}, "
+            f"departing in {delay}\n"
+        )
 
     def generate(self):
-
         self.description = ""
 
         self.description += "DCS Liberation turn #" + str(self.game.turn) + "\n"
         self.description += "=" * 15 + "\n\n"
 
+        self.description += (
+            "Most briefing information, including communications and flight "
+            "plan information, can be found on your kneeboard.\n\n"
+        )
+
         self.generate_ongoing_war_text()
 
         self.description += "\n"*2
         self.description += "Your flights:" + "\n"
         self.description += "=" * 15 + "\n\n"
 
-        for planner in self.game.planners.values():
-            for flight in planner.flights:
+        for flight in self.flights:
+            if flight.client_units:
                 self.add_flight_description(flight)
 
         self.description += "\n"*2
         self.description += "Planned ally flights:" + "\n"
         self.description += "=" * 15 + "\n"
-        for planner in self.game.planners.values():
-            if planner.from_cp.captured and len(planner.flights) > 0:
-                self.description += "\nFrom " + planner.from_cp.full_name + " \n"
-                self.description += "-" * 50 + "\n\n"
-                for flight in planner.flights:
-                    self.add_ally_flight_description(flight)
+        allied_flights_by_departure = defaultdict(list)
+        for flight in self.flights:
+            if not flight.client_units and flight.friendly:
+                name = flight.departure.airfield_name
+                allied_flights_by_departure[name].append(flight)
+        for departure, flights in allied_flights_by_departure.items():
+            self.description += f"\nFrom {departure}\n"
+            self.description += "-" * 50 + "\n\n"
+            for flight in flights:
+                self.add_ally_flight_description(flight)
 
-        if self.freqs:
+        if self.comms:
             self.description += "\n\nComms Frequencies:\n"
             self.description += "=" * 15 + "\n"
-            for name, freq in self.freqs:
-                self.description += "{}: {}\n".format(name, freq)
+            for comm_info in self.comms:
+                self.description += f"{comm_info.name}: {comm_info.freq}\n"
         self.description += ("-" * 50) + "\n"
 
-        for cp in self.game.theater.controlpoints:
-            if cp.captured and cp.cptype in [ControlPointType.LHA_GROUP, ControlPointType.AIRCRAFT_CARRIER_GROUP]:
-                self.description += cp.name + "\n"
-                self.description += "RADIO : 127.5 Mhz AM\n"
-                self.description += "TACAN : "
-                self.description += str(cp.tacanN)
-                if cp.tacanY:
-                    self.description += "Y"
-                else:
-                    self.description += "X"
-                self.description += " " + str(cp.tacanI) + "\n"
-
-                if cp.cptype == ControlPointType.AIRCRAFT_CARRIER_GROUP and hasattr(cp, "icls"):
-                    self.description += "ICLS Channel : " + str(cp.icls) + "\n"
-                self.description += "-" * 50 + "\n"
+        for runway in self.dynamic_runways:
+            self.description += f"{runway.airfield_name}\n"
+            self.description += f"RADIO : {runway.atc}\n"
+            if runway.tacan is not None:
+                self.description += f"TACAN : {runway.tacan} {runway.tacan_callsign}\n"
+            if runway.icls is not None:
+                self.description += f"ICLS Channel : {runway.icls}\n"
+            self.description += "-" * 50 + "\n"
 
 
         self.description += "JTACS [F-10 Menu] : \n"
         self.description += "===================\n\n"
-        for jtac in self.game.jtacs:
-            self.description += str(jtac[0]) + " -- Code : " + str(jtac[1]) + "\n"
+        for jtac in self.jtacs:
+            self.description += f"{jtac.region} -- Code : {jtac.code}\n"
 
-        self.m.set_description_text(self.description)
+        self.mission.set_description_text(self.description)
 
-        self.m.add_picture_blue(os.path.abspath("./resources/ui/splash_screen.png"))
+        self.mission.add_picture_blue(os.path.abspath(
+            "./resources/ui/splash_screen.png"))
 
 
     def generate_ongoing_war_text(self):
@@ -129,14 +194,10 @@ class BriefingGenerator:
 
         conflict_number = 0
 
-        for c in self.game.theater.conflicts():
+        for front_line in self.game.theater.conflicts(from_player=True):
             conflict_number = conflict_number + 1
-            if c[0].captured:
-                player_base = c[0]
-                enemy_base = c[1]
-            else:
-                player_base = c[1]
-                enemy_base = c[0]
+            player_base = front_line.control_point_a
+            enemy_base = front_line.control_point_b
 
             has_numerical_superiority = player_base.base.total_armor > enemy_base.base.total_armor
             self.description += self.__random_frontline_sentence(player_base.name, enemy_base.name)
@@ -148,7 +209,7 @@ class BriefingGenerator:
                     self.description += "We do not have a single vehicle available to hold our position, the situation is critical, and we will lose ground inevitably.\n"
                 elif enemy_base.base.total_armor == 0:
                     self.description += "The enemy forces have been crushed, we will be able to make significant progress toward " + enemy_base.name + ". \n"
-                if stance == CombatStance.AGGRESIVE:
+                if stance == CombatStance.AGGRESSIVE:
                     if has_numerical_superiority:
                         self.description += "On this location, our ground forces will try to make progress against the enemy"
                         self.description += ". As the enemy is outnumbered, our forces should have no issue making progress.\n"
@@ -180,7 +241,7 @@ class BriefingGenerator:
     def __random_frontline_sentence(self, player_base_name, enemy_base_name):
         templates = [
             "There are combats between {} and {}. ",
-            "The war on the ground is still going on between {} an {}. ",
+            "The war on the ground is still going on between {} and {}. ",
             "Our ground forces in {} are opposed to enemy forces based in {}. ",
             "Our forces from {} are fighting enemies based in {}. ",
             "There is an active frontline between {} and {}. ",

gen/callsigns.py

@@ -0,0 +1,34 @@
+"""Support for working with DCS group callsigns."""
+import logging
+import re
+
+from dcs.unitgroup import FlyingGroup
+from dcs.flyingunit import FlyingUnit
+
+
+def callsign_for_support_unit(group: FlyingGroup) -> str:
+    # Either something like Overlord11 for Western AWACS, or else just a number.
+    # Convert to either "Overlord" or "Flight 123".
+    lead = group.units[0]
+    raw_callsign = lead.callsign_as_str()
+    try:
+        return f"Flight {int(raw_callsign)}"
+    except ValueError:
+        return raw_callsign.rstrip("1234567890")
+
+
+def create_group_callsign_from_unit(lead: FlyingUnit) -> str:
+    raw_callsign = lead.callsign_as_str()
+    if not lead.callsign_is_western:
+        # Callsigns for non-Western countries are just a number per flight,
+        # similar to tail numbers.
+        return f"Flight {raw_callsign}"
+
+    # Callsign from pydcs is in the format `<name><group ID><unit ID>`,
+    # where unit ID is guaranteed to be a single digit but the group ID may
+    # be more.
+    match = re.search(r"^(\D+)(\d+)(\d)$", raw_callsign)
+    if match is None:
+        logging.error(f"Could not parse unit callsign: {raw_callsign}")
+        return f"Flight {raw_callsign}"
+    return f"{match.group(1)} {match.group(2)}"

gen/conflictgen.py

@@ -1,21 +1,11 @@
 import logging
-import typing
-import pdb
-from pydcs import dcs
+import random
+from typing import Tuple
 
-from random import randint
-from dcs import Mission
+from dcs.country import Country
+from dcs.mapping import Point
 
-from dcs.mission import *
-from dcs.vehicles import *
-from dcs.unitgroup import *
-from dcs.unittype import *
-from dcs.mapping import *
-from dcs.point import *
-from dcs.task import *
-from dcs.country import *
-
-from theater import *
+from theater import ConflictTheater, ControlPoint
 
 AIR_DISTANCE = 40000
 
@@ -65,24 +55,6 @@ def _heading_sum(h, a) -> int:
 
 
 class Conflict:
-    attackers_side = None  # type: str
-    defenders_side = None  # type: str
-    attackers_country = None  # type: Country
-    defenders_country = None  # type: Country
-    from_cp = None  # type: ControlPoint
-    to_cp = None  # type: ControlPoint
-    position = None  # type: Point
-    size = None  # type: int
-    radials = None  # type: typing.List[int]
-
-    heading = None  # type: int
-    distance = None  # type: int
-
-    ground_attackers_location = None  # type: Point
-    ground_defenders_location = None  # type: Point
-    air_attackers_location = None  # type: Point
-    air_defenders_location = None  # type: Point
-
     def __init__(self,
                  theater: ConflictTheater,
                  from_cp: ControlPoint,
@@ -155,7 +127,7 @@ class Conflict:
         else:
             return self.position
 
-    def find_ground_position(self, at: Point, heading: int, max_distance: int = 40000) -> typing.Optional[Point]:
+    def find_ground_position(self, at: Point, heading: int, max_distance: int = 40000) -> Point:
         return Conflict._find_ground_position(at, max_distance, heading, self.theater)
 
     @classmethod
@@ -163,7 +135,7 @@ class Conflict:
         return from_cp.has_frontline and to_cp.has_frontline
 
     @classmethod
-    def frontline_position(cls, theater: ConflictTheater, from_cp: ControlPoint, to_cp: ControlPoint) -> typing.Optional[typing.Tuple[Point, int]]:
+    def frontline_position(cls, theater: ConflictTheater, from_cp: ControlPoint, to_cp: ControlPoint) -> Tuple[Point, int]:
         attack_heading = from_cp.position.heading_between_point(to_cp.position)
         attack_distance = from_cp.position.distance_to_point(to_cp.position)
         middle_point = from_cp.position.point_from_heading(attack_heading, attack_distance / 2)
@@ -174,9 +146,7 @@ class Conflict:
 
 
     @classmethod
-    def frontline_vector(cls, from_cp: ControlPoint, to_cp: ControlPoint, theater: ConflictTheater) -> typing.Optional[typing.Tuple[Point, int, int]]:
-        initial, heading = cls.frontline_position(theater, from_cp, to_cp)
-
+    def frontline_vector(cls, from_cp: ControlPoint, to_cp: ControlPoint, theater: ConflictTheater) -> Tuple[Point, int, int]:
         """
         probe_end_point = initial.point_from_heading(heading, FRONTLINE_LENGTH)
         probe = geometry.LineString([(initial.x, initial.y), (probe_end_point.x, probe_end_point.y) ])
@@ -193,9 +163,6 @@ class Conflict:
         return Point(*intersection.xy[0]), _heading_sum(heading, 90), intersection.length
         """
         frontline = cls.frontline_position(theater, from_cp, to_cp)
-        if not frontline:
-            return None
-
         center_position, heading = frontline
         left_position, right_position = None, None
 
@@ -243,7 +210,7 @@ class Conflict:
         """
 
     @classmethod
-    def _find_ground_position(cls, initial: Point, max_distance: int, heading: int, theater: ConflictTheater) -> typing.Optional[Point]:
+    def _find_ground_position(cls, initial: Point, max_distance: int, heading: int, theater: ConflictTheater) -> Point:
         pos = initial
         for _ in range(0, int(max_distance), 500):
             if theater.is_on_land(pos):
@@ -302,10 +269,14 @@ class Conflict:
 
         distance = to_cp.size * GROUND_DISTANCE_FACTOR
         attackers_location = position.point_from_heading(attack_heading, distance)
-        attackers_location = Conflict._find_ground_position(attackers_location, distance * 2, _heading_sum(attack_heading, 180), theater)
+        attackers_location = Conflict._find_ground_position(
+            attackers_location, int(distance * 2),
+            _heading_sum(attack_heading, 180), theater)
 
         defenders_location = position.point_from_heading(defense_heading, distance)
-        defenders_location = Conflict._find_ground_position(defenders_location, distance * 2, _heading_sum(defense_heading, 180), theater)
+        defenders_location = Conflict._find_ground_position(
+            defenders_location, int(distance * 2),
+            _heading_sum(defense_heading, 180), theater)
 
         return cls(
             position=position,
@@ -429,7 +400,7 @@ class Conflict:
         assert cls.has_frontline_between(from_cp, to_cp)
 
         position, heading, distance = cls.frontline_vector(from_cp, to_cp, theater)
-        attack_position = position.point_from_heading(heading, randint(0, int(distance)))
+        attack_position = position.point_from_heading(heading, random.randint(0, int(distance)))
         attackers_position = attack_position.point_from_heading(heading - 90, AIR_DISTANCE)
         defenders_position = attack_position.point_from_heading(heading + 90, random.randint(*CAP_CAS_DISTANCE))
 
@@ -456,7 +427,9 @@ class Conflict:
 
         distance = to_cp.size * GROUND_DISTANCE_FACTOR
         defenders_location = position.point_from_heading(defense_heading, distance)
-        defenders_location = Conflict._find_ground_position(defenders_location, distance * 2, _heading_sum(defense_heading, 180), theater)
+        defenders_location = Conflict._find_ground_position(
+            defenders_location, int(distance * 2),
+            _heading_sum(defense_heading, 180), theater)
 
         return cls(
             position=position,

gen/defenses/armor_group_generator.py

@@ -3,22 +3,37 @@ import random
 from dcs.vehicles import Armor
 
 from game import db
-from gen.defenses.armored_group_generator import ArmoredGroupGenerator
+from gen.defenses.armored_group_generator import ArmoredGroupGenerator, FixedSizeArmorGroupGenerator
 
 
 def generate_armor_group(faction:str, game, ground_object):
     """
     This generate a group of ground units
-    :param parentCp: The parent control point
-    :param ground_object: The ground object which will own the group
-    :param country: Owner country
     :return: Generated group
     """
-
-    possible_unit = [u for u in db.FACTIONS[faction]["units"] if u in Armor.__dict__.values()]
+    possible_unit = [u for u in db.FACTIONS[faction].frontline_units if u in Armor.__dict__.values()]
     if len(possible_unit) > 0:
         unit_type = random.choice(possible_unit)
-        generator = ArmoredGroupGenerator(game, ground_object, unit_type)
-        generator.generate()
-        return generator.get_generated_group()
+        return generate_armor_group_of_type(game, ground_object, unit_type)
     return None
+
+
+def generate_armor_group_of_type(game, ground_object, unit_type):
+    """
+    This generate a group of ground units of given type
+    :return: Generated group
+    """
+    generator = ArmoredGroupGenerator(game, ground_object, unit_type)
+    generator.generate()
+    return generator.get_generated_group()
+
+
+def generate_armor_group_of_type_and_size(game, ground_object, unit_type, size: int):
+    """
+    This generate a group of ground units of given type and size
+    :return: Generated group
+    """
+    generator = FixedSizeArmorGroupGenerator(game, ground_object, unit_type, size)
+    generator.generate()
+    return generator.get_generated_group()
+

gen/defenses/armored_group_generator.py

@@ -25,3 +25,20 @@ class ArmoredGroupGenerator(GroupGenerator):
                               self.position.y + spacing * j, self.heading)
 
 
+class FixedSizeArmorGroupGenerator(GroupGenerator):
+
+    def __init__(self, game, ground_object, unit_type, size):
+        super(FixedSizeArmorGroupGenerator, self).__init__(game, ground_object)
+        self.unit_type = unit_type
+        self.size = size
+
+    def generate(self):
+        spacing = random.randint(20, 70)
+
+        index = 0
+        for i in range(self.size):
+            index = index + 1
+            self.add_unit(self.unit_type, "Armor#" + str(index),
+                            self.position.x + spacing * i,
+                            self.position.y, self.heading)
+

gen/environmentgen.py

@@ -1,156 +1,36 @@
-import logging
-import typing
-import random
-from datetime import datetime, timedelta, time
+from typing import Optional
 
 from dcs.mission import Mission
-from dcs.triggers import *
-from dcs.condition import *
-from dcs.action import *
-from dcs.unit import Skill
-from dcs.point import MovingPoint, PointProperties
-from dcs.action import *
-from dcs.weather import *
 
-from game import db
-from theater import *
-from gen import *
-
-WEATHER_CLOUD_BASE = 2000, 3000
-WEATHER_CLOUD_DENSITY = 1, 8
-WEATHER_CLOUD_THICKNESS = 100, 400
-WEATHER_CLOUD_BASE_MIN = 1600
-
-WEATHER_FOG_CHANCE = 20
-WEATHER_FOG_VISIBILITY = 2500, 5000
-WEATHER_FOG_THICKNESS = 100, 500
-
-RANDOM_TIME = {
-    "night": 7,
-    "dusk": 40,
-    "dawn": 40,
-    "day": 100,
-}
-
-RANDOM_WEATHER = {
-    1: 0,  # thunderstorm
-    2: 20,  # rain
-    3: 80,  # clouds
-    4: 100,  # clear
-}
+from game.weather import Clouds, Fog, Conditions, WindConditions
 
 
-class EnvironmentSettings:
-    weather_dict = None
-    start_time = None
-
-
-class EnviromentGenerator:
-    def __init__(self, mission: Mission, conflict: Conflict, game):
+class EnvironmentGenerator:
+    def __init__(self, mission: Mission, conditions: Conditions) -> None:
         self.mission = mission
-        self.conflict = conflict
-        self.game = game
+        self.conditions = conditions
 
-    def _gen_time(self):
+    def set_clouds(self, clouds: Optional[Clouds]) -> None:
+        if clouds is None:
+            return
+        self.mission.weather.clouds_base = clouds.base
+        self.mission.weather.clouds_thickness = clouds.thickness
+        self.mission.weather.clouds_density = clouds.density
+        self.mission.weather.clouds_iprecptns = clouds.precipitation
 
-        start_time = self.game.current_day
+    def set_fog(self, fog: Optional[Fog]) -> None:
+        if fog is None:
+            return
+        self.mission.weather.fog_visibility = fog.visibility
+        self.mission.weather.fog_thickness = fog.thickness
 
-        daytime = self.game.current_turn_daytime
-        logging.info("Mission time will be {}".format(daytime))
-        if self.game.settings.night_disabled:
-            logging.info("Skip Night mission due to user settings")
-            if daytime == "dawn":
-                time_range = (8, 9)
-            elif daytime == "day":
-                time_range = (10, 12)
-            elif daytime == "dusk":
-                time_range = (12, 14)
-            elif daytime == "night":
-                time_range = (14, 17)
-            else:
-                time_range = (10, 12)
-        else:
-            time_range = self.game.theater.daytime_map[daytime]
-
-        start_time += timedelta(hours=random.randint(*time_range))
-
-        logging.info("time - {}, slot - {}, night skipped - {}".format(
-            str(start_time),
-            str(time_range),
-            self.game.settings.night_disabled))
-
-        self.mission.start_time = start_time
-
-    def _generate_wind(self, wind_speed, wind_direction=None):
-        # wind
-        if not wind_direction:
-            wind_direction = random.randint(0, 360)
-
-        self.mission.weather.wind_at_ground = Wind(wind_direction, wind_speed)
-        self.mission.weather.wind_at_2000 = Wind(wind_direction, wind_speed * 2)
-        self.mission.weather.wind_at_8000 = Wind(wind_direction, wind_speed * 3)
-
-    def _generate_base_weather(self):
-        # clouds
-        self.mission.weather.clouds_base = random.randint(*WEATHER_CLOUD_BASE)
-        self.mission.weather.clouds_density = random.randint(*WEATHER_CLOUD_DENSITY)
-        self.mission.weather.clouds_thickness = random.randint(*WEATHER_CLOUD_THICKNESS)
-
-        # wind
-        self._generate_wind(random.randint(0, 4))
-
-        # fog
-        if random.randint(0, 100) < WEATHER_FOG_CHANCE:
-            self.mission.weather.fog_visibility = random.randint(*WEATHER_FOG_VISIBILITY)
-            self.mission.weather.fog_thickness = random.randint(*WEATHER_FOG_THICKNESS)
-
-    def _gen_random_weather(self):
-        weather_type = None
-        for k, v in RANDOM_WEATHER.items():
-            if random.randint(0, 100) <= v:
-                weather_type = k
-                break
-
-        logging.info("generated weather {}".format(weather_type))
-        if weather_type == 1:
-            # thunderstorm
-            self._generate_base_weather()
-            self._generate_wind(random.randint(0, 8))
-
-            self.mission.weather.clouds_density = random.randint(9, 10)
-            self.mission.weather.clouds_iprecptns = Weather.Preceptions.Thunderstorm
-        elif weather_type == 2:
-            # rain
-            self._generate_base_weather()
-            self.mission.weather.clouds_density = random.randint(5, 8)
-            self.mission.weather.clouds_iprecptns = Weather.Preceptions.Rain
-
-            self._generate_wind(random.randint(0, 6))
-        elif weather_type == 3:
-            # clouds
-            self._generate_base_weather()
-        elif weather_type == 4:
-            # clear
-            pass
-
-        if self.mission.weather.clouds_density > 0:
-            # sometimes clouds are randomized way too low and need to be fixed
-            self.mission.weather.clouds_base = max(self.mission.weather.clouds_base, WEATHER_CLOUD_BASE_MIN)
-
-        if self.mission.weather.wind_at_ground.speed == 0:
-            # frontline smokes look silly w/o any wind
-            self._generate_wind(1)
-
-    def generate(self) -> EnvironmentSettings:
-        self._gen_time()
-        self._gen_random_weather()
-
-        settings = EnvironmentSettings()
-        settings.start_time = self.mission.start_time
-        settings.weather_dict = self.mission.weather.dict()
-        return settings
-
-    def load(self, settings: EnvironmentSettings):
-        self.mission.start_time = settings.start_time
-        self.mission.weather.load_from_dict(settings.weather_dict)
+    def set_wind(self, wind: WindConditions) -> None:
+        self.mission.weather.wind_at_ground = wind.at_0m
+        self.mission.weather.wind_at_2000 = wind.at_2000m
+        self.mission.weather.wind_at_8000 = wind.at_8000m
 
+    def generate(self):
+        self.mission.start_time = self.conditions.start_time
+        self.set_clouds(self.conditions.weather.clouds)
+        self.set_fog(self.conditions.weather.fog)
+        self.set_wind(self.conditions.weather.wind)

gen/fleet/carrier_group.py

@@ -12,19 +12,15 @@ class CarrierGroupGenerator(GroupGenerator):
     def generate(self):
 
         # Add carrier
-        if "aircraft_carrier" in self.faction.keys():
-
-            if "supercarrier" in self.faction.keys() and self.game.settings.supercarrier:
-                carrier_type = random.choice(self.faction["supercarrier"])
-            else:
-                carrier_type = random.choice(self.faction["aircraft_carrier"])
+        if len(self.faction.aircraft_carrier) > 0:
+            carrier_type = random.choice(self.faction.aircraft_carrier)
             self.add_unit(carrier_type, "Carrier", self.position.x, self.position.y, self.heading)
         else:
             return
 
         # Add destroyers escort
-        if "destroyer" in self.faction.keys():
-            dd_type = random.choice(self.faction["destroyer"])
+        if len(self.faction.destroyers) > 0:
+            dd_type = random.choice(self.faction.destroyers)
             self.add_unit(dd_type, "DD1", self.position.x + 2500, self.position.y + 4500, self.heading)
             self.add_unit(dd_type, "DD2", self.position.x + 2500, self.position.y - 4500, self.heading)
 

gen/fleet/lha_group.py

@@ -12,13 +12,13 @@ class LHAGroupGenerator(GroupGenerator):
     def generate(self):
 
         # Add carrier
-        if "helicopter_carrier" in self.faction.keys():
-            carrier_type = random.choice(self.faction["helicopter_carrier"])
+        if len(self.faction.helicopter_carrier) > 0:
+            carrier_type = random.choice(self.faction.helicopter_carrier)
             self.add_unit(carrier_type, "LHA", self.position.x, self.position.y, self.heading)
 
         # Add destroyers escort
-        if "destroyer" in self.faction.keys():
-            dd_type = random.choice(self.faction["destroyer"])
+        if len(self.faction.destroyers) > 0:
+            dd_type = random.choice(self.faction.destroyers)
             self.add_unit(dd_type, "DD1", self.position.x + 1250, self.position.y + 1450, self.heading)
             self.add_unit(dd_type, "DD2", self.position.x + 1250, self.position.y - 1450, self.heading)
 

gen/fleet/ship_group_generator.py

@@ -28,22 +28,20 @@ SHIP_MAP = {
 }
 
 
-def generate_ship_group(game, ground_object, faction:str):
+def generate_ship_group(game, ground_object, faction_name: str):
     """
     This generate a ship group
     :return: Nothing, but put the group reference inside the ground object
     """
-    faction = db.FACTIONS[faction]
-    if "boat" in faction.keys():
-        generators = faction["boat"]
-        if len(generators) > 0:
-            gen = random.choice(generators)
-            if gen in SHIP_MAP.keys():
-                generator = SHIP_MAP[gen](game, ground_object, faction)
-                generator.generate()
-                return generator.get_generated_group()
-            else:
-                logging.info("Unable to generate ship group, generator : " + str(gen) + "does not exists")
+    faction = db.FACTIONS[faction_name]
+    if len(faction.navy_generators) > 0:
+        gen = random.choice(faction.navy_generators)
+        if gen in SHIP_MAP.keys():
+            generator = SHIP_MAP[gen](game, ground_object, faction)
+            generator.generate()
+            return generator.get_generated_group()
+        else:
+            logging.info("Unable to generate ship group, generator : " + str(gen) + "does not exists")
     return None
 
 

gen/flights/ai_flight_planner_db.py

@@ -1,5 +1,84 @@
-from dcs.planes import *
-from dcs.helicopters import *
+from dcs.helicopters import (
+    AH_1W,
+    AH_64A,
+    AH_64D,
+    Ka_50,
+    Mi_24V,
+    Mi_28N,
+    Mi_8MT,
+    OH_58D,
+    SA342L,
+    SA342M,
+    UH_1H,
+)
+from dcs.planes import (
+    AJS37,
+    AV8BNA,
+    A_10A,
+    A_10C,
+    A_10C_2,
+    A_20G,
+    B_17G,
+    B_1B,
+    B_52H,
+    Bf_109K_4,
+    C_101CC,
+    FA_18C_hornet,
+    FW_190A8,
+    FW_190D9,
+    F_117A,
+    F_14B,
+    F_15C,
+    F_15E,
+    F_16A,
+    F_16C_50,
+    F_4E,
+    F_5E_3,
+    F_86F_Sabre,
+    F_A_18C,
+    JF_17,
+    J_11A,
+    Ju_88A4,
+    L_39ZA,
+    MQ_9_Reaper,
+    M_2000C,
+    MiG_15bis,
+    MiG_19P,
+    MiG_21Bis,
+    MiG_23MLD,
+    MiG_25PD,
+    MiG_27K,
+    MiG_29A,
+    MiG_29G,
+    MiG_29K,
+    MiG_29S,
+    MiG_31,
+    Mirage_2000_5,
+    P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
+    P_51D,
+    P_51D_30_NA,
+    RQ_1A_Predator,
+    SpitfireLFMkIX,
+    SpitfireLFMkIXCW,
+    Su_17M4,
+    Su_24M,
+    Su_24MR,
+    Su_25,
+    Su_25T,
+    Su_25TM,
+    Su_27,
+    Su_30,
+    Su_33,
+    Su_34,
+    Tornado_GR4,
+    Tornado_IDS,
+    Tu_160,
+    Tu_22M3,
+    Tu_95MS,
+    WingLoong_I,
+)
 
 # Interceptor are the aircraft prioritized for interception tasks
 # If none is available, the AI will use regular CAP-capable aircraft instead
@@ -7,6 +86,11 @@ from pydcs_extensions.a4ec.a4ec import A_4E_C
 from pydcs_extensions.mb339.mb339 import MB_339PAN
 from pydcs_extensions.rafale.rafale import Rafale_A_S, Rafale_M
 
+# TODO: These lists really ought to be era (faction) dependent.
+# Factions which have F-5s, F-86s, and A-4s will should prefer F-5s for CAP, but
+# factions that also have F-4s should not.
+from pydcs_extensions.su57.su57 import Su_57
+
 INTERCEPT_CAPABLE = [
     MiG_21Bis,
     MiG_25PD,
@@ -27,6 +111,7 @@ INTERCEPT_CAPABLE = [
 
 # Used for CAP, Escort, and intercept if there is not a specialised aircraft available
 CAP_CAPABLE = [
+
     MiG_15bis,
     MiG_19P,
     MiG_21Bis,
@@ -42,6 +127,7 @@ CAP_CAPABLE = [
     JF_17,
     Su_30,
     Su_33,
+    Su_57,
 
     M_2000C,
     Mirage_2000_5,
@@ -62,6 +148,8 @@ CAP_CAPABLE = [
     P_51D_30_NA,
     P_51D,
     P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
 
     SpitfireLFMkIXCW,
     SpitfireLFMkIX,
@@ -74,6 +162,43 @@ CAP_CAPABLE = [
     Rafale_M,
 ]
 
+CAP_PREFERRED = [
+    MiG_15bis,
+    MiG_19P,
+    MiG_21Bis,
+    MiG_23MLD,
+    MiG_25PD,
+    MiG_29A,
+    MiG_29G,
+    MiG_29S,
+    MiG_31,
+
+    Su_27,
+    J_11A,
+    Su_30,
+    Su_33,
+    Su_57,
+
+    M_2000C,
+    Mirage_2000_5,
+
+    F_86F_Sabre,
+    F_14B,
+    F_15C,
+
+    P_51D_30_NA,
+    P_51D,
+
+    SpitfireLFMkIXCW,
+    SpitfireLFMkIX,
+
+    Bf_109K_4,
+    FW_190D9,
+    FW_190A8,
+
+    Rafale_M,
+]
+
 # Used for CAS (Close air support) and BAI (Battlefield Interdiction)
 CAS_CAPABLE = [
 
@@ -96,6 +221,7 @@ CAS_CAPABLE = [
 
     A_10A,
     A_10C,
+    A_10C_2,
     AV8BNA,
 
     F_86F_Sabre,
@@ -106,6 +232,11 @@ CAS_CAPABLE = [
     F_16C_50,
     FA_18C_hornet,
 
+    B_1B,
+
+    Tornado_IDS,
+    Tornado_GR4,
+
     C_101CC,
     MB_339PAN,
     L_39ZA,
@@ -119,7 +250,6 @@ CAS_CAPABLE = [
     AH_64D,
     AH_1W,
 
-
     UH_1H,
 
     Mi_8MT,
@@ -130,6 +260,8 @@ CAS_CAPABLE = [
     P_51D_30_NA,
     P_51D,
     P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
     A_20G,
 
     SpitfireLFMkIXCW,
@@ -147,12 +279,65 @@ CAS_CAPABLE = [
     RQ_1A_Predator
 ]
 
+CAS_PREFERRED = [
+    Su_17M4,
+    Su_24M,
+    Su_24MR,
+    Su_25,
+    Su_25T,
+    Su_25TM,
+    Su_34,
+
+    JF_17,
+
+    A_10A,
+    A_10C,
+    A_10C_2,
+    AV8BNA,
+
+    F_15E,
+
+    Tornado_GR4,
+
+    C_101CC,
+    MB_339PAN,
+    L_39ZA,
+    AJS37,
+
+    SA342M,
+    SA342L,
+    OH_58D,
+
+    AH_64A,
+    AH_64D,
+    AH_1W,
+
+    UH_1H,
+
+    Mi_8MT,
+    Mi_28N,
+    Mi_24V,
+    Ka_50,
+
+    P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
+    A_20G,
+
+    A_4E_C,
+    Rafale_A_S,
+
+    WingLoong_I,
+    MQ_9_Reaper,
+    RQ_1A_Predator
+]
+
 # Aircraft used for SEAD / DEAD tasks
 SEAD_CAPABLE = [
     F_4E,
     FA_18C_hornet,
     F_15E,
-    # F_16C_50, Not yet
+    F_16C_50,
     AV8BNA,
     JF_17,
 
@@ -164,10 +349,19 @@ SEAD_CAPABLE = [
     Su_34,
     MiG_27K,
 
+    Tornado_IDS,
+    Tornado_GR4,
+
     A_4E_C,
     Rafale_A_S
 ]
 
+SEAD_PREFERRED = [
+    F_4E,
+    Su_25T,
+    Tornado_IDS,
+]
+
 # Aircraft used for Strike mission
 STRIKE_CAPABLE = [
     MiG_15bis,
@@ -181,12 +375,17 @@ STRIKE_CAPABLE = [
     Su_25T,
     Su_34,
 
+    Tu_160,
+    Tu_22M3,
+    Tu_95MS,
+
     JF_17,
 
     M_2000C,
 
     A_10A,
     A_10C,
+    A_10C_2,
     AV8BNA,
 
     F_86F_Sabre,
@@ -197,6 +396,13 @@ STRIKE_CAPABLE = [
     F_16C_50,
     FA_18C_hornet,
 
+    B_1B,
+    B_52H,
+    F_117A,
+
+    Tornado_IDS,
+    Tornado_GR4,
+
     C_101CC,
     L_39ZA,
     AJS37,
@@ -204,6 +410,8 @@ STRIKE_CAPABLE = [
     P_51D_30_NA,
     P_51D,
     P_47D_30,
+    P_47D_30bl1,
+    P_47D_40,
     A_20G,
     B_17G,
 
@@ -219,6 +427,20 @@ STRIKE_CAPABLE = [
 
 ]
 
+STRIKE_PREFERRED = [
+    AJS37,
+    A_20G,
+    B_17G,
+    B_1B,
+    B_52H,
+    F_117A,
+    F_15E,
+    Tornado_GR4,
+    Tu_160,
+    Tu_22M3,
+    Tu_95MS,
+]
+
 ANTISHIP_CAPABLE = [
     Su_24M,
     Su_17M4,
@@ -229,8 +451,12 @@ ANTISHIP_CAPABLE = [
     F_16A,
     F_16C_50,
     A_10C,
+    A_10C_2,
     A_10A,
 
+    Tornado_IDS,
+    Tornado_GR4,
+
     Ju_88A4,
     Rafale_A_S
 ]

gen/flights/closestairfields.py

@@ -0,0 +1,51 @@
+"""Objective adjacency lists."""
+from typing import Dict, Iterator, List, Optional
+
+from theater import ConflictTheater, ControlPoint, MissionTarget
+
+
+class ClosestAirfields:
+    """Precalculates which control points are closes to the given target."""
+
+    def __init__(self, target: MissionTarget,
+                 all_control_points: List[ControlPoint]) -> None:
+        self.target = target
+        self.closest_airfields: List[ControlPoint] = sorted(
+            all_control_points, key=lambda c: self.target.distance_to(c)
+        )
+
+    def airfields_within(self, meters: int) -> Iterator[ControlPoint]:
+        """Iterates over all airfields within the given range of the target.
+
+        Note that this iterates over *all* airfields, not just friendly
+        airfields.
+        """
+        for cp in self.closest_airfields:
+            if cp.distance_to(self.target) < meters:
+                yield cp
+            else:
+                break
+
+
+class ObjectiveDistanceCache:
+    theater: Optional[ConflictTheater] = None
+    closest_airfields: Dict[str, ClosestAirfields] = {}
+
+    @classmethod
+    def set_theater(cls, theater: ConflictTheater) -> None:
+        if cls.theater is not None:
+            cls.closest_airfields = {}
+        cls.theater = theater
+
+    @classmethod
+    def get_closest_airfields(cls, location: MissionTarget) -> ClosestAirfields:
+        if cls.theater is None:
+            raise RuntimeError(
+                "Call ObjectiveDistanceCache.set_theater before using"
+            )
+
+        if location.name not in cls.closest_airfields:
+            cls.closest_airfields[location.name] = ClosestAirfields(
+                location, cls.theater.controlpoints
+            )
+        return cls.closest_airfields[location.name]

gen/flights/flight.py

@@ -1,14 +1,21 @@
-from enum import Enum
-from typing import List
+from __future__ import annotations
 
-from dcs.mission import StartType
+from enum import Enum
+from typing import Dict, Iterable, List, Optional, TYPE_CHECKING
+
+from dcs.mapping import Point
+from dcs.point import MovingPoint, PointAction
 from dcs.unittype import UnitType
 
 from game import db
+from theater.controlpoint import ControlPoint, MissionTarget
+
+if TYPE_CHECKING:
+    from gen.ato import Package
 
 
 class FlightType(Enum):
-    CAP = 0
+    CAP = 0  # Do not use. Use BARCAP or TARCAP.
     TARCAP = 1
     BARCAP = 2
     CAS = 3
@@ -47,6 +54,10 @@ class FlightWaypointType(Enum):
     TARGET_GROUP_LOC = 13   # A target group approximate location
     TARGET_SHIP = 14        # A target ship known location
     CUSTOM = 15             # User waypoint (no specific behaviour)
+    JOIN = 16
+    SPLIT = 17
+    LOITER = 18
+    INGRESS_ESCORT = 19
 
 
 class PredefinedWaypointCategory(Enum):
@@ -62,61 +73,103 @@ class PredefinedWaypointCategory(Enum):
 
 class FlightWaypoint:
 
-    def __init__(self, x: float, y: float, alt=0):
+    def __init__(self, waypoint_type: FlightWaypointType, x: float, y: float,
+                 alt: int = 0) -> None:
+        """Creates a flight waypoint.
+
+        Args:
+            waypoint_type: The waypoint type.
+            x: X cooidinate of the waypoint.
+            y: Y coordinate of the waypoint.
+            alt: Altitude of the waypoint. By default this is AGL, but it can be
+            changed to MSL by setting alt_type to "RADIO".
+        """
+        self.waypoint_type = waypoint_type
         self.x = x
         self.y = y
         self.alt = alt
         self.alt_type = "BARO"
         self.name = ""
         self.description = ""
-        self.targets = []
-        self.targetGroup = None
+        self.targets: List[MissionTarget] = []
+        self.targetGroup: Optional[MissionTarget] = None
         self.obj_name = ""
         self.pretty_name = ""
-        self.waypoint_type = FlightWaypointType.TAKEOFF  # type: FlightWaypointType
-        self.category = PredefinedWaypointCategory.NOT_PREDEFINED# type: PredefinedWaypointCategory
+        self.category: PredefinedWaypointCategory = PredefinedWaypointCategory.NOT_PREDEFINED
         self.only_for_player = False
         self.data = None
 
+        # These are set very late by the air conflict generator (part of mission
+        # generation). We do it late so that we don't need to propagate changes
+        # to waypoint times whenever the player alters the package TOT or the
+        # flight's offset in the UI.
+        self.tot: Optional[int] = None
+        self.departure_time: Optional[int] = None
+
+    @property
+    def position(self) -> Point:
+        return Point(self.x, self.y)
+
+    @classmethod
+    def from_pydcs(cls, point: MovingPoint,
+                   from_cp: ControlPoint) -> "FlightWaypoint":
+        waypoint = FlightWaypoint(FlightWaypointType.NAV, point.position.x,
+                                  point.position.y, point.alt)
+        waypoint.alt_type = point.alt_type
+        # Other actions exist... but none of them *should* be the first
+        # waypoint for a flight.
+        waypoint.waypoint_type = {
+            PointAction.TurningPoint: FlightWaypointType.NAV,
+            PointAction.FlyOverPoint: FlightWaypointType.NAV,
+            PointAction.FromParkingArea: FlightWaypointType.TAKEOFF,
+            PointAction.FromParkingAreaHot: FlightWaypointType.TAKEOFF,
+            PointAction.FromRunway: FlightWaypointType.TAKEOFF,
+        }[point.action]
+        if waypoint.waypoint_type == FlightWaypointType.NAV:
+            waypoint.name = "NAV"
+            waypoint.pretty_name = "Nav"
+            waypoint.description = "Nav"
+        else:
+            waypoint.name = "TAKEOFF"
+            waypoint.pretty_name = "Takeoff"
+            waypoint.description = "Takeoff"
+            waypoint.description = f"Takeoff from {from_cp.name}"
+        return waypoint
+
 
 class Flight:
-    unit_type: UnitType = None
-    from_cp = None
-    points: List[FlightWaypoint] = []
-    flight_type: FlightType = None
     count: int = 0
     client_count: int = 0
-    targets = []
     use_custom_loadout = False
-    loadout = {}
     preset_loadout_name = ""
-    start_type = "Runway"
     group = False # Contains DCS Mission group data after mission has been generated
 
-    # How long before this flight should take off
-    scheduled_in = 0
-
-    def __init__(self, unit_type: UnitType, count: int, from_cp, flight_type: FlightType):
+    def __init__(self, package: Package, unit_type: UnitType, count: int,
+                 from_cp: ControlPoint, flight_type: FlightType,
+                 start_type: str) -> None:
+        self.package = package
         self.unit_type = unit_type
         self.count = count
         self.from_cp = from_cp
         self.flight_type = flight_type
-        self.points = []
-        self.targets = []
-        self.loadout = {}
-        self.start_type = "Runway"
+        self.points: List[FlightWaypoint] = []
+        self.targets: List[MissionTarget] = []
+        self.loadout: Dict[str, str] = {}
+        self.start_type = start_type
+        # Late activation delay in seconds from mission start. This is not
+        # the same as the flight's takeoff time. Takeoff time depends on the
+        # mission's TOT and the other flights in the package. Takeoff time is
+        # determined by AirConflictGenerator.
+        self.scheduled_in = 0
 
     def __repr__(self):
         return self.flight_type.name + " | " + str(self.count) + "x" + db.unit_type_name(self.unit_type) \
-               + " in " + str(self.scheduled_in) + " minutes (" + str(len(self.points)) + " wpt)"
+               + " (" + str(len(self.points)) + " wpt)"
 
-
-# Test
-if __name__ == '__main__':
-    from dcs.planes import A_10C
-    from theater import ControlPoint, Point, List
-
-    from_cp = ControlPoint(0, "AA", Point(0, 0), None, [], 0, 0)
-    f = Flight(A_10C, 4, from_cp, FlightType.CAS)
-    f.scheduled_in = 50
-    print(f)
+    def waypoint_with_type(
+            self,
+            types: Iterable[FlightWaypointType]) -> Optional[FlightWaypoint]:
+        for waypoint in self.points:
+            if waypoint.waypoint_type in types:
+                return waypoint
+        return None

gen/flights/flightplan.py

@@ -0,0 +1,454 @@
+"""Flight plan generation.
+
+Flights are first planned generically by either the player or by the
+MissionPlanner. Those only plan basic information like the objective, aircraft
+type, and the size of the flight. The FlightPlanBuilder is responsible for
+generating the waypoints for the mission.
+"""
+from __future__ import annotations
+
+import logging
+import random
+from typing import List, Optional, TYPE_CHECKING
+
+from dcs.mapping import Point
+from dcs.unit import Unit
+
+from game.data.doctrine import Doctrine, MODERN_DOCTRINE
+from game.utils import nm_to_meter
+from gen.ato import Package, PackageWaypoints
+from theater import ControlPoint, FrontLine, MissionTarget, TheaterGroundObject
+from .closestairfields import ObjectiveDistanceCache
+from .flight import Flight, FlightType, FlightWaypoint
+from .waypointbuilder import WaypointBuilder
+from ..conflictgen import Conflict
+
+if TYPE_CHECKING:
+    from game import Game
+
+
+class InvalidObjectiveLocation(RuntimeError):
+    """Raised when the objective location is invalid for the mission type."""
+    def __init__(self, task: FlightType, location: MissionTarget) -> None:
+        super().__init__(
+            f"{location.name} is not valid for {task.name} missions."
+        )
+
+
+class FlightPlanBuilder:
+    """Generates flight plans for flights."""
+
+    def __init__(self, game: Game, package: Package, is_player: bool) -> None:
+        self.game = game
+        self.package = package
+        self.is_player = is_player
+        if is_player:
+            faction = self.game.player_faction
+        else:
+            faction = self.game.enemy_faction
+        self.doctrine: Doctrine = faction.doctrine
+
+    def populate_flight_plan(
+            self, flight: Flight,
+            # TODO: Custom targets should be an attribute of the flight.
+            custom_targets: Optional[List[Unit]] = None) -> None:
+        """Creates a default flight plan for the given mission."""
+        if flight not in self.package.flights:
+            raise RuntimeError("Flight must be a part of the package")
+        if self.package.waypoints is None:
+            self.regenerate_package_waypoints()
+
+        # TODO: Flesh out mission types.
+        try:
+            task = flight.flight_type
+            if task == FlightType.ANTISHIP:
+                logging.error(
+                    "Anti-ship flight plan generation not implemented"
+                )
+            elif task == FlightType.BAI:
+                logging.error("BAI flight plan generation not implemented")
+            elif task == FlightType.BARCAP:
+                self.generate_barcap(flight)
+            elif task == FlightType.CAS:
+                self.generate_cas(flight)
+            elif task == FlightType.DEAD:
+                self.generate_sead(flight, custom_targets)
+            elif task == FlightType.ELINT:
+                logging.error("ELINT flight plan generation not implemented")
+            elif task == FlightType.ESCORT:
+                self.generate_escort(flight)
+            elif task == FlightType.EVAC:
+                logging.error("Evac flight plan generation not implemented")
+            elif task == FlightType.EWAR:
+                logging.error("EWar flight plan generation not implemented")
+            elif task == FlightType.INTERCEPTION:
+                logging.error(
+                    "Intercept flight plan generation not implemented"
+                )
+            elif task == FlightType.LOGISTICS:
+                logging.error(
+                    "Logistics flight plan generation not implemented"
+                )
+            elif task == FlightType.RECON:
+                logging.error("Recon flight plan generation not implemented")
+            elif task == FlightType.SEAD:
+                self.generate_sead(flight, custom_targets)
+            elif task == FlightType.STRIKE:
+                self.generate_strike(flight)
+            elif task == FlightType.TARCAP:
+                self.generate_frontline_cap(flight)
+            elif task == FlightType.TROOP_TRANSPORT:
+                logging.error(
+                    "Troop transport flight plan generation not implemented"
+                )
+            else:
+                logging.error(f"Unsupported task type: {task.name}")
+        except InvalidObjectiveLocation:
+            logging.exception(f"Could not create flight plan")
+
+    def regenerate_package_waypoints(self) -> None:
+        ingress_point = self._ingress_point()
+        egress_point = self._egress_point()
+        join_point = self._join_point(ingress_point)
+        split_point = self._split_point(egress_point)
+
+        self.package.waypoints = PackageWaypoints(
+            join_point,
+            ingress_point,
+            egress_point,
+            split_point,
+        )
+
+    def generate_strike(self, flight: Flight) -> None:
+        """Generates a strike flight plan.
+
+        Args:
+            flight: The flight to generate the flight plan for.
+        """
+        assert self.package.waypoints is not None
+        location = self.package.target
+
+        # TODO: Support airfield strikes.
+        if not isinstance(location, TheaterGroundObject):
+            raise InvalidObjectiveLocation(flight.flight_type, location)
+
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.ascent(flight.from_cp)
+        builder.hold(self._hold_point(flight))
+        builder.join(self.package.waypoints.join)
+        builder.ingress_strike(self.package.waypoints.ingress, location)
+
+        if len(location.groups) > 0 and location.dcs_identifier == "AA":
+            # TODO: Replace with DEAD?
+            # Strike missions on SEAD targets target units.
+            for g in location.groups:
+                for j, u in enumerate(g.units):
+                    builder.strike_point(u, f"{u.type} #{j}", location)
+        else:
+            # TODO: Does this actually happen?
+            # ConflictTheater is built with the belief that multiple ground
+            # objects have the same name. If that's the case,
+            # TheaterGroundObject needs some refactoring because it behaves very
+            # differently for SAM sites than it does for strike targets.
+            buildings = self.game.theater.find_ground_objects_by_obj_name(
+                location.obj_name
+            )
+            for building in buildings:
+                if building.is_dead:
+                    continue
+
+                builder.strike_point(building, building.category, location)
+
+        builder.egress(self.package.waypoints.egress, location)
+        builder.split(self.package.waypoints.split)
+        builder.rtb(flight.from_cp)
+
+        flight.points = builder.build()
+
+    def generate_barcap(self, flight: Flight) -> None:
+        """Generate a BARCAP flight at a given location.
+
+        Args:
+            flight: The flight to generate the flight plan for.
+        """
+        location = self.package.target
+
+        if isinstance(location, FrontLine):
+            raise InvalidObjectiveLocation(flight.flight_type, location)
+
+        patrol_alt = random.randint(
+            self.doctrine.min_patrol_altitude,
+            self.doctrine.max_patrol_altitude
+        )
+
+        closest_cache = ObjectiveDistanceCache.get_closest_airfields(location)
+        for airfield in closest_cache.closest_airfields:
+            # If the mission is a BARCAP of an enemy airfield, find the *next*
+            # closest enemy airfield.
+            if airfield == self.package.target:
+                continue
+            if airfield.captured != self.is_player:
+                closest_airfield = airfield
+                break
+        else:
+            logging.error("Could not find any enemy airfields")
+            return
+
+        heading = location.position.heading_between_point(
+            closest_airfield.position
+        )
+
+        min_distance_from_enemy = nm_to_meter(20)
+        distance_to_airfield = int(closest_airfield.position.distance_to_point(
+            self.package.target.position
+        ))
+        distance_to_no_fly = distance_to_airfield - min_distance_from_enemy
+        min_cap_distance = min(self.doctrine.cap_min_distance_from_cp,
+                               distance_to_no_fly)
+        max_cap_distance = min(self.doctrine.cap_max_distance_from_cp,
+                               distance_to_no_fly)
+
+        end = location.position.point_from_heading(
+            heading,
+            random.randint(min_cap_distance, max_cap_distance)
+        )
+        diameter = random.randint(
+            self.doctrine.cap_min_track_length,
+            self.doctrine.cap_max_track_length
+        )
+        start = end.point_from_heading(heading - 180, diameter)
+
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.ascent(flight.from_cp)
+        builder.race_track(start, end, patrol_alt)
+        builder.rtb(flight.from_cp)
+        flight.points = builder.build()
+
+    def generate_frontline_cap(self, flight: Flight) -> None:
+        """Generate a CAP flight plan for the given front line.
+
+        Args:
+            flight: The flight to generate the flight plan for.
+        """
+        assert self.package.waypoints is not None
+        location = self.package.target
+
+        if not isinstance(location, FrontLine):
+            raise InvalidObjectiveLocation(flight.flight_type, location)
+
+        ally_cp, enemy_cp = location.control_points
+        patrol_alt = random.randint(self.doctrine.min_patrol_altitude,
+                                    self.doctrine.max_patrol_altitude)
+
+        # Find targets waypoints
+        ingress, heading, distance = Conflict.frontline_vector(
+            ally_cp, enemy_cp, self.game.theater
+        )
+        center = ingress.point_from_heading(heading, distance / 2)
+        orbit_center = center.point_from_heading(
+            heading - 90, random.randint(nm_to_meter(6), nm_to_meter(15))
+        )
+
+        combat_width = distance / 2
+        if combat_width > 500000:
+            combat_width = 500000
+        if combat_width < 35000:
+            combat_width = 35000
+
+        radius = combat_width*1.25
+        orbit0p = orbit_center.point_from_heading(heading, radius)
+        orbit1p = orbit_center.point_from_heading(heading + 180, radius)
+
+        # Create points
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.ascent(flight.from_cp)
+        builder.hold(self._hold_point(flight))
+        builder.join(self.package.waypoints.join)
+        builder.race_track(orbit0p, orbit1p, patrol_alt)
+        builder.split(self.package.waypoints.split)
+        builder.rtb(flight.from_cp)
+        flight.points = builder.build()
+
+    def generate_sead(self, flight: Flight,
+                      custom_targets: Optional[List[Unit]]) -> None:
+        """Generate a SEAD/DEAD flight at a given location.
+
+        Args:
+            flight: The flight to generate the flight plan for.
+            custom_targets: Specific radar equipped units selected by the user.
+        """
+        assert self.package.waypoints is not None
+        location = self.package.target
+
+        if not isinstance(location, TheaterGroundObject):
+            raise InvalidObjectiveLocation(flight.flight_type, location)
+
+        if custom_targets is None:
+            custom_targets = []
+
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.ascent(flight.from_cp)
+        builder.hold(self._hold_point(flight))
+        builder.join(self.package.waypoints.join)
+        builder.ingress_sead(self.package.waypoints.ingress, location)
+
+        # TODO: Unify these.
+        # There doesn't seem to be any reason to treat the UI fragged missions
+        # different from the automatic missions.
+        if custom_targets:
+            for target in custom_targets:
+                if flight.flight_type == FlightType.DEAD:
+                    builder.dead_point(target, location.name, location)
+                else:
+                    builder.sead_point(target, location.name, location)
+        else:
+            if flight.flight_type == FlightType.DEAD:
+                builder.dead_area(location)
+            else:
+                builder.sead_area(location)
+
+        builder.egress(self.package.waypoints.egress, location)
+        builder.split(self.package.waypoints.split)
+        builder.rtb(flight.from_cp)
+
+        flight.points = builder.build()
+
+    def _hold_point(self, flight: Flight) -> Point:
+        heading = flight.from_cp.position.heading_between_point(
+            self.package.target.position
+        )
+        return flight.from_cp.position.point_from_heading(
+            heading, nm_to_meter(15)
+        )
+
+    def generate_escort(self, flight: Flight) -> None:
+        assert self.package.waypoints is not None
+
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.ascent(flight.from_cp)
+        builder.hold(self._hold_point(flight))
+        builder.join(self.package.waypoints.join)
+        builder.escort(self.package.waypoints.ingress,
+                       self.package.target, self.package.waypoints.egress)
+        builder.split(self.package.waypoints.split)
+        builder.rtb(flight.from_cp)
+
+        flight.points = builder.build()
+
+    def generate_cas(self, flight: Flight) -> None:
+        """Generate a CAS flight plan for the given target.
+
+        Args:
+            flight: The flight to generate the flight plan for.
+        """
+        assert self.package.waypoints is not None
+        location = self.package.target
+
+        if not isinstance(location, FrontLine):
+            raise InvalidObjectiveLocation(flight.flight_type, location)
+
+        ingress, heading, distance = Conflict.frontline_vector(
+            location.control_points[0], location.control_points[1],
+            self.game.theater
+        )
+        center = ingress.point_from_heading(heading, distance / 2)
+        egress = ingress.point_from_heading(heading, distance)
+
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.ascent(flight.from_cp)
+        builder.hold(self._hold_point(flight))
+        builder.join(self.package.waypoints.join)
+        builder.ingress_cas(ingress, location)
+        builder.cas(center)
+        builder.egress(egress, location)
+        builder.split(self.package.waypoints.split)
+        builder.rtb(flight.from_cp)
+
+        flight.points = builder.build()
+
+    # TODO: Make a model for the waypoint builder and use that in the UI.
+    def generate_ascend_point(self, flight: Flight,
+                              departure: ControlPoint) -> FlightWaypoint:
+        """Generate ascend point.
+
+        Args:
+            flight: The flight to generate the descend point for.
+            departure: Departure airfield or carrier.
+        """
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.ascent(departure)
+        return builder.build()[0]
+
+    def generate_descend_point(self, flight: Flight,
+                               arrival: ControlPoint) -> FlightWaypoint:
+        """Generate approach/descend point.
+
+        Args:
+            flight: The flight to generate the descend point for.
+            arrival: Arrival airfield or carrier.
+        """
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.descent(arrival)
+        return builder.build()[0]
+
+    def generate_rtb_waypoint(self, flight: Flight,
+                              arrival: ControlPoint) -> FlightWaypoint:
+        """Generate RTB landing point.
+
+        Args:
+            flight: The flight to generate the landing waypoint for.
+            arrival: Arrival airfield or carrier.
+        """
+        builder = WaypointBuilder(self.game.conditions, flight, self.doctrine)
+        builder.land(arrival)
+        return builder.build()[0]
+
+    def _join_point(self, ingress_point: Point) -> Point:
+        heading = self._heading_to_package_airfield(ingress_point)
+        return ingress_point.point_from_heading(heading,
+                                                -self.doctrine.join_distance)
+
+    def _split_point(self, egress_point: Point) -> Point:
+        heading = self._heading_to_package_airfield(egress_point)
+        return egress_point.point_from_heading(heading,
+                                               -self.doctrine.split_distance)
+
+    def _ingress_point(self) -> Point:
+        heading = self._target_heading_to_package_airfield()
+        return self.package.target.position.point_from_heading(
+            heading - 180 + 25, self.doctrine.ingress_egress_distance
+        )
+
+    def _egress_point(self) -> Point:
+        heading = self._target_heading_to_package_airfield()
+        return self.package.target.position.point_from_heading(
+            heading - 180 - 25, self.doctrine.ingress_egress_distance
+        )
+
+    def _target_heading_to_package_airfield(self) -> int:
+        return self._heading_to_package_airfield(self.package.target.position)
+
+    def _heading_to_package_airfield(self, point: Point) -> int:
+        return self.package_airfield().position.heading_between_point(point)
+
+    def package_airfield(self) -> ControlPoint:
+        # We'll always have a package, but if this is being planned via the UI
+        # it could be the first flight in the package.
+        if not self.package.flights:
+            raise RuntimeError(
+                "Cannot determine source airfield for package with no flights"
+            )
+
+        # The package airfield is either the flight's airfield (when there is no
+        # package) or the closest airfield to the objective that is the
+        # departure airfield for some flight in the package.
+        cache = ObjectiveDistanceCache.get_closest_airfields(
+            self.package.target
+        )
+        for airfield in cache.closest_airfields:
+            for flight in self.package.flights:
+                if flight.from_cp == airfield:
+                    return airfield
+        raise RuntimeError(
+            "Could not find any airfield assigned to this package"
+        )

gen/flights/traveltime.py

@@ -0,0 +1,392 @@
+from __future__ import annotations
+
+import logging
+import math
+from dataclasses import dataclass
+from typing import Iterable, Optional
+
+from dcs.mapping import Point
+from dcs.unittype import FlyingType
+
+from game.utils import meter_to_nm
+from gen.ato import Package
+from gen.flights.flight import (
+    Flight,
+    FlightType,
+    FlightWaypoint,
+    FlightWaypointType,
+)
+
+
+CAP_DURATION = 30  # Minutes
+
+INGRESS_TYPES = {
+    FlightWaypointType.INGRESS_CAS,
+    FlightWaypointType.INGRESS_ESCORT,
+    FlightWaypointType.INGRESS_SEAD,
+    FlightWaypointType.INGRESS_STRIKE,
+}
+
+
+class GroundSpeed:
+    @staticmethod
+    def mission_speed(package: Package) -> int:
+        speeds = set()
+        for flight in package.flights:
+            # Find a waypoint that matches the mission start waypoint and use
+            # that for the altitude of the mission. That may not be true for the
+            # whole mission, but it's probably good enough for now.
+            waypoint = flight.waypoint_with_type({
+                FlightWaypointType.INGRESS_CAS,
+                FlightWaypointType.INGRESS_ESCORT,
+                FlightWaypointType.INGRESS_SEAD,
+                FlightWaypointType.INGRESS_STRIKE,
+                FlightWaypointType.PATROL_TRACK,
+            })
+            if waypoint is None:
+                logging.error(f"Could not find ingress point for {flight}.")
+                if flight.points:
+                    logging.warning(
+                        "Using first waypoint for mission altitude.")
+                    waypoint = flight.points[0]
+                else:
+                    logging.warning(
+                        "Flight has no waypoints. Assuming mission altitude "
+                        "of 25000 feet.")
+                    waypoint = FlightWaypoint(FlightWaypointType.NAV, 0, 0,
+                                              25000)
+            speeds.add(GroundSpeed.for_flight(flight, waypoint.alt))
+        return min(speeds)
+
+    @classmethod
+    def for_flight(cls, flight: Flight, altitude: int) -> int:
+        if not issubclass(flight.unit_type, FlyingType):
+            raise TypeError("Flight has non-flying unit")
+
+        # TODO: Expose both a cruise speed and target speed.
+        # The cruise speed can be used for ascent, hold, join, and RTB to save
+        # on fuel, but mission speed will be fast enough to keep the flight
+        # safer.
+
+        c_sound_sea_level = 661.5
+
+        # DCS's max speed is in kph at 0 MSL. Convert to knots.
+        max_speed = flight.unit_type.max_speed * 0.539957
+        if max_speed > c_sound_sea_level:
+            # Aircraft is supersonic. Limit to mach 0.8 to conserve fuel and
+            # account for heavily loaded jets.
+            return int(cls.from_mach(0.8, altitude))
+
+        # For subsonic aircraft, assume the aircraft can reasonably perform at
+        # 80% of its maximum, and that it can maintain the same mach at altitude
+        # as it can at sea level. This probably isn't great assumption, but
+        # might. be sufficient given the wiggle room. We can come up with
+        # another heuristic if needed.
+        mach = max_speed * 0.8 / c_sound_sea_level
+        return int(cls.from_mach(mach, altitude))  # knots
+
+    @staticmethod
+    def from_mach(mach: float, altitude: int) -> float:
+        """Returns the ground speed in knots for the given mach and altitude.
+
+        Args:
+            mach: The mach number to convert to ground speed.
+            altitude: The altitude in feet.
+
+        Returns:
+            The ground speed corresponding to the given altitude and mach number
+            in knots.
+        """
+        # https://www.grc.nasa.gov/WWW/K-12/airplane/atmos.html
+        if altitude <= 36152:
+            temperature_f = 59 - 0.00356 * altitude
+        else:
+            # There's another formula for altitudes over 82k feet, but we better
+            # not be planning waypoints that high...
+            temperature_f = -70
+
+        temperature_k = (temperature_f + 459.67) * (5 / 9)
+
+        # https://www.engineeringtoolbox.com/specific-heat-ratio-d_602.html
+        # Dependent on temperature, but varies very little (+/-0.001)
+        # between -40F and 180F.
+        heat_capacity_ratio = 1.4
+
+        # https://www.grc.nasa.gov/WWW/K-12/airplane/sound.html
+        gas_constant = 286  # m^2/s^2/K
+        c_sound = math.sqrt(heat_capacity_ratio * gas_constant * temperature_k)
+        # c_sound is in m/s, convert to knots.
+        return (c_sound * 1.944) * mach
+
+
+class TravelTime:
+    @staticmethod
+    def between_points(a: Point, b: Point, speed: float) -> int:
+        error_factor = 1.1
+        distance = meter_to_nm(a.distance_to_point(b))
+        hours = distance / speed
+        seconds = hours * 3600
+        return int(seconds * error_factor)
+
+
+class TotEstimator:
+    # An extra five minutes given as wiggle room. Expected to be spent at the
+    # hold point performing any last minute configuration.
+    HOLD_TIME = 5 * 60
+
+    def __init__(self, package: Package) -> None:
+        self.package = package
+        self.timing = PackageWaypointTiming.for_package(package)
+
+    def mission_start_time(self, flight: Flight) -> int:
+        takeoff_time = self.takeoff_time_for_flight(flight)
+        startup_time = self.estimate_startup(flight)
+        ground_ops_time = self.estimate_ground_ops(flight)
+        return takeoff_time - startup_time - ground_ops_time
+
+    def takeoff_time_for_flight(self, flight: Flight) -> int:
+        stop_types = {FlightWaypointType.JOIN, FlightWaypointType.PATROL_TRACK}
+        travel_time = self.estimate_waypoints_to_target(flight, stop_types)
+        if travel_time is None:
+            logging.warning("Found no join point or patrol point. Cannot "
+                            f"estimate takeoff time takeoff time for {flight}")
+            # Takeoff immediately.
+            return 0
+
+        # BARCAP flights do not coordinate with the rest of the package on join
+        # or ingress points.
+        if flight.flight_type == FlightType.BARCAP:
+            start_time = self.timing.race_track_start(flight)
+        else:
+            start_time = self.timing.join
+        return start_time - travel_time - self.HOLD_TIME
+
+    def earliest_tot(self) -> int:
+        return max((
+            self.earliest_tot_for_flight(f) for f in self.package.flights
+        )) + self.HOLD_TIME
+
+    def earliest_tot_for_flight(self, flight: Flight) -> int:
+        """Estimate fastest time from mission start to the target position.
+
+        For BARCAP flights, this is time to race track start. This ensures that
+        they are on station at the same time any other package members reach
+        their ingress point.
+
+        For other mission types this is the time to the mission target.
+
+        Args:
+            flight: The flight to get the earliest TOT time for.
+
+        Returns:
+            The earliest possible TOT for the given flight in seconds. Returns 0
+            if an ingress point cannot be found.
+        """
+        if flight.flight_type == FlightType.BARCAP:
+            time_to_target = self.estimate_waypoints_to_target(flight, {
+                FlightWaypointType.PATROL_TRACK
+            })
+            if time_to_target is None:
+                logging.warning(
+                    f"Found no race track. Cannot estimate TOT for {flight}")
+                # Return 0 so this flight's travel time does not affect the rest
+                # of the package.
+                return 0
+        else:
+            time_to_ingress = self.estimate_waypoints_to_target(
+                flight, INGRESS_TYPES
+            )
+            if time_to_ingress is None:
+                logging.warning(
+                    f"Found no ingress types. Cannot estimate TOT for {flight}")
+                # Return 0 so this flight's travel time does not affect the rest
+                # of the package.
+                return 0
+
+            assert self.package.waypoints is not None
+            time_to_target = time_to_ingress + TravelTime.between_points(
+                self.package.waypoints.ingress, self.package.target.position,
+                GroundSpeed.mission_speed(self.package))
+        return sum([
+            self.estimate_startup(flight),
+            self.estimate_ground_ops(flight),
+            time_to_target,
+        ])
+
+    @staticmethod
+    def estimate_startup(flight: Flight) -> int:
+        if flight.start_type == "Cold":
+            if flight.client_count:
+                return 10 * 60
+            else:
+                # The AI doesn't seem to have a real startup procedure.
+                return 2 * 60
+        return 0
+
+    @staticmethod
+    def estimate_ground_ops(flight: Flight) -> int:
+        if flight.start_type in ("Runway", "In Flight"):
+            return 0
+        if flight.from_cp.is_fleet:
+            return 2 * 60
+        else:
+            return 5 * 60
+
+    def estimate_waypoints_to_target(
+            self, flight: Flight,
+            stop_types: Iterable[FlightWaypointType]) -> Optional[int]:
+        total = 0
+        # TODO: This is AGL. We want MSL.
+        previous_altitude = 0
+        previous_position = flight.from_cp.position
+        for waypoint in flight.points:
+            position = Point(waypoint.x, waypoint.y)
+            total += TravelTime.between_points(
+                previous_position, position,
+                self.speed_to_waypoint(flight, waypoint, previous_altitude)
+            )
+            previous_position = position
+            previous_altitude = waypoint.alt
+            if waypoint.waypoint_type in stop_types:
+                return total
+
+        return None
+
+    def speed_to_waypoint(self, flight: Flight, waypoint: FlightWaypoint,
+                          from_altitude: int) -> int:
+        # TODO: Adjust if AGL.
+        # We don't have an exact heightmap, but we should probably be performing
+        # *some* adjustment for NTTR since the minimum altitude of the map is
+        # near 2000 ft MSL.
+        alt_for_speed = min(from_altitude, waypoint.alt)
+        pre_join = (FlightWaypointType.LOITER, FlightWaypointType.JOIN)
+        if waypoint.waypoint_type == FlightWaypointType.ASCEND_POINT:
+            # Flights that start airborne already have some altitude and a good
+            # amount of speed.
+            factor = 1.0 if flight.start_type == "In Flight" else 0.5
+            return int(GroundSpeed.for_flight(flight, alt_for_speed) * factor)
+        elif waypoint.waypoint_type in pre_join:
+            return GroundSpeed.for_flight(flight, alt_for_speed)
+        return GroundSpeed.mission_speed(self.package)
+
+
+@dataclass(frozen=True)
+class PackageWaypointTiming:
+    #: The package being scheduled.
+    package: Package
+
+    #: The package join time.
+    join: int
+
+    #: The ingress waypoint TOT.
+    ingress: int
+
+    #: The egress waypoint TOT.
+    egress: int
+
+    #: The package split time.
+    split: int
+
+    @property
+    def target(self) -> int:
+        """The package time over target."""
+        assert self.package.time_over_target is not None
+        return self.package.time_over_target
+
+    def race_track_start(self, flight: Flight) -> int:
+        if flight.flight_type == FlightType.BARCAP:
+            return self.target
+        else:
+            # The only other type that (currently) uses race tracks is TARCAP,
+            # which is sort of in need of cleanup. TARCAP is only valid on front
+            # lines and they participate in join points and patrol between the
+            # ingress and egress points rather than on a race track actually
+            # pointed at the enemy.
+            return self.ingress
+
+    def race_track_end(self, flight: Flight) -> int:
+        if flight.flight_type == FlightType.BARCAP:
+            return self.target + CAP_DURATION * 60
+        else:
+            # For TARCAP. See the explanation in race_track_start.
+            return self.egress
+
+    def push_time(self, flight: Flight, hold_point: FlightWaypoint) -> int:
+        assert self.package.waypoints is not None
+        return self.join - TravelTime.between_points(
+            Point(hold_point.x, hold_point.y),
+            self.package.waypoints.join,
+            GroundSpeed.for_flight(flight, hold_point.alt)
+        )
+
+    def tot_for_waypoint(self, flight: Flight,
+                         waypoint: FlightWaypoint) -> Optional[int]:
+        target_types = (
+            FlightWaypointType.TARGET_GROUP_LOC,
+            FlightWaypointType.TARGET_POINT,
+            FlightWaypointType.TARGET_SHIP,
+        )
+
+        if waypoint.waypoint_type == FlightWaypointType.JOIN:
+            return self.join
+        elif waypoint.waypoint_type in INGRESS_TYPES:
+            return self.ingress
+        elif waypoint.waypoint_type in target_types:
+            return self.target
+        elif waypoint.waypoint_type == FlightWaypointType.EGRESS:
+            return self.egress
+        elif waypoint.waypoint_type == FlightWaypointType.SPLIT:
+            return self.split
+        elif waypoint.waypoint_type == FlightWaypointType.PATROL_TRACK:
+            return self.race_track_start(flight)
+        return None
+
+    def depart_time_for_waypoint(self, waypoint: FlightWaypoint,
+                                 flight: Flight) -> Optional[int]:
+        if waypoint.waypoint_type == FlightWaypointType.LOITER:
+            return self.push_time(flight, waypoint)
+        elif waypoint.waypoint_type == FlightWaypointType.PATROL:
+            return self.race_track_end(flight)
+        return None
+
+    @classmethod
+    def for_package(cls, package: Package) -> PackageWaypointTiming:
+        assert package.waypoints is not None
+
+        # TODO: Plan similar altitudes for the in-country leg of the mission.
+        # Waypoint altitudes for a given flight *shouldn't* differ too much
+        # between the join and split points, so we don't need speeds for each
+        # leg individually since they should all be fairly similar. This doesn't
+        # hold too well right now since nothing is stopping each waypoint from
+        # jumping 20k feet each time, but that's a huge waste of energy we
+        # should be avoiding anyway.
+        if not package.flights:
+            raise ValueError("Cannot plan TOT for package with no flights")
+
+        group_ground_speed = GroundSpeed.mission_speed(package)
+
+        ingress = package.time_over_target - TravelTime.between_points(
+            package.waypoints.ingress,
+            package.target.position,
+            group_ground_speed
+        )
+
+        join = ingress - TravelTime.between_points(
+            package.waypoints.join,
+            package.waypoints.ingress,
+            group_ground_speed
+        )
+
+        egress = package.time_over_target + TravelTime.between_points(
+            package.target.position,
+            package.waypoints.egress,
+            group_ground_speed
+        )
+
+        split = egress + TravelTime.between_points(
+            package.waypoints.egress,
+            package.waypoints.split,
+            group_ground_speed
+        )
+
+        return cls(package, join, ingress, egress, split)

gen/flights/waypointbuilder.py

@@ -0,0 +1,348 @@
+from __future__ import annotations
+
+from typing import List, Optional, Union
+
+from dcs.mapping import Point
+from dcs.unit import Unit
+
+from game.data.doctrine import Doctrine
+from game.utils import nm_to_meter
+from game.weather import Conditions
+from theater import ControlPoint, MissionTarget, TheaterGroundObject
+from .flight import Flight, FlightWaypoint, FlightWaypointType
+from ..runways import RunwayAssigner
+
+
+class WaypointBuilder:
+    def __init__(self, conditions: Conditions, flight: Flight,
+                 doctrine: Doctrine) -> None:
+        self.conditions = conditions
+        self.flight = flight
+        self.doctrine = doctrine
+        self.waypoints: List[FlightWaypoint] = []
+        self.ingress_point: Optional[FlightWaypoint] = None
+
+    @property
+    def is_helo(self) -> bool:
+        return getattr(self.flight.unit_type, "helicopter", False)
+
+    def build(self) -> List[FlightWaypoint]:
+        return self.waypoints
+
+    def ascent(self, departure: ControlPoint) -> None:
+        """Create ascent waypoint for the given departure airfield or carrier.
+
+        Args:
+            departure: Departure airfield or carrier.
+        """
+        heading = RunwayAssigner(self.conditions).takeoff_heading(departure)
+        position = departure.position.point_from_heading(
+            heading, nm_to_meter(5)
+        )
+        waypoint = FlightWaypoint(
+            FlightWaypointType.ASCEND_POINT,
+            position.x,
+            position.y,
+            500 if self.is_helo else self.doctrine.pattern_altitude
+        )
+        waypoint.name = "ASCEND"
+        waypoint.alt_type = "RADIO"
+        waypoint.description = "Ascend"
+        waypoint.pretty_name = "Ascend"
+        self.waypoints.append(waypoint)
+
+    def descent(self, arrival: ControlPoint) -> None:
+        """Create descent waypoint for the given arrival airfield or carrier.
+
+        Args:
+            arrival: Arrival airfield or carrier.
+        """
+        landing_heading = RunwayAssigner(self.conditions).landing_heading(
+            arrival)
+        heading = (landing_heading + 180) % 360
+        position = arrival.position.point_from_heading(
+            heading, nm_to_meter(5)
+        )
+        waypoint = FlightWaypoint(
+            FlightWaypointType.DESCENT_POINT,
+            position.x,
+            position.y,
+            300 if self.is_helo else self.doctrine.pattern_altitude
+        )
+        waypoint.name = "DESCEND"
+        waypoint.alt_type = "RADIO"
+        waypoint.description = "Descend to pattern altitude"
+        waypoint.pretty_name = "Descend"
+        self.waypoints.append(waypoint)
+
+    def land(self, arrival: ControlPoint) -> None:
+        """Create descent waypoint for the given arrival airfield or carrier.
+
+        Args:
+            arrival: Arrival airfield or carrier.
+        """
+        position = arrival.position
+        waypoint = FlightWaypoint(
+            FlightWaypointType.LANDING_POINT,
+            position.x,
+            position.y,
+            0
+        )
+        waypoint.name = "LANDING"
+        waypoint.alt_type = "RADIO"
+        waypoint.description = "Land"
+        waypoint.pretty_name = "Land"
+        self.waypoints.append(waypoint)
+
+    def hold(self, position: Point) -> None:
+        waypoint = FlightWaypoint(
+            FlightWaypointType.LOITER,
+            position.x,
+            position.y,
+            500 if self.is_helo else self.doctrine.rendezvous_altitude
+        )
+        waypoint.pretty_name = "Hold"
+        waypoint.description = "Wait until push time"
+        waypoint.name = "HOLD"
+        self.waypoints.append(waypoint)
+
+    def join(self, position: Point) -> None:
+        waypoint = FlightWaypoint(
+            FlightWaypointType.JOIN,
+            position.x,
+            position.y,
+            500 if self.is_helo else self.doctrine.ingress_altitude
+        )
+        waypoint.pretty_name = "Join"
+        waypoint.description = "Rendezvous with package"
+        waypoint.name = "JOIN"
+        self.waypoints.append(waypoint)
+
+    def split(self, position: Point) -> None:
+        waypoint = FlightWaypoint(
+            FlightWaypointType.SPLIT,
+            position.x,
+            position.y,
+            500 if self.is_helo else self.doctrine.ingress_altitude
+        )
+        waypoint.pretty_name = "Split"
+        waypoint.description = "Depart from package"
+        waypoint.name = "SPLIT"
+        self.waypoints.append(waypoint)
+
+    def ingress_cas(self, position: Point, objective: MissionTarget) -> None:
+        self._ingress(FlightWaypointType.INGRESS_CAS, position, objective)
+
+    def ingress_escort(self, position: Point, objective: MissionTarget) -> None:
+        self._ingress(FlightWaypointType.INGRESS_ESCORT, position, objective)
+
+    def ingress_sead(self, position: Point, objective: MissionTarget) -> None:
+        self._ingress(FlightWaypointType.INGRESS_SEAD, position, objective)
+
+    def ingress_strike(self, position: Point, objective: MissionTarget) -> None:
+        self._ingress(FlightWaypointType.INGRESS_STRIKE, position, objective)
+
+    def _ingress(self, ingress_type: FlightWaypointType, position: Point,
+                 objective: MissionTarget) -> None:
+        if self.ingress_point is not None:
+            raise RuntimeError("A flight plan can have only one ingress point.")
+
+        waypoint = FlightWaypoint(
+            ingress_type,
+            position.x,
+            position.y,
+            500 if self.is_helo else self.doctrine.ingress_altitude
+        )
+        waypoint.pretty_name = "INGRESS on " + objective.name
+        waypoint.description = "INGRESS on " + objective.name
+        waypoint.name = "INGRESS"
+        self.waypoints.append(waypoint)
+        self.ingress_point = waypoint
+
+    def egress(self, position: Point, target: MissionTarget) -> None:
+        waypoint = FlightWaypoint(
+            FlightWaypointType.EGRESS,
+            position.x,
+            position.y,
+            500 if self.is_helo else self.doctrine.ingress_altitude
+        )
+        waypoint.pretty_name = "EGRESS from " + target.name
+        waypoint.description = "EGRESS from " + target.name
+        waypoint.name = "EGRESS"
+        self.waypoints.append(waypoint)
+
+    def dead_point(self, target: Union[TheaterGroundObject, Unit], name: str,
+                   location: MissionTarget) -> None:
+        self._target_point(target, name, f"STRIKE {name}", location)
+        # TODO: Seems fishy.
+        if self.ingress_point is not None:
+            self.ingress_point.targetGroup = location
+
+    def sead_point(self, target: Union[TheaterGroundObject, Unit], name: str,
+                   location: MissionTarget) -> None:
+        self._target_point(target, name, f"STRIKE {name}", location)
+        # TODO: Seems fishy.
+        if self.ingress_point is not None:
+            self.ingress_point.targetGroup = location
+
+    def strike_point(self, target: Union[TheaterGroundObject, Unit], name: str,
+                     location: MissionTarget) -> None:
+        self._target_point(target, name, f"STRIKE {name}", location)
+
+    def _target_point(self, target: Union[TheaterGroundObject, Unit], name: str,
+                      description: str, location: MissionTarget) -> None:
+        if self.ingress_point is None:
+            raise RuntimeError(
+                "An ingress point must be added before target points."
+            )
+
+        waypoint = FlightWaypoint(
+            FlightWaypointType.TARGET_POINT,
+            target.position.x,
+            target.position.y,
+            0
+        )
+        waypoint.description = description
+        waypoint.pretty_name = description
+        waypoint.name = name
+        # The target waypoints are only for the player's benefit. AI tasks for
+        # the target are set on the ingress point so they begin their attack
+        # *before* reaching the target.
+        waypoint.only_for_player = True
+        self.waypoints.append(waypoint)
+        # TODO: This seems wrong, but it's what was there before.
+        self.ingress_point.targets.append(location)
+
+    def sead_area(self, target: MissionTarget) -> None:
+        self._target_area(f"SEAD on {target.name}", target)
+        # TODO: Seems fishy.
+        if self.ingress_point is not None:
+            self.ingress_point.targetGroup = target
+
+    def dead_area(self, target: MissionTarget) -> None:
+        self._target_area(f"DEAD on {target.name}", target)
+        # TODO: Seems fishy.
+        if self.ingress_point is not None:
+            self.ingress_point.targetGroup = target
+
+    def _target_area(self, name: str, location: MissionTarget) -> None:
+        if self.ingress_point is None:
+            raise RuntimeError(
+                "An ingress point must be added before target points."
+            )
+
+        waypoint = FlightWaypoint(
+            FlightWaypointType.TARGET_GROUP_LOC,
+            location.position.x,
+            location.position.y,
+            0
+        )
+        waypoint.description = name
+        waypoint.pretty_name = name
+        waypoint.name = name
+        # The target waypoints are only for the player's benefit. AI tasks for
+        # the target are set on the ingress point so they begin their attack
+        # *before* reaching the target.
+        waypoint.only_for_player = True
+        self.waypoints.append(waypoint)
+        # TODO: This seems wrong, but it's what was there before.
+        self.ingress_point.targets.append(location)
+
+    def cas(self, position: Point) -> None:
+        waypoint = FlightWaypoint(
+            FlightWaypointType.CAS,
+            position.x,
+            position.y,
+            500 if self.is_helo else 1000
+        )
+        waypoint.alt_type = "RADIO"
+        waypoint.description = "Provide CAS"
+        waypoint.name = "CAS"
+        waypoint.pretty_name = "CAS"
+        self.waypoints.append(waypoint)
+
+    def race_track_start(self, position: Point, altitude: int) -> None:
+        """Creates a racetrack start waypoint.
+
+        Args:
+            position: Position of the waypoint.
+            altitude: Altitude of the racetrack in meters.
+        """
+        waypoint = FlightWaypoint(
+            FlightWaypointType.PATROL_TRACK,
+            position.x,
+            position.y,
+            altitude
+        )
+        waypoint.name = "RACETRACK START"
+        waypoint.description = "Orbit between this point and the next point"
+        waypoint.pretty_name = "Race-track start"
+        self.waypoints.append(waypoint)
+
+    def race_track_end(self, position: Point, altitude: int) -> None:
+        """Creates a racetrack end waypoint.
+
+        Args:
+            position: Position of the waypoint.
+            altitude: Altitude of the racetrack in meters.
+        """
+        waypoint = FlightWaypoint(
+            FlightWaypointType.PATROL,
+            position.x,
+            position.y,
+            altitude
+        )
+        waypoint.name = "RACETRACK END"
+        waypoint.description = "Orbit between this point and the previous point"
+        waypoint.pretty_name = "Race-track end"
+        self.waypoints.append(waypoint)
+
+    def race_track(self, start: Point, end: Point, altitude: int) -> None:
+        """Creates two waypoint for a racetrack orbit.
+
+        Args:
+            start: The beginning racetrack waypoint.
+            end: The ending racetrack waypoint.
+            altitude: The racetrack altitude.
+        """
+        self.race_track_start(start, altitude)
+        self.race_track_end(end, altitude)
+
+    def rtb(self, arrival: ControlPoint) -> None:
+        """Creates descent ant landing waypoints for the given control point.
+
+        Args:
+            arrival: Arrival airfield or carrier.
+        """
+        self.descent(arrival)
+        self.land(arrival)
+
+    def escort(self, ingress: Point, target: MissionTarget,
+               egress: Point) -> None:
+        """Creates the waypoints needed to escort the package.
+
+        Args:
+            ingress: The package ingress point.
+            target: The mission target.
+            egress: The package egress point.
+        """
+        # This would preferably be no points at all, and instead the Escort task
+        # would begin on the join point and end on the split point, however the
+        # escort task does not appear to work properly (see the longer
+        # description in gen.aircraft.JoinPointBuilder), so instead we give
+        # the escort flights a flight plan including the ingress point, target
+        # area, and egress point.
+        self._ingress(FlightWaypointType.INGRESS_ESCORT, ingress, target)
+
+        waypoint = FlightWaypoint(
+            FlightWaypointType.TARGET_GROUP_LOC,
+            target.position.x,
+            target.position.y,
+            500 if self.is_helo else self.doctrine.ingress_altitude
+        )
+        waypoint.name = "TARGET"
+        waypoint.description = "Escort the package"
+        waypoint.pretty_name = "Target area"
+        self.waypoints.append(waypoint)
+
+        self.egress(egress, target)

gen/ground_forces/ai_ground_planner.py

@@ -1,13 +1,13 @@
 import random
 from enum import Enum
+from typing import Dict, List
 
-from dcs.vehicles import *
-
-from gen import Conflict
-from gen.ground_forces.combat_stance import CombatStance
-from theater import ControlPoint
+from dcs.vehicles import Armor, Artillery, Infantry, Unarmed
+from dcs.unittype import VehicleType
 
 import pydcs_extensions.frenchpack.frenchpack as frenchpack
+from gen.ground_forces.combat_stance import CombatStance
+from theater import ControlPoint
 
 TYPE_TANKS = [
     Armor.MBT_T_55,
@@ -197,7 +197,7 @@ DISTANCE_FROM_FRONTLINE = {
 
 GROUP_SIZES_BY_COMBAT_STANCE = {
     CombatStance.DEFENSIVE: [2, 4, 6],
-    CombatStance.AGGRESIVE: [2, 4, 6],
+    CombatStance.AGGRESSIVE: [2, 4, 6],
     CombatStance.RETREAT: [2, 4, 6, 8],
     CombatStance.BREAKTHROUGH: [4, 6, 6, 8],
     CombatStance.ELIMINATION: [2, 4, 4, 4, 6],
@@ -207,8 +207,8 @@ GROUP_SIZES_BY_COMBAT_STANCE = {
 
 class CombatGroup:
 
-    def __init__(self, role:CombatGroupRole):
-        self.units = []
+    def __init__(self, role: CombatGroupRole):
+        self.units: List[VehicleType] = []
         self.role = role
         self.assigned_enemy_cp = None
         self.start_position = None
@@ -222,33 +222,22 @@ class CombatGroup:
 
 class GroundPlanner:
 
-    cp = None
-    combat_groups_dict = {}
-    connected_enemy_cp = []
-
-    tank_groups = []
-    apc_group = []
-    ifv_group = []
-    art_group = []
-    shorad_groups = []
-    logi_groups = []
-
     def __init__(self, cp:ControlPoint, game):
         self.cp = cp
         self.game = game
         self.connected_enemy_cp = [cp for cp in self.cp.connected_points if cp.captured != self.cp.captured]
-        self.tank_groups = []
-        self.apc_group = []
-        self.ifv_group = []
-        self.art_group = []
-        self.atgm_group = []
-        self.logi_groups = []
-        self.shorad_groups = []
+        self.tank_groups: List[CombatGroup] = []
+        self.apc_group: List[CombatGroup] = []
+        self.ifv_group: List[CombatGroup] = []
+        self.art_group: List[CombatGroup] = []
+        self.atgm_group: List[CombatGroup] = []
+        self.logi_groups: List[CombatGroup] = []
+        self.shorad_groups: List[CombatGroup] = []
 
-        self.units_per_cp = {}
+        self.units_per_cp: Dict[int, List[CombatGroup]] = {}
         for cp in self.connected_enemy_cp:
             self.units_per_cp[cp.id] = []
-        self.reserve = []
+        self.reserve: List[CombatGroup] = []
 
 
     def plan_groundwar(self):

gen/ground_forces/combat_stance.py

@@ -3,7 +3,7 @@ from enum import Enum
 
 class CombatStance(Enum):
     DEFENSIVE = 0    # Unit will adopt defensive stance with medium group of units
-    AGGRESIVE = 1    # Unit will attempt to make progress with medium sized group of units
+    AGGRESSIVE = 1    # Unit will attempt to make progress with medium sized group of units
     RETREAT = 2      # Unit will retreat
     BREAKTHROUGH = 3 # Unit will attempt a breakthrough, rushing forward very aggresively with big group of armored units, and even less armored units will move aggresively
     ELIMINATION = 4  # Unit will progress aggresively toward anemy units, attempting to eliminate the ennemy force