From a4a6c98a60e9b994d953afa2c7481c2dd67d8de6 Mon Sep 17 00:00:00 2001 From: Luna Date: Sat, 17 Aug 2024 09:30:23 +0200 Subject: Fix: Finnegan Perks (#2359) --- .../features/garden/farming/GardenCropMilestoneDisplay.kt | 8 +------- .../hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt index b52b9f62b..c37eb41b7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt @@ -120,13 +120,7 @@ object GardenCropMilestoneDisplay { val addedCounter = (counter - old).toInt() FarmingWeightDisplay.addCrop(crop, addedCounter) update() - // Farming Simulator: There is a 25% chance for Mathematical Hoes and the Cultivating Enchantment to count twice. - // 0.8 = 1 / 1.25 - crop.setCounter( - crop.getCounter() + if (GardenCropSpeed.finneganPerkActive()) { - (addedCounter.toDouble() * 0.8).toInt() - } else addedCounter - ) + crop.setCounter(crop.getCounter() + addedCounter) } cultivatingData[crop] = counter } catch (e: Throwable) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt index f4d954229..141c93ff1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt @@ -177,8 +177,6 @@ object GardenCropSpeed { secondsStopped = 0 } - fun finneganPerkActive() = Perk.FARMING_SIMULATOR.isActive - fun isEnabled() = GardenAPI.inGarden() fun CropType.getSpeed() = cropsPerSecond?.get(this) -- cgit