fix: fixed with auto status tank stance.

ArchiDog1998 · May 2, 2023 · 015c5ba · 015c5ba
1 parent 0d74a6c
commit 015c5ba
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -62,6 +62,10 @@
   "3559": 0.6,
   "3560": 0.6,
   "3562": 0.6,
+  "3568": 0.1,
+  "3569": 0.6,
+  "3570": 0.6,
+  "3571": 0.6,
   "3573": 0.6,
   "3574": 0.6,
   "3576": 0.1,
@@ -109,6 +113,7 @@
   "7426": 0.6,
   "7427": 0.6,
   "7429": 0.6,
+  "7430": 0.6,
   "7431": 0.1,
   "7432": 0.6,
   "7447": 0.1,
@@ -141,6 +146,7 @@
   "9793": 0.1,
   "10083": 0.1,
   "12260": 0.1,
+  "14100": 2.1,
   "16137": 0.6,
   "16138": 0.6,
   "16139": 0.6,
@@ -171,12 +177,14 @@
   "16524": 0.1,
   "16525": 0.1,
   "16527": 0.6,
+  "16531": 0.6,
   "16542": 0.6,
   "16552": 0.6,
   "16553": 0.6,
   "17215": 0.1,
   "20243": 0.1,
   "21054": 2.1,
+  "22605": 2.1,
   "24283": 0.1,
   "24284": 0.1,
   "24285": 0.6,

diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -1,6 +1,11 @@
 [
   2398,
   3416,
+  8023,
+  8024,
+  8025,
+  8028,
+  8039,
   9523,
   13314,
   13343,

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
@@ -77,7 +77,10 @@ private bool InterruptAbility(JobRole role, out IAction act)
     private bool ShirkOrShield(JobRole role, SpecialCommandType specialType, out IAction act)
     {
         act = null;
-        if (role != JobRole.Tank) return false;
+        if (role != JobRole.Tank)
+        {
+            return DataCenter.SetAutoStatus(AutoStatus.TankStance, false);
+        }
 
         switch (specialType)
         {

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -95,7 +95,7 @@ static void DutyState_DutyStarted(object sender, ushort e)
         if (!Service.Player.IsJobCategory(JobRole.Tank) && !Service.Player.IsJobCategory(JobRole.Healer)) return;
 
         var territory = Service.GetSheet<TerritoryType>().GetRow(e);
-        if (HighEndDuties.Any(t => t.RowId == territory.RowId))
+        //if (HighEndDuties.Any(t => t.RowId == territory.RowId))
         {
             var str = territory.PlaceName?.Value?.Name.ToString() ?? "High-end Duty";
             var message = string.Format(LocalizationManager.RightLang.HighEndWarning, str);
-Original file line number
+Diff line change
@@ -1,6 +1,11 @@
     [
 ,
 ,
+,
+,
+,
+,
+,
 ,
 ,
 ,
@@ Expand Down @@