diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-23 00:48:08 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-23 00:48:08 +0200 |
commit | 693a03d089652aa0d061a497e36d82a1f234fb24 (patch) | |
tree | 4095a8ea8cf7600e15e09af783c37e7946188fb5 | |
parent | e9a5a461992c3a8d1dc80803b770bbcd7a0993ca (diff) | |
download | skyhanni-693a03d089652aa0d061a497e36d82a1f234fb24.tar.gz skyhanni-693a03d089652aa0d061a497e36d82a1f234fb24.tar.bz2 skyhanni-693a03d089652aa0d061a497e36d82a1f234fb24.zip |
changed elephant and anita ff buffs
4 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt index 33846d630..4558174a5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt @@ -204,7 +204,7 @@ class CaptureFarmingGear { hidden.farmingLevel = group("level").romanToDecimalIfNeeded() } anitaBuffPattern.matchMatcher(msg) { - hidden.anitaUpgrade = group("level").toInt() / 2 + hidden.anitaUpgrade = group("level").toInt() / 4 } lotusUpgradePattern.matchMatcher(msg) { val piece = group("piece").uppercase() 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 5eed793aa..ccc0b0179 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 @@ -198,7 +198,7 @@ object FFStats { out[FFTypes.FARMING_LVL] = savedStats.farmingLevel.toDouble() * 4 out[FFTypes.COMMUNITY_SHOP] = (ProfileStorageData.playerSpecific?.gardenCommunityUpgrade ?: -1).toDouble() * 4 out[FFTypes.PLOTS] = savedStats.plotsUnlocked.toDouble() * 3 - out[FFTypes.ANITA] = savedStats.anitaUpgrade.toDouble() * 2 + out[FFTypes.ANITA] = savedStats.anitaUpgrade.toDouble() * 4 if (cakeExpireTime - System.currentTimeMillis() > 0 || cakeExpireTime == -1L) { out[FFTypes.CAKE] = 5.0 } else { @@ -238,7 +238,7 @@ object FFStats { if (strength != null) { val rawInternalName = pet.getInternalName() return if (rawInternalName.contains("ELEPHANT;4")) { - 1.8 * petLevel + 1.3 * petLevel } else if (rawInternalName.contains("MOOSHROOM_COW;4")) { (10 + petLevel).toDouble() + strength / (40 - petLevel * .2) } else if (rawInternalName.contains("MOOSHROOM")) { 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 d047780c7..70ef53536 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 @@ -46,7 +46,7 @@ object FortuneUpgrades { genericUpgrades.add( FortuneUpgrade( "§7Upgrade Anita bonus to level ${hidden.anitaUpgrade + 1}", - null, "JACOBS_TICKET", anitaTicketsNeeded[hidden.anitaUpgrade], 2.0 + null, "JACOBS_TICKET", anitaTicketsNeeded[hidden.anitaUpgrade], 4.0 ) ) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt index d0ba39603..bd79c3343 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt @@ -28,8 +28,8 @@ class OverviewPage: FFGuideGUI.FFGuidePage() { FFGuideGUI.guiTop + 5, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay) var line = if (FFStats.baseFF[FFTypes.ANITA]!! < 0.0) "§cAnita buff not saved\n§eVisit Anita to set it!" - else "§7§2Fortune for levelling your Anita extra crops\n§2You get 2☘ per buff level" - GuiRenderUtils.drawFarmingBar("§2Anita Buff", line, FFStats.baseFF[FFTypes.ANITA] ?: 0.0, 30, FFGuideGUI.guiLeft + 15, + else "§7§2Fortune for levelling your Anita extra crops\n§2You get 4☘ per buff level" + GuiRenderUtils.drawFarmingBar("§2Anita Buff", line, FFStats.baseFF[FFTypes.ANITA] ?: 0.0, 60, FFGuideGUI.guiLeft + 15, FFGuideGUI.guiTop + 30, 90, mouseX, mouseY, FFGuideGUI.tooltipToDisplay) line = if (FFStats.baseFF[FFTypes.FARMING_LVL]!! < 0.0) "§cFarming level not saved\n§eOpen /skills to set it!" |