fix: changed reprisal action type.

ArchiDog1998 · May 5, 2023 · f721872 · f721872
1 parent fb94d60
commit f721872
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -205,6 +205,7 @@
   "20243": 0.1,
   "20542": 2.1,
   "21054": 2.1,
+  "21910": 2.1,
   "22411": 1.1,
   "22605": 2.1,
   "24283": 0.1,

diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -4,11 +4,15 @@
   2375,
   2398,
   3416,
+  3676,
+  3691,
+  3696,
   4116,
   4126,
   4135,
   4149,
   4162,
+  4323,
   6469,
   6547,
   8023,
@@ -17,6 +21,7 @@
   8028,
   8039,
   9523,
+  13262,
   13314,
   13343,
   13389,
@@ -35,6 +40,7 @@
   28493,
   28495,
   28512,
+  28527,
   28528,
   29818,
   30134,
@@ -49,6 +55,10 @@
   31376,
   31390,
   31835,
+  31885,
+  31910,
+  31925,
   31956,
-  31978
+  31978,
+  32785
 ]
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -112,7 +112,7 @@ internal RoleAction(ActionID actionID, JobRole[] roles, ActionOption option = Ac
         FilterForHostiles = b => TargetFilter.ProvokeTarget(b),
     };
 
-    public static IBaseAction Reprisal { get; } = new RoleAction(ActionID.Reprisal, new JobRole[] { JobRole.Tank }, ActionOption.Defense);
+    public static IBaseAction Reprisal { get; } = new RoleAction(ActionID.Reprisal, new JobRole[] { JobRole.Tank }, ActionOption.ActionSequencer);
 
     public static IBaseAction Shirk { get; } = new RoleAction(ActionID.Shirk, new JobRole[] { JobRole.Tank }, ActionOption.Friendly | ActionOption.ActionSequencer)
     {

diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs
@@ -142,7 +142,12 @@ private static Assembly LoadOne(string filePath)
 
     private static void LoadRotationsFromLocal(string relayFolder)
     {
-        var directories = new string[] { relayFolder }
+        var directories = new string[] {
+#if DEBUG
+#else
+            relayFolder 
+#endif
+        }
             .Union(Service.Config.OtherLibs
             .Where(Directory.Exists));
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,11 +4,15 @@ @@
 ,
 ,
 ,
+,
+,
+,
 ,
 ,
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand All / @@ -17,6 +21,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand All / @@ -35,6 +40,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand All / @@ -49,6 +55,10 @@ @@
 ,
 ,
 ,
+,
+,
+,
 ,
+,
     ]