fix: add another check for Karida.

ArchiDog1998 · May 6, 2023 · c28aeda · c28aeda
1 parent f721872
commit c28aeda
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -221,6 +221,7 @@ public static void SetSpecialType(SpecialCommandType specialType)
         () => (Service.Config.InterruptDelayMin, Service.Config.InterruptDelayMax));
 
     public static IEnumerable<GameObject> AllTargets { get; set; }
+    public static IEnumerable<BattleChara> AllBattles { get; set; }
 
     public static uint[] TreasureCharas { get; set; } = Array.Empty<uint>();
     public static bool HasHostilesInRange => NumberOfHostilesInRange > 0;

diff --git a/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs b/RotationSolver.Basic/Rotations/Basic/SGE_Base.cs
@@ -70,7 +70,8 @@ protected static bool AddersgallEndAfterGCD(uint gctCount = 0, float offset = 0)
 
             return TargetFilter.FindAttackedTarget(targets, mustUse);
         },
-        ActionCheck = b => !b.HasStatus(true, StatusID.Kardion),
+        ActionCheck = b => !b.HasStatus(true, StatusID.Kardion) 
+            && DataCenter.AllBattles.All(o => !o.HasStatus(true, StatusID.Kardion)),
     };
 
     public static IBaseAction Prognosis { get; } = new BaseAction(ActionID.Prognosis, ActionOption.Heal | ActionOption.EndSpecial);

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -13,16 +13,17 @@ internal static partial class TargetUpdater
     internal static void UpdateTarget()
     {
         DataCenter.AllTargets = Service.ObjectTable.GetObjectInRadius(30);
-        var battles = DataCenter.AllTargets.OfType<BattleChara>();
-        UpdateHostileTargets(battles);
-        UpdateFriends(battles);
+        DataCenter.AllBattles = DataCenter.AllTargets.OfType<BattleChara>();
+        UpdateHostileTargets(DataCenter.AllBattles);
+        UpdateFriends(DataCenter.AllBattles);
         UpdateNamePlate(Service.ObjectTable.OfType<BattleChara>());
     }
 
     internal static void ClearTarget()
     {
         var empty = Array.Empty<BattleChara>();
         DataCenter.AllTargets
+            = DataCenter.AllBattles
             = DataCenter.AllHostileTargets 
             = DataCenter.TarOnMeTargets
             = DataCenter.PartyMembers