diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-05-24 23:52:18 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-24 15:52:18 +0200 |
| commit | 1b2325c3d4f52e20bdbe6b823106cd45025dac53 (patch) | |
| tree | 1bae142b40edcfc980deca7c07f6d93e968566f4 /src/main/java/at/hannibal2/skyhanni/features/garden | |
| parent | f7bc3f2f0786a15ce3082df4f8bb766d01b4c5ea (diff) | |
| download | skyhanni-1b2325c3d4f52e20bdbe6b823106cd45025dac53.tar.gz skyhanni-1b2325c3d4f52e20bdbe6b823106cd45025dac53.tar.bz2 skyhanni-1b2325c3d4f52e20bdbe6b823106cd45025dac53.zip | |
Backend: Use Skyhanni events (#1557)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt index 0b27856fd..2f1ce1860 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt @@ -88,7 +88,7 @@ object FFStats { cropPage.clear() cropPage[FortuneStats.BASE] = Pair(totalBaseFF[FFTypes.TOTAL] ?: 100.0, if (usingSpeedBoots) 1373.0 else 1377.0) cropPage[FortuneStats.CROP_UPGRADE] = Pair((crop.getUpgradeLevel()?.toDouble() ?: 0.0) * 5.0, 45.0) - cropPage[FortuneStats.ACCESSORY] = Pair(CropAccessoryData.cropAccessory?.getFortune(crop) ?: 0.0, 30.0) + cropPage[FortuneStats.ACCESSORY] = Pair(CropAccessoryData.cropAccessory.getFortune(crop), 30.0) cropPage[FortuneStats.FFD] = Pair((tool.getFarmingForDummiesCount() ?: 0).toDouble(), 5.0) cropPage[FortuneStats.TURBO] = Pair(FarmingFortuneDisplay.getTurboCropFortune(tool, crop), 25.0) cropPage[FortuneStats.DEDICATION] = Pair(FarmingFortuneDisplay.getDedicationFortune(tool, crop), 92.0) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt index 5abc89f80..191b9b7e5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt @@ -80,7 +80,7 @@ object FortuneUpgrades { } private fun getTalismanUpgrade() { - val currentTalismanTier = CropAccessoryData.cropAccessory?.ordinal ?: return + val currentTalismanTier = CropAccessoryData.cropAccessory.ordinal if (currentTalismanTier < 3) { val nextTalisman = CropAccessory.entries[currentTalismanTier + 1] genericUpgrades.add( |