fix: fixed target area checking.

ArchiDog1998 · Jul 19, 2023 · 2fe3a43 · 2fe3a43
1 parent c0efc5a
commit 2fe3a43
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -267,6 +267,10 @@
   "9793": 0.1,
   "10079": 2.1,
   "10083": 0.1,
+  "11398": 0.1,
+  "11406": 0.1,
+  "11411": 0.1,
+  "11423": 0.6,
   "12260": 0.1,
   "12669": 1.1,
   "14083": 2.1,
@@ -387,6 +391,7 @@
   "17841": 2.1,
   "17842": 2.1,
   "17843": 2.1,
+  "18309": 0.1,
   "18873": 0.6,
   "18877": 0.6,
   "18881": 0.6,
@@ -427,6 +432,7 @@
   "23044": 0.1,
   "23045": 0.1,
   "23048": 0.1,
+  "23264": 0.1,
   "23317": 2.1,
   "23915": 0.1,
   "24222": 2.1,

diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -500,7 +500,7 @@ internal unsafe bool CanUseTo(GameObject tar)
 
         var tarAddress = tar.Struct();
 
-        if (!ActionManager.CanUseActionOnTarget(AdjustedID, tarAddress)) return false;
+        if (!_action.TargetArea && !ActionManager.CanUseActionOnTarget(AdjustedID, tarAddress)) return false;
 
         var point = Player.Object.Position + Vector3.UnitY * Player.GameObject->Height;
         var tarPt = tar.Position + Vector3.UnitY * tar.Struct()->Height;

diff --git a/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLU_Base.cs
@@ -158,7 +158,7 @@ public bool RightType
                     if (Target.HasStatus(false, NoPhysic) && Type == BLUActionType.Physical) return false;
                     if (Target.HasStatus(false, NoMagic) && Type == BLUActionType.Magical) return false;
                 }
-                catch(Exception ex)
+                catch (Exception ex)
                 {
                     PluginLog.Warning(ex, "Failed for checking target status.");
                 }
@@ -323,7 +323,10 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
     /// <summary>
     /// 
     /// </summary>
-    public static IBLUAction Eruption { get; } = new BLUAction(ActionID.Eruption);
+    public static IBLUAction Eruption { get; } = new BLUAction(ActionID.Eruption)
+    {
+        AOECount = 1,
+    };
 
     /// <summary>
     /// 
@@ -1044,7 +1047,7 @@ protected override IRotationConfigSet CreateConfiguration()
     {
         return base.CreateConfiguration()
             .SetCombo("BlueId", 2, "Role", "Tank", "Healer", "DPS")
-            .SetCombo("AttackType", 2, "Type", "Magic", "Physic", "Both");
+            .SetCombo("AttackType", 2, "Type", "Both", "Magic", "Physic");
     }
 
     /// <summary>