Add a UUID -> Flight database to Game.

This will be expanded with other types as needed.

game/commander/packagebuilder.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 from typing import Optional, TYPE_CHECKING
 
+from game.theater import ControlPoint, MissionTarget, OffMapSpawn
 from game.utils import nautical_miles
-from ..ato.package import Package
-from game.theater import MissionTarget, OffMapSpawn, ControlPoint
 from ..ato.flight import Flight
+from ..ato.package import Package
 from ..ato.starttype import StartType
+from ..db.database import Database
 
 if TYPE_CHECKING:
     from game.dcs.aircrafttype import AircraftType
@@ -23,6 +24,7 @@ class PackageBuilder:
         location: MissionTarget,
         closest_airfields: ClosestAirfields,
         air_wing: AirWing,
+        flight_db: Database[Flight],
         is_player: bool,
         package_country: str,
         start_type: StartType,
@@ -31,7 +33,7 @@ class PackageBuilder:
         self.closest_airfields = closest_airfields
         self.is_player = is_player
         self.package_country = package_country
-        self.package = Package(location, auto_asap=asap)
+        self.package = Package(location, flight_db, auto_asap=asap)
         self.air_wing = air_wing
         self.start_type = start_type
 

game/commander/packagefulfiller.py

@@ -2,24 +2,26 @@ from __future__ import annotations
 
 import logging
 from collections import defaultdict
-from typing import Set, Iterable, Dict, TYPE_CHECKING, Optional
+from typing import Dict, Iterable, Optional, Set, TYPE_CHECKING
 
-from game.commander.missionproposals import ProposedMission, ProposedFlight, EscortType
+from game.ato.airtaaskingorder import AirTaskingOrder
+from game.ato.flighttype import FlightType
+from game.ato.package import Package
+from game.commander.missionproposals import EscortType, ProposedFlight, ProposedMission
 from game.commander.packagebuilder import PackageBuilder
 from game.data.doctrine import Doctrine
+from game.db import Database
 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 game.ato.airtaaskingorder import AirTaskingOrder
-from game.ato.package import Package
 from gen.flights.closestairfields import ObjectiveDistanceCache
-from game.ato.flighttype import FlightType
 from gen.flights.flightplan import FlightPlanBuilder
 
 if TYPE_CHECKING:
+    from game.ato import Flight
     from game.coalition import Coalition
 
 
@@ -27,10 +29,15 @@ class PackageFulfiller:
     """Responsible for package aircraft allocation and flight plan layout."""
 
     def __init__(
-        self, coalition: Coalition, theater: ConflictTheater, settings: Settings
+        self,
+        coalition: Coalition,
+        theater: ConflictTheater,
+        flight_db: Database[Flight],
+        settings: Settings,
     ) -> None:
         self.coalition = coalition
         self.theater = theater
+        self.flight_db = flight_db
         self.player_missions_asap = settings.auto_ato_player_missions_asap
         self.default_start_type = settings.default_start_type
 
@@ -133,6 +140,7 @@ class PackageFulfiller:
             mission.location,
             ObjectiveDistanceCache.get_closest_airfields(mission.location),
             self.air_wing,
+            self.flight_db,
             self.is_player,
             self.coalition.country_name,
             self.default_start_type,

game/commander/tasks/packageplanningtask.py

@@ -4,10 +4,12 @@ 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 enum import IntEnum, auto, unique
+from typing import Generic, Iterator, Optional, TYPE_CHECKING, TypeVar, Union
 
-from game.commander.missionproposals import ProposedFlight, EscortType, ProposedMission
+from game.ato.flighttype import FlightType
+from game.ato.package import Package
+from game.commander.missionproposals import EscortType, ProposedFlight, ProposedMission
 from game.commander.packagefulfiller import PackageFulfiller
 from game.commander.tasks.theatercommandertask import TheaterCommanderTask
 from game.commander.theaterstate import TheaterState
@@ -15,8 +17,6 @@ from game.settings import AutoAtoBehavior
 from game.theater import MissionTarget
 from game.theater.theatergroundobject import IadsGroundObject, NavalGroundObject
 from game.utils import Distance, meters
-from game.ato.package import Package
-from game.ato.flighttype import FlightType
 
 if TYPE_CHECKING:
     from game.coalition import Coalition
@@ -40,7 +40,6 @@ class PackagePlanningTask(TheaterCommanderTask, Generic[MissionTargetT]):
 
     def __post_init__(self) -> None:
         self.flights = []
-        self.package = Package(self.target)
 
     def preconditions_met(self, state: TheaterState) -> bool:
         if (
@@ -97,6 +96,7 @@ class PackagePlanningTask(TheaterCommanderTask, Generic[MissionTargetT]):
         fulfiller = PackageFulfiller(
             state.context.coalition,
             state.context.theater,
+            state.context.game_db.flights,
             state.context.settings,
         )
         self.package = fulfiller.plan_mission(

game/commander/theaterstate.py

@@ -9,6 +9,7 @@ from typing import Any, Optional, TYPE_CHECKING, Union
 
 from game.commander.garrisons import Garrisons
 from game.commander.objectivefinder import ObjectiveFinder
+from game.db import GameDb
 from game.htn import WorldState
 from game.profiling import MultiEventTracer
 from game.settings import Settings
@@ -31,6 +32,7 @@ if TYPE_CHECKING:
 
 @dataclass(frozen=True)
 class PersistentContext:
+    game_db: GameDb
     coalition: Coalition
     theater: ConflictTheater
     turn: int
@@ -140,7 +142,7 @@ class TheaterState(WorldState["TheaterState"]):
         ordered_capturable_points = finder.prioritized_unisolated_points()
 
         context = PersistentContext(
-            coalition, game.theater, game.turn, game.settings, tracer
+            game.db, coalition, game.theater, game.turn, game.settings, tracer
         )
 
         # Plan enough rounds of CAP that the target has coverage over the expected