fix: fixed moving target.

ArchiDog1998 · Jul 2, 2023 · 2d1378d · 2d1378d
1 parent 38ea7d2
commit 2d1378d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -136,8 +136,8 @@
   "3596": 0.1,
   "3598": 0.1,
   "3599": 0.6,
-  "3600": 0.1,
-  "3601": 0.6,
+  "3600": 0.6,
+  "3601": 0.1,
   "3603": 0.6,
   "3606": 0.6,
   "3608": 0.6,
@@ -223,7 +223,10 @@
   "7518": 0.6,
   "7519": 0.6,
   "7520": 0.6,
+  "7521": 0.6,
   "7524": 0.1,
+  "7525": 0.6,
+  "7526": 0.6,
   "7531": 0.6,
   "7533": 0.6,
   "7535": 0.6,
@@ -334,6 +337,7 @@
   "16514": 0.6,
   "16524": 0.1,
   "16525": 0.1,
+  "16526": 0.6,
   "16527": 0.6,
   "16531": 0.6,
   "16532": 0.6,
@@ -360,6 +364,7 @@
   "19012": 0.6,
   "19297": 0.6,
   "20243": 0.1,
+  "20250": 0.1,
   "20304": 0.6,
   "20542": 2.1,
   "21052": 2.1,

diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -1,5 +1,7 @@
 [
   458,
+  927,
+  930,
   1038,
   1365,
   1385,
@@ -28,6 +30,8 @@
   4855,
   4918,
   5159,
+  5182,
+  5188,
   5317,
   5329,
   5331,
@@ -153,6 +157,9 @@
   28999,
   29002,
   29003,
+  29014,
+  29021,
+  29022,
   29046,
   29210,
   29211,

diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -290,7 +290,7 @@ private bool TargetHostileManual(BattleChara b, bool mustUse, int aoeCount, out
     {
         target = b;
         if (!CanUseTo(b)) return false;
-        if (!TargetFilterFuncEot(new BattleChara[] { b }, mustUse).Any()) return false;
+        if (ChoiceTarget(TargetFilterFuncEot(new BattleChara[] { b }, mustUse), mustUse) == null) return false;
 
         if (_action.CastType == 1)
         {

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -227,7 +227,6 @@
   "ActionSequencer_ActionSequencerDescription": "To customize when Rotation Solver uses specific actions automatically, click on an action's icon in the left list. Below, you may set the conditions for when that specific action is used. Each action can have a different set of conditions to override the default rotation behavior.",
   "ActionSequencer_ForceConditionSet": "Conditions When Automatic Use of Action is Forced",
   "ActionSequencer_DisableConditionSet": "Conditions When Automatic Use of Action is Disabled",
-  "ActionSequencer_ConditionsRequired": "Conditions Required",
   "ActionSequencer_Can": "Can",
   "ActionSequencer_Cannot": "Cannot",
   "ActionSequencer_Is": "Is",
-Original file line number
+Diff line change
@@ -1,5 +1,7 @@
     [
 ,
+,
+,
 ,
 ,
 ,
@@ Expand Down Expand Up / @@ -28,6 +30,8 @@ @@
 ,
 ,
 ,
+,
+,
 ,
 ,
 ,
@@ Expand Down Expand Up / @@ -153,6 +157,9 @@ @@
 ,
 ,
 ,
+,
+,
+,
 ,
 ,
 ,
@@ Expand Down @@