Spawn convoys for transfers.

Destroying these units currently has no effect.

https://github.com/Khopa/dcs_liberation/issues/824

game/operation/operation.py

@@ -22,6 +22,7 @@ from gen.airsupportgen import AirSupport, AirSupportConflictGenerator
 from gen.armor import GroundConflictGenerator, JtacInfo
 from gen.beacons import load_beacons_for_terrain
 from gen.briefinggen import BriefingGenerator, MissionInfoGenerator
+from gen.convoys import ConvoyGenerator
 from gen.environmentgen import EnvironmentGenerator
 from gen.forcedoptionsgen import ForcedOptionsGenerator
 from gen.groundobjectsgen import GroundObjectsGenerator
@@ -314,6 +315,7 @@ class Operation:
             cls.airgen.flights, cls.airsupportgen.air_support
         )
         cls._generate_ground_conflicts()
+        cls._generate_convoys()
 
         # Triggers
         triggersgen = TriggersGenerator(cls.current_mission, cls.game)
@@ -428,6 +430,11 @@ class Operation:
             ground_conflict_gen.generate()
             cls.jtacs.extend(ground_conflict_gen.jtacs)
 
+    @classmethod
+    def _generate_convoys(cls) -> None:
+        """Generates convoys for unit transfers by road."""
+        ConvoyGenerator(cls.current_mission, cls.game, cls.unit_map).generate()
+
     @classmethod
     def reset_naming_ids(cls):
         namegen.reset_numbers()

game/transfers.py

@@ -1,6 +1,6 @@
 import logging
 from dataclasses import dataclass, field
-from typing import Dict, List, Type
+from typing import Dict, Iterator, List, Type
 
 from dcs.unittype import VehicleType
 from game.theater import ControlPoint
@@ -49,6 +49,9 @@ class PendingTransfers:
     def __init__(self) -> None:
         self.pending_transfers: List[RoadTransferOrder] = []
 
+    def __iter__(self) -> Iterator[RoadTransferOrder]:
+        yield from self.pending_transfers
+
     @property
     def pending_transfer_count(self) -> int:
         return len(self.pending_transfers)

game/unitmap.py

@@ -9,6 +9,7 @@ from dcs.unittype import VehicleType
 from game import db
 from game.theater import Airfield, ControlPoint, TheaterGroundObject
 from game.theater.theatergroundobject import BuildingGroundObject
+from game.transfers import RoadTransferOrder
 from gen.flights.flight import Flight
 
 
@@ -25,6 +26,12 @@ class GroundObjectUnit:
     unit: Unit
 
 
+@dataclass(frozen=True)
+class ConvoyUnit:
+    unit_type: Type[VehicleType]
+    transfer: RoadTransferOrder
+
+
 @dataclass(frozen=True)
 class Building:
     ground_object: BuildingGroundObject
@@ -37,6 +44,7 @@ class UnitMap:
         self.front_line_units: Dict[str, FrontLineUnit] = {}
         self.ground_object_units: Dict[str, GroundObjectUnit] = {}
         self.buildings: Dict[str, Building] = {}
+        self.convoys: Dict[str, ConvoyUnit] = {}
 
     def add_aircraft(self, group: FlyingGroup, flight: Flight) -> None:
         for unit in group.units:
@@ -113,6 +121,25 @@ class UnitMap:
     def ground_object_unit(self, name: str) -> Optional[GroundObjectUnit]:
         return self.ground_object_units.get(name, None)
 
+    def add_convoy_units(self, group: Group, transfer: RoadTransferOrder) -> None:
+        for unit in group.units:
+            # The actual name is a String (the pydcs translatable string), which
+            # doesn't define __eq__.
+            name = str(unit.name)
+            if name in self.convoys:
+                raise RuntimeError(f"Duplicate convoy unit: {name}")
+            unit_type = db.unit_type_from_name(unit.type)
+            if unit_type is None:
+                raise RuntimeError(f"Unknown unit type: {unit.type}")
+            if not issubclass(unit_type, VehicleType):
+                raise RuntimeError(
+                    f"{name} is a {unit_type.__name__}, expected a VehicleType"
+                )
+            self.convoys[name] = ConvoyUnit(unit_type, transfer)
+
+    def convoy_unit(self, name: str) -> Optional[ConvoyUnit]:
+        return self.convoys.get(name, None)
+
     def add_building(self, ground_object: BuildingGroundObject, group: Group) -> None:
         # The actual name is a String (the pydcs translatable string), which
         # doesn't define __eq__.