From eb8859ebea4c7e07f4801dc0a227c95a428d6c35 Mon Sep 17 00:00:00 2001 From: MetalStormGhost <89945461+MetalStormGhost@users.noreply.github.com> Date: Sun, 6 Feb 2022 22:39:41 +0200 Subject: [PATCH] Don't reject exact fits when transferring squadrons. cherry-pick from a024be6b1d6ab65f4dd1ed108f29a81dad86b3f8 --- changelog.md | 1 + game/squadrons/squadron.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index ee1f6a4d..bffa7b6c 100644 --- a/changelog.md +++ b/changelog.md @@ -17,6 +17,7 @@ Saves from 5.1.0 are compatible with 5.2.0 * **[Mission Generation]** Fixed incorrect SA-5 and NASAMS threat range when TR destroyed. It will not count as threat anymore when the TR is dead. * **[Mission Generation]** Fixed "Max Threat Range" error * **[Mission Generation]** Fix unculled zones not updating when needed +* **[Mission Planner]** Now allows squadron transfers to control points where the number of free slots matches exactly the expected size of the transferring squadron next turn. * **[Data]** Removed Fw 190 A-8 and D-9 from Germany 1940 and 1942 faction list for historical accuracy. * **[Data]** Updated Loadouts for Tornado GR4, F-15E and F-16C * **[Data]** Corrected some unit data diff --git a/game/squadrons/squadron.py b/game/squadrons/squadron.py index 2a8c80ab..b67d8ddd 100644 --- a/game/squadrons/squadron.py +++ b/game/squadrons/squadron.py @@ -340,7 +340,7 @@ class Squadron: ) return - if self.expected_size_next_turn >= destination.unclaimed_parking(): + if self.expected_size_next_turn > destination.unclaimed_parking(): raise RuntimeError(f"Not enough parking for {self} at {destination}.") if not destination.can_operate(self.aircraft): raise RuntimeError(f"{self} cannot operate at {destination}.")