Move Flight and its related components out of gen.

qt_ui/widgets/QTopPanel.py

@@ -14,7 +14,7 @@ from game import Game
 from game.event.airwar import AirWarEvent
 from game.profiling import logged_duration
 from game.utils import meters
-from gen.ato import Package
+from game.ato.package import Package
 from gen.flights.traveltime import TotEstimator
 from qt_ui.models import GameModel
 from qt_ui.widgets.QBudgetBox import QBudgetBox

qt_ui/widgets/ato.py

@@ -24,8 +24,8 @@ from PySide2.QtWidgets import (
     QVBoxLayout,
 )
 
-from gen.ato import Package
-from gen.flights.flight import Flight
+from game.ato.package import Package
+from game.ato.flight import Flight
 from gen.flights.traveltime import TotEstimator
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from ..delegates import TwoColumnRowDelegate

qt_ui/widgets/combos/QAircraftTypeSelector.py

@@ -5,7 +5,7 @@ from PySide2.QtWidgets import QComboBox
 from dcs.unittype import FlyingType
 
 from gen.flights.ai_flight_planner_db import aircraft_for_task
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 
 
 class QAircraftTypeSelector(QComboBox):

qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py

@@ -4,7 +4,8 @@ from game import Game
 from game.theater import ControlPointType, BuildingGroundObject
 from game.utils import Distance
 from gen.conflictgen import Conflict
-from gen.flights.flight import FlightWaypoint, FlightWaypointType
+from game.ato.flightwaypointtype import FlightWaypointType
+from game.ato.flightwaypoint import FlightWaypoint
 from qt_ui.widgets.combos.QFilteredComboBox import QFilteredComboBox
 
 

qt_ui/widgets/map/mapmodel.py

@@ -32,8 +32,10 @@ from game.theater import (
 from game.threatzones import ThreatZones
 from game.transfers import MultiGroupTransport, TransportMap
 from game.utils import meters, nautical_miles
-from gen.ato import AirTaskingOrder
-from gen.flights.flight import Flight, FlightWaypoint, FlightWaypointType
+from game.ato.airtaaskingorder import AirTaskingOrder
+from game.ato.flightwaypointtype import FlightWaypointType
+from game.ato.flightwaypoint import FlightWaypoint
+from game.ato.flight import Flight
 from gen.flights.flightplan import (
     FlightPlan,
     PatrollingFlightPlan,