From 20d8cc2b47e55ed987ffd711e845e981f3befb6b Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Fri, 23 Apr 2021 20:31:52 -0700
Subject: [PATCH] Plan transports at the beginning of the turn.

https://github.com/Khopa/dcs_liberation/issues/823
---
 game/game.py                     | 2 ++
 game/transfers.py                | 6 +++---
 gen/flights/ai_flight_planner.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/game/game.py b/game/game.py
index e264842f..ec687561 100644
--- a/game/game.py
+++ b/game/game.py
@@ -337,6 +337,8 @@ class Game:
         self.compute_threat_zones()
         self.ground_planners = {}
 
+        self.transfers.plan_transports()
+
         blue_planner = CoalitionMissionPlanner(self, is_player=True)
         blue_planner.plan_missions()
 
diff --git a/game/transfers.py b/game/transfers.py
index b8832e4b..545f004f 100644
--- a/game/transfers.py
+++ b/game/transfers.py
@@ -394,9 +394,9 @@ class PendingTransfers:
             if not transfer.completed:
                 incomplete.append(transfer)
         self.pending_transfers = incomplete
-        self.rebuild_convoys()
 
-    def rebuild_convoys(self) -> None:
+    def plan_transports(self) -> None:
         self.convoys.disband_all()
         for transfer in self.pending_transfers:
-            self.arrange_transport(transfer)
+            if transfer.transport is None:
+                self.arrange_transport(transfer)
diff --git a/gen/flights/ai_flight_planner.py b/gen/flights/ai_flight_planner.py
index a07bb6dd..87d00a60 100644
--- a/gen/flights/ai_flight_planner.py
+++ b/gen/flights/ai_flight_planner.py
@@ -39,7 +39,7 @@ from game.theater.theatergroundobject import (
     NavalGroundObject,
     VehicleGroupGroundObject,
 )
-from game.transfers import Convoy
+from game.transfers import Convoy, TransferOrder
 from game.utils import Distance, nautical_miles
 from gen import Conflict
 from gen.ato import Package