Finish moving gen into game.

game/commander/missionscheduler.py

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

game/commander/objectivefinder.py

@@ -19,7 +19,7 @@ from game.theater.theatergroundobject import (
     NavalGroundObject,
 )
 from game.utils import meters, nautical_miles
-from gen.flights.closestairfields import ClosestAirfields, ObjectiveDistanceCache
+from game.ato.closestairfields import ClosestAirfields, ObjectiveDistanceCache
 
 if TYPE_CHECKING:
     from game import Game

game/commander/packagebuilder.py

@@ -12,7 +12,7 @@ from ..db.database import Database
 if TYPE_CHECKING:
     from game.dcs.aircrafttype import AircraftType
     from game.squadrons.airwing import AirWing
-    from gen.flights.closestairfields import ClosestAirfields
+    from game.ato.closestairfields import ClosestAirfields
     from .missionproposals import ProposedFlight
 
 

game/commander/packagefulfiller.py

@@ -17,8 +17,8 @@ from game.settings import Settings
 from game.squadrons import AirWing
 from game.theater import ConflictTheater
 from game.threatzones import ThreatZones
-from gen.flights.closestairfields import ObjectiveDistanceCache
-from gen.flights.flightplan import FlightPlanBuilder
+from game.ato.closestairfields import ObjectiveDistanceCache
+from game.ato.flightplan import FlightPlanBuilder
 
 if TYPE_CHECKING:
     from game.ato import Flight

game/commander/tasks/frontlinestancetask.py

@@ -6,8 +6,8 @@ from typing import TYPE_CHECKING
 
 from game.commander.tasks.theatercommandertask import TheaterCommanderTask
 from game.commander.theaterstate import TheaterState
+from game.ground_forces.combat_stance import CombatStance
 from game.theater import FrontLine
-from gen.ground_forces.combat_stance import CombatStance
 
 if TYPE_CHECKING:
     from game.coalition import Coalition

game/commander/tasks/primitive/aggressiveattack.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from gen.ground_forces.combat_stance import CombatStance
+from game.ground_forces.combat_stance import CombatStance
 
 
 class AggressiveAttack(FrontLineStanceTask):

game/commander/tasks/primitive/breakthroughattack.py

@@ -2,7 +2,7 @@ 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
+from game.ground_forces.combat_stance import CombatStance
 
 
 class BreakthroughAttack(FrontLineStanceTask):

game/commander/tasks/primitive/defensivestance.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from gen.ground_forces.combat_stance import CombatStance
+from game.ground_forces.combat_stance import CombatStance
 
 
 class DefensiveStance(FrontLineStanceTask):

game/commander/tasks/primitive/eliminationattack.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from gen.ground_forces.combat_stance import CombatStance
+from game.ground_forces.combat_stance import CombatStance
 
 
 class EliminationAttack(FrontLineStanceTask):

game/commander/tasks/primitive/retreatstance.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from game.commander.tasks.frontlinestancetask import FrontLineStanceTask
-from gen.ground_forces.combat_stance import CombatStance
+from game.ground_forces.combat_stance import CombatStance
 
 
 class RetreatStance(FrontLineStanceTask):

game/commander/theaterstate.py

@@ -5,11 +5,12 @@ import itertools
 import math
 from collections.abc import Iterator
 from dataclasses import dataclass
-from typing import Any, Optional, TYPE_CHECKING, Union
+from typing import Optional, TYPE_CHECKING, Union
 
 from game.commander.garrisons import Garrisons
 from game.commander.objectivefinder import ObjectiveFinder
 from game.db import GameDb
+from game.ground_forces.combat_stance import CombatStance
 from game.htn import WorldState
 from game.profiling import MultiEventTracer
 from game.settings import Settings
@@ -22,7 +23,6 @@ from game.theater.theatergroundobject import (
     VehicleGroupGroundObject,
 )
 from game.threatzones import ThreatZones
-from gen.ground_forces.combat_stance import CombatStance
 
 if TYPE_CHECKING:
     from game import Game