Finish moving gen into game.

qt_ui/models.py

@@ -21,7 +21,7 @@ from game.sim.gameupdateevents import GameUpdateEvents
 from game.squadrons.squadron import Pilot, Squadron
 from game.theater.missiontarget import MissionTarget
 from game.transfers import PendingTransfers, TransferOrder
-from gen.flights.traveltime import TotEstimator
+from game.ato.traveltime import TotEstimator
 from qt_ui.simcontroller import SimController
 from qt_ui.uiconstants import AIRCRAFT_ICONS
 

qt_ui/widgets/QTopPanel.py

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

qt_ui/widgets/combos/QAircraftTypeSelector.py

@@ -4,7 +4,7 @@ from typing import Iterable, Type
 from PySide2.QtWidgets import QComboBox
 from dcs.unittype import FlyingType
 
-from gen.flights.ai_flight_planner_db import aircraft_for_task
+from game.ato.ai_flight_planner_db import aircraft_for_task
 from game.ato.flighttype import FlightType
 
 

qt_ui/windows/QUnitInfoWindow.py

@@ -10,7 +10,7 @@ from PySide2.QtWidgets import (
     QFrame,
 )
 
-import gen.flights.ai_flight_planner_db
+import game.ato.ai_flight_planner_db
 from game.dcs.aircrafttype import AircraftType
 from game.dcs.groundunittype import GroundUnitType
 from game.dcs.unittype import UnitType
@@ -105,26 +105,26 @@ class QUnitInfoWindow(QDialog):
     def generateAircraftTasks(self) -> str:
         aircraft_tasks = ""
         unit_type = self.unit_type.dcs_unit_type
-        if unit_type in gen.flights.ai_flight_planner_db.CAP_CAPABLE:
+        if unit_type in game.ato.ai_flight_planner_db.CAP_CAPABLE:
             aircraft_tasks = (
                 aircraft_tasks
                 + f"{FlightType.BARCAP}, {FlightType.ESCORT}, {FlightType.INTERCEPTION}, {FlightType.SWEEP}, {FlightType.TARCAP}, "
             )
-        if unit_type in gen.flights.ai_flight_planner_db.CAS_CAPABLE:
+        if unit_type in game.ato.ai_flight_planner_db.CAS_CAPABLE:
             aircraft_tasks = (
                 aircraft_tasks
                 + f"{FlightType.CAS}, {FlightType.BAI}, {FlightType.OCA_AIRCRAFT}, "
             )
-        if unit_type in gen.flights.ai_flight_planner_db.SEAD_CAPABLE:
+        if unit_type in game.ato.ai_flight_planner_db.SEAD_CAPABLE:
             aircraft_tasks = aircraft_tasks + f"{FlightType.SEAD}, "
-        if unit_type in gen.flights.ai_flight_planner_db.DEAD_CAPABLE:
+        if unit_type in game.ato.ai_flight_planner_db.DEAD_CAPABLE:
             aircraft_tasks = aircraft_tasks + f"{FlightType.DEAD}, "
-        if unit_type in gen.flights.ai_flight_planner_db.ANTISHIP_CAPABLE:
+        if unit_type in game.ato.ai_flight_planner_db.ANTISHIP_CAPABLE:
             aircraft_tasks = aircraft_tasks + f"{FlightType.ANTISHIP}, "
-        if unit_type in gen.flights.ai_flight_planner_db.RUNWAY_ATTACK_CAPABLE:
+        if unit_type in game.ato.ai_flight_planner_db.RUNWAY_ATTACK_CAPABLE:
             aircraft_tasks = aircraft_tasks + f"{FlightType.OCA_RUNWAY}, "
-        if unit_type in gen.flights.ai_flight_planner_db.STRIKE_CAPABLE:
+        if unit_type in game.ato.ai_flight_planner_db.STRIKE_CAPABLE:
             aircraft_tasks = aircraft_tasks + f"{FlightType.STRIKE}, "
-        if unit_type in gen.flights.ai_flight_planner_db.REFUELING_CAPABALE:
+        if unit_type in game.ato.ai_flight_planner_db.REFUELING_CAPABALE:
             aircraft_tasks = aircraft_tasks + f"{FlightType.REFUELING}, "
         return aircraft_tasks[:-2]

qt_ui/windows/mission/QFlightItem.py

@@ -2,7 +2,7 @@ from PySide2.QtGui import QStandardItem, QIcon
 
 from game.ato.package import Package
 from game.ato.flight import Flight
-from gen.flights.traveltime import TotEstimator
+from game.ato.traveltime import TotEstimator
 from qt_ui.uiconstants import AIRCRAFT_ICONS
 
 

qt_ui/windows/mission/QPackageDialog.py

@@ -19,7 +19,7 @@ from game.ato.flight import Flight
 from game.ato.package import Package
 from game.game import Game
 from game.theater.missiontarget import MissionTarget
-from gen.flights.flightplan import FlightPlanBuilder, PlanningError
+from game.ato.flightplan import FlightPlanBuilder, PlanningError
 from qt_ui.models import AtoModel, GameModel, PackageModel
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.widgets.ato import QFlightList

qt_ui/windows/mission/QPlannedFlightsView.py

@@ -7,7 +7,7 @@ from PySide2.QtWidgets import QAbstractItemView, QListView
 from qt_ui.models import GameModel
 from qt_ui.windows.mission.QFlightItem import QFlightItem
 from game.theater.controlpoint import ControlPoint
-from gen.flights.traveltime import TotEstimator
+from game.ato.traveltime import TotEstimator
 
 
 class QPlannedFlightsView(QListView):

qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py

@@ -8,7 +8,7 @@ from PySide2.QtWidgets import (
 
 from game import Game
 from game.ato.flight import Flight
-from gen.flights.loadouts import Loadout
+from game.ato.loadouts import Loadout
 from .QLoadoutEditor import QLoadoutEditor
 from .propertyeditor import PropertyEditor
 

qt_ui/windows/mission/flight/payload/QPylonEditor.py

@@ -7,7 +7,7 @@ from PySide2.QtWidgets import QComboBox
 from game import Game
 from game.data.weapons import Pylon, Weapon
 from game.ato.flight import Flight
-from gen.flights.loadouts import Loadout
+from game.ato.loadouts import Loadout
 
 
 class QPylonEditor(QComboBox):

qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py

@@ -4,8 +4,8 @@ from PySide2.QtWidgets import QGroupBox, QLabel, QMessageBox, QVBoxLayout
 
 from game import Game
 from game.ato.flight import Flight
-from gen.flights.flightplan import FlightPlanBuilder, PlanningError
-from gen.flights.traveltime import TotEstimator
+from game.ato.flightplan import FlightPlanBuilder, PlanningError
+from game.ato.traveltime import TotEstimator
 from qt_ui.models import PackageModel
 from qt_ui.widgets.QLabeledWidget import QLabeledWidget
 from qt_ui.widgets.combos.QArrivalAirfieldSelector import QArrivalAirfieldSelector

qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py

@@ -16,13 +16,13 @@ from game.ato.package import Package
 from game.ato.flighttype import FlightType
 from game.ato.flightwaypoint import FlightWaypoint
 from game.ato.flight import Flight
-from gen.flights.flightplan import (
+from game.ato.flightplan import (
     CustomFlightPlan,
     FlightPlanBuilder,
     PlanningError,
     StrikeFlightPlan,
 )
-from gen.flights.loadouts import Loadout
+from game.ato.loadouts import Loadout
 from qt_ui.windows.mission.flight.waypoints.QFlightWaypointList import (
     QFlightWaypointList,
 )