From 36e434d6e117d1606cebfe88717b68f7476b5a02 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Mon, 15 Aug 2022 21:12:32 +0200 Subject: add blaze slayer tier 1 --- .../at/hannibal2/skyhanni/damageindicator/BossFinder.kt | 13 ++++++++++--- .../java/at/hannibal2/skyhanni/damageindicator/BossType.kt | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/damageindicator') diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt index 078669b95..c8bea30df 100644 --- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt @@ -222,9 +222,7 @@ class BossFinder { if (entity is EntityEnderman) { if (entity.hasNameTagWith(3, "§c☠ §bVoidgloom Seraph ")) { - - - when (maxHealth.toInt()) { + when (maxHealth) { 300_000, 600_000 -> { return EntityResult(bossType = BossType.SLAYER_ENDERMAN_1) } @@ -299,6 +297,15 @@ class BossFinder { } } } + if (entity is EntityBlaze) { + if (entity.hasNameTagWith(2, "§c☠ §bInferno Demonlord ")) { + when (maxHealth) { + 2_500_000, 5_000_000 -> { + return EntityResult(bossType = BossType.SLAYER_BLAZE_1) + } + } + } + } } 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 f43d990a6..00e920a0e 100644 --- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt +++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt @@ -29,7 +29,7 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName SLAYER_ENDERMAN_3("§cVoidgloom Seraph 3", 8), SLAYER_ENDERMAN_4("§4Voidgloom Seraph 4", 8), - BLAZE_SLAYER("Blaze Slayer", 9, "Blaze"), + SLAYER_BLAZE_1("§aInferno Demonlord 1", 9), HUB_HEADLESS_HORSEMAN("§6Headless Horseman", 10), @@ -58,4 +58,6 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName * f7 blood room giants * */ + + //TODO diana mythological creatures } \ No newline at end of file -- cgit