From d3fdbdbca54ac1972e0a7f66149eb6f65904fee5 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Fri, 23 Apr 2021 20:23:23 -0700
Subject: [PATCH] Fix convoys not spawning where they should.

---
 game/transfers.py | 9 +++++++++
 gen/convoys.py    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/game/transfers.py b/game/transfers.py
index 4236a7aa..b8832e4b 100644
--- a/game/transfers.py
+++ b/game/transfers.py
@@ -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:
diff --git a/gen/convoys.py b/gen/convoys.py
index aa0e3e3d..9c904009 100644
--- a/gen/convoys.py
+++ b/gen/convoys.py
@@ -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,
         )