Addresses review comments.

This commit is contained in:
Simon Clark
2021-01-05 09:42:05 +00:00
parent 03a29aeedf
commit 7c3f7d4b8e
4 changed files with 37 additions and 22 deletions

View File

@@ -342,8 +342,6 @@ class UnitsDeliveryEvent:
def __init__(self, control_point: ControlPoint) -> None:
self.to_cp = control_point
self.units: Dict[Type[UnitType], int] = {}
self.bought_units: Dict[Type[UnitType], int] = {}
self.sold_units: Dict[Type[UnitType], int] = {}
def __str__(self) -> str:
return "Pending delivery to {}".format(self.to_cp)
@@ -372,21 +370,30 @@ class UnitsDeliveryEvent:
f"Refunding {count} {unit_type.id} at {self.to_cp.name}")
game.adjust_budget(price * count, player=self.to_cp.captured)
def available_next_turn(self, unit_type: Type[UnitType]) -> int:
pending_units = self.units.get(unit_type)
if pending_units is None:
pending_units = 0
current_units = self.to_cp.base.total_units_of_type(unit_type)
return pending_units + current_units
def process(self, game: Game) -> None:
bought_units: Dict[Type[UnitType], int] = {}
sold_units: Dict[Type[UnitType], int] = {}
for unit_type, count in self.units.items():
coalition = "Ally" if self.to_cp.captured else "Enemy"
aircraft = unit_type.id
name = self.to_cp.name
if count >= 0:
self.bought_units[unit_type] = count
bought_units[unit_type] = count
game.message(
f"{coalition} reinforcements: {aircraft} x {count} at {name}")
else:
self.sold_units[unit_type] = 0 - count
sold_units[unit_type] = -count
game.message(
f"{coalition} sold: {aircraft} x {0 - count} at {name}")
self.to_cp.base.commision_units(self.bought_units)
self.to_cp.base.commit_losses(self.sold_units)
f"{coalition} sold: {aircraft} x {-count} at {name}")
self.to_cp.base.commision_units(bought_units)
self.to_cp.base.commit_losses(sold_units)
self.units = {}
self.bought_units = {}
self.sold_units = {}
bought_units = {}
sold_units = {}