fix: fixed BLM timer.

ArchiDog1998 · Apr 29, 2023 · 2efbb65 · 2efbb65
1 parent fb6cbe4
commit 2efbb65
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -1,20 +1,34 @@
 {
+  "141": 0.1,
+  "152": 0.1,
+  "153": 0.6,
+  "154": 0.1,
+  "3574": 0.6,
+  "3576": 0.1,
+  "3577": 0.1,
   "4868": 2.1,
+  "7421": 0.6,
   "7503": 0.1,
   "7505": 0.6,
   "7506": 0.6,
   "7507": 0.6,
   "7509": 0.6,
   "7510": 0.1,
   "7511": 0.1,
+  "7513": 0.6,
   "7514": 0.1,
   "7517": 0.6,
   "7518": 0.6,
   "7559": 0.6,
   "7560": 0.6,
   "7561": 0.6,
   "7562": 0.6,
+  "9793": 0.1,
+  "12260": 0.1,
+  "16505": 0.1,
   "16524": 0.1,
   "16525": 0.1,
-  "16527": 0.6
+  "16527": 0.6,
+  "20243": 0.1,
+  "25796": 0.6
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs b/RotationSolver.Basic/Rotations/Basic/BLM_Base.cs
@@ -27,18 +27,20 @@ public abstract partial class BLM_Base : CustomRotation
 
     protected static bool IsPolyglotStacksMaxed => Xenoglossy.EnoughLevel ? PolyglotStacks == 2 : PolyglotStacks == 1;
 
-    static float ElementTime => JobGauge.EnochianTimer / 1000f;
+    static float EnochianTime => JobGauge.EnochianTimer / 1000f;
 
     protected static bool EnchinaEndAfter(float time)
     {
-        return EndAfter(JobGauge.EnochianTimer / 1000f, time);
+        return EndAfter(EnochianTime, time);
     }
 
     protected static bool EnchinaEndAfterGCD(uint gctCount = 0, float offset = 0)
     {
-        return EndAfterGCD(JobGauge.EnochianTimer / 1000f, gctCount, offset);
+        return EndAfterGCD(EnochianTime, gctCount, offset);
     }
 
+    static float ElementTime => JobGauge.ElementTimeRemaining / 1000f;
+
     protected static bool ElementTimeEndAfter(float time)
     {
         return EndAfter(ElementTime, time);