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

Remove special case behavior for FOB missions.

Browse Source 
The only difference from the main CP types was that it didn't support
AEW&C (which shouldn't have been on the main ControlPoint class anyway)
and add strike.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1132
This commit is contained in:
Dan Albert 2021-05-28 18:00:00 -07:00
parent d0bde7b016
commit cea264e871
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
game/theater/controlpoint.py
View File

@ -773,15 +773,6 @@ class ControlPoint(MissionTarget, ABC):
def income_per_turn(self) -> int: def income_per_turn(self) -> int:
return 0 return 0
def mission_types(self, for_player: bool) -> Iterator[FlightType]:
from gen.flights.flight import FlightType
if self.is_friendly(for_player):
yield from [
FlightType.AEWC,
]
yield from super().mission_types(for_player)
@property @property
def has_active_frontline(self) -> bool: def has_active_frontline(self) -> bool:
return any(not c.is_friendly(self.captured) for c in self.connected_points) return any(not c.is_friendly(self.captured) for c in self.connected_points)
@ -830,18 +821,21 @@ class Airfield(ControlPoint):
def mission_types(self, for_player: bool) -> Iterator[FlightType]: def mission_types(self, for_player: bool) -> Iterator[FlightType]:
from gen.flights.flight import FlightType from gen.flights.flight import FlightType
if self.is_friendly(for_player): if not self.is_friendly(for_player):
yield from [
# TODO: FlightType.INTERCEPTION
# TODO: FlightType.LOGISTICS
]
else:
yield from [ yield from [
FlightType.OCA_AIRCRAFT, FlightType.OCA_AIRCRAFT,
FlightType.OCA_RUNWAY, FlightType.OCA_RUNWAY,
] ]
yield from super().mission_types(for_player) yield from super().mission_types(for_player)
if self.is_friendly(for_player):
yield from [
FlightType.AEWC,
# TODO: FlightType.INTERCEPTION
# TODO: FlightType.LOGISTICS
]
@property @property
def total_aircraft_parking(self) -> int: def total_aircraft_parking(self) -> int:
return len(self.airport.parking_slots) return len(self.airport.parking_slots)
@ -961,6 +955,13 @@ class Carrier(NavalControlPoint):
cptype=ControlPointType.AIRCRAFT_CARRIER_GROUP, cptype=ControlPointType.AIRCRAFT_CARRIER_GROUP,
) )
def mission_types(self, for_player: bool) -> Iterator[FlightType]:
from gen.flights.flight import FlightType
yield from super().mission_types(for_player)
if self.is_friendly(for_player):
yield FlightType.AEWC
def capture(self, game: Game, for_player: bool) -> None: def capture(self, game: Game, for_player: bool) -> None:
raise RuntimeError("Carriers cannot be captured") raise RuntimeError("Carriers cannot be captured")
@ -1100,18 +1101,10 @@ class Fob(ControlPoint):
def mission_types(self, for_player: bool) -> Iterator[FlightType]: def mission_types(self, for_player: bool) -> Iterator[FlightType]:
from gen.flights.flight import FlightType from gen.flights.flight import FlightType
if self.is_friendly(for_player): if not self.is_friendly(for_player):
yield from [ yield FlightType.STRIKE
FlightType.BARCAP,
# TODO: FlightType.LOGISTICS yield from super().mission_types(for_player)
]
else:
yield from [
FlightType.STRIKE,
FlightType.SWEEP,
FlightType.ESCORT,
FlightType.SEAD_ESCORT,
]
@property @property
def total_aircraft_parking(self) -> int: def total_aircraft_parking(self) -> int: