Merge branch 'develop' into frontline

qt_ui/widgets/base/QAirportInformation.py

@@ -1,52 +0,0 @@
-from PySide2.QtWidgets import QGridLayout, QLabel, QGroupBox, QVBoxLayout, QLCDNumber
-
-from theater import ControlPoint, Airport
-
-
-class QAirportInformation(QGroupBox):
-
-    def __init__(self, cp:ControlPoint, airport:Airport):
-        super(QAirportInformation, self).__init__(airport.name)
-        self.cp = cp
-        self.airport = airport
-        self.init_ui()
-
-    def init_ui(self):
-        self.layout = QGridLayout()
-
-        # Runway information
-        self.runways = QGroupBox("Runways")
-        self.runwayLayout = QGridLayout()
-        for i, runway in enumerate(self.airport.runways):
-
-            # Seems like info is missing in pydcs, even if the attribute is there
-            lr = ""
-            if runway.leftright == 1:
-                lr = "L"
-            elif runway.leftright == 2:
-                lr = "R"
-
-            self.runwayLayout.addWidget(QLabel("Runway " + str(runway.heading) + lr), i, 0)
-
-            # Seems like info is missing in pydcs, even if the attribute is there
-            if runway.ils:
-                self.runwayLayout.addWidget(QLabel("ILS "), i, 1)
-                self.runwayLayout.addWidget(QLCDNumber(6, runway.ils), i, 1)
-            else:
-                self.runwayLayout.addWidget(QLabel("NO ILS"), i, 1)
-
-
-        self.runways.setLayout(self.runwayLayout)
-        self.layout.addWidget(self.runways, 0, 0)
-
-        self.layout.addWidget(QLabel("<b>Parking Slots :</b>"), 1, 0)
-        self.layout.addWidget(QLabel(str(len(self.airport.parking_slots))), 1, 1)
-
-
-        stretch = QVBoxLayout()
-        stretch.addStretch()
-
-        self.layout.addLayout(stretch, 2, 0)
-        self.setLayout(self.layout)
-
-

qt_ui/widgets/combos/QAircraftTypeSelector.py

@@ -3,13 +3,13 @@ from typing import Iterable
 
 from PySide2.QtWidgets import QComboBox
 
-from dcs.planes import PlaneType
+from dcs.unittype import FlyingType
 
 
 class QAircraftTypeSelector(QComboBox):
     """Combo box for selecting among the given aircraft types."""
 
-    def __init__(self, aircraft_types: Iterable[PlaneType]) -> None:
+    def __init__(self, aircraft_types: Iterable[FlyingType]) -> None:
         super().__init__()
         for aircraft in aircraft_types:
             self.addItem(f"{aircraft.id}", userData=aircraft)

qt_ui/widgets/combos/QArrivalAirfieldSelector.py

@@ -0,0 +1,40 @@
+"""Combo box for selecting a departure airfield."""
+from typing import Iterable
+
+from PySide2.QtWidgets import QComboBox
+from dcs.unittype import FlyingType
+
+from game import db
+from game.theater.controlpoint import ControlPoint
+
+
+class QArrivalAirfieldSelector(QComboBox):
+    """A combo box for selecting a flight's arrival or divert airfield.
+
+    The combo box will automatically be populated with all airfields the given
+    aircraft type is able to land at.
+    """
+
+    def __init__(self, destinations: Iterable[ControlPoint],
+                 aircraft: FlyingType, optional_text: str) -> None:
+        super().__init__()
+        self.destinations = list(destinations)
+        self.aircraft = aircraft
+        self.optional_text = optional_text
+        self.rebuild_selector()
+        self.setCurrentIndex(0)
+
+    def change_aircraft(self, aircraft: FlyingType) -> None:
+        if self.aircraft == aircraft:
+            return
+        self.aircraft = aircraft
+        self.rebuild_selector()
+
+    def rebuild_selector(self) -> None:
+        self.clear()
+        for destination in self.destinations:
+            if destination.can_land(self.aircraft):
+                self.addItem(destination.name, destination)
+        self.model().sort(0)
+        self.insertItem(0, self.optional_text, None)
+        self.update()

qt_ui/widgets/combos/QFlightTypeComboBox.py

@@ -2,7 +2,7 @@
 
 from PySide2.QtWidgets import QComboBox
 
-from theater import ConflictTheater, MissionTarget
+from game.theater import ConflictTheater, MissionTarget
 
 
 class QFlightTypeComboBox(QComboBox):

qt_ui/widgets/combos/QOriginAirfieldSelector.py

@@ -3,7 +3,7 @@ from typing import Iterable
 
 from PySide2.QtCore import Signal
 from PySide2.QtWidgets import QComboBox
-from dcs.planes import PlaneType
+from dcs.unittype import FlyingType
 
 from game.inventory import GlobalAircraftInventory
 from game.theater.controlpoint import ControlPoint
@@ -20,7 +20,7 @@ class QOriginAirfieldSelector(QComboBox):
 
     def __init__(self, global_inventory: GlobalAircraftInventory,
                  origins: Iterable[ControlPoint],
-                 aircraft: PlaneType) -> None:
+                 aircraft: FlyingType) -> None:
         super().__init__()
         self.global_inventory = global_inventory
         self.origins = list(origins)
@@ -28,7 +28,7 @@ class QOriginAirfieldSelector(QComboBox):
         self.rebuild_selector()
         self.currentIndexChanged.connect(self.index_changed)
 
-    def change_aircraft(self, aircraft: PlaneType) -> None:
+    def change_aircraft(self, aircraft: FlyingType) -> None:
         if self.aircraft == aircraft:
             return
         self.aircraft = aircraft

qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py

@@ -1,10 +1,10 @@
 from PySide2.QtGui import QStandardItem, QStandardItemModel
 
 from game import Game
+from game.theater import ControlPointType
 from gen import BuildingGroundObject, Conflict, FlightWaypointType
 from gen.flights.flight import FlightWaypoint
 from qt_ui.widgets.combos.QFilteredComboBox import QFilteredComboBox
-from theater import ControlPointType
 
 
 class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):

qt_ui/widgets/map/QFrontLine.py

@@ -13,11 +13,11 @@ from PySide2.QtWidgets import (
 )
 
 import qt_ui.uiconstants as const
+from game.theater import FrontLine
 from qt_ui.dialogs import Dialog
 from qt_ui.models import GameModel
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from qt_ui.windows.mission.QPackageDialog import QNewPackageDialog
-from theater import FrontLine
 
 
 class QFrontLine(QGraphicsLineItem):

qt_ui/widgets/map/QLiberationMap.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import datetime
 import logging
 import math
-from typing import Iterable, List, Optional, Tuple, Iterator
+from typing import Iterable, Iterator, List, Optional, Tuple
 
 from PySide2.QtCore import QPointF, Qt
 from PySide2.QtGui import (
@@ -27,6 +27,13 @@ from dcs.mapping import point_from_heading
 
 import qt_ui.uiconstants as CONST
 from game import Game, db
+from game.theater import ControlPoint
+from game.theater.conflicttheater import FrontLine
+from game.theater.theatergroundobject import (
+    EwrGroundObject,
+    MissileSiteGroundObject,
+    TheaterGroundObject,
+)
 from game.utils import meter_to_feet
 from game.weather import TimeOfDay
 from gen import Conflict
@@ -39,13 +46,7 @@ from qt_ui.widgets.map.QLiberationScene import QLiberationScene
 from qt_ui.widgets.map.QMapControlPoint import QMapControlPoint
 from qt_ui.widgets.map.QMapGroundObject import QMapGroundObject
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
-from theater import ControlPoint
-from game.theater.conflicttheater import FrontLine
-from game.theater.theatergroundobject import (
-    EwrGroundObject,
-    MissileSiteGroundObject,
-    TheaterGroundObject,
-)
+
 
 def binomial(i: int, n: int) -> float:
     """Binomial coefficient"""
@@ -373,6 +374,10 @@ class QLiberationMap(QGraphicsView):
             FlightWaypointType.TARGET_SHIP,
         )
         for idx, point in enumerate(flight.flight_plan.waypoints[1:]):
+            if point.waypoint_type == FlightWaypointType.DIVERT:
+                # Don't clutter the map showing divert points.
+                continue
+
             new_pos = self._transform_point(Point(point.x, point.y))
             self.draw_flight_path(scene, prev_pos, new_pos, is_player,
                                   selected)
@@ -386,7 +391,6 @@ class QLiberationMap(QGraphicsView):
                 self.draw_waypoint_info(scene, idx + 1, point, new_pos,
                                         flight.flight_plan)
             prev_pos = tuple(new_pos)
-        self.draw_flight_path(scene, prev_pos, pos, is_player, selected)
 
     def draw_waypoint(self, scene: QGraphicsScene, position: Tuple[int, int],
                       player: bool, selected: bool) -> None:

qt_ui/widgets/map/QMapControlPoint.py

@@ -4,9 +4,9 @@ from PySide2.QtGui import QColor, QPainter
 from PySide2.QtWidgets import QAction, QMenu
 
 import qt_ui.uiconstants as const
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.QBaseMenu2 import QBaseMenu2
-from theater import ControlPoint
 from .QMapObject import QMapObject
 from ...displayoptions import DisplayOptions
 from ...windows.GameUpdateSignal import GameUpdateSignal

qt_ui/widgets/map/QMapGroundObject.py

@@ -8,8 +8,8 @@ import qt_ui.uiconstants as const
 from game import Game
 from game.data.building_data import FORTIFICATION_BUILDINGS
 from game.db import REWARDS
+from game.theater import ControlPoint, TheaterGroundObject
 from qt_ui.windows.groundobject.QGroundObjectMenu import QGroundObjectMenu
-from theater import ControlPoint, TheaterGroundObject
 from .QMapObject import QMapObject
 from ...displayoptions import DisplayOptions
 

qt_ui/windows/basemenu/QBaseMenu2.py

@@ -2,12 +2,12 @@ from PySide2.QtCore import Qt
 from PySide2.QtGui import QCloseEvent, QPixmap
 from PySide2.QtWidgets import QDialog, QGridLayout, QHBoxLayout, QLabel, QWidget
 
+from game.theater import ControlPoint, ControlPointType
 from qt_ui.models import GameModel
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from qt_ui.windows.basemenu.QBaseMenuTabs import QBaseMenuTabs
 from qt_ui.windows.basemenu.QRecruitBehaviour import QRecruitBehaviour
-from theater import ControlPoint, ControlPointType
 
 
 class QBaseMenu2(QDialog):

qt_ui/windows/basemenu/QBaseMenuTabs.py

@@ -1,11 +1,11 @@
-from PySide2.QtWidgets import QFrame, QGridLayout, QLabel, QTabWidget
+from PySide2.QtWidgets import QTabWidget
 
+from game.theater import ControlPoint, OffMapSpawn
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.airfield.QAirfieldCommand import QAirfieldCommand
 from qt_ui.windows.basemenu.base_defenses.QBaseDefensesHQ import QBaseDefensesHQ
 from qt_ui.windows.basemenu.ground_forces.QGroundForcesHQ import QGroundForcesHQ
 from qt_ui.windows.basemenu.intel.QIntelInfo import QIntelInfo
-from theater import ControlPoint, OffMapSpawn
 
 
 class QBaseMenuTabs(QTabWidget):

qt_ui/windows/basemenu/QRecruitBehaviour.py

@@ -1,3 +1,5 @@
+import logging
+
 from PySide2.QtWidgets import (
     QGroupBox,
     QHBoxLayout,
@@ -6,17 +8,17 @@ from PySide2.QtWidgets import (
     QSizePolicy,
     QSpacerItem,
 )
-import logging
 from dcs.unittype import UnitType
 
-from theater import db
-
+from game import db
+from game.event import UnitsDeliveryEvent
+from game.theater import ControlPoint
+from qt_ui.models import GameModel
 
 
 class QRecruitBehaviour:
-    game = None
-    cp = None
-    deliveryEvent = None
+    game_model: GameModel
+    cp: ControlPoint
     existing_units_labels = None
     bought_amount_labels = None
     maximum_units = -1
@@ -24,12 +26,16 @@ class QRecruitBehaviour:
     BUDGET_FORMAT = "Available Budget: <b>${}M</b>"
 
     def __init__(self) -> None:
-        self.deliveryEvent = None
         self.bought_amount_labels = {}
         self.existing_units_labels = {}
         self.recruitable_types = []
         self.update_available_budget()
 
+    @property
+    def pending_deliveries(self) -> UnitsDeliveryEvent:
+        assert self.cp.pending_unit_deliveries
+        return self.cp.pending_unit_deliveries
+
     @property
     def budget(self) -> int:
         return self.game_model.game.budget
@@ -47,7 +53,7 @@ class QRecruitBehaviour:
         exist.setLayout(existLayout)
 
         existing_units = self.cp.base.total_units_of_type(unit_type)
-        scheduled_units = self.deliveryEvent.units.get(unit_type, 0)
+        scheduled_units = self.pending_deliveries.units.get(unit_type, 0)
 
         unitName = QLabel("<b>" + db.unit_type_name_2(unit_type) + "</b>")
         unitName.setSizePolicy(QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding))
@@ -103,7 +109,7 @@ class QRecruitBehaviour:
     def _update_count_label(self, unit_type: UnitType):
 
         self.bought_amount_labels[unit_type].setText("<b>{}</b>".format(
-            unit_type in self.deliveryEvent.units and "{}".format(self.deliveryEvent.units[unit_type]) or "0"
+            unit_type in self.pending_deliveries.units and "{}".format(self.pending_deliveries.units[unit_type]) or "0"
         ))
 
         self.existing_units_labels[unit_type].setText("<b>{}</b>".format(
@@ -129,7 +135,7 @@ class QRecruitBehaviour:
 
         price = db.PRICES[unit_type]
         if self.budget >= price:
-            self.deliveryEvent.deliver({unit_type: 1})
+            self.pending_deliveries.deliver({unit_type: 1})
             self.budget -= price
         else:
             # TODO : display modal warning
@@ -138,12 +144,12 @@ class QRecruitBehaviour:
         self.update_available_budget()
 
     def sell(self, unit_type):
-        if self.deliveryEvent.units.get(unit_type, 0) > 0:
+        if self.pending_deliveries.units.get(unit_type, 0) > 0:
             price = db.PRICES[unit_type]
             self.budget += price
-            self.deliveryEvent.units[unit_type] = self.deliveryEvent.units[unit_type] - 1
-            if self.deliveryEvent.units[unit_type] == 0:
-                del self.deliveryEvent.units[unit_type]
+            self.pending_deliveries.units[unit_type] = self.pending_deliveries.units[unit_type] - 1
+            if self.pending_deliveries.units[unit_type] == 0:
+                del self.pending_deliveries.units[unit_type]
         elif self.cp.base.total_units_of_type(unit_type) > 0:
             price = db.PRICES[unit_type]
             self.budget += price
@@ -154,20 +160,14 @@ class QRecruitBehaviour:
 
     @property
     def total_units(self):
-
         total = 0
         for unit_type in self.recruitables_types:
             total += self.cp.base.total_units(unit_type)
-            print(unit_type, total, self.cp.base.total_units(unit_type))
-        print("--------------------------------")
 
-        if self.deliveryEvent:
-            for unit_bought in self.deliveryEvent.units:
+        if self.pending_deliveries:
+            for unit_bought in self.pending_deliveries.units:
                 if db.unit_task(unit_bought) in self.recruitables_types:
-                    total += self.deliveryEvent.units[unit_bought]
-                    print(unit_bought, total, self.deliveryEvent.units[unit_bought])
-
-        print("=============================")
+                    total += self.pending_deliveries.units[unit_bought]
 
         return total
 
@@ -181,4 +181,4 @@ class QRecruitBehaviour:
         """
         Set the maximum number of units that can be bought
         """
-        self.recruitables_types = recruitables_types
+        self.recruitables_types = recruitables_types

qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py

@@ -11,13 +11,14 @@ from PySide2.QtWidgets import (
     QVBoxLayout,
     QWidget,
 )
+from dcs.task import CAP, CAS
 from dcs.unittype import UnitType
 
-from game.event.event import UnitsDeliveryEvent
+from game import db
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.uiconstants import ICONS
 from qt_ui.windows.basemenu.QRecruitBehaviour import QRecruitBehaviour
-from theater import CAP, CAS, ControlPoint, db
 
 
 class QAircraftRecruitmentMenu(QFrame, QRecruitBehaviour):
@@ -25,17 +26,10 @@ class QAircraftRecruitmentMenu(QFrame, QRecruitBehaviour):
         QFrame.__init__(self)
         self.cp = cp
         self.game_model = game_model
-        self.deliveryEvent: Optional[UnitsDeliveryEvent] = None
 
         self.bought_amount_labels = {}
         self.existing_units_labels = {}
 
-        for event in self.game_model.game.events:
-            if event.__class__ == UnitsDeliveryEvent and event.from_cp == self.cp:
-                self.deliveryEvent = event
-        if not self.deliveryEvent:
-            self.deliveryEvent = self.game_model.game.units_delivery_event(self.cp)
-
         # Determine maximum number of aircrafts that can be bought
         self.set_maximum_units(self.cp.available_aircraft_slots)
         self.set_recruitable_types([CAP, CAS])
@@ -92,7 +86,7 @@ class QAircraftRecruitmentMenu(QFrame, QRecruitBehaviour):
     def sell(self, unit_type: UnitType):
         # Don't need to remove aircraft from the inventory if we're canceling
         # orders.
-        if self.deliveryEvent.units.get(unit_type, 0) <= 0:
+        if self.pending_deliveries.units.get(unit_type, 0) <= 0:
             global_inventory = self.game_model.game.aircraft_inventory
             inventory = global_inventory.for_control_point(self.cp)
             try:

qt_ui/windows/basemenu/airfield/QAirfieldCommand.py

@@ -1,10 +1,10 @@
 from PySide2.QtWidgets import QFrame, QGridLayout, QGroupBox, QVBoxLayout
 
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.airfield.QAircraftRecruitmentMenu import \
     QAircraftRecruitmentMenu
 from qt_ui.windows.mission.QPlannedFlightsView import QPlannedFlightsView
-from theater import ControlPoint
 
 
 class QAirfieldCommand(QFrame):

qt_ui/windows/basemenu/base_defenses/QBaseDefenseGroupInfo.py

@@ -1,10 +1,16 @@
 from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QGridLayout, QLabel, QGroupBox, QPushButton, QVBoxLayout
+from PySide2.QtWidgets import (
+    QGridLayout,
+    QGroupBox,
+    QLabel,
+    QPushButton,
+    QVBoxLayout,
+)
 
+from game.theater import ControlPoint, TheaterGroundObject
 from qt_ui.dialogs import Dialog
 from qt_ui.uiconstants import VEHICLES_ICONS
 from qt_ui.windows.groundobject.QGroundObjectMenu import QGroundObjectMenu
-from theater import ControlPoint, TheaterGroundObject
 
 
 class QBaseDefenseGroupInfo(QGroupBox):

qt_ui/windows/basemenu/base_defenses/QBaseDefensesHQ.py

@@ -1,7 +1,9 @@
 from PySide2.QtWidgets import QFrame, QGridLayout
+
 from game import Game
-from qt_ui.windows.basemenu.base_defenses.QBaseInformation import QBaseInformation
-from theater import ControlPoint
+from game.theater import ControlPoint
+from qt_ui.windows.basemenu.base_defenses.QBaseInformation import \
+    QBaseInformation
 
 
 class QBaseDefensesHQ(QFrame):

qt_ui/windows/basemenu/base_defenses/QBaseInformation.py

@@ -1,10 +1,15 @@
 from PySide2.QtGui import Qt
-from PySide2.QtWidgets import QGridLayout, QLabel, QGroupBox, QVBoxLayout, QFrame, QWidget, QScrollArea
+from PySide2.QtWidgets import (
+    QFrame,
+    QGridLayout,
+    QScrollArea,
+    QVBoxLayout,
+    QWidget,
+)
 
-from game import db
-from qt_ui.uiconstants import AIRCRAFT_ICONS, VEHICLES_ICONS
-from qt_ui.windows.basemenu.base_defenses.QBaseDefenseGroupInfo import QBaseDefenseGroupInfo
-from theater import ControlPoint, Airport
+from game.theater import Airport, ControlPoint
+from qt_ui.windows.basemenu.base_defenses.QBaseDefenseGroupInfo import \
+    QBaseDefenseGroupInfo
 
 
 class QBaseInformation(QFrame):

qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py

@@ -6,11 +6,12 @@ from PySide2.QtWidgets import (
     QVBoxLayout,
     QWidget,
 )
+from dcs.task import PinpointStrike
 
-from game.event import UnitsDeliveryEvent
+from game import db
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.QRecruitBehaviour import QRecruitBehaviour
-from theater import ControlPoint, PinpointStrike, db
 
 
 class QArmorRecruitmentMenu(QFrame, QRecruitBehaviour):
@@ -23,12 +24,6 @@ class QArmorRecruitmentMenu(QFrame, QRecruitBehaviour):
         self.bought_amount_labels = {}
         self.existing_units_labels = {}
 
-        for event in self.game_model.game.events:
-            if event.__class__ == UnitsDeliveryEvent and event.from_cp == self.cp:
-                self.deliveryEvent = event
-        if not self.deliveryEvent:
-            self.deliveryEvent = self.game_model.game.units_delivery_event(self.cp)
-
         self.init_ui()
 
     def init_ui(self):
@@ -61,4 +56,4 @@ class QArmorRecruitmentMenu(QFrame, QRecruitBehaviour):
         scroll.setWidgetResizable(True)
         scroll.setWidget(scroll_content)
         main_layout.addWidget(scroll)
-        self.setLayout(main_layout)
+        self.setLayout(main_layout)

qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py

@@ -1,11 +1,11 @@
 from PySide2.QtWidgets import QFrame, QGridLayout
 
+from game.theater import ControlPoint
 from qt_ui.models import GameModel
 from qt_ui.windows.basemenu.ground_forces.QArmorRecruitmentMenu import \
     QArmorRecruitmentMenu
 from qt_ui.windows.basemenu.ground_forces.QGroundForcesStrategy import \
     QGroundForcesStrategy
-from theater import ControlPoint
 
 
 class QGroundForcesHQ(QFrame):

qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py

@@ -1,8 +1,9 @@
-from PySide2.QtWidgets import QLabel, QGroupBox, QVBoxLayout
+from PySide2.QtWidgets import QGroupBox, QLabel, QVBoxLayout
 
 from game import Game
-from qt_ui.windows.basemenu.ground_forces.QGroundForcesStrategySelector import QGroundForcesStrategySelector
-from theater import ControlPoint
+from game.theater import ControlPoint
+from qt_ui.windows.basemenu.ground_forces.QGroundForcesStrategySelector import \
+    QGroundForcesStrategySelector
 
 
 class QGroundForcesStrategy(QGroupBox):

qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py

@@ -1,6 +1,6 @@
 from PySide2.QtWidgets import QComboBox
 
-from theater import ControlPoint, CombatStance
+from game.theater import CombatStance, ControlPoint
 
 
 class QGroundForcesStrategySelector(QComboBox):

qt_ui/windows/basemenu/intel/QIntelInfo.py

@@ -1,11 +1,14 @@
+from PySide2.QtWidgets import (
+    QFrame,
+    QGridLayout,
+    QGroupBox,
+    QLabel,
+    QVBoxLayout,
+)
+from dcs.task import CAP, CAS, Embarking, PinpointStrike
 
-
-from PySide2.QtWidgets import QLabel, QGroupBox, QVBoxLayout, QFrame, QGridLayout
-from dcs.task import Embarking, CAS, PinpointStrike, CAP
-
-from game import Game
-from qt_ui.windows.basemenu.ground_forces.QGroundForcesStrategySelector import QGroundForcesStrategySelector
-from theater import ControlPoint, db
+from game import Game, db
+from game.theater import ControlPoint
 
 
 class QIntelInfo(QFrame):

qt_ui/windows/groundobject/QGroundObjectMenu.py

@@ -2,20 +2,31 @@ import logging
 
 from PySide2 import QtCore
 from PySide2.QtGui import Qt
-from PySide2.QtWidgets import QHBoxLayout, QDialog, QGridLayout, QLabel, QGroupBox, QVBoxLayout, QPushButton, \
-    QComboBox, QSpinBox, QMessageBox
+from PySide2.QtWidgets import (
+    QComboBox,
+    QDialog,
+    QGridLayout,
+    QGroupBox,
+    QHBoxLayout,
+    QLabel,
+    QMessageBox,
+    QPushButton,
+    QSpinBox,
+    QVBoxLayout,
+)
 from dcs import Point
 
 from game import Game, db
 from game.data.building_data import FORTIFICATION_BUILDINGS
-from game.db import PRICES, REWARDS, unit_type_of, PinpointStrike
-from gen.defenses.armor_group_generator import generate_armor_group_of_type_and_size
+from game.db import PRICES, PinpointStrike, REWARDS, unit_type_of
+from game.theater import ControlPoint, TheaterGroundObject
+from gen.defenses.armor_group_generator import \
+    generate_armor_group_of_type_and_size
 from gen.sam.sam_group_generator import get_faction_possible_sams_generator
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.widgets.QBudgetBox import QBudgetBox
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from qt_ui.windows.groundobject.QBuildingInfo import QBuildingInfo
-from theater import ControlPoint, TheaterGroundObject
 
 
 class QGroundObjectMenu(QDialog):

qt_ui/windows/mission/flight/QFlightCreator.py

@@ -10,15 +10,17 @@ from PySide2.QtWidgets import (
 from dcs.planes import PlaneType
 
 from game import Game
+from game.theater import ControlPoint, OffMapSpawn
 from gen.ato import Package
 from gen.flights.flight import Flight
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.widgets.QFlightSizeSpinner import QFlightSizeSpinner
 from qt_ui.widgets.QLabeledWidget import QLabeledWidget
 from qt_ui.widgets.combos.QAircraftTypeSelector import QAircraftTypeSelector
+from qt_ui.widgets.combos.QArrivalAirfieldSelector import \
+    QArrivalAirfieldSelector
 from qt_ui.widgets.combos.QFlightTypeComboBox import QFlightTypeComboBox
 from qt_ui.widgets.combos.QOriginAirfieldSelector import QOriginAirfieldSelector
-from theater import ControlPoint, OffMapSpawn
 
 
 class QFlightCreator(QDialog):
@@ -49,16 +51,30 @@ class QFlightCreator(QDialog):
             self.on_aircraft_changed)
         layout.addLayout(QLabeledWidget("Aircraft:", self.aircraft_selector))
 
-        self.airfield_selector = QOriginAirfieldSelector(
+        self.departure = QOriginAirfieldSelector(
             self.game.aircraft_inventory,
             [cp for cp in game.theater.controlpoints if cp.captured],
             self.aircraft_selector.currentData()
         )
-        self.airfield_selector.availability_changed.connect(self.update_max_size)
-        layout.addLayout(QLabeledWidget("Airfield:", self.airfield_selector))
+        self.departure.availability_changed.connect(self.update_max_size)
+        layout.addLayout(QLabeledWidget("Departure:", self.departure))
+
+        self.arrival = QArrivalAirfieldSelector(
+            [cp for cp in game.theater.controlpoints if cp.captured],
+            self.aircraft_selector.currentData(),
+            "Same as departure"
+        )
+        layout.addLayout(QLabeledWidget("Arrival:", self.arrival))
+
+        self.divert = QArrivalAirfieldSelector(
+            [cp for cp in game.theater.controlpoints if cp.captured],
+            self.aircraft_selector.currentData(),
+            "None"
+        )
+        layout.addLayout(QLabeledWidget("Divert:", self.divert))
 
         self.flight_size_spinner = QFlightSizeSpinner()
-        self.update_max_size(self.airfield_selector.available)
+        self.update_max_size(self.departure.available)
         layout.addLayout(QLabeledWidget("Size:", self.flight_size_spinner))
 
         self.client_slots_spinner = QFlightSizeSpinner(
@@ -82,10 +98,16 @@ class QFlightCreator(QDialog):
 
     def verify_form(self) -> Optional[str]:
         aircraft: PlaneType = self.aircraft_selector.currentData()
-        origin: ControlPoint = self.airfield_selector.currentData()
+        origin: ControlPoint = self.departure.currentData()
+        arrival: ControlPoint = self.arrival.currentData()
+        divert: ControlPoint = self.divert.currentData()
         size: int = self.flight_size_spinner.value()
         if not origin.captured:
             return f"{origin.name} is not owned by your coalition."
+        if arrival is not None and not arrival.captured:
+            return f"{arrival.name} is not owned by your coalition."
+        if divert is not None and not divert.captured:
+            return f"{divert.name} is not owned by your coalition."
         available = origin.base.aircraft.get(aircraft, 0)
         if not available:
             return f"{origin.name} has no {aircraft.id} available."
@@ -104,16 +126,22 @@ class QFlightCreator(QDialog):
 
         task = self.task_selector.currentData()
         aircraft = self.aircraft_selector.currentData()
-        origin = self.airfield_selector.currentData()
+        origin = self.departure.currentData()
+        arrival = self.arrival.currentData()
+        divert = self.divert.currentData()
         size = self.flight_size_spinner.value()
 
+        if arrival is None:
+            arrival = origin
+
         if isinstance(origin, OffMapSpawn):
             start_type = "In Flight"
         elif self.game.settings.perf_ai_parking_start:
             start_type = "Cold"
         else:
             start_type = "Warm"
-        flight = Flight(self.package, aircraft, size, origin, task, start_type)
+        flight = Flight(self.package, aircraft, size, task, start_type, origin,
+                        arrival, divert)
         flight.client_count = self.client_slots_spinner.value()
 
         # noinspection PyUnresolvedReferences
@@ -122,7 +150,9 @@ class QFlightCreator(QDialog):
 
     def on_aircraft_changed(self, index: int) -> None:
         new_aircraft = self.aircraft_selector.itemData(index)
-        self.airfield_selector.change_aircraft(new_aircraft)
+        self.departure.change_aircraft(new_aircraft)
+        self.arrival.change_aircraft(new_aircraft)
+        self.divert.change_aircraft(new_aircraft)
 
     def update_max_size(self, available: int) -> None:
         self.flight_size_spinner.setMaximum(min(available, 4))

qt_ui/windows/newgame/QCampaignList.py

@@ -12,7 +12,7 @@ from PySide2.QtGui import QStandardItem, QStandardItemModel
 from PySide2.QtWidgets import QAbstractItemView, QListView
 
 import qt_ui.uiconstants as CONST
-from theater import ConflictTheater
+from game.theater import ConflictTheater
 
 
 @dataclass(frozen=True)