Skip to content

Commit

Permalink
various fixed
Browse files Browse the repository at this point in the history
Bard Heartbreak(bloodletter) fix thanks to smileryface, fixed VPR ogcd usage, fix PCT pvp swap out of subtractive pallet when have charges of comet in black
  • Loading branch information
Rabalaba committed Jul 12, 2024
1 parent 5fd006b commit 07dc032
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
13 changes: 9 additions & 4 deletions Advanced_Rotations/PVE/Melee/VPR_PVE.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ protected override bool EmergencyAbility(IAction nextGCD, out IAction? act)
{
act = null;

if (TwinfangBitePvE.CanUse(out act) && HaveHuntersVenom) return true;
if (TwinbloodBitePvE.CanUse(out act) && HaveSwiftVenom) return true;
if (UncoiledTwinfangPvE.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && HavePoisedFang) return true;
if (ThisCoil.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && HavePoisedBlood) return true;

return base.EmergencyAbility(nextGCD, out act);
}
#endregion
Expand All @@ -55,10 +60,10 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
if (SerpentsIrePvE.CanUse(out act) && InCombat && RattlingCoilStacks <= 2 && !HaveReawakend) return true;
if (TwinfangThreshPvE.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && HaveFellHuntersVenom) return true;
if (TwinbloodThreshPvE.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && HaveFellskintVenom) return true;
if (TwinfangBitePvE.CanUse(out act) && HaveHuntersVenom) return true;
if (TwinbloodBitePvE.CanUse(out act) && HaveSwiftVenom) return true;
if (UncoiledTwinfangPvE.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && HavePoisedFang) return true;
if (ThisCoil.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && HavePoisedBlood) return true;




if (LastLashPvE.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && SerpentsTailId == LastLashPvE.ID) return true;
if (DeathRattlePvE.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && SerpentsTailId == DeathRattlePvE.ID) return true;
if (FirstLegacyPvE.CanUse(out act, skipComboCheck: true, skipCastingCheck: true, skipAoeCheck: true, skipStatusProvideCheck: true) && SerpentsTailId == FirstLegacyPvE.ID) return true;
Expand Down
1 change: 1 addition & 0 deletions Advanced_Rotations/PVE/Ranged_Phys/BRD.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ private bool BloodletterLogic(out IAction? act)

if (HeartbreakShotPvE.CanUse(out act, usedUp: true))
{
if (isBattleVoice || isRadiantFinale || (isRagingSoon && (isBloodTrait || isNoBloodTrait))) return false;
if (isEmpyrealArrowCD || isEmpyrealSoon || isEmpyrealLevel || isRepertoire) return true;
}

Expand Down
2 changes: 1 addition & 1 deletion Advanced_Rotations/PVP/Ranged_Magic/PCT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ protected override bool GeneralGCD(out IAction? act)
}

if (HolyInWhitePvP.CanUse(out act, skipAoeCheck: true, usedUp: true)) return true;
if (IsMoving && Player.HasStatus(true, StatusID.SubtractivePalette_4102))
if (IsMoving && Player.HasStatus(true, StatusID.SubtractivePalette_4102) && HolyInWhitePvE.Cooldown.CurrentCharges == 0)
{
if (ReleaseSubtractivePalettePvP.CanUse(out act)) return true;
}
Expand Down
2 changes: 1 addition & 1 deletion Advanced_Rotations/RabbsRotationsNET8.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net8.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Authors>Rabbs</Authors>
<Version>1.1.2.4</Version>
<Version>1.1.2.5</Version>
<PlatformTarget>x64</PlatformTarget>
<Platforms>x64</Platforms>

Expand Down
2 changes: 1 addition & 1 deletion Advanced_Rotations/RotationInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ internal class RotationInfo
{
internal const string USERNAME = $"Rabbs";

internal const string VERSION = "1.1.2.4";
internal const string VERSION = "1.1.2.5";
}

0 comments on commit 07dc032

Please sign in to comment.