From cafe0a0fe1aba57524dab406121397be7c4923d1 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 8 Apr 2024 16:49:19 -0400 Subject: [PATCH] Minor class cleanup --- src/engine/gameManager/ForgeManager.java | 4 ++-- src/engine/loot/WorkOrder.java | 26 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/engine/gameManager/ForgeManager.java b/src/engine/gameManager/ForgeManager.java index c9e1bbbf..023ff100 100644 --- a/src/engine/gameManager/ForgeManager.java +++ b/src/engine/gameManager/ForgeManager.java @@ -61,7 +61,7 @@ public enum ForgeManager implements Runnable { workOrder.total_produced = workOrder.total_produced - 1; workOrders.add(workOrder); - Logger.info("Workorder has cycled: " + workOrder.workOrderID); + Logger.info("workorder:" + workOrder.workOrderID + " (" + workOrder.total_produced + "/" + workOrder.total_to_produce + ")"); } catch (InterruptedException e) { e.printStackTrace(); } @@ -83,7 +83,7 @@ public enum ForgeManager implements Runnable { // Single item rolls are total_to_produce of 0; - if (workOrder.slotCount > 1 && workOrder.total_to_produce == 0) + if (workOrder.slotCount > 0 && workOrder.total_to_produce == 0) workOrder.slotCount = 1; Logger.info(workOrder.toString()); diff --git a/src/engine/loot/WorkOrder.java b/src/engine/loot/WorkOrder.java index e4c51dfd..9071c5ab 100644 --- a/src/engine/loot/WorkOrder.java +++ b/src/engine/loot/WorkOrder.java @@ -54,19 +54,19 @@ public class WorkOrder implements Delayed { } public String toString() { - String outSTring = "wordOrderID" + this.workOrderID + "\r\n" + - "vendor" + this.vendor.getObjectUUID() + "\r\n" + - "slotCount" + this.slotCount + "\r\n" + - "total_to_produce" + this.total_to_produce + "\r\n" + - "total_produced" + this.total_produced + "\r\n" + - "templateID" + this.templateID + "\r\n" + - "itemName" + this.itemName + "\r\n" + - "prefixToken" + this.prefixToken + "\r\n" + - "suffixToken" + this.suffixToken + "\r\n" + - "rollingDuration" + this.rollingDuration + "\r\n" + - "completionTime" + this.completionTime + "\r\n" + - "runCompleted" + this.runCompleted + "\r\n" + - "runCanceled" + this.runCanceled + "\r\n"; + String outSTring = "wordOrderID: " + this.workOrderID + "\r\n" + + "vendor: " + this.vendor.getObjectUUID() + "\r\n" + + "slotCount: " + this.slotCount + "\r\n" + + "total_to_produce: " + this.total_to_produce + "\r\n" + + "total_produced: " + this.total_produced + "\r\n" + + "templateID: " + this.templateID + "\r\n" + + "itemName: " + this.itemName + "\r\n" + + "prefixToken: " + this.prefixToken + "\r\n" + + "suffixToken: " + this.suffixToken + "\r\n" + + "rollingDuration: " + this.rollingDuration + "\r\n" + + "completionTime: " + this.completionTime + "\r\n" + + "runCompleted: " + this.runCompleted + "\r\n" + + "runCanceled: " + this.runCanceled + "\r\n"; return outSTring; }