diff --git a/BasicRotations/Healer/SCH_Default.cs b/BasicRotations/Healer/SCH_Default.cs
index 07ec200..d6b3443 100644
--- a/BasicRotations/Healer/SCH_Default.cs
+++ b/BasicRotations/Healer/SCH_Default.cs
@@ -2,7 +2,7 @@ namespace DefaultRotations.Healer;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Healer/SCH_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class SCH_Default : ScholarRotation
{
#region Config Options
diff --git a/BasicRotations/Healer/SGE_Default.cs b/BasicRotations/Healer/SGE_Default.cs
index f9b8437..4f435d7 100644
--- a/BasicRotations/Healer/SGE_Default.cs
+++ b/BasicRotations/Healer/SGE_Default.cs
@@ -2,7 +2,7 @@ namespace DefaultRotations.Healer;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Healer/SGE_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class SGE_Default : SageRotation
{
#region Config Options
diff --git a/BasicRotations/Healer/WHM_Default.cs b/BasicRotations/Healer/WHM_Default.cs
index ec90f7a..7e7f67f 100644
--- a/BasicRotations/Healer/WHM_Default.cs
+++ b/BasicRotations/Healer/WHM_Default.cs
@@ -2,7 +2,7 @@ namespace DefaultRotations.Healer;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Healer/WHM_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class WHM_Default :WhiteMageRotation
{
#region Config Options
diff --git a/BasicRotations/Magical/RDM_Default.cs b/BasicRotations/Magical/RDM_Default.cs
index 4ca0b5a..4e6281a 100644
--- a/BasicRotations/Magical/RDM_Default.cs
+++ b/BasicRotations/Magical/RDM_Default.cs
@@ -2,7 +2,7 @@ namespace DefaultRotations.Magical;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Magical/RDM_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class RDM_Default : RedMageRotation
{
#region Config Options
diff --git a/BasicRotations/Magical/SMN_Default.cs b/BasicRotations/Magical/SMN_Default.cs
index 8bf487e..a5cbc58 100644
--- a/BasicRotations/Magical/SMN_Default.cs
+++ b/BasicRotations/Magical/SMN_Default.cs
@@ -4,7 +4,7 @@ namespace DefaultRotations.Magical;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Magical/SMN_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class SMN_Default : SummonerRotation
{
#region Config Options
diff --git a/BasicRotations/Melee/DRG_Default.cs b/BasicRotations/Melee/DRG_Default.cs
index ad2d168..89f7082 100644
--- a/BasicRotations/Melee/DRG_Default.cs
+++ b/BasicRotations/Melee/DRG_Default.cs
@@ -2,10 +2,10 @@ namespace DefaultRotations.Melee;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Melee/DRG_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class DRG_Default : DragoonRotation
-{/*
+{
#region Config Options
[RotationDesc(ActionID.WingedGlidePvE, ActionID.DragonfireDivePvE)]
@@ -16,7 +16,6 @@ public sealed class DRG_Default : DragoonRotation
#region Move Logic
protected override bool MoveForwardAbility(IAction nextGCD, out IAction act)
{
- if (SpineshatterDivePvE.CanUse(out act)) return true;
if (DragonfireDivePvE.CanUse(out act, skipAoeCheck: true)) return true;
return false;
@@ -45,7 +44,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
if (LanceChargePvE.CanUse(out act, skipAoeCheck: true) && Player.HasStatus(true, StatusID.PowerSurge)) return true;
if (LanceChargePvE.CanUse(out act, skipAoeCheck: true) && !Player.HasStatus(true, StatusID.PowerSurge)) return true;
- if (DragonSightPvE.CanUse(out act, skipAoeCheck: true)) return true;
if (BattleLitanyPvE.CanUse(out act, skipAoeCheck: true)) return true;
}
@@ -63,11 +61,9 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
if (GeirskogulPvE.CanUse(out act, skipAoeCheck: true)) return true;
- if (SpineshatterDivePvE.CanUse(out act, usedUp: true))
{
if (Player.HasStatus(true, StatusID.LanceCharge) && LanceChargePvE.Cooldown.ElapsedOneChargeAfterGCD(3)) return true;
}
- if (Player.HasStatus(true, StatusID.PowerSurge) && SpineshatterDivePvE.Cooldown.CurrentCharges != 1 && SpineshatterDivePvE.CanUse(out act)) return true;
if (MirageDivePvE.CanUse(out act)) return true;
@@ -93,6 +89,7 @@ protected override bool GeneralGCD(out IAction? act)
if (DoomSpikePvE.CanUse(out act, skipComboCheck: doomSpikeRightNow)) return true;
+ if (DrakesbanePvE.CanUse(out act)) return true;
if (WheelingThrustPvE.CanUse(out act)) return true;
if (FangAndClawPvE.CanUse(out act)) return true;
@@ -112,4 +109,4 @@ protected override bool GeneralGCD(out IAction? act)
return base.GeneralGCD(out act);
}
#endregion
-*/}
+}
diff --git a/BasicRotations/Melee/MNK_Default.cs b/BasicRotations/Melee/MNK_Default.cs
index fa0ad8c..4c2db14 100644
--- a/BasicRotations/Melee/MNK_Default.cs
+++ b/BasicRotations/Melee/MNK_Default.cs
@@ -2,9 +2,9 @@ namespace DefaultRotations.Melee;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00", Description = "Uses Lunar Solar Opener from The Balance")]
[SourceCode(Path = "main/DefaultRotations/Melee/MNK_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class MNK_Default : MonkRotation
-{/*
+{
#region Config Options
[RotationConfig(CombatType.PvE, Name = "Use Form Shift")]
public bool AutoFormShift { get; set; } = true;
@@ -118,7 +118,7 @@ protected override bool GeneralGCD(out IAction? act)
if (OpoOpoForm(out act)) return true; // Fallback to Use OpoOpo Form GCDs
- if (Chakra < 5 && MeditationPvE.CanUse(out act)) return true;
+ if (Chakra < 5 && ForbiddenMeditationPvE.CanUse(out act)) return true;
if (AutoFormShift && FormShiftPvE.CanUse(out act)) return true; // Form Shift GCD use
@@ -210,4 +210,4 @@ bool SolarNadi(out IAction? act)
return CoerlForm(out act);
}
#endregion
-*/}
+}
diff --git a/BasicRotations/Melee/SAM_Default.cs b/BasicRotations/Melee/SAM_Default.cs
index 22610f5..70b4c35 100644
--- a/BasicRotations/Melee/SAM_Default.cs
+++ b/BasicRotations/Melee/SAM_Default.cs
@@ -2,9 +2,9 @@
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Melee/SAM_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class SAM_Default : SamuraiRotation
-{/*
+{
#region Config Options
[Range(0, 85, ConfigUnitType.None, 5)]
@@ -47,7 +47,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
if (HissatsuSeneiPvE.CanUse(out act)) return true;
}
- if (ShohaIiPvE.CanUse(out act)) return true;
if (ShohaPvE.CanUse(out act)) return true;
if (Kenki >= 50 && IkishotenPvE.Cooldown.WillHaveOneCharge(10) || Kenki >= AddKenki || IsTargetBoss && IsTargetDying)
@@ -131,4 +130,4 @@ protected override bool GeneralGCD(out IAction? act)
private static bool HaveMeikyoShisui => Player.HasStatus(true, StatusID.MeikyoShisui);
#endregion
-*/}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/BasicRotations/Ranged/BRD_Default.cs b/BasicRotations/Ranged/BRD_Default.cs
index f2fc8bd..4c97ff8 100644
--- a/BasicRotations/Ranged/BRD_Default.cs
+++ b/BasicRotations/Ranged/BRD_Default.cs
@@ -3,7 +3,7 @@ namespace DefaultRotations.Ranged;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00",
Description = "Please make sure that the three song times add up to 120 seconds, Wanderers default first song for now.")]
[SourceCode(Path = "main/DefaultRotations/Ranged/BRD_Default.cs")]
-[Api(1)]
+[Api(2)]
public sealed class BRD_Default : BardRotation
{
#region Config Options
diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
index 93b8f99..d7e7a9c 100644
--- a/BasicRotations/RebornRotations.csproj
+++ b/BasicRotations/RebornRotations.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/BasicRotations/Tank/DRK_Default.cs b/BasicRotations/Tank/DRK_Default.cs
index 850ffff..b63146c 100644
--- a/BasicRotations/Tank/DRK_Default.cs
+++ b/BasicRotations/Tank/DRK_Default.cs
@@ -2,9 +2,9 @@ namespace DefaultRotations.Tank;
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Tank/DRK_Balance.cs")]
-[Api(1)]
+[Api(2)]
public sealed class DRK_Default : DarkKnightRotation
-{/*
+{
#region Config Options
[RotationConfig(CombatType.PvE, Name = "Keep at least 3000 MP")]
public bool TheBlackestNight { get; set; } = true;
@@ -124,13 +124,13 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
}
- if (PlungePvE.CanUse(out act, skipAoeCheck: true) && !IsMoving) return true;
+ if (ShadowstridePvE.CanUse(out act, skipAoeCheck: true) && !IsMoving) return true;
if (SaltAndDarknessPvE.CanUse(out act)) return true;
if (InTwoMIsBurst)
{
- if (PlungePvE.CanUse(out act, usedUp: true, skipAoeCheck: true) && !IsMoving) return true;
+ if (ShadowstridePvE.CanUse(out act, usedUp: true, skipAoeCheck: true) && !IsMoving) return true;
}
if (MergedStatus.HasFlag(AutoStatus.MoveForward) && MoveForwardAbility(nextGCD, out act)) return true;
return base.AttackAbility(nextGCD, out act);
@@ -209,4 +209,4 @@ private bool CheckDarkSide
}
}
#endregion
-*/}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/BasicRotations/Tank/PLD_Default.cs b/BasicRotations/Tank/PLD_Default.cs
index fbc189e..be30b90 100644
--- a/BasicRotations/Tank/PLD_Default.cs
+++ b/BasicRotations/Tank/PLD_Default.cs
@@ -2,9 +2,9 @@
[Rotation("Default", CombatType.PvE, GameVersion = "7.00")]
[SourceCode(Path = "main/DefaultRotations/Tank/PLD_Default.cs")]
-[Api(1)]
+[Api(2)]
public class PLD_Default : PaladinRotation
-{/*
+{
#region Config Options
[RotationConfig(CombatType.PvE, Name = "Use Divine Veil at 15 seconds remaining on Countdown")]
public bool UseDivineVeilPre { get; set; } = false;
@@ -157,10 +157,10 @@ protected override bool GeneralGCD(out IAction? act)
#region Extra Methods
private bool UseOath(out IAction act, bool onLast = false)
{
- if (SheltronPvE.CanUse(out act, onLastAbility: onLast)) return true;
- if (InterventionPvE.CanUse(out act, onLastAbility: onLast)) return true;
+ if (SheltronPvE.CanUse(out act)) return true;
+ if (InterventionPvE.CanUse(out act)) return true;
return false;
}
#endregion
-*/}
\ No newline at end of file
+}
\ No newline at end of file