Priming Touch fix

-Priming Touch feature was not reading if you had the buff, so it would not revert back to meticulous to allow you to use the button if you got a collectors standard proc before the last step. This has been fixed. -Disabled PCT features as they are not replacing the whole chain
PrincessRTFM · Jul 11, 2024 · 96c3ea4 · 96c3ea4
1 parent 4aa30f7
commit 96c3ea4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/XIVComboVX/Combos/DOL.cs b/XIVComboVX/Combos/DOL.cs
@@ -12,7 +12,8 @@ public static class Buffs {
 		public const ushort
 			EurekaMoment = 2765,
 			CollectorsStandard = 2418,
-			CollectorsHighStandard = 3911;
+			CollectorsHighStandard = 3911,
+			PrimingTouch = 3910;
 	}
 
 	public static class Debuffs {
@@ -335,7 +336,8 @@ protected override uint Invoke(uint actionID, uint lastComboActionId, float comb
 		if (level >= DOL.Levels.PrimingTouch) {
 			if (LocalPlayer.CurrentGp >= 400) {
 				if (SelfHasEffect(DOL.Buffs.CollectorsStandard) || SelfHasEffect(DOL.Buffs.CollectorsHighStandard)) {
-					return IsJob(DOL.MinID) ? MIN.PrimingTouch : BTN.PrimingTouch;
+					if (!SelfHasEffect(DOL.Buffs.PrimingTouch)) 
+						return IsJob(DOL.MinID) ? MIN.PrimingTouch : BTN.PrimingTouch;
 				}
 			}
 		}

diff --git a/XIVComboVX/Combos/PCT.cs b/XIVComboVX/Combos/PCT.cs
@@ -123,6 +123,9 @@ public const byte
 
 }
 
+
+/* Unimplemented until its working
+
 internal class PictomancerSTComboFeature: CustomCombo {
 	public override CustomComboPreset Preset => CustomComboPreset.PictomancerSTComboFeature;
 	public override uint[] ActionIDs { get; } = [PCT.FireRed, PCT.AeroGreen, PCT.WaterBlue];
@@ -147,3 +150,4 @@ protected override uint Invoke(uint actionID, uint lastComboActionId, float comb
 		return PCT.ExtraBlizzardCyan;
 	}
 }
+*/
diff --git a/XIVComboVX/CustomComboPreset.cs b/XIVComboVX/CustomComboPreset.cs
@@ -802,12 +802,12 @@ public enum CustomComboPreset {
 	#endregion
 	// ====================================================================================
 	#region PICTOMANCER (42xx)
+	// Unimplemeneted until its working
+	//[CustomComboInfo("Single Target Combo Replacer", "Changes Red/Green/Blue Single-Target combo into Single-Target Cyan/Yellow/Magenta combo when under the effect of Subtractive Palette", PCT.JobID)]
+	//PictomancerSTComboFeature = 4201,
 
-	[CustomComboInfo("Single Target Combo Replacer", "Changes Red/Green/Blue Single-Target combo into Single-Target Cyan/Yellow/Magenta combo when under the effect of Subtractive Palette", PCT.JobID)]
-	PictomancerSTComboFeature = 4201,
-
-	[CustomComboInfo("AoE Target Combo Replacer", "Changes Red/Green/Blue AoE combo into AoE Cyan/Yellow/Magenta combo when under the effect of Subtractive Palette", PCT.JobID)]
-	PictomancerAOEComboFeature = 4202,
+	//[CustomComboInfo("AoE Target Combo Replacer", "Changes Red/Green/Blue AoE combo into AoE Cyan/Yellow/Magenta combo when under the effect of Subtractive Palette", PCT.JobID)]
+	//PictomancerAOEComboFeature = 4202,
 
 
 	#endregion