weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor use_countermeasures to faction (#3459)

Browse Source
This commit is contained in:
zhexu14 2024-11-11 20:47:24 +11:00 committed by GitHub
parent fa41b00ef0
commit e47e95f89f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/data/doctrine.py
View File

@ -117,8 +117,6 @@ class Cap:
@dataclass(frozen=True) @dataclass(frozen=True)
class Tactics: class Tactics:
#: Aircraft use countermeasures (chaff, flares)
use_countermeasures: bool
#: Air-to-air missile attack range options #: Air-to-air missile attack range options
air_to_air_missile_attack_range: Optional[OptAAMissileAttackRange.Values] air_to_air_missile_attack_range: Optional[OptAAMissileAttackRange.Values]
@ -129,7 +127,6 @@ class Tactics:
@staticmethod @staticmethod
def from_dict(data: dict[str, Any]) -> Tactics: def from_dict(data: dict[str, Any]) -> Tactics:
return Tactics( return Tactics(
use_countermeasures=data.get("use_countermeasures", True),
air_to_air_missile_attack_range=None, air_to_air_missile_attack_range=None,
air_defence_evades_anti_radiation_missiles=data.get( air_defence_evades_anti_radiation_missiles=data.get(
"air_defence_evades_anti_radiation_missiles", False "air_defence_evades_anti_radiation_missiles", False

5
game/factions/faction.py
View File

@ -123,6 +123,9 @@ class Faction:
#: weapons groups to their introduction years. #: weapons groups to their introduction years.
weapons_introduction_year_overrides: Dict[str, int] = field(default_factory=dict) weapons_introduction_year_overrides: Dict[str, int] = field(default_factory=dict)
#: Set to True if the faction has access to countermeasures (chaff and flares).
countermeasures_available: bool = True
def has_access_to_dcs_type(self, unit_type: Type[DcsUnitType]) -> bool: def has_access_to_dcs_type(self, unit_type: Type[DcsUnitType]) -> bool:
# Vehicle and Ship Units # Vehicle and Ship Units
if any(unit_type == u.dcs_unit_type for u in self.accessible_units): if any(unit_type == u.dcs_unit_type for u in self.accessible_units):
@ -271,6 +274,8 @@ class Faction:
"weapons_introduction_year_overrides", {} "weapons_introduction_year_overrides", {}
) )
faction.countermeasures_available = json.get("countermeasures_available", True)
return faction return faction
@property @property

1
resources/doctrines/coldwar.yaml
View File

@ -32,6 +32,5 @@ helicopter:
rendezvous_altitude_ft_agl: 1500 rendezvous_altitude_ft_agl: 1500
air_assault_nav_altitude_ft_agl: 1500 air_assault_nav_altitude_ft_agl: 1500
tactics: tactics:
use_countermeasures: true
air_defence_evades_anti_radiation_missiles: false air_defence_evades_anti_radiation_missiles: false
air_to_air_missile_attack_range: ~ air_to_air_missile_attack_range: ~

1
resources/doctrines/modern.yaml
View File

@ -32,6 +32,5 @@ helicopter:
rendezvous_altitude_ft_agl: 1500 rendezvous_altitude_ft_agl: 1500
air_assault_nav_altitude_ft_agl: 1500 air_assault_nav_altitude_ft_agl: 1500
tactics: tactics:
use_countermeasures: true
air_defence_evades_anti_radiation_missiles: false air_defence_evades_anti_radiation_missiles: false
air_to_air_missile_attack_range: ~ air_to_air_missile_attack_range: ~

1
resources/doctrines/ww2.yaml
View File

@ -31,6 +31,5 @@ helicopter:
rendezvous_altitude_ft_agl: 1500 rendezvous_altitude_ft_agl: 1500
air_assault_nav_altitude_ft_agl: 1500 air_assault_nav_altitude_ft_agl: 1500
tactics: tactics:
use_countermeasures: true
air_defence_evades_anti_radiation_missiles: false air_defence_evades_anti_radiation_missiles: false
air_to_air_missile_attack_range: ~ air_to_air_missile_attack_range: ~