feat: health check for spells

Author: ewrogers

CHANGELOG.md

@@ -8,22 +8,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- `MinHealthPercent` to spell/skill metadata
-- `MaxHealthPercent` to spell/skill metadata (Crasher/Animal Feast/Execute)
+- `MinHealthPercent` to ability metadata
+- `MaxHealthPercent` to ability metadata (Crasher/Animal Feast/Execute)
+- Visual indicator on spell queue when waiting on HP thresholds
 - `OpensDialog` to spell metadata (was only skills before)
-- HP threshold in spell/skill tooltips
+- HP threshold in ability tooltips
 - More tooltips in metadata editors
 
 ### Changed
 
-- Use new metadata properties for HP based conditions
+- Use new metadata properties for HP based conditions on abilities
 - Redesign some metadata editors for skill/spells
 - Increase dialog size for skill/spell metadata editors
 - Tooltip design
 
 ### Removed
 
-- Removed hard-coded names for HP-based skills
+- Removed hard-coded names for HP-based skills (now is customizable)
 
 ### Fixed
 

SleepHunter/Macro/PlayerMacroState.cs

@@ -553,11 +553,11 @@ private bool DoSkillMacro(out bool didAssail)
                 }
 
                 // Min health percentage (ex: > 90%), skip if cannot use YET
-                if (skill.MinHealthPercent.HasValue && skill.MinHealthPercent >= client.Stats.HealthPercent)
+                if (skill.MinHealthPercent.HasValue && skill.MinHealthPercent.Value >= client.Stats.HealthPercent)
                     continue;
 
                 // Max health percentage (ex < 2%), skip if cannot use YET
-                if (skill.MaxHealthPercent.HasValue && client.Stats.HealthPercent > skill.MaxHealthPercent)
+                if (skill.MaxHealthPercent.HasValue && client.Stats.HealthPercent > skill.MaxHealthPercent.Value)
                     continue;
 
                 if (client.SwitchToPanelAndWait(skill.Panel, TimeSpan.FromSeconds(1), out var didRequireSwitch, useShiftKey))
@@ -924,32 +924,28 @@ private SpellQueueItem GetNextSpell()
         private SpellQueueItem GetNextSpell_NoRotation(bool skipOnCooldown = true)
         {
             if (skipOnCooldown)
-                return spellQueue.FirstOrDefault(spell => !spell.IsOnCooldown);
+                return spellQueue.FirstOrDefault(spell => !spell.IsWaitingOnHealth && !spell.IsOnCooldown);
             else
-                return spellQueue.FirstOrDefault();
+                return spellQueue.FirstOrDefault(spell => !spell.IsWaitingOnHealth);
         }
 
         private SpellQueueItem GetNextSpell_SingularOrder(bool skipOnCooldown = true)
         {
             if (skipOnCooldown)
-                return spellQueue.FirstOrDefault(spell => !spell.IsOnCooldown && !spell.IsDone);
+                return spellQueue.FirstOrDefault(spell => !spell.IsWaitingOnHealth && !spell.IsOnCooldown && !spell.IsDone);
             else
-                return spellQueue.FirstOrDefault(spell => !spell.IsDone);
+                return spellQueue.FirstOrDefault(spell => !spell.IsWaitingOnHealth && !spell.IsDone);
         }
 
         private SpellQueueItem GetNextSpell_RoundRobin(bool skipOnCooldown = true)
         {
-            // All spells are done, nothing to cast
-            if (spellQueue.All(spell => spell.IsDone))
-                return null;
-
-            // All spells are on cooldown, and skipping so nothing to do
-            if (spellQueue.All(spell => spell.IsOnCooldown) && skipOnCooldown)
+            // All spells are unavailable, nothing to do
+            if (spellQueue.All(spell => spell.IsWaitingOnHealth || spell.IsOnCooldown || spell.IsDone))
                 return null;
 
             var currentSpell = spellQueue.ElementAt(spellQueueIndex);
 
-            while (currentSpell.IsDone || (skipOnCooldown && currentSpell.IsOnCooldown))
+            while (currentSpell.IsWaitingOnHealth || currentSpell.IsDone || (skipOnCooldown && currentSpell.IsOnCooldown))
                 currentSpell = AdvanceToNextSpell();
 
             // Round robin rotation for next time

SleepHunter/Views/MainWindow.xaml.cs

@@ -499,6 +499,17 @@ private void HandleClientUpdateTick(object sender, EventArgs e)
                 queuedSpell.MaximumLevel = spell.MaximumLevel;
                 queuedSpell.CurrentLevel = spell.CurrentLevel;
                 queuedSpell.IsOnCooldown = spell.IsOnCooldown;
+
+                var isWaitingOnHealth = false;
+
+                // Min health percentage (ex: > 90%), cannot use yet
+                if (spell.MinHealthPercent.HasValue && spell.MinHealthPercent.Value >= player.Stats.HealthPercent)
+                    isWaitingOnHealth = true;
+                // Max health percentage (ex: < 2%), cannot use yet
+                else if (spell.MaxHealthPercent.HasValue && player.Stats.HealthPercent > spell.MaxHealthPercent.Value)
+                    isWaitingOnHealth = true;
+
+                queuedSpell.IsWaitingOnHealth = isWaitingOnHealth;
             }
         }