Open all files with utf-8 encoding

- will not be used for binary read/writes (rb,wb)!
- prevents a bug where units with special characters in the unit name can not be tracked anymore as there will be a name mismatch due to wrong encoding

(cherry-picked from b5b0d82)

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/mod_support.md

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

.github/workflows/build.yml

@@ -36,11 +36,6 @@ jobs:
       run: |
         ./venv/scripts/activate
         mypy gen
-
-    - name: mypy tests
-      run: |
-        ./venv/scripts/activate
-        mypy tests
       
     - name: update build number
       run: |

.github/workflows/test.yml

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

.gitignore

@@ -18,7 +18,7 @@ env/
 /liberation_preferences.json
 /state.json
 
-/logs/
+logs/
 
 qt_ui/logs/liberation.log
 

README.md

@@ -1,6 +1,4 @@
-[![Logo](https://i.imgur.com/HJBT4BL.png)](https://shdwp.github.io/ukraine/)
-
-(Github Readme Banner and Splash screen Artwork by Andriy Dankovych, CC BY-SA 4.0)
+![Logo](https://i.imgur.com/c2k18E1.png)
 
 [![Patreon](https://img.shields.io/badge/patreon-become%20a%20patron-orange?logo=patreon)](https://patreon.com/khopa)
 

changelog.md

@@ -1,106 +1,16 @@
-# 5.2.1
+# 4.1.2
 
-## Fixes
-
-* **[Mission Generation]** Work around DCS 2.8 bug preventing the AI from leaving their hold point.
-
-# 5.2.0
-
-Saves from 5.1.0 are compatible with 5.2.0
+Saves from 4.1.1 are compatible with 4.1.2.
 
 ## Features/Improvements
 
-* **[Engine]** Support for DCS DCS 2.7.11.21408, including the new Apache AH-64D and the Syria map extension
-* **[Mission Generation]** Improved FARP Helipad handling and creation (now includes windsocks)
-* **[Modding]** Add UH-60L mod support
-* **[Modding]** Updated Community A-4E-C mod version support to 2.0.0 release. Version 1.4.2 is no longer compatible, unless the mod default loadouts are deleted/modified.
-* **[Modding]** Updated JAS-39-C mod support for v1.8.0-beta
-* **[Campaign]** Peace Spring, Vectron's Claw, Vegas Nerve, Scenic Route 2 campaign update
-* **[Campaign]** Added Tripoint Hostility campaign by Fuzzle
-* **[Campaign]** Add 3 new campaigns from Sith1144
-## Fixes
-
-* **[Mission Generation]** Fixed incorrect SA-5 and NASAMS threat range when TR destroyed. It will not count as threat anymore when the TR is dead.
-* **[Mission Generation]** Fixed "Max Threat Range" error
-* **[Mission Generation]** Fix unculled zones not updating when needed
-* **[Mission Planner]** Now allows squadron transfers to control points where the number of free slots matches exactly the expected size of the transferring squadron next turn.
-* **[Data]** Removed Fw 190 A-8 and D-9 from Germany 1940 and 1942 faction list for historical accuracy.
-* **[Data]** Updated Loadouts for Tornado GR4, F-15E and F-16C
-* **[Data]** Corrected some unit data
-* **[UI]** Fixed various UI issues (for example Scaling and HighDPI)
-* **[UI]** Typhoon GR4 and IDS images
-
-
-# 5.1.0
-
-Saves from 5.0.0 are compatible with 5.1.0
-
-## Features/Improvements
-
-* **[Engine]** Support for DCS 2.7.9.17830 and newer, including the HTS and ECM pod.
-* **[Campaign]** Add option to manually add and remove squadrons and different aircraft type in the new game wizard / air wing configuration dialog.
-* **[Mission Generation]** Add Option to enforce the Easy Communication setting for the mission
-* **[Mission Generation]** Add Option to select between only night missions, day missions or any time (default).
-* **[Modding]** Add F-104 mod support
-## Fixes
-
-* **[Campaign]** Fixed some minor issues in campaigns which generated error messages in the log.
-* **[Campaign]** Changed the way how map object / scenery kills where tracked. This fixes issues with kill recognition after map updates from ED which change the object ids and therefore prevent correct kill recognition.
-* **[Mission Generation]** Fixed incorrect radio specification for the AN/ARC-222.
-* **[Mission Generation]** Fixed mission scripting error when using a dedicated server.
-* **[Mission Generation]** Fixed an issue where empty convoys lead to an index error when a point capture made a pending transfer of units not completable anymore.
-* **[Mission Generation]** Corrected Viggen FR22 & FR24 preset channels for the DCS 2.7.9 update
-* **[Mission Generation]** Fixed the SA-5 Generator to use the P-19 FlatFace SR as a Fallback radar if the faction does not have access to the TinShield SR.
-* **[UI]** Enable / Disable the settings, save and stats actions if no game is loaded to prevent an error as these functions can only be used on a valid game.
-* **[UI]** Added missing icons for Tornado GR4, and Tornado IDS.
-
-# 5.0.0
-
-Saves from 4.x are not compatible with 5.0.
-
-## Features/Improvements
-
-* **[Campaign]** Weather! Theaters now experience weather that is more realistic for the region and its current season. For example, Persian Gulf will have very hot, sunny summers and Marianas will experience lots of rain during fall. These changes affect pressure, temperature, clouds and precipitation. Additionally, temperature will drop during the night, by an amount that is somewhat realistic for the region.
-* **[Campaign]** Weapon data such as fallbacks and introduction years is now moddable. Due to the new architecture to support this, the old data was not automatically migrated.
-* **[Campaign]** Era-restricted loadouts will now skip LGBs when no TGP is available in the loadout. This only applies to default loadouts; buddy-lasing can be coordinated with custom loadouts.
-* **[Campaign]** FOBs control point can have FARP/helipad slot and host helicopters. To enable this feature on a FOB, add "Invisible FARP" statics objects near the FOB location in the campaign definition file.
-* **[Campaign]** Squadrons now have a home base and will not operate out of other bases. See https://github.com/dcs-liberation/dcs_liberation/issues/1145 for status.
-* **[Campaign]** Aircraft now belong to squadrons rather than bases to support squadron location transfers.
-* **[Campaign]** Skipped turns are no longer counted as defeats on front lines.
-* **[Campaign AI]** Overhauled campaign AI target prioritization.
-* **[Campaign AI]** Player front line stances can now be automated. Improved stance selection for AI.
-* **[Campaign AI]** Reworked layout of hold, join, split, and ingress points. Should result in much shorter flight plans in general while still maintaining safe join/split/hold points.
-* **[Campaign AI]** Auto-planning mission range limits are now specified per-aircraft. On average this means that longer range missions will now be plannable. The limit only accounts for the direct distance to the target, not the path taken.
-* **[Campaign AI]** Transport aircraft will now be bought only if necessary at control points which can produce ground units and are capable to operate transport aircraft.
-* **[Campaign AI]** Aircraft will now only be automatically purchased or assigned at appropriate bases. Naval aircraft will default to only operating from carriers, Harriers will default to LHAs and shore bases, helicopters will operate from anywhere. This can be customized per-squadron.
-* **[Engine]** Support for DCS 2.7.7.14727 and newer, including support for F-16 CBU-105s, SA-5s, and the Forrestal.
-* **[Kneeboard]** Minimum required fuel estimates have been added to the kneeboard for aircraft with supporting data (currently only the Hornet and Viper).
-* **[Kneeboard]** QNH (pressure MSL) and temperature have been added to the kneeboard.
 * **[Mission Generation]** EWRs are now also headed towards the center of the conflict
-* **[Mission Generation]** FACs can now use FC3 compatible laser codes. Note that this setting is global, not per FAC.
-* **[Modding]** Can now install custom campaigns to <DCS saved games>/Liberation/Campaigns instead of the Liberation install directory.
-* **[Modding]** Campaigns can now define a default start date.
-* **[Modding]** Campaigns now specify the squadrons that are present in the campaign, their roles, and their starting bases. Players can customize this at game start but the campaign will choose the defaults.
-* **[New Game Wizard]** Can now customize the player's air wing before campaign start to disable, relocate, or rename squadrons.
-* **[Plugins]** Updated SkynetIADS to 2.4.0 (adds SA-5 support).
 * **[UI]** Sell Button for aircraft will be disabled if there are no units available to be sold or all are already assigned to a mission
-* **[UI]** Enemy aircraft inventory now viewable in the air wing menu.
 
 ## Fixes
 
-* **[Campaign]** Naval control points will no longer claim ground objectives during campaign generation and prevent them from spawning.
-* **[Campaign]** Units aboard sunk cargo ships will now have their losses tracked properly.
-* **[Mission Generation]** Mission results and other files will now be opened with enforced utf-8 encoding to prevent an issue where destroyed ground units were untracked because of special characters in their names.
-* **[Mission Generation]** Fixed generation of landing waypoints so that the AI obeys them.
-* **[Mission Generation]** AI carrier aircraft with a start time of T+0 will now start at T+1s to avoid traffic jams.
-* **[Mission Generation]** Fixed cases of unused aircraft not being spawned at airfields as soon as any airport filled up.
-* **[Mission Generation]** Fixed cases with multiple client flights of the same airframe all received the same preset channels.
-* **[Mission Generation]** F-14A is now generated with stored alignment.
-* **[Mission Generation]** Su-33s set to cold or warm start on the Kuznetsov will always be generated as runway starts to avoid the AI getting stuck.
-* **[Mission Generation]** Fixed AI not receiving anti-ship tasks against carriers and LHAs.
-* **[Mods]** Fixed broken A-4 support causing no weapons to be available.
 * **[UI]** Selling of Units is now visible again in the UI dialog and shows the correct amount of sold units
-* **[UI]** Fixed bug where an incompatible campaign could be generated if no action is taken on the campaign selection screen.
+* **[Mission Generation]** Mission results and other files will now be opened with enforced utf-8 encoding to prevent an issue where destroyed ground units were untracked because of special characters in their names.
 
 # 4.1.1
 
@@ -125,8 +35,8 @@ Saves from 4.0.0 are compatible with 4.1.0.
 * **[Flight Planning]** CAP patrol altitudes are now set per-aircraft. By default the altitude will be set based on the aircraft's maximum speed.
 * **[Flight Planning]** CAP patrol speeds are now set per-aircraft to be more suitable/sensible. By default the speed will be set based on the aircraft's maximum speed.
 * **[Mission Generation]** Improvements for better support of the Skynet Plugin and long range SAMs are now acting as EWR
+* **[Mods]** Support for version v1.5.0-Beta of Gripen mod. In-progress campaigns may need to re-plan Gripen flights to pick up updated loadouts.
 * **[Mission Generation]** SAM sites are now headed towards the center of the conflict
-* **[Mods]** Support for latest version of Gripen mod. In-progress campaigns may need to re-plan Gripen flights to pick up updated loadouts.
 * **[Plugins]** Increased time JTAC Autolase messages stay visible on the UI.
 * **[Plugins]** Updated SkynetIADS to 2.2.0 (adds NASAMS support).  
 * **[UI]** Added ability to take notes and have those notes appear as a kneeboard page.
@@ -152,7 +62,7 @@ Saves from 4.0.0 are compatible with 4.1.0.
 * **[Mission Generation]** Planned transfers which will be impossible after a base capture will no longer prevent the mission result submit.
 * **[Mission Generation]** Fix occasional KeyError preventing mission generation when all units of the same type in a convoy were killed.
 * **[Mission Generation]** Fix for AAA Flak generator using Opel Blitz preventing the mission from being generated because duplicate unit names were used.
-* **[Mission Generation]** Fixed a potential bug with laser code generation where it would generate invalid codes.  
+* **[Campaign AI]** Transport aircraft will now be bought only if necessary at control points which can produce ground units and are capable to operate transport aircraft.
 * **[UI]** Statistics window tick marks are now always integers.
 * **[UI]** Statistics window now shows the correct info for the turn
 * **[UI]** Toggling custom loadout for an aircraft with no preset loadouts no longer breaks the flight.

doc/fuel-consumption-measurement.md

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

game/campaignloader/__init__.py

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

game/campaignloader/campaign.py

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

game/campaignloader/campaignairwingconfig.py

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

game/campaignloader/defaultsquadronassigner.py

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

game/campaignloader/mizcampaignloader.py

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

game/campaignloader/squadrondefgenerator.py

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

game/coalition.py

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

game/commander/__init__.py

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

game/commander/garrisons.py

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

game/commander/missionproposals.py

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

game/commander/missionscheduler.py

@@ -1,76 +0,0 @@
-from __future__ import annotations
-
-import logging
-import random
-from collections import defaultdict
-from datetime import timedelta
-from typing import Iterator, Dict, TYPE_CHECKING
-
-from game.theater import MissionTarget
-from gen.flights.flight import FlightType
-from gen.flights.traveltime import TotEstimator
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class MissionScheduler:
-    def __init__(self, coalition: Coalition, desired_mission_length: timedelta) -> None:
-        self.coalition = coalition
-        self.desired_mission_length = desired_mission_length
-
-    def schedule_missions(self) -> None:
-        """Identifies and plans mission for the turn."""
-
-        def start_time_generator(
-            count: int, earliest: int, latest: int, margin: int
-        ) -> Iterator[timedelta]:
-            interval = (latest - earliest) // count
-            for time in range(earliest, latest, interval):
-                error = random.randint(-margin, margin)
-                yield timedelta(seconds=max(0, time + error))
-
-        dca_types = {
-            FlightType.BARCAP,
-            FlightType.TARCAP,
-        }
-
-        previous_cap_end_time: Dict[MissionTarget, timedelta] = defaultdict(timedelta)
-        non_dca_packages = [
-            p for p in self.coalition.ato.packages if p.primary_task not in dca_types
-        ]
-
-        start_time = start_time_generator(
-            count=len(non_dca_packages),
-            earliest=5 * 60,
-            latest=int(self.desired_mission_length.total_seconds()),
-            margin=5 * 60,
-        )
-        for package in self.coalition.ato.packages:
-            tot = TotEstimator(package).earliest_tot()
-            if package.primary_task in dca_types:
-                previous_end_time = previous_cap_end_time[package.target]
-                if tot > previous_end_time:
-                    # Can't get there exactly on time, so get there ASAP. This
-                    # will typically only happen for the first CAP at each
-                    # target.
-                    package.time_over_target = tot
-                else:
-                    package.time_over_target = previous_end_time
-
-                departure_time = package.mission_departure_time
-                # Should be impossible for CAPs
-                if departure_time is None:
-                    logging.error(f"Could not determine mission end time for {package}")
-                    continue
-                previous_cap_end_time[package.target] = departure_time
-            elif package.auto_asap:
-                package.set_tot_asap()
-            else:
-                # But other packages should be spread out a bit. Note that take
-                # times are delayed, but all aircraft will become active at
-                # mission start. This makes it more worthwhile to attack enemy
-                # airfields to hit grounded aircraft, since they're more likely
-                # to be present. Runway and air started aircraft will be
-                # delayed until their takeoff time by AirConflictGenerator.
-                package.time_over_target = next(start_time) + tot

game/commander/objectivefinder.py

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

game/commander/packagebuilder.py

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

game/commander/packagefulfiller.py

@@ -1,221 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections import defaultdict
-from typing import Set, Iterable, Dict, TYPE_CHECKING, Optional
-
-from game.commander.missionproposals import ProposedMission, ProposedFlight, EscortType
-from game.commander.packagebuilder import PackageBuilder
-from game.data.doctrine import Doctrine
-from game.procurement import AircraftProcurementRequest
-from game.profiling import MultiEventTracer
-from game.settings import Settings
-from game.squadrons import AirWing
-from game.theater import ConflictTheater
-from game.threatzones import ThreatZones
-from gen.ato import AirTaskingOrder, Package
-from gen.flights.closestairfields import ObjectiveDistanceCache
-from gen.flights.flight import FlightType
-from gen.flights.flightplan import FlightPlanBuilder
-
-if TYPE_CHECKING:
-    from game.coalition import Coalition
-
-
-class PackageFulfiller:
-    """Responsible for package aircraft allocation and flight plan layout."""
-
-    def __init__(
-        self, coalition: Coalition, theater: ConflictTheater, settings: Settings
-    ) -> None:
-        self.coalition = coalition
-        self.theater = theater
-        self.player_missions_asap = settings.auto_ato_player_missions_asap
-        self.default_start_type = settings.default_start_type
-
-    @property
-    def is_player(self) -> bool:
-        return self.coalition.player
-
-    @property
-    def ato(self) -> AirTaskingOrder:
-        return self.coalition.ato
-
-    @property
-    def air_wing(self) -> AirWing:
-        return self.coalition.air_wing
-
-    @property
-    def doctrine(self) -> Doctrine:
-        return self.coalition.doctrine
-
-    @property
-    def threat_zones(self) -> ThreatZones:
-        return self.coalition.opponent.threat_zone
-
-    def add_procurement_request(self, request: AircraftProcurementRequest) -> None:
-        self.coalition.add_procurement_request(request)
-
-    def air_wing_can_plan(self, mission_type: FlightType) -> bool:
-        """Returns True if it is possible for the air wing to plan this mission type.
-
-        Not all mission types can be fulfilled by all air wings. Many factions do not
-        have AEW&C aircraft, so they will never be able to plan those missions. It's
-        also possible for the player to exclude mission types from their squadron
-        designs.
-        """
-        return self.air_wing.can_auto_plan(mission_type)
-
-    def plan_flight(
-        self,
-        mission: ProposedMission,
-        flight: ProposedFlight,
-        builder: PackageBuilder,
-        missing_types: Set[FlightType],
-        purchase_multiplier: int,
-    ) -> None:
-        if not builder.plan_flight(flight):
-            missing_types.add(flight.task)
-            purchase_order = AircraftProcurementRequest(
-                near=mission.location,
-                task_capability=flight.task,
-                number=flight.num_aircraft * purchase_multiplier,
-            )
-            # Reserves are planned for critical missions, so prioritize those orders
-            # over aircraft needed for non-critical missions.
-            self.add_procurement_request(purchase_order)
-
-    def scrub_mission_missing_aircraft(
-        self,
-        mission: ProposedMission,
-        builder: PackageBuilder,
-        missing_types: Set[FlightType],
-        not_attempted: Iterable[ProposedFlight],
-        purchase_multiplier: int,
-    ) -> None:
-        # Try to plan the rest of the mission just so we can count the missing
-        # types to buy.
-        for flight in not_attempted:
-            self.plan_flight(
-                mission, flight, builder, missing_types, purchase_multiplier
-            )
-
-        missing_types_str = ", ".join(sorted([t.name for t in missing_types]))
-        builder.release_planned_aircraft()
-        color = "Blue" if self.is_player else "Red"
-        logging.debug(
-            f"{color}: not enough aircraft in range for {mission.location.name} "
-            f"capable of: {missing_types_str}"
-        )
-
-    def check_needed_escorts(self, builder: PackageBuilder) -> Dict[EscortType, bool]:
-        threats = defaultdict(bool)
-        for flight in builder.package.flights:
-            if self.threat_zones.waypoints_threatened_by_aircraft(
-                flight.flight_plan.escorted_waypoints()
-            ):
-                threats[EscortType.AirToAir] = True
-            if self.threat_zones.waypoints_threatened_by_radar_sam(
-                list(flight.flight_plan.escorted_waypoints())
-            ):
-                threats[EscortType.Sead] = True
-        return threats
-
-    def plan_mission(
-        self,
-        mission: ProposedMission,
-        purchase_multiplier: int,
-        tracer: MultiEventTracer,
-    ) -> Optional[Package]:
-        """Allocates aircraft for a proposed mission and adds it to the ATO."""
-        builder = PackageBuilder(
-            mission.location,
-            ObjectiveDistanceCache.get_closest_airfields(mission.location),
-            self.air_wing,
-            self.is_player,
-            self.coalition.country_name,
-            self.default_start_type,
-            mission.asap,
-        )
-
-        # Attempt to plan all the main elements of the mission first. Escorts
-        # will be planned separately so we can prune escorts for packages that
-        # are not expected to encounter that type of threat.
-        missing_types: Set[FlightType] = set()
-        escorts = []
-        for proposed_flight in mission.flights:
-            if not self.air_wing_can_plan(proposed_flight.task):
-                # This air wing can never plan this mission type because they do not
-                # have compatible aircraft or squadrons. Skip fulfillment so that we
-                # don't place the purchase request.
-                continue
-            if proposed_flight.escort_type is not None:
-                # Escorts are planned after the primary elements of the package.
-                # If the package does not need escorts they may be pruned.
-                escorts.append(proposed_flight)
-                continue
-            with tracer.trace("Flight planning"):
-                self.plan_flight(
-                    mission,
-                    proposed_flight,
-                    builder,
-                    missing_types,
-                    purchase_multiplier,
-                )
-
-        if missing_types:
-            self.scrub_mission_missing_aircraft(
-                mission, builder, missing_types, escorts, purchase_multiplier
-            )
-            return None
-
-        if not builder.package.flights:
-            # The non-escort part of this mission is unplannable by this faction. Scrub
-            # the mission and do not attempt planning escorts because there's no reason
-            # to buy them because this mission will never be planned.
-            return None
-
-        # Create flight plans for the main flights of the package so we can
-        # determine threats. This is done *after* creating all of the flights
-        # rather than as each flight is added because the flight plan for
-        # flights that will rendezvous with their package will be affected by
-        # the other flights in the package. Escorts will not be able to
-        # contribute to this.
-        flight_plan_builder = FlightPlanBuilder(
-            builder.package, self.coalition, self.theater
-        )
-        for flight in builder.package.flights:
-            with tracer.trace("Flight plan population"):
-                flight_plan_builder.populate_flight_plan(flight)
-
-        needed_escorts = self.check_needed_escorts(builder)
-        for escort in escorts:
-            # This list was generated from the not None set, so this should be
-            # impossible.
-            assert escort.escort_type is not None
-            if needed_escorts[escort.escort_type]:
-                with tracer.trace("Flight planning"):
-                    self.plan_flight(
-                        mission, escort, builder, missing_types, purchase_multiplier
-                    )
-
-        # Check again for unavailable aircraft. If the escort was required and
-        # none were found, scrub the mission.
-        if missing_types:
-            self.scrub_mission_missing_aircraft(
-                mission, builder, missing_types, escorts, purchase_multiplier
-            )
-            return None
-
-        package = builder.build()
-        # Add flight plans for escorts.
-        for flight in package.flights:
-            if not flight.flight_plan.waypoints:
-                with tracer.trace("Flight plan population"):
-                    flight_plan_builder.populate_flight_plan(flight)
-
-        if package.has_players and self.player_missions_asap:
-            package.auto_asap = True
-            package.set_tot_asap()
-
-        return package

game/commander/tasks/compound/aewcsupport.py

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

game/commander/tasks/compound/attackairinfrastructure.py

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

game/commander/tasks/compound/attackbuildings.py

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

game/commander/tasks/compound/attackgarrisons.py

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

game/commander/tasks/compound/capturebase.py

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

game/commander/tasks/compound/capturebases.py

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

game/commander/tasks/compound/defendbase.py

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

game/commander/tasks/compound/defendbases.py

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

game/commander/tasks/compound/degradeiads.py

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

game/commander/tasks/compound/destroyenemygroundunits.py

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

game/commander/tasks/compound/frontlinedefense.py

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

game/commander/tasks/compound/interdictreinforcements.py

@@ -1,27 +0,0 @@
-from collections import Iterator
-
-from game.commander.tasks.primitive.antishipping import PlanAntiShipping
-from game.commander.tasks.primitive.convoyinterdiction import PlanConvoyInterdiction
-from game.commander.theaterstate import TheaterState
-from game.htn import CompoundTask, Method
-
-
-class InterdictReinforcements(CompoundTask[TheaterState]):
-    def each_valid_method(self, state: TheaterState) -> Iterator[Method[TheaterState]]:
-        # These will only rarely get planned. When a convoy is travelling multiple legs,
-        # they're targetable after the first leg. The reason for this is that
-        # procurement happens *after* mission planning so that the missions that could
-        # not be filled will guide the procurement process. Procurement is the stage
-        # that convoys are created (because they're created to move ground units that
-        # were just purchased), so we haven't created any yet. Any incomplete transfers
-        # from the previous turn (multi-leg journeys) will still be present though so
-        # they can be targeted.
-        #
-        # Even after this is fixed, the player's convoys that were created through the
-        # UI will never be targeted on the first turn of their journey because the AI
-        # stops planning after the start of the turn. We could potentially fix this by
-        # moving opfor mission planning until the takeoff button is pushed.
-        for convoy in state.enemy_convoys:
-            yield [PlanConvoyInterdiction(convoy)]
-        for ship in state.enemy_shipping:
-            yield [PlanAntiShipping(ship)]

game/commander/tasks/compound/nextaction.py

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

game/commander/tasks/compound/protectairspace.py

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

game/commander/tasks/compound/reduceenemyfrontlinecapacity.py

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

game/commander/tasks/compound/refuelingsupport.py

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

game/commander/tasks/compound/theatersupport.py

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

game/commander/tasks/frontlinestancetask.py

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

game/commander/tasks/packageplanningtask.py

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

game/commander/tasks/primitive/aewc.py

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

game/commander/tasks/primitive/aggressiveattack.py

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

game/commander/tasks/primitive/antiship.py

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

game/commander/tasks/primitive/antishipping.py

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

game/commander/tasks/primitive/bai.py

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

game/commander/tasks/primitive/barcap.py

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

game/commander/tasks/primitive/breakthroughattack.py

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

game/commander/tasks/primitive/cas.py

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

game/commander/tasks/primitive/convoyinterdiction.py

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

game/commander/tasks/primitive/dead.py

@@ -1,46 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from game.commander.missionproposals import EscortType
-from game.commander.tasks.packageplanningtask import PackagePlanningTask
-from game.commander.theaterstate import TheaterState
-from game.theater.theatergroundobject import IadsGroundObject
-from gen.flights.flight import FlightType
-
-
-@dataclass
-class PlanDead(PackagePlanningTask[IadsGroundObject]):
-    def preconditions_met(self, state: TheaterState) -> bool:
-        if (
-            self.target not in state.threatening_air_defenses
-            and self.target not in state.detecting_air_defenses
-        ):
-            return False
-        if not self.target_area_preconditions_met(state, ignore_iads=True):
-            return False
-        return super().preconditions_met(state)
-
-    def apply_effects(self, state: TheaterState) -> None:
-        state.eliminate_air_defense(self.target)
-
-    def propose_flights(self) -> None:
-        self.propose_flight(FlightType.DEAD, 2)
-
-        # Only include SEAD against SAMs that still have emitters. No need to
-        # suppress an EWR, and SEAD isn't useful against a SAM that no longer has a
-        # working track radar.
-        #
-        # For SAMs without track radars and EWRs, we still want a SEAD escort if
-        # needed.
-        #
-        # Note that there is a quirk here: we should potentially be included a SEAD
-        # escort *and* SEAD when the target is a radar SAM but the flight path is
-        # also threatened by SAMs. We don't want to include a SEAD escort if the
-        # package is *only* threatened by the target though. Could be improved, but
-        # needs a decent refactor to the escort planning to do so.
-        if self.target.has_live_radar_sam:
-            self.propose_flight(FlightType.SEAD, 2)
-        else:
-            self.propose_flight(FlightType.SEAD_ESCORT, 2, EscortType.Sead)
-        self.propose_flight(FlightType.ESCORT, 2, EscortType.AirToAir)

game/commander/tasks/primitive/defensivestance.py

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

game/commander/tasks/primitive/eliminationattack.py

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

game/commander/tasks/primitive/oca.py

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

game/commander/tasks/primitive/refueling.py

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

game/commander/tasks/primitive/retreatstance.py

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

game/commander/tasks/primitive/strike.py

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

game/commander/tasks/theatercommandertask.py

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

game/commander/theatercommander.py

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

game/commander/theaterstate.py

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

game/data/doctrine.py

@@ -1,8 +1,9 @@
 from dataclasses import dataclass
 from datetime import timedelta
+from dcs.task import Reconnaissance
 
-from game.data.groundunitclass import GroundUnitClass
 from game.utils import Distance, feet, nautical_miles
+from game.data.groundunitclass import GroundUnitClass
 
 
 @dataclass
@@ -25,26 +26,13 @@ class Doctrine:
     antiship: bool
 
     rendezvous_altitude: Distance
-
-    #: The minimum distance between the departure airfield and the hold point.
     hold_distance: Distance
-
-    #: The minimum distance between the hold point and the join point.
     push_distance: Distance
-
-    #: The distance between the join point and the ingress point. Only used for the
-    #: fallback flight plan layout (when the departure airfield is near a threat zone).
     join_distance: Distance
-
-    #: The maximum distance between the ingress point (beginning of the attack) and
-    #: target.
-    max_ingress_distance: Distance
-
-    #: The minimum distance between the ingress point (beginning of the attack) and
-    #: target.
-    min_ingress_distance: Distance
-
+    split_distance: Distance
+    ingress_egress_distance: Distance
     ingress_altitude: Distance
+    egress_altitude: Distance
 
     min_patrol_altitude: Distance
     max_patrol_altitude: Distance
@@ -85,12 +73,13 @@ MODERN_DOCTRINE = Doctrine(
     strike=True,
     antiship=True,
     rendezvous_altitude=feet(25000),
-    hold_distance=nautical_miles(25),
+    hold_distance=nautical_miles(15),
     push_distance=nautical_miles(20),
     join_distance=nautical_miles(20),
-    max_ingress_distance=nautical_miles(45),
-    min_ingress_distance=nautical_miles(10),
+    split_distance=nautical_miles(20),
+    ingress_egress_distance=nautical_miles(45),
     ingress_altitude=feet(20000),
+    egress_altitude=feet(20000),
     min_patrol_altitude=feet(15000),
     max_patrol_altitude=feet(33000),
     pattern_altitude=feet(5000),
@@ -122,12 +111,13 @@ COLDWAR_DOCTRINE = Doctrine(
     strike=True,
     antiship=True,
     rendezvous_altitude=feet(22000),
-    hold_distance=nautical_miles(15),
+    hold_distance=nautical_miles(10),
     push_distance=nautical_miles(10),
     join_distance=nautical_miles(10),
-    max_ingress_distance=nautical_miles(30),
-    min_ingress_distance=nautical_miles(10),
+    split_distance=nautical_miles(10),
+    ingress_egress_distance=nautical_miles(30),
     ingress_altitude=feet(18000),
+    egress_altitude=feet(18000),
     min_patrol_altitude=feet(10000),
     max_patrol_altitude=feet(24000),
     pattern_altitude=feet(5000),
@@ -158,13 +148,14 @@ WWII_DOCTRINE = Doctrine(
     sead=False,
     strike=True,
     antiship=True,
-    hold_distance=nautical_miles(10),
+    hold_distance=nautical_miles(5),
     push_distance=nautical_miles(5),
     join_distance=nautical_miles(5),
+    split_distance=nautical_miles(5),
     rendezvous_altitude=feet(10000),
-    max_ingress_distance=nautical_miles(7),
-    min_ingress_distance=nautical_miles(5),
+    ingress_egress_distance=nautical_miles(7),
     ingress_altitude=feet(8000),
+    egress_altitude=feet(8000),
     min_patrol_altitude=feet(4000),
     max_patrol_altitude=feet(15000),
     pattern_altitude=feet(5000),

game/data/radar_db.py

@@ -1,5 +1,4 @@
 from dcs.ships import (
-    Forrestal,
     PIOTR,
     MOSCOW,
     VINSON,
@@ -25,7 +24,7 @@ from dcs.vehicles import AirDefence
 
 TELARS = {
     AirDefence._2S6_Tunguska,
-    AirDefence.SA_11_Buk_LN_9A310M1,
+    AirDefence.SA_11_Buk_SR_9S18M1,
     AirDefence.Osa_9A33_ln,
     AirDefence.Tor_9A331,
     AirDefence.Roland_ADS,
@@ -38,10 +37,8 @@ TRACK_RADARS = {
     AirDefence.Hawk_tr,
     AirDefence.Patriot_str,
     AirDefence.SNR_75V,
-    AirDefence.RPC_5N62V,
     AirDefence.Rapier_fsa_blindfire_radar,
     AirDefence.HQ_7_STR_SP,
-    AirDefence.NASAMS_Radar_MPQ64F1,
 }
 
 LAUNCHER_TRACKER_PAIRS = {
@@ -54,9 +51,6 @@ LAUNCHER_TRACKER_PAIRS = {
     AirDefence.S_75M_Volhov: AirDefence.SNR_75V,
     AirDefence.Rapier_fsa_launcher: AirDefence.Rapier_fsa_blindfire_radar,
     AirDefence.HQ_7_LN_SP: AirDefence.HQ_7_STR_SP,
-    AirDefence.S_200_Launcher: AirDefence.RPC_5N62V,
-    AirDefence.NASAMS_LN_B: AirDefence.NASAMS_Radar_MPQ64F1,
-    AirDefence.NASAMS_LN_C: AirDefence.NASAMS_Radar_MPQ64F1,
 }
 
 UNITS_WITH_RADAR = {
@@ -85,33 +79,30 @@ UNITS_WITH_RADAR = {
     AirDefence.Roland_Radar,
     AirDefence.Snr_s_125_tr,
     AirDefence.SNR_75V,
-    AirDefence.RLS_19J6,
-    AirDefence.RPC_5N62V,
     AirDefence.Rapier_fsa_blindfire_radar,
     AirDefence.HQ_7_LN_SP,
     AirDefence.HQ_7_STR_SP,
     AirDefence.FuMG_401,
     AirDefence.FuSe_65,
     # Ships
+    VINSON,
+    PERRY,
+    TICONDEROG,
     ALBATROS,
-    CVN_71,
-    CVN_72,
-    CVN_73,
-    CV_1143_5,
-    Forrestal,
     KUZNECOW,
-    LHA_Tarawa,
     MOLNIYA,
     MOSCOW,
     NEUSTRASH,
-    PERRY,
     PIOTR,
     REZKY,
+    CV_1143_5,
     Stennis,
-    TICONDEROG,
-    Type_052B,
-    Type_052C,
-    Type_054A,
+    CVN_71,
+    CVN_72,
+    CVN_73,
     USS_Arleigh_Burke_IIa,
-    VINSON,
+    LHA_Tarawa,
+    Type_052B,
+    Type_054A,
+    Type_052C,
 }

game/db.py

@@ -42,25 +42,17 @@ import pydcs_extensions.highdigitsams.highdigitsams as highdigitsams
 # PATCH pydcs data with MODS
 from game.factions.faction_loader import FactionLoader
 from pydcs_extensions.a4ec.a4ec import A_4E_C
-from pydcs_extensions.f104.f104 import VSN_F104G, VSN_F104S, VSN_F104S_AG
 from pydcs_extensions.f22a.f22a import F_22A
 from pydcs_extensions.hercules.hercules import Hercules
 from pydcs_extensions.jas39.jas39 import JAS39Gripen, JAS39Gripen_AG
 from pydcs_extensions.su57.su57 import Su_57
-from pydcs_extensions.uh60l.uh60l import UH_60L, KC130J
 
 plane_map["A-4E-C"] = A_4E_C
 plane_map["F-22A"] = F_22A
 plane_map["Su-57"] = Su_57
 plane_map["Hercules"] = Hercules
-plane_map["KC130J"] = KC130J
 plane_map["JAS39Gripen"] = JAS39Gripen
 plane_map["JAS39Gripen_AG"] = JAS39Gripen_AG
-plane_map["VSN_F104G"] = VSN_F104G
-plane_map["VSN_F104S"] = VSN_F104S
-plane_map["VSN_F104S_AG"] = VSN_F104S_AG
-
-helicopter_map["UH-60L"] = UH_60L
 
 vehicle_map["FieldHL"] = frenchpack._FIELD_HIDE
 vehicle_map["HARRIERH"] = frenchpack._FIELD_HIDE_SMALL
@@ -326,8 +318,6 @@ REWARDS = {
     "comms": 10,
     "oil": 10,
     "derrick": 8,
-    "village": 0.25,
-    "allycamp": 0.5,
 }
 
 """

game/dcs/aircrafttype.py

@@ -14,7 +14,6 @@ from dcs.unittype import FlyingType
 
 from game.dcs.unittype import UnitType
 from game.radio.channels import (
-    ApacheChannelNamer,
     ChannelNamer,
     RadioChannelAllocator,
     CommonRadioChannelAllocator,
@@ -37,13 +36,12 @@ from game.utils import (
     feet,
     kph,
     knots,
-    nautical_miles,
 )
 
 if TYPE_CHECKING:
     from gen.aircraft import FlightData
-    from gen.airsupport import AirSupport
-    from gen.radios import Radio, RadioFrequency, RadioRegistry
+    from gen import AirSupport, RadioFrequency, RadioRegistry
+    from gen.radios import Radio
 
 
 @dataclass(frozen=True)
@@ -96,7 +94,6 @@ class RadioConfig:
             "tomcat": TomcatChannelNamer,
             "viggen": ViggenChannelNamer,
             "viper": ViperChannelNamer,
-            "apache": ApacheChannelNamer,
         }[config.get("namer", "default")]
 
 
@@ -115,35 +112,6 @@ class PatrolConfig:
         )
 
 
-@dataclass(frozen=True)
-class FuelConsumption:
-    #: The estimated taxi fuel requirement, in pounds.
-    taxi: int
-
-    #: The estimated fuel consumption for a takeoff climb, in pounds per nautical mile.
-    climb: float
-
-    #: The estimated fuel consumption for cruising, in pounds per nautical mile.
-    cruise: float
-
-    #: The estimated fuel consumption for combat speeds, in pounds per nautical mile.
-    combat: float
-
-    #: The minimum amount of fuel that the aircraft should land with, in pounds. This is
-    #: a reserve amount for landing delays or emergencies.
-    min_safe: int
-
-    @classmethod
-    def from_data(cls, data: dict[str, Any]) -> FuelConsumption:
-        return FuelConsumption(
-            int(data["taxi"]),
-            float(data["climb_ppm"]),
-            float(data["cruise_ppm"]),
-            float(data["combat_ppm"]),
-            int(data["min_safe"]),
-        )
-
-
 # TODO: Split into PlaneType and HelicopterType?
 @dataclass(frozen=True)
 class AircraftType(UnitType[Type[FlyingType]]):
@@ -151,20 +119,13 @@ class AircraftType(UnitType[Type[FlyingType]]):
     lha_capable: bool
     always_keeps_gun: bool
 
-    # If true, the aircraft does not use the guns as the last resort weapons, but as a
-    # main weapon. It'll RTB when it doesn't have gun ammo left.
+    # If true, the aircraft does not use the guns as the last resort weapons, but as a main weapon.
+    # It'll RTB when it doesn't have gun ammo left.
     gunfighter: bool
 
     max_group_size: int
     patrol_altitude: Optional[Distance]
     patrol_speed: Optional[Speed]
-
-    #: The maximum range between the origin airfield and the target for which the auto-
-    #: planner will consider this aircraft usable for a mission.
-    max_mission_range: Distance
-
-    fuel_consumption: Optional[FuelConsumption]
-
     intra_flight_radio: Optional[Radio]
     channel_allocator: Optional[RadioChannelAllocator]
     channel_namer: Type[ChannelNamer]
@@ -186,10 +147,6 @@ class AircraftType(UnitType[Type[FlyingType]]):
     def flyable(self) -> bool:
         return self.dcs_unit_type.flyable
 
-    @property
-    def helicopter(self) -> bool:
-        return self.dcs_unit_type.helicopter
-
     @cached_property
     def max_speed(self) -> Speed:
         return kph(self.dcs_unit_type.max_speed)
@@ -342,25 +299,6 @@ class AircraftType(UnitType[Type[FlyingType]]):
         radio_config = RadioConfig.from_data(data.get("radios", {}))
         patrol_config = PatrolConfig.from_data(data.get("patrol", {}))
 
-        try:
-            mission_range = nautical_miles(int(data["max_range"]))
-        except (KeyError, ValueError):
-            mission_range = (
-                nautical_miles(50) if aircraft.helicopter else nautical_miles(150)
-            )
-            logging.warning(
-                f"{aircraft.id} does not specify a max_range. Defaulting to "
-                f"{mission_range.nautical_miles}NM"
-            )
-
-        fuel_data = data.get("fuel")
-        if fuel_data is not None:
-            fuel_consumption: Optional[FuelConsumption] = FuelConsumption.from_data(
-                fuel_data
-            )
-        else:
-            fuel_consumption = None
-
         try:
             introduction = data["introduced"]
             if introduction is None:
@@ -388,8 +326,6 @@ class AircraftType(UnitType[Type[FlyingType]]):
                 max_group_size=data.get("max_group_size", aircraft.group_size_max),
                 patrol_altitude=patrol_config.altitude,
                 patrol_speed=patrol_config.speed,
-                max_mission_range=mission_range,
-                fuel_consumption=fuel_consumption,
                 intra_flight_radio=radio_config.intra_flight,
                 channel_allocator=radio_config.channel_allocator,
                 channel_namer=radio_config.channel_namer,

game/debriefing.py

@@ -18,6 +18,7 @@ from typing import (
     Union,
 )
 
+from game import db
 from game.dcs.aircrafttype import AircraftType
 from game.dcs.groundunittype import GroundUnitType
 from game.theater import Airfield, ControlPoint
@@ -101,7 +102,7 @@ class StateData:
     #: Names of aircraft units that were killed during the mission.
     killed_aircraft: List[str]
 
-    #: Names of vehicles, ships or buildings that were killed during the mission.
+    #: Names of vehicle (and ship) units that were killed during the mission.
     killed_ground_units: List[str]
 
     #: List of descriptions of destroyed statics. Format of each element is a mapping of
@@ -135,8 +136,10 @@ class Debriefing:
         self.game = game
         self.unit_map = unit_map
 
-        self.player_country = game.blue.country_name
-        self.enemy_country = game.red.country_name
+        self.player_country = game.player_country
+        self.enemy_country = game.enemy_country
+        self.player_country_id = db.country_id_from_name(game.player_country)
+        self.enemy_country_id = db.country_id_from_name(game.enemy_country)
 
         self.air_losses = self.dead_aircraft()
         self.ground_losses = self.dead_ground_units()

game/event/event.py

@@ -7,11 +7,13 @@ from dcs.mapping import Point
 from dcs.task import Task
 
 from game import persistency
-from game.debriefing import Debriefing
+from game.debriefing import AirLosses, Debriefing
+from game.infos.information import Information
 from game.operation.operation import Operation
 from game.theater import ControlPoint
-from gen.ato import AirTaskingOrder
+from gen import AirTaskingOrder
 from gen.ground_forces.combat_stance import CombatStance
+from ..dcs.groundunittype import GroundUnitType
 from ..unitmap import UnitMap
 
 if TYPE_CHECKING:
@@ -51,7 +53,7 @@ class Event:
 
     @property
     def is_player_attacking(self) -> bool:
-        return self.attacker_name == self.game.blue.faction.name
+        return self.attacker_name == self.game.player_faction.name
 
     @property
     def tasks(self) -> List[Type[Task]]:
@@ -65,6 +67,59 @@ class Event:
         )
         return unit_map
 
+    @staticmethod
+    def _transfer_aircraft(
+        ato: AirTaskingOrder, losses: AirLosses, for_player: bool
+    ) -> None:
+        for package in ato.packages:
+            for flight in package.flights:
+                # No need to transfer to the same location.
+                if flight.departure == flight.arrival:
+                    continue
+
+                # Don't transfer to bases that were captured. Note that if the
+                # airfield was back-filling transfers it may overflow. We could
+                # attempt to be smarter in the future by performing transfers in
+                # order up a graph to prevent transfers to full airports and
+                # send overflow off-map, but overflow is fine for now.
+                if flight.arrival.captured != for_player:
+                    logging.info(
+                        f"Not transferring {flight} because {flight.arrival} "
+                        "was captured"
+                    )
+                    continue
+
+                transfer_count = losses.surviving_flight_members(flight)
+                if transfer_count < 0:
+                    logging.error(
+                        f"{flight} had {flight.count} aircraft but "
+                        f"{transfer_count} losses were recorded."
+                    )
+                    continue
+
+                aircraft = flight.unit_type
+                available = flight.departure.base.total_units_of_type(aircraft)
+                if available < transfer_count:
+                    logging.error(
+                        f"Found killed {aircraft} from {flight.departure} but "
+                        f"that airbase has only {available} available."
+                    )
+                    continue
+
+                flight.departure.base.aircraft[aircraft] -= transfer_count
+                if aircraft not in flight.arrival.base.aircraft:
+                    # TODO: Should use defaultdict.
+                    flight.arrival.base.aircraft[aircraft] = 0
+                flight.arrival.base.aircraft[aircraft] += transfer_count
+
+    def complete_aircraft_transfers(self, debriefing: Debriefing) -> None:
+        self._transfer_aircraft(
+            self.game.blue_ato, debriefing.air_losses, for_player=True
+        )
+        self._transfer_aircraft(
+            self.game.red_ato, debriefing.air_losses, for_player=False
+        )
+
     def commit_air_losses(self, debriefing: Debriefing) -> None:
         for loss in debriefing.air_losses.losses:
             if loss.pilot is not None and (
@@ -72,18 +127,18 @@ class Event:
                 or not self.game.settings.invulnerable_player_pilots
             ):
                 loss.pilot.kill()
-            squadron = loss.flight.squadron
             aircraft = loss.flight.unit_type
-            available = squadron.owned_aircraft
+            cp = loss.flight.departure
+            available = cp.base.total_units_of_type(aircraft)
             if available <= 0:
                 logging.error(
-                    f"Found killed {aircraft} from {squadron} but that airbase has "
+                    f"Found killed {aircraft} from {cp} but that airbase has "
                     "none available."
                 )
                 continue
 
-            logging.info(f"{aircraft} destroyed from {squadron}")
-            squadron.owned_aircraft -= 1
+            logging.info(f"{aircraft} destroyed from {cp}")
+            cp.base.aircraft[aircraft] -= 1
 
     @staticmethod
     def _commit_pilot_experience(ato: AirTaskingOrder) -> None:
@@ -99,8 +154,8 @@ class Event:
                     pilot.record.missions_flown += 1
 
     def commit_pilot_experience(self) -> None:
-        self._commit_pilot_experience(self.game.blue.ato)
-        self._commit_pilot_experience(self.game.red.ato)
+        self._commit_pilot_experience(self.game.blue_ato)
+        self._commit_pilot_experience(self.game.red_ato)
 
     @staticmethod
     def commit_front_line_losses(debriefing: Debriefing) -> None:
@@ -172,10 +227,13 @@ class Event:
     def commit_building_losses(self, debriefing: Debriefing) -> None:
         for loss in debriefing.building_losses:
             loss.ground_object.kill()
-            self.game.message(
-                "Building destroyed",
-                f"{loss.ground_object.dcs_identifier} has been destroyed at "
-                f"location {loss.ground_object.obj_name}",
+            self.game.informations.append(
+                Information(
+                    "Building destroyed",
+                    f"{loss.ground_object.dcs_identifier} has been destroyed at "
+                    f"location {loss.ground_object.obj_name}",
+                    self.game.turn,
+                )
             )
 
     @staticmethod
@@ -187,16 +245,19 @@ class Event:
         for captured in debriefing.base_captures:
             try:
                 if captured.captured_by_player:
-                    self.game.message(
+                    info = Information(
                         f"{captured.control_point} captured!",
                         f"We took control of {captured.control_point}.",
+                        self.game.turn,
                     )
                 else:
-                    self.game.message(
+                    info = Information(
                         f"{captured.control_point} lost!",
                         f"The enemy took control of {captured.control_point}.",
+                        self.game.turn,
                     )
 
+                self.game.informations.append(info)
                 captured.control_point.capture(self.game, captured.captured_by_player)
                 logging.info(f"Will run redeploy for {captured.control_point}")
                 self.redeploy_units(captured.control_point)
@@ -210,12 +271,12 @@ class Event:
         self.commit_pilot_experience()
         self.commit_front_line_losses(debriefing)
         self.commit_convoy_losses(debriefing)
-        self.commit_cargo_ship_losses(debriefing)
         self.commit_airlift_losses(debriefing)
         self.commit_ground_object_losses(debriefing)
         self.commit_building_losses(debriefing)
         self.commit_damaged_runways(debriefing)
         self.commit_captures(debriefing)
+        self.complete_aircraft_transfers(debriefing)
 
         # Destroyed units carcass
         # -------------------------
@@ -324,28 +385,34 @@ class Event:
                 # Handle the case where there are no casualties at all on either side but both sides still have units
                 if delta == 0.0:
                     print(status_msg)
-                    self.game.message(
+                    info = Information(
                         "Frontline Report",
                         f"Our ground forces from {cp.name} reached a stalemate with enemy forces from {enemy_cp.name}.",
+                        self.game.turn,
                     )
+                    self.game.informations.append(info)
                 else:
                     if player_won:
                         print(status_msg)
                         cp.base.affect_strength(delta)
                         enemy_cp.base.affect_strength(-delta)
-                        self.game.message(
+                        info = Information(
                             "Frontline Report",
-                            f"Our ground forces from {cp.name} are making progress toward {enemy_cp.name}. {status_msg}",
+                            f"Our ground forces from {cp.name} are making progress toward {enemy_cp.name}.  {status_msg}",
+                            self.game.turn,
                         )
+                        self.game.informations.append(info)
                     else:
                         print(status_msg)
                         enemy_cp.base.affect_strength(delta)
                         cp.base.affect_strength(-delta)
-                        self.game.message(
+                        info = Information(
                             "Frontline Report",
                             f"Our ground forces from {cp.name} are losing ground against the enemy forces from "
                             f"{enemy_cp.name}. {status_msg}",
+                            self.game.turn,
                         )
+                        self.game.informations.append(info)
 
     def redeploy_units(self, cp: ControlPoint) -> None:
         """ "
@@ -391,15 +458,22 @@ class Event:
         source.base.commit_losses(moved_units)
 
         # Also transfer pending deliveries.
-        for unit_type, count in source.ground_unit_orders.units.items():
+        for unit_type, count in source.pending_unit_deliveries.units.items():
+            if not isinstance(unit_type, GroundUnitType):
+                continue
+            if count <= 0:
+                # Don't transfer *sales*...
+                continue
             move_count = int(count * move_factor)
-            source.ground_unit_orders.sell({unit_type: move_count})
-            destination.ground_unit_orders.order({unit_type: move_count})
+            source.pending_unit_deliveries.sell({unit_type: move_count})
+            destination.pending_unit_deliveries.order({unit_type: move_count})
             total_units_redeployed += move_count
 
         if total_units_redeployed > 0:
-            self.game.message(
-                "Units redeployed",
+            text = (
                 f"{total_units_redeployed}  units have been redeployed from "
-                f"{source.name} to {destination.name}",
+                f"{source.name} to {destination.name}"
             )
+            info = Information("Units redeployed", text, self.game.turn)
+            self.game.informations.append(info)
+            logging.info(text)

game/factions/faction.py

@@ -266,15 +266,8 @@ class Faction:
             self.remove_aircraft("A-4E-C")
         if not mod_settings.hercules:
             self.remove_aircraft("Hercules")
-        if not mod_settings.uh_60l:
-            self.remove_aircraft("UH-60L")
-            self.remove_aircraft("KC130J")
         if not mod_settings.f22_raptor:
             self.remove_aircraft("F-22A")
-        if not mod_settings.f104_starfighter:
-            self.remove_aircraft("VSN_F104G")
-            self.remove_aircraft("VSN_F104S")
-            self.remove_aircraft("VSN_F104S_AG")
         if not mod_settings.jas39_gripen:
             self.remove_aircraft("JAS39Gripen")
             self.remove_aircraft("JAS39Gripen_AG")

game/flightplan/__init__.py

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

game/flightplan/holdzonegeometry.py

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

game/flightplan/ipzonegeometry.py

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

game/flightplan/joinzonegeometry.py

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

game/game.py

@@ -1,49 +1,48 @@
-from __future__ import annotations
-
 import itertools
 import logging
 import math
-from collections import Iterator
+import random
+import sys
 from datetime import date, datetime, timedelta
 from enum import Enum
-from typing import Any, List, Type, Union, cast, TYPE_CHECKING
+from typing import Any, List, Type, Union, cast
 
-from dcs.countries import Switzerland, UnitedNationsPeacekeepers, USAFAggressors
-from dcs.country import Country
+from dcs.action import Coalition
 from dcs.mapping import Point
 from dcs.task import CAP, CAS, PinpointStrike
 from dcs.vehicles import AirDefence
 from faker import Faker
 
+from game.inventory import GlobalAircraftInventory
 from game.models.game_stats import GameStats
 from game.plugins import LuaPluginManager
 from gen import naming
 from gen.ato import AirTaskingOrder
 from gen.conflictgen import Conflict
+from gen.flights.ai_flight_planner import CoalitionMissionPlanner
 from gen.flights.closestairfields import ObjectiveDistanceCache
 from gen.flights.flight import FlightType
 from gen.ground_forces.ai_ground_planner import GroundPlanner
 from . import persistency
-from .campaignloader import CampaignAirWingConfig
-from .coalition import Coalition
 from .debriefing import Debriefing
 from .event.event import Event
 from .event.frontlineattack import FrontlineAttackEvent
 from .factions.faction import Faction
+from .income import Income
 from .infos.information import Information
 from .navmesh import NavMesh
+from .procurement import AircraftProcurementRequest, ProcurementAi
 from .profiling import logged_duration
-from .settings import Settings
+from .settings import Settings, AutoAtoBehavior
+from .squadrons import AirWing
 from .theater import ConflictTheater, ControlPoint
 from .theater.bullseye import Bullseye
 from .theater.transitnetwork import TransitNetwork, TransitNetworkBuilder
 from .threatzones import ThreatZones
+from .transfers import PendingTransfers
 from .unitmap import UnitMap
 from .weather import Conditions, TimeOfDay
 
-if TYPE_CHECKING:
-    from .squadrons import AirWing
-
 COMMISION_UNIT_VARIETY = 4
 COMMISION_LIMITS_SCALE = 1.5
 COMMISION_LIMITS_FACTORS = {
@@ -90,7 +89,6 @@ class Game:
         player_faction: Faction,
         enemy_faction: Faction,
         theater: ConflictTheater,
-        air_wing_config: CampaignAirWingConfig,
         start_date: datetime,
         settings: Settings,
         player_budget: float,
@@ -99,87 +97,134 @@ class Game:
         self.settings = settings
         self.events: List[Event] = []
         self.theater = theater
-        self.turn = 0
+        self.player_faction = player_faction
+        self.player_country = player_faction.country
+        self.enemy_faction = enemy_faction
+        self.enemy_country = enemy_faction.country
+        # pass_turn() will be called when initialization is complete which will
+        # increment this to turn 0 before it reaches the player.
+        self.turn = -1
         # NB: This is the *start* date. It is never updated.
         self.date = date(start_date.year, start_date.month, start_date.day)
         self.game_stats = GameStats()
         self.notes = ""
         self.ground_planners: dict[int, GroundPlanner] = {}
-        self.informations: list[Information] = []
-        self.message("Game Start", "-" * 40)
+        self.informations = []
+        self.informations.append(Information("Game Start", "-" * 40, 0))
         # Culling Zones are for areas around points of interest that contain things we may not wish to cull.
         self.__culling_zones: List[Point] = []
         self.__destroyed_units: list[dict[str, Union[float, str]]] = []
         self.savepath = ""
+        self.budget = player_budget
+        self.enemy_budget = enemy_budget
         self.current_unit_id = 0
         self.current_group_id = 0
         self.name_generator = naming.namegen
 
         self.conditions = self.generate_conditions()
 
-        self.sanitize_sides(player_faction, enemy_faction)
-        self.blue = Coalition(self, player_faction, player_budget, player=True)
-        self.red = Coalition(self, enemy_faction, enemy_budget, player=False)
-        self.blue.set_opponent(self.red)
-        self.red.set_opponent(self.blue)
+        self.blue_transit_network = TransitNetwork()
+        self.red_transit_network = TransitNetwork()
 
-        for control_point in self.theater.controlpoints:
-            control_point.finish_init(self)
+        self.blue_procurement_requests: List[AircraftProcurementRequest] = []
+        self.red_procurement_requests: List[AircraftProcurementRequest] = []
 
-        self.blue.configure_default_air_wing(air_wing_config)
-        self.red.configure_default_air_wing(air_wing_config)
+        self.blue_ato = AirTaskingOrder()
+        self.red_ato = AirTaskingOrder()
+
+        self.blue_bullseye = Bullseye(Point(0, 0))
+        self.red_bullseye = Bullseye(Point(0, 0))
+
+        self.aircraft_inventory = GlobalAircraftInventory(self.theater.controlpoints)
+
+        self.transfers = PendingTransfers(self)
+
+        self.sanitize_sides()
+
+        self.blue_faker = Faker(self.player_faction.locales)
+        self.red_faker = Faker(self.enemy_faction.locales)
+
+        self.blue_air_wing = AirWing(self, player=True)
+        self.red_air_wing = AirWing(self, player=False)
 
         self.on_load(game_still_initializing=True)
 
+    def __getstate__(self) -> dict[str, Any]:
+        state = self.__dict__.copy()
+        # Avoid persisting any volatile types that can be deterministically
+        # recomputed on load for the sake of save compatibility.
+        del state["blue_threat_zone"]
+        del state["red_threat_zone"]
+        del state["blue_navmesh"]
+        del state["red_navmesh"]
+        del state["blue_faker"]
+        del state["red_faker"]
+        return state
+
     def __setstate__(self, state: dict[str, Any]) -> None:
         self.__dict__.update(state)
         # Regenerate any state that was not persisted.
         self.on_load()
 
-    @property
-    def coalitions(self) -> Iterator[Coalition]:
-        yield self.blue
-        yield self.red
-
     def ato_for(self, player: bool) -> AirTaskingOrder:
-        return self.coalition_for(player).ato
+        if player:
+            return self.blue_ato
+        return self.red_ato
+
+    def procurement_requests_for(
+        self, player: bool
+    ) -> List[AircraftProcurementRequest]:
+        if player:
+            return self.blue_procurement_requests
+        return self.red_procurement_requests
 
     def transit_network_for(self, player: bool) -> TransitNetwork:
-        return self.coalition_for(player).transit_network
+        if player:
+            return self.blue_transit_network
+        return self.red_transit_network
 
     def generate_conditions(self) -> Conditions:
         return Conditions.generate(
             self.theater, self.current_day, self.current_turn_time_of_day, self.settings
         )
 
-    @staticmethod
-    def sanitize_sides(player_faction: Faction, enemy_faction: Faction) -> None:
+    def sanitize_sides(self) -> None:
         """
         Make sure the opposing factions are using different countries
         :return:
         """
-        if player_faction.country == enemy_faction.country:
-            if player_faction.country == "USA":
-                enemy_faction.country = "USAF Aggressors"
-            elif player_faction.country == "Russia":
-                enemy_faction.country = "USSR"
+        if self.player_country == self.enemy_country:
+            if self.player_country == "USA":
+                self.enemy_country = "USAF Aggressors"
+            elif self.player_country == "Russia":
+                self.enemy_country = "USSR"
             else:
-                enemy_faction.country = "Russia"
+                self.enemy_country = "Russia"
 
     def faction_for(self, player: bool) -> Faction:
-        return self.coalition_for(player).faction
+        if player:
+            return self.player_faction
+        return self.enemy_faction
 
     def faker_for(self, player: bool) -> Faker:
-        return self.coalition_for(player).faker
+        if player:
+            return self.blue_faker
+        return self.red_faker
 
     def air_wing_for(self, player: bool) -> AirWing:
-        return self.coalition_for(player).air_wing
+        if player:
+            return self.blue_air_wing
+        return self.red_air_wing
 
     def country_for(self, player: bool) -> str:
-        return self.coalition_for(player).country_name
+        if player:
+            return self.player_country
+        return self.enemy_country
 
     def bullseye_for(self, player: bool) -> Bullseye:
-        return self.coalition_for(player).bullseye
+        if player:
+            return self.blue_bullseye
+        return self.red_bullseye
 
     def _generate_player_event(
         self, event_class: Type[Event], player_cp: ControlPoint, enemy_cp: ControlPoint
@@ -190,22 +235,11 @@ class Game:
                 player_cp,
                 enemy_cp,
                 enemy_cp.position,
-                self.blue.faction.name,
-                self.red.faction.name,
+                self.player_faction.name,
+                self.enemy_faction.name,
             )
         )
 
-    @property
-    def neutral_country(self) -> Type[Country]:
-        """Return the best fitting country that can be used as neutral faction in the generated mission"""
-        countries_in_use = [self.red.country_name, self.blue.country_name]
-        if UnitedNationsPeacekeepers not in countries_in_use:
-            return UnitedNationsPeacekeepers
-        elif Switzerland.name not in countries_in_use:
-            return Switzerland
-        else:
-            return USAFAggressors
-
     def _generate_events(self) -> None:
         for front_line in self.theater.conflicts():
             self._generate_player_event(
@@ -214,13 +248,20 @@ class Game:
                 front_line.red_cp,
             )
 
-    def coalition_for(self, player: bool) -> Coalition:
-        if player:
-            return self.blue
-        return self.red
-
     def adjust_budget(self, amount: float, player: bool) -> None:
-        self.coalition_for(player).adjust_budget(amount)
+        if player:
+            self.budget += amount
+        else:
+            self.enemy_budget += amount
+
+    def process_player_income(self) -> None:
+        self.budget += Income(self, player=True).total
+
+    def process_enemy_income(self) -> None:
+        # TODO: Clean up save compat.
+        if not hasattr(self, "enemy_budget"):
+            self.enemy_budget = 0
+        self.enemy_budget += Income(self, player=False).total
 
     @staticmethod
     def initiate_event(event: Event) -> UnitMap:
@@ -248,9 +289,15 @@ class Game:
         naming.namegen = self.name_generator
         LuaPluginManager.load_settings(self.settings)
         ObjectiveDistanceCache.set_theater(self.theater)
-        self.compute_unculled_zones()
+        self.compute_conflicts_position()
         if not game_still_initializing:
             self.compute_threat_zones()
+        self.blue_faker = Faker(self.faction_for(player=True).locales)
+        self.red_faker = Faker(self.faction_for(player=False).locales)
+
+    def reset_ato(self) -> None:
+        self.blue_ato.clear()
+        self.red_ato.clear()
 
     def finish_turn(self, skipped: bool = False) -> None:
         """Finalizes the current turn and advances to the next turn.
@@ -280,29 +327,44 @@ class Game:
         Args:
             skipped: True if the turn was skipped.
         """
-        self.message("End of turn #" + str(self.turn), "-" * 40)
+        self.informations.append(
+            Information("End of turn #" + str(self.turn), "-" * 40, 0)
+        )
         self.turn += 1
 
-        # The coalition-specific turn finalization *must* happen before unit deliveries,
-        # since the coalition-specific finalization handles transit network updates and
-        # transfer processing. If in the other order, units may be delivered to captured
-        # bases, and freshly delivered units will spawn one leg through their journey.
-        self.blue.end_turn()
-        self.red.end_turn()
+        # Need to recompute before transfers and deliveries to account for captures.
+        # This happens in in initialize_turn as well, because cheating doesn't advance a
+        # turn but can capture bases so we need to recompute there as well.
+        self.compute_transit_networks()
 
+        # Must happen *before* unit deliveries are handled, or else new units will spawn
+        # one hop ahead. ControlPoint.process_turn handles unit deliveries.
+        self.transfers.perform_transfers()
+
+        # Needs to happen *before* planning transfers so we don't cancel them.
+        self.reset_ato()
         for control_point in self.theater.controlpoints:
             control_point.process_turn(self)
 
+        self.blue_air_wing.replenish()
+        self.red_air_wing.replenish()
+
         if not skipped:
             for cp in self.theater.player_points():
                 cp.base.affect_strength(+PLAYER_BASE_STRENGTH_RECOVERY)
+        elif self.turn > 1:
+            for cp in self.theater.player_points():
+                if not cp.is_carrier and not cp.is_lha:
+                    cp.base.affect_strength(-PLAYER_BASE_STRENGTH_RECOVERY)
 
         self.conditions = self.generate_conditions()
 
+        self.process_enemy_income()
+        self.process_player_income()
+
     def begin_turn_0(self) -> None:
         """Initialization for the first turn of the game."""
-        self.blue.preinit_turn_0()
-        self.red.preinit_turn_0()
+        self.turn = 0
         self.initialize_turn()
 
     def pass_turn(self, no_action: bool = False) -> None:
@@ -339,8 +401,8 @@ class Game:
 
     def set_bullseye(self) -> None:
         player_cp, enemy_cp = self.theater.closest_opposing_control_points()
-        self.blue.bullseye = Bullseye(enemy_cp.position)
-        self.red.bullseye = Bullseye(player_cp.position)
+        self.blue_bullseye = Bullseye(enemy_cp.position)
+        self.red_bullseye = Bullseye(player_cp.position)
 
     def initialize_turn(self, for_red: bool = True, for_blue: bool = True) -> None:
         """Performs turn initialization for the specified players.
@@ -388,30 +450,98 @@ class Game:
         if turn_state in (TurnState.LOSS, TurnState.WIN):
             return self.process_win_loss(turn_state)
 
-        # Plan flights & combat for next turn
-        with logged_duration("Threat zone computation"):
-            self.compute_threat_zones()
-
         # Plan Coalition specific turn
-        if for_blue:
-            self.blue.initialize_turn()
         if for_red:
-            self.red.initialize_turn()
+            self.initialize_turn_for(player=False)
+        if for_blue:
+            self.initialize_turn_for(player=True)
 
         # Plan GroundWar
-        self.ground_planners = {}
         for cp in self.theater.controlpoints:
             if cp.has_frontline:
                 gplanner = GroundPlanner(cp, self)
                 gplanner.plan_groundwar()
                 self.ground_planners[cp.id] = gplanner
 
-        # Update cull zones
-        with logged_duration("Computing culling positions"):
-            self.compute_unculled_zones()
+    def initialize_turn_for(self, player: bool) -> None:
+        """Processes coalition-specific turn initialization.
 
-    def message(self, title: str, text: str = "") -> None:
-        self.informations.append(Information(title, text, turn=self.turn))
+        For more information on turn initialization in general, see the documentation
+        for `Game.initialize_turn`.
+
+        Args:
+            player: True if the player coalition is being initialized. False for opfor
+            initialization.
+        """
+        self.ato_for(player).clear()
+        self.air_wing_for(player).reset()
+
+        self.aircraft_inventory.reset()
+        for cp in self.theater.controlpoints:
+            self.aircraft_inventory.set_from_control_point(cp)
+            # Refund all pending deliveries for opfor and if player
+            # has automate_aircraft_reinforcements
+            if (not player and not cp.captured) or (
+                player
+                and cp.captured
+                and self.settings.automate_aircraft_reinforcements
+            ):
+                cp.pending_unit_deliveries.refund_all(self)
+
+        # Plan flights & combat for next turn
+        with logged_duration("Computing conflict positions"):
+            self.compute_conflicts_position()
+        with logged_duration("Threat zone computation"):
+            self.compute_threat_zones()
+        with logged_duration("Transit network identification"):
+            self.compute_transit_networks()
+        self.ground_planners = {}
+
+        self.procurement_requests_for(player).clear()
+
+        with logged_duration("Procurement of airlift assets"):
+            self.transfers.order_airlift_assets()
+        with logged_duration("Transport planning"):
+            self.transfers.plan_transports()
+
+        if not player or (
+            player and self.settings.auto_ato_behavior is not AutoAtoBehavior.Disabled
+        ):
+            color = "Blue" if player else "Red"
+            with logged_duration(f"{color} mission planning"):
+                mission_planner = CoalitionMissionPlanner(self, player)
+                mission_planner.plan_missions()
+
+        self.plan_procurement_for(player)
+
+    def plan_procurement_for(self, for_player: bool) -> None:
+        # The first turn needs to buy a *lot* of aircraft to fill CAPs, so it
+        # gets much more of the budget that turn. Otherwise budget (after
+        # repairs) is split evenly between air and ground. For the default
+        # starting budget of 2000 this gives 600 to ground forces and 1400 to
+        # aircraft. After that the budget will be spend proportionally based on how much is already invested
+
+        if for_player:
+            self.budget = ProcurementAi(
+                self,
+                for_player=True,
+                faction=self.player_faction,
+                manage_runways=self.settings.automate_runway_repair,
+                manage_front_line=self.settings.automate_front_line_reinforcements,
+                manage_aircraft=self.settings.automate_aircraft_reinforcements,
+            ).spend_budget(self.budget)
+        else:
+            self.enemy_budget = ProcurementAi(
+                self,
+                for_player=False,
+                faction=self.enemy_faction,
+                manage_runways=True,
+                manage_front_line=True,
+                manage_aircraft=True,
+            ).spend_budget(self.enemy_budget)
+
+    def message(self, text: str) -> None:
+        self.informations.append(Information(text, turn=self.turn))
 
     @property
     def current_turn_time_of_day(self) -> TimeOfDay:
@@ -435,24 +565,37 @@ class Game:
         self.current_group_id += 1
         return self.current_group_id
 
+    def compute_transit_networks(self) -> None:
+        self.blue_transit_network = self.compute_transit_network_for(player=True)
+        self.red_transit_network = self.compute_transit_network_for(player=False)
+
     def compute_transit_network_for(self, player: bool) -> TransitNetwork:
         return TransitNetworkBuilder(self.theater, player).build()
 
     def compute_threat_zones(self) -> None:
-        self.blue.compute_threat_zones()
-        self.red.compute_threat_zones()
-        self.blue.compute_nav_meshes()
-        self.red.compute_nav_meshes()
+        self.blue_threat_zone = ThreatZones.for_faction(self, player=True)
+        self.red_threat_zone = ThreatZones.for_faction(self, player=False)
+        self.blue_navmesh = NavMesh.from_threat_zones(
+            self.red_threat_zone, self.theater
+        )
+        self.red_navmesh = NavMesh.from_threat_zones(
+            self.blue_threat_zone, self.theater
+        )
 
     def threat_zone_for(self, player: bool) -> ThreatZones:
-        return self.coalition_for(player).threat_zone
+        if player:
+            return self.blue_threat_zone
+        return self.red_threat_zone
 
     def navmesh_for(self, player: bool) -> NavMesh:
-        return self.coalition_for(player).nav_mesh
+        if player:
+            return self.blue_navmesh
+        return self.red_navmesh
 
-    def compute_unculled_zones(self) -> None:
+    def compute_conflicts_position(self) -> None:
         """
-        Compute the current conflict position(s) used for culling calculation
+        Compute the current conflict center position(s), mainly used for culling calculation
+        :return: List of points of interests
         """
         zones = []
 
@@ -490,7 +633,7 @@ class Game:
             if cpoint is not None:
                 zones.append(cpoint)
 
-        packages = itertools.chain(self.blue.ato.packages, self.red.ato.packages)
+        packages = itertools.chain(self.blue_ato.packages, self.red_ato.packages)
         for package in packages:
             if package.primary_task is FlightType.BARCAP:
                 # BARCAPs will be planned at most locations on smaller theaters,
@@ -536,6 +679,25 @@ class Game:
         """
         return self.__culling_zones
 
+    # 1 = red, 2 = blue
+    def get_player_coalition_id(self) -> int:
+        return 2
+
+    def get_enemy_coalition_id(self) -> int:
+        return 1
+
+    def get_player_coalition(self) -> Coalition:
+        return Coalition.Blue
+
+    def get_enemy_coalition(self) -> Coalition:
+        return Coalition.Red
+
+    def get_player_color(self) -> str:
+        return "blue"
+
+    def get_enemy_color(self) -> str:
+        return "red"
+
     def process_win_loss(self, turn_state: TurnState) -> None:
         if turn_state is TurnState.WIN:
             self.message(

game/htn.py

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

game/income.py

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

game/inventory.py

@@ -0,0 +1,131 @@
+"""Inventory management APIs."""
+from __future__ import annotations
+
+from collections import defaultdict
+from typing import Dict, Iterable, Iterator, Set, Tuple, TYPE_CHECKING, Type
+
+from dcs.unittype import FlyingType
+
+from game.dcs.aircrafttype import AircraftType
+from gen.flights.flight import Flight
+
+if TYPE_CHECKING:
+    from game.theater import ControlPoint
+
+
+class ControlPointAircraftInventory:
+    """Aircraft inventory for a single control point."""
+
+    def __init__(self, control_point: ControlPoint) -> None:
+        self.control_point = control_point
+        self.inventory: Dict[AircraftType, int] = defaultdict(int)
+
+    def add_aircraft(self, aircraft: AircraftType, 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: AircraftType, 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} from "
+                f"{self.control_point.name}. Only have {available}."
+            )
+        self.inventory[aircraft] -= count
+
+    def available(self, aircraft: AircraftType) -> int:
+        """Returns the number of available aircraft of the given type.
+
+        Args:
+            aircraft: The type of aircraft to query.
+        """
+        try:
+            return self.inventory[aircraft]
+        except KeyError:
+            return 0
+
+    @property
+    def types_available(self) -> Iterator[AircraftType]:
+        """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[AircraftType, 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[AircraftType]:
+        """Iterates over all aircraft types available to the player."""
+        seen: Set[AircraftType] = set()
+        for control_point, inventory in self.inventories.items():
+            if control_point.captured:
+                for aircraft in inventory.types_available:
+                    if not control_point.can_operate(aircraft):
+                        continue
+                    if aircraft not in seen:
+                        seen.add(aircraft)
+                        yield aircraft
+
+    def claim_for_flight(self, flight: Flight) -> None:
+        """Removes aircraft from the inventory for the given flight."""
+        inventory = self.for_control_point(flight.from_cp)
+        inventory.remove_aircraft(flight.unit_type, flight.count)
+
+    def return_from_flight(self, flight: Flight) -> None:
+        """Returns a flight's aircraft to the inventory."""
+        inventory = self.for_control_point(flight.from_cp)
+        inventory.add_aircraft(flight.unit_type, flight.count)

game/models/game_stats.py

@@ -56,12 +56,10 @@ class GameStats:
 
         for cp in game.theater.controlpoints:
             if cp.captured:
-                for squadron in cp.squadrons:
-                    turn_data.allied_units.aircraft_count += squadron.owned_aircraft
+                turn_data.allied_units.aircraft_count += sum(cp.base.aircraft.values())
                 turn_data.allied_units.vehicles_count += sum(cp.base.armor.values())
             else:
-                for squadron in cp.squadrons:
-                    turn_data.enemy_units.aircraft_count += squadron.owned_aircraft
+                turn_data.enemy_units.aircraft_count += sum(cp.base.aircraft.values())
                 turn_data.enemy_units.vehicles_count += sum(cp.base.armor.values())
 
         self.data_per_turn.append(turn_data)

game/operation/operation.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 import os
 from pathlib import Path
-from typing import List, Set, TYPE_CHECKING, cast
+from typing import Iterable, List, Set, TYPE_CHECKING, cast
 
 from dcs import Mission
 from dcs.action import DoScript, DoScriptFile
@@ -16,30 +16,25 @@ from dcs.triggers import TriggerStart
 
 from game.plugins import LuaPluginManager
 from game.theater.theatergroundobject import TheaterGroundObject
+from gen import Conflict, FlightType, VisualGenerator
 from gen.aircraft import AircraftConflictGenerator, FlightData
 from gen.airfields import AIRFIELD_DATA
-from gen.airsupport import AirSupport
-from gen.airsupportgen import AirSupportConflictGenerator
-from gen.armor import GroundConflictGenerator
+from gen.airsupportgen import AirSupport, AirSupportConflictGenerator
+from gen.armor import GroundConflictGenerator, JtacInfo
 from gen.beacons import load_beacons_for_terrain
 from gen.briefinggen import BriefingGenerator, MissionInfoGenerator
 from gen.cargoshipgen import CargoShipGenerator
-from gen.conflictgen import Conflict
 from gen.convoygen import ConvoyGenerator
 from gen.environmentgen import EnvironmentGenerator
-from gen.flights.flight import FlightType
 from gen.forcedoptionsgen import ForcedOptionsGenerator
 from gen.groundobjectsgen import GroundObjectsGenerator
 from gen.kneeboard import KneeboardGenerator
-from gen.lasercoderegistry import LaserCodeRegistry
 from gen.naming import namegen
 from gen.radios import RadioFrequency, RadioRegistry
-from gen.tacan import TacanRegistry, TacanUsage
+from gen.tacan import TacanRegistry
 from gen.triggergen import TRIGGER_RADIUS_MEDIUM, TriggersGenerator
-from gen.visualgen import VisualGenerator
 from .. import db
 from ..theater import Airfield, FrontLine
-from ..theater.bullseye import Bullseye
 from ..unitmap import UnitMap
 
 if TYPE_CHECKING:
@@ -55,7 +50,6 @@ class Operation:
     groundobjectgen: GroundObjectsGenerator
     radio_registry: RadioRegistry
     tacan_registry: TacanRegistry
-    laser_code_registry: LaserCodeRegistry
     game: Game
     trigger_radius = TRIGGER_RADIUS_MEDIUM
     is_quick = None
@@ -64,8 +58,8 @@ class Operation:
     enemy_awacs_enabled = True
     ca_slots = 1
     unit_map: UnitMap
+    jtacs: List[JtacInfo] = []
     plugin_scripts: List[str] = []
-    air_support = AirSupport()
 
     @classmethod
     def prepare(cls, game: Game) -> None:
@@ -87,10 +81,10 @@ class Operation:
         return Conflict(
             cls.game.theater,
             FrontLine(player_cp, enemy_cp),
-            cls.game.blue.faction.name,
-            cls.game.red.faction.name,
-            cls.current_mission.country(cls.game.blue.country_name),
-            cls.current_mission.country(cls.game.red.country_name),
+            cls.game.player_faction.name,
+            cls.game.enemy_faction.name,
+            cls.current_mission.country(cls.game.player_country),
+            cls.current_mission.country(cls.game.enemy_country),
             mid_point,
         )
 
@@ -101,17 +95,14 @@ class Operation:
     @classmethod
     def _setup_mission_coalitions(cls) -> None:
         cls.current_mission.coalition["blue"] = Coalition(
-            "blue", bullseye=cls.game.blue.bullseye.to_pydcs()
+            "blue", bullseye=cls.game.blue_bullseye.to_pydcs()
         )
         cls.current_mission.coalition["red"] = Coalition(
-            "red", bullseye=cls.game.red.bullseye.to_pydcs()
-        )
-        cls.current_mission.coalition["neutrals"] = Coalition(
-            "neutrals", bullseye=Bullseye(Point(0, 0)).to_pydcs()
+            "red", bullseye=cls.game.red_bullseye.to_pydcs()
         )
 
-        p_country = cls.game.blue.country_name
-        e_country = cls.game.red.country_name
+        p_country = cls.game.player_country
+        e_country = cls.game.enemy_country
         cls.current_mission.coalition["blue"].add_country(
             country_dict[db.country_id_from_name(p_country)]()
         )
@@ -119,16 +110,6 @@ class Operation:
             country_dict[db.country_id_from_name(e_country)]()
         )
 
-        belligerents = [
-            db.country_id_from_name(p_country),
-            db.country_id_from_name(e_country),
-        ]
-        for country in country_dict.keys():
-            if country not in belligerents:
-                cls.current_mission.coalition["neutrals"].add_country(
-                    country_dict[country]()
-                )
-
     @classmethod
     def inject_lua_trigger(cls, contents: str, comment: str) -> None:
         trigger = TriggerStart(comment=comment)
@@ -165,7 +146,8 @@ class Operation:
     def notify_info_generators(
         cls,
         groundobjectgen: GroundObjectsGenerator,
-        air_support: AirSupport,
+        airsupportgen: AirSupportConflictGenerator,
+        jtacs: List[JtacInfo],
         airgen: AircraftConflictGenerator,
     ) -> None:
         """Generates subscribed MissionInfoGenerator objects (currently kneeboards and briefings)"""
@@ -178,15 +160,15 @@ class Operation:
             for dynamic_runway in groundobjectgen.runways.values():
                 gen.add_dynamic_runway(dynamic_runway)
 
-            for tanker in air_support.tankers:
+            for tanker in airsupportgen.air_support.tankers:
                 if tanker.blue:
                     gen.add_tanker(tanker)
 
-            for aewc in air_support.awacs:
+            for aewc in airsupportgen.air_support.awacs:
                 if aewc.blue:
                     gen.add_awacs(aewc)
 
-            for jtac in air_support.jtacs:
+            for jtac in jtacs:
                 if jtac.blue:
                     gen.add_jtac(jtac)
 
@@ -211,10 +193,6 @@ class Operation:
         for frequency in unique_map_frequencies:
             cls.radio_registry.reserve(frequency)
 
-    @classmethod
-    def create_laser_code_registry(cls) -> None:
-        cls.laser_code_registry = LaserCodeRegistry()
-
     @classmethod
     def assign_channels_to_flights(
         cls, flights: List[FlightData], air_support: AirSupport
@@ -242,7 +220,7 @@ class Operation:
                 if beacon.channel is None:
                     logging.error(f"TACAN beacon has no channel: {beacon.callsign}")
                 else:
-                    cls.tacan_registry.mark_unavailable(beacon.tacan_channel)
+                    cls.tacan_registry.reserve(beacon.tacan_channel)
 
     @classmethod
     def _create_radio_registry(
@@ -290,7 +268,7 @@ class Operation:
                 and cls.game.settings.perf_destroyed_units
             ):
                 cls.current_mission.static_group(
-                    country=cls.current_mission.country(cls.game.blue.country_name),
+                    country=cls.current_mission.country(cls.game.player_country),
                     name="",
                     _type=utype,
                     hidden=True,
@@ -302,22 +280,18 @@ class Operation:
     @classmethod
     def generate(cls) -> UnitMap:
         """Build the final Mission to be exported"""
-        cls.air_support = AirSupport()
         cls.create_unit_map()
         cls.create_radio_registries()
-        cls.create_laser_code_registry()
         # Set mission time and weather conditions.
         EnvironmentGenerator(cls.current_mission, cls.game.conditions).generate()
         cls._generate_ground_units()
         cls._generate_transports()
         cls._generate_destroyed_units()
-        # Generate ground conflicts first so the JTACs get the first laser code (1688)
-        # rather than the first player flight with a TGP.
-        cls._generate_ground_conflicts()
         cls._generate_air_units()
         cls.assign_channels_to_flights(
             cls.airgen.flights, cls.airsupportgen.air_support
         )
+        cls._generate_ground_conflicts()
 
         # Triggers
         triggersgen = TriggersGenerator(cls.current_mission, cls.game)
@@ -337,7 +311,7 @@ class Operation:
         if cls.game.settings.perf_smoke_gen:
             visualgen.generate()
 
-        cls.generate_lua(cls.airgen, cls.air_support)
+        cls.generate_lua(cls.airgen, cls.airsupportgen, cls.jtacs)
 
         # Inject Plugins Lua Scripts and data
         cls.plugin_scripts.clear()
@@ -349,7 +323,9 @@ class Operation:
         cls.assign_channels_to_flights(
             cls.airgen.flights, cls.airsupportgen.air_support
         )
-        cls.notify_info_generators(cls.groundobjectgen, cls.air_support, cls.airgen)
+        cls.notify_info_generators(
+            cls.groundobjectgen, cls.airsupportgen, cls.jtacs, cls.airgen
+        )
         cls.reset_naming_ids()
         return cls.unit_map
 
@@ -365,7 +341,6 @@ class Operation:
             cls.game,
             cls.radio_registry,
             cls.tacan_registry,
-            cls.air_support,
         )
         cls.airsupportgen.generate()
 
@@ -376,40 +351,39 @@ class Operation:
             cls.game,
             cls.radio_registry,
             cls.tacan_registry,
-            cls.laser_code_registry,
             cls.unit_map,
             air_support=cls.airsupportgen.air_support,
-            helipads=cls.groundobjectgen.helipads,
         )
 
         cls.airgen.clear_parking_slots()
 
         cls.airgen.generate_flights(
-            cls.current_mission.country(cls.game.blue.country_name),
-            cls.game.blue.ato,
+            cls.current_mission.country(cls.game.player_country),
+            cls.game.blue_ato,
             cls.groundobjectgen.runways,
         )
         cls.airgen.generate_flights(
-            cls.current_mission.country(cls.game.red.country_name),
-            cls.game.red.ato,
+            cls.current_mission.country(cls.game.enemy_country),
+            cls.game.red_ato,
             cls.groundobjectgen.runways,
         )
         cls.airgen.spawn_unused_aircraft(
-            cls.current_mission.country(cls.game.blue.country_name),
-            cls.current_mission.country(cls.game.red.country_name),
+            cls.current_mission.country(cls.game.player_country),
+            cls.current_mission.country(cls.game.enemy_country),
         )
 
     @classmethod
     def _generate_ground_conflicts(cls) -> None:
         """For each frontline in the Operation, generate the ground conflicts and JTACs"""
+        cls.jtacs = []
         for front_line in cls.game.theater.conflicts():
             player_cp = front_line.blue_cp
             enemy_cp = front_line.red_cp
             conflict = Conflict.frontline_cas_conflict(
-                cls.game.blue.faction.name,
-                cls.game.red.faction.name,
-                cls.current_mission.country(cls.game.blue.country_name),
-                cls.current_mission.country(cls.game.red.country_name),
+                cls.game.player_faction.name,
+                cls.game.enemy_faction.name,
+                cls.current_mission.country(cls.game.player_country),
+                cls.current_mission.country(cls.game.enemy_country),
                 front_line,
                 cls.game.theater,
             )
@@ -423,13 +397,10 @@ class Operation:
                 player_gp,
                 enemy_gp,
                 player_cp.stances[enemy_cp.id],
-                enemy_cp.stances[player_cp.id],
                 cls.unit_map,
-                cls.radio_registry,
-                cls.air_support,
-                cls.laser_code_registry,
             )
             ground_conflict_gen.generate()
+            cls.jtacs.extend(ground_conflict_gen.jtacs)
 
     @classmethod
     def _generate_transports(cls) -> None:
@@ -443,7 +414,10 @@ class Operation:
 
     @classmethod
     def generate_lua(
-        cls, airgen: AircraftConflictGenerator, air_support: AirSupport
+        cls,
+        airgen: AircraftConflictGenerator,
+        airsupportgen: AirSupportConflictGenerator,
+        jtacs: List[JtacInfo],
     ) -> None:
         #  TODO: Refactor this
         luaData = {
@@ -456,7 +430,7 @@ class Operation:
             "BlueAA": {},
         }  # type: ignore
 
-        for i, tanker in enumerate(air_support.tankers):
+        for i, tanker in enumerate(airsupportgen.air_support.tankers):
             luaData["Tankers"][i] = {
                 "dcsGroupName": tanker.group_name,
                 "callsign": tanker.callsign,
@@ -465,21 +439,20 @@ class Operation:
                 "tacan": str(tanker.tacan.number) + tanker.tacan.band.name,
             }
 
-        for i, awacs in enumerate(air_support.awacs):
+        for i, awacs in enumerate(airsupportgen.air_support.awacs):
             luaData["AWACs"][i] = {
                 "dcsGroupName": awacs.group_name,
                 "callsign": awacs.callsign,
                 "radio": awacs.freq.mhz,
             }
 
-        for i, jtac in enumerate(air_support.jtacs):
+        for i, jtac in enumerate(jtacs):
             luaData["JTACs"][i] = {
                 "dcsGroupName": jtac.group_name,
                 "callsign": jtac.callsign,
                 "zone": jtac.region,
                 "dcsUnit": jtac.unit_name,
                 "laserCode": jtac.code,
-                "radio": jtac.freq.mhz,
             }
         flight_count = 0
         for flight in airgen.flights:
@@ -596,8 +569,7 @@ class Operation:
             zone = data["zone"]
             laserCode = data["laserCode"]
             dcsUnit = data["dcsUnit"]
-            radio = data["radio"]
-            lua += f"    {{dcsGroupName='{dcsGroupName}', callsign='{callsign}', zone={repr(zone)}, laserCode='{laserCode}', dcsUnit='{dcsUnit}', radio='{radio}' }}, \n"
+            lua += f"    {{dcsGroupName='{dcsGroupName}', callsign='{callsign}', zone={repr(zone)}, laserCode='{laserCode}', dcsUnit='{dcsUnit}' }}, \n"
         lua += "}"
 
         # Process the Target Points

game/orderedset.py

@@ -1,23 +0,0 @@
-from collections import Iterator, Iterable
-from typing import Generic, TypeVar, Optional
-
-ValueT = TypeVar("ValueT")
-
-
-class OrderedSet(Generic[ValueT]):
-    def __init__(self, initial_data: Optional[Iterable[ValueT]] = None) -> None:
-        if initial_data is None:
-            initial_data = []
-        self._data: dict[ValueT, None] = {v: None for v in initial_data}
-
-    def __iter__(self) -> Iterator[ValueT]:
-        yield from self._data
-
-    def __contains__(self, item: ValueT) -> bool:
-        return item in self._data
-
-    def add(self, item: ValueT) -> None:
-        self._data[item] = None
-
-    def clear(self) -> None:
-        self._data.clear()

game/point_with_heading.py

@@ -1,16 +1,15 @@
 from __future__ import annotations
 
 from dcs import Point
-from game.utils import Heading
 
 
 class PointWithHeading(Point):
     def __init__(self) -> None:
         super(PointWithHeading, self).__init__(0, 0)
-        self.heading: Heading = Heading.from_degrees(0)
+        self.heading = 0
 
     @staticmethod
-    def from_point(point: Point, heading: Heading) -> PointWithHeading:
+    def from_point(point: Point, heading: int) -> PointWithHeading:
         p = PointWithHeading()
         p.x = point.x
         p.y = point.y

game/procurement.py

@@ -7,11 +7,11 @@ from typing import Iterator, List, Optional, TYPE_CHECKING, Tuple
 
 from game import db
 from game.data.groundunitclass import GroundUnitClass
+from game.dcs.aircrafttype import AircraftType
 from game.dcs.groundunittype import GroundUnitType
 from game.factions.faction import Faction
-from game.squadrons import Squadron
 from game.theater import ControlPoint, MissionTarget
-from game.utils import meters
+from game.utils import Distance
 from gen.flights.ai_flight_planner_db import aircraft_for_task
 from gen.flights.closestairfields import ObjectiveDistanceCache
 from gen.flights.flight import FlightType
@@ -25,13 +25,15 @@ FRONTLINE_RESERVES_FACTOR = 1.3
 @dataclass(frozen=True)
 class AircraftProcurementRequest:
     near: MissionTarget
+    range: Distance
     task_capability: FlightType
     number: int
 
     def __str__(self) -> str:
         task = self.task_capability.value
+        distance = self.range.nautical_miles
         target = self.near.name
-        return f"{self.number} ship {task} near {target}"
+        return f"{self.number} ship {task} within {distance} nm of {target}"
 
 
 class ProcurementAi:
@@ -70,11 +72,9 @@ class ProcurementAi:
             return 1
 
         for cp in self.owned_points:
-            cp_ground_units = cp.allocated_ground_units(
-                self.game.coalition_for(self.is_player).transfers
-            )
+            cp_ground_units = cp.allocated_ground_units(self.game.transfers)
             armor_investment += cp_ground_units.total_value
-            cp_aircraft = cp.allocated_aircraft()
+            cp_aircraft = cp.allocated_aircraft(self.game)
             aircraft_investment += cp_aircraft.total_value
 
         total_investment = aircraft_investment + armor_investment
@@ -97,10 +97,37 @@ class ProcurementAi:
             budget -= armor_budget
             budget += self.reinforce_front_line(armor_budget)
 
+        # Don't sell overstock aircraft until after we've bought runways and
+        # front lines. Any budget we free up should be earmarked for aircraft.
+        if not self.is_player:
+            budget += self.sell_incomplete_squadrons()
         if self.manage_aircraft:
             budget = self.purchase_aircraft(budget)
         return budget
 
+    def sell_incomplete_squadrons(self) -> float:
+        # Selling incomplete squadrons gives us more money to spend on the next
+        # turn. This serves as a short term fix for
+        # https://github.com/dcs-liberation/dcs_liberation/issues/41.
+        #
+        # Only incomplete squadrons which are unlikely to get used will be sold
+        # rather than all unused aircraft because the unused aircraft are what
+        # make OCA strikes worthwhile.
+        #
+        # This option is only used by the AI since players cannot cancel sales
+        # (https://github.com/dcs-liberation/dcs_liberation/issues/365).
+        total = 0.0
+        for cp in self.game.theater.control_points_for(self.is_player):
+            inventory = self.game.aircraft_inventory.for_control_point(cp)
+            for aircraft, available in inventory.all_aircraft:
+                # We only ever plan even groups, so the odd aircraft is unlikely
+                # to get used.
+                if available % 2 == 0:
+                    continue
+                inventory.remove_aircraft(aircraft, 1)
+                total += aircraft.price
+        return total
+
     def repair_runways(self, budget: float) -> float:
         for control_point in self.owned_points:
             if budget < db.RUNWAY_REPAIR_COST:
@@ -153,7 +180,7 @@ class ProcurementAi:
                 break
 
             budget -= unit.price
-            cp.ground_unit_orders.order({unit: 1})
+            cp.pending_unit_deliveries.order({unit: 1})
 
         return budget
 
@@ -182,29 +209,67 @@ class ProcurementAi:
             return GroundUnitClass.Tank
         return worst_balanced
 
-    @staticmethod
-    def fulfill_aircraft_request(
-        squadrons: list[Squadron], quantity: int, budget: float
-    ) -> Tuple[float, bool]:
-        for squadron in squadrons:
-            price = squadron.aircraft.price * quantity
-            if price > budget:
+    def _affordable_aircraft_for_task(
+        self,
+        task: FlightType,
+        airbase: ControlPoint,
+        number: int,
+        max_price: float,
+    ) -> Optional[AircraftType]:
+        best_choice: Optional[AircraftType] = None
+        for unit in aircraft_for_task(task):
+            if unit not in self.faction.aircrafts:
+                continue
+            if unit.price * number > max_price:
+                continue
+            if not airbase.can_operate(unit):
                 continue
 
-            squadron.pending_deliveries += quantity
-            budget -= price
+            for squadron in self.air_wing.squadrons_for(unit):
+                if task in squadron.auto_assignable_mission_types:
+                    break
+            else:
+                continue
+
+            # Affordable, compatible, and we have a squadron capable of the task. To
+            # keep some variety, skip with a 50/50 chance. Might be a good idea to have
+            # the chance to skip based on the price compared to the rest of the choices.
+            best_choice = unit
+            if random.choice([True, False]):
+                break
+        return best_choice
+
+    def affordable_aircraft_for(
+        self, request: AircraftProcurementRequest, airbase: ControlPoint, budget: float
+    ) -> Optional[AircraftType]:
+        return self._affordable_aircraft_for_task(
+            request.task_capability, airbase, request.number, budget
+        )
+
+    def fulfill_aircraft_request(
+        self, request: AircraftProcurementRequest, budget: float
+    ) -> Tuple[float, bool]:
+        for airbase in self.best_airbases_for(request):
+            unit = self.affordable_aircraft_for(request, airbase, budget)
+            if unit is None:
+                # Can't afford any aircraft capable of performing the
+                # required mission that can operate from this airbase. We
+                # might be able to afford aircraft at other airbases though,
+                # in the case where the airbase we attempted to use is only
+                # able to operate expensive aircraft.
+                continue
+
+            budget -= unit.price * request.number
+            airbase.pending_unit_deliveries.order({unit: request.number})
             return budget, True
         return budget, False
 
     def purchase_aircraft(self, budget: float) -> float:
-        for request in self.game.coalition_for(self.is_player).procurement_requests:
-            squadrons = list(self.best_squadrons_for(request))
-            if not squadrons:
+        for request in self.game.procurement_requests_for(self.is_player):
+            if not list(self.best_airbases_for(request)):
                 # No airbases in range of this request. Skip it.
                 continue
-            budget, fulfilled = self.fulfill_aircraft_request(
-                squadrons, request.number, budget
-            )
+            budget, fulfilled = self.fulfill_aircraft_request(request, budget)
             if not fulfilled:
                 # The request was not fulfilled because we could not afford any suitable
                 # aircraft. Rather than continuing, which could proceed to buy tons of
@@ -221,21 +286,19 @@ class ProcurementAi:
         else:
             return self.game.theater.enemy_points()
 
-    def best_squadrons_for(
+    def best_airbases_for(
         self, request: AircraftProcurementRequest
-    ) -> Iterator[Squadron]:
+    ) -> Iterator[ControlPoint]:
+        distance_cache = ObjectiveDistanceCache.get_closest_airfields(request.near)
         threatened = []
-        for squadron in self.air_wing.best_squadrons_for(
-            request.near, request.task_capability, request.number, this_turn=False
-        ):
-            if not squadron.can_provide_pilots(request.number):
+        for cp in distance_cache.operational_airfields_within(request.range):
+            if not cp.is_friendly(self.is_player):
                 continue
-            if squadron.location.unclaimed_parking() < request.number:
+            if cp.unclaimed_parking(self.game) < request.number:
                 continue
-            if self.threat_zones.threatened(squadron.location.position):
-                threatened.append(squadron)
-                continue
-            yield squadron
+            if self.threat_zones.threatened(cp.position):
+                threatened.append(cp)
+            yield cp
         yield from threatened
 
     def ground_reinforcement_candidate(self) -> Optional[ControlPoint]:
@@ -253,9 +316,7 @@ class ProcurementAi:
                 continue
 
             purchase_target = cp.frontline_unit_count_limit * FRONTLINE_RESERVES_FACTOR
-            allocated = cp.allocated_ground_units(
-                self.game.coalition_for(self.is_player).transfers
-            )
+            allocated = cp.allocated_ground_units(self.game.transfers)
             if allocated.total >= purchase_target:
                 # Control point is already sufficiently defended.
                 continue
@@ -282,9 +343,7 @@ class ProcurementAi:
             if not cp.can_recruit_ground_units(self.game):
                 continue
 
-            allocated = cp.allocated_ground_units(
-                self.game.coalition_for(self.is_player).transfers
-            )
+            allocated = cp.allocated_ground_units(self.game.transfers)
             if allocated.total >= self.game.settings.reserves_procurement_target:
                 continue
 
@@ -297,9 +356,7 @@ class ProcurementAi:
     def cost_ratio_of_ground_unit(
         self, control_point: ControlPoint, unit_class: GroundUnitClass
     ) -> float:
-        allocations = control_point.allocated_ground_units(
-            self.game.coalition_for(self.is_player).transfers
-        )
+        allocations = control_point.allocated_ground_units(self.game.transfers)
         class_cost = 0
         total_cost = 0
         for unit_type, count in allocations.all.items():

game/purchaseadapter.py

@@ -1,186 +0,0 @@
-from abc import abstractmethod
-from typing import TypeVar, Generic, Any
-
-from game import Game
-from game.coalition import Coalition
-from game.dcs.aircrafttype import AircraftType
-from game.dcs.groundunittype import GroundUnitType
-from game.dcs.unittype import UnitType
-from game.squadrons import Squadron
-from game.theater import ControlPoint
-
-ItemType = TypeVar("ItemType")
-
-
-class TransactionError(RuntimeError):
-    def __init__(self, message: str) -> None:
-        super().__init__(message)
-
-
-class PurchaseAdapter(Generic[ItemType]):
-    def __init__(self, coalition: Coalition) -> None:
-        self.coalition = coalition
-
-    def buy(self, item: ItemType, quantity: int) -> None:
-        for _ in range(quantity):
-            if self.has_pending_sales(item):
-                self.do_cancel_sale(item)
-            elif self.can_buy(item):
-                self.do_purchase(item)
-            else:
-                raise TransactionError(f"Cannot buy more {item}")
-            self.coalition.adjust_budget(-self.price_of(item))
-
-    def sell(self, item: ItemType, quantity: int) -> None:
-        for _ in range(quantity):
-            if self.has_pending_orders(item):
-                self.do_cancel_purchase(item)
-            elif self.can_sell(item):
-                self.do_sale(item)
-            else:
-                raise TransactionError(f"Cannot sell more {item}")
-            self.coalition.adjust_budget(self.price_of(item))
-
-    def has_pending_orders(self, item: ItemType) -> bool:
-        return self.pending_delivery_quantity(item) > 0
-
-    def has_pending_sales(self, item: ItemType) -> bool:
-        return self.pending_delivery_quantity(item) < 0
-
-    @abstractmethod
-    def current_quantity_of(self, item: ItemType) -> int:
-        ...
-
-    @abstractmethod
-    def pending_delivery_quantity(self, item: ItemType) -> int:
-        ...
-
-    def expected_quantity_next_turn(self, item: ItemType) -> int:
-        return self.current_quantity_of(item) + self.pending_delivery_quantity(item)
-
-    def can_buy(self, item: ItemType) -> bool:
-        return self.coalition.budget >= self.price_of(item)
-
-    def can_sell_or_cancel(self, item: ItemType) -> bool:
-        return self.can_sell(item) or self.has_pending_orders(item)
-
-    @abstractmethod
-    def can_sell(self, item: ItemType) -> bool:
-        ...
-
-    @abstractmethod
-    def do_purchase(self, item: ItemType) -> None:
-        ...
-
-    @abstractmethod
-    def do_cancel_purchase(self, item: ItemType) -> None:
-        ...
-
-    @abstractmethod
-    def do_sale(self, item: ItemType) -> None:
-        ...
-
-    @abstractmethod
-    def do_cancel_sale(self, item: ItemType) -> None:
-        ...
-
-    @abstractmethod
-    def price_of(self, item: ItemType) -> int:
-        ...
-
-    @abstractmethod
-    def name_of(self, item: ItemType, multiline: bool = False) -> str:
-        ...
-
-    @abstractmethod
-    def unit_type_of(self, item: ItemType) -> UnitType[Any]:
-        ...
-
-
-class AircraftPurchaseAdapter(PurchaseAdapter[Squadron]):
-    def __init__(self, control_point: ControlPoint) -> None:
-        super().__init__(control_point.coalition)
-        self.control_point = control_point
-
-    def pending_delivery_quantity(self, item: Squadron) -> int:
-        return item.pending_deliveries
-
-    def current_quantity_of(self, item: Squadron) -> int:
-        return item.owned_aircraft
-
-    def can_buy(self, item: Squadron) -> bool:
-        return super().can_buy(item) and self.control_point.unclaimed_parking() > 0
-
-    def can_sell(self, item: Squadron) -> bool:
-        return item.untasked_aircraft > 0
-
-    def do_purchase(self, item: Squadron) -> None:
-        item.pending_deliveries += 1
-
-    def do_cancel_purchase(self, item: Squadron) -> None:
-        item.pending_deliveries -= 1
-
-    def do_sale(self, item: Squadron) -> None:
-        item.untasked_aircraft -= 1
-        item.pending_deliveries -= 1
-
-    def do_cancel_sale(self, item: Squadron) -> None:
-        item.untasked_aircraft += 1
-        item.pending_deliveries += 1
-
-    def price_of(self, item: Squadron) -> int:
-        return item.aircraft.price
-
-    def name_of(self, item: Squadron, multiline: bool = False) -> str:
-        if multiline:
-            separator = "<br />"
-        else:
-            separator = " "
-        return separator.join([item.aircraft.name, str(item)])
-
-    def unit_type_of(self, item: Squadron) -> AircraftType:
-        return item.aircraft
-
-
-class GroundUnitPurchaseAdapter(PurchaseAdapter[GroundUnitType]):
-    def __init__(
-        self, control_point: ControlPoint, coalition: Coalition, game: Game
-    ) -> None:
-        super().__init__(coalition)
-        self.control_point = control_point
-        self.game = game
-
-    def pending_delivery_quantity(self, item: GroundUnitType) -> int:
-        return self.control_point.ground_unit_orders.pending_orders(item)
-
-    def current_quantity_of(self, item: GroundUnitType) -> int:
-        return self.control_point.base.total_units_of_type(item)
-
-    def can_buy(self, item: GroundUnitType) -> bool:
-        return super().can_buy(item) and self.control_point.has_ground_unit_source(
-            self.game
-        )
-
-    def can_sell(self, item: GroundUnitType) -> bool:
-        return False
-
-    def do_purchase(self, item: GroundUnitType) -> None:
-        self.control_point.ground_unit_orders.order({item: 1})
-
-    def do_cancel_purchase(self, item: GroundUnitType) -> None:
-        self.control_point.ground_unit_orders.sell({item: 1})
-
-    def do_sale(self, item: GroundUnitType) -> None:
-        raise TransactionError("Sale of ground units not allowed")
-
-    def do_cancel_sale(self, item: GroundUnitType) -> None:
-        raise TransactionError("Sale of ground units not allowed")
-
-    def price_of(self, item: GroundUnitType) -> int:
-        return item.price
-
-    def name_of(self, item: GroundUnitType, multiline: bool = False) -> str:
-        return f"{item}"
-
-    def unit_type_of(self, item: GroundUnitType) -> GroundUnitType:
-        return item

game/radio/channels.py

@@ -4,8 +4,7 @@ from dataclasses import dataclass
 from typing import Optional, Any, TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from gen.aircraft import FlightData
-    from gen.airsupport import AirSupport
+    from gen import FlightData, AirSupport
 
 
 class RadioChannelAllocator:
@@ -73,9 +72,6 @@ class CommonRadioChannelAllocator(RadioChannelAllocator):
         for awacs in air_support.awacs:
             flight.assign_channel(radio_id, next(channel_alloc), awacs.freq)
 
-        for jtac in air_support.jtacs:
-            flight.assign_channel(radio_id, next(channel_alloc), jtac.freq)
-
         if flight.arrival != flight.departure and flight.arrival.atc is not None:
             flight.assign_channel(radio_id, next(channel_alloc), flight.arrival.atc)
 
@@ -144,35 +140,22 @@ class ViggenRadioChannelAllocator(RadioChannelAllocator):
         self, flight: FlightData, air_support: AirSupport
     ) -> None:
         # The Viggen's preset channels are handled differently from other
-        # aircraft. Since 2.7.9 the group channels will not be generated automatically
-        # anymore. So we have to set AWACS and JTAC manually. There are also seven
-        # special channels we can modify. We'll set the first channel of the main radio
-        # to the intra-flight channel, and the first three emergency channels to each
+        # aircraft. The aircraft automatically configures channels for every
+        # allied flight in the game (including AWACS) and for every airfield. As
+        # such, we don't need to allocate any of those. There are seven presets
+        # we can modify, however: three channels for the main radio intended for
+        # communication with wingmen, and four emergency channels for the backup
+        # radio. We'll set the first channel of the main radio to the
+        # intra-flight channel, and the first three emergency channels to each
         # of the flight plan's airfields. The fourth emergency channel is always
         # the guard channel.
         radio_id = 1
-
-        # Possible Group Channels (100-139)
-        channel_alloc = iter(range(1, 40))
-
-        # Intra-Flight channel on Special 1 and Group 100 (required by module)
-        flight.assign_channel(radio_id, 41, flight.intra_flight_channel)  # Special 1
-        flight.assign_channel(
-            radio_id, next(channel_alloc), flight.intra_flight_channel
-        )
-
-        for awacs in air_support.awacs:
-            flight.assign_channel(radio_id, next(channel_alloc), awacs.freq)
-
-        for jtac in air_support.jtacs:
-            flight.assign_channel(radio_id, next(channel_alloc), jtac.freq)
-
+        flight.assign_channel(radio_id, 1, flight.intra_flight_channel)
         if flight.departure.atc is not None:
-            flight.assign_channel(radio_id, 44, flight.departure.atc)  # FR24 E
+            flight.assign_channel(radio_id, 4, flight.departure.atc)
         if flight.arrival.atc is not None:
-            flight.assign_channel(radio_id, 45, flight.arrival.atc)  # FR24 F
-        if flight.divert is not None and flight.divert.atc is not None:
-            flight.assign_channel(radio_id, 46, flight.divert.atc)  # FR24 G
+            flight.assign_channel(radio_id, 5, flight.arrival.atc)
+        # TODO: Assign divert to 6 when we support divert airfields.
 
     @classmethod
     def name(cls) -> str:
@@ -258,27 +241,6 @@ class MirageChannelNamer(ChannelNamer):
         return "mirage"
 
 
-class ApacheChannelNamer(ChannelNamer):
-    """Channel namer for the AH-64D Apache"""
-
-    @staticmethod
-    def channel_name(radio_id: int, channel_id: int) -> str:
-        # From the manual: Radio identifier (“VHF” for ARC-186, “UHF” for ARC-164,
-        # “FM1” for first ARC-201D, “FM2” for second ARC-201D, or “HF” for ARC-220).
-        radio_name = [
-            "VHF",  # ARC-186
-            "UHF",  # ARC-164
-            "FM1",  # first ARC-201D
-            "FM2",  # second ARC-201D
-            "HF",  # ARC-220
-        ][radio_id - 1]
-        return f"{radio_name} Ch {channel_id}"
-
-    @classmethod
-    def name(cls) -> str:
-        return "apache"
-
-
 class TomcatChannelNamer(ChannelNamer):
     """Channel namer for the F-14."""
 
@@ -297,18 +259,10 @@ class ViggenChannelNamer(ChannelNamer):
 
     @staticmethod
     def channel_name(radio_id: int, channel_id: int) -> str:
-        special_channels = [
-            "FR 22 Special 1",
-            "FR 22 Special 2",
-            "FR 22 Special 3",
-            "FR 24 E",
-            "FR 24 F",
-            "FR 24 G",
-            "FR 24 H",
-        ]
-        if channel_id >= 41:  # Special channels are 41-47
-            return special_channels[channel_id - 41]
-        return f"FR 22 Group {99 + channel_id}"
+        if channel_id >= 4:
+            channel_letter = "EFGH"[channel_id - 4]
+            return f"FR 24 {channel_letter}"
+        return f"FR 22 Special {channel_id}"
 
     @classmethod
     def name(cls) -> str:

game/settings.py

@@ -0,0 +1,115 @@
+from dataclasses import dataclass, field
+from datetime import timedelta
+from enum import Enum, unique
+from typing import Dict, Optional, Any
+
+from dcs.forcedoptions import ForcedOptions
+
+
+@unique
+class AutoAtoBehavior(Enum):
+    Disabled = "Disabled"
+    Never = "Never assign player pilots"
+    Default = "No preference"
+    Prefer = "Prefer player pilots"
+
+
+@dataclass
+class Settings:
+
+    # Difficulty settings
+    player_skill: str = "Good"
+    enemy_skill: str = "Average"
+    ai_pilot_levelling: bool = True
+    enemy_vehicle_skill: str = "Average"
+    map_coalition_visibility: ForcedOptions.Views = ForcedOptions.Views.All
+    labels: str = "Full"
+    only_player_takeoff: bool = True  # Legacy parameter do not use
+    night_disabled: bool = False
+    external_views_allowed: bool = True
+    supercarrier: bool = False
+    generate_marks: bool = True
+    manpads: bool = True
+    version: Optional[str] = None
+    player_income_multiplier: float = 1.0
+    enemy_income_multiplier: float = 1.0
+
+    #: Feature flag for squadron limits.
+    enable_squadron_pilot_limits: bool = False
+
+    #: The maximum number of pilots a squadron can have at one time. Changing this after
+    #: the campaign has started will have no immediate effect; pilots already in the
+    #: squadron will not be removed if the limit is lowered and pilots will not be
+    #: immediately created if the limit is raised.
+    squadron_pilot_limit: int = 12
+
+    #: The number of pilots a squadron can replace per turn.
+    squadron_replenishment_rate: int = 4
+
+    default_start_type: str = "Cold"
+
+    # Mission specific
+    desired_player_mission_duration: timedelta = timedelta(minutes=60)
+
+    # Campaign management
+    automate_runway_repair: bool = False
+    automate_front_line_reinforcements: bool = False
+    automate_aircraft_reinforcements: bool = False
+    restrict_weapons_by_date: bool = False
+    disable_legacy_aewc: bool = True
+    disable_legacy_tanker: bool = True
+    generate_dark_kneeboard: bool = False
+    invulnerable_player_pilots: bool = True
+    auto_ato_behavior: AutoAtoBehavior = AutoAtoBehavior.Default
+    auto_ato_player_missions_asap: bool = True
+
+    # Performance oriented
+    perf_red_alert_state: bool = True
+    perf_smoke_gen: bool = True
+    perf_smoke_spacing = 1600
+    perf_artillery: bool = True
+    perf_moving_units: bool = True
+    perf_infantry: bool = True
+    perf_destroyed_units: bool = True
+    reserves_procurement_target: int = 10
+
+    # Performance culling
+    perf_culling: bool = False
+    perf_culling_distance: int = 100
+    perf_do_not_cull_carrier = True
+
+    # LUA Plugins system
+    plugins: Dict[str, bool] = field(default_factory=dict)
+
+    # Cheating
+    show_red_ato: bool = False
+    enable_frontline_cheats: bool = False
+    enable_base_capture_cheat: bool = False
+
+    never_delay_player_flights: bool = False
+
+    @staticmethod
+    def plugin_settings_key(identifier: str) -> str:
+        return f"plugins.{identifier}"
+
+    def initialize_plugin_option(self, identifier: str, default_value: bool) -> None:
+        try:
+            self.plugin_option(identifier)
+        except KeyError:
+            self.set_plugin_option(identifier, default_value)
+
+    def plugin_option(self, identifier: str) -> bool:
+        return self.plugins[self.plugin_settings_key(identifier)]
+
+    def set_plugin_option(self, identifier: str, enabled: bool) -> None:
+        self.plugins[self.plugin_settings_key(identifier)] = enabled
+
+    def __setstate__(self, state: dict[str, Any]) -> 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/settings/__init__.py

@@ -1,7 +0,0 @@
-from .booleanoption import BooleanOption
-from .boundedfloatoption import BoundedFloatOption
-from .boundedintoption import BoundedIntOption
-from .choicesoption import ChoicesOption
-from .minutesoption import MinutesOption
-from .optiondescription import OptionDescription
-from .settings import AutoAtoBehavior, Settings

game/settings/booleanoption.py

@@ -1,37 +0,0 @@
-from dataclasses import dataclass, field
-from typing import Any, Optional
-
-from .optiondescription import OptionDescription, SETTING_DESCRIPTION_KEY
-
-
-@dataclass(frozen=True)
-class BooleanOption(OptionDescription):
-    invert: bool
-
-
-def boolean_option(
-    text: str,
-    page: str,
-    section: str,
-    default: bool,
-    invert: bool = False,
-    detail: Optional[str] = None,
-    tooltip: Optional[str] = None,
-    causes_expensive_game_update: bool = False,
-    **kwargs: Any,
-) -> bool:
-    return field(
-        metadata={
-            SETTING_DESCRIPTION_KEY: BooleanOption(
-                page,
-                section,
-                text,
-                detail,
-                tooltip,
-                causes_expensive_game_update,
-                invert,
-            )
-        },
-        default=default,
-        **kwargs,
-    )

game/settings/boundedfloatoption.py

@@ -1,42 +0,0 @@
-from dataclasses import dataclass, field
-from typing import Any, Optional
-
-from .optiondescription import OptionDescription, SETTING_DESCRIPTION_KEY
-
-
-@dataclass(frozen=True)
-class BoundedFloatOption(OptionDescription):
-    min: float
-    max: float
-    divisor: int
-
-
-def bounded_float_option(
-    text: str,
-    page: str,
-    section: str,
-    default: float,
-    min: float,
-    max: float,
-    divisor: int,
-    detail: Optional[str] = None,
-    tooltip: Optional[str] = None,
-    **kwargs: Any,
-) -> float:
-    return field(
-        metadata={
-            SETTING_DESCRIPTION_KEY: BoundedFloatOption(
-                page,
-                section,
-                text,
-                detail,
-                tooltip,
-                causes_expensive_game_update=False,
-                min=min,
-                max=max,
-                divisor=divisor,
-            )
-        },
-        default=default,
-        **kwargs,
-    )

game/settings/boundedintoption.py

@@ -1,40 +0,0 @@
-from dataclasses import dataclass, field
-from typing import Any, Optional
-
-from .optiondescription import OptionDescription, SETTING_DESCRIPTION_KEY
-
-
-@dataclass(frozen=True)
-class BoundedIntOption(OptionDescription):
-    min: int
-    max: int
-
-
-def bounded_int_option(
-    text: str,
-    page: str,
-    section: str,
-    default: int,
-    min: int,
-    max: int,
-    detail: Optional[str] = None,
-    tooltip: Optional[str] = None,
-    causes_expensive_game_update: bool = False,
-    **kwargs: Any,
-) -> int:
-    return field(
-        metadata={
-            SETTING_DESCRIPTION_KEY: BoundedIntOption(
-                page,
-                section,
-                text,
-                detail,
-                tooltip,
-                causes_expensive_game_update,
-                min=min,
-                max=max,
-            )
-        },
-        default=default,
-        **kwargs,
-    )

game/settings/choicesoption.py

@@ -1,46 +0,0 @@
-from dataclasses import dataclass, field
-from typing import Any, Generic, Iterable, Mapping, Optional, TypeVar, Union
-
-from .optiondescription import OptionDescription, SETTING_DESCRIPTION_KEY
-
-ValueT = TypeVar("ValueT")
-
-
-@dataclass(frozen=True)
-class ChoicesOption(OptionDescription, Generic[ValueT]):
-    choices: dict[str, ValueT]
-
-    def text_for_value(self, value: ValueT) -> str:
-        for text, _value in self.choices.items():
-            if value == _value:
-                return text
-        raise ValueError(f"{self} does not contain {value}")
-
-
-def choices_option(
-    text: str,
-    page: str,
-    section: str,
-    default: ValueT,
-    choices: Union[Iterable[str], Mapping[str, ValueT]],
-    detail: Optional[str] = None,
-    tooltip: Optional[str] = None,
-    **kwargs: Any,
-) -> ValueT:
-    if not isinstance(choices, Mapping):
-        choices = {c: c for c in choices}
-    return field(
-        metadata={
-            SETTING_DESCRIPTION_KEY: ChoicesOption(
-                page,
-                section,
-                text,
-                detail,
-                tooltip,
-                causes_expensive_game_update=False,
-                choices=dict(choices),
-            )
-        },
-        default=default,
-        **kwargs,
-    )

game/settings/minutesoption.py

@@ -1,40 +0,0 @@
-from dataclasses import dataclass, field
-from datetime import timedelta
-from typing import Any, Optional
-
-from .optiondescription import OptionDescription, SETTING_DESCRIPTION_KEY
-
-
-@dataclass(frozen=True)
-class MinutesOption(OptionDescription):
-    min: int
-    max: int
-
-
-def minutes_option(
-    text: str,
-    page: str,
-    section: str,
-    default: timedelta,
-    min: int,
-    max: int,
-    detail: Optional[str] = None,
-    tooltip: Optional[str] = None,
-    **kwargs: Any,
-) -> timedelta:
-    return field(
-        metadata={
-            SETTING_DESCRIPTION_KEY: MinutesOption(
-                page,
-                section,
-                text,
-                detail,
-                tooltip,
-                causes_expensive_game_update=False,
-                min=min,
-                max=max,
-            )
-        },
-        default=default,
-        **kwargs,
-    )

game/settings/optiondescription.py

@@ -1,15 +0,0 @@
-from dataclasses import dataclass
-from typing import Optional
-
-
-SETTING_DESCRIPTION_KEY = "DCS_LIBERATION_SETTING_DESCRIPTION_KEY"
-
-
-@dataclass(frozen=True)
-class OptionDescription:
-    page: str
-    section: str
-    text: str
-    detail: Optional[str]
-    tooltip: Optional[str]
-    causes_expensive_game_update: bool

game/settings/settings.py

@@ -1,513 +0,0 @@
-from collections import Iterator
-from dataclasses import Field, dataclass, field, fields
-from datetime import timedelta
-from enum import Enum, unique
-from typing import Any, Dict, Optional
-
-from dcs.forcedoptions import ForcedOptions
-
-from .booleanoption import boolean_option
-from .boundedfloatoption import bounded_float_option
-from .boundedintoption import bounded_int_option
-from .choicesoption import choices_option
-from .minutesoption import minutes_option
-from .optiondescription import OptionDescription, SETTING_DESCRIPTION_KEY
-from .skilloption import skill_option
-
-
-@unique
-class AutoAtoBehavior(Enum):
-    Disabled = "Disabled"
-    Never = "Never assign player pilots"
-    Default = "No preference"
-    Prefer = "Prefer player pilots"
-
-
-class NightMissions(Enum):
-    DayAndNight = "nightmissions_nightandday"
-    OnlyDay = "nightmissions_onlyday"
-    OnlyNight = "nightmissions_onlynight"
-
-
-DIFFICULTY_PAGE = "Difficulty"
-
-AI_DIFFICULTY_SECTION = "AI Difficulty"
-MISSION_DIFFICULTY_SECTION = "Mission Difficulty"
-MISSION_RESTRICTIONS_SECTION = "Mission Restrictions"
-
-CAMPAIGN_MANAGEMENT_PAGE = "Campaign Management"
-
-GENERAL_SECTION = "General"
-PILOTS_AND_SQUADRONS_SECTION = "Pilots and Squadrons"
-HQ_AUTOMATION_SECTION = "HQ Automation"
-
-MISSION_GENERATOR_PAGE = "Mission Generator"
-
-GAMEPLAY_SECTION = "Gameplay"
-
-# TODO: Make sections a type and add headers.
-# This section had the header: "Disabling settings below may improve performance, but
-# will impact the overall quality of the experience."
-PERFORMANCE_SECTION = "Performance"
-
-
-@dataclass
-class Settings:
-    version: Optional[str] = None
-
-    # Difficulty settings
-    # AI Difficulty
-    player_skill: str = skill_option(
-        "Player coalition skill",
-        page=DIFFICULTY_PAGE,
-        section=AI_DIFFICULTY_SECTION,
-        default="Good",
-    )
-    enemy_skill: str = skill_option(
-        "Enemy coalition skill",
-        page=DIFFICULTY_PAGE,
-        section=AI_DIFFICULTY_SECTION,
-        default="Average",
-    )
-    enemy_vehicle_skill: str = skill_option(
-        "Enemy AA and vehicles skill",
-        page=DIFFICULTY_PAGE,
-        section=AI_DIFFICULTY_SECTION,
-        default="Average",
-    )
-    player_income_multiplier: float = bounded_float_option(
-        "Player income multiplier",
-        page=DIFFICULTY_PAGE,
-        section=AI_DIFFICULTY_SECTION,
-        min=0,
-        max=5,
-        divisor=10,
-        default=1.0,
-    )
-    enemy_income_multiplier: float = bounded_float_option(
-        "Enemy income multiplier",
-        page=DIFFICULTY_PAGE,
-        section=AI_DIFFICULTY_SECTION,
-        min=0,
-        max=5,
-        divisor=10,
-        default=1.0,
-    )
-    invulnerable_player_pilots: bool = boolean_option(
-        "Player pilots cannot be killed",
-        page=DIFFICULTY_PAGE,
-        section=AI_DIFFICULTY_SECTION,
-        detail=(
-            "Aircraft are vulnerable, but the player's pilot will be returned to the "
-            "squadron at the end of the mission"
-        ),
-        default=True,
-    )
-    # Mission Difficulty
-    manpads: bool = boolean_option(
-        "Manpads on frontlines",
-        page=DIFFICULTY_PAGE,
-        section=MISSION_DIFFICULTY_SECTION,
-        default=True,
-    )
-    night_day_missions: NightMissions = choices_option(
-        "Night/day mission options",
-        page=DIFFICULTY_PAGE,
-        section=MISSION_DIFFICULTY_SECTION,
-        choices={
-            "Generate night and day missions": NightMissions.DayAndNight,
-            "Only generate day missions": NightMissions.OnlyDay,
-            "Only generate night missions": NightMissions.OnlyNight,
-        },
-        default=NightMissions.DayAndNight,
-    )
-    # Mission Restrictions
-    labels: str = choices_option(
-        "In game labels",
-        page=DIFFICULTY_PAGE,
-        section=MISSION_RESTRICTIONS_SECTION,
-        choices=["Full", "Abbreviated", "Dot Only", "Neutral Dot", "Off"],
-        default="Full",
-    )
-    map_coalition_visibility: ForcedOptions.Views = choices_option(
-        "Map visibility options",
-        page=DIFFICULTY_PAGE,
-        section=MISSION_RESTRICTIONS_SECTION,
-        choices={
-            "All": ForcedOptions.Views.All,
-            "Fog of war": ForcedOptions.Views.Allies,
-            "Allies only": ForcedOptions.Views.OnlyAllies,
-            "Own aircraft only": ForcedOptions.Views.MyAircraft,
-            "Map only": ForcedOptions.Views.OnlyMap,
-        },
-        default=ForcedOptions.Views.All,
-    )
-    external_views_allowed: bool = boolean_option(
-        "Allow external views",
-        DIFFICULTY_PAGE,
-        MISSION_RESTRICTIONS_SECTION,
-        default=True,
-    )
-
-    easy_communication: Optional[bool] = choices_option(
-        "Easy Communication",
-        page=DIFFICULTY_PAGE,
-        section=MISSION_RESTRICTIONS_SECTION,
-        choices={"Player preference": None, "Enforced on": True, "Enforced off": False},
-        default=None,
-    )
-
-    battle_damage_assessment: Optional[bool] = choices_option(
-        "Battle damage assessment",
-        page=DIFFICULTY_PAGE,
-        section=MISSION_RESTRICTIONS_SECTION,
-        choices={"Player preference": None, "Enforced on": True, "Enforced off": False},
-        default=None,
-    )
-
-    # Campaign management
-    # General
-    restrict_weapons_by_date: bool = boolean_option(
-        "Restrict weapons by date (WIP)",
-        page=CAMPAIGN_MANAGEMENT_PAGE,
-        section=GENERAL_SECTION,
-        default=False,
-        detail=(
-            "Restricts weapon availability based on the campaign date. Data is "
-            "extremely incomplete so does not affect all weapons."
-        ),
-    )
-    disable_legacy_aewc: bool = boolean_option(
-        "Spawn invulnerable, always-available AEW&C aircraft (deprecated)",
-        page=CAMPAIGN_MANAGEMENT_PAGE,
-        section=GENERAL_SECTION,
-        default=True,
-        invert=True,
-        detail=(
-            "If checked, an invulnerable friendly AEW&C aircraft that begins the "
-            "mission on station will be be spawned. This behavior will be removed in a "
-            "future release."
-        ),
-    )
-    disable_legacy_tanker: bool = boolean_option(
-        "Spawn invulnerable, always-available tanker aircraft (deprecated)",
-        page=CAMPAIGN_MANAGEMENT_PAGE,
-        section=GENERAL_SECTION,
-        default=True,
-        invert=True,
-        detail=(
-            "If checked, an invulnerable friendly tanker aircraft that begins the "
-            "mission on station will be be spawned. This behavior will be removed in a "
-            "future release."
-        ),
-    )
-    # Pilots and Squadrons
-    ai_pilot_levelling: bool = boolean_option(
-        "Allow AI pilot leveling",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        PILOTS_AND_SQUADRONS_SECTION,
-        default=True,
-        detail=(
-            "Set whether or not AI pilots will level up after completing a number of"
-            " sorties. Since pilot level affects the AI skill, you may wish to disable"
-            " this, lest you face an Ace!"
-        ),
-    )
-    #: Feature flag for squadron limits.
-    enable_squadron_pilot_limits: bool = boolean_option(
-        "Enable per-squadron pilot limits (WIP)",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        PILOTS_AND_SQUADRONS_SECTION,
-        default=False,
-        detail=(
-            "If set, squadrons will be limited to a maximum number of pilots and dead "
-            "pilots will replenish at a fixed rate, each defined with the settings"
-            "below. Auto-purchase may buy aircraft for which there are no pilots"
-            "available, so this feature is still a work-in-progress."
-        ),
-    )
-    #: The maximum number of pilots a squadron can have at one time. Changing this after
-    #: the campaign has started will have no immediate effect; pilots already in the
-    #: squadron will not be removed if the limit is lowered and pilots will not be
-    #: immediately created if the limit is raised.
-    squadron_pilot_limit: int = bounded_int_option(
-        "Maximum number of pilots per squadron",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        PILOTS_AND_SQUADRONS_SECTION,
-        default=12,
-        min=12,
-        max=72,
-        detail=(
-            "Sets the maximum number of pilots a squadron may have active. "
-            "Changing this value will not have an immediate effect, but will alter "
-            "replenishment for future turns."
-        ),
-    )
-    #: The number of pilots a squadron can replace per turn.
-    squadron_replenishment_rate: int = bounded_int_option(
-        "Squadron pilot replenishment rate",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        PILOTS_AND_SQUADRONS_SECTION,
-        default=4,
-        min=1,
-        max=20,
-        detail=(
-            "Sets the maximum number of pilots that will be recruited to each squadron "
-            "at the end of each turn. Squadrons will not recruit new pilots beyond the "
-            "pilot limit, but each squadron with room for more pilots will recruit "
-            "this many pilots each turn up to the limit."
-        ),
-    )
-
-    # HQ Automation
-    automate_runway_repair: bool = boolean_option(
-        "Automate runway repairs",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        HQ_AUTOMATION_SECTION,
-        default=False,
-    )
-    automate_front_line_reinforcements: bool = boolean_option(
-        "Automate front-line purchases",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        HQ_AUTOMATION_SECTION,
-        default=False,
-    )
-    automate_aircraft_reinforcements: bool = boolean_option(
-        "Automate aircraft purchases",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        HQ_AUTOMATION_SECTION,
-        default=False,
-    )
-    auto_ato_behavior: AutoAtoBehavior = choices_option(
-        "Automatic package planning behavior",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        HQ_AUTOMATION_SECTION,
-        default=AutoAtoBehavior.Default,
-        choices={v.value: v for v in AutoAtoBehavior},
-        detail=(
-            "Aircraft auto-purchase is directed by the auto-planner, so disabling "
-            "auto-planning disables auto-purchase."
-        ),
-    )
-    auto_ato_player_missions_asap: bool = boolean_option(
-        "Automatically generated packages with players are scheduled ASAP",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        HQ_AUTOMATION_SECTION,
-        default=True,
-    )
-    automate_front_line_stance: bool = boolean_option(
-        "Automatically manage front line stances",
-        CAMPAIGN_MANAGEMENT_PAGE,
-        HQ_AUTOMATION_SECTION,
-        default=True,
-    )
-    reserves_procurement_target: int = 10
-
-    # Mission Generator
-    # Gameplay
-    supercarrier: bool = boolean_option(
-        "Use supercarrier module",
-        MISSION_GENERATOR_PAGE,
-        GAMEPLAY_SECTION,
-        default=False,
-    )
-    generate_marks: bool = boolean_option(
-        "Put objective markers on the map",
-        MISSION_GENERATOR_PAGE,
-        GAMEPLAY_SECTION,
-        default=True,
-    )
-    generate_dark_kneeboard: bool = boolean_option(
-        "Generate dark kneeboard",
-        MISSION_GENERATOR_PAGE,
-        GAMEPLAY_SECTION,
-        default=False,
-        detail=(
-            "Dark kneeboard for night missions. This will likely make the kneeboard on "
-            "the pilot leg unreadable."
-        ),
-    )
-    never_delay_player_flights: bool = boolean_option(
-        "Player flights ignore TOT and spawn immediately",
-        MISSION_GENERATOR_PAGE,
-        GAMEPLAY_SECTION,
-        default=False,
-        detail=(
-            "Does not adjust package waypoint times. Should not be used if players "
-            "have runway or in-air starts."
-        ),
-        tooltip=(
-            "Always spawns player aircraft immediately, even if their start time is "
-            "more than 10 minutes after the start of the mission. <strong>This does "
-            "not alter the timing of your mission. Your TOT will not change. This "
-            "option only allows the player to wait on the ground.</strong>"
-        ),
-    )
-    default_start_type: str = choices_option(
-        "Default start type for AI aircraft",
-        page=MISSION_GENERATOR_PAGE,
-        section=GAMEPLAY_SECTION,
-        choices=["Cold", "Warm", "Runway", "In Flight"],
-        default="Cold",
-        detail=(
-            "Warning: Options other than Cold will significantly reduce the number of "
-            "targets available for OCA/Aircraft missions, and OCA/Aircraft flights "
-            "will not be included in automatically planned OCA packages."
-        ),
-    )
-    # Mission specific
-    desired_player_mission_duration: timedelta = minutes_option(
-        "Desired mission duration",
-        page=MISSION_GENERATOR_PAGE,
-        section=GAMEPLAY_SECTION,
-        default=timedelta(minutes=60),
-        min=30,
-        max=150,
-    )
-
-    # Performance
-    perf_smoke_gen: bool = boolean_option(
-        "Smoke visual effect on the front line",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=True,
-    )
-    perf_smoke_spacing: int = bounded_int_option(
-        "Smoke generator spacing (higher means less smoke)",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=1600,
-        min=800,
-        max=24000,
-    )
-    perf_red_alert_state: bool = boolean_option(
-        "SAM starts in red alert mode",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=True,
-    )
-    perf_artillery: bool = boolean_option(
-        "Artillery strikes",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=True,
-    )
-    perf_moving_units: bool = boolean_option(
-        "Moving ground units",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=True,
-    )
-    convoys_travel_full_distance: bool = boolean_option(
-        "Convoys drive the full distance between control points",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=True,
-    )
-    perf_infantry: bool = boolean_option(
-        "Generate infantry squads alongside vehicles",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=True,
-    )
-    perf_destroyed_units: bool = boolean_option(
-        "Generate carcasses for units destroyed in previous turns",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=True,
-    )
-    # Performance culling
-    perf_culling: bool = boolean_option(
-        "Culling of distant units enabled",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=False,
-    )
-    perf_culling_distance: int = bounded_int_option(
-        "Culling distance (km)",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=100,
-        min=10,
-        max=10000,
-        causes_expensive_game_update=True,
-    )
-    perf_do_not_cull_carrier: bool = boolean_option(
-        "Do not cull carrier's surroundings",
-        page=MISSION_GENERATOR_PAGE,
-        section=PERFORMANCE_SECTION,
-        default=True,
-        causes_expensive_game_update=True,
-    )
-
-    # Cheating. Not using auto settings because the same page also has buttons which do
-    # not alter settings.
-    show_red_ato: bool = False
-    enable_frontline_cheats: bool = False
-    enable_base_capture_cheat: bool = False
-
-    # LUA Plugins system
-    plugins: Dict[str, bool] = field(default_factory=dict)
-
-    only_player_takeoff: bool = True  # Legacy parameter do not use
-
-    @staticmethod
-    def plugin_settings_key(identifier: str) -> str:
-        return f"plugins.{identifier}"
-
-    def initialize_plugin_option(self, identifier: str, default_value: bool) -> None:
-        try:
-            self.plugin_option(identifier)
-        except KeyError:
-            self.set_plugin_option(identifier, default_value)
-
-    def plugin_option(self, identifier: str) -> bool:
-        return self.plugins[self.plugin_settings_key(identifier)]
-
-    def set_plugin_option(self, identifier: str, enabled: bool) -> None:
-        self.plugins[self.plugin_settings_key(identifier)] = enabled
-
-    def __setstate__(self, state: dict[str, Any]) -> 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)
-
-    @classmethod
-    def _field_description(cls, settings_field: Field[Any]) -> OptionDescription:
-        return settings_field.metadata[SETTING_DESCRIPTION_KEY]
-
-    @classmethod
-    def pages(cls) -> Iterator[str]:
-        seen: set[str] = set()
-        for settings_field in cls._user_fields():
-            description = cls._field_description(settings_field)
-            if description.page not in seen:
-                yield description.page
-                seen.add(description.page)
-
-    @classmethod
-    def sections(cls, page: str) -> Iterator[str]:
-        seen: set[str] = set()
-        for settings_field in cls._user_fields():
-            description = cls._field_description(settings_field)
-            if description.page == page and description.section not in seen:
-                yield description.section
-                seen.add(description.section)
-
-    @classmethod
-    def fields(cls, page: str, section: str) -> Iterator[tuple[str, OptionDescription]]:
-        for settings_field in cls._user_fields():
-            description = cls._field_description(settings_field)
-            if description.page == page and description.section == section:
-                yield settings_field.name, description
-
-    @classmethod
-    def _user_fields(cls) -> Iterator[Field[Any]]:
-        for settings_field in fields(cls):
-            if SETTING_DESCRIPTION_KEY in settings_field.metadata:
-                yield settings_field

game/settings/skilloption.py

@@ -1,24 +0,0 @@
-from typing import Any, Optional
-
-from .choicesoption import choices_option
-
-
-def skill_option(
-    text: str,
-    page: str,
-    section: str,
-    default: str,
-    detail: Optional[str] = None,
-    tooltip: Optional[str] = None,
-    **kwargs: Any,
-) -> str:
-    return choices_option(
-        text,
-        page,
-        section,
-        default,
-        ["Average", "Good", "High", "Excellent"],
-        detail=detail,
-        tooltip=tooltip,
-        **kwargs,
-    )

game/squadrons.py

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

game/squadrons/__init__.py

@@ -1,3 +0,0 @@
-from .airwing import AirWing
-from .pilot import Pilot
-from .squadron import Squadron

game/squadrons/airwing.py

@@ -1,120 +0,0 @@
-from __future__ import annotations
-
-import itertools
-from collections import defaultdict
-from typing import Sequence, Iterator, TYPE_CHECKING, Optional
-
-from game.dcs.aircrafttype import AircraftType
-from gen.flights.ai_flight_planner_db import aircraft_for_task
-from gen.flights.closestairfields import ObjectiveDistanceCache
-from .squadrondef import SquadronDef
-from .squadrondefloader import SquadronDefLoader
-from ..campaignloader.squadrondefgenerator import SquadronDefGenerator
-from ..factions.faction import Faction
-from ..theater import ControlPoint, MissionTarget
-
-if TYPE_CHECKING:
-    from game.game import Game
-    from gen.flights.flight import FlightType
-    from .squadron import Squadron
-
-
-class AirWing:
-    def __init__(self, player: bool, game: Game, faction: Faction) -> None:
-        self.player = player
-        self.squadrons: dict[AircraftType, list[Squadron]] = defaultdict(list)
-        self.squadron_defs = SquadronDefLoader(game, faction).load()
-        self.squadron_def_generator = SquadronDefGenerator(faction)
-
-    def unclaim_squadron_def(self, squadron: Squadron) -> None:
-        if squadron.aircraft in self.squadron_defs:
-            for squadron_def in self.squadron_defs[squadron.aircraft]:
-                if squadron_def.claimed and squadron_def.name == squadron.name:
-                    squadron_def.claimed = False
-
-    def add_squadron(self, squadron: Squadron) -> None:
-        self.squadrons[squadron.aircraft].append(squadron)
-
-    def squadrons_for(self, aircraft: AircraftType) -> Sequence[Squadron]:
-        return self.squadrons[aircraft]
-
-    def can_auto_plan(self, task: FlightType) -> bool:
-        try:
-            next(self.auto_assignable_for_task(task))
-            return True
-        except StopIteration:
-            return False
-
-    def best_squadrons_for(
-        self, location: MissionTarget, task: FlightType, size: int, this_turn: bool
-    ) -> list[Squadron]:
-        airfield_cache = ObjectiveDistanceCache.get_closest_airfields(location)
-        best_aircraft = aircraft_for_task(task)
-        ordered: list[Squadron] = []
-        for control_point in airfield_cache.operational_airfields:
-            if control_point.captured != self.player:
-                continue
-            capable_at_base = []
-            for squadron in control_point.squadrons:
-                if squadron.can_auto_assign_mission(location, task, size, this_turn):
-                    capable_at_base.append(squadron)
-
-            ordered.extend(
-                sorted(
-                    capable_at_base,
-                    key=lambda s: best_aircraft.index(s.aircraft),
-                )
-            )
-        return ordered
-
-    def best_squadron_for(
-        self, location: MissionTarget, task: FlightType, size: int, this_turn: bool
-    ) -> Optional[Squadron]:
-        for squadron in self.best_squadrons_for(location, task, size, this_turn):
-            return squadron
-        return None
-
-    @property
-    def available_aircraft_types(self) -> Iterator[AircraftType]:
-        for aircraft, squadrons in self.squadrons.items():
-            for squadron in squadrons:
-                if squadron.untasked_aircraft:
-                    yield aircraft
-                    break
-
-    def auto_assignable_for_task(self, task: FlightType) -> Iterator[Squadron]:
-        for squadron in self.iter_squadrons():
-            if squadron.can_auto_assign(task):
-                yield squadron
-
-    def auto_assignable_for_task_at(
-        self, task: FlightType, base: ControlPoint
-    ) -> Iterator[Squadron]:
-        for squadron in self.iter_squadrons():
-            if squadron.can_auto_assign(task) and squadron.location == base:
-                yield squadron
-
-    def squadron_for(self, aircraft: AircraftType) -> Squadron:
-        return self.squadrons_for(aircraft)[0]
-
-    def iter_squadrons(self) -> Iterator[Squadron]:
-        return itertools.chain.from_iterable(self.squadrons.values())
-
-    def squadron_at_index(self, index: int) -> Squadron:
-        return list(self.iter_squadrons())[index]
-
-    def populate_for_turn_0(self) -> None:
-        for squadron in self.iter_squadrons():
-            squadron.populate_for_turn_0()
-
-    def end_turn(self) -> None:
-        for squadron in self.iter_squadrons():
-            squadron.end_turn()
-
-    def reset(self) -> None:
-        for squadron in self.iter_squadrons():
-            squadron.return_all_pilots_and_aircraft()
-
-    @property
-    def size(self) -> int:
-        return sum(len(s) for s in self.squadrons.values())

game/squadrons/operatingbases.py

@@ -1,33 +0,0 @@
-from __future__ import annotations
-
-import dataclasses
-from dataclasses import dataclass
-
-from game.dcs.aircrafttype import AircraftType
-
-
-@dataclass(frozen=True)
-class OperatingBases:
-    shore: bool
-    carrier: bool
-    lha: bool
-
-    @classmethod
-    def default_for_aircraft(cls, aircraft: AircraftType) -> OperatingBases:
-        if aircraft.dcs_unit_type.helicopter:
-            # Helicopters operate from anywhere by default.
-            return OperatingBases(shore=True, carrier=True, lha=True)
-        if aircraft.lha_capable:
-            # Marine aircraft operate from LHAs and the shore by default.
-            return OperatingBases(shore=True, carrier=False, lha=True)
-        if aircraft.carrier_capable:
-            # Carrier aircraft operate from carriers by default.
-            return OperatingBases(shore=False, carrier=True, lha=False)
-        # And the rest are only capable of shore operation.
-        return OperatingBases(shore=True, carrier=False, lha=False)
-
-    @classmethod
-    def from_yaml(cls, aircraft: AircraftType, data: dict[str, bool]) -> OperatingBases:
-        return dataclasses.replace(
-            OperatingBases.default_for_aircraft(aircraft), **data
-        )

game/squadrons/pilot.py

@@ -1,51 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-from enum import unique, Enum
-
-from faker import Faker
-
-
-@dataclass
-class PilotRecord:
-    missions_flown: int = field(default=0)
-
-
-@unique
-class PilotStatus(Enum):
-    Active = "Active"
-    OnLeave = "On leave"
-    Dead = "Dead"
-
-
-@dataclass
-class Pilot:
-    name: str
-    player: bool = field(default=False)
-    status: PilotStatus = field(default=PilotStatus.Active)
-    record: PilotRecord = field(default_factory=PilotRecord)
-
-    @property
-    def alive(self) -> bool:
-        return self.status is not PilotStatus.Dead
-
-    @property
-    def on_leave(self) -> bool:
-        return self.status is PilotStatus.OnLeave
-
-    def send_on_leave(self) -> None:
-        if self.status is not PilotStatus.Active:
-            raise RuntimeError("Only active pilots may be sent on leave")
-        self.status = PilotStatus.OnLeave
-
-    def return_from_leave(self) -> None:
-        if self.status is not PilotStatus.OnLeave:
-            raise RuntimeError("Only pilots on leave may be returned from leave")
-        self.status = PilotStatus.Active
-
-    def kill(self) -> None:
-        self.status = PilotStatus.Dead
-
-    @classmethod
-    def random(cls, faker: Faker) -> Pilot:
-        return Pilot(faker.name())

game/squadrons/squadron.py

@@ -1,436 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections import Iterable
-from dataclasses import dataclass, field
-from typing import Optional, Sequence, TYPE_CHECKING
-
-from faker import Faker
-
-from game.settings import AutoAtoBehavior, Settings
-from gen.ato import Package
-from gen.flights.flight import Flight, FlightType
-from gen.flights.flightplan import FlightPlanBuilder
-from .pilot import Pilot, PilotStatus
-from ..utils import meters
-
-if TYPE_CHECKING:
-    from game import Game
-    from game.coalition import Coalition
-    from game.dcs.aircrafttype import AircraftType
-    from game.theater import ControlPoint, ConflictTheater, MissionTarget
-    from .operatingbases import OperatingBases
-    from .squadrondef import SquadronDef
-
-
-@dataclass
-class Squadron:
-    name: str
-    nickname: Optional[str]
-    country: str
-    role: str
-    aircraft: AircraftType
-    livery: Optional[str]
-    mission_types: tuple[FlightType, ...]
-    operating_bases: OperatingBases
-
-    #: The pool of pilots that have not yet been assigned to the squadron. This only
-    #: happens when a preset squadron defines more preset pilots than the squadron limit
-    #: allows. This pool will be consumed before random pilots are generated.
-    pilot_pool: list[Pilot]
-
-    current_roster: list[Pilot] = field(default_factory=list, init=False, hash=False)
-    available_pilots: list[Pilot] = field(
-        default_factory=list, init=False, hash=False, compare=False
-    )
-
-    auto_assignable_mission_types: set[FlightType] = field(
-        init=False, hash=False, compare=False
-    )
-
-    coalition: Coalition = field(hash=False, compare=False)
-    settings: Settings = field(hash=False, compare=False)
-
-    location: ControlPoint
-    destination: Optional[ControlPoint] = field(
-        init=False, hash=False, compare=False, default=None
-    )
-
-    owned_aircraft: int = field(init=False, hash=False, compare=False, default=0)
-    untasked_aircraft: int = field(init=False, hash=False, compare=False, default=0)
-    pending_deliveries: int = field(init=False, hash=False, compare=False, default=0)
-
-    def __post_init__(self) -> None:
-        self.auto_assignable_mission_types = set(self.mission_types)
-
-    def __str__(self) -> str:
-        if self.nickname is None:
-            return self.name
-        return f'{self.name} "{self.nickname}"'
-
-    def __hash__(self) -> int:
-        return hash(
-            (
-                self.name,
-                self.nickname,
-                self.country,
-                self.role,
-                self.aircraft,
-            )
-        )
-
-    @property
-    def player(self) -> bool:
-        return self.coalition.player
-
-    def assign_to_base(self, base: ControlPoint) -> None:
-        self.location = base
-        logging.debug(f"Assigned {self} to {base}")
-
-    @property
-    def pilot_limits_enabled(self) -> bool:
-        return self.settings.enable_squadron_pilot_limits
-
-    def set_allowed_mission_types(self, mission_types: Iterable[FlightType]) -> None:
-        self.mission_types = tuple(mission_types)
-        self.auto_assignable_mission_types.intersection_update(self.mission_types)
-
-    def set_auto_assignable_mission_types(
-        self, mission_types: Iterable[FlightType]
-    ) -> None:
-        self.auto_assignable_mission_types = set(self.mission_types).intersection(
-            mission_types
-        )
-
-    def claim_new_pilot_if_allowed(self) -> Optional[Pilot]:
-        if self.pilot_limits_enabled:
-            return None
-        self._recruit_pilots(1)
-        return self.available_pilots.pop()
-
-    def claim_available_pilot(self) -> Optional[Pilot]:
-        if not self.available_pilots:
-            return self.claim_new_pilot_if_allowed()
-
-        # For opfor, so player/AI option is irrelevant.
-        if not self.player:
-            return self.available_pilots.pop()
-
-        preference = self.settings.auto_ato_behavior
-
-        # No preference, so the first pilot is fine.
-        if preference is AutoAtoBehavior.Default:
-            return self.available_pilots.pop()
-
-        prefer_players = preference is AutoAtoBehavior.Prefer
-        for pilot in self.available_pilots:
-            if pilot.player == prefer_players:
-                self.available_pilots.remove(pilot)
-                return pilot
-
-        # No pilot was found that matched the user's preference.
-        #
-        # If they chose to *never* assign players and only players remain in the pool,
-        # we cannot fill the slot with the available pilots.
-        #
-        # If they only *prefer* players and we're out of players, just return an AI
-        # pilot.
-        if not prefer_players:
-            return self.claim_new_pilot_if_allowed()
-        return self.available_pilots.pop()
-
-    def claim_pilot(self, pilot: Pilot) -> None:
-        if pilot not in self.available_pilots:
-            raise ValueError(
-                f"Cannot assign {pilot} to {self} because they are not available"
-            )
-        self.available_pilots.remove(pilot)
-
-    def return_pilot(self, pilot: Pilot) -> None:
-        self.available_pilots.append(pilot)
-
-    def return_pilots(self, pilots: Sequence[Pilot]) -> None:
-        # Return in reverse so that returning two pilots and then getting two more
-        # results in the same ordering. This happens commonly when resetting rosters in
-        # the UI, when we clear the roster because the UI is updating, then end up
-        # repopulating the same size flight from the same squadron.
-        self.available_pilots.extend(reversed(pilots))
-
-    def _recruit_pilots(self, count: int) -> None:
-        new_pilots = self.pilot_pool[:count]
-        self.pilot_pool = self.pilot_pool[count:]
-        count -= len(new_pilots)
-        new_pilots.extend([Pilot(self.faker.name()) for _ in range(count)])
-        self.current_roster.extend(new_pilots)
-        self.available_pilots.extend(new_pilots)
-
-    def populate_for_turn_0(self) -> None:
-        if any(p.status is not PilotStatus.Active for p in self.pilot_pool):
-            raise ValueError("Squadrons can only be created with active pilots.")
-        self._recruit_pilots(self.settings.squadron_pilot_limit)
-
-    def end_turn(self) -> None:
-        if self.destination is not None:
-            self.relocate_to(self.destination)
-        self.replenish_lost_pilots()
-        self.deliver_orders()
-
-    def replenish_lost_pilots(self) -> None:
-        if not self.pilot_limits_enabled:
-            return
-
-        replenish_count = min(
-            self.settings.squadron_replenishment_rate,
-            self._number_of_unfilled_pilot_slots,
-        )
-        if replenish_count > 0:
-            self._recruit_pilots(replenish_count)
-
-    def return_all_pilots_and_aircraft(self) -> None:
-        self.available_pilots = list(self.active_pilots)
-        self.untasked_aircraft = self.owned_aircraft
-
-    @staticmethod
-    def send_on_leave(pilot: Pilot) -> None:
-        pilot.send_on_leave()
-
-    def return_from_leave(self, pilot: Pilot) -> None:
-        if not self.has_unfilled_pilot_slots:
-            raise RuntimeError(
-                f"Cannot return {pilot} from leave because {self} is full"
-            )
-        pilot.return_from_leave()
-
-    @property
-    def faker(self) -> Faker:
-        return self.coalition.faker
-
-    def _pilots_with_status(self, status: PilotStatus) -> list[Pilot]:
-        return [p for p in self.current_roster if p.status == status]
-
-    def _pilots_without_status(self, status: PilotStatus) -> list[Pilot]:
-        return [p for p in self.current_roster if p.status != status]
-
-    @property
-    def max_size(self) -> int:
-        return self.settings.squadron_pilot_limit
-
-    @property
-    def active_pilots(self) -> list[Pilot]:
-        return self._pilots_with_status(PilotStatus.Active)
-
-    @property
-    def pilots_on_leave(self) -> list[Pilot]:
-        return self._pilots_with_status(PilotStatus.OnLeave)
-
-    @property
-    def number_of_pilots_including_inactive(self) -> int:
-        return len(self.current_roster)
-
-    @property
-    def _number_of_unfilled_pilot_slots(self) -> int:
-        return self.max_size - len(self.active_pilots)
-
-    @property
-    def number_of_available_pilots(self) -> int:
-        return len(self.available_pilots)
-
-    def can_provide_pilots(self, count: int) -> bool:
-        return not self.pilot_limits_enabled or self.number_of_available_pilots >= count
-
-    @property
-    def has_available_pilots(self) -> bool:
-        return not self.pilot_limits_enabled or bool(self.available_pilots)
-
-    @property
-    def has_unfilled_pilot_slots(self) -> bool:
-        return not self.pilot_limits_enabled or self._number_of_unfilled_pilot_slots > 0
-
-    def can_auto_assign(self, task: FlightType) -> bool:
-        return task in self.auto_assignable_mission_types
-
-    def can_auto_assign_mission(
-        self, location: MissionTarget, task: FlightType, size: int, this_turn: bool
-    ) -> bool:
-        if not self.can_auto_assign(task):
-            return False
-        if this_turn and not self.can_fulfill_flight(size):
-            return False
-
-        distance_to_target = meters(location.distance_to(self.location))
-        return distance_to_target <= self.aircraft.max_mission_range
-
-    def operates_from(self, control_point: ControlPoint) -> bool:
-        if not control_point.can_operate(self.aircraft):
-            return False
-        if control_point.is_carrier:
-            return self.operating_bases.carrier
-        elif control_point.is_lha:
-            return self.operating_bases.lha
-        else:
-            return self.operating_bases.shore
-
-    def pilot_at_index(self, index: int) -> Pilot:
-        return self.current_roster[index]
-
-    def claim_inventory(self, count: int) -> None:
-        if self.untasked_aircraft < count:
-            raise ValueError(
-                f"Cannot remove {count} from {self.name}. Only have "
-                f"{self.untasked_aircraft}."
-            )
-        self.untasked_aircraft -= count
-
-    def can_fulfill_flight(self, count: int) -> bool:
-        return self.can_provide_pilots(count) and self.untasked_aircraft >= count
-
-    def refund_orders(self, count: Optional[int] = None) -> None:
-        if count is None:
-            count = self.pending_deliveries
-        self.coalition.adjust_budget(self.aircraft.price * count)
-        self.pending_deliveries -= count
-
-    def deliver_orders(self) -> None:
-        self.cancel_overflow_orders()
-        self.owned_aircraft += self.pending_deliveries
-        self.pending_deliveries = 0
-
-    def relocate_to(self, destination: ControlPoint) -> None:
-        self.location = destination
-        if self.location == self.destination:
-            self.destination = None
-
-    def cancel_overflow_orders(self) -> None:
-        if self.pending_deliveries <= 0:
-            return
-        overflow = -self.location.unclaimed_parking()
-        if overflow > 0:
-            sell_count = min(overflow, self.pending_deliveries)
-            logging.debug(
-                f"{self.location} is overfull by {overflow} aircraft. Cancelling "
-                f"orders for {sell_count} aircraft to make room."
-            )
-            self.refund_orders(sell_count)
-
-    @property
-    def max_fulfillable_aircraft(self) -> int:
-        return max(self.number_of_available_pilots, self.untasked_aircraft)
-
-    @property
-    def expected_size_next_turn(self) -> int:
-        return self.owned_aircraft + self.pending_deliveries
-
-    @property
-    def arrival(self) -> ControlPoint:
-        return self.location if self.destination is None else self.destination
-
-    def plan_relocation(
-        self, destination: ControlPoint, theater: ConflictTheater
-    ) -> None:
-        if destination == self.location:
-            logging.warning(
-                f"Attempted to plan relocation of {self} to current location "
-                f"{destination}. Ignoring."
-            )
-            return
-        if destination == self.destination:
-            logging.warning(
-                f"Attempted to plan relocation of {self} to current destination "
-                f"{destination}. Ignoring."
-            )
-            return
-
-        if self.expected_size_next_turn > destination.unclaimed_parking():
-            raise RuntimeError(f"Not enough parking for {self} at {destination}.")
-        if not destination.can_operate(self.aircraft):
-            raise RuntimeError(f"{self} cannot operate at {destination}.")
-        self.destination = destination
-        self.replan_ferry_flights(theater)
-
-    def cancel_relocation(self) -> None:
-        if self.destination is None:
-            logging.warning(
-                f"Attempted to cancel relocation of squadron with no transfer order. "
-                "Ignoring."
-            )
-            return
-
-        if self.expected_size_next_turn >= self.location.unclaimed_parking():
-            raise RuntimeError(f"Not enough parking for {self} at {self.location}.")
-        self.destination = None
-        self.cancel_ferry_flights()
-
-    def replan_ferry_flights(self, theater: ConflictTheater) -> None:
-        self.cancel_ferry_flights()
-        self.plan_ferry_flights(theater)
-
-    def cancel_ferry_flights(self) -> None:
-        for package in self.coalition.ato.packages:
-            # Copy the list so our iterator remains consistent throughout the removal.
-            for flight in list(package.flights):
-                if flight.squadron == self and flight.flight_type is FlightType.FERRY:
-                    package.remove_flight(flight)
-                    flight.return_pilots_and_aircraft()
-            if not package.flights:
-                self.coalition.ato.remove_package(package)
-
-    def plan_ferry_flights(self, theater: ConflictTheater) -> None:
-        if self.destination is None:
-            raise RuntimeError(
-                f"Cannot plan ferry flights for {self} because there is no destination."
-            )
-        remaining = self.untasked_aircraft
-        if not remaining:
-            return
-
-        package = Package(self.destination)
-        builder = FlightPlanBuilder(package, self.coalition, theater)
-        while remaining:
-            size = min(remaining, self.aircraft.max_group_size)
-            self.plan_ferry_flight(builder, package, size)
-            remaining -= size
-        package.set_tot_asap()
-        self.coalition.ato.add_package(package)
-
-    def plan_ferry_flight(
-        self, builder: FlightPlanBuilder, package: Package, size: int
-    ) -> None:
-        start_type = self.location.required_aircraft_start_type
-        if start_type is None:
-            start_type = self.settings.default_start_type
-
-        flight = Flight(
-            package,
-            self.coalition.country_name,
-            self,
-            size,
-            FlightType.FERRY,
-            start_type,
-            divert=None,
-        )
-        package.add_flight(flight)
-        builder.populate_flight_plan(flight)
-
-    @classmethod
-    def create_from(
-        cls,
-        squadron_def: SquadronDef,
-        base: ControlPoint,
-        coalition: Coalition,
-        game: Game,
-    ) -> Squadron:
-        squadron_def.claimed = True
-        return Squadron(
-            squadron_def.name,
-            squadron_def.nickname,
-            squadron_def.country,
-            squadron_def.role,
-            squadron_def.aircraft,
-            squadron_def.livery,
-            squadron_def.mission_types,
-            squadron_def.operating_bases,
-            squadron_def.pilot_pool,
-            coalition,
-            game.settings,
-            base,
-        )

game/squadrons/squadrondef.py

@@ -1,99 +0,0 @@
-from __future__ import annotations
-
-import logging
-from collections import Iterable
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import Optional, TYPE_CHECKING
-
-import yaml
-
-from game.dcs.aircrafttype import AircraftType
-from game.squadrons.operatingbases import OperatingBases
-from game.squadrons.pilot import Pilot
-
-if TYPE_CHECKING:
-    from gen.flights.flight import FlightType
-    from game.theater import ControlPoint
-
-
-@dataclass
-class SquadronDef:
-    name: str
-    nickname: Optional[str]
-    country: str
-    role: str
-    aircraft: AircraftType
-    livery: Optional[str]
-    mission_types: tuple[FlightType, ...]
-    operating_bases: OperatingBases
-    pilot_pool: list[Pilot]
-    claimed: bool = False
-
-    auto_assignable_mission_types: set[FlightType] = field(
-        init=False, hash=False, compare=False
-    )
-
-    def __post_init__(self) -> None:
-        self.auto_assignable_mission_types = set(self.mission_types)
-
-    def __str__(self) -> str:
-        if self.nickname is None:
-            return self.name
-        return f'{self.name} "{self.nickname}"'
-
-    def set_allowed_mission_types(self, mission_types: Iterable[FlightType]) -> None:
-        self.mission_types = tuple(mission_types)
-        self.auto_assignable_mission_types.intersection_update(self.mission_types)
-
-    def can_auto_assign(self, task: FlightType) -> bool:
-        return task in self.auto_assignable_mission_types
-
-    def operates_from(self, control_point: ControlPoint) -> bool:
-        if not control_point.can_operate(self.aircraft):
-            return False
-        if control_point.is_carrier:
-            return self.operating_bases.carrier
-        elif control_point.is_lha:
-            return self.operating_bases.lha
-        else:
-            return self.operating_bases.shore
-
-    @classmethod
-    def from_yaml(cls, path: Path) -> SquadronDef:
-        from gen.flights.ai_flight_planner_db import tasks_for_aircraft
-        from gen.flights.flight import FlightType
-
-        with path.open(encoding="utf8") as squadron_file:
-            data = yaml.safe_load(squadron_file)
-
-        name = data["aircraft"]
-        try:
-            unit_type = AircraftType.named(name)
-        except KeyError as ex:
-            raise KeyError(f"Could not find any aircraft named {name}") from ex
-
-        pilots = [Pilot(n, player=False) for n in data.get("pilots", [])]
-        pilots.extend([Pilot(n, player=True) for n in data.get("players", [])])
-
-        mission_types = [FlightType.from_name(n) for n in data["mission_types"]]
-        tasks = tasks_for_aircraft(unit_type)
-        for mission_type in list(mission_types):
-            if mission_type not in tasks:
-                logging.error(
-                    f"Squadron has mission type {mission_type} but {unit_type} is not "
-                    f"capable of that task: {path}"
-                )
-                mission_types.remove(mission_type)
-
-        return SquadronDef(
-            name=data["name"],
-            nickname=data.get("nickname"),
-            country=data["country"],
-            role=data["role"],
-            aircraft=unit_type,
-            livery=data.get("livery"),
-            mission_types=tuple(mission_types),
-            operating_bases=OperatingBases.from_yaml(unit_type, data.get("bases", {})),
-            pilot_pool=pilots,
-        )