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

fix generation of empty transfer during cp capture

Browse Source 
when a cp capture happens and the next cp has pending unit deliveries then they will be redeployed to the newly captured cp. The redeploy was drecreasing the num of pending unit deliveries for the old cp but was not removing them completly from the dict when all were removed
This commit is contained in:
RndName 2021-07-25 14:59:56 +02:00
parent 80bf3c97b2
commit 67fa4a8910
No known key found for this signature in database
GPG Key ID: 5EF516FD9537F7C0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -43,6 +43,7 @@ Saves from 4.0.0 are compatible with 4.1.0.
* **[Mission Generation]** The lua data for other plugins is now generated correctly * **[Mission Generation]** The lua data for other plugins is now generated correctly
* **[Mission Generation]** Fixed problem with opfor planning missions against sold ground objects like SAMs * **[Mission Generation]** Fixed problem with opfor planning missions against sold ground objects like SAMs
* **[Mission Generation]** The legacy always-available tanker option no longer prevents mission creation. * **[Mission Generation]** The legacy always-available tanker option no longer prevents mission creation.
* **[Mission Generation]** Prevent the creation of a transfer order with 0 units for a rare situtation when a point was captured.
* **[Mission Generation]** Fix occasional KeyError preventing mission generation when all units of the same type in a convoy were killed. * **[Mission Generation]** Fix occasional KeyError preventing mission generation when all units of the same type in a convoy were killed.
* **[UI]** Statistics window tick marks are now always integers. * **[UI]** Statistics window tick marks are now always integers.
* **[UI]** Statistics window now shows the correct info for the turn * **[UI]** Statistics window now shows the correct info for the turn

5
game/unitdelivery.py
View File

@ -40,7 +40,10 @@ class PendingUnitDeliveries:
def sell(self, units: dict[UnitType[Any], int]) -> None: def sell(self, units: dict[UnitType[Any], int]) -> None:
for k, v in units.items(): for k, v in units.items():
self.units[k] -= v if self.units[k] > v:
self.units[k] -= v
else:
del self.units[k]
def refund_all(self, coalition: Coalition) -> None: def refund_all(self, coalition: Coalition) -> None:
self.refund(coalition, self.units) self.refund(coalition, self.units)

2
qt_ui/windows/basemenu/QRecruitBehaviour.py
View File

@ -209,8 +209,6 @@ class QRecruitBehaviour:
if self.pending_deliveries.available_next_turn(unit_type) > 0: if self.pending_deliveries.available_next_turn(unit_type) > 0:
self.budget += unit_type.price self.budget += unit_type.price
self.pending_deliveries.sell({unit_type: 1}) self.pending_deliveries.sell({unit_type: 1})
if self.pending_deliveries.units[unit_type] == 0:
del self.pending_deliveries.units[unit_type]
self.update_purchase_controls() self.update_purchase_controls()
self.update_available_budget() self.update_available_budget()
return True return True