More adaptation for pydcs updates.

This is as much as we can do until pydcs actually adds the py.typed file. Once that's added there are a few ugly monkey patching corners that will just need `# type: ignore` for now, but we can't pre-add those since we have mypy warning us about superfluous ignore comments. (cherry picked from commit 96c7b87ac7)
2025-11-10 14:22:26 +00:00 · 2021-07-09 14:13:20 -07:00
parent 53a1c938c3
commit 1ea13954ec
27 changed files with 238 additions and 207 deletions
--- a/game/data/weapons.py
+++ b/game/data/weapons.py
@@ -5,14 +5,14 @@ import inspect
 import logging
 from collections import defaultdict
 from dataclasses import dataclass, field
-from typing import Dict, Iterator, Optional, Set, Tuple, Union, cast, Any
+from typing import Dict, Iterator, Optional, Set, Tuple, cast, Any

 from dcs.unitgroup import FlyingGroup
 from dcs.weapons_data import Weapons, weapon_ids

 from game.dcs.aircrafttype import AircraftType

-PydcsWeapon = Dict[str, Any]
+PydcsWeapon = Any
 PydcsWeaponAssignment = Tuple[int, PydcsWeapon]


@@ -83,7 +83,7 @@ class Pylon:
        # configuration.
        return weapon in self.allowed or weapon.cls_id == "<CLEAN>"

-    def equip(self, group: FlyingGroup, weapon: Weapon) -> None:
+    def equip(self, group: FlyingGroup[Any], weapon: Weapon) -> None:
        if not self.can_equip(weapon):
            logging.error(f"Pylon {self.number} cannot equip {weapon.name}")
        group.load_pylon(self.make_pydcs_assignment(weapon), self.number)
--- a/game/db.py
+++ b/game/db.py
@@ -31,7 +31,7 @@ from dcs.ships import (
 from dcs.terrain.terrain import Airport
 from dcs.unit import Ship
 from dcs.unitgroup import ShipGroup, StaticGroup
-from dcs.unittype import UnitType
+from dcs.unittype import UnitType, FlyingType, ShipType, VehicleType
 from dcs.vehicles import (
    vehicle_map,
 )
@@ -256,7 +256,7 @@ Aircraft livery overrides. Syntax as follows:
 `Identifier` is aircraft identifier (as used troughout the file) and "LiveryName" (with double quotes) 
 is livery name as found in mission editor.
 """
-PLANE_LIVERY_OVERRIDES = {
+PLANE_LIVERY_OVERRIDES: dict[Type[FlyingType], str] = {
    FA_18C_hornet: "VFA-34",  # default livery for the hornet is blue angels one
 }

@@ -327,7 +327,7 @@ REWARDS = {
 StartingPosition = Union[ShipGroup, StaticGroup, Airport, Point]


-def upgrade_to_supercarrier(unit: Type[Ship], name: str) -> Type[Ship]:
+def upgrade_to_supercarrier(unit: Type[ShipType], name: str) -> Type[ShipType]:
    if unit == Stennis:
        if name == "CVN-71 Theodore Roosevelt":
            return CVN_71
@@ -360,6 +360,14 @@ def unit_type_from_name(name: str) -> Optional[Type[UnitType]]:
        return None


+def vehicle_type_from_name(name: str) -> Type[VehicleType]:
+    return vehicle_map[name]
+
+
+def ship_type_from_name(name: str) -> Type[ShipType]:
+    return ship_map[name]
+
+
 def country_id_from_name(name: str) -> int:
    for k, v in country_dict.items():
        if v.name == name:
--- a/game/dcs/aircrafttype.py
+++ b/game/dcs/aircrafttype.py
@@ -105,6 +105,7 @@ class PatrolConfig:
        )


+# TODO: Split into PlaneType and HelicopterType?
@dataclass(frozen=True)
 class AircraftType(UnitType[Type[FlyingType]]):
    carrier_capable: bool
@@ -144,12 +145,23 @@ class AircraftType(UnitType[Type[FlyingType]]):
        return kph(self.dcs_unit_type.max_speed)

    def alloc_flight_radio(self, radio_registry: RadioRegistry) -> RadioFrequency:
-        from gen.radios import ChannelInUseError, MHz
+        from gen.radios import ChannelInUseError, kHz

        if self.intra_flight_radio is not None:
            return radio_registry.alloc_for_radio(self.intra_flight_radio)

-        freq = MHz(self.dcs_unit_type.radio_frequency)
+        # The default radio frequency is set in megahertz. For some aircraft, it is a
+        # floating point value. For all current aircraft, adjusting to kilohertz will be
+        # sufficient to convert to an integer.
+        in_khz = float(self.dcs_unit_type.radio_frequency) * 1000
+        if not in_khz.is_integer():
+            logging.warning(
+                f"Found unexpected sub-kHz default radio for {self}: {in_khz} kHz. "
+                "Truncating to integer. The truncated frequency may not be valid for "
+                "the aircraft."
+            )
+
+        freq = kHz(int(in_khz))
        try:
            radio_registry.reserve(freq)
        except ChannelInUseError:
--- a/game/debriefing.py
+++ b/game/debriefing.py
@@ -78,8 +78,8 @@ class GroundLosses:
    player_airlifts: List[AirliftUnits] = field(default_factory=list)
    enemy_airlifts: List[AirliftUnits] = field(default_factory=list)

-    player_ground_objects: List[GroundObjectUnit] = field(default_factory=list)
-    enemy_ground_objects: List[GroundObjectUnit] = field(default_factory=list)
+    player_ground_objects: List[GroundObjectUnit[Any]] = field(default_factory=list)
+    enemy_ground_objects: List[GroundObjectUnit[Any]] = field(default_factory=list)

    player_buildings: List[Building] = field(default_factory=list)
    enemy_buildings: List[Building] = field(default_factory=list)
@@ -166,7 +166,7 @@ class Debriefing:
        yield from self.ground_losses.enemy_airlifts

    @property
-    def ground_object_losses(self) -> Iterator[GroundObjectUnit]:
+    def ground_object_losses(self) -> Iterator[GroundObjectUnit[Any]]:
        yield from self.ground_losses.player_ground_objects
        yield from self.ground_losses.enemy_ground_objects

--- a/game/point_with_heading.py
+++ b/game/point_with_heading.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dcs import Point


@@ -7,7 +9,7 @@ class PointWithHeading(Point):
        self.heading = 0

    @staticmethod
-    def from_point(point: Point, heading: int) -> Point:
+    def from_point(point: Point, heading: int) -> PointWithHeading:
        p = PointWithHeading()
        p.x = point.x
        p.y = point.y
--- a/game/positioned.py
+++ b/game/positioned.py
@@ -0,0 +1,9 @@
+from typing import Protocol
+
+from dcs import Point
+
+
+class Positioned(Protocol):
+    @property
+    def position(self) -> Point:
+        raise NotImplementedError
--- a/game/theater/conflicttheater.py
+++ b/game/theater/conflicttheater.py
@@ -33,11 +33,10 @@ from dcs.terrain import (
 )
 from dcs.terrain.terrain import Airport, Terrain
 from dcs.unitgroup import (
-    FlyingGroup,
-    Group,
    ShipGroup,
    StaticGroup,
    VehicleGroup,
+    PlaneGroup,
 )
 from dcs.vehicles import AirDefence, Armor, MissilesSS, Unarmed
 from pyproj import CRS, Transformer
@@ -57,6 +56,7 @@ from .landmap import Landmap, load_landmap, poly_contains
 from .latlon import LatLon
 from .projections import TransverseMercator
 from ..point_with_heading import PointWithHeading
+from ..positioned import Positioned
 from ..profiling import logged_duration
 from ..scenery_group import SceneryGroup
 from ..utils import Distance, meters
@@ -185,7 +185,7 @@ class MizCampaignLoader:
    def red(self) -> Country:
        return self.country(blue=False)

-    def off_map_spawns(self, blue: bool) -> Iterator[FlyingGroup]:
+    def off_map_spawns(self, blue: bool) -> Iterator[PlaneGroup]:
        for group in self.country(blue).plane_group:
            if group.units[0].type == self.OFF_MAP_UNIT_TYPE:
                yield group
@@ -309,26 +309,26 @@ class MizCampaignLoader:
                control_point.captured = blue
                control_point.captured_invert = group.late_activation
                control_points[control_point.id] = control_point
-            for group in self.carriers(blue):
+            for ship in self.carriers(blue):
                # TODO: Name the carrier.
                control_point = Carrier(
-                    "carrier", group.position, next(self.control_point_id)
+                    "carrier", ship.position, next(self.control_point_id)
                )
                control_point.captured = blue
-                control_point.captured_invert = group.late_activation
+                control_point.captured_invert = ship.late_activation
                control_points[control_point.id] = control_point
-            for group in self.lhas(blue):
+            for ship in self.lhas(blue):
                # TODO: Name the LHA.db
-                control_point = Lha("lha", group.position, next(self.control_point_id))
+                control_point = Lha("lha", ship.position, next(self.control_point_id))
                control_point.captured = blue
-                control_point.captured_invert = group.late_activation
+                control_point.captured_invert = ship.late_activation
                control_points[control_point.id] = control_point
-            for group in self.fobs(blue):
+            for fob in self.fobs(blue):
                control_point = Fob(
-                    str(group.name), group.position, next(self.control_point_id)
+                    str(fob.name), fob.position, next(self.control_point_id)
                )
                control_point.captured = blue
-                control_point.captured_invert = group.late_activation
+                control_point.captured_invert = fob.late_activation
                control_points[control_point.id] = control_point

        return control_points
@@ -389,22 +389,22 @@ class MizCampaignLoader:
                origin, list(reversed(waypoints))
            )

-    def objective_info(self, group: Group) -> Tuple[ControlPoint, Distance]:
-        closest = self.theater.closest_control_point(group.position)
-        distance = meters(closest.position.distance_to_point(group.position))
+    def objective_info(self, near: Positioned) -> Tuple[ControlPoint, Distance]:
+        closest = self.theater.closest_control_point(near.position)
+        distance = meters(closest.position.distance_to_point(near.position))
        return closest, distance

    def add_preset_locations(self) -> None:
-        for group in self.offshore_strike_targets:
-            closest, distance = self.objective_info(group)
+        for static in self.offshore_strike_targets:
+            closest, distance = self.objective_info(static)
            closest.preset_locations.offshore_strike_locations.append(
-                PointWithHeading.from_point(group.position, group.units[0].heading)
+                PointWithHeading.from_point(static.position, static.units[0].heading)
            )

-        for group in self.ships:
-            closest, distance = self.objective_info(group)
+        for ship in self.ships:
+            closest, distance = self.objective_info(ship)
            closest.preset_locations.ships.append(
-                PointWithHeading.from_point(group.position, group.units[0].heading)
+                PointWithHeading.from_point(ship.position, ship.units[0].heading)
            )

        for group in self.missile_sites:
@@ -455,33 +455,33 @@ class MizCampaignLoader:
                PointWithHeading.from_point(group.position, group.units[0].heading)
            )

-        for group in self.helipads:
-            closest, distance = self.objective_info(group)
+        for static in self.helipads:
+            closest, distance = self.objective_info(static)
            closest.helipads.append(
-                PointWithHeading.from_point(group.position, group.units[0].heading)
+                PointWithHeading.from_point(static.position, static.units[0].heading)
            )

-        for group in self.factories:
-            closest, distance = self.objective_info(group)
+        for static in self.factories:
+            closest, distance = self.objective_info(static)
            closest.preset_locations.factories.append(
-                PointWithHeading.from_point(group.position, group.units[0].heading)
+                PointWithHeading.from_point(static.position, static.units[0].heading)
            )

-        for group in self.ammunition_depots:
-            closest, distance = self.objective_info(group)
+        for static in self.ammunition_depots:
+            closest, distance = self.objective_info(static)
            closest.preset_locations.ammunition_depots.append(
-                PointWithHeading.from_point(group.position, group.units[0].heading)
+                PointWithHeading.from_point(static.position, static.units[0].heading)
            )

-        for group in self.strike_targets:
-            closest, distance = self.objective_info(group)
+        for static in self.strike_targets:
+            closest, distance = self.objective_info(static)
            closest.preset_locations.strike_locations.append(
-                PointWithHeading.from_point(group.position, group.units[0].heading)
+                PointWithHeading.from_point(static.position, static.units[0].heading)
            )

-        for group in self.scenery:
-            closest, distance = self.objective_info(group)
-            closest.preset_locations.scenery.append(group)
+        for scenery_group in self.scenery:
+            closest, distance = self.objective_info(scenery_group)
+            closest.preset_locations.scenery.append(scenery_group)

    def populate_theater(self) -> None:
        for control_point in self.control_points.values():
@@ -587,12 +587,12 @@ class ConflictTheater:

        return True

-    def nearest_land_pos(self, point: Point, extend_dist: int = 50) -> Point:
+    def nearest_land_pos(self, near: Point, extend_dist: int = 50) -> Point:
        """Returns the nearest point inside a land exclusion zone from point
        `extend_dist` determines how far inside the zone the point should be placed"""
-        if self.is_on_land(point):
-            return point
-        point = geometry.Point(point.x, point.y)
+        if self.is_on_land(near):
+            return near
+        point = geometry.Point(near.x, near.y)
        nearest_points = []
        if not self.landmap:
            raise RuntimeError("Landmap not initialized")
--- a/game/theater/controlpoint.py
+++ b/game/theater/controlpoint.py
@@ -751,7 +751,7 @@ class ControlPoint(MissionTarget, ABC):
        return len([obj for obj in self.connected_objectives if obj.category == "ammo"])

    @property
-    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+    def strike_targets(self) -> Sequence[Union[MissionTarget, Unit]]:
        return []

    @property
--- a/game/theater/frontline.py
+++ b/game/theater/frontline.py
@@ -2,7 +2,7 @@ from __future__ import annotations

 import logging
 from dataclasses import dataclass
-from typing import Iterator, List, Tuple
+from typing import Iterator, List, Tuple, Any

 from dcs.mapping import Point

@@ -66,7 +66,15 @@ class FrontLine(MissionTarget):
        self.segments: List[FrontLineSegment] = [
            FrontLineSegment(a, b) for a, b in pairwise(route)
        ]
-        self.name = f"Front line {blue_point}/{red_point}"
+        super().__init__(
+            f"Front line {blue_point}/{red_point}",
+            self.point_from_a(self._position_distance),
+        )
+
+    def __setstate__(self, state: dict[str, Any]) -> None:
+        self.__dict__.update(state)
+        if not hasattr(self, "position"):
+            self.position = self.point_from_a(self._position_distance)

    def control_point_hostile_to(self, player: bool) -> ControlPoint:
        if player:
@@ -87,14 +95,6 @@ class FrontLine(MissionTarget):
        ]
        yield from super().mission_types(for_player)

-    @property
-    def position(self) -> Point:
-        """
-        The position where the conflict should occur
-        according to the current strength of each control point.
-        """
-        return self.point_from_a(self._position_distance)
-
    @property
    def points(self) -> Iterator[Point]:
        yield self.segments[0].point_a
@@ -149,6 +149,9 @@ class FrontLine(MissionTarget):
                )
            else:
                remaining_dist -= segment.attack_distance
+        raise RuntimeError(
+            f"Could not find front line point {distance} from {self.blue_cp}"
+        )

    @property
    def _position_distance(self) -> float:
--- a/game/theater/missiontarget.py
+++ b/game/theater/missiontarget.py
@@ -1,5 +1,6 @@
 from __future__ import annotations

+from collections import Sequence
 from typing import Iterator, TYPE_CHECKING, List, Union

 from dcs.mapping import Point
@@ -45,5 +46,5 @@ class MissionTarget:
            ]

    @property
-    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+    def strike_targets(self) -> Sequence[Union[MissionTarget, Unit]]:
        return []
--- a/game/theater/theatergroundobject.py
+++ b/game/theater/theatergroundobject.py
@@ -2,13 +2,13 @@ from __future__ import annotations

 import itertools
 import logging
+from collections import Sequence
 from typing import Iterator, List, TYPE_CHECKING, Union, Generic, TypeVar, Any

 from dcs.mapping import Point
 from dcs.triggers import TriggerZone
 from dcs.unit import Unit
-from dcs.unitgroup import Group, ShipGroup, VehicleGroup
-from dcs.unittype import VehicleType
+from dcs.unitgroup import ShipGroup, VehicleGroup

 from .. import db
 from ..data.radar_db import (
@@ -47,7 +47,7 @@ NAME_BY_CATEGORY = {
 }


-GroupT = TypeVar("GroupT", bound=Group)
+GroupT = TypeVar("GroupT", ShipGroup, VehicleGroup)


 class TheaterGroundObject(MissionTarget, Generic[GroupT]):
@@ -150,7 +150,7 @@ class TheaterGroundObject(MissionTarget, Generic[GroupT]):
                return True
        return False

-    def _max_range_of_type(self, group: Group, range_type: str) -> Distance:
+    def _max_range_of_type(self, group: GroupT, range_type: str) -> Distance:
        if not self.might_have_aa:
            return meters(0)

@@ -171,13 +171,13 @@ class TheaterGroundObject(MissionTarget, Generic[GroupT]):
    def max_detection_range(self) -> Distance:
        return max(self.detection_range(g) for g in self.groups)

-    def detection_range(self, group: Group) -> Distance:
+    def detection_range(self, group: GroupT) -> Distance:
        return self._max_range_of_type(group, "detection_range")

    def max_threat_range(self) -> Distance:
        return max(self.threat_range(g) for g in self.groups)

-    def threat_range(self, group: Group, radar_only: bool = False) -> Distance:
+    def threat_range(self, group: GroupT, radar_only: bool = False) -> Distance:
        return self._max_range_of_type(group, "threat_range")

    @property
@@ -190,7 +190,7 @@ class TheaterGroundObject(MissionTarget, Generic[GroupT]):
        return False

    @property
-    def strike_targets(self) -> List[Union[MissionTarget, Unit]]:
+    def strike_targets(self) -> Sequence[Union[MissionTarget, Unit]]:
        return self.units

    @property
@@ -497,33 +497,25 @@ class SamGroundObject(TheaterGroundObject[VehicleGroup]):
    def might_have_aa(self) -> bool:
        return True

-    def threat_range(self, group: Group, radar_only: bool = False) -> Distance:
+    def threat_range(self, group: VehicleGroup, radar_only: bool = False) -> Distance:
        max_non_radar = meters(0)
        live_trs = set()
        max_telar_range = meters(0)
        launchers = set()
        for unit in group.units:
-            unit_type = db.unit_type_from_name(unit.type)
-            if unit_type is None or not issubclass(unit_type, VehicleType):
-                continue
+            unit_type = db.vehicle_type_from_name(unit.type)
            if unit_type in TRACK_RADARS:
                live_trs.add(unit_type)
            elif unit_type in TELARS:
-                max_telar_range = max(
-                    max_telar_range, meters(getattr(unit_type, "threat_range", 0))
-                )
+                max_telar_range = max(max_telar_range, meters(unit_type.threat_range))
            elif unit_type in LAUNCHER_TRACKER_PAIRS:
                launchers.add(unit_type)
            else:
-                max_non_radar = max(
-                    max_non_radar, meters(getattr(unit_type, "threat_range", 0))
-                )
+                max_non_radar = max(max_non_radar, meters(unit_type.threat_range))
        max_tel_range = meters(0)
        for launcher in launchers:
            if LAUNCHER_TRACKER_PAIRS[launcher] in live_trs:
-                max_tel_range = max(
-                    max_tel_range, meters(getattr(launcher, "threat_range"))
-                )
+                max_tel_range = max(max_tel_range, meters(unit_type.threat_range))
        if radar_only:
            return max(max_tel_range, max_telar_range)
        else:
--- a/game/unitdelivery.py
+++ b/game/unitdelivery.py
@@ -5,8 +5,6 @@ from collections import defaultdict
 from dataclasses import dataclass
 from typing import Optional, TYPE_CHECKING, Any

-from dcs.unittype import UnitType as DcsUnitType
-
 from game.theater import ControlPoint
 from .dcs.groundunittype import GroundUnitType
 from .dcs.unittype import UnitType
@@ -48,27 +46,27 @@ class PendingUnitDeliveries:
        self.units = defaultdict(int)

    def refund_ground_units(self, game: Game) -> None:
-        ground_units: dict[UnitType[DcsUnitType], int] = {
+        ground_units: dict[UnitType[Any], int] = {
            u: self.units[u] for u in self.units.keys() if isinstance(u, GroundUnitType)
        }
        self.refund(game, ground_units)
        for gu in ground_units.keys():
            del self.units[gu]

-    def refund(self, game: Game, units: dict[UnitType[DcsUnitType], int]) -> None:
+    def refund(self, game: Game, units: dict[UnitType[Any], int]) -> None:
        for unit_type, count in units.items():
            logging.info(f"Refunding {count} {unit_type} at {self.destination.name}")
            game.adjust_budget(
                unit_type.price * count, player=self.destination.captured
            )

-    def pending_orders(self, unit_type: UnitType[DcsUnitType]) -> int:
+    def pending_orders(self, unit_type: UnitType[Any]) -> int:
        pending_units = self.units.get(unit_type)
        if pending_units is None:
            pending_units = 0
        return pending_units

-    def available_next_turn(self, unit_type: UnitType[DcsUnitType]) -> int:
+    def available_next_turn(self, unit_type: UnitType[Any]) -> int:
        current_units = self.destination.base.total_units_of_type(unit_type)
        return self.pending_orders(unit_type) + current_units

@@ -81,9 +79,9 @@ class PendingUnitDeliveries:
            )
            self.refund_ground_units(game)

-        bought_units: dict[UnitType[DcsUnitType], int] = {}
+        bought_units: dict[UnitType[Any], int] = {}
        units_needing_transfer: dict[GroundUnitType, int] = {}
-        sold_units: dict[UnitType[DcsUnitType], int] = {}
+        sold_units: dict[UnitType[Any], int] = {}
        for unit_type, count in self.units.items():
            coalition = "Ally" if self.destination.captured else "Enemy"
            d: dict[Any, int]
--- a/game/unitmap.py
+++ b/game/unitmap.py
@@ -2,10 +2,10 @@
 import itertools
 import math
 from dataclasses import dataclass
-from typing import Dict, Optional, Any
+from typing import Dict, Optional, Any, Union, TypeVar, Generic

-from dcs.unit import Unit
-from dcs.unitgroup import FlyingGroup, Group, VehicleGroup
+from dcs.unit import Vehicle, Ship
+from dcs.unitgroup import FlyingGroup, VehicleGroup, StaticGroup, ShipGroup, MovingGroup

 from game.dcs.groundunittype import GroundUnitType
 from game.squadrons import Pilot
@@ -27,11 +27,14 @@ class FrontLineUnit:
    origin: ControlPoint


+UnitT = TypeVar("UnitT", Ship, Vehicle)
+
+
@dataclass(frozen=True)
-class GroundObjectUnit:
+class GroundObjectUnit(Generic[UnitT]):
    ground_object: TheaterGroundObject[Any]
-    group: Group
-    unit: Unit
+    group: MovingGroup[UnitT]
+    unit: UnitT


@dataclass(frozen=True)
@@ -56,13 +59,13 @@ class UnitMap:
        self.aircraft: Dict[str, FlyingUnit] = {}
        self.airfields: Dict[str, Airfield] = {}
        self.front_line_units: Dict[str, FrontLineUnit] = {}
-        self.ground_object_units: Dict[str, GroundObjectUnit] = {}
+        self.ground_object_units: Dict[str, GroundObjectUnit[Any]] = {}
        self.buildings: Dict[str, Building] = {}
        self.convoys: Dict[str, ConvoyUnit] = {}
        self.cargo_ships: Dict[str, CargoShip] = {}
        self.airlifts: Dict[str, AirliftUnits] = {}

-    def add_aircraft(self, group: FlyingGroup, flight: Flight) -> None:
+    def add_aircraft(self, group: FlyingGroup[Any], flight: Flight) -> None:
        for pilot, unit in zip(flight.roster.pilots, group.units):
            # The actual name is a String (the pydcs translatable string), which
            # doesn't define __eq__.
@@ -85,7 +88,7 @@ class UnitMap:
        return self.airfields.get(name, None)

    def add_front_line_units(
-        self, group: Group, origin: ControlPoint, unit_type: GroundUnitType
+        self, group: VehicleGroup, origin: ControlPoint, unit_type: GroundUnitType
    ) -> None:
        for unit in group.units:
            # The actual name is a String (the pydcs translatable string), which
@@ -101,8 +104,8 @@ class UnitMap:
    def add_ground_object_units(
        self,
        ground_object: TheaterGroundObject[Any],
-        persistence_group: Group,
-        miz_group: Group,
+        persistence_group: Union[ShipGroup, VehicleGroup],
+        miz_group: Union[ShipGroup, VehicleGroup],
    ) -> None:
        """Adds a group associated with a TGO to the unit map.

@@ -131,10 +134,10 @@ class UnitMap:
                ground_object, persistence_group, persistent_unit
            )

-    def ground_object_unit(self, name: str) -> Optional[GroundObjectUnit]:
+    def ground_object_unit(self, name: str) -> Optional[GroundObjectUnit[Any]]:
        return self.ground_object_units.get(name, None)

-    def add_convoy_units(self, group: Group, convoy: Convoy) -> None:
+    def add_convoy_units(self, group: VehicleGroup, convoy: Convoy) -> None:
        for unit, unit_type in zip(group.units, convoy.iter_units()):
            # The actual name is a String (the pydcs translatable string), which
            # doesn't define __eq__.
@@ -146,7 +149,7 @@ class UnitMap:
    def convoy_unit(self, name: str) -> Optional[ConvoyUnit]:
        return self.convoys.get(name, None)

-    def add_cargo_ship(self, group: Group, ship: CargoShip) -> None:
+    def add_cargo_ship(self, group: ShipGroup, ship: CargoShip) -> None:
        if len(group.units) > 1:
            # Cargo ship "groups" are single units. Killing the one ship kills the whole
            # transfer. If we ever want to add escorts or create multiple cargo ships in
@@ -163,7 +166,9 @@ class UnitMap:
    def cargo_ship(self, name: str) -> Optional[CargoShip]:
        return self.cargo_ships.get(name, None)

-    def add_airlift_units(self, group: FlyingGroup, transfer: TransferOrder) -> None:
+    def add_airlift_units(
+        self, group: FlyingGroup[Any], transfer: TransferOrder
+    ) -> None:
        capacity_each = math.ceil(transfer.size / len(group.units))
        for idx, transport in enumerate(group.units):
            # Slice the units in groups based on the capacity of each unit. Cargo is
@@ -186,7 +191,9 @@ class UnitMap:
    def airlift_unit(self, name: str) -> Optional[AirliftUnits]:
        return self.airlifts.get(name, None)

-    def add_building(self, ground_object: BuildingGroundObject, group: Group) -> None:
+    def add_building(
+        self, ground_object: BuildingGroundObject, group: StaticGroup
+    ) -> None:
        # The actual name is a String (the pydcs translatable string), which
        # doesn't define __eq__.
        # The name of the initiator in the DCS dead event will have " object"