From a1ad265420e21856fc0aed2b51c15718191407a9 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Tue, 21 Jul 2026 04:48:11 -0700
Subject: [PATCH] Optimize shadow siege request/permit gain

---
 src/main/java/emu/nebula/GameConstants.java   |  2 ++
 .../emu/nebula/game/inventory/Inventory.java  |  4 +--
 .../game/tracehunt/TraceHuntManager.java      | 26 +++++++++----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/emu/nebula/GameConstants.java b/src/main/java/emu/nebula/GameConstants.java
index 406dfd8..0312dc1 100644
--- a/src/main/java/emu/nebula/GameConstants.java
+++ b/src/main/java/emu/nebula/GameConstants.java
@@ -58,6 +58,8 @@ public class GameConstants {
     public static final int TRACE_HUNT_TOKEN_ID = 37;
     public static final int TRACE_HUNT_REQUEST_ITEM_ID = 38;
     public static final int TRACE_HUNT_PERMIT_ITEM_ID = 39;
+    public static final int TRACE_HUNT_MAX_DAILY_REQUESTS = 20;
+    public static final int TRACE_HUNT_MAX_DAILY_PERMITS = 4;
     public static final int[] TRACE_HUNT_TRACE_IDS = {21, 22, 23, 31, 41};
     public static final int TRACE_HUNT_MAX_TRACE_PROGRESS = 10_000;
     public static final int TRACE_HUNT_MAX_HUNT_PROGRESS = 10_000;
diff --git a/src/main/java/emu/nebula/game/inventory/Inventory.java b/src/main/java/emu/nebula/game/inventory/Inventory.java
index ea14eb9..8141f2e 100644
--- a/src/main/java/emu/nebula/game/inventory/Inventory.java
+++ b/src/main/java/emu/nebula/game/inventory/Inventory.java
@@ -591,10 +591,10 @@ public class Inventory extends PlayerManager implements GameDatabaseObject {
                 }
             }
             case TraceRequest -> {
-                this.getPlayer().getTraceHuntManager().addTraceRequests(amount, change, true);
+                this.getPlayer().getTraceHuntManager().addTraceRequests(amount, 0, change, true);
             }
             case HuntPermit -> {
-                this.getPlayer().getTraceHuntManager().addHuntPermits(amount, change, true);
+                this.getPlayer().getTraceHuntManager().addHuntPermits(amount, 0, change, true);
             }
             default -> {
                 // Not implemented
diff --git a/src/main/java/emu/nebula/game/tracehunt/TraceHuntManager.java b/src/main/java/emu/nebula/game/tracehunt/TraceHuntManager.java
index eab4c33..d5ce7d8 100644
--- a/src/main/java/emu/nebula/game/tracehunt/TraceHuntManager.java
+++ b/src/main/java/emu/nebula/game/tracehunt/TraceHuntManager.java
@@ -95,8 +95,10 @@ public class TraceHuntManager extends PlayerManager implements GameDatabaseObjec
     }
     
     public void onSpendEnergy(int amount, PlayerChangeInfo change) {
-        // Save flag
-        boolean save = true;
+        // Optimization: Skip if we already have the max daily requests/permits
+        if (this.dailyRequests >= GameConstants.TRACE_HUNT_MAX_DAILY_REQUESTS && this.dailyPermits >= GameConstants.TRACE_HUNT_MAX_DAILY_PERMITS) {
+            return;
+        }
         
         // Calculate daily request/permits to add
         this.dailyRequestProgress += amount;
@@ -110,29 +112,27 @@ public class TraceHuntManager extends PlayerManager implements GameDatabaseObjec
         
         // Add
         if (newRequests > 0) {
-            int max = Math.max(Math.min(60 - this.getTraceRequests(), 20 - this.getDailyRequests()), 0);
+            int max = Math.max(Math.min(60 - this.getTraceRequests(), GameConstants.TRACE_HUNT_MAX_DAILY_REQUESTS - this.getDailyRequests()), 0);
             int add = Math.min(newRequests, max);
             
             if (add > 0) {
                 this.dailyRequests += add;
-                this.addTraceRequests(add, change, false);
+                this.addTraceRequests(add, add, change, false);
             }
         }
         
         if (newPermits > 0) {
-            int max = Math.max(Math.min(12 - this.getHuntPermits(), 4 - this.getDailyPermits()), 0);
+            int max = Math.max(Math.min(12 - this.getHuntPermits(), GameConstants.TRACE_HUNT_MAX_DAILY_PERMITS - this.getDailyPermits()), 0);
             int add = Math.min(newPermits, max);
             
             if (add > 0) {
                 this.dailyPermits += add;
-                this.addHuntPermits(add, change, false);
+                this.addHuntPermits(add, add, change, false);
             }
         }
         
         // Save to database
-        if (save) {
-            this.save();
-        }
+        this.save();
     }
     
     public void resetDailyQuota() {
@@ -146,7 +146,7 @@ public class TraceHuntManager extends PlayerManager implements GameDatabaseObjec
         this.save();
     }
     
-    public void addTraceRequests(int amount, PlayerChangeInfo change, boolean shouldSave) {
+    public void addTraceRequests(int amount, int daily, PlayerChangeInfo change, boolean shouldSave) {
         // Save old value to check if we need to save this to the database
         int oldValue = this.traceRequests;
         
@@ -162,12 +162,12 @@ public class TraceHuntManager extends PlayerManager implements GameDatabaseObjec
         var proto = TraceHuntItem.newInstance()
                 .setTid(GameConstants.TRACE_HUNT_REQUEST_ITEM_ID)
                 .setGrantQty(this.getTraceRequests() - oldValue)
-                .setDailyCount(this.getDailyRequests());
+                .setDailyCount(daily);
 
         change.add(proto);
     }
 
-    public void addHuntPermits(int amount, PlayerChangeInfo change, boolean shouldSave) {
+    public void addHuntPermits(int amount, int daily, PlayerChangeInfo change, boolean shouldSave) {
         // Save old value to check if we need to save this to the database
         int oldValue = this.huntPermits;
         
@@ -183,7 +183,7 @@ public class TraceHuntManager extends PlayerManager implements GameDatabaseObjec
         var proto = TraceHuntItem.newInstance()
                 .setTid(GameConstants.TRACE_HUNT_PERMIT_ITEM_ID)
                 .setGrantQty(this.getHuntPermits() - oldValue)
-                .setDailyCount(this.getDailyPermits());
+                .setDailyCount(daily);
 
         change.add(proto);
     }