From 1ce8d9c2b725266121dec3cc644a5510cd997945 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sat, 7 Oct 2023 14:08:53 +0200 Subject: [PATCH] Cleanup after cherry-pick --- game/ato/flightmember.py | 2 -- game/game.py | 2 -- game/missiongenerator/aircraft/flightgroupconfigurator.py | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/game/ato/flightmember.py b/game/ato/flightmember.py index ddb2cca4..51b4266f 100644 --- a/game/ato/flightmember.py +++ b/game/ato/flightmember.py @@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Any from game.ato.loadouts import Loadout from game.lasercodes import LaserCode -from game.savecompat import has_save_compat_for if TYPE_CHECKING: from game.squadrons import Pilot @@ -18,7 +17,6 @@ class FlightMember: self.tgp_laser_code: LaserCode | None = None self.properties: dict[str, bool | float | int] = {} - @has_save_compat_for(9) def __setstate__(self, state: dict[str, Any]) -> None: if "tgp_laser_code" not in state: state["tgp_laser_code"] = None diff --git a/game/game.py b/game/game.py index 2efc7233..ebe47cfb 100644 --- a/game/game.py +++ b/game/game.py @@ -30,7 +30,6 @@ from .dcs.countries import country_with_name from .infos.information import Information from .lasercodes.lasercoderegistry import LaserCodeRegistry from .profiling import logged_duration -from .savecompat import has_save_compat_for from .settings import Settings from .theater import ConflictTheater from .theater.bullseye import Bullseye @@ -151,7 +150,6 @@ class Game: self.on_load(game_still_initializing=True) - @has_save_compat_for(9) def __setstate__(self, state: dict[str, Any]) -> None: self.__dict__.update(state) if not hasattr(self, "laser_code_registry"): diff --git a/game/missiongenerator/aircraft/flightgroupconfigurator.py b/game/missiongenerator/aircraft/flightgroupconfigurator.py index 1935a48f..84dd1d64 100644 --- a/game/missiongenerator/aircraft/flightgroupconfigurator.py +++ b/game/missiongenerator/aircraft/flightgroupconfigurator.py @@ -15,7 +15,7 @@ from dcs.unitgroup import FlyingGroup from game.ato import Flight, FlightType from game.callsigns import callsign_for_support_unit -from game.data.weapons import Pylon +from game.data.weapons import Pylon, WeaponType from game.missiongenerator.logisticsgenerator import LogisticsGenerator from game.missiongenerator.missiondata import MissionData, AwacsInfo, TankerInfo from game.radio.radios import RadioFrequency, RadioRegistry @@ -153,7 +153,7 @@ class FlightGroupConfigurator: return jammer_required = settings.plugin_option("ewrj.ecm_required") if jammer_required: - ecm = WeaponTypeEnum.JAMMER + ecm = WeaponType.JAMMER if not member.loadout.has_weapon_of_type(ecm): return ewrj_menu_trigger = TriggerStart(comment=f"EWRJ-{unit.name}")