diff options
Diffstat (limited to 'src/main')
4 files changed, 24 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java index 839bde981..0062067b9 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java @@ -54,6 +54,7 @@ public class DamageIndicator { "\u00a7bDungeon Floor 5", "\u00a7bDungeon Floor 6", "\u00a7bDungeon Floor 7", + "\u00a7bDiana Mobs", "Dummy" } ) diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java index 7fa3dc609..f218929cb 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java @@ -76,7 +76,7 @@ public class DevData { public boolean filterGrowBuffer = false; @Expose - @ConfigOption(name = "Filter Chat", desc = "Filter 'Unable to play unknown soundEvent'") + @ConfigOption(name = "Filter Sound Error", desc = "Filter 'Unable to play unknown soundEvent'") @ConfigEditorBoolean @ConfigAccordionId(id = 2) public boolean filterUnknownSound = false; diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt index c77738605..a2e8a83ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt @@ -48,7 +48,12 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName DUNGEON_F("", 16), DUNGEON_75("", 17), - DUMMY("Dummy", 18), + MINOS_INQUISITOR("§5Minos Inquisitor", 18), + MINOS_CHAMPION("§2Minos Champion", 18), + GAIA_CONSTURUCT("§2Gaia Construct", 18), + MINOTAUR("§2Minotaur", 18), + + DUMMY("Dummy", 19), //TODO arachne diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt index aa0af27b5..65c6d4e1b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt @@ -340,6 +340,22 @@ class MobFinder { } } } + if (entity is EntityOtherPlayerMP) { + if (entity.name == "Minos Inquisitor") { + return EntityResult(bossType = BossType.MINOS_INQUISITOR) + } + if (entity.name == "Minos Champion") { + return EntityResult(bossType = BossType.MINOS_CHAMPION) + } + if (entity.name == "Minotaur ") { + return EntityResult(bossType = BossType.MINOTAUR) + } + } + if (entity is EntityIronGolem) { + if (entity.baseMaxHealth % 1_500_000 == 0.0) { + return EntityResult(bossType = BossType.GAIA_CONSTURUCT) + } + } } return null |