fix: add InCombat property for every object.

ArchiDog1998 · Aug 28, 2023 · b2c34bd · b2c34bd
1 parent 941ae29
commit b2c34bd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -167,6 +167,16 @@ public static bool IsDying(this BattleChara b)
         return b.GetDeadTime() <= Service.Config.GetValue(Configuration.PluginConfigFloat.DeadTimeDying) || b.GetHealthRatio() < 0.02f;
     }
 
+    /// <summary>
+    /// Whether the character is in combat.
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns></returns>
+    public static unsafe bool InCombat(this BattleChara obj)
+    {
+        return obj.Struct()->Character.InCombat;
+    }
+
     private static readonly TimeSpan CheckSpan = TimeSpan.FromSeconds(2.5);
 
     /// <summary>

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -209,10 +209,10 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     /// <summary>
     /// 
     /// </summary>
-    public static unsafe IBaseAction Peloton { get; } = new RoleAction(ActionID.Peloton, new JobRole[] { JobRole.RangedPhysical }, ActionOption.Friendly)
+    public static IBaseAction Peloton { get; } = new RoleAction(ActionID.Peloton, new JobRole[] { JobRole.RangedPhysical }, ActionOption.Friendly)
     {
         ActionCheck = (b, m) => NotInCombatDelay && PartyMembers.GetObjectInRadius(20)
-            .Any(p => p.WillStatusEnd(3, false, StatusID.Peloton) && !p.Struct()->Character.InCombat),
+            .Any(p => p.WillStatusEnd(3, false, StatusID.Peloton) && !p.InCombat()),
     };
 
     /// <summary>

diff --git a/RotationSolver/ActionSequencer/TargetCondition.cs b/RotationSolver/ActionSequencer/TargetCondition.cs
@@ -68,6 +68,10 @@ public bool IsTrue(ICustomRotation rotation)
                 result = tar.IsDying();
                 break;
 
+            case TargetConditionType.InCombat:
+                result = tar.InCombat();
+                break;
+
             case TargetConditionType.Distance:
                 result = tar.DistanceToPlayer() > DistanceOrTime;
                 break;
@@ -179,6 +183,7 @@ public void Draw(ICustomRotation rotation)
                 break;
             case TargetConditionType.IsDying:
             case TargetConditionType.IsBoss:
+            case TargetConditionType.InCombat:
             case TargetConditionType.CastingAction:
                 combos = new string[]
                 {
@@ -309,6 +314,7 @@ public enum TargetConditionType : byte
     HasStatus,
     IsDying,
     IsBoss,
+    InCombat,
     Distance,
     StatusEnd,
     StatusEndGCD,

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -2064,6 +2064,12 @@ private static unsafe void DrawParty()
         ImGui.Text("CanHealAreaSpell: " + DataCenter.CanHealAreaSpell.ToString());
         ImGui.Text("CanHealAreaSpell: " + DataCenter.CanHealAreaSpell.ToString());
         ImGui.Text("PartyMembersAverHP: " + DataCenter.PartyMembersAverHP.ToString());
+
+        foreach (var p in Svc.Party)
+        {
+            if (p.GameObject is not BattleChara b) continue;
+            ImGui.Text($"In Combat: {b.InCombat()}");
+        }
     }
 
     private static unsafe void DrawTargetData()