Merge pull request #437 from Karaha-Baruha/main

Add ability to target by HP percentage
FFXIV-CombatReborn · Oct 23, 2024 · fee5ea2 · fee5ea2
2 parents 94b3f69 + 14deb2b
commit fee5ea2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/RotationSolver.Basic/Actions/ActionTargetInfo.cs b/RotationSolver.Basic/Actions/ActionTargetInfo.cs
@@ -988,6 +988,8 @@ private readonly bool CanGetTarget(IGameObject target, IGameObject subTarget)
                 TargetingType.Small => IGameObjects.OrderBy<IGameObject, float>(p => p.HitboxRadius),
                 TargetingType.HighHP => IGameObjects.OrderByDescending<IGameObject, uint>(p => p is IBattleChara b ? b.CurrentHp : 0),
                 TargetingType.LowHP => IGameObjects.OrderBy<IGameObject, uint>(p => p is IBattleChara b ? b.CurrentHp : 0),
+                TargetingType.HighHPPercent => IGameObjects.OrderByDescending<IGameObject, float>(p => p is IBattleChara b ? b.CurrentHp / b.MaxHp : 0),
+                TargetingType.LowHPPercent => IGameObjects.OrderBy<IGameObject, float>(p => p is IBattleChara b ? b.CurrentHp / b.MaxHp : 0),
                 TargetingType.HighMaxHP => IGameObjects.OrderByDescending<IGameObject, uint>(p => p is IBattleChara b ? b.MaxHp : 0),
                 TargetingType.LowMaxHP => IGameObjects.OrderBy<IGameObject, uint>(p => p is IBattleChara b ? b.MaxHp : 0),
                 TargetingType.Nearest => IGameObjects.OrderBy<IGameObject, float>(p => p.DistanceToPlayer()),

diff --git a/RotationSolver.Basic/Data/TargetType.cs b/RotationSolver.Basic/Data/TargetType.cs
@@ -29,6 +29,18 @@ public enum TargetingType
     [Description("Low HP")]
     LowHP,
 
+    /// <summary>
+    /// Find the target whose HP percentage is highest.
+    /// </summary>
+    [Description("High HP%")]
+    HighHPPercent,
+
+    /// <summary>
+    /// Find the target whose HP percentage is lowest.
+    /// </summary>
+    [Description("Low HP%")]
+    LowHPPercent,
+
     /// <summary>
     /// Find the target whose max HP is highest.
     /// </summary>