diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json index ea476e676..2e39e2d95 100644 --- a/Resources/AnimationLockTime.json +++ b/Resources/AnimationLockTime.json @@ -1,8 +1,10 @@ { "141": 0.1, + "149": 0.6, "152": 0.1, "153": 0.6, "154": 0.1, + "158": 0.6, "3574": 0.6, "3576": 0.1, "3577": 0.1, @@ -26,9 +28,11 @@ "9793": 0.1, "12260": 0.1, "16505": 0.1, + "16507": 0.6, "16524": 0.1, "16525": 0.1, "16527": 0.6, "20243": 0.1, - "25796": 0.6 + "25796": 0.6, + "25797": 0.6 } \ No newline at end of file diff --git a/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs b/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs index 4d017d220..a6951f46e 100644 --- a/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs @@ -56,7 +56,6 @@ protected static bool AddersgallEndAfterGCD(uint gctCount = 0, float offset = 0) public static IBaseAction Kardia { get; } = new BaseAction(ActionID.Kardia, ActionOption.Heal) { - StatusProvide = new StatusID[] { StatusID.Kardia }, ChoiceTarget = (Targets, mustUse) => { var targets = Targets.GetJobCategory(JobRole.Tank); diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs index 6680e2d5d..e54b65e32 100644 --- a/RotationSolver/Updaters/RotationUpdater.cs +++ b/RotationSolver/Updaters/RotationUpdater.cs @@ -140,15 +140,9 @@ private static Assembly LoadOne(string filePath) private static void LoadRotationsFromLocal(string relayFolder) { - var directories = Service.Config.OtherLibs - .Where(Directory.Exists) - //.Append(Path.GetDirectoryName(Assembly.GetAssembly(typeof(ICustomRotation)).Location)) -#if DEBUG - //.Append(relayFolder) -#else - .Append(relayFolder) -#endif - ; + var directories = new string[] { relayFolder } + .Union(Service.Config.OtherLibs + .Where(Directory.Exists)); var assemblies = from dir in directories where Directory.Exists(dir)