Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Withdraw logic cleanup

Browse Source
This commit is contained in:
MagicBot
2024-05-09 11:31:12 -04:00
parent a5255bcf11
commit 973dfc94f7
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/loot/WorkOrder.java
+7 -12
View File
@@ -150,30 +150,25 @@ public class WorkOrder implements Delayed {
int strongbox = workOrder.vendor.building.getStrongboxValue(); int strongbox = workOrder.vendor.building.getStrongboxValue();
// Strongbox can cover total gold cost; // Early exit if strongbox can cover gold only roll.
if (workOrder.production_cost_total.get(mbEnums.ResourceType.GOLD) <= strongbox) {
if (workOrder.production_cost_total.size() == 1 && workOrder.production_cost_total.get(mbEnums.ResourceType.GOLD) <= strongbox) {
workOrder.vendor.building.setStrongboxValue(strongbox - workOrder.production_cost_total.get(mbEnums.ResourceType.GOLD)); workOrder.vendor.building.setStrongboxValue(strongbox - workOrder.production_cost_total.get(mbEnums.ResourceType.GOLD));
workOrder.production_cost_total.put(mbEnums.ResourceType.GOLD, 0); workOrder.production_cost_total.put(mbEnums.ResourceType.GOLD, 0);
// Early exit for Strongbox covering gold only rolls
if (workOrder.production_cost_total.size() == 1)
return true; return true;
} else {
int remainingAmount = workOrder.production_cost_total.get(mbEnums.ResourceType.GOLD) - strongbox;
workOrder.vendor.building.setStrongboxValue(0);
workOrder.production_cost_total.put(mbEnums.ResourceType.GOLD, workOrder.production_cost_total.get(mbEnums.ResourceType.GOLD) - remainingAmount);
} }
// There is an overflow at this point and a warehouse is required // Warehouse is required after this point
Warehouse warehouse = workOrder.vendor.building.getCity().warehouse; Warehouse warehouse = workOrder.vendor.building.getCity().warehouse;
if (warehouse == null) if (warehouse == null)
return false; return false;
int remainingAmount = workOrder.production_cost_total.get(mbEnums.ResourceType.GOLD) - strongbox;
workOrder.vendor.building.setStrongboxValue(0);
workOrder.production_cost_total.put(mbEnums.ResourceType.GOLD, workOrder.production_cost_total.get(mbEnums.ResourceType.GOLD) - remainingAmount);
// Deduct total production cost from warehouse // Deduct total production cost from warehouse
workOrder.production_cost_total.forEach((key, value) -> warehouse.resources.put(key, warehouse.resources.get(key) - value)); workOrder.production_cost_total.forEach((key, value) -> warehouse.resources.put(key, warehouse.resources.get(key) - value));