Merge pull request #223 from FFXIV-CombatReborn/dead-code-removal

Add config options, update methods, and clean up code

BasicRotations/Healer/SCH_Default.cs

@@ -233,6 +233,5 @@ 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);
-
     #endregion
 }

BasicRotations/Magical/ICWA_PCT_BETA.cs

@@ -7,6 +7,7 @@ namespace DefaultRotations.Magical;
 [Api(3)]
 public sealed class IcWaPctBeta : PictomancerRotation
 {
+    #region Config Options
     public override MedicineType MedicineType => MedicineType.Intelligence;
     public static IBaseAction RainbowPrePull { get; } = new BaseAction((ActionID)34688);
     [RotationConfig(CombatType.PvE, Name = "Use HolyInWhite or CometInBlack while moving")]
@@ -28,6 +29,9 @@ public enum MotifSwift : byte
         [Description("AllMotif")] AllMotif,
         [Description("NoMotif(ManualSwifcast")] NoMotif
     }
+
+    #endregion
+
     #region Countdown logic
     // Defines logic for actions to take during the countdown before combat starts.
     protected override IAction? CountDownAction(float remainTime)

BasicRotations/Magical/PCT_Default.cs

@@ -5,6 +5,7 @@
 [Api(3)]
 public sealed class PCT_Default : PictomancerRotation
 {
+    #region Config Options
     [RotationConfig(CombatType.PvE, Name = "Use HolyInWhite or CometInBlack while moving")]
     public bool HolyCometMoving { get; set; } = true;
 
@@ -21,6 +22,8 @@ public sealed class PCT_Default : PictomancerRotation
     [RotationConfig(CombatType.PvE, Name = "Which Motif to use swiftcast on")]
     public CanvasFlags MotifSwiftCast { get; set; } = CanvasFlags.Weapon;
 
+    #endregion
+
     #region Countdown logic
     // Defines logic for actions to take during the countdown before combat starts.
     protected override IAction? CountDownAction(float remainTime)

BasicRotations/Magical/SMN_Default.cs

@@ -139,7 +139,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
 
         return base.AttackAbility(nextGCD, out act);
     }
-    #endregion
 
     protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
     {
@@ -154,6 +153,8 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
 
         return base.EmergencyAbility(nextGCD, out act);
     }
+
+    #endregion
 
     #region GCD Logic
     protected override bool GeneralGCD(out IAction? act)
@@ -225,23 +226,4 @@ public bool DoesAnyPlayerNeedHeal()
         return PartyMembersAverHP < 0.8f;
     }
     #endregion
-
-
-    // public override void DisplayStatus()
-    // {
-    // 	bool isTargetBoss = HostileTarget?.IsBossFromTTK() ?? false;
-    // 	bool isTargetDying = HostileTarget?.IsDying() ?? false;
-    // 	bool inSolarUnique = !InBahamut && !InPhoenix && InSolarBahamut;
-    //
-    // 	IAction act;
-    // 	var condition1 = $"inSolarUnique: {inSolarUnique}, Not Enough SearingLightPvE Level: {!SearingLightPvE.EnoughLevel}, isTargetBoss: {isTargetBoss}, isTargetDying: {isTargetDying}, PainflarePvE Can Use: {PainflarePvE.CanUse(out act)}";
-    // 	var condition2 = $"inSolarUnique: {inSolarUnique}, Not Enough SearingLightPvE Level: {!SearingLightPvE.EnoughLevel}, isTargetBoss: {isTargetBoss}, isTargetDying: {isTargetDying}, FesterPvE Can Use: {FesterPvE.CanUse(out act)}, NecrotizePvE Can Use: {NecrotizePvE.CanUse(out act)}";
-    //
-    // 	var conditionG = (inSolarUnique && Player.HasStatus(false, StatusID.SearingLight) || !SearingLightPvE.EnoughLevel || isTargetBoss && isTargetDying) && EnergyDrainPvE.IsInCooldown && (FesterPvE.CanUse(out act) || NecrotizePvE.CanUse(out act));
-    // 	ImGui.Text(condition1);
-    // 	ImGui.Text(condition2);
-    // 	ImGui.Text(conditionG.ToString());
-    // 	base.DisplayStatus();
-    // }
-
 }

BasicRotations/Melee/MNK_Default.cs

@@ -200,8 +200,4 @@ protected override bool GeneralGCD(out IAction? act)
         return base.GeneralGCD(out act);
     }
     #endregion
-
-    #region Extra Methods
-
-    #endregion
 }

BasicRotations/Melee/NIN_Default.cs

@@ -428,14 +428,5 @@ protected override bool GeneralGCD(out IAction? act)
     #region Extra Methods
     // Holds the next ninjutsu action to perform.
     private IBaseAction? _ninActionAim = null;
-
-    // Determines if Trick Attack is in its effective period.
-    private bool InTrickAttack => (KunaisBanePvE.Cooldown.IsCoolingDown || TrickAttackPvE.Cooldown.IsCoolingDown) && (!KunaisBanePvE.Cooldown.ElapsedAfter(17) || !TrickAttackPvE.Cooldown.ElapsedAfter(17));
-
-    // Determines if Mug is in its effective period.
-    private bool InMug => MugPvE.Cooldown.IsCoolingDown && !MugPvE.Cooldown.ElapsedAfter(19);
-
-    // Checks if no ninjutsu action is currently selected or if the Rabbit Medium has been invoked.
-    private static bool NoNinjutsu => AdjustId(ActionID.NinjutsuPvE) is ActionID.NinjutsuPvE or ActionID.RabbitMediumPvE;
     #endregion
 }

BasicRotations/Melee/SAM_Default.cs

@@ -164,8 +164,4 @@ protected override bool GeneralGCD(out IAction? act)
     }
 
     #endregion
-
-    #region Extra Methods
-    private static bool HaveMeikyoShisui => Player.HasStatus(true, StatusID.MeikyoShisui);
-    #endregion
 }

BasicRotations/Ranged/BRD_Default.cs

@@ -32,7 +32,7 @@ public sealed class BRD_Default : BardRotation
     private float ARMYRemainTime => 45 - ARMYTime;
 
     private static bool InBurstStatus => (Player.Level > 50 && !Player.WillStatusEnd(0, true, StatusID.RagingStrikes))
-        || (Player.Level >= 50 && Player.Level < 90 && !Player.WillStatusEnd(0, true, StatusID.RagingStrikes) && !Player.WillStatusEnd(0, true, StatusID.BattleVoice)) 
+        || (Player.Level >= 50 && Player.Level < 90 && !Player.WillStatusEnd(0, true, StatusID.RagingStrikes) && !Player.WillStatusEnd(0, true, StatusID.BattleVoice))
         || (MinstrelsCodaTrait.EnoughLevel && !Player.WillStatusEnd(0, true, StatusID.RagingStrikes) && !Player.WillStatusEnd(0, true, StatusID.RadiantFinale) && !Player.WillStatusEnd(0, true, StatusID.BattleVoice));
 
     #endregion