fix: identify boss by mobs' rank, which is 2 or 6.

ArchiDog1998 · Nov 4, 2023 · 9b2e39a · 9b2e39a
1 parent 5731349
commit 9b2e39a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,4 +1,4 @@
 {
-  "ClickingCount": 54459,
+  "ClickingCount": 54509,
   "SaidUsers": []
 }
diff --git a/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
@@ -173,7 +173,11 @@ public unsafe virtual bool CanUse(out IAction act, CanUseOption option = CanUseO
         if (IsGeneralGCD && IsEot && IsFriendly && IActionHelper.IsLastGCD(true, this)
             && DataCenter.TimeSinceLastAction.TotalSeconds < 3) return false;
 
-        if (!FindTarget(mustUse, aoeCount, out var target, out var affectedTargets) || target == null) return false;
+        if (!FindTarget(mustUse, aoeCount, out var target, out var affectedTargets) || target == null)
+        {
+            AffectedTargets = affectedTargets;
+            return false;
+        }
 
         if (ActionCheck != null && !ActionCheck(target, mustUse)) return false;
 

diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -513,12 +513,13 @@ private bool TargetSelf(bool mustUse, int aoeCount, out BattleChara[] affectedTa
             }
 
             var tars = TargetFilter.GetObjectInRadius(TargetFilterFuncEot(DataCenter.HostileTargets, mustUse), EffectRange);
+
+            affectedTargets = GetAffectedTargets(DataCenter.AllHostileTargets, Player.Object);
+
             if (tars.Count() < aoeCount) return false;
 
             if (Service.Config.GetValue(PluginConfigBool.NoNewHostiles) && TargetFilter.GetObjectInRadius(DataCenter.AllHostileTargets, EffectRange)
                 .Any(t => t.TargetObject == null)) return false;
-
-            affectedTargets = GetAffectedTargets(DataCenter.AllHostileTargets, Player.Object);
         }
 
         return true;
@@ -582,7 +583,6 @@ private bool CanGetTarget(BattleChara target, BattleChara subTarget)
     {
         if (target == null) return false;
         if (IsSingleTarget) return false;
-        if (target.DistanceToPlayer() > Range) return false;
 
         var pPos = Player.Object.Position;
         Vector3 dir = target.Position - pPos;

diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -159,7 +159,7 @@ public static bool IsBoss(this BattleChara obj)
         if (obj == null) return false;
         if (obj.IsDummy() && !Service.Config.GetValue(Configuration.PluginConfigBool.ShowTargetTimeToKill)) return true;
 
-        return  !(obj.GetObjectNPC()?.IsTargetLine ?? true);
+        return obj.GetObjectNPC()?.Rank is 2 or 6;
     }
 
     /// <summary>

diff --git a/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs b/RotationSolver.Basic/Rotations/Basic/DNC_Base.cs
@@ -265,7 +265,7 @@ public abstract class DNC_Base : CustomRotation
     /// <summary>
     /// 
     /// </summary>
-    protected static IBaseAction StandardFinish { get; } = new BaseAction(ActionID.StandardFinish)
+    public static IBaseAction StandardFinish { get; } = new BaseAction(ActionID.StandardFinish)
     {
         StatusNeed = new[] { StatusID.StandardStep },
         ActionCheck = (b, m) => IsDancing && CompletedSteps == 2,
@@ -274,7 +274,7 @@ public abstract class DNC_Base : CustomRotation
     /// <summary>
     /// 
     /// </summary>
-    protected static IBaseAction TechnicalFinish { get; } = new BaseAction(ActionID.TechnicalFinish)
+    public static IBaseAction TechnicalFinish { get; } = new BaseAction(ActionID.TechnicalFinish)
     {
         StatusNeed = new[] { StatusID.TechnicalStep },
         ActionCheck = (b, m) => IsDancing && CompletedSteps == 4,

diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -72,7 +72,12 @@ public static void DoAction()
 
                     if (act.ShouldEndSpecial) ResetSpecial();
 #if DEBUG
-                    //Svc.Log.Debug($"{act}, {act.Target.Name}");
+                    //Svc.Chat.Print(act.Name);
+                    //Svc.Chat.Print(act.Target?.Name.TextValue ?? string.Empty);
+                    //foreach (var item in act.AffectedTargets)
+                    //{
+                    //    Svc.Chat.Print(item?.Name.TextValue ?? string.Empty);
+                    //}
 #endif
                     //Change Target
                     var tar = (act.Target == null || act.Target == Player.Object) 

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -225,7 +225,7 @@ private static bool IsCastingTankVfx()
 
     private static bool IsCastingAreaVfx()
     {
-        return false;
+        return IsCastingVfx(s => s.StartsWith("vfx/lockon/eff/com_share"));
     }
 
     private static bool IsCastingVfx(Func<string, bool> isVfx)