From bdbac0dfde77e87891e3078aa4a672d6404a1fc3 Mon Sep 17 00:00:00 2001
From: Luna <me@lunya.dev>
Date: Tue, 1 Oct 2024 23:16:36 +0200
Subject: Improvement: Change "efficient miner" to "spread" in mineshaft pity
 breakdown (#2633)

---
 .../skyhanni/features/mining/MineshaftPityDisplay.kt   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
index 72f3d13d4..79d838f20 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/MineshaftPityDisplay.kt
@@ -45,11 +45,11 @@ object MineshaftPityDisplay {
             profileStorage?.blocksBroken = value
         }
 
-    private var PityBlock.efficientMiner: Int
-        get() = minedBlocks.firstOrNull { it.pityBlock == this }?.efficientMiner ?: 0
+    private var PityBlock.spreadBlocksBroken: Int
+        get() = minedBlocks.firstOrNull { it.pityBlock == this }?.spreadBlocksBroken ?: 0
         set(value) {
-            minedBlocks.firstOrNull { it.pityBlock == this }?.let { it.efficientMiner = value } ?: run {
-                minedBlocks.add(PityData(this, efficientMiner = value))
+            minedBlocks.firstOrNull { it.pityBlock == this }?.let { it.spreadBlocksBroken = value } ?: run {
+                minedBlocks.add(PityData(this, spreadBlocksBroken = value))
             }
         }
 
@@ -92,7 +92,7 @@ object MineshaftPityDisplay {
                 if (originalOre != null) addOrPut(originalOre, -1)
             }
             .map { (block, amount) ->
-                block.getPityBlock()?.let { it.efficientMiner += amount }
+                block.getPityBlock()?.let { it.spreadBlocksBroken += amount }
             }
 
         update()
@@ -105,7 +105,7 @@ object MineshaftPityDisplay {
             val pityCounter = calculateCounter()
             val chance = calculateChance(pityCounter)
             val counterUntilPity = MAX_COUNTER - pityCounter
-            val totalBlocks = PityBlock.entries.sumOf { it.blocksBroken + it.efficientMiner }
+            val totalBlocks = PityBlock.entries.sumOf { it.blocksBroken + it.spreadBlocksBroken }
 
             mineshaftTotalBlocks += totalBlocks
             mineshaftTotalCount++
@@ -124,7 +124,7 @@ object MineshaftPityDisplay {
                 minedBlocks.forEach {
                     add(
                         "    §7${it.pityBlock.displayName} mined: " +
-                            "§e${it.blocksBroken.addSeparators()} [+${it.efficientMiner.addSeparators()} efficient miner]" +
+                            "§e${it.blocksBroken.addSeparators()} [+${it.spreadBlocksBroken.addSeparators()} spread]" +
                             " §6(${it.pityBlock.getPity().addSeparators()}/${counterUntilPity.addSeparators()})",
                     )
                 }
@@ -283,7 +283,7 @@ object MineshaftPityDisplay {
     data class PityData(
         @Expose val pityBlock: PityBlock,
         @Expose var blocksBroken: Int = 0,
-        @Expose var efficientMiner: Int = 0,
+        @Expose var spreadBlocksBroken: Int = 0,
     )
 
     enum class PityBlock(
@@ -339,7 +339,7 @@ object MineshaftPityDisplay {
                 return entries.firstOrNull { oreType in it.oreTypes }
             }
 
-            fun PityBlock.getPity() = (blocksBroken + efficientMiner / 2.0) * multiplier
+            fun PityBlock.getPity() = (blocksBroken + spreadBlocksBroken / 2.0) * multiplier
         }
     }
 }
-- 
cgit