fix: removed the tank buster check.

ArchiDog1998 · Apr 30, 2023 · 5afb0e0 · 5afb0e0
1 parent bf7b72c
commit 5afb0e0
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 38 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -111,15 +111,23 @@
   "24289": 0.6,
   "24290": 0.6,
   "24291": 0.6,
+  "24292": 0.6,
   "24294": 0.6,
+  "24295": 0.70000005,
   "24296": 0.6,
   "24297": 0.6,
   "24298": 0.6,
+  "24299": 0.6,
+  "24301": 0.6,
   "24302": 0.6,
   "24303": 0.6,
   "24304": 0.6,
+  "24305": 0.6,
+  "24310": 0.6,
   "24312": 0.1,
   "24313": 0.6,
+  "24315": 0.6,
+  "24316": 0.6,
   "25751": 0.6,
   "25752": 0.6,
   "25753": 1.15,

diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -1,6 +1,10 @@
 [
+  9523,
+  13314,
+  13343,
   13389,
   13440,
   13461,
-  13462
+  13462,
+  31835
 ]
diff --git a/Resources/HostileCastingTank.json b/Resources/HostileCastingTank.json
@@ -1,15 +1 @@
-[
-  13364,
-  13365,
-  13367,
-  13371,
-  13375,
-  13385,
-  13388,
-  13438,
-  13444,
-  13452,
-  13454,
-  13462,
-  13475
-]
+[]
diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -165,7 +165,6 @@ public class PluginConfiguration : IPluginConfiguration
     public bool AutoUpdateLibs = true;
     public string[] OtherLibs = Array.Empty<string>();
 
-    public bool RecordCastingTank = true;
     public bool RecordCastingArea = true;
 
     public List<TargetingType> TargetingTypes { get; set; } = new List<TargetingType>();

diff --git a/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs b/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs
@@ -80,7 +80,7 @@ protected static bool AddersgallEndAfterGCD(uint gctCount = 0, float offset = 0)
 
     public static IBaseAction Eukrasia { get; } = new BaseAction(ActionID.Eukrasia, ActionOption.Heal)
     {
-        ActionCheck = b => !JobGauge.Eukrasia,
+        ActionCheck = b => !HasEukrasia,
     };
 
     public static IBaseAction Soteria { get; } = new BaseAction(ActionID.Soteria, ActionOption.Heal);
@@ -122,12 +122,12 @@ protected static bool AddersgallEndAfterGCD(uint gctCount = 0, float offset = 0)
         },
     };
 
-    public static IBaseAction Haima { get; } = new BaseAction(ActionID.Haima, ActionOption.Heal)
+    public static IBaseAction Haima { get; } = new BaseAction(ActionID.Haima, ActionOption.Defense)
     {
         ChoiceTarget = TargetFilter.FindAttackedTarget,
     };
 
-    public static IBaseAction EukrasianDiagnosis { get; } = new BaseAction(ActionID.EukrasianDiagnosis, ActionOption.Heal)
+    public static IBaseAction EukrasianDiagnosis { get; } = new BaseAction(ActionID.EukrasianDiagnosis, ActionOption.Defense)
     {
         ChoiceTarget = TargetFilter.FindAttackedTarget,
     };

diff --git a/RotationSolver/UI/RotationConfigWindow_Action.cs b/RotationSolver/UI/RotationConfigWindow_Action.cs
@@ -33,7 +33,7 @@ private void DrawActionList()
                 {
                     if (ImGui.CollapsingHeader(pair.Key))
                     {
-                        foreach (var item in pair)
+                        foreach (var item in pair.OrderBy(t => t.ID))
                         {
                             item.Display(ActiveAction == item);
                             ImGui.Separator();

diff --git a/RotationSolver/UI/RotationConfigWindow_List.cs b/RotationSolver/UI/RotationConfigWindow_List.cs
@@ -181,11 +181,6 @@ private void DrawListTab()
 
             DrawParamTabItem(LocalizationManager.RightLang.ConfigWindow_List_HostileCastingTank, DrawHostileCastingTank, () =>
             {
-                DrawCheckBox("Record", ref Service.Config.RecordCastingTank, Service.Default.RecordCastingTank);
-
-                ImGui.SameLine();
-                ImGuiHelper.Spacing();
-
                 ImGui.SetNextItemWidth(200);
                 ImGuiHelper.SearchCombo("##AddCastingTank",
                     LocalizationManager.RightLang.ConfigWindow_Param_AddOne,

diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
@@ -98,18 +98,6 @@ private static void ActionFromEnemy(uint sourceId, ActionEffectSet set)
                         OtherConfiguration.SaveHostileCastingArea();
                     }
                 }
-                else if (DataCenter.PartyTanks.Any(p => p.ObjectId == set.Target?.ObjectId)
-                    || set.TargetEffects.Any(e =>
-                    DataCenter.PartyTanks.Any(p => p.ObjectId == e.Target?.ObjectId)
-                    && e.GetSpecificTypeEffect(ActionEffectType.Damage, out var effect)
-                    && (effect.Value > 0 || (effect.Param0 & 6) == 6)))
-                {
-                    if (Service.Config.RecordCastingTank)
-                    {
-                        OtherConfiguration.HostileCastingTank.Add(set.Action.RowId);
-                        OtherConfiguration.SaveHostileCastingTank();
-                    }
-                }
             }
         }
     }
-Original file line number
+Diff line change
@@ -1,6 +1,10 @@
     [
+,
+,
+,
 ,
 ,
 ,
+,
     ]