From 9f4733bcf9142ba9d39c5c9725c0650e53edc2ce Mon Sep 17 00:00:00 2001 From: Empa <42304516+ItsEmpa@users.noreply.github.com> Date: Sun, 12 May 2024 00:54:37 +0200 Subject: Improvement: Rabbit crush warning only during Hoppity (#1762) --- .../inventory/chocolatefactory/ChocolateFactoryConfig.java | 8 ++++++++ .../inventory/chocolatefactory/ChocolateFactoryBarnManager.kt | 2 ++ 2 files changed, 10 insertions(+) (limited to 'src') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java index bffc5cc8e..bacd8aae0 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java @@ -82,6 +82,14 @@ public class ChocolateFactoryConfig { @ConfigEditorSlider(minValue = 0, maxValue = 20, minStep = 1) public int barnCapacityThreshold = 6; + @Expose + @ConfigOption( + name = "Rabbit Crush During Hoppity", + desc = "Only warn about rabbit crush when the Hoppity event is active." + ) + @ConfigEditorBoolean + public boolean rabbitCrushOnlyDuringHoppity = false; + @Expose @ConfigOption(name = "Extra Tooltip Stats", desc = "Shows extra information about upgrades in the tooltip.") @ConfigEditorBoolean diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt index 8f19d9959..445c72974 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt @@ -93,6 +93,8 @@ object ChocolateFactoryBarnManager { return } + if (config.rabbitCrushOnlyDuringHoppity && !ChocolateFactoryAPI.isHoppityEvent()) return + ChatUtils.clickableChat( message = if (profileStorage.currentRabbits == profileStorage.maxRabbits) { "§cYour barn is full! §7(${barnStatus()}). §cUpgrade it so they don't get crushed" -- cgit