Clean up CAP types.

Stop using "CAP". Use BARCAP or TARCAP instead.

TARCAP no longer allowed anywhere but front lines, since that's all we
have mission planning for right now. Later will add TARCAP and BARCAP
for all objective types with different timing profiles.

Part two of the fix for
https://github.com/Khopa/dcs_liberation/issues/210.

qt_ui/widgets/combos/QFlightTypeComboBox.py

@@ -19,7 +19,6 @@ class QFlightTypeComboBox(QComboBox):
 
     COMMON_ENEMY_MISSIONS = [
         FlightType.ESCORT,
-        FlightType.TARCAP,
         FlightType.SEAD,
         FlightType.DEAD,
         # TODO: FlightType.ELINT,
@@ -27,42 +26,46 @@ class QFlightTypeComboBox(QComboBox):
         # TODO: FlightType.RECON,
     ]
 
-    FRIENDLY_AIRBASE_MISSIONS = [
-        FlightType.CAP,
-        # TODO: FlightType.INTERCEPTION
-        # TODO: FlightType.LOGISTICS
+    COMMON_FRIENDLY_MISSIONS = [
+        FlightType.BARCAP,
     ]
 
+    FRIENDLY_AIRBASE_MISSIONS = [
+        # TODO: FlightType.INTERCEPTION
+        # TODO: FlightType.LOGISTICS
+    ] + COMMON_FRIENDLY_MISSIONS
+
     FRIENDLY_CARRIER_MISSIONS = [
-        FlightType.BARCAP,
         # TODO: FlightType.INTERCEPTION
         # TODO: Buddy tanking for the A-4?
         # TODO: Rescue chopper?
         # TODO: Inter-ship logistics?
-    ]
+    ] + COMMON_FRIENDLY_MISSIONS
 
     ENEMY_CARRIER_MISSIONS = [
         FlightType.ESCORT,
-        FlightType.TARCAP,
+        FlightType.BARCAP,
         # TODO: FlightType.ANTISHIP
     ]
 
     ENEMY_AIRBASE_MISSIONS = [
+        FlightType.BARCAP,
         # TODO: FlightType.STRIKE
     ] + COMMON_ENEMY_MISSIONS
 
     FRIENDLY_GROUND_OBJECT_MISSIONS = [
-        FlightType.CAP,
         # TODO: FlightType.LOGISTICS
         # TODO: FlightType.TROOP_TRANSPORT
-    ]
+    ] + COMMON_FRIENDLY_MISSIONS
 
     ENEMY_GROUND_OBJECT_MISSIONS = [
+        FlightType.BARCAP,
         FlightType.STRIKE,
     ] + COMMON_ENEMY_MISSIONS
 
     FRONT_LINE_MISSIONS = [
         FlightType.CAS,
+        FlightType.TARCAP,
         # TODO: FlightType.TROOP_TRANSPORT
         # TODO: FlightType.EVAC
     ] + COMMON_ENEMY_MISSIONS

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

@@ -54,6 +54,7 @@ class QFlightWaypointTab(QFrame):
         rlayout.addWidget(QLabel("<strong>Generator :</strong>"))
         rlayout.addWidget(QLabel("<small>AI compatible</small>"))
 
+        # TODO: Filter by objective type.
         self.recreate_buttons.clear()
         recreate_types = [
             FlightType.CAS,
@@ -137,13 +138,16 @@ class QFlightWaypointTab(QFrame):
             QMessageBox.Yes
         )
         if result == QMessageBox.Yes:
-            # TODO: These should all be just CAP.
+            # TODO: Should be buttons for both BARCAP and TARCAP.
+            # BARCAP and TARCAP behave differently. TARCAP arrives a few minutes
+            # ahead of the rest of the package and stays until the package
+            # departs, whereas BARCAP usually isn't part of a strike package and
+            # has a fixed mission time.
             if task == FlightType.CAP:
                 if isinstance(self.package.target, FrontLine):
                     task = FlightType.TARCAP
                 elif isinstance(self.package.target, ControlPoint):
-                    if self.package.target.is_fleet:
-                        task = FlightType.BARCAP
+                    task = FlightType.BARCAP
             self.flight.flight_type = task
             self.planner.populate_flight_plan(self.flight)
             self.flight_waypoint_list.update_list()