diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json index 562b7967b..c357007ef 100644 --- a/Resources/AnimationLockTime.json +++ b/Resources/AnimationLockTime.json @@ -57,6 +57,10 @@ "190": 0.1, "260": 0.6, "266": 0.6, + "2874": 0.6, + "2876": 0.6, + "2878": 0.6, + "2890": 0.6, "3545": 0.6, "3546": 0.6, "3549": 0.6, @@ -116,6 +120,11 @@ "7406": 0.6, "7407": 0.6, "7409": 0.6, + "7410": 0.6, + "7411": 0.6, + "7412": 0.6, + "7413": 0.6, + "7414": 0.6, "7421": 0.6, "7426": 0.6, "7427": 0.6, @@ -189,6 +198,9 @@ "16473": 0.6, "16495": 0.6, "16496": 0.6, + "16498": 0.6, + "16500": 0.6, + "16501": 0.6, "16505": 0.1, "16507": 0.6, "16508": 0.6, @@ -203,6 +215,7 @@ "16552": 0.6, "16553": 0.6, "16926": 0.1, + "17209": 0.6, "17215": 0.1, "17527": 2.1, "19002": 0.6, @@ -242,6 +255,16 @@ "24313": 0.6, "24315": 0.6, "24316": 0.6, + "24373": 0.6, + "24374": 0.6, + "24378": 0.6, + "24380": 0.6, + "24382": 0.6, + "24383": 0.6, + "24385": 0.6, + "24387": 0.6, + "24393": 0.6, + "24405": 0.6, "25751": 0.6, "25752": 0.6, "25753": 1.15, @@ -255,6 +278,7 @@ "25768": 0.6, "25784": 0.6, "25785": 0.6, + "25788": 0.6, "25793": 0.1, "25796": 0.6, "25797": 0.6, diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs index 1ebae9c4c..6b521fbbb 100644 --- a/RotationSolver.Basic/DataCenter.cs +++ b/RotationSolver.Basic/DataCenter.cs @@ -42,7 +42,7 @@ public static bool SetAutoStatus(AutoStatus status, bool keep) } return keep; } - public static HashSet DisabledAction { get; set; } + public static HashSet DisabledAction { get; set; } = new HashSet(); private static List NextActs = new(); public static IAction ActionSequencerAction { private get; set; } diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs b/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs index 689407596..c1e6ee071 100644 --- a/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs +++ b/RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs @@ -25,7 +25,7 @@ public bool TryInvoke(out IAction newAction, out IAction gcdAction) { if(_lastException?.GetType() != ex.GetType()) { - PluginLog.Error(ex, $"Failed to invoke the next action in \"{GetType().FullName}\", please contact to the author."); + PluginLog.Error(ex, $"Failed to invoke the next action in \"{GetType().FullName}\",\nplease contact to the author with your logs in /xllog."); } _lastException = ex; IsValid = false; diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs index c1ce03591..4f9659ebc 100644 --- a/RotationSolver/Updaters/RotationUpdater.cs +++ b/RotationSolver/Updaters/RotationUpdater.cs @@ -144,6 +144,7 @@ private static void LoadRotationsFromLocal(string relayFolder) { var directories = new string[] { #if DEBUG + relayFolder #else relayFolder #endif