From 333cb46f87c255663294cf0368b20839039cfe42 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 30 Sep 2022 01:12:30 +0200 Subject: added first dagger --- src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java | 6 ++++++ .../skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/main/java/at/hannibal2') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java index 4e1884f00..4c31648a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java @@ -52,6 +52,12 @@ public class Slayer { @ConfigAccordionId(id = 2) public boolean blazeMarkRightHellionShield = false; + @Expose + @ConfigOption(name = "First Dagger", desc = "Select the first, left sided dagger for the display.") + @ConfigEditorDropdown(values = {"Spirit/Crystal", "Ashen/Auric"}) + @ConfigAccordionId(id = 2) + public int blazeFirstDagger = 0; + @Expose @ConfigOption(name = "Fire Pillars", desc = "") @ConfigEditorAccordion(id = 3) diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt index a16d85a00..80c28f2cf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt @@ -52,8 +52,8 @@ class BlazeSlayerDaggerHelper { checkActiveDagger() lastNearest = findNearest() - val first = Dagger.TWILIGHT - val second = Dagger.FIREDUST + val first = Dagger.values()[SkyHanniMod.feature.slayer.blazeFirstDagger] + val second = first.other() textTopLeft = format(holding, true, first, lastNearest) textTopRight = format(holding, true, second, lastNearest) @@ -106,7 +106,6 @@ class BlazeSlayerDaggerHelper { shield.chatColor + shield.cleanName } } - } private fun checkActiveDagger() { -- cgit