Minor naming tweaks.

awgil · Jul 13, 2024 · 860a999 · 860a999
1 parent c67162f
commit 860a999
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/BossMod/Autorotation/xan/xbase.cs b/BossMod/Autorotation/xan/xbase.cs
@@ -80,9 +80,9 @@ protected void SelectPrimaryTarget(OptionRef track, ref Actor? primaryTarget, fl
             return;
         }
 
-        if (Player.DistanceTo(primaryTarget) > range)
+        if (Player.DistanceToHitbox(primaryTarget) > range)
         {
-            primaryTarget = Hints.PriorityTargets.Where(x => x.Actor.DistanceTo(Player) <= range).MaxBy(x => x.Actor.HPMP.CurHP)?.Actor;
+            primaryTarget = Hints.PriorityTargets.Where(x => x.Actor.DistanceToHitbox(Player) <= range).MaxBy(x => x.Actor.HPMP.CurHP)?.Actor;
             // Hints.ForcedTarget = primaryTarget;
         }
     }

diff --git a/BossMod/BossModule/AIHints.cs b/BossMod/BossModule/AIHints.cs
@@ -39,6 +39,7 @@ public class Enemy(Actor actor, bool shouldBeTanked)
 
     // amount of time remaining we have to finish a slidecast
     // this is only set to a sensible value by AIBehaviour; otherwise it will be 0 if any movement keys are being pressed or infinity otherwise
+    // TODO: reconsider...
     public float ForceMovementIn = float.MaxValue;
 
     // positioning: list of shapes that are either forbidden to stand in now or will be in near future

diff --git a/BossMod/Data/Actor.cs b/BossMod/Data/Actor.cs
@@ -121,7 +121,7 @@ public sealed class Actor(ulong instanceID, uint oid, int spawnIndex, string nam
     public ActorStatus? FindStatus<SID>(SID sid) where SID : Enum => FindStatus((uint)(object)sid);
     public ActorStatus? FindStatus<SID>(SID sid, ulong source) where SID : Enum => FindStatus((uint)(object)sid, source);
 
-    public float DistanceTo(Actor? other) => other == null ? float.MaxValue : (other.Position - Position).Length() - other.HitboxRadius - HitboxRadius;
+    public float DistanceToHitbox(Actor? other) => other == null ? float.MaxValue : (other.Position - Position).Length() - other.HitboxRadius - HitboxRadius;
 
     public override string ToString() => $"{OID:X} '{Name}' <{InstanceID:X}>";
 }