diff --git a/BasicRotations/Magical/PCT_Default.cs b/BasicRotations/Magical/PCT_Default.cs
index 15501d6..3d7396e 100644
--- a/BasicRotations/Magical/PCT_Default.cs
+++ b/BasicRotations/Magical/PCT_Default.cs
@@ -14,8 +14,6 @@ public sealed class PCT_Default : PictomancerRotation
IAction act;
if (!InCombat)
{
-
-
if (!CreatureMotifDrawn)
{
if (PomMotifPvE.CanUse(out act) && CreatureMotifPvE.AdjustedID == PomMotifPvE.ID) return act;
@@ -58,8 +56,6 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
protected override bool AttackAbility(IAction nextGCD, out IAction? act)
{
-
-
if (Player.HasStatus(true, StatusID.StarryMuse))
{
if (Player.HasStatus(true, StatusID.SubtractiveSpectrum) && !Player.HasStatus(true, StatusID.SubtractivePalette))
@@ -67,7 +63,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
if (SubtractivePalettePvE.CanUse(out act)) return true;
}
-
if (CreatureMotifDrawn)
{
if (FangedMusePvE.CanUse(out act, skipCastingCheck: true, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true, usedUp: true) && CreatureMotifDrawn && LivingMusePvE.AdjustedID == FangedMusePvE.ID) return true;
@@ -147,8 +142,6 @@ protected override bool GeneralGCD(out IAction? act)
if (HolyInWhitePvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0) return true;
}
-
-
if (HammerStampPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Player.HasStatus(true, StatusID.HammerTime) && InCombat) return true;
if (!InCombat)
@@ -210,13 +203,6 @@ protected override bool GeneralGCD(out IAction? act)
if (HammerMotifPvE.CanUse(out act)) return true;
}
-
-
-
-
-
-
-
//white paint over cap protection
if (Paint == 5)
{
@@ -224,10 +210,6 @@ protected override bool GeneralGCD(out IAction? act)
if (HolyInWhitePvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0) return true;
}
-
-
-
-
///123 combo stuff with moving checks
if (!IsMoving)
{
@@ -247,7 +229,6 @@ protected override bool GeneralGCD(out IAction? act)
///single target
///
-
if (ThunderInMagentaPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette) && Player.HasStatus(true, StatusID.AetherhuesIi)) return true;
if (StoneInYellowPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette) && Player.HasStatus(true, StatusID.Aetherhues)) return true;
if (BlizzardInCyanPvE.CanUse(out act) && Player.HasStatus(true, StatusID.SubtractivePalette)) return true;
diff --git a/BasicRotations/Magical/SMN_Default.cs b/BasicRotations/Magical/SMN_Default.cs
index 904b3f8..7f0849b 100644
--- a/BasicRotations/Magical/SMN_Default.cs
+++ b/BasicRotations/Magical/SMN_Default.cs
@@ -114,8 +114,7 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
#region GCD Logic
protected override bool GeneralGCD(out IAction? act)
{
-
- //if (SummonCarbunclePvE.CanUse(out act)) return true;
+ if (SummonCarbunclePvE.CanUse(out act)) return true;
if (SummonBahamutPvE.CanUse(out act)) return true;
if ((Player.HasStatus(false, StatusID.SearingLight) || SearingLightPvE.Cooldown.IsCoolingDown) && SummonBahamutPvE.CanUse(out act)) return true;
diff --git a/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs
index ca99c33..c9718c1 100644
--- a/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/AST_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
public class AST_DefaultPVP : AstrologianRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs
index 57021be..5d6835e 100644
--- a/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/SCH_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
public class SCH_DefaultPVP : ScholarRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs
index 67f9ea7..771fd9c 100644
--- a/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/SGE_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
public class SGE_DefaultPVP : SageRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs
index 9d3ca4e..c5fee5b 100644
--- a/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs
@@ -2,7 +2,7 @@ namespace DefaultRotations.Healer;
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Healer/WHM_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
public class WHM_DefaultPVP : WhiteMageRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs b/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs
index fe61ac0..d90e81e 100644
--- a/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/BLM_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
public class BLM_DefaultPVP : BlackMageRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs b/BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs
index 82e8610..b49d799 100644
--- a/BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs
+++ b/BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/RDM_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
public class RDM_DefaultPvP : RedMageRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs b/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs
index 3165b68..b6719fc 100644
--- a/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Magical/SMN_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
public class SMN_DefaultPvP : SummonerRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs
index 892ee34..7bc7bb7 100644
--- a/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/DRG_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class DRG_DefaultPvP : DragoonRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs
index 120dfb1..78cb31f 100644
--- a/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Melee/MNK_Default.PVP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class MNK_DefaultPvP : MonkRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs
index 493fd5f..c47f6d9 100644
--- a/BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/NIN_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class NIN_DefaultPvP : NinjaRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs
index 5b77984..193fda7 100644
--- a/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/RPR_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class RPR_DefaultPvP : ReaperRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs
index 21bf0de..24991be 100644
--- a/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/SAM_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class SAM_DefaultPvP : SamuraiRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs b/BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs
index 80097ac..9485e6e 100644
--- a/BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Ranged/DNC_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class DNC_DefaultPvP : DancerRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs
index 05995b8..61b30dc 100644
--- a/BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs
@@ -2,7 +2,7 @@ namespace DefaultRotations.Tank;
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/DRK_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class DRK_DefaultPvP : DarkKnightRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Tank/GNB_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/GNB_Default.PVP.cs
index 9f779bf..23db81a 100644
--- a/BasicRotations/PVPRotations/Tank/GNB_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Tank/GNB_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/GNB_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class GNB_DefaultPvP : GunbreakerRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Tank/PLD_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/PLD_Default.PVP.cs
index a4562be..8c7cb70 100644
--- a/BasicRotations/PVPRotations/Tank/PLD_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Tank/PLD_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/PLD_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class PLD_DefaultPvP : PaladinRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/PVPRotations/Tank/WAR_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/WAR_Default.PVP.cs
index c0dca98..66eceaa 100644
--- a/BasicRotations/PVPRotations/Tank/WAR_Default.PVP.cs
+++ b/BasicRotations/PVPRotations/Tank/WAR_Default.PVP.cs
@@ -2,7 +2,7 @@
[Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
[SourceCode(Path = "main/DefaultRotations/PVPRotations/Tank/WAR_Default.PvP.cs")]
-[Api(1)]
+[Api(2)]
public sealed class WAR_DefaultPvP : WarriorRotation
{
[RotationConfig(CombatType.PvP, Name = "Sprint")]
diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
index 4c603ce..5024d44 100644
--- a/BasicRotations/RebornRotations.csproj
+++ b/BasicRotations/RebornRotations.csproj
@@ -9,7 +9,7 @@
-
+