diff options
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java | 6 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 082bf1735..67cce0032 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ + Added blaze slayer phase display + Added toggle for blaze slayer colored mobs + Mark the right dagger to use for blaze slayer in the dagger overlay. ++ Added option to select the first, left sided dagger for the display. ### Stats Tuning + Show the tuning stats in the Thaumaturgy inventory. 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 @@ -53,6 +53,12 @@ public class Slayer { 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) @ConfigAccordionId(id = 1) 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() { |