weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup after cherry-pick

Browse Source
This commit is contained in:
Raffson 2023-10-07 14:08:53 +02:00
parent 17e539e524
commit 1ce8d9c2b7
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/ato/flightmember.py
View File

@ -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

2
game/game.py
View File

@ -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"):

4
game/missiongenerator/aircraft/flightgroupconfigurator.py
View File

@ -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}")