Move Flight and its related components out of gen.

game/commander/missionproposals.py

@@ -3,7 +3,7 @@ from enum import Enum, auto
 from typing import Optional
 
 from game.theater import MissionTarget
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 
 
 class EscortType(Enum):

game/commander/missionscheduler.py

@@ -7,7 +7,7 @@ from datetime import timedelta
 from typing import Iterator, Dict, TYPE_CHECKING
 
 from game.theater import MissionTarget
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 from gen.flights.traveltime import TotEstimator
 
 if TYPE_CHECKING:

game/commander/packagebuilder.py

@@ -3,10 +3,9 @@ from __future__ import annotations
 from typing import Optional, TYPE_CHECKING
 
 from game.utils import nautical_miles
-from gen.ato import Package
+from ..ato.package import Package
 from game.theater import MissionTarget, OffMapSpawn, ControlPoint
-from gen.flights.flight import Flight
-
+from ..ato.flight import Flight
 
 if TYPE_CHECKING:
     from game.dcs.aircrafttype import AircraftType

game/commander/packagefulfiller.py

@@ -13,9 +13,10 @@ 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 game.ato.airtaaskingorder import AirTaskingOrder
+from game.ato.package import Package
 from gen.flights.closestairfields import ObjectiveDistanceCache
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 from gen.flights.flightplan import FlightPlanBuilder
 
 if TYPE_CHECKING:

game/commander/tasks/packageplanningtask.py

@@ -15,8 +15,8 @@ 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
+from game.ato.package import Package
+from game.ato.flighttype import FlightType
 
 if TYPE_CHECKING:
     from game.coalition import Coalition

game/commander/tasks/primitive/aewc.py

@@ -5,7 +5,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/antiship.py

@@ -6,7 +6,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/antishipping.py

@@ -5,7 +5,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/bai.py

@@ -5,7 +5,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/barcap.py

@@ -5,7 +5,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/cas.py

@@ -5,7 +5,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/convoyinterdiction.py

@@ -6,7 +6,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/dead.py

@@ -6,7 +6,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/oca.py

@@ -5,7 +5,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/refueling.py

@@ -5,7 +5,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass

game/commander/tasks/primitive/strike.py

@@ -6,7 +6,7 @@ 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
+from game.ato.flighttype import FlightType
 
 
 @dataclass