fix: fixed the mark action check.

ArchiDog1998 · Apr 30, 2023 · d340b19 · d340b19
1 parent 27d692f
commit d340b19
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 7 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -75,6 +75,7 @@
   "7562": 0.6,
   "7568": 0.1,
   "9793": 0.1,
+  "10083": 0.1,
   "12260": 0.1,
   "16137": 0.6,
   "16138": 0.6,
@@ -104,6 +105,21 @@
   "16553": 0.6,
   "17215": 0.1,
   "20243": 0.1,
+  "21054": 2.1,
+  "24283": 0.1,
+  "24285": 0.6,
+  "24289": 0.6,
+  "24290": 0.6,
+  "24291": 0.6,
+  "24294": 0.6,
+  "24296": 0.6,
+  "24297": 0.6,
+  "24298": 0.6,
+  "24302": 0.6,
+  "24303": 0.6,
+  "24304": 0.6,
+  "24312": 0.1,
+  "24313": 0.6,
   "25751": 0.6,
   "25752": 0.6,
   "25753": 1.15,
@@ -112,5 +128,6 @@
   "25796": 0.6,
   "25797": 0.6,
   "25865": 0.1,
-  "25870": 0.6
+  "25870": 0.6,
+  "31323": 2.1
 }
diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -1 +1,6 @@
-[]
+[
+  13389,
+  13440,
+  13461,
+  13462
+]
diff --git a/Resources/HostileCastingTank.json b/Resources/HostileCastingTank.json
@@ -1 +1,15 @@
-[]
+[
+  13364,
+  13365,
+  13367,
+  13371,
+  13375,
+  13385,
+  13388,
+  13438,
+  13444,
+  13452,
+  13454,
+  13462,
+  13475
+]
diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -280,7 +280,7 @@ private bool TargetHostile(float range, bool mustUse, int aoeCount, out BattleCh
         if (Service.Config.ChooseAttackMark)
         {
             var b = MarkingHelper.GetAttackMarkChara(DataCenter.HostileTargets);
-            if (b != null && TargetFilterFuncEot(new BattleChara[] { b }, mustUse).Any())
+            if (b != null && GetMostObjects(TargetFilterFuncEot(new BattleChara[] { b }, mustUse), Service.Config.CanAttackMarkAOE ?  aoeCount : int.MaxValue).Any())
             {
                 target = b;
                 return true;

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -161,8 +161,11 @@ private static async void SayHelloToAuthor()
                 await Task.Delay(100);
             }
 
+#if DEBUG
+#else
             Service.TargetManager.SetTarget(author.c);
             Service.SubmitToChat($"/{_macroToAuthor[new Random().Next(_macroToAuthor.Count)]} <t>");
+#endif
             var message = new SeString(new IconPayload(BitmapFontIcon.Mentor),
 
                           new UIForegroundPayload(31),

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -174,9 +174,8 @@ private static bool IsHostileCastingTank(BattleChara h)
     {
         return IsHostileCastingBase(h, (act) =>
         {
-            return OtherConfiguration.HostileCastingTank.Contains(act.RowId);
-
-            //return h.CastTargetObjectId == h.TargetObjectId;
+            return OtherConfiguration.HostileCastingTank.Contains(act.RowId)
+                || h.CastTargetObjectId == h.TargetObjectId;
         });
     }
-Original file line number
+Diff line change
@@ -1 +1,6 @@
-    []
+    [
+,
+,
+,
+    ]