From 38ff691eacc3d7d70d1f34920dd47596ddf4d6c5 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sun, 24 Jul 2022 19:30:30 +0200 Subject: [PATCH] Fix squadron reuse. This was never marking the original squadron as claimed. Just update the object rather than cloning it. Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2011 (cherry picked from commit 6e555167e068a727ed0e104be81615965437de45) --- game/campaignloader/defaultsquadronassigner.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/game/campaignloader/defaultsquadronassigner.py b/game/campaignloader/defaultsquadronassigner.py index 59356b01..8911c9b4 100644 --- a/game/campaignloader/defaultsquadronassigner.py +++ b/game/campaignloader/defaultsquadronassigner.py @@ -158,12 +158,11 @@ class DefaultSquadronAssigner: if squadron_def is None: return None - overrides: Dict[str, Union[str, int]] = {} if config.name is not None: - overrides["name"] = config.name + squadron_def.name = config.name if config.nickname is not None: - overrides["nickname"] = config.nickname + squadron_def.nickname = config.nickname if config.female_pilot_percentage is not None: - overrides["female_pilot_percentage"] = config.female_pilot_percentage + squadron_def.female_pilot_percentage = config.female_pilot_percentage - return dataclasses.replace(squadron_def, **overrides) + return squadron_def