From fcc34413559f43ed846eff34380be9b97e923646 Mon Sep 17 00:00:00 2001
From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:01:49 -0500
Subject: [PATCH] PCT hammer fix

---
 BasicRotations/Magical/ICWA_PCT_BETA.cs | 10 +++++++---
 BasicRotations/Magical/PCT_Default.cs   |  5 +++--
 BasicRotations/Magical/zPCT_TESTING.cs  |  2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/BasicRotations/Magical/ICWA_PCT_BETA.cs b/BasicRotations/Magical/ICWA_PCT_BETA.cs
index 26bd1b1..4654e2f 100644
--- a/BasicRotations/Magical/ICWA_PCT_BETA.cs
+++ b/BasicRotations/Magical/ICWA_PCT_BETA.cs
@@ -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))
@@ -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)
         {
@@ -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;
diff --git a/BasicRotations/Magical/PCT_Default.cs b/BasicRotations/Magical/PCT_Default.cs
index 7dc592f..bf33811 100644
--- a/BasicRotations/Magical/PCT_Default.cs
+++ b/BasicRotations/Magical/PCT_Default.cs
@@ -205,7 +205,6 @@ 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;
@@ -213,7 +212,9 @@ protected override bool GeneralGCD(out IAction? act)
             }
         }
 
-        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)
         {
diff --git a/BasicRotations/Magical/zPCT_TESTING.cs b/BasicRotations/Magical/zPCT_TESTING.cs
index ae03de7..18a88bb 100644
--- a/BasicRotations/Magical/zPCT_TESTING.cs
+++ b/BasicRotations/Magical/zPCT_TESTING.cs
@@ -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)