diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-09-30 01:12:30 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-09-30 01:12:30 +0200 |
| commit | 333cb46f87c255663294cf0368b20839039cfe42 (patch) | |
| tree | ff20749471ac25cd4237aa7cfdde8c3d7daf2b25 /src/main/java | |
| parent | f2e7412924773d01a8ad96e8b642a7d5deb9ae90 (diff) | |
| download | skyhanni-333cb46f87c255663294cf0368b20839039cfe42.tar.gz skyhanni-333cb46f87c255663294cf0368b20839039cfe42.tar.bz2 skyhanni-333cb46f87c255663294cf0368b20839039cfe42.zip | |
added first dagger
Diffstat (limited to 'src/main/java')
| -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 |
2 files changed, 8 insertions, 3 deletions
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() { |