Merge pull request #560 from FFXIV-CombatReborn/cleanupXpicto

Cleanup and fixes for WHM, PCT, and BLM
FFXIV-CombatReborn · Jan 12, 2025 · d2ecbb4 · d2ecbb4
2 parents 3a0854a + 58b2781
commit d2ecbb4
Show file tree

Hide file tree

Showing 64 changed files with 153 additions and 139 deletions.
diff --git a/BasicRotations/Duty/VariantDefault.cs b/BasicRotations/Duty/VariantDefault.cs
@@ -1,6 +1,6 @@
 using RotationSolver.Basic.Rotations.Duties;
 
-namespace DefaultRotations.Duty;
+namespace RebornRotations.Duty;
 
 [Rotation("Variant Default", CombatType.PvE)]
 

diff --git a/BasicRotations/Healer/AST_Default.cs b/BasicRotations/Healer/AST_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Healer;
+namespace RebornRotations.Healer;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Healer/AST_Default.cs")]

diff --git a/BasicRotations/Healer/SCH_Default.cs b/BasicRotations/Healer/SCH_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Healer;
+namespace RebornRotations.Healer;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Healer/SCH_Default.cs")]
@@ -187,7 +187,7 @@ protected override bool HealSingleGCD(out IAction? act)
         act = null;
 
         if (HasSwift && SwiftLogic && ResurrectionPvE.CanUse(out _)) return false;
-        
+
         if (AdloquiumPvE.CanUse(out act)) return true;
         if (ManifestationPvE.CanUse(out act, skipCastingCheck: true)) return true;
         if (PhysickPvE.CanUse(out act)) return true;
@@ -236,7 +236,7 @@ protected override bool GeneralGCD(out IAction? act)
 
         //Single Instant for when moving.
         if (MovingTime > RuinTime && RuinIiPvE.CanUse(out act)) return true;
-        
+
         //Add dot while moving.
         if (MovingTime > DOTTime && BiolysisPvE.CanUse(out act, skipStatusProvideCheck: DOTUpkeep)) return true;
         if (MovingTime > DOTTime && BioIiPvE.CanUse(out act, skipStatusProvideCheck: DOTUpkeep)) return true;

diff --git a/BasicRotations/Healer/SGE_Default.cs b/BasicRotations/Healer/SGE_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Healer;
+namespace RebornRotations.Healer;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Healer/SGE_Default.cs")]
@@ -394,7 +394,7 @@ protected override bool GeneralGCD(out IAction? act)
     #region Extra Methods
     public override bool CanHealSingleSpell => base.CanHealSingleSpell && (GCDHeal || PartyMembers.GetJobCategory(JobRole.Healer).Count() < 2);
     public override bool CanHealAreaSpell => base.CanHealAreaSpell && (GCDHeal || PartyMembers.GetJobCategory(JobRole.Healer).Count() < 2);
-    
+
     public override void DisplayStatus()
     {
         ImGui.Text($"Eukrasian Action: {_EukrasiaActionAim}");

diff --git a/BasicRotations/Healer/WHM_Default.cs b/BasicRotations/Healer/WHM_Default.cs
@@ -1,13 +1,16 @@
 using System.ComponentModel;
 
-namespace DefaultRotations.Healer;
+namespace RebornRotations.Healer;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Healer/WHM_Default.cs")]
 [Api(4)]
 public sealed class WHM_Default : WhiteMageRotation
 {
     #region Config Options
+    [RotationConfig(CombatType.PvE, Name = "Use Tincture/Gemdraught when about to use Prescense of Mind")]
+    public bool UseMedicine { get; set; } = true;
+
     [RotationConfig(CombatType.PvE, Name = "Enable Swiftcast Restriction Logic to attempt to prevent actions other than Raise when you have swiftcast")]
     public bool SwiftLogic { get; set; } = true;
 
@@ -63,7 +66,7 @@ public enum ThinAirUsageStrategy : byte
     {
         if (remainTime < StonePvE.Info.CastTime + CountDownAhead
             && StonePvE.CanUse(out var act)) return act;
-
+        if (remainTime < 3 && UseBurstMedicine(out act)) return act;
         if (UsePreRegen && remainTime <= 5 && remainTime > 3)
         {
             if (RegenPvE.CanUse(out act)) return act;
@@ -76,7 +79,9 @@ public enum ThinAirUsageStrategy : byte
     #region oGCD Logic
     protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
-        if (Player.WillStatusEndGCD(0, 3, true, StatusID.DivineGrace) && DivineCaressPvE.CanUse(out act)) return true;
+        if (Player.WillStatusEndGCD(2, 0, true, StatusID.DivineGrace) && DivineCaressPvE.CanUse(out act)) return true;
+
+        if (UseMedicine && !PresenceOfMindPvE.Cooldown.IsCoolingDown && UseBurstMedicine(out act)) return true;
 
         bool useLastThinAirCharge = ThinAirLastChargeUsage == ThinAirUsageStrategy.UseAllCharges || (ThinAirLastChargeUsage == ThinAirUsageStrategy.ReserveLastChargeForRaise && nextGCD == RaisePvE);
         if (nextGCD is IBaseAction action && action.Info.MPNeed >= ThinAirNeed &&
@@ -203,7 +208,6 @@ protected override bool GeneralGCD(out IAction? act)
     {
 
         act = null;
-
         if (HasSwift && SwiftLogic && RaisePvE.CanUse(out _)) return false;
 
         //if (NotInCombatDelay && RegenDefense.CanUse(out act)) return true;
@@ -237,11 +241,6 @@ protected override bool GeneralGCD(out IAction? act)
     #endregion
 
     #region Extra Methods
-    public WHM_Default()
-    {
-        AfflatusRapturePvE.Setting.RotationCheck = () => BloodLily < 3;
-        AfflatusSolacePvE.Setting.RotationCheck = () => BloodLily < 3;
-    }
     public override bool CanHealSingleSpell => base.CanHealSingleSpell && (GCDHeal || PartyMembers.GetJobCategory(JobRole.Healer).Count() < 2);
     public override bool CanHealAreaSpell => base.CanHealAreaSpell && (GCDHeal || PartyMembers.GetJobCategory(JobRole.Healer).Count() < 2);
 

diff --git a/BasicRotations/Limited Jobs/BLU_Basic.cs b/BasicRotations/Limited Jobs/BLU_Basic.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.Magical;
 
 [Rotation("Basic BLU", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Limited Jobs/BLU_Basic.cs")]

diff --git a/BasicRotations/Limited Jobs/BLU_Default.cs b/BasicRotations/Limited Jobs/BLU_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.Magical;
 
 [Rotation("DOES NOT WORK", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Limited Jobs/BLU_Default.cs")]

diff --git a/BasicRotations/Limited Jobs/BSM_Default.cs b/BasicRotations/Limited Jobs/BSM_Default.cs
@@ -1,4 +1,4 @@
-//namespace DefaultRotations.Ranged;
+//namespace RebornRotations.Ranged;
 
 //[Rotation("Default", CombatType.PvE, GameVersion = "7.2")]
 //[SourceCode(Path = "main/BasicRotations/Limited Jobs/BSM_Default.cs")]

diff --git a/BasicRotations/Magical/BLM_Beta.cs b/BasicRotations/Magical/BLM_Beta.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.Magical;
 
 [Rotation("Beta", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Magical/BLM_Beta.cs")]
@@ -512,7 +512,7 @@ private bool MaintainStatus(out IAction? act)
         if (CombatElapsedLess(6)) return false;
         if (UmbralSoulPvE.CanUse(out act)) return true;
         if (InAstralFire && TransposePvE.CanUse(out act)) return true;
-        
+
         return false;
     }
 

diff --git a/BasicRotations/Magical/BLM_Default.cs b/BasicRotations/Magical/BLM_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.Magical;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Magical/BLM_Default.cs")]

diff --git a/BasicRotations/Magical/PCT_Default.cs b/BasicRotations/Magical/PCT_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.Magical;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Magical/PCT_Default.cs")]
@@ -93,13 +93,21 @@ protected sealed override bool DefenseAreaAbility(IAction nextGCD, out IAction?
         return base.DefenseAreaAbility(nextGCD, out act);
     }
 
+    [RotationDesc(ActionID.TemperaCoatPvE)]
+    protected sealed override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
+    {
+        // Mitigations
+        if (TemperaCoatPvE.CanUse(out act)) return true;
+        return base.DefenseAreaAbility(nextGCD, out act);
+    }
+
     #endregion
 
     #region oGCD Logic
 
     protected override bool AttackAbility(IAction nextGCD, out IAction? act)
     {
-        bool burstTimingCheckerStriking = (!ScenicMusePvE.Cooldown.WillHaveOneCharge(60) || HasStarryMuse) || !StarryMusePvE.EnoughLevel;
+        bool burstTimingCheckerStriking = !ScenicMusePvE.Cooldown.WillHaveOneCharge(60) || HasStarryMuse || !StarryMusePvE.EnoughLevel;
         // Bursts
         int adjustCombatTimeForOpener = Player.Level < 92 ? 2 : 5;
         if (StarryMusePvE.CanUse(out act) && CombatTime > adjustCombatTimeForOpener && IsBurst) return true;
@@ -124,6 +132,13 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
         //if (LivingMusePvE.CanUse(out act, usedUp: true)) return true;
         return base.AttackAbility(nextGCD, out act);
     }
+
+    protected override bool GeneralAbility(IAction nextGCD, out IAction? act)
+    {
+        if ((MergedStatus.HasFlag(AutoStatus.DefenseArea) || Player.WillStatusEndGCD(2, 0, true, StatusID.TemperaCoat)) && TemperaGrassaPvE.CanUse(out act)) return true;
+
+        return base.AttackAbility(nextGCD, out act);
+    }
     #endregion
 
     #region GCD Logic

diff --git a/BasicRotations/Magical/RDM_Default.cs b/BasicRotations/Magical/RDM_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.Magical;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Magical/RDM_Default.cs")]

diff --git a/BasicRotations/Magical/SMN_Default.cs b/BasicRotations/Magical/SMN_Default.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace DefaultRotations.Magical;
+namespace RebornRotations.Magical;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Magical/SMN_Default.cs")]

diff --git a/BasicRotations/Melee/DRG_Default.cs b/BasicRotations/Melee/DRG_Default.cs
@@ -1,6 +1,4 @@
-using System.Drawing.Text;
-
-namespace DefaultRotations.Melee;
+namespace RebornRotations.Melee;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Melee/DRG_Default.cs")]
@@ -49,25 +47,25 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
         if (IsBurst && InCombat)
         {
-            bool lifeSurgeReady = (Player.HasStatus(true, StatusID.BattleLitany) || Player.HasStatus(true, StatusID.LanceCharge) 
+            bool lifeSurgeReady = (Player.HasStatus(true, StatusID.BattleLitany) || Player.HasStatus(true, StatusID.LanceCharge)
             || LOTDEndAfter(1000)) && nextGCD.IsTheSameTo(true, HeavensThrustPvE, DrakesbanePvE)
-            || (Player.HasStatus(true, StatusID.BattleLitany) && Player.HasStatus(true, StatusID.LanceCharge) && LOTDEndAfter(1000) && nextGCD.IsTheSameTo(true, ChaoticSpringPvE, LanceBarragePvE, WheelingThrustPvE, FangAndClawPvE))
-            || (nextGCD.IsTheSameTo(true, HeavensThrustPvE, DrakesbanePvE) && (LanceChargePvE.IsInCooldown || BattleLitanyPvE.IsInCooldown));
+            || Player.HasStatus(true, StatusID.BattleLitany) && Player.HasStatus(true, StatusID.LanceCharge) && LOTDEndAfter(1000) && nextGCD.IsTheSameTo(true, ChaoticSpringPvE, LanceBarragePvE, WheelingThrustPvE, FangAndClawPvE)
+            || nextGCD.IsTheSameTo(true, HeavensThrustPvE, DrakesbanePvE) && (LanceChargePvE.IsInCooldown || BattleLitanyPvE.IsInCooldown);
 
             if ((!BattleLitanyPvE.Cooldown.ElapsedAfter(60) || !BattleLitanyPvE.EnoughLevel) && LanceChargePvE.CanUse(out act)) return true;
 
             if (Player.HasStatus(true, StatusID.LanceCharge) && BattleLitanyPvE.CanUse(out act)) return true;
 
             if ((Player.HasStatus(true, StatusID.BattleLitany) || Player.HasStatus(true, StatusID.LanceCharge) || LOTDEndAfter(1000)) && nextGCD.IsTheSameTo(true, HeavensThrustPvE, DrakesbanePvE)
-            || (Player.HasStatus(true, StatusID.BattleLitany) && Player.HasStatus(true, StatusID.LanceCharge) && LOTDEndAfter(1000) && nextGCD.IsTheSameTo(true, ChaoticSpringPvE, LanceBarragePvE, WheelingThrustPvE, FangAndClawPvE))
-            || (nextGCD.IsTheSameTo(true, HeavensThrustPvE, DrakesbanePvE) && (LanceChargePvE.IsInCooldown || BattleLitanyPvE.IsInCooldown)))
+            || Player.HasStatus(true, StatusID.BattleLitany) && Player.HasStatus(true, StatusID.LanceCharge) && LOTDEndAfter(1000) && nextGCD.IsTheSameTo(true, ChaoticSpringPvE, LanceBarragePvE, WheelingThrustPvE, FangAndClawPvE)
+            || nextGCD.IsTheSameTo(true, HeavensThrustPvE, DrakesbanePvE) && (LanceChargePvE.IsInCooldown || BattleLitanyPvE.IsInCooldown))
             {
                 if (LifeSurgePvE.CanUse(out act, usedUp: true)) return true;
             }
 
-            if (lifeSurgeReady 
-                || !DisembowelPvE.EnoughLevel && nextGCD.IsTheSameTo(true, VorpalThrustPvE) 
-                || !FullThrustPvE.EnoughLevel && nextGCD.IsTheSameTo(true, VorpalThrustPvE, DisembowelPvE) 
+            if (lifeSurgeReady
+                || !DisembowelPvE.EnoughLevel && nextGCD.IsTheSameTo(true, VorpalThrustPvE)
+                || !FullThrustPvE.EnoughLevel && nextGCD.IsTheSameTo(true, VorpalThrustPvE, DisembowelPvE)
                 || !LanceChargePvE.EnoughLevel && nextGCD.IsTheSameTo(true, DisembowelPvE, FullThrustPvE)
                 || !BattleLitanyPvE.EnoughLevel && nextGCD.IsTheSameTo(true, ChaosThrustPvE, FullThrustPvE))
             {
@@ -91,7 +89,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
             if (DragonfireDivePvE.CanUse(out act)) return true;
         }
 
-        if ((Player.HasStatus(true, StatusID.BattleLitany) || Player.HasStatus(true, StatusID.LanceCharge) || LOTDEndAfter(1000))
+        if (Player.HasStatus(true, StatusID.BattleLitany) || Player.HasStatus(true, StatusID.LanceCharge) || LOTDEndAfter(1000)
             || nextGCD.IsTheSameTo(true, RaidenThrustPvE, DraconianFuryPvE))
         {
             if (WyrmwindThrustPvE.CanUse(out act, usedUp: true)) return true;

diff --git a/BasicRotations/Melee/MNK_Default.cs b/BasicRotations/Melee/MNK_Default.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace DefaultRotations.Melee;
+namespace RebornRotations.Melee;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15", Description = "Uses Lunar Solar Opener from The Balance")]
 [SourceCode(Path = "main/BasicRotations/Melee/MNK_Default.cs")]

diff --git a/BasicRotations/Melee/NIN_Default.cs b/BasicRotations/Melee/NIN_Default.cs
@@ -1,6 +1,6 @@
 using Dalamud.Interface.Colors;
 
-namespace DefaultRotations.Melee;
+namespace RebornRotations.Melee;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Melee/NIN_Default.cs")]

diff --git a/BasicRotations/Melee/RPR_Default.cs b/BasicRotations/Melee/RPR_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Melee;
+namespace RebornRotations.Melee;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15", Description = "")]
 [SourceCode(Path = "main/BasicRotations/Melee/RPR_Default.cs")]

diff --git a/BasicRotations/Melee/SAM_Default.cs b/BasicRotations/Melee/SAM_Default.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace DefaultRotations.Melee;
+namespace RebornRotations.Melee;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Melee/SAM_Default.cs")]

diff --git a/BasicRotations/Melee/VPR_Default.cs b/BasicRotations/Melee/VPR_Default.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Melee;
+namespace RebornRotations.Melee;
 
 [Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Melee/VPR_Default.cs")]

diff --git a/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Healer;
+namespace RebornRotations.PVPRotations.Healer;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Healer/AST_Default.PVP.cs")]

diff --git a/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Healer;
+namespace RebornRotations.PVPRotations.Healer;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Healer/SCH_Default.PVP.cs")]

diff --git a/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Healer;
+namespace RebornRotations.PVPRotations.Healer;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Healer/SGE_Default.PVP.cs")]

diff --git a/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs b/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Healer;
+namespace RebornRotations.PVPRotations.Healer;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Healer/WHM_Default.PVP.cs")]

diff --git a/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs b/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.PVPRotations.Magical;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.15", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Magical/BLM_Default.PVP.cs")]

diff --git a/BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs b/BasicRotations/PVPRotations/Magical/RDM_Default.PvP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.PVPRotations.Magical;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Magical/RDM_Default.PVP.cs")]

diff --git a/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs b/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Magical;
+namespace RebornRotations.PVPRotations.Magical;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Magical/SMN_Default.PVP.cs")]

diff --git a/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/DRG_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Melee;
+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")]

diff --git a/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Melee;
+namespace RebornRotations.PVPRotations.Melee;
 
 [Rotation("Default", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Melee/MNK_Default.PVP.cs")]

diff --git a/BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/NIN_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Melee;
+namespace RebornRotations.PVPRotations.Melee;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Tank/NIN_Default.PvP.cs")]

diff --git a/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/RPR_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Melee;
+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")]

diff --git a/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/SAM_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Melee;
+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")]

diff --git a/BasicRotations/PVPRotations/Melee/VPR_Default.PVP.cs b/BasicRotations/PVPRotations/Melee/VPR_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Melee;
+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")]

diff --git a/BasicRotations/PVPRotations/Ranged/BRD_Default.PVP.cs b/BasicRotations/PVPRotations/Ranged/BRD_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Ranged;
+namespace RebornRotations.PVPRotations.Ranged;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.1", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Ranged/BRD_Default.PvP.cs")]

diff --git a/BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs b/BasicRotations/PVPRotations/Ranged/DNC_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Ranged;
+namespace RebornRotations.PVPRotations.Ranged;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Ranged/DNC_Default.PvP.cs")]

diff --git a/BasicRotations/PVPRotations/Ranged/MCH_Default.PvP.cs b/BasicRotations/PVPRotations/Ranged/MCH_Default.PvP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Ranged;
+namespace RebornRotations.PVPRotations.Ranged;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Ranged/MCH_Default.PvP.cs")]

diff --git a/BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs b/BasicRotations/PVPRotations/Tank/DRK_Default.PVP.cs
@@ -1,4 +1,4 @@
-namespace DefaultRotations.Tank;
+namespace RebornRotations.PVPRotations.Tank;
 
 [Rotation("Default PVP", CombatType.PvP, GameVersion = "7.00", Description = "Beta Rotation")]
 [SourceCode(Path = "main/BasicRotations/PVPRotations/Tank/DRK_Default.PvP.cs")]