Merge pull request #506 from FFXIV-CombatReborn/pokeball

Add checks to PvE methods and update online status handling
FFXIV-CombatReborn · Jan 1, 2025 · ecb1a13 · ecb1a13
2 parents 4c090af + 418c469
commit ecb1a13
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs b/RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs
@@ -104,6 +104,7 @@ static partial void ModifyCombustPvE(ref ActionSetting setting)
     static partial void ModifyLightspeedPvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.Lightspeed];
+        setting.ActionCheck = () => !IsLastAbility(ActionID.LightspeedPvE);
         setting.CreateConfig = () => new ActionConfig()
         {
             TimeToKill = 10,

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -27,6 +27,7 @@ internal static void LoadActionSetting(ref IBaseAction action)
     static partial void ModifyTrueNorthPvE(ref ActionSetting setting)
     {
         setting.StatusProvide = new[] { StatusID.TrueNorth };
+        setting.ActionCheck = () => !IsLastAction(ActionID.TrueNorthPvE);
     }
 
     static partial void ModifyAddlePvE(ref ActionSetting setting)

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -2644,6 +2644,7 @@ private static unsafe void DrawStatus()
             ImGui.Text($"Fate: {DataCenter.FateId}");
         }
         ImGui.Text($"Height: {Player.Character->ModelContainer.CalculateHeight()}");
+        ImGui.Text($"OnlineStatus: {Player.OnlineStatus}");
         ImGui.Text($"Moving: {DataCenter.IsMoving}");
         ImGui.Text($"Stop Moving: {DataCenter.StopMovingRaw}");
         ImGui.Text($"CountDownTime: {Service.CountDownTime}");

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -38,7 +38,7 @@ private static unsafe List<IBattleChara> GetPartyMembers()
         {
             return DataCenter.AllianceMembers?
                 .Where(ObjectHelper.IsParty)
-                .Where(b => b.Character() != null && b.Character()->CharacterData.OnlineStatus != 15 && b.IsTargetable)
+                .Where(b => b.Character() != null && b.Character()->CharacterData.OnlineStatus != 15 && b.Character()->CharacterData.OnlineStatus != 5 && b.IsTargetable)
                 .ToList() ?? new List<IBattleChara>();
         }
         catch (Exception ex)
@@ -55,7 +55,7 @@ private static unsafe List<IBattleChara> GetAllianceMembers()
         {
             return DataCenter.AllTargets?
                 .Where(ObjectHelper.IsAlliance)
-                .Where(b => b.Character() != null && b.Character()->CharacterData.OnlineStatus != 15 && b.IsTargetable)
+                .Where(b => b.Character() != null && b.Character()->CharacterData.OnlineStatus != 15 && b.Character()->CharacterData.OnlineStatus != 5 && b.IsTargetable)
                 .ToList() ?? new List<IBattleChara>();
         }
         catch (Exception ex)