Merge pull request #274 from FFXIV-CombatReborn/rsr-users-can-read-an…

…d-other-jokes-we-tell-ourselves

TLDR; UI pass for clarity and control, Dragoon base fix, new engage targeting mode, exposed TTK HP percentage to users.

RotationSolver.Basic/Configuration/Timeline/MoveTimelineItem.cs

@@ -23,7 +23,7 @@ internal override void OnEnable()
     {
         base.OnEnable();
 
-        if (!Service.Config.EnableTimelineMovement) return;
+        return;
 
         var ipc = Svc.PluginInterface.GetIpcSubscriber<List<Vector3>, bool, object>("vnavmesh.Path.MoveTo");
 
@@ -39,7 +39,7 @@ internal override void OnDisable()
     {
         base.OnDisable();
 
-        if (!Service.Config.EnableTimelineMovement) return;
+        return;
 
         var ipc = Svc.PluginInterface.GetIpcSubscriber<object>("vnavmesh.Path.Stop");
         ipc?.InvokeAction();

RotationSolver.Basic/Data/TargetHostileType.cs

@@ -6,19 +6,25 @@
 public enum TargetHostileType : byte
 {
     /// <summary>
-    /// All
+    /// All targets.
     /// </summary>
-    [Description("All targets that are in range for any abilities")]
+    [Description("All targets that are in range for any abilities (Tanks)")]
     AllTargetsCanAttack,
 
     /// <summary>
     /// Have target.
     /// </summary>
-    [Description("Previously engaged targets (engages on countdown timer)")]
+    [Description("Previously engaged targets (Non-Tanks)")]
     TargetsHaveTarget,
 
     /// <summary>
-    /// ALl Targets When solo.
+    /// All targets when solo .
+    /// </summary>
+    [Description("All targets when solo in duty, or previously engaged.")]
+    AllTargetsWhenSoloInDuty,
+
+    /// <summary>
+    /// All targets when solo.
     /// </summary>
     [Description("All targets when solo, or previously engaged.")]
     AllTargetsWhenSolo,

RotationSolver.Basic/Helpers/ObjectHelper.cs

@@ -1,4 +1,5 @@
-using Dalamud.Game.ClientState.Objects.Enums;
+using Dalamud.Game.ClientState.Conditions;
+using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Statuses;
 using ECommons.DalamudServices;
@@ -118,7 +119,8 @@ internal static bool IsAttackable(this IBattleChara IBattleChara)
         {
             TargetHostileType.AllTargetsCanAttack => true,
             TargetHostileType.TargetsHaveTarget => IBattleChara.TargetObject is IBattleChara,
-            TargetHostileType.AllTargetsWhenSolo => DataCenter.PartyMembers.Length < 2 
+            TargetHostileType.AllTargetsWhenSolo => DataCenter.PartyMembers.Length < 2 || IBattleChara.TargetObject is IBattleChara,
+            TargetHostileType.AllTargetsWhenSoloInDuty => (DataCenter.PartyMembers.Length < 2 && Svc.Condition[ConditionFlag.BoundByDuty])
                 || IBattleChara.TargetObject is IBattleChara,
             _ => true,
         };
@@ -321,7 +323,7 @@ public static bool IsDying(this IBattleChara b)
     {
         if (b == null) return false;
         if (b.IsDummy()) return false;
-        return b.GetTimeToKill() <= Service.Config.DyingTimeToKill || b.GetHealthRatio() < 0.02f;
+        return b.GetTimeToKill() <= Service.Config.DyingTimeToKill || b.GetHealthRatio() < Service.Config.IsDyingConfig;
     }
 
     internal static unsafe bool InCombat(this IBattleChara obj)
@@ -375,7 +377,7 @@ internal static bool IsAttacked(this IBattleChara b)
 
     internal static unsafe bool CanSee(this IGameObject b)
     {
-        var point = Player.Object.Position + Vector3.UnitY * Player.IGameObject->Height;
+        var point = Player.Object.Position + Vector3.UnitY * Player.GameObject->Height;
         var tarPt = b.Position + Vector3.UnitY * b.Struct()->Height;
         var direction = tarPt - point;
 

RotationSolver.Basic/Rotations/Basic/DragoonRotation.cs

@@ -63,7 +63,7 @@ static partial void ModifyPiercingTalonPvE(ref ActionSetting setting)
     static partial void ModifyDisembowelPvE(ref ActionSetting setting)
     {
         setting.ComboIds = [ActionID.TrueThrustPvE, ActionID.RaidenThrustPvE];
-        setting.StatusProvide = [StatusID.PowerSurge];
+        setting.StatusProvide = [StatusID.PowerSurge_2720];
     }
 
     static partial void ModifyFullThrustPvE(ref ActionSetting setting)
@@ -161,7 +161,7 @@ static partial void ModifyGeirskogulPvE(ref ActionSetting setting)
     static partial void ModifySonicThrustPvE(ref ActionSetting setting)
     {
         setting.ComboIds = [ActionID.DraconianFuryPvE, ActionID.DoomSpikePvE];
-        setting.StatusProvide = [StatusID.PowerSurge];
+        setting.StatusProvide = [StatusID.PowerSurge_2720];
         setting.CreateConfig = () => new()
         {
             AoeCount = 2,
@@ -266,7 +266,7 @@ static partial void ModifyLanceBarragePvE(ref ActionSetting setting)
     static partial void ModifySpiralBlowPvE(ref ActionSetting setting)
     {
         setting.ComboIds = [ActionID.TrueThrustPvE, ActionID.RaidenThrustPvE];
-        setting.StatusProvide = [StatusID.PowerSurge];
+        setting.StatusProvide = [StatusID.PowerSurge_2720];
     }
 
     static partial void ModifyStarcrossPvE(ref ActionSetting setting)
@@ -287,7 +287,7 @@ static partial void ModifyHighJumpPvP(ref ActionSetting setting)
 
     /// <inheritdoc/>
     [RotationDesc(ActionID.FeintPvE)]
-    protected sealed override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
+    protected override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
     {
         if (FeintPvE.CanUse(out act)) return true;
         return false;

RotationSolver.Basic/Rotations/CustomRotation_GCD.cs

@@ -108,7 +108,7 @@ partial class CustomRotation
 
         IBaseAction.TargetOverride = TargetType.Death;
 
-        if (Service.Config.RaisePlayerByCasting && RaiseSpell(out act, true)) return act;
+        if (Service.Config.RaisePlayerByCasting && SwiftcastPvE.Cooldown.IsCoolingDown && RaiseSpell(out act, true)) return act;
 
         IBaseAction.TargetOverride = null;
 
@@ -148,23 +148,22 @@ private bool RaiseSpell(out IAction? act, bool mustUse)
             {
                 return true;
             }
-            else if (mustUse)
+            else if (Service.Config.RaisePlayerBySwift && !SwiftcastPvE.Cooldown.IsCoolingDown)
             {
-                var action = act;
                 if (SwiftcastPvE.CanUse(out act))
                 {
                     return true;
                 }
-                else if (!IsMoving)
+            }
+            else if (mustUse)
+            {
+                var action = act;
+                if (!IsMoving)
                 {
                     act = action;
                     return true;
                 }
             }
-            else if (Service.Config.RaisePlayerBySwift && !SwiftcastPvE.Cooldown.IsCoolingDown)
-            {
-                return true;
-            }
         }
 
         return false;
@@ -178,6 +177,7 @@ bool RaiseAction(out IAction act, bool ignoreCastingCheck)
         }
     }
 
+
     /// <summary>
     /// The gcd for raising.
     /// </summary>