Fix convoys not spawning where they should.

This commit is contained in:
Dan Albert 2021-04-23 20:23:23 -07:00
parent d80f7ebf3b
commit d3fdbdbca5
2 changed files with 11 additions and 2 deletions

View File

@ -6,6 +6,7 @@ from dataclasses import dataclass, field
from functools import singledispatchmethod
from typing import Dict, Iterator, List, Optional, TYPE_CHECKING, Type
from dcs.mapping import Point
from dcs.unittype import FlyingType, VehicleType
from gen.ato import Package
@ -246,6 +247,14 @@ class Convoy(MissionTarget, Transport):
def description(self) -> str:
return f"In a convoy to {self.destination}"
@property
def route_start(self) -> Point:
return self.origin.convoy_spawns[self.destination]
@property
def route_end(self) -> Point:
return self.destination.convoy_spawns[self.origin]
class ConvoyMap:
def __init__(self) -> None:

View File

@ -33,12 +33,12 @@ class ConvoyGenerator:
def generate_convoy(self, convoy: Convoy) -> VehicleGroup:
group = self._create_mixed_unit_group(
convoy.name,
convoy.origin.position,
convoy.route_start,
convoy.units,
convoy.player_owned,
)
group.add_waypoint(
convoy.destination.position,
convoy.route_end,
speed=kph(40).kph,
move_formation=PointAction.OnRoad,
)