Merge pull request #600 from DeviousCrypto/PVP-SAMRPR

SAM / RPR PvP Actions
FFXIV-CombatReborn · Jan 23, 2025 · 9ecbe45 · 9ecbe45
2 parents 06b6712 + 7077f77
commit 9ecbe45
Show file tree

Hide file tree

Showing 2 changed files with 197 additions and 1 deletion.
diff --git a/RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs b/RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs
@@ -399,10 +399,113 @@ static partial void ModifyPerfectioPvE(ref ActionSetting setting)
     #endregion
 
     #region PvP Actions
+    static partial void ModifySlicePvP(ref ActionSetting setting)
+    {
+    }
+
+    static partial void ModifyWaxingSlicePvP(ref ActionSetting setting)
+    {
+    }
+
+    static partial void ModifyInfernalSlicePvP(ref ActionSetting setting)
+    {
+    }
+    static partial void ModifyHarvestMoonPvP(ref ActionSetting setting)
+    {
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyPlentifulHarvestPvP(ref ActionSetting setting)
+    {
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyGrimSwathePvP(ref ActionSetting setting)
+    {
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyDeathWarrantPvP(ref ActionSetting setting)
+    {
+    }
+
+    static partial void ModifyArcaneCrestPvP(ref ActionSetting setting)
+    {
+        setting.IsFriendly = true;
+    }
+
+    static partial void ModifyVoidReapingPvP(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.Enshrouded];
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.SlicePvP) == ActionID.VoidReapingPvP;
+    }
+
+    static partial void ModifyExecutionersGuillotinePvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.SlicePvP) == ActionID.ExecutionersGuillotinePvP;
+    }
+
+    static partial void ModifyCrossReapingPvP(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.Enshrouded];
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.SlicePvP) == ActionID.CrossReapingPvP;
+    }
+
+    static partial void ModifyLemuresSlicePvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.GrimSwathePvP) == ActionID.LemuresSlicePvP;
+        setting.StatusNeed = [StatusID.Enshrouded];
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyFateSealedPvP(ref ActionSetting setting)
+    {
+    }
+
+    static partial void ModifyPerfectioPvP(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.PerfectioParata_4309];
+        setting.IsFriendly = false;
+    }
+
+    static partial void ModifyCommunioPvP(ref ActionSetting setting)
+    {
+        setting.StatusNeed = [StatusID.Enshrouded];
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyRegressPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.HellsIngressPvP) == ActionID.RegressPvP;
+        setting.SpecialType = SpecialActionType.MovingBackward;
+        setting.IsFriendly = true;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
     static partial void ModifyHellsIngressPvP(ref ActionSetting setting)
     {
         setting.SpecialType = SpecialActionType.MovingForward;
+        setting.IsFriendly = true;
     }
+
     #endregion
 
     /// <inheritdoc/>

diff --git a/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs b/RotationSolver.Basic/Rotations/Basic/SamuraiRotation.cs
@@ -448,10 +448,103 @@ static partial void ModifyTendoKaeshiSetsugekkaPvE(ref ActionSetting setting)
     #endregion
 
     #region PvP Actions
-    // PvP
+
+    static partial void ModifyYukikazePvP(ref ActionSetting setting)
+    {
+    }
+
+    static partial void ModifyGekkoPvP(ref ActionSetting setting)
+    {
+    }
+
+    static partial void ModifyKashaPvP(ref ActionSetting setting)
+    {
+    }
+    static partial void ModifyOgiNamikiriPvP(ref ActionSetting setting)
+    {
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyHissatsuChitenPvP(ref ActionSetting setting)
+    {
+
+    }
+
+    static partial void ModifyMineuchiPvP(ref ActionSetting setting)
+    {
+    }
+
+    static partial void ModifyMeikyoShisuiPvP(ref ActionSetting setting)
+    {
+        setting.IsFriendly = true;
+    }
+
+    static partial void ModifyHyosetsuPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.YukikazePvP) == ActionID.HyosetsuPvP;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyMangetsuPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.YukikazePvP) == ActionID.MangetsuPvP;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyOkaPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.YukikazePvP) == ActionID.OkaPvP;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyKaeshiNamikiriPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.OgiNamikiriPvP) == ActionID.KaeshiNamikiriPvP;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyZanshinPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.HissatsuChitenPvP) == ActionID.ZanshinPvP;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
+    }
+
+    static partial void ModifyTendoSetsugekkaPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.MeikyoShisuiPvP) == ActionID.TendoSetsugekkaPvP;
+    }
+
+    static partial void ModifyTendoKaeshiSetsugekkaPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.MeikyoShisuiPvP) == ActionID.TendoKaeshiSetsugekkaPvP;
+    }
+
+
     static partial void ModifyHissatsuSotenPvP(ref ActionSetting setting)
     {
         setting.SpecialType = SpecialActionType.MovingForward;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
     #endregion
 }