From b24b0bac2bf8f964f0065f934a98f1cfd85b7f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Tue, 25 Apr 2023 00:23:00 +0800 Subject: [PATCH] fix: fund back the `UpdateNextAction` method call. --- Resources/AnimationLockTime.json | 11 ++++++++++- RotationSolver/Updaters/MajorUpdater.cs | 11 ++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json index f36b6402f..7ff4bd921 100644 --- a/Resources/AnimationLockTime.json +++ b/Resources/AnimationLockTime.json @@ -185,7 +185,12 @@ "7562": 0.6, "7568": 0.1, "9826": 0.1, + "10084": 2.1, + "13704": 2.1, + "13706": 2.1, + "13707": 2.1, "14971": 1.1, + "15818": 2.1, "15989": 0.6, "15990": 0.6, "15991": 0.6, @@ -249,6 +254,7 @@ "22378": 2.1, "22379": 2.1, "22380": 2.1, + "22497": 2.1, "24284": 0.1, "24285": 0.6, "24290": 0.6, @@ -269,6 +275,7 @@ "24391": 0.6, "24393": 0.6, "24405": 0.6, + "24801": 2.1, "25746": 0.6, "25747": 0.6, "25748": 0.6, @@ -307,5 +314,7 @@ "25865": 0.1, "25870": 0.6, "25876": 0.6, - "25885": 0.6 + "25885": 0.6, + "27970": 2.1, + "31404": 2.1 } \ No newline at end of file diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs index 83bd30f67..f1917ec51 100644 --- a/RotationSolver/Updaters/MajorUpdater.cs +++ b/RotationSolver/Updaters/MajorUpdater.cs @@ -11,7 +11,7 @@ internal static class MajorUpdater && !DataCenter.HasHostilesInRange; #if DEBUG - private static readonly Dictionary _valus = new Dictionary(); + private static readonly Dictionary _values = new Dictionary(); #endif private static void FrameworkUpdate(Framework framework) @@ -33,11 +33,11 @@ private static void FrameworkUpdate(Framework framework) { string key = enumNames[i]; bool newValue = Service.Conditions[(Dalamud.Game.ClientState.Conditions.ConditionFlag)indexs[i]]; - if (_valus.ContainsKey(i) && _valus[i] != newValue && indexs[i] != 48 && indexs[i] != 27) + if (_values.ContainsKey(i) && _values[i] != newValue && indexs[i] != 48 && indexs[i] != 27) { //Service.ToastGui.ShowQuest(indexs[i].ToString() + " " + key + ": " + newValue.ToString()); } - _valus[i] = newValue; + _values[i] = newValue; } } #endif @@ -97,10 +97,7 @@ private static void UpdateWork() RotationUpdater.UpdateRotation(); ActionSequencerUpdater.UpdateActionSequencerAction(); - if (!ShouldPreventActions) - { - ActionUpdater.DoAction(); - } + ActionUpdater.UpdateNextAction(); RSCommands.UpdateRotationState();