From 2a904cc119c555d7721c4bc9959bf75fb4040a72 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Mon, 15 Aug 2022 14:16:54 +0200 Subject: added drop down list for damage indicator and for item numbers as stack size --- .../damageindicator/BossDamageIndicator.kt | 1 + .../hannibal2/skyhanni/damageindicator/BossType.kt | 32 +++++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/damageindicator') diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt index f63b7c6cf..3624f479b 100644 --- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt +++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt @@ -58,6 +58,7 @@ class BossDamageIndicator { if (!player.canEntityBeSeen(data.entity)) continue } if (data.hidden) continue + if (data.bossType.bossTypeToggle !in SkyHanniMod.feature.misc.damageIndicatorBossesToShow) continue val entity = data.entity diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt index 763bb3056..3490bddbd 100644 --- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt +++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt @@ -1,20 +1,26 @@ package at.hannibal2.skyhanni.damageindicator -enum class BossType(val fullName: String, val shortName: String = fullName) { - DUNGEON("Generic Dungeon boss"),//TODO split into different bosses +enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName: String = fullName) { + DUNGEON("Generic Dungeon boss", 0),//TODO split into different bosses - NETHER_BLADESOUL("§8Bladesoul"), - NETHER_MAGMA_BOSS("§4Magma Boss"), - NETHER_ASHFANG("§cAshfang"), - NETHER_BARBARIAN_DUKE("§eBarbarian Duke"), - NETHER_MAGE_OUTLAW("§5Mage Outlaw"), + //Nether Mini Bosses + NETHER_BLADESOUL("§8Bladesoul", 1), + NETHER_MAGMA_BOSS("§4Magma Boss", 1), + NETHER_ASHFANG("§cAshfang", 1), + NETHER_BARBARIAN_DUKE("§eBarbarian Duke", 1), + NETHER_MAGE_OUTLAW("§5Mage Outlaw", 1), - NETHER_VANQUISHER("§5Vanquisher"), + NETHER_VANQUISHER("§5Vanquisher", 2), - END_ENDSTONE_PROTECTOR("§cEndstone Protector"),//TODO add color - END_ENDERMAN_SLAYER("Voidgloom Seraph"),//TODO use seperate enums per tier - END_ENDER_DRAGON("Ender Dragon"),//TODO fix totally + END_ENDSTONE_PROTECTOR("§cEndstone Protector", 3), + END_ENDER_DRAGON("Ender Dragon", 4),//TODO fix totally - HUB_REVENANT_HORROR("§5Revenant Horror 5", "§5Rev 5"),//TODO add other variants like voidgloom? - HUB_HEADLESS_HORSEMAN("§6Headless Horseman"), + //TODO more seperated slayer variants + HUB_REVENANT_HORROR("§5Revenant Horror 5", 5, "§5Rev 5"), + SPIDER_SLAYER("Spider Slayer", 6, "Spider"), + WOLF_SLAYER("Wolf Slayer", 7, "Wolf"), + END_ENDERMAN_SLAYER("Voidgloom Seraph", 8), + BLAZE_SLAYER("Blaze Slayer", 9, "Blaze"), + + HUB_HEADLESS_HORSEMAN("§6Headless Horseman", 10), } \ No newline at end of file -- cgit