Skip to content

Commit

Permalink
Living, Steel, and Scenic motif combos
Browse files Browse the repository at this point in the history
-Living, Steel, and Scenic motif combos SHOULD work. Please note, not tested above level 80, but the logic checks out
  • Loading branch information
FrigidWalrus committed Jul 16, 2024
1 parent 246db3d commit e3785b9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
22 changes: 16 additions & 6 deletions XIVComboVX/Combos/PCT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<PCTGauge>();

if (gauge.CreatureMotifDrawn) {
return OriginalHook(PCT.LivingMuse);
}
return OriginalHook(PCT.CreatureMotif);
}

}
3 changes: 2 additions & 1 deletion XIVComboVX/CustomComboPreset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e3785b9

Please sign in to comment.