From 6ce3c7776676219b7f2b28664f426cc97cbed727 Mon Sep 17 00:00:00 2001
From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com>
Date: Thu, 28 Mar 2024 16:39:03 -0500
Subject: [PATCH] revert add skip ping config
---
.../Actions/ActionCooldownInfo.cs | 2 +-
RotationSolver.Basic/Actions/BaseItem.cs | 2 +-
RotationSolver.Basic/Configuration/Configs.cs | 4 ----
RotationSolver.Basic/DataCenter.cs | 22 +++++--------------
.../Rotations/Basic/BlackMageRotation.cs | 4 ++--
RotationSolver/UI/NextActionWindow.cs | 2 +-
RotationSolver/UI/RotationConfigWindow.cs | 4 ++--
RotationSolver/Updaters/ActionUpdater.cs | 2 +-
RotationSolver/Watcher.cs | 2 +-
9 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/RotationSolver.Basic/Actions/ActionCooldownInfo.cs b/RotationSolver.Basic/Actions/ActionCooldownInfo.cs
index 980024358..184b3d652 100644
--- a/RotationSolver.Basic/Actions/ActionCooldownInfo.cs
+++ b/RotationSolver.Basic/Actions/ActionCooldownInfo.cs
@@ -153,7 +153,7 @@ internal bool CooldownCheck(bool isEmpty, bool onLastAbility, bool ignoreClippin
}
else
{
- if (!HasOneCharge && RecastTimeRemainOneChargeRaw > DataCenter.AnimationLocktime) return false;
+ if (!HasOneCharge && RecastTimeRemainOneChargeRaw > DataCenter.ActionRemain) return false;
}
}
diff --git a/RotationSolver.Basic/Actions/BaseItem.cs b/RotationSolver.Basic/Actions/BaseItem.cs
index 6a79f98d8..1238187d2 100644
--- a/RotationSolver.Basic/Actions/BaseItem.cs
+++ b/RotationSolver.Basic/Actions/BaseItem.cs
@@ -175,7 +175,7 @@ public virtual unsafe bool CanUse(out IAction item, bool clippingCheck = true)
var remain = Cooldown.RecastTimeOneChargeRaw - Cooldown.RecastTimeElapsedRaw;
- if (remain > DataCenter.AnimationLocktime) return false;
+ if (remain > DataCenter.ActionRemain) return false;
if (clippingCheck && DataCenter.WeaponRemain > 0)
{
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
index 0d9d73586..3a53a0fc2 100644
--- a/RotationSolver.Basic/Configuration/Configs.cs
+++ b/RotationSolver.Basic/Configuration/Configs.cs
@@ -410,10 +410,6 @@ public const string
Filter = TimelineFilter)]
private static readonly bool _enableTimelineMovement = false;
- [ConditionBool, UI("Skip the Ping Check. Enable if you use Bossmod Action Tweaks or Noclippy.",
- Filter = BasicTimer, Section = 2)]
- private static readonly bool _noPingCheck = false;
-
[UI("The max ping that RS can get to before skipping to the next action.",
Filter = BasicTimer)]
[Range(0.01f, 0.5f, ConfigUnitType.Seconds, 0.002f)]
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
index 7448d1024..0fdb307b9 100644
--- a/RotationSolver.Basic/DataCenter.cs
+++ b/RotationSolver.Basic/DataCenter.cs
@@ -204,7 +204,7 @@ public static float GCDTime(uint gcdCount = 0, float offset = 0)
///
/// Time to the next action
///
- public static unsafe float AnimationLocktime => *(float*)((IntPtr)ActionManager.Instance() + 0x8);
+ public static unsafe float ActionRemain => *(float*)((IntPtr)ActionManager.Instance() + 0x8);
public static float AbilityRemain
{
@@ -212,28 +212,16 @@ public static float AbilityRemain
{
var gcdRemain = WeaponRemain;
// Check if we should account for the animation lock and ping.
- if (gcdRemain - MinAnimationLock - Ping <= AnimationLocktime)
+ if (gcdRemain - MinAnimationLock - Ping <= ActionRemain)
{
return gcdRemain + MinAnimationLock + Ping;
}
- return AnimationLocktime;
+ return ActionRemain;
}
}
// Update the property to conditionally use AbilityRemain based on the NoPingCheck setting.
- public static float NextAbilityToNextGCD
- {
- get
- {
- // Check if NoPingCheck is false; if so, use AbilityRemain.
- if (!Service.Config.NoPingCheck)
- {
- return AbilityRemain - WeaponRemain;
- }
- // Otherwise, use the existing logic.
- return WeaponRemain - AnimationLocktime;
- }
- }
+ public static float NextAbilityToNextGCD => WeaponRemain - ActionRemain;
public static float CastingTotal { get; internal set; }
#endregion
@@ -408,7 +396,7 @@ public static float DPSTaken
public static ActionID LastGCD { get; private set; } = 0;
public static ActionID LastAbility { get; private set; } = 0;
- public static float Ping => Service.Config.NoPingCheck ? 0 : Math.Min(Math.Min(RTT, FetchTime), Service.Config.MaxPing);
+ public static float Ping => Math.Min(Math.Min(RTT, FetchTime), Service.Config.MaxPing);
public static float RTT { get; internal set; } = 0.05f;
public static float FetchTime { get; private set; } = 0.05f;
diff --git a/RotationSolver.Basic/Rotations/Basic/BlackMageRotation.cs b/RotationSolver.Basic/Rotations/Basic/BlackMageRotation.cs
index 7a97e3c9a..c4548f4c5 100644
--- a/RotationSolver.Basic/Rotations/Basic/BlackMageRotation.cs
+++ b/RotationSolver.Basic/Rotations/Basic/BlackMageRotation.cs
@@ -218,12 +218,12 @@ static partial void ModifyTriplecastPvE(ref ActionSetting setting)
static partial void ModifyTransposePvE(ref ActionSetting setting)
{
- setting.ActionCheck = () => DataCenter.AnimationLocktime <= ElementTimeRaw;
+ setting.ActionCheck = () => DataCenter.ActionRemain <= ElementTimeRaw;
}
static partial void ModifyUmbralSoulPvE(ref ActionSetting setting)
{
- setting.ActionCheck = () => JobGauge.InUmbralIce && DataCenter.AnimationLocktime <= ElementTimeRaw;
+ setting.ActionCheck = () => JobGauge.InUmbralIce && DataCenter.ActionRemain <= ElementTimeRaw;
}
///
diff --git a/RotationSolver/UI/NextActionWindow.cs b/RotationSolver/UI/NextActionWindow.cs
index 6d68540e0..00451b3ec 100644
--- a/RotationSolver/UI/NextActionWindow.cs
+++ b/RotationSolver/UI/NextActionWindow.cs
@@ -67,7 +67,7 @@ public static unsafe void DrawGcdCooldown(float width, bool drawTittle)
ImGui.ProgressBar(group->Elapsed / group->Total, new Vector2(width, height), string.Empty);
- var actionRemain = DataCenter.AnimationLocktime;
+ var actionRemain = DataCenter.ActionRemain;
if (remain > actionRemain + 0.6f + DataCenter.Ping)
{
var value = total - remain + actionRemain;
diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
index d8360c700..1ab352a42 100644
--- a/RotationSolver/UI/RotationConfigWindow.cs
+++ b/RotationSolver/UI/RotationConfigWindow.cs
@@ -2424,7 +2424,7 @@ private static unsafe void DrawStatus()
ImGui.Text("DPSTaken: " + DataCenter.DPSTaken.ToString());
ImGui.Text("TimeToNext: " + DataCenter.NextAbilityToNextGCD.ToString());
ImGui.Text("WeaponElapsed: " + DataCenter.WeaponElapsed.ToString());
- ImGui.Text("AnimationLock: " + DataCenter.AnimationLocktime.ToString());
+ ImGui.Text("AnimationLock: " + DataCenter.ActionRemain.ToString());
ImGui.Text("Have pet: " + DataCenter.HasPet.ToString());
ImGui.Text("Hostile Near Count: " + DataCenter.NumberOfHostilesInRange.ToString());
@@ -2520,7 +2520,7 @@ private static void DrawNextAction()
ImGui.Text(ActionUpdater.NextAction?.Name ?? "null");
ImGui.Text("Ability Remain: " + DataCenter.AbilityRemain.ToString());
- ImGui.Text("Action Remain: " + DataCenter.AnimationLocktime.ToString());
+ ImGui.Text("Action Remain: " + DataCenter.ActionRemain.ToString());
ImGui.Text("Weapon Remain: " + DataCenter.WeaponRemain.ToString());
ImGui.Text("Animation Lock Delay: " + ActionManagerHelper.GetCurrentAnimationLock().ToString());
}
diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
index 53394be64..97b40b230 100644
--- a/RotationSolver/Updaters/ActionUpdater.cs
+++ b/RotationSolver/Updaters/ActionUpdater.cs
@@ -292,7 +292,7 @@ internal unsafe static bool CanDoAction()
var nextAction = NextAction;
if (nextAction == null) return false;
- var timeToNext = DataCenter.AnimationLocktime;
+ var timeToNext = DataCenter.ActionRemain;
////No time to use 0gcd
//if (timeToNext + nextAction.AnimationLockTime
diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
index 6018f1b1e..6147dfc06 100644
--- a/RotationSolver/Watcher.cs
+++ b/RotationSolver/Watcher.cs
@@ -231,7 +231,7 @@ private static void ActionFromSelf(ActionEffectSet set)
OtherConfiguration.AnimationLockTime[id] = set.Header.AnimationLockTime;
}
- if (set.TargetEffects.Length == 0) return;
+ if (!set.TargetEffects.Any()) return;
var action = set.Action;
var tar = set.Target;