diff --git a/XIVComboVX/Combos/PCT.cs b/XIVComboVX/Combos/PCT.cs index cab839f1..ea7c087e 100644 --- a/XIVComboVX/Combos/PCT.cs +++ b/XIVComboVX/Combos/PCT.cs @@ -191,12 +191,6 @@ protected override uint Invoke(uint actionID, uint lastComboActionId, float comb } } -/* -internal class PictomancerCreatureCombo: CustomCombo { - public override CustomComboPreset Preset { get; } = CustomComboPreset.PictomancerAOEComboFeature - -} -*/ internal class PictoimancerHolyCometCombo : CustomCombo { public override CustomComboPreset Preset { get; } = CustomComboPreset.PictomancerHolyCometCombo; @@ -210,3 +204,19 @@ protected override uint Invoke(uint actionID, uint lastComboActionId, float comb return actionID; } } + + + +internal class PictomancerCreatureCombo: CustomCombo { + public override CustomComboPreset Preset { get; } = CustomComboPreset.PictomancerLivingMuseCombo; + public override uint[] ActionIDs { get; } = [PCT.LivingMuse]; + protected override uint Invoke(uint actionID, uint lastComboActionId, float comboTime, byte level) { + PCTGauge gauge = GetJobGauge(); + + if (gauge.CreatureMotifDrawn) { + return OriginalHook(PCT.LivingMuse); + } + return OriginalHook(PCT.CreatureMotif); + } + +} diff --git a/XIVComboVX/CustomComboPreset.cs b/XIVComboVX/CustomComboPreset.cs index 85f33eaf..65918f13 100644 --- a/XIVComboVX/CustomComboPreset.cs +++ b/XIVComboVX/CustomComboPreset.cs @@ -826,7 +826,8 @@ public enum CustomComboPreset { [CustomComboInfo("Holy Comet Combo", "When using Subtractive Palette at level 90+, turns Holy In White into Comet In Black", PCT.JobID)] PictomancerHolyCometCombo = 4207, - //[CustomComboInfo("Creature Motif/Muse Combo", "Changes Living Muse into Creature Motif when nothing is currently drawn")] + [CustomComboInfo("Creature Motif/Muse Combo", "Changes Living Muse into Creature Motif when nothing is currently drawn", PCT.JobID)] + PictomancerLivingMuseCombo = 4208, #endregion