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

Commit

Permalink
changes for serpent tails
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kagekazu
Kagekazu committed Jul 11, 2024
1 parent bbf37b2 commit c36ebb0
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions XIVSlothCombo/Combos/PvE/VPR.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public const uint
ThirdLegacy = 34642,
FourthGeneration = 34630,
FourthLegacy = 34643,
Ouroboros = 34631;
Ouroboros = 34631,
LastLash = 34635;

public static class Buffs
{
Expand Down Expand Up @@ -177,8 +178,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
//Legacy weaves
if (TraitLevelChecked(Traits.SerpentsLegacy) && CanWeave(actionID) &&
(WasLastWeaponskill(OriginalHook(SteelFangs)) || WasLastWeaponskill(OriginalHook(DreadFangs)) ||
WasLastWeaponskill(OriginalHook(HuntersCoil)) || WasLastWeaponskill(OriginalHook(SwiftskinsCoil))))
(WasLastAction(OriginalHook(SteelFangs)) || WasLastAction(OriginalHook(DreadFangs)) ||
WasLastAction(OriginalHook(HuntersCoil)) || WasLastAction(OriginalHook(SwiftskinsCoil))))
return OriginalHook(SerpentsTail);

if (gauge.AnguineTribute is 5)
Expand Down Expand Up @@ -267,14 +268,14 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

if (lastComboMove is HindstingStrike or HindsbaneFang or FlankstingStrike or FlanksbaneFang)
{
if (CanWeave(actionID) && LevelChecked(SerpentsTail) &&
if (CanWeave(actionID) && LevelChecked(SerpentsTail) && HasCharges(DeathRattle) &&
(WasLastWeaponskill(HindstingStrike) || WasLastWeaponskill(HindsbaneFang) ||
WasLastWeaponskill(FlankstingStrike) || WasLastWeaponskill(FlanksbaneFang)))
return OriginalHook(SerpentsTail);

//Reawakend Usage
if ((HasEffect(Buffs.ReadyToReawaken) || gauge.SerpentOffering >= 50) &&
GetCooldownRemainingTime(SerpentsIre) > GCD * 10 &&
GetCooldownRemainingTime(SerpentsIre) > GCD * 15 &&
HasEffect(Buffs.Swiftscaled) &&
HasEffect(Buffs.HuntersInstinct) &&
TargetHasEffect(Debuffs.NoxiousGnash) &&
Expand Down Expand Up @@ -382,8 +383,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
//Legacy weaves
if (TraitLevelChecked(Traits.SerpentsLegacy) && CanWeave(actionID) &&
(WasLastWeaponskill(OriginalHook(SteelFangs)) || WasLastWeaponskill(OriginalHook(DreadFangs)) ||
WasLastWeaponskill(OriginalHook(HuntersCoil)) || WasLastWeaponskill(OriginalHook(SwiftskinsCoil))))
(WasLastAction(OriginalHook(SteelFangs)) || WasLastAction(OriginalHook(DreadFangs)) ||
WasLastAction(OriginalHook(HuntersCoil)) || WasLastAction(OriginalHook(SwiftskinsCoil))))
return OriginalHook(SerpentsTail);

if (gauge.AnguineTribute is 5)
Expand Down Expand Up @@ -521,15 +522,15 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (lastComboMove is HindstingStrike or HindsbaneFang or FlankstingStrike or FlanksbaneFang)
{
if (IsEnabled(CustomComboPreset.VPR_ST_SerpentsTail) &&
CanWeave(actionID) && LevelChecked(SerpentsTail) &&
CanWeave(actionID) && LevelChecked(SerpentsTail) && HasCharges(DeathRattle) &&
(WasLastWeaponskill(HindstingStrike) || WasLastWeaponskill(HindsbaneFang) ||
WasLastWeaponskill(FlankstingStrike) || WasLastWeaponskill(FlanksbaneFang)))
return OriginalHook(SerpentsTail);

//Reawakend Usage
if (IsEnabled(CustomComboPreset.VPR_ST_Reawaken) &&
(HasEffect(Buffs.ReadyToReawaken) || gauge.SerpentOffering >= 50) &&
GetCooldownRemainingTime(SerpentsIre) > GCD * 10 &&
GetCooldownRemainingTime(SerpentsIre) > GCD * 15 &&
HasEffect(Buffs.Swiftscaled) &&
HasEffect(Buffs.HuntersInstinct) &&
TargetHasEffect(Debuffs.NoxiousGnash) &&
Expand Down Expand Up @@ -617,8 +618,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
//Legacy weaves
if (TraitLevelChecked(Traits.SerpentsLegacy) && CanWeave(actionID) &&
(WasLastWeaponskill(OriginalHook(SteelMaw)) || WasLastWeaponskill(OriginalHook(DreadMaw)) ||
WasLastWeaponskill(OriginalHook(HuntersDen)) || WasLastWeaponskill(OriginalHook(SwiftskinsDen))))
(WasLastAction(OriginalHook(SteelMaw)) || WasLastAction(OriginalHook(DreadMaw)) ||
WasLastAction(OriginalHook(HuntersDen)) || WasLastAction(OriginalHook(SwiftskinsDen))))
return OriginalHook(SerpentsTail);

if (gauge.AnguineTribute is 5)
Expand Down Expand Up @@ -681,7 +682,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

if (lastComboMove is BloodiedMaw or JaggedMaw)
{
if (CanWeave(actionID) && LevelChecked(SerpentsTail) &&
if (CanWeave(actionID) && LevelChecked(SerpentsTail) && HasCharges(LastLash) &&
(WasLastWeaponskill(BloodiedMaw) || WasLastWeaponskill(JaggedMaw)))
return OriginalHook(SerpentsTail);

Expand Down Expand Up @@ -777,8 +778,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
//Legacy weaves
if (TraitLevelChecked(Traits.SerpentsLegacy) && CanWeave(actionID) &&
(WasLastWeaponskill(OriginalHook(SteelMaw)) || WasLastWeaponskill(OriginalHook(DreadMaw)) ||
WasLastWeaponskill(OriginalHook(HuntersDen)) || WasLastWeaponskill(OriginalHook(SwiftskinsDen))))
(WasLastAction(OriginalHook(SteelMaw)) || WasLastAction(OriginalHook(DreadMaw)) ||
WasLastAction(OriginalHook(HuntersDen)) || WasLastAction(OriginalHook(SwiftskinsDen))))
return OriginalHook(SerpentsTail);

if (gauge.AnguineTribute is 5)
Expand Down Expand Up @@ -859,7 +860,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (lastComboMove is BloodiedMaw or JaggedMaw)
{
if (IsEnabled(CustomComboPreset.VPR_AoE_SerpentsTail) &&
CanWeave(actionID) && LevelChecked(SerpentsTail) &&
CanWeave(actionID) && LevelChecked(SerpentsTail) && HasCharges(LastLash) &&
(WasLastWeaponskill(BloodiedMaw) || WasLastWeaponskill(JaggedMaw)))
return OriginalHook(SerpentsTail);

Expand Down Expand Up @@ -1025,8 +1026,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (IsEnabled(CustomComboPreset.VPR_ReawakenLegacyWeaves))
{
if (TraitLevelChecked(Traits.SerpentsLegacy) && CanWeave(actionID) &&
(WasLastWeaponskill(OriginalHook(SteelFangs)) || WasLastWeaponskill(OriginalHook(DreadFangs)) ||
WasLastWeaponskill(OriginalHook(HuntersCoil)) || WasLastWeaponskill(OriginalHook(SwiftskinsCoil))))
(WasLastAction(OriginalHook(SteelFangs)) || WasLastAction(OriginalHook(DreadFangs)) ||
WasLastAction(OriginalHook(HuntersCoil)) || WasLastAction(OriginalHook(SwiftskinsCoil))))
return OriginalHook(SerpentsTail);
}

Expand Down Expand Up @@ -1060,8 +1061,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (actionID is SerpentsTail)
{
if (TraitLevelChecked(Traits.SerpentsLegacy) && CanWeave(actionID) &&
(WasLastWeaponskill(OriginalHook(SteelMaw)) || WasLastWeaponskill(OriginalHook(DreadMaw)) ||
WasLastWeaponskill(OriginalHook(HuntersDen)) || WasLastWeaponskill(OriginalHook(SwiftskinsDen))))
(WasLastAction(OriginalHook(SteelMaw)) || WasLastAction(OriginalHook(DreadMaw)) ||
WasLastAction(OriginalHook(HuntersDen)) || WasLastAction(OriginalHook(SwiftskinsDen))))
return OriginalHook(SerpentsTail);

if (HasEffect(Buffs.PoisedForTwinfang))
Expand Down

0 comments on commit c36ebb0

Please sign in to comment.