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

Decouple unit deliveries and conflict events.

Browse Source 
Fixes https://github.com/Khopa/dcs_liberation/issues/692 and lets us
clean up the interface quite a bit.
This commit is contained in:
Dan Albert
2021-01-01 13:48:23 -08:00
parent de325c1208
commit 9671542bdf
5 changed files with 28 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
game/theater/controlpoint.py
View File

@@ -230,7 +230,7 @@ class ControlPoint(MissionTarget, ABC):
self.cptype = cptype
# TODO: Should be Airbase specific.
self.stances: Dict[int, CombatStance] = {}
self.pending_unit_deliveries: Optional[UnitsDeliveryEvent] = None
self.pending_unit_deliveries = UnitsDeliveryEvent(self)
self.target_position: Optional[Point] = None
@@ -367,8 +367,7 @@ class ControlPoint(MissionTarget, ABC):
# TODO: Should be Airbase specific.
def capture(self, game: Game, for_player: bool) -> None:
if self.pending_unit_deliveries is not None:
self.pending_unit_deliveries.refund_all()
self.pending_unit_deliveries.refund_all(game)
if for_player:
self.captured = True
@@ -406,7 +405,6 @@ class ControlPoint(MissionTarget, ABC):
return total
def expected_aircraft_next_turn(self, game: Game) -> PendingOccupancy:
assert self.pending_unit_deliveries
on_order = 0
for unit_bought in self.pending_unit_deliveries.units:
if issubclass(unit_bought, FlyingType):
@@ -443,7 +441,9 @@ class ControlPoint(MissionTarget, ABC):
return
self.runway_status.begin_repair()
def process_turn(self) -> None:
def process_turn(self, game: Game) -> None:
self.pending_unit_deliveries.process(game)
runway_status = self.runway_status
if runway_status is not None:
runway_status.process_turn()