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

Commit

Permalink
fixed VPR Burst 6 min +
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kagekazu
Kagekazu committed Jul 16, 2024
1 parent 3cfa7b0 commit 4355ceb
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions XIVSlothCombo/Combos/PvE/VPR.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}

// Uncoiled Fury usage
if (LevelChecked(UncoiledFury) && gauge.HasRattlingCoilStack() &&
if (LevelChecked(UncoiledFury) && gauge.HasRattlingCoilStack() && !HasEffect(Buffs.ReadyToReawaken) && !WasLastWeaponskill(Ouroboros) &&
HasEffect(Buffs.Swiftscaled) && HasEffect(Buffs.HuntersInstinct) &&
!DreadwinderReady && !HuntersCoilReady && !SwiftskinsCoilReady && !HasEffect(Buffs.Reawakened) &&
!HasEffect(Buffs.SwiftskinsVenom) && !HasEffect(Buffs.HuntersVenom) &&
Expand Down Expand Up @@ -326,11 +326,12 @@ private static bool UseReawaken(VPRGauge gauge)
!HasEffect(Buffs.Reawakened) &&
!HasEffect(Buffs.HuntersVenom) && !HasEffect(Buffs.SwiftskinsVenom) &&
!HasEffect(Buffs.PoisedForTwinblood) && !HasEffect(Buffs.PoisedForTwinfang))

{
//even minutes
if ((SerpentsIreUsed <= 3 || SerpentsIreUsed >= 5) && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 14 &&
if ((SerpentsIreUsed <= 3 || SerpentsIreUsed >= 5) && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 10 &&
(WasLastAbility(SerpentsIre) ||
WasLastWeaponskill(Ouroboros) ||
(gauge.SerpentOffering >= 50 && WasLastWeaponskill(Ouroboros)) ||
HasEffect(Buffs.ReadyToReawaken) ||
(gauge.SerpentOffering >= 95 && WasLastAbility(SerpentsIre))))
return true;
Expand All @@ -343,15 +344,15 @@ private static bool UseReawaken(VPRGauge gauge)
return true;

// 6 minutes
if (SerpentsIreUsed == 4 && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 14 &&
if (SerpentsIreUsed == 4 && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 10 &&
(WasLastAbility(SerpentsIre) ||
WasLastWeaponskill(Ouroboros) ||
(gauge.SerpentOffering >= 50 && WasLastWeaponskill(Ouroboros)) ||
HasEffect(Buffs.ReadyToReawaken) ||
(gauge.SerpentOffering >= 95 && WasLastAbility(SerpentsIre))))
return true;

// 7min 2RA
if (SerpentsIreUsed == 4 && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 14 &&
if (SerpentsIreUsed == 4 && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 10 &&
(gauge.SerpentOffering >= 95 ||
(gauge.SerpentOffering >= 50 && WasLastWeaponskill(Ouroboros))) &&
GetCooldownRemainingTime(SerpentsIre) <= GCD * 36 &&
Expand Down Expand Up @@ -479,7 +480,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (IsEnabled(CustomComboPreset.VPR_ST_UncoiledFury) &&
LevelChecked(UncoiledFury) && gauge.RattlingCoilStacks > Config.VPR_ST_UncoiledFury_HoldCharges &&
HasEffect(Buffs.Swiftscaled) && HasEffect(Buffs.HuntersInstinct) &&
!DreadwinderReady && !HuntersCoilReady && !SwiftskinsCoilReady && !HasEffect(Buffs.Reawakened) &&
!DreadwinderReady && !HuntersCoilReady && !SwiftskinsCoilReady &&
!HasEffect(Buffs.Reawakened) && !HasEffect(Buffs.ReadyToReawaken) && !WasLastWeaponskill(Ouroboros) &&
!HasEffect(Buffs.SwiftskinsVenom) && !HasEffect(Buffs.HuntersVenom) &&
!WasLastWeaponskill(FlankstingStrike) && !WasLastWeaponskill(FlanksbaneFang) &&
!WasLastWeaponskill(HindstingStrike) && !WasLastWeaponskill(HindsbaneFang) && !WasLastAbility(SerpentsIre) &&
Expand Down Expand Up @@ -595,7 +597,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}
return (IsEnabled(CustomComboPreset.VPR_ST_NoxiousGnash) &&
(GetDebuffRemainingTime(Debuffs.NoxiousGnash) < ST_NoxiousDebuffRefresh ||
GetCooldownRemainingTime(SerpentsIre) <= GCD * 3) && LevelChecked(DreadFangs) &&
GetCooldownRemainingTime(SerpentsIre) <= GCD * 4) && LevelChecked(DreadFangs) &&
((IsEnabled(CustomComboPreset.VPR_ST_Dreadwinder) &&
(!ActionReady(Dreadwinder))) ||
!IsEnabled(CustomComboPreset.VPR_ST_Dreadwinder)))
Expand Down Expand Up @@ -623,9 +625,9 @@ private static bool UseReawaken(VPRGauge gauge)
GetTargetHPPercent() >= Config.VPR_ST_Reawaken_Usage)
{
//even minutes
if ((SerpentsIreUsed <= 3 || SerpentsIreUsed >= 5) && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 14 &&
if ((SerpentsIreUsed <= 3 || SerpentsIreUsed >= 5) && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 10 &&
(WasLastAbility(SerpentsIre) ||
WasLastWeaponskill(Ouroboros) ||
(gauge.SerpentOffering >= 50 && WasLastWeaponskill(Ouroboros)) ||
HasEffect(Buffs.ReadyToReawaken) ||
(gauge.SerpentOffering >= 95 && WasLastAbility(SerpentsIre))))
return true;
Expand All @@ -638,15 +640,15 @@ private static bool UseReawaken(VPRGauge gauge)
return true;

// 6 minutes
if (SerpentsIreUsed == 4 && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 14 &&
if (SerpentsIreUsed == 4 && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 10 &&
(WasLastAbility(SerpentsIre) ||
WasLastWeaponskill(Ouroboros) ||
(gauge.SerpentOffering >= 50 && WasLastWeaponskill(Ouroboros)) ||
HasEffect(Buffs.ReadyToReawaken) ||
(gauge.SerpentOffering >= 95 && WasLastAbility(SerpentsIre))))
return true;

// 7min 2RA
if (SerpentsIreUsed == 4 && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 14 &&
if (SerpentsIreUsed == 4 && GetDebuffRemainingTime(Debuffs.NoxiousGnash) >= AwGCD * 10 &&
(gauge.SerpentOffering >= 95 ||
(gauge.SerpentOffering >= 50 && WasLastWeaponskill(Ouroboros))) &&
GetCooldownRemainingTime(SerpentsIre) <= GCD * 36 &&
Expand Down Expand Up @@ -1073,7 +1075,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
VPRGauge? gauge = GetJobGauge<VPRGauge>();
bool PitOfDreadReady = gauge.DreadCombo == DreadCombo.PitOfDread;
bool SwiftskinsDenReady = gauge.DreadCombo == DreadCombo.SwiftskinsDen;
bool HuntersDenReady = gauge.DreadCombo == DreadCombo.HuntersDen;

if (actionID is PitofDread)
{
Expand Down Expand Up @@ -1176,8 +1177,6 @@ internal class VPR_TwinTails : CustomCombo
protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.VPR_TwinTails;
protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
{
VPRGauge? gauge = GetJobGauge<VPRGauge>();

if (actionID is SerpentsTail)
{
if (TraitLevelChecked(Traits.SerpentsLegacy) && CanWeave(actionID) &&
Expand Down

0 comments on commit 4355ceb

Please sign in to comment.