fix typo RPR

Nik-Potokar · Jul 11, 2024 · 47f1001 · 47f1001
1 parent 8748ecb
commit 47f1001
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/XIVSlothCombo/Combos/PvE/RPR.cs b/XIVSlothCombo/Combos/PvE/RPR.cs
@@ -142,9 +142,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                     }
 
                     if (LevelChecked(ShadowOfDeath) && !HasEffect(Buffs.SoulReaver) &&
-                        ((LevelChecked(PlentifulHarvest) && HasEffect(Buffs.Enshrouded) &&
-                        ((GetCooldownRemainingTime(ArcaneCircle) <= GCD * 3) || (GetCooldownRemainingTime(ArcaneCircle) <= GCD))) || // Double Enshroud windows
-                        (GetDebuffRemainingTime(Debuffs.DeathsDesign) <= 6))) // Other times
+                       ((LevelChecked(PlentifulHarvest) && HasEffect(Buffs.Enshrouded) &&
+                       (GetCooldownRemainingTime(ArcaneCircle) <= GCD * 3 || GetCooldownRemainingTime(ArcaneCircle) <= GCD)) || // Double Enshroud windows
+                     (GetDebuffRemainingTime(Debuffs.DeathsDesign) <= 6))) // Other times
                         return ShadowOfDeath;
 
                     if (TargetHasEffect(Debuffs.DeathsDesign))
@@ -175,12 +175,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
 
                         if (LevelChecked(Enshroud) && (gauge.Shroud >= 50 || HasEffect(Buffs.IdealHost)) && !HasEffect(Buffs.SoulReaver) && !HasEffect(Buffs.Enshrouded) &&
-                            (!LevelChecked(PlentifulHarvest) || // Before Plentiful Harvest     
-                            HasEffect(Buffs.ArcaneCircle) || // Shroud in Arcane Circle  
-                            (GetCooldownRemainingTime(ArcaneCircle) <= GCD * 4) || // Prep for double Enshroud + Natural Odd Minute Shrouds
-                            WasLastAction(PlentifulHarvest) || //2nd part of Double Enshroud
-                            (!HasEffect(Buffs.ArcaneCircle) && WasLastAction(ShadowOfDeath)) || //Natural Odd Minute Shroud
-                            (!HasEffect(Buffs.ArcaneCircle) && gauge.Soul >= 90))) // Correction for 2 min windows
+                             (!LevelChecked(PlentifulHarvest) || // Before Plentiful Harvest     
+                             HasEffect(Buffs.ArcaneCircle) || // Shroud in Arcane Circle  
+                             (GetCooldownRemainingTime(ArcaneCircle) <= GCD * 4) || // Prep for double Enshroud + Natural Odd Minute Shrouds
+                             WasLastAction(PlentifulHarvest) || //2nd part of Double Enshroud
+                             (!HasEffect(Buffs.ArcaneCircle) && GetCooldownRemainingTime(ArcaneCircle) <= GCD * 20) || //Natural Odd Minute Shrouds
+                             (!HasEffect(Buffs.ArcaneCircle) && gauge.Soul >= 90))) // Correction for 2 min windows
                             return Enshroud;
 
                         if (!HasEffect(Buffs.Enshrouded) && !HasEffect(Buffs.SoulReaver) &&
@@ -298,7 +298,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                     }
 
                     if (IsEnabled(CustomComboPreset.RPR_ST_SoD) && LevelChecked(ShadowOfDeath) && !HasEffect(Buffs.SoulReaver) && enemyHP > Config.RPR_SoDThreshold &&
-                        ((LevelChecked(PlentifulHarvest) && (GetCooldownRemainingTime(ArcaneCircle) <= GCD * 3 || GetCooldownRemainingTime(ArcaneCircle) <= GCD)) || // Double Enshroud windows
+                        ((LevelChecked(PlentifulHarvest) && HasEffect(Buffs.Enshrouded) && (GetCooldownRemainingTime(ArcaneCircle) <= GCD * 3 || GetCooldownRemainingTime(ArcaneCircle) <= GCD)) || // Double Enshroud windows
                       (GetDebuffRemainingTime(Debuffs.DeathsDesign) <= sodRefreshRange))) // Other times
                         return ShadowOfDeath;
 
@@ -343,7 +343,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             HasEffect(Buffs.ArcaneCircle) || // Shroud in Arcane Circle  
                             (GetCooldownRemainingTime(ArcaneCircle) <= GCD * 4) || // Prep for double Enshroud + Natural Odd Minute Shrouds
                             WasLastAction(PlentifulHarvest) || //2nd part of Double Enshroud
-                            (!HasEffect(Buffs.ArcaneCircle) && GetCooldownRemainingTime(ArcaneCircle) <= GCD * 10) || //Natural Odd Minute Shrouds
+                            (!HasEffect(Buffs.ArcaneCircle) && GetCooldownRemainingTime(ArcaneCircle) <= GCD * 20) || //Natural Odd Minute Shrouds
                             (!HasEffect(Buffs.ArcaneCircle) && gauge.Soul >= 90))) // Correction for 2 min windows
                             return Enshroud;