Skip to content
This repository has been archived by the owner on Nov 23, 2024. It is now read-only.

Pot usage removal #214

Merged
merged 1 commit into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions BasicRotations/Magical/SMN_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
bool elapsed6ChargeAfterInvocation = SummonSolarBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(6) || SummonBahamutPvE.Cooldown.ElapsedOneChargeAfterGCD(6) || SummonPhoenixPvE.Cooldown.ElapsedOneChargeAfterGCD(6);
bool burstInSolar = Player.Level == 100 ? InSolarBahamut : InBahamut;

if (!Player.HasStatus(false, StatusID.SearingLight) && burstInSolar && elapsed0ChargeAfterInvocation && (SearingLightPvE.Cooldown.WillHaveOneCharge(5) || !SearingLightPvE.Cooldown.IsCoolingDown))
{
UseBurstMedicine(out act);
}

if (!Player.HasStatus(false, StatusID.SearingLight) && burstInSolar && elapsed1ChargeAfterInvocation)
{
if (SearingLightPvE.CanUse(out act, skipAoeCheck: true)) return true;
Expand Down
11 changes: 0 additions & 11 deletions BasicRotations/Melee/RPR_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)

if (IsBurst)
{
if (UseBurstMedicine(out act))
{
if (CombatElapsedLess(10))
{
if (!CombatElapsedLess(5)) return true;
}
else
{
if (ArcaneCirclePvE.Cooldown.WillHaveOneCharge(5)) return true;
}
}
if ((HostileTarget?.HasStatus(true, StatusID.DeathsDesign) ?? false)
&& !CombatElapsedLess(3.5f) && ArcaneCirclePvE.CanUse(out act, skipAoeCheck: true)) return true;
}
Expand Down
9 changes: 8 additions & 1 deletion BasicRotations/Melee/VPR_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ public sealed class VPR_Default : ViperRotation
[RotationConfig(CombatType.PvE, Name = "How long has to pass on Serpents Ire's cooldown before the rotation starts pooling gauge for burst. Leave this alone if you dont know what youre doing. (Will still use Reawaken if you reach cap regardless of timer)")]
public int ReawakenDelayTimer { get; set; } = 75;

[RotationConfig(CombatType.PvE, Name = "Experimental Pot Usage(used up to 5 seconds before SerpentsIre comes off cooldown)")]
public bool BurstMed { get; set; } = false;

#endregion

private static bool IsInBurst => Player.Level > 50 && !Player.WillStatusEnd(0, true, StatusID.RagingStrikes);
Expand All @@ -49,6 +52,10 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
if (TwinfangBitePvE.CanUse(out act)) return true;
if (TwinbloodBitePvE.CanUse(out act)) return true;

// Use burst medicine if cooldown for Technical Step has elapsed sufficiently
if (BurstMed && SerpentsIrePvE.EnoughLevel && SerpentsIrePvE.Cooldown.ElapsedAfter(85)
&& UseBurstMedicine(out act)) return true;

return base.EmergencyAbility(nextGCD, out act);
}

Expand All @@ -62,7 +69,7 @@ protected override bool MoveForwardAbility(IAction nextGCD, out IAction? act)
[RotationDesc]
protected sealed override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
{
if (FeintPvE.CanUse(out act)) return true;
if (SerpentCombo == SerpentCombo.NONE &&FeintPvE.CanUse(out act)) return true;
return base.DefenseAreaAbility(nextGCD, out act);
}
#endregion
Expand Down
2 changes: 0 additions & 2 deletions BasicRotations/Ranged/MCH_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
// Burst
if (IsBurst)
{
if (UseBurstMedicine(out act)) return true;

{
if ((IsLastAbility(false, HyperchargePvE) || Heat >= 50 || Player.HasStatus(true, StatusID.Hypercharged)) && !CombatElapsedLessGCD(5) &&
(CombatElapsedLess(20) || ToolChargeSoon(out _)) && !LowLevelHyperCheck && WildfirePvE.CanUse(out act)) return true;
Expand Down
1 change: 0 additions & 1 deletion BasicRotations/Tank/PLD_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)

if (InCombat)
{
if (UseBurstMedicine(out act)) return true;
if (IsBurst && !CombatElapsedLess(5) && FightOrFlightPvE.CanUse(out act)) return true;
}
if (CombatElapsedLess(8)) return false;
Expand Down
2 changes: 0 additions & 2 deletions BasicRotations/Tank/WAR_Default.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)

protected override bool GeneralAbility(IAction nextGCD, out IAction? act)
{
if (IsBurstStatus && UseBurstMedicine(out act)) return true;

if (Player.GetHealthRatio() < ThrillOfBattleHeal)
{
if (ThrillOfBattlePvE.CanUse(out act)) return true;
Expand Down