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

PCT hammer fix #215

Merged
merged 1 commit into from
Sep 11, 2024
Merged

PCT hammer fix #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions BasicRotations/Magical/ICWA_PCT_BETA.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
{
bool burstTimingCheckerStriking = !ScenicMusePvE.Cooldown.WillHaveOneCharge(60) || Player.HasStatus(true, StatusID.StarryMuse);
int adjustCombatTimeForOpener = Player.Level < 92 ? 2 : 5;
if (ScenicMusePvE.CanUse(out act, skipCastingCheck: true, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true, usedUp: true) && CombatTime > adjustCombatTimeForOpener && IsBurst) return true;
//if (ScenicMusePvE.CanUse(out act, skipCastingCheck: true, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true, usedUp: true) && CombatTime > adjustCombatTimeForOpener && IsBurst) return true; this needs to be corrected, cannot call sceneic muse, not valid action
if (CombatTime > adjustCombatTimeForOpener && StrikingMusePvE.CanUse(out act, skipCastingCheck: true, skipStatusProvideCheck: true, skipComboCheck: true, skipAoeCheck: true, usedUp: true) && burstTimingCheckerStriking) return true;
if (SubtractivePalettePvE.CanUse(out act) && !Player.HasStatus(true, StatusID.SubtractivePalette)) return true;
if (Player.HasStatus(true, StatusID.StarryMuse))
Expand Down Expand Up @@ -172,7 +172,9 @@ protected override bool GeneralGCD(out IAction? act)
if (CometInBlackPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0) return true;
}
if (StarPrismPvE.CanUse(out act, skipAoeCheck: true) && Player.HasStatus(true, StatusID.Starstruck)) return true;
if (HammerStampPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && HasHammerTime) return true;
if (PolishingHammerPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HammerBrushPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HammerStampPvE.CanUse(out act, skipComboCheck: true)) return true;
//Cast when not in fight or no target available
if (!InCombat)
{
Expand Down Expand Up @@ -205,7 +207,9 @@ protected override bool GeneralGCD(out IAction? act)
// white/black paint use while moving
if (isMovingAndSwift)
{
if (HammerStampPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true)) return true;
if (PolishingHammerPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HammerBrushPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HammerStampPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HolyCometMoving)
{
if (CometInBlackPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true)) return true;
Expand Down
5 changes: 3 additions & 2 deletions BasicRotations/Magical/PCT_Default.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,16 @@ protected override bool GeneralGCD(out IAction? act)
// white/black paint use while moving
if (IsMoving)
{
if (HammerStampPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Player.HasStatus(true, StatusID.HammerTime) && InCombat) return true;
if (HolyCometMoving)
{
if (CometInBlackPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0 && Player.HasStatus(true, StatusID.MonochromeTones)) return true;
if (HolyInWhitePvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Paint > 0) return true;
}
}

if (HammerStampPvE.CanUse(out act, skipCastingCheck: true, skipAoeCheck: true) && Player.HasStatus(true, StatusID.HammerTime) && InCombat) return true;
if (PolishingHammerPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HammerBrushPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HammerStampPvE.CanUse(out act, skipComboCheck: true)) return true;

if (!InCombat)
{
Expand Down
2 changes: 2 additions & 0 deletions BasicRotations/Magical/zPCT_TESTING.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
protected override bool GeneralGCD(out IAction? act)
{
// Weapon Painting Burst
if (PolishingHammerPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HammerBrushPvE.CanUse(out act, skipComboCheck: true)) return true;
if (HammerStampPvE.CanUse(out act, skipComboCheck: true)) return true;

if (HolyCometMoving && IsMoving)
Expand Down