Add off-map spawn locations.

The AI isn't making use of these yet, but it's not smart enough to do so
anyway.

Would benefit from an icon to differentiate it on the map.

I'm stretching the definition of "control point" quite a bit. We might
want to put a class above `ControlPoint` for `AirSpawnLocation` to
represent types of spawn locations that can't be captured and don't have
ground objectives.

Fixes https://github.com/Khopa/dcs_liberation/issues/274

qt_ui/widgets/map/QMapControlPoint.py

@@ -79,11 +79,8 @@ class QMapControlPoint(QMapObject):
 
         for connected in self.control_point.connected_points:
             if connected.captured:
+                menu.addAction(self.capture_action)
                 break
-        else:
-            return
-
-        menu.addAction(self.capture_action)
 
     def cheat_capture(self) -> None:
         self.control_point.capture(self.game_model.game, for_player=True)

qt_ui/widgets/map/QMapObject.py

@@ -47,9 +47,12 @@ class QMapObject(QGraphicsRectItem):
         object_details_action.triggered.connect(self.on_click)
         menu.addAction(object_details_action)
 
-        new_package_action = QAction(f"New package")
-        new_package_action.triggered.connect(self.open_new_package_dialog)
-        menu.addAction(new_package_action)
+        # Not all locations have valid objetives. Off-map spawns, for example,
+        # have no mission types.
+        if list(self.mission_target.mission_types(for_player=True)):
+            new_package_action = QAction(f"New package")
+            new_package_action.triggered.connect(self.open_new_package_dialog)
+            menu.addAction(new_package_action)
 
         self.add_context_menu_actions(menu)
 

qt_ui/windows/basemenu/QBaseMenu2.py

@@ -18,7 +18,6 @@ class QBaseMenu2(QDialog):
         # Attrs
         self.cp = cp
         self.game_model = game_model
-        self.is_carrier = self.cp.cptype in [ControlPointType.AIRCRAFT_CARRIER_GROUP, ControlPointType.LHA_GROUP]
         self.objectName = "menuDialogue"
 
         # Widgets

qt_ui/windows/basemenu/QBaseMenuTabs.py

@@ -5,39 +5,30 @@ 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
+from theater import ControlPoint, OffMapSpawn
 
 
 class QBaseMenuTabs(QTabWidget):
 
     def __init__(self, cp: ControlPoint, game_model: GameModel):
         super(QBaseMenuTabs, self).__init__()
-        self.cp = cp
-        if cp:
-
-            if not cp.captured:
-                if not cp.is_carrier:
-                    self.base_defenses_hq = QBaseDefensesHQ(cp, game_model.game)
-                    self.addTab(self.base_defenses_hq, "Base Defenses")
-                self.intel = QIntelInfo(cp, game_model.game)
-                self.addTab(self.intel, "Intel")
-            else:
-                if cp.has_runway():
-                    self.airfield_command = QAirfieldCommand(cp, game_model)
-                    self.addTab(self.airfield_command, "Airfield Command")
-
-                if not cp.is_carrier:
-                    self.ground_forces_hq = QGroundForcesHQ(cp, game_model)
-                    self.addTab(self.ground_forces_hq, "Ground Forces HQ")
-                    self.base_defenses_hq = QBaseDefensesHQ(cp, game_model.game)
-                    self.addTab(self.base_defenses_hq, "Base Defenses")
-                else:
-                    self.base_defenses_hq = QBaseDefensesHQ(cp, game_model.game)
-                    self.addTab(self.base_defenses_hq, "Fleet")
 
+        if not cp.captured:
+            if not cp.is_carrier and not isinstance(cp, OffMapSpawn):
+                self.base_defenses_hq = QBaseDefensesHQ(cp, game_model.game)
+                self.addTab(self.base_defenses_hq, "Base Defenses")
+            self.intel = QIntelInfo(cp, game_model.game)
+            self.addTab(self.intel, "Intel")
         else:
-            tabError = QFrame()
-            l = QGridLayout()
-            l.addWidget(QLabel("No Control Point"))
-            tabError.setLayout(l)
-            self.addTab(tabError, "No Control Point")
+            if cp.has_runway():
+                self.airfield_command = QAirfieldCommand(cp, game_model)
+                self.addTab(self.airfield_command, "Airfield Command")
+
+            if cp.is_carrier:
+                self.base_defenses_hq = QBaseDefensesHQ(cp, game_model.game)
+                self.addTab(self.base_defenses_hq, "Fleet")
+            elif not isinstance(cp, OffMapSpawn):
+                self.ground_forces_hq = QGroundForcesHQ(cp, game_model)
+                self.addTab(self.ground_forces_hq, "Ground Forces HQ")
+                self.base_defenses_hq = QBaseDefensesHQ(cp, game_model.game)
+                self.addTab(self.base_defenses_hq, "Base Defenses")

qt_ui/windows/mission/flight/QFlightCreator.py

@@ -18,7 +18,7 @@ from qt_ui.widgets.QLabeledWidget import QLabeledWidget
 from qt_ui.widgets.combos.QAircraftTypeSelector import QAircraftTypeSelector
 from qt_ui.widgets.combos.QFlightTypeComboBox import QFlightTypeComboBox
 from qt_ui.widgets.combos.QOriginAirfieldSelector import QOriginAirfieldSelector
-from theater import ControlPoint
+from theater import ControlPoint, OffMapSpawn
 
 
 class QFlightCreator(QDialog):
@@ -107,7 +107,9 @@ class QFlightCreator(QDialog):
         origin = self.airfield_selector.currentData()
         size = self.flight_size_spinner.value()
 
-        if self.game.settings.perf_ai_parking_start:
+        if isinstance(origin, OffMapSpawn):
+            start_type = "In Flight"
+        elif self.game.settings.perf_ai_parking_start:
             start_type = "Cold"
         else:
             start_type = "Warm"

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

@@ -42,15 +42,7 @@ class QFlightWaypointList(QTableView):
 
         self.model.setHorizontalHeaderLabels(["Name", "Alt", "TOT/DEPART"])
 
-        # The first waypoint is set up by pydcs at mission generation time, so
-        # we need to add that waypoint manually.
-        takeoff = FlightWaypoint(self.flight.from_cp.position.x,
-                                 self.flight.from_cp.position.y, 0)
-        takeoff.description = "Take Off"
-        takeoff.name = takeoff.pretty_name = "Take Off from " + self.flight.from_cp.name
-        takeoff.alt_type = "RADIO"
-
-        waypoints = itertools.chain([takeoff], self.flight.points)
+        waypoints = self.flight.flight_plan.waypoints
         for row, waypoint in enumerate(waypoints):
             self.add_waypoint_row(row, self.flight, waypoint)
         self.selectionModel().setCurrentIndex(self.indexAt(QPoint(1, 1)),