Merge pull request #254 from FFXIV-CombatReborn/DT-Base-Class-Fixes

MNK GNB RDM Fixes

Author: Tykku

RotationSolver.Basic/Rotations/Basic/GunbreakerRotation.cs

@@ -86,11 +86,13 @@ static partial void ModifyReignOfBeastsPvE(ref ActionSetting setting)
     static partial void ModifyNobleBloodPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.ReignOfBeastsPvE) == ActionID.NobleBloodPvE;
+        setting.ComboIds = [ActionID.ReignOfBeastsPvE];
     }
 
     static partial void ModifyLionHeartPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => Service.GetAdjustedActionId(ActionID.ReignOfBeastsPvE) == ActionID.LionHeartPvE;
+        setting.ComboIds = [ActionID.NobleBloodPvE];
     }
 
     static partial void ModifyFatedCirclePvE(ref ActionSetting setting)

RotationSolver.Basic/Rotations/Basic/MonkRotation.cs

@@ -157,7 +157,7 @@ static partial void ModifyDragonKickPvE(ref ActionSetting setting)
 
     static partial void ModifyPerfectBalancePvE(ref ActionSetting setting)
     {
-        setting.ActionCheck = () => InCombat && IsLongerThan(5);
+        setting.ActionCheck = () => InCombat;
         setting.UnlockedByQuestID = 66602;
         setting.StatusProvide = [StatusID.PerfectBalance];
     }

RotationSolver.Basic/Rotations/Basic/RedMageRotation.cs

@@ -1,4 +1,6 @@
-namespace RotationSolver.Basic.Rotations.Basic;
+using FFXIVClientStructs.FFXIV.Client.UI.Shell;
+
+namespace RotationSolver.Basic.Rotations.Basic;
 
 partial class RedMageRotation
 {
@@ -71,11 +73,13 @@ static partial void ModifyRipostePvE(ref ActionSetting setting)
     static partial void ModifyZwerchhauPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => (BlackMana >= 15 && WhiteMana >= 15)  || Player.HasStatus(true, StatusID.MagickedSwordplay);
+        setting.ComboIds = [ActionID.RipostePvE];
     }
 
     static partial void ModifyRedoublementPvE(ref ActionSetting setting)
     {
         setting.ActionCheck = () => (BlackMana >= 15 && WhiteMana >= 15)  || Player.HasStatus(true, StatusID.MagickedSwordplay);
+        setting.ComboIds = [ActionID.ZwerchhauPvE];
     }
 
     static partial void ModifyScatterPvE(ref ActionSetting setting)
@@ -104,7 +108,12 @@ static partial void ModifyMoulinetPvE(ref ActionSetting setting)
 
     static partial void ModifyScorchPvE(ref ActionSetting setting)
     {
-        setting.ComboIds = [ActionID.VerholyPvE];
+        setting.ComboIds = [ActionID.VerholyPvE, ActionID.VerfirePvE];
+    }
+
+    static partial void ModifyResolutionPvE(ref ActionSetting setting)
+    {
+        setting.ComboIds = [ActionID.ScorchPvE];
     }
 
     private protected sealed override IBaseAction Raise => VerraisePvE;