From d3e2991644880b2766d9d50b7419466ece9027c1 Mon Sep 17 00:00:00 2001
From: Lorenz <lo.scherf@gmail.com>
Date: Thu, 25 Aug 2022 15:46:35 +0200
Subject: added option to show the health of Voidgloom Seraph 4 during the
 laser phase

---
 .../hannibal2/skyhanni/config/features/DamageIndicator.java  |  7 ++++++-
 .../at/hannibal2/skyhanni/config/features/Inventory.java     |  2 +-
 .../features/damageindicator/DamageIndicatorManager.kt       | 12 +++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src')

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 042ce6bd5..78421680b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DamageIndicator.java
@@ -13,7 +13,7 @@ import java.util.List;
 public class DamageIndicator {
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Show the missing health of a boss.")
+    @ConfigOption(name = "Damage Indicator Enabled", desc = "Show the missing health of a boss.")
     @ConfigEditorBoolean
     public boolean enabled = false;
 
@@ -69,4 +69,9 @@ public class DamageIndicator {
     @ConfigOption(name = "Damage Over Time", desc = "Show damage and health over time below the damage indicator")
     @ConfigEditorBoolean
     public boolean showDamageOverTime = false;
+
+    @Expose
+    @ConfigOption(name = "Health During Laser", desc = "Show the health of Voidgloom Seraph 4 during the laser phase")
+    @ConfigEditorBoolean
+    public boolean showHealthDuringLaser = false;
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
index c1a5bfdea..ec3076a16 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
@@ -13,7 +13,7 @@ public class Inventory {
     public boolean hideNotClickable = false;
 
     @Expose
-    @ConfigOption(name = "Enabled", desc = "Hide items that are not clickable in the current inventory: ah, bz, accessory bag, etc.")
+    @ConfigOption(name = "Not Clickable Items Enabled", desc = "Hide items that are not clickable in the current inventory: ah, bz, accessory bag, etc.")
     @ConfigEditorBoolean
     @ConfigAccordionId(id = 0)
     public boolean hideNotClickableItems = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index 5d7ddd3be..047b4c7ed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -170,7 +170,8 @@ class DamageIndicatorManager {
             }
 
             if (now > damageCounter.firstTick + 1_000) {
-                damageCounter.oldDamages.add(0, OldDamage(now, damageCounter.currentDamage, damageCounter.currentHealing))
+                damageCounter.oldDamages.add(0,
+                    OldDamage(now, damageCounter.currentDamage, damageCounter.currentHealing))
                 damageCounter.firstTick = 0L
                 damageCounter.currentDamage = 0
                 damageCounter.currentHealing = 0
@@ -282,8 +283,8 @@ class DamageIndicatorManager {
 //                    val ticksAlive = entity.ticksExisted % (20 * 5)
 //                    val remainingTicks = (5 * 20).toLong() - ticksAlive
 //                    val format = formatDelay(remainingTicks * 50)
-//                    entityData.nameSuffix = " §lBOOM - $format"
-                    entityData.nameSuffix = " §lBOOM!"
+//                    entityData.nameSuffix = " §f§lBOOM - $format"
+                    entityData.nameSuffix = " §f§lBOOM!"
                 }
             }
         }
@@ -431,7 +432,12 @@ class DamageIndicatorManager {
             //TODO more tests, more exact values, better logic? idk make this working perfectly pls
             //val remainingTicks = 8 * 20 - ticksAlive
             val remainingTicks = (8.9 * 20).toLong() - ticksAlive
+
+            if (SkyHanniMod.feature.damageIndicator.showHealthDuringLaser) {
+                entityData.nameSuffix = " §f" + formatDelay(remainingTicks * 50)
+            } else {
             return formatDelay(remainingTicks * 50)
+            }
         }
 
         return result
-- 
cgit