Fix: Experiments Profit Tracker (#3066)

Co-authored-by: hannibal2 <[email protected]>
hannibal002 · Dec 15, 2024 · 236c00d · 236c00d
1 parent ce0f411
commit 236c00d
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/...at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt b/...at/hannibal2/skyhanni/features/inventory/experimentationtable/ExperimentsProfitTracker.kt
@@ -167,12 +167,20 @@ object ExperimentsProfitTracker {
 
     @HandleEvent
     fun onItemClick(event: ItemClickEvent) {
-        if (isEnabled() && event.clickType == ClickType.RIGHT_CLICK) {
-            val item = event.itemInHand ?: return
-            if (item.getInternalName().isExpBottle()) {
-                lastSplashTime = SimpleTimeMark.now()
-                lastSplashes.add(item)
+        if (!isEnabled() || event.clickType != ClickType.RIGHT_CLICK) return
+        val item = event.itemInHand ?: return
+        val internalName = item.getInternalName()
+        if (!internalName.isExpBottle()) return
+
+        lastSplashTime = SimpleTimeMark.now()
+
+        if (ExperimentationTableAPI.inDistanceToTable(LorenzVec.getBlockBelowPlayer(), 15.0)) {
+            tracker.modify {
+                it.startCost -= calculateBottlePrice(internalName)
             }
+            DelayedRun.runDelayed(100.milliseconds) { handleExpBottles(false) }
+        } else {
+            lastSplashes.add(item)
         }
     }
 
@@ -200,8 +208,7 @@ object ExperimentsProfitTracker {
     private fun calculateBottlePrice(internalName: NEUInternalName): Int {
         val price = internalName.getPrice()
         val npcPrice = internalName.getNpcPriceOrNull() ?: 0.0
-        val maxPrice = npcPrice.coerceAtLeast(price)
-        return maxPrice.toInt()
+        return npcPrice.coerceAtLeast(price).toInt()
     }
 
     @SubscribeEvent
@@ -267,22 +274,20 @@ object ExperimentsProfitTracker {
         for ((internalName, amount) in currentBottlesInInventory) {
             val lastInInv = lastBottlesInInventory.getOrDefault(internalName, 0)
             if (lastInInv >= amount) {
-                currentBottlesInInventory[internalName] = 0
                 lastBottlesInInventory[internalName] = amount
                 continue
             }
 
             if (lastInInv == 0) {
-                currentBottlesInInventory[internalName] = 0
                 lastBottlesInInventory[internalName] = amount
                 if (addToTracker) tracker.addItem(internalName, amount, false)
                 continue
             }
 
-            currentBottlesInInventory[internalName] = 0
             lastBottlesInInventory[internalName] = amount
             if (addToTracker) tracker.addItem(internalName, amount - lastInInv, false)
         }
+        currentBottlesInInventory.clear()
     }
 
     private fun ExperimentMessages.isSelected() = config.hideMessages.contains(this)