Remove save compat since it's breaking anyway.

Removal of old paths/names for things that no longer exist.

gen/flights/ai_flight_planner.py

@@ -21,6 +21,19 @@ from dcs.unittype import FlyingType, UnitType
 from game import db
 from game.data.radar_db import UNITS_WITH_RADAR
 from game.infos.information import Information
+from game.theater import (
+    ControlPoint,
+    FrontLine,
+    MissionTarget,
+    OffMapSpawn,
+    SamGroundObject,
+    TheaterGroundObject,
+)
+# Avoid importing some types that cause circular imports unless type checking.
+from game.theater.theatergroundobject import (
+    EwrGroundObject,
+    NavalGroundObject, VehicleGroupGroundObject,
+)
 from game.utils import nm_to_meter
 from gen import Conflict
 from gen.ato import Package
@@ -46,19 +59,6 @@ from gen.flights.flight import (
 )
 from gen.flights.flightplan import FlightPlanBuilder
 from gen.flights.traveltime import TotEstimator
-from theater import (
-    ControlPoint,
-    FrontLine,
-    MissionTarget,
-    OffMapSpawn, TheaterGroundObject,
-    SamGroundObject,
-)
-
-# Avoid importing some types that cause circular imports unless type checking.
-from game.theater.theatergroundobject import (
-    EwrGroundObject,
-    NavalGroundObject, VehicleGroupGroundObject,
-)
 
 if TYPE_CHECKING:
     from game import Game

gen/flights/closestairfields.py

@@ -1,7 +1,7 @@
 """Objective adjacency lists."""
 from typing import Dict, Iterator, List, Optional
 
-from theater import ConflictTheater, ControlPoint, MissionTarget
+from game.theater import ConflictTheater, ControlPoint, MissionTarget
 
 
 class ClosestAirfields:

gen/flights/flightplan.py

@@ -7,20 +7,19 @@ generating the waypoints for the mission.
 """
 from __future__ import annotations
 
-import math
-from datetime import timedelta
-from functools import cached_property
 import logging
+import math
 import random
 from dataclasses import dataclass
+from datetime import timedelta
+from functools import cached_property
 from typing import Iterator, List, Optional, Set, TYPE_CHECKING, Tuple
 
 from dcs.mapping import Point
 from dcs.unit import Unit
 
 from game.data.doctrine import Doctrine
-from game.utils import nm_to_meter
-from theater import (
+from game.theater import (
     ControlPoint,
     FrontLine,
     MissionTarget,
@@ -28,6 +27,7 @@ from theater import (
     TheaterGroundObject,
 )
 from game.theater.theatergroundobject import EwrGroundObject
+from game.utils import nm_to_meter
 from .closestairfields import ObjectiveDistanceCache
 from .flight import Flight, FlightType, FlightWaypoint, FlightWaypointType
 from .traveltime import GroundSpeed, TravelTime
@@ -393,10 +393,6 @@ class TarCapFlightPlan(PatrollingFlightPlan):
         return super().patrol_end_time
 
 
-# TODO: Remove when breaking save compat.
-FrontLineCapFlightPlan = TarCapFlightPlan
-
-
 @dataclass(frozen=True)
 class StrikeFlightPlan(FormationFlightPlan):
     takeoff: FlightWaypoint

gen/flights/waypointbuilder.py

@@ -8,14 +8,13 @@ from dcs.unit import Unit
 from dcs.unitgroup import VehicleGroup
 
 from game.data.doctrine import Doctrine
-from game.utils import feet_to_meter
-from game.weather import Conditions
-from theater import (
+from game.theater import (
     ControlPoint,
     MissionTarget,
     OffMapSpawn,
     TheaterGroundObject,
 )
+from game.weather import Conditions
 from .flight import Flight, FlightWaypoint, FlightWaypointType