Merge pull request #603 from CritoCantCode/3.0PvPTuning

Tuned AST, MNK, NIN PvP Actions
FFXIV-CombatReborn · Jan 27, 2025 · e65639a · e65639a
2 parents 6e035fa + 39976ed
commit e65639a
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 17 deletions.
diff --git a/...s/PVPRotations/Magical/PCT_Default.PvP.cs → ...s/PVPRotations/Magical/PCT_Default.PVP.cs b/...s/PVPRotations/Magical/PCT_Default.PvP.cs → ...s/PVPRotations/Magical/PCT_Default.PVP.cs
@@ -1,6 +1,7 @@
 namespace RebornRotations.PVPRotations.Magical;
 
 [Rotation("Default PvP", CombatType.PvP, GameVersion = "7.15", Description = "Default PVP Pictomancer by Crito")]
+[SourceCode(Path = "main/BasicRotations/PVPRotations/Magical/PCT_Default.PVP.cs")]
 [Api(4)]
 public class PCT_DefaultPvP : PictomancerRotation
 {

diff --git a/...s/PVPRotations/Magical/RDM_Default.PvP.cs → ...s/PVPRotations/Magical/RDM_Default.PVP.cs b/...s/PVPRotations/Magical/RDM_Default.PvP.cs → ...s/PVPRotations/Magical/RDM_Default.PVP.cs
diff --git a/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs
@@ -1,7 +1,7 @@
 namespace RebornRotations.PVPRotations.Melee;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
-[SourceCode(Path = "main/BasicRotations/PVPRotations/Tank/DRG_Default.PvP.cs")]
+[SourceCode(Path = "main/BasicRotations/PVPRotations/Melee/DRG_Default.PvP.cs")]
 [Api(4)]
 public sealed class DRG_DefaultPvP : DragoonRotation
 {

diff --git a/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs
@@ -1,7 +1,7 @@
 namespace RebornRotations.PVPRotations.Melee;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
-[SourceCode(Path = "main/BasicRotations/PVPRotations/Tank/RPR_Default.PvP.cs")]
+[SourceCode(Path = "main/BasicRotations/PVPRotations/Melee/RPR_Default.PvP.cs")]
 [Api(4)]
 public sealed class RPR_DefaultPvP : ReaperRotation
 {

diff --git a/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs
@@ -1,7 +1,7 @@
 namespace RebornRotations.PVPRotations.Melee;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
-[SourceCode(Path = "main/BasicRotations/PVPRotations/Tank/SAM_Default.PvP.cs")]
+[SourceCode(Path = "main/BasicRotations/PVPRotations/Melee/SAM_Default.PvP.cs")]
 [Api(4)]
 public sealed class SAM_DefaultPvP : SamuraiRotation
 {

diff --git a/BasicRotations/PVPRotations/Melee/VPR_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/VPR_Default.PVP.cs
@@ -1,7 +1,7 @@
 namespace RebornRotations.PVPRotations.Melee;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.05", Description = "Beta Rotation")]
-[SourceCode(Path = "main/BasicRotations/PVPRotations/Tank/VPR_Default.PvP.cs")]
+[SourceCode(Path = "main/BasicRotations/PVPRotations/Melee/VPR_Default.PvP.cs")]
 [Api(4)]
 public sealed class VPR_DefaultPvP : ViperRotation
 {

diff --git a/RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs b/RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs
@@ -457,11 +457,21 @@ static partial void ModifyFallMaleficPvP(ref ActionSetting setting)
 
     }
 
+    static partial void ModifyFallMaleficPvP_29246(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.DoubleCastPvP) == ActionID.FallMaleficPvP_29246;
+    }
+
     static partial void ModifyAspectedBeneficPvP(ref ActionSetting setting) 
     {
 
     }
 
+    static partial void ModifyAspectedBeneficPvP_29247(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.DoubleCastPvP) == ActionID.AspectedBeneficPvP_29247;
+    }
+
     static partial void ModifyGravityIiPvP(ref ActionSetting setting)
     {
         setting.CreateConfig = () => new ActionConfig()
@@ -470,16 +480,22 @@ static partial void ModifyGravityIiPvP(ref ActionSetting setting)
         };
     }
 
-    static partial void ModifyDoubleCastPvP(ref ActionSetting setting)
+    static partial void ModifyGravityIiPvP_29248(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.DoubleCastPvP) != ActionID.DoubleCastPvP;
-        setting.IsFriendly = true;
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.DoubleCastPvP) == ActionID.GravityIiPvP_29248;
         setting.CreateConfig = () => new ActionConfig()
         {
             AoeCount = 1,
         };
     }
 
+    static partial void ModifyDoubleCastPvP(ref ActionSetting setting)
+    {
+        // You should never send the server this Action.
+        setting.ActionCheck = () => false;
+        setting.IsFriendly = true;
+    }
+
     static partial void ModifyMacrocosmosPvP(ref ActionSetting setting)
     {
         setting.IsFriendly = false;

diff --git a/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs b/RotationSolver.Basic/Rotations/Basic/MonkRotation.cs
@@ -475,7 +475,6 @@ static partial void ModifyPhantomRushPvP(ref ActionSetting setting)
 
     static partial void ModifyFlintsReplyPvP(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.FlintsReplyPvP) == ActionID.FiresReplyPvP;
         setting.CreateConfig = () => new ActionConfig()
         {
             AoeCount = 1,

diff --git a/RotationSolver.Basic/Rotations/Basic/NinjaRotation.cs b/RotationSolver.Basic/Rotations/Basic/NinjaRotation.cs
@@ -524,6 +524,10 @@ static partial void ModifyFumaShurikenPvP(ref ActionSetting setting)
 
     static partial void ModifyDokumoriPvP(ref ActionSetting setting)
     {
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifyThreeMudraPvP(ref ActionSetting setting)
@@ -546,7 +550,8 @@ static partial void ModifyAssassinatePvP(ref ActionSetting setting)
 
     static partial void ModifyForkedRaijuPvP(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.SpinningEdgePvP) == ActionID.ForkedRaijuPvP;
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.SpinningEdgePvP) == ActionID.ForkedRaijuPvP &&
+                                    !Player.HasStatus(true, StatusID.SealedForkedRaiju);
     }
 
     static partial void ModifyFleetingRaijuPvP(ref ActionSetting setting)
@@ -556,28 +561,33 @@ static partial void ModifyFleetingRaijuPvP(ref ActionSetting setting)
 
     static partial void ModifyHyoshoRanryuPvP(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.FumaShurikenPvP) == ActionID.HyoshoRanryuPvP;
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.FumaShurikenPvP) == ActionID.HyoshoRanryuPvP &&
+                                    !Player.HasStatus(true, StatusID.SealedHyoshoRanryu);
     }
 
     static partial void ModifyGokaMekkyakuPvP(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.DokumoriPvP) == ActionID.GokaMekkyakuPvP;
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.DokumoriPvP) == ActionID.GokaMekkyakuPvP &&
+                                    !Player.HasStatus(true, StatusID.SealedGokaMekkyaku);
     }
 
     static partial void ModifyMeisuiPvP(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.ThreeMudraPvP) == ActionID.MeisuiPvP;
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.ThreeMudraPvP) == ActionID.MeisuiPvP &&
+                                    !Player.HasStatus(true, StatusID.SealedMeisui);
+    }
+
+    static partial void ModifyHutonPvP(ref ActionSetting setting)
+    {
+        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.BunshinPvP) == ActionID.HutonPvP &&
+                                    !Player.HasStatus(true, StatusID.SealedHuton);
+        setting.IsFriendly = true;
     }
 
     static partial void ModifyHollowNozuchiPvP(ref ActionSetting setting)
     {
         //this isn't a real action
     }
-    static partial void ModifyHutonPvP(ref ActionSetting setting)
-    {
-        setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.BunshinPvP) == ActionID.HutonPvP;
-        setting.IsFriendly = true;
-    }
 
     static partial void ModifyDotonPvP(ref ActionSetting setting)
     {