Merge pull request #220 from SonicZeHedgehog/Update-Samurai-Rotation

Update SamuraiRotation.cs
FFXIV-CombatReborn · Jul 13, 2024 · 3c45b76 · 3c45b76
2 parents 98a6710 + 619b0d2
commit 3c45b76
Showing 1 changed file with 46 additions and 2 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs b/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs
@@ -67,12 +67,54 @@ static partial void ModifyShohaPvE(ref ActionSetting setting)
     // {
     //     setting.ActionCheck = () => MeditationStacks == 3;
     // }
-
+
+    static partial void ModifyJinpuPvE(ref ActionSetting setting)
+    {
+        setting.ComboIds = [ActionID.HakazePvE, ActionID.GyofuPvE];
+    }
+
+    static partial void ModifyShifuPvE(ref ActionSetting setting)
+    {
+        setting.ComboIds = [ActionID.HakazePvE, ActionID.GyofuPvE];
+    }
+
+    static partial void ModifyYukikazePvE(ref ActionSetting setting)
+    {
+        setting.ComboIds = [ActionID.HakazePvE, ActionID.GyofuPvE];
+    }
+
+    static partial void ModifyTendoSetsugekkaPvE(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.Tendo];
+    }
+
+    static partial void ModifyTendoKaeshiSetsugekkaPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => (byte)Kaeshi == 6; // Temporary until Dalamud enums are updated
+    }
+
+    static partial void ModifyTendoKaeshiGokenPvE(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => (byte)Kaeshi == 5; // Temporary until Dalamud enums are updated
+    }
+
+    static partial void ModifyTendoGokenPvE(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.Tendo];
+        setting.IsFriendly = false;
+    }
+
     static partial void ModifyMangetsuPvE(ref ActionSetting setting)
     {
         setting.ComboIds = [ActionID.FugaPvE, ActionID.FukoPvE];
     }
-
+
+    static partial void ModifyZanshinPvE(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.ZanshinReady];
+        setting.ActionCheck = () => Kenki >= 50;
+    }
+
     static partial void ModifyOkaPvE(ref ActionSetting setting)
     {
         setting.ComboIds = [ActionID.FugaPvE, ActionID.FukoPvE];
@@ -138,6 +180,7 @@ static partial void ModifyHagakurePvE(ref ActionSetting setting)
     static partial void ModifyIkishotenPvE(ref ActionSetting setting)
     {
         setting.StatusProvide = [StatusID.OgiNamikiriReady];
+        setting.StatusProvide = [StatusID.ZanshinReady];
         setting.ActionCheck = () => InCombat;
     }
 
@@ -198,6 +241,7 @@ protected sealed override bool DefenseAreaAbility(IAction nextGCD, out IAction?
     [RotationDesc(ActionID.ThirdEyePvE)]
     protected override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
     {
+        if (TengetsuPvE.CanUse(out act)) return true;
         if (ThirdEyePvE.CanUse(out act)) return true;
         return base.DefenseSingleAbility(nextGCD, out act);
     }