From 03548be42728e1056743b4ae1ef1313d8a9c9bf7 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Wed, 23 Aug 2023 12:27:47 +0200 Subject: Option to show reputation locations only when pressing the hotkey --- .../features/nether/reputationhelper/CrimsonIsleReputationHelper.kt | 6 ++++++ .../nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt | 2 +- .../features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt | 2 +- .../nether/reputationhelper/miniboss/DailyMiniBossHelper.kt | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/nether') diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt index 156062432..cb5006aa7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt @@ -151,4 +151,10 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) { val z = locationData[2].asDouble - 1 return LorenzVec(x, y, z) } + + fun showLocations() = when (config.crimsonIsleReputationShowLocation) { + 0 -> true + 1 -> OSUtils.isKeyHeld(config.reputationHelperHotkey) + else -> false + } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt index 597de55e4..bab45b0a9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt @@ -27,7 +27,7 @@ class DailyKuudraBossHelper(private val reputationHelper: CrimsonIsleReputationH if (!LorenzUtils.inSkyBlock) return if (LorenzUtils.skyBlockIsland != IslandType.CRIMSON_ISLE) return if (!SkyHanniMod.feature.misc.crimsonIsleReputationHelper) return - if (!SkyHanniMod.feature.misc.crimsonIsleReputationLocation) return + if (!reputationHelper.showLocations()) return if (allKuudraDone) return kuudraLocation?.let { diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt index 827ed137a..14e5b131a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt @@ -179,7 +179,7 @@ class DailyQuestHelper(val reputationHelper: CrimsonIsleReputationHelper) { @SubscribeEvent fun onRenderWorld(event: RenderWorldLastEvent) { if (!isEnabled()) return - if (!SkyHanniMod.feature.misc.crimsonIsleReputationLocation) return + if (!reputationHelper.showLocations()) return for (quest in quests) { if (quest is MiniBossQuest) continue diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt index ad9032d43..982551549 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt @@ -42,7 +42,7 @@ class DailyMiniBossHelper(private val reputationHelper: CrimsonIsleReputationHel if (!LorenzUtils.inSkyBlock) return if (LorenzUtils.skyBlockIsland != IslandType.CRIMSON_ISLE) return if (!SkyHanniMod.feature.misc.crimsonIsleReputationHelper) return - if (!SkyHanniMod.feature.misc.crimsonIsleReputationLocation) return + if (!reputationHelper.showLocations()) return val playerLocation = LocationUtils.playerLocation() for (miniBoss in miniBosses) { -- cgit