diff options
| author | Lorenz <lo.scherf@gmail.com> | 2022-08-15 21:26:52 +0200 |
|---|---|---|
| committer | Lorenz <lo.scherf@gmail.com> | 2022-08-15 21:26:52 +0200 |
| commit | 5b51e17222e6e6fe55206c6d20ad2cd4adff1f69 (patch) | |
| tree | fe96c516b86717a89245a5775b6ca1416d1cfb45 /src/main | |
| parent | 36e434d6e117d1606cebfe88717b68f7476b5a02 (diff) | |
| download | skyhanni-5b51e17222e6e6fe55206c6d20ad2cd4adff1f69.tar.gz skyhanni-5b51e17222e6e6fe55206c6d20ad2cd4adff1f69.tar.bz2 skyhanni-5b51e17222e6e6fe55206c6d20ad2cd4adff1f69.zip | |
add tarantula slayer
Diffstat (limited to 'src/main')
3 files changed, 27 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java index 0f9d735a6..6614c6f6c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java @@ -47,10 +47,10 @@ public class Misc { "\u00a7bEndstone Protector (not tested)", "\u00a7bEnder Dragon (not finished)", "\u00a7bRevenant Horror", - "\u00a7bSpider Slayer (not implemented)", + "\u00a7bTarantula Broodfather", "\u00a7bWolf Slayer (not implemented)", "\u00a7bVoidgloom Seraph", - "\u00a7bBlaze Slayer (only tier 1 yet)", + "\u00a7bInferno Demonlord (only tier 1 yet)", "\u00a7bHeadless Horseman (bugged)", "\u00a7bDungeon Floor 1", "\u00a7bDungeon Floor 2", @@ -63,7 +63,7 @@ public class Misc { ) @ConfigAccordionId(id = 1) //TODO only show currently working and tested features - public List<Integer> damageIndicatorBossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 8, 9)); + public List<Integer> damageIndicatorBossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 8, 9)); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt index c8bea30df..43544c776 100644 --- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt @@ -306,6 +306,25 @@ class BossFinder { } } } + + if (entity is EntitySpider) { + if (entity.hasNameTagWith(1, "§5☠ §4Tarantula Broodfather ")) { + when (maxHealth) { + 740, 1_500 -> { + return EntityResult(bossType = BossType.SLAYER_SPIDER_1) + } + 30_000, 60_000 -> { + return EntityResult(bossType = BossType.SLAYER_SPIDER_2) + } + 900_000, 1_800_000 -> { + return EntityResult(bossType = BossType.SLAYER_SPIDER_3) + } + 2_400_000, 4_800_000 -> { + return EntityResult(bossType = BossType.SLAYER_SPIDER_4) + } + } + } + } } return null diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt index 00e920a0e..2ea336470 100644 --- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt +++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt @@ -21,7 +21,11 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName SLAYER_ZOMBIE_4("§4Revenant Horror 4", 5, "§4Rev 4"), SLAYER_ZOMBIE_5("§5Revenant Horror 5", 5, "§5Rev 5"), - SPIDER_SLAYER("Spider Slayer", 6, "Spider"), + SLAYER_SPIDER_1("§aTarantula Broodfather 1", 6), + SLAYER_SPIDER_2("§eTarantula Broodfather 2", 6), + SLAYER_SPIDER_3("§cTarantula Broodfather 3", 6), + SLAYER_SPIDER_4("§4Tarantula Broodfather 4", 6), + WOLF_SLAYER("Wolf Slayer", 7, "Wolf"), SLAYER_ENDERMAN_1("§aVoidgloom Seraph 1", 8), |