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

Improve the replenish rate function in squadron.py

Browse Source 
reword and reuse
This commit is contained in:
RndName 2022-02-20 00:51:05 +01:00
parent 2af274dc77
commit b533633494
No known key found for this signature in database
GPG Key ID: 5EF516FD9537F7C0
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
game/squadrons/squadron.py
View File

@ -183,15 +183,8 @@ class Squadron:
self.deliver_orders() self.deliver_orders()
def replenish_lost_pilots(self) -> None: def replenish_lost_pilots(self) -> None:
if not self.pilot_limits_enabled: if self.pilot_limits_enabled and self.replenish_count > 0:
return self._recruit_pilots(self.replenish_count)
replenish_count = min(
self.settings.squadron_replenishment_rate,
self._number_of_unfilled_pilot_slots,
)
if replenish_count > 0:
self._recruit_pilots(replenish_count)
def return_all_pilots_and_aircraft(self) -> None: def return_all_pilots_and_aircraft(self) -> None:
self.available_pilots = list(self.active_pilots) self.available_pilots = list(self.active_pilots)
@ -224,10 +217,10 @@ class Squadron:
@property @property
def expected_pilots_next_turn(self) -> int: def expected_pilots_next_turn(self) -> int:
return len(self.active_pilots) + self.replenish_rate return len(self.active_pilots) + self.replenish_count
@property @property
def replenish_rate(self) -> int: def replenish_count(self) -> int:
return min( return min(
self.settings.squadron_replenishment_rate, self.settings.squadron_replenishment_rate,
self._number_of_unfilled_pilot_slots, self._number_of_unfilled_pilot_slots,