Merge pull request #567 from FFXIV-CombatReborn/hotforteachingmode

Hotforteachingmode
FFXIV-CombatReborn · Jan 13, 2025 · cb7dcd8 · cb7dcd8
2 parents 1156b97 + cf2f4cb
commit cb7dcd8
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 309 deletions.
diff --git a/BasicRotations/Magical/BLM_Beta.cs b/BasicRotations/Magical/BLM_Beta.cs
@@ -7,7 +7,7 @@
 public sealed class BLM_Beta : BlackMageRotation
 {
     #region Config Options
-    [RotationConfig(CombatType.PvE, Name = "Use Infinite Paradox Rotation (Requires Level 90)")]
+    [RotationConfig(CombatType.PvE, Name = "Use Infinite Paradox Rotation when at level 100)")]
     public bool Infinity { get; set; } = false;
 
     [RotationConfig(CombatType.PvE, Name = "(Standard Rotation) Use Leylines in combat when standing still")]
@@ -140,7 +140,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
             if (AmplifierPvE.CanUse(out act)) return true;
         }
 
-        if (ParadoxPvE.EnoughLevel && Infinity)
+        if (FlareStarPvE.EnoughLevel && Infinity)
         {
             if (UseMedicine && UseBurstMedicine(out act)) return true;
 
@@ -199,7 +199,7 @@ protected override bool GeneralGCD(out IAction? act)
             if (MaintainStatus(out act)) return true;
         }
 
-        if (ParadoxPvE.EnoughLevel && Infinity)
+        if (FlareStarPvE.EnoughLevel && Infinity)
         {
 
             if (InAstralFire && ElementTime < 4 && Player.HasStatus(true, StatusID.Firestarter))

diff --git a/BasicRotations/RebornRotations.csproj b/BasicRotations/RebornRotations.csproj
@@ -26,7 +26,6 @@
   <ItemGroup>
     <Compile Include="Duty\EmanationDefault" />
     <Compile Include="Magical\ICWA_PCT_BETA" />
-    <Compile Include="Tank\PLD_Default_Old" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Tank\GNB_Default.cs" />

diff --git a/BasicRotations/Tank/PLD_Default.cs b/BasicRotations/Tank/PLD_Default.cs
@@ -1,6 +1,6 @@
 namespace RebornRotations.Tank;
 
-[Rotation("Beta", CombatType.PvE, GameVersion = "7.15")]
+[Rotation("Default", CombatType.PvE, GameVersion = "7.15")]
 [SourceCode(Path = "main/BasicRotations/Tank/PLD_Default.cs")]
 [Api(4)]
 
@@ -32,6 +32,9 @@ public sealed class PLD_Default : PaladinRotation
     [RotationConfig(CombatType.PvE, Name = "Use Holy Spirit when out of melee range")]
     private bool UseHolyWhenAway { get; set; } = false;
 
+    [RotationConfig(CombatType.PvE, Name = "Use Clemency with Requiescat")]
+    private bool RequiescatHealBot { get; set; } = true;
+
     [Range(0, 1, ConfigUnitType.Percent)]
     [RotationConfig(CombatType.PvE, Name = "Minimum HP threshold party member needs to be to use Clemency with Requiescat")]
     public float ClemencyRequi { get; set; } = 0.2f;
@@ -186,8 +189,8 @@ protected override bool HealSingleGCD(out IAction? act)
     {
         act = null;
         if (PassageProtec && Player.HasStatus(true, StatusID.PassageOfArms)) return false;
-        if (ClemencyPvE.Target.Target?.GetHealthRatio() < ClemencyRequi && RequiescatStacks > 0 && ClemencyPvE.CanUse(out act, skipCastingCheck: true)) return true;
-        if (HealBot && ClemencyPvE.Target.Target?.GetHealthRatio() < ClemencyNoRequi && ClemencyPvE.CanUse(out act)) return true;
+        if (RequiescatHealBot && RequiescatStacks > 0 && ClemencyPvE.CanUse(out act, skipCastingCheck: true) && ClemencyPvE.Target.Target?.GetHealthRatio() < ClemencyRequi) return true;
+        if (HealBot && ClemencyPvE.CanUse(out act) && ClemencyPvE.Target.Target?.GetHealthRatio() < ClemencyNoRequi) return true;
         return base.HealSingleGCD(out act);
     }
 

diff --git a/BasicRotations/Tank/PLD_Default_Old b/BasicRotations/Tank/PLD_Default_Old
diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -190,7 +190,7 @@ internal static void UpdateRotationState()
                     (DataCenter.RightSet.SwitchCancelConditionSet?.IsTrue(DataCenter.RightNowRotation) ?? false))
                 {
                     CancelState();
-                    if (Player.Job != _previousJob) _previousJob = Player.Job;
+                    if (Player.Job != null && Player.Job != _previousJob) _previousJob = Player.Job;
                     if (ActionUpdater.AutoCancelTime != DateTime.MinValue) ActionUpdater.AutoCancelTime = DateTime.MinValue;
                 }
                 else if ((Service.Config.AutoOnPvPMatchStart && Svc.Condition[ConditionFlag.BetweenAreas] &&