aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/damageindicator
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/damageindicator')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt8
2 files changed, 15 insertions, 2 deletions
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 4755d7dd1..264c8700a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
@@ -1,6 +1,11 @@
package at.hannibal2.skyhanni.features.damageindicator
-enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName: String = fullName, val showDeathTime: Boolean = false) {
+enum class BossType(
+ val fullName: String,
+ val bossTypeToggle: Int,
+ val shortName: String = fullName,
+ val showDeathTime: Boolean = false
+) {
GENERIC_DUNGEON_BOSS("Generic Dungeon boss", 0),//TODO split into different bosses
//Nether Mini Bosses
@@ -83,6 +88,8 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName
LEECH_SUPREME("§cLeech Supreme", 22),
BACTE("§aBacte", 22),
+ WINTER_REINDRAKE("Reindrake", 24),//TODO fix totally
+
//TODO arachne
//TODO corelone
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 4194c015e..5e660510e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
@@ -1,5 +1,6 @@
package at.hannibal2.skyhanni.features.damageindicator
+import at.hannibal2.skyhanni.data.IslandType
import at.hannibal2.skyhanni.features.dungeon.DungeonData
import at.hannibal2.skyhanni.features.dungeon.DungeonLividFinder
import at.hannibal2.skyhanni.features.rift.RiftAPI
@@ -11,6 +12,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
import at.hannibal2.skyhanni.utils.LorenzUtils.derpy
+import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
import at.hannibal2.skyhanni.utils.LorenzVec
import at.hannibal2.skyhanni.utils.StringUtils.matchRegex
import at.hannibal2.skyhanni.utils.getLorenzVec
@@ -258,7 +260,11 @@ class MobFinder {
}
if (entity is EntityDragon) {
//TODO testing and use sidebar data
- return EntityResult(bossType = BossType.END_ENDER_DRAGON)
+ if (IslandType.THE_END.isInIsland()) {
+ return EntityResult(bossType = BossType.END_ENDER_DRAGON)
+ } else if (IslandType.WINTER.isInIsland()) {
+ return EntityResult(bossType = BossType.WINTER_REINDRAKE)
+ }
}
if (entity is EntityIronGolem) {
if (entity.hasNameTagWith(3, "§e﴾ §8[§7Lv100§8] §lEndstone Protector§r ")) {