From f2c01a6c5a13c35286c1a738a0c676762bf17d92 Mon Sep 17 00:00:00 2001
From: HiZe_ <superhize@hotmail.com>
Date: Wed, 19 Jul 2023 19:58:17 +0200
Subject: Merge pull request #308

* Added bloodfiend to damage indicator
---
 .../skyhanni/config/features/DamageIndicatorConfig.java        |  5 +++--
 .../at/hannibal2/skyhanni/features/damageindicator/BossType.kt |  6 ++++++
 .../hannibal2/skyhanni/features/damageindicator/MobFinder.kt   | 10 ++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
index 141b5e5ed..38c1e198c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicatorConfig.java
@@ -58,11 +58,12 @@ public class DamageIndicatorConfig {
                     "§bSea Creatures",
                     "Dummy",
                     "§bArachne",
-                    "§bThe Rift Bosses"
+                    "§bThe Rift Bosses",
+                    "§bRiftstalker Bloodfiend"
             }
     )
     //TODO only show currently working and tested features
-    public List<Integer> bossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 9, 18, 19, 21, 22));
+    public List<Integer> bossesToShow = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 9, 18, 19, 21, 22, 23));
 
     @Expose
     @ConfigOption(name = "Hide Damage Splash", desc = "Hiding damage splashes near the damage indicator.")
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 d4ccee634..9c2e4c7d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
@@ -77,6 +77,12 @@ enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName
     // The Rift
     LEECH_SUPREME("§cLeech Supreme", 22),
 
+    SLAYER_BLOODFIEND_1("§aRiftstalker Bloodfiend 1", 23, "§aBlood 1", showDeathTime = true),
+    SLAYER_BLOODFIEND_2("§6Riftstalker Bloodfiend 2", 23, "§6Blood 2", showDeathTime = true),
+    SLAYER_BLOODFIEND_3("§cRiftstalker Bloodfiend 3", 23, "§cBlood 3", showDeathTime = true),
+    SLAYER_BLOODFIEND_4("§4Riftstalker Bloodfiend 4", 23, "§4Blood 4", showDeathTime = true),
+    SLAYER_BLOODFIEND_5("§5Riftstalker Bloodfiend 5", 23, "§5Blood 5", showDeathTime = true),
+
     //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 b8c20ddab..57be6beeb 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
@@ -203,6 +203,16 @@ class MobFinder {
                 if (entity.name == "Leech Supreme") {
                     return EntityResult(bossType = BossType.LEECH_SUPREME)
                 }
+
+                if (entity.name == "Bloodfiend ") {
+                    when {
+                        entity.hasMaxHealth(625) -> return EntityResult(bossType = BossType.SLAYER_BLOODFIEND_1)
+                        entity.hasMaxHealth(1_100) -> return EntityResult(bossType = BossType.SLAYER_BLOODFIEND_2)
+                        entity.hasMaxHealth(1_800) -> return EntityResult(bossType = BossType.SLAYER_BLOODFIEND_3)
+                        entity.hasMaxHealth(2_400) -> return EntityResult(bossType = BossType.SLAYER_BLOODFIEND_4)
+                        entity.hasMaxHealth(3_000) -> return EntityResult(bossType = BossType.SLAYER_BLOODFIEND_5)
+                    }
+                }
             }
         } else {
             if (entity is EntityBlaze) {
-- 
cgit