From a024be6b1d6ab65f4dd1ed108f29a81dad86b3f8 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. Resolves #1952 --- changelog.md | 1 + game/squadrons/squadron.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 9f36ec2e..0aa8f31a 100644 --- a/changelog.md +++ b/changelog.md @@ -28,6 +28,7 @@ Saves from 5.x are not compatible with 6.0. * **[Mission Generation]** Fixed an issue which prevented the mission generation if two controlpoints are really close to each other (e.g. Marianas campaigns) * **[Mission Generation]** Fixed the SA-5 Generator to use the P-19 FlatFace SR as a Fallback radar if the faction does not have access to the TinShield SR. * **[Mission Generation]** Fixed incorrect SA-5 threat range when TR destroyed. It will not count as threat anymore when the TR is dead. +* **[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. * **[UI]** Enable / Disable the settings, save and stats actions if no game is loaded to prevent an error as these functions can only be used on a valid game. * **[UI]** Added missing icons for Tornado GR4, and Tornado IDS. diff --git a/game/squadrons/squadron.py b/game/squadrons/squadron.py index f2078bd9..f7d95ac0 100644 --- a/game/squadrons/squadron.py +++ b/game/squadrons/squadron.py @@ -339,7 +339,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}.")