Fix some typing in preparation for pydcs types.

Not complete, but progress.

gen/fleet/cn_dd_group.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import random
 from typing import TYPE_CHECKING
 
-
 from dcs.ships import (
     Type_052C,
     Type_052B,
@@ -11,9 +10,9 @@ from dcs.ships import (
 )
 
 from game.factions.faction import Faction
+from game.theater.theatergroundobject import ShipGroundObject
 from gen.fleet.dd_group import DDGroupGenerator
 from gen.sam.group_generator import ShipGroupGenerator
-from game.theater.theatergroundobject import TheaterGroundObject
 
 if TYPE_CHECKING:
     from game.game import Game
@@ -65,9 +64,7 @@ class ChineseNavyGroupGenerator(ShipGroupGenerator):
 
 
 class Type54GroupGenerator(DDGroupGenerator):
-    def __init__(
-        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
-    ):
+    def __init__(self, game: Game, ground_object: ShipGroundObject, faction: Faction):
         super(Type54GroupGenerator, self).__init__(
             game, ground_object, faction, Type_054A
         )

gen/fleet/dd_group.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
+
 from typing import TYPE_CHECKING, Type
 
-from game.factions.faction import Faction
-from game.theater.theatergroundobject import TheaterGroundObject
-
-from gen.sam.group_generator import ShipGroupGenerator
-from dcs.unittype import ShipType
 from dcs.ships import PERRY, USS_Arleigh_Burke_IIa
+from dcs.unittype import ShipType
+
+from game.factions.faction import Faction
+from game.theater.theatergroundobject import ShipGroundObject
+from gen.sam.group_generator import ShipGroupGenerator
 
 if TYPE_CHECKING:
     from game.game import Game
@@ -16,7 +17,7 @@ class DDGroupGenerator(ShipGroupGenerator):
     def __init__(
         self,
         game: Game,
-        ground_object: TheaterGroundObject,
+        ground_object: ShipGroundObject,
         faction: Faction,
         ddtype: Type[ShipType],
     ):
@@ -42,18 +43,14 @@ class DDGroupGenerator(ShipGroupGenerator):
 
 
 class OliverHazardPerryGroupGenerator(DDGroupGenerator):
-    def __init__(
-        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
-    ):
+    def __init__(self, game: Game, ground_object: ShipGroundObject, faction: Faction):
         super(OliverHazardPerryGroupGenerator, self).__init__(
             game, ground_object, faction, PERRY
         )
 
 
 class ArleighBurkeGroupGenerator(DDGroupGenerator):
-    def __init__(
-        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
-    ):
+    def __init__(self, game: Game, ground_object: ShipGroundObject, faction: Faction):
         super(ArleighBurkeGroupGenerator, self).__init__(
             game, ground_object, faction, USS_Arleigh_Burke_IIa
         )

gen/fleet/lacombattanteII.py

@@ -2,14 +2,12 @@ from dcs.ships import La_Combattante_II
 
 from game import Game
 from game.factions.faction import Faction
-from game.theater import TheaterGroundObject
+from game.theater.theatergroundobject import ShipGroundObject
 from gen.fleet.dd_group import DDGroupGenerator
 
 
 class LaCombattanteIIGroupGenerator(DDGroupGenerator):
-    def __init__(
-        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
-    ):
+    def __init__(self, game: Game, ground_object: ShipGroundObject, faction: Faction):
         super(LaCombattanteIIGroupGenerator, self).__init__(
             game, ground_object, faction, La_Combattante_II
         )

gen/fleet/ru_dd_group.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+
 import random
 from typing import TYPE_CHECKING
 
@@ -12,11 +13,10 @@ from dcs.ships import (
     SOM,
 )
 
+from game.factions.faction import Faction
+from game.theater.theatergroundobject import ShipGroundObject
 from gen.fleet.dd_group import DDGroupGenerator
 from gen.sam.group_generator import ShipGroupGenerator
-from game.factions.faction import Faction
-from game.theater.theatergroundobject import TheaterGroundObject
-
 
 if TYPE_CHECKING:
     from game.game import Game
@@ -85,32 +85,24 @@ class RussianNavyGroupGenerator(ShipGroupGenerator):
 
 
 class GrishaGroupGenerator(DDGroupGenerator):
-    def __init__(
-        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
-    ):
+    def __init__(self, game: Game, ground_object: ShipGroundObject, faction: Faction):
         super(GrishaGroupGenerator, self).__init__(
             game, ground_object, faction, ALBATROS
         )
 
 
 class MolniyaGroupGenerator(DDGroupGenerator):
-    def __init__(
-        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
-    ):
+    def __init__(self, game: Game, ground_object: ShipGroundObject, faction: Faction):
         super(MolniyaGroupGenerator, self).__init__(
             game, ground_object, faction, MOLNIYA
         )
 
 
 class KiloSubGroupGenerator(DDGroupGenerator):
-    def __init__(
-        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
-    ):
+    def __init__(self, game: Game, ground_object: ShipGroundObject, faction: Faction):
         super(KiloSubGroupGenerator, self).__init__(game, ground_object, faction, KILO)
 
 
 class TangoSubGroupGenerator(DDGroupGenerator):
-    def __init__(
-        self, game: Game, ground_object: TheaterGroundObject, faction: Faction
-    ):
+    def __init__(self, game: Game, ground_object: ShipGroundObject, faction: Faction):
         super(TangoSubGroupGenerator, self).__init__(game, ground_object, faction, SOM)