Fix some typing in preparation for pydcs types.

Not complete, but progress.

(cherry picked from commit 53f6a0b32b)

gen/flights/ai_flight_planner.py

@@ -18,6 +18,7 @@ from typing import (
     TYPE_CHECKING,
     Tuple,
     TypeVar,
+    Any,
 )
 
 from game.dcs.aircrafttype import AircraftType
@@ -284,7 +285,7 @@ class ObjectiveFinder:
         self.game = game
         self.is_player = is_player
 
-    def enemy_air_defenses(self) -> Iterator[tuple[TheaterGroundObject, Distance]]:
+    def enemy_air_defenses(self) -> Iterator[tuple[TheaterGroundObject[Any], Distance]]:
         """Iterates over all enemy SAM sites."""
         doctrine = self.game.faction_for(self.is_player).doctrine
         threat_zones = self.game.threat_zone_for(not self.is_player)
@@ -314,14 +315,14 @@ class ObjectiveFinder:
 
                 yield ground_object, target_range
 
-    def threatening_air_defenses(self) -> Iterator[TheaterGroundObject]:
+    def threatening_air_defenses(self) -> Iterator[TheaterGroundObject[Any]]:
         """Iterates over enemy SAMs in threat range of friendly control points.
 
         SAM sites are sorted by their closest proximity to any friendly control
         point (airfield or fleet).
         """
 
-        target_ranges: list[tuple[TheaterGroundObject, Distance]] = []
+        target_ranges: list[tuple[TheaterGroundObject[Any], Distance]] = []
         for target, threat_range in self.enemy_air_defenses():
             ranges: list[Distance] = []
             for cp in self.friendly_control_points():
@@ -385,13 +386,13 @@ class ObjectiveFinder:
         for target, _range in target_ranges:
             yield target
 
-    def strike_targets(self) -> Iterator[TheaterGroundObject]:
+    def strike_targets(self) -> Iterator[TheaterGroundObject[Any]]:
         """Iterates over enemy strike targets.
 
         Targets are sorted by their closest proximity to any friendly control
         point (airfield or fleet).
         """
-        targets: List[Tuple[TheaterGroundObject, int]] = []
+        targets: List[Tuple[TheaterGroundObject[Any], int]] = []
         # Building objectives are made of several individual TGOs (one per
         # building).
         found_targets: Set[str] = set()

gen/flights/flightplan.py

@@ -1130,7 +1130,7 @@ class FlightPlanBuilder:
         )
 
     @staticmethod
-    def anti_ship_targets_for_tgo(tgo: TheaterGroundObject) -> List[StrikeTarget]:
+    def anti_ship_targets_for_tgo(tgo: NavalGroundObject) -> List[StrikeTarget]:
         return [StrikeTarget(f"{g.name} at {tgo.name}", g) for g in tgo.groups]
 
     def generate_anti_ship(self, flight: Flight) -> StrikeFlightPlan:

gen/flights/waypointbuilder.py

@@ -10,6 +10,7 @@ from typing import (
     TYPE_CHECKING,
     Tuple,
     Union,
+    Any,
 )
 
 from dcs.mapping import Point
@@ -33,7 +34,9 @@ from .flight import Flight, FlightWaypoint, FlightWaypointType
 @dataclass(frozen=True)
 class StrikeTarget:
     name: str
-    target: Union[VehicleGroup, TheaterGroundObject, Unit, Group, MultiGroupTransport]
+    target: Union[
+        VehicleGroup, TheaterGroundObject[Any], Unit, Group, MultiGroupTransport
+    ]
 
 
 class WaypointBuilder: