From 10af579e5160ef3c55835c3ed64a277acfe87209 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Wed, 12 Jul 2023 12:51:37 +0200 Subject: Added Living Metal Helper for Living Stillness --- .../skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt | 2 +- .../features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt | 2 +- src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt index 7133cd3c9..18304c25e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt @@ -85,7 +85,7 @@ class LivingCaveDefenseBlocks { private fun isCorrectMob(name: String) = when (name) { "Autonull ", - + "Autocap ", "Autochest ", "Autopants ", diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt index 352e8270b..3f5b7e01f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt @@ -88,5 +88,5 @@ class LivingCaveLivingMetalHelper { } } - fun isEnabled() = RiftAPI.inRift() && RiftAPI.inLivingCave() && config.enabled + fun isEnabled() = RiftAPI.inRift() && (RiftAPI.inLivingCave() || RiftAPI.inLivingStillness()) && config.enabled } diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt index b3f00cc08..8d4c6cf99 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftAPI.kt @@ -18,4 +18,5 @@ object RiftAPI { fun ItemStack.motesNpcPrice() = motesPrice[getInternalName()] fun inLivingCave() = LorenzUtils.skyBlockArea == "Living Cave" + fun inLivingStillness() = LorenzUtils.skyBlockArea == "Living Stillness" } \ No newline at end of file -- cgit