Merge pull request #285 from FFXIV-CombatReborn/ninjaHotfix

Ninja, Dragoon, Machinist, and tank invuln hotfixes
FFXIV-CombatReborn · Jul 29, 2024 · 75c7187 · 75c7187
2 parents cb6178e + bf5a7f2
commit 75c7187
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 11 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs b/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs
@@ -154,7 +154,8 @@ static partial void ModifyDarkMindPvE(ref ActionSetting setting)
     static partial void ModifyLivingDeadPvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.LivingDead, StatusID.WalkingDead, StatusID.UndeadRebirth];
-        setting.ActionCheck = Player.IsTargetOnSelf;
+        setting.ActionCheck = () => InCombat;
+        setting.TargetType = TargetType.Self;
         setting.UnlockedByQuestID = 67594;
     }
 

diff --git a/RotationSolver.Basic/Rotations/Basic/DragoonRotation.cs b/RotationSolver.Basic/Rotations/Basic/DragoonRotation.cs
@@ -43,6 +43,11 @@ protected static bool LOTDEndAfterGCD(uint gctCount = 0, float offset = 0)
 
     //Job
 
+    static partial void ModifyTrueThrustPvE(ref ActionSetting setting)
+    {
+
+    }
+
     static partial void ModifyVorpalThrustPvE(ref ActionSetting setting)
     {
         setting.ComboIds = [ActionID.TrueThrustPvE, ActionID.RaidenThrustPvE];
@@ -66,13 +71,13 @@ static partial void ModifyDisembowelPvE(ref ActionSetting setting)
         setting.StatusProvide = [StatusID.PowerSurge_2720];
         setting.CreateConfig = () => new ActionConfig()
         {
-            StatusGcdCount = 3,
+            StatusGcdCount = 2,
         };
     }
 
     static partial void ModifyFullThrustPvE(ref ActionSetting setting)
     {
-        setting.ComboIds = [ActionID.VorpalThrustPvE];
+        setting.ComboIds = [ActionID.VorpalThrustPvE, ActionID.LanceBarragePvE];
     }
 
     static partial void ModifyLanceChargePvE(ref ActionSetting setting)
@@ -113,8 +118,8 @@ static partial void ModifyWingedGlidePvE(ref ActionSetting setting)
 
     static partial void ModifyChaosThrustPvE(ref ActionSetting setting)
     {
-        setting.ComboIds = [ActionID.DisembowelPvE];
-        setting.TargetStatusProvide = [StatusID.ChaoticSpring];
+        setting.ComboIds = [ActionID.DisembowelPvE, ActionID.SpiralBlowPvE];
+        setting.TargetStatusProvide = [StatusID.ChaosThrust,StatusID.ChaoticSpring];
         setting.CreateConfig = () => new ActionConfig()
         {
             StatusGcdCount = 3,
@@ -181,6 +186,10 @@ static partial void ModifyDrakesbanePvE(ref ActionSetting setting) //aka Kendric
     {
         setting.ComboIds = [ActionID.WheelingThrustPvE, ActionID.FangAndClawPvE];
         setting.StatusProvide = [StatusID.DraconianFire];
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            StatusGcdCount = 5,
+        };
     }
 
     static partial void ModifyMirageDivePvE(ref ActionSetting setting)
@@ -239,7 +248,7 @@ static partial void ModifyDraconianFuryPvE(ref ActionSetting setting)
 
     static partial void ModifyHeavensThrustPvE(ref ActionSetting setting)
     {
-        setting.ComboIds = [ActionID.LanceBarragePvE];
+        setting.ComboIds = [ActionID.VorpalThrustPvE, ActionID.LanceBarragePvE];
     }
 
     static partial void ModifyChaoticSpringPvE(ref ActionSetting setting)

diff --git a/RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs b/RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs
@@ -111,7 +111,8 @@ static partial void ModifyAuroraPvE(ref ActionSetting setting)
     static partial void ModifySuperbolidePvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.Superbolide];
-        setting.ActionCheck = () => Player.IsTargetOnSelf();
+        setting.ActionCheck = () => InCombat;
+        setting.TargetType = TargetType.Self;
     }
 
     static partial void ModifySonicBreakPvE(ref ActionSetting setting)

diff --git a/RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs b/RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs
@@ -96,6 +96,7 @@ static partial void ModifyCleanShotPvE(ref ActionSetting setting)
     static partial void ModifyHyperchargePvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => !IsOverheated && (Heat >= 50 || Player.HasStatus(true, StatusID.Hypercharged));
+        setting.StatusProvide = [StatusID.Overheated];
         setting.UnlockedByQuestID = 67233;
         setting.CreateConfig = () => new ActionConfig()
         {

diff --git a/RotationSolver.Basic/Rotations/Basic/NinjaRotation.cs b/RotationSolver.Basic/Rotations/Basic/NinjaRotation.cs
@@ -166,13 +166,14 @@ static partial void ModifyTenChiJinPvE(ref ActionSetting setting)
         setting.StatusNeed = [StatusID.Kassatsu];
         setting.StatusProvide = [StatusID.TenChiJin, StatusID.TenriJindoReady];
         setting.UnlockedByQuestID = 68488;
+        setting.ActionCheck = () => Ninki <= 50 && !IsMoving;
     }
 
     static partial void ModifyMeisuiPvE(ref ActionSetting setting)
     {
         setting.StatusNeed = [StatusID.ShadowWalker];
         setting.StatusProvide = [StatusID.Meisui];
-        setting.ActionCheck = () => Ninki <= 50 && InCombat;
+        setting.ActionCheck = () => !Player.HasStatus(true, StatusID.Kassatsu) && InCombat;
     }
 
     static partial void ModifyBunshinPvE(ref ActionSetting setting)
@@ -207,7 +208,7 @@ static partial void ModifyFleetingRaijuPvE(ref ActionSetting setting)
 
     static partial void ModifyKunaisBanePvE(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.Hidden];
+        setting.ActionCheck = () => Player.HasStatus(true, StatusID.Hidden) || Player.HasStatus(true, StatusID.ShadowWalker);
         setting.TargetStatusProvide = [StatusID.KunaisBane];
         setting.CreateConfig = () => new ActionConfig()
         {
@@ -293,7 +294,7 @@ static partial void ModifyDotonPvE(ref ActionSetting setting)
         setting.StatusProvide = [StatusID.Doton];
         setting.CreateConfig = () => new ActionConfig()
         {
-            AoeCount = 1,
+            AoeCount = 3,
         };
     }
 

diff --git a/RotationSolver.Basic/Rotations/Basic/PaladinRotation.cs b/RotationSolver.Basic/Rotations/Basic/PaladinRotation.cs
@@ -152,6 +152,7 @@ static partial void ModifyHallowedGroundPvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.HallowedGround];
         setting.UnlockedByQuestID = 66596;
+        setting.ActionCheck = () => InCombat;
     }
 
     static partial void ModifyBulwarkPvE(ref ActionSetting setting)

diff --git a/RotationSolver.Basic/Rotations/Basic/WarriorRotation.cs b/RotationSolver.Basic/Rotations/Basic/WarriorRotation.cs
@@ -84,18 +84,19 @@ static partial void ModifyVengeancePvE(ref ActionSetting setting)
     static partial void ModifyMythrilTempestPvE(ref ActionSetting setting)
     {
         setting.ComboIds = [ActionID.OverpowerPvE];
-        setting.StatusProvide = [StatusID.SurgingTempest];
         setting.CreateConfig = () => new ActionConfig()
         {
             AoeCount = 2,
         };
         setting.UnlockedByQuestID = 66587;
+
     }
 
     static partial void ModifyHolmgangPvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.Holmgang_409];
         setting.TargetType = TargetType.Self;
+        setting.ActionCheck = () => InCombat;
     }
 
     static partial void ModifySteelCyclonePvE(ref ActionSetting setting)