Fix: hoppity stuff (#1860)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

1 files changed, 15 insertions, 1 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index e0ce6bc6f..a078ea9d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -11,6 +11,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
+import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
@@ -115,6 +116,7 @@ object HoppityCollectionStats {
             val filtered = loggedRabbits.filter { it.value.rarity == rarity }
 
             val isTotal = rarity == RabbitCollectionRarity.TOTAL
+            if (filtered.isEmpty() && !isTotal) continue
 
             val title = "${rarity.displayName} Rabbits"
             val amountFound = filtered.filter { it.value.found }.size
@@ -144,7 +146,7 @@ object HoppityCollectionStats {
                 add("§7Duplicate Rabbits: §a$displayDuplicates")
                 add("§7Total Rabbits Found: §a${displayFound + displayDuplicates}")
                 add("")
-                add("§7Chocolate Per Second: §a$displayChocolatePerSecond")
+                add("§7Chocolate Per Second: §a${displayChocolatePerSecond.addSeparators()}")
                 add("§7Chocolate Multiplier: §a${displayChocolateMultiplier.round(3)}")
             }
             table.add(
@@ -191,9 +193,20 @@ object HoppityCollectionStats {
                 ChocolateFactoryAPI.profileStorage?.timeTowerCooldown = 7
             }
 
+            if (itemName == "§dMu" && found) {
+                ChocolateFactoryAPI.profileStorage?.hasMuRabbit = true
+            }
+
             val duplicates = duplicatesFound.coerceAtLeast(0)
             loggedRabbits[itemName] = RabbitCollectionInfo(rarity, found, duplicates)
         }
+        // For getting data for neu pv
+//         val rarityToRabbit = mutableMapOf<RabbitCollectionRarity, MutableList<String>>()
+//         loggedRabbits.forEach { (name, info) ->
+//             val formattedName = name.removeColor().lowercase().replace(" ", "_").replace("-", "_")
+//             rarityToRabbit.getOrPut(info.rarity) { mutableListOf() }.add("\"$formattedName\"")
+//         }
+//         println(rarityToRabbit)
         return totalAmount
     }
 
@@ -218,6 +231,7 @@ object HoppityCollectionStats {
         EPIC("§5Epic", 10, 0.005, "STAINED_GLASS-10".asInternalName()),
         LEGENDARY("§6Legendary", 0, 0.02, "STAINED_GLASS-1".asInternalName()),
         MYTHIC("§dMythic", 0, 0.0, "STAINED_GLASS-6".asInternalName()),
+        DIVINE("§bDivine", 0, 0.025, "STAINED_GLASS-3".asInternalName()),
         TOTAL("§cTotal", 0, 0.0, "STAINED_GLASS-14".asInternalName()),
         ;