aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--FEATURES.md2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/DevData.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt16
6 files changed, 29 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cdb31600..3605af845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,12 @@
### Misc
- Added hiding the flame particles when using the Fire Veil Wand ability
- Added circle around the player when having the Fire Veil Wand ability is active
-- The config GUI how has a search function (top right corner)
+- The config GUI how has a search function (top right corner)
### Small Changes
- Changed the ashfang gravity orb highlight from square to cylinder
-- added msg support to fancy chat format
+- Added msg support to fancy chat format
+- Added damage indicator for diana mobs
### Fixes
- Fixed enchanted books in bazaar
@@ -36,7 +37,7 @@
- Added option to change the way the Skyblock Level gets displayed in the chat (only working when skyblock level and fancy player message format are enabled)
- Added highlight the voidling extremist in pink color
- Added highlight corrupted mobs in purple color
-- Added command /shmarkplayer (marking a player with yellow color)
+- Added command /shmarkplayer <player> (marking a player with yellow color)
- Added highlight slayer miniboss in blue color
- Added option to hide the death messages of other players, except for players who are close to the player, inside dungeon or during a Kuudra fight.
- Added highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)
diff --git a/FEATURES.md b/FEATURES.md
index 8e1e1983e..0ef26cfa1 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -3,7 +3,7 @@
## Commands
- /skyhanni or /sh (opening the SkyHanni config in game)
- /wiki (using hypixel-skyblock.fandom.com instead of Hypixel wiki)
-- /shmarkplayer (marking a player with yellow color)
+- /shmarkplayer <player> (marking a player with yellow color)
## Chat Filter
- Hiding annoying messages in the Hub of Hypixel (MVP player joins, other player loot boxes, prototype message, radiating generosity, Hypixel tournaments)
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