Merge pull request #334 from FFXIV-CombatReborn/Various-fixes

DRK base fix
FFXIV-CombatReborn · Sep 1, 2024 · 1cb81af · 1cb81af
2 parents c9d5122 + db74e57
commit 1cb81af
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs b/RotationSolver.Basic/Rotations/Basic/DarkKnightRotation.cs
@@ -79,7 +79,7 @@ static partial void ModifyUnleashPvE(ref ActionSetting setting)
     {
         setting.CreateConfig = () => new ActionConfig()
         {
-            AoeCount = 3,
+            AoeCount = 2,
         };
     }
 
@@ -109,7 +109,7 @@ static partial void ModifyFloodOfDarknessPvE(ref ActionSetting setting)
         setting.UnlockedByQuestID = 67590;
         setting.CreateConfig = () => new ActionConfig()
         {
-            AoeCount = 3,
+            AoeCount = 2,
         };
     }
 
@@ -136,7 +136,7 @@ static partial void ModifyStalwartSoulPvE(ref ActionSetting setting)
         setting.ComboIds = [ActionID.UnleashPvE];
         setting.CreateConfig = () => new ActionConfig()
         {
-            AoeCount = 3,
+            AoeCount = 2,
         };
     }
 
@@ -162,6 +162,10 @@ static partial void ModifyLivingDeadPvE(ref ActionSetting setting)
     static partial void ModifySaltedEarthPvE(ref ActionSetting setting)
     {
         setting.UnlockedByQuestID = 67596;
+        setting.CreateConfig = () => new ActionConfig()
+        {
+            AoeCount = 1,
+        };
     }
 
     static partial void ModifyShadowstridePvE(ref ActionSetting setting)
@@ -175,7 +179,7 @@ static partial void ModifyAbyssalDrainPvE(ref ActionSetting setting)
         setting.UnlockedByQuestID = 67598;
         setting.CreateConfig = () => new ActionConfig()
         {
-            AoeCount = 3,
+            AoeCount = 2,
         };
     }
 
@@ -194,13 +198,13 @@ static partial void ModifyQuietusPvE(ref ActionSetting setting)
         setting.ActionCheck = () => Blood >= 50 || !Player.WillStatusEnd(0, true, StatusID.Delirium_1972);
         setting.CreateConfig = () => new ActionConfig()
         {
-            AoeCount = 3,
+            AoeCount = 2,
         };
     }
 
     static partial void ModifyDeliriumPvE(ref ActionSetting setting)
     {
-        setting.StatusProvide = [StatusID.Delirium_1972, StatusID.BloodWeapon];
+        setting.StatusProvide = [StatusID.Delirium_1972, StatusID.BloodWeapon, StatusID.Delirium_3836];
         setting.CreateConfig = () => new ActionConfig()
         {
             TimeToKill = 10,
@@ -281,27 +285,27 @@ static partial void ModifyShadowedVigilPvE(ref ActionSetting setting)
 
     static partial void ModifyScarletDeliriumPvE(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.Delirium_1972];
+        setting.StatusNeed = [StatusID.Delirium_3836];
     }
 
     static partial void ModifyComeuppancePvE(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.Delirium_1972];
+        setting.StatusNeed = [StatusID.Delirium_3836];
         setting.ComboIds = [ActionID.ScarletDeliriumPvE];
     }
 
     static partial void ModifyTorcleaverPvE(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.Delirium_1972];
-        setting.ComboIds = [ActionID.ComeuppancePvE];
+        setting.StatusNeed = [StatusID.Delirium_3836];
+        setting.ComboIds = [ActionID.TorcleaverPvE];
     }
 
     static partial void ModifyImpalementPvE(ref ActionSetting setting)
     {
-        setting.StatusNeed = [StatusID.Delirium_1972];
+        setting.ActionCheck = () => !Player.WillStatusEnd(0, true, StatusID.Delirium_3836);
         setting.CreateConfig = () => new ActionConfig()
         {
-            AoeCount = 3,
+            AoeCount = 2,
         };
     }