diff options
| author | Luna <luna@alexia.lol> | 2024-06-30 11:06:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-30 11:06:45 +0200 |
| commit | c0067955cdf8c4fceb0bf9564c7b0427e4b7b992 (patch) | |
| tree | 2925e37f81cb257ff3a92ebeb52770aea02d2d25 /src/main/java/at/hannibal2 | |
| parent | 9659a44f1d2735a95b7352fedeffe7d4b181cce5 (diff) | |
| download | skyhanni-c0067955cdf8c4fceb0bf9564c7b0427e4b7b992.tar.gz skyhanni-c0067955cdf8c4fceb0bf9564c7b0427e4b7b992.tar.bz2 skyhanni-c0067955cdf8c4fceb0bf9564c7b0427e4b7b992.zip | |
Fix: Chocolate per Time Tower charge ignoring Mu Rabbit (#2165)
Diffstat (limited to 'src/main/java/at/hannibal2')
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt index 7df0f5bd2..a6f3626b6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryAPI.kt @@ -163,7 +163,7 @@ object ChocolateFactoryAPI { fun timeTowerChargeDuration() = if (HoppityCollectionStats.hasFoundRabbit("Einstein")) 7.hours else 8.hours - private fun timeTowerMultiplier(): Double { + fun timeTowerMultiplier(): Double { var multiplier = (profileStorage?.timeTowerLevel ?: 0) * 0.1 if (HoppityCollectionStats.hasFoundRabbit("Mu")) multiplier += 0.7 return multiplier diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt index f73655bc5..8973bc1e4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryTooltip.kt @@ -45,7 +45,7 @@ object ChocolateFactoryTooltip { private fun chocPerTimeTower(): Int { val profileStorage = profileStorage ?: return 0 - val amountPerSecond = profileStorage.rawChocPerSecond * profileStorage.timeTowerLevel * .1 + val amountPerSecond = profileStorage.rawChocPerSecond * ChocolateFactoryAPI.timeTowerMultiplier() val amountPerHour = amountPerSecond * 60 * 60 return amountPerHour.toInt() } |