diff options
Diffstat (limited to 'src/main/java/at/hannibal2')
3 files changed, 15 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java index cfc73ad94..64ab6cdb9 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/FishingConfig.java @@ -119,11 +119,19 @@ public class FishingConfig { ) @ConfigEditorBoolean @ConfigAccordionId(id = 2) - @FeatureToggle public boolean barnTimerCrystalHollows = true; @Expose @ConfigOption( + name = "Stranded Fishing", + desc = "Show the barn fishing timer even on all the different islands stranded players can visit." + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean barnTimerForStranded = true; + + @Expose + @ConfigOption( name = "Worm Cap Alert", desc = "Alerts you with sound if you hit the Worm Sea Creature limit of 60." ) diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt index f5f87ee2c..83abe9f7e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt @@ -71,11 +71,14 @@ class FishingTimer { }.sum() private fun isRightLocation(): Boolean { + inHollows = false + + if (config.barnTimerForStranded && LorenzUtils.isStrandedProfile) return true + if (config.barnTimerCrystalHollows && IslandType.CRYSTAL_HOLLOWS.isInIsland()) { inHollows = true return true } - inHollows = false if (!IslandType.THE_FARMING_ISLANDS.isInIsland()) { return LocationUtils.playerLocation().distance(barnLocation) < 50 diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index 27573a5c0..9a4348d39 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -55,6 +55,8 @@ object LorenzUtils { val noTradeMode get() = HypixelData.noTrade + val isStrandedProfile get() = HypixelData.stranded + val isBingoProfile get() = inSkyBlock && (HypixelData.bingo || TestBingo.testBingo) val lastWorldSwitch get() = HypixelData.joinedWorld |