Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCT: Standalone Motif Combo #315

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −18
Open

PCT: Standalone Motif Combo #315

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: 5 additions & 5 deletions XIVComboPlugin/Configuration/CustomComboPreset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@ public enum CustomComboPreset : long
ReaperArcaneFeature = 1L << 30,

//PICTOMANCER
[CustomComboInfo("Additive to Subtractive Combo","Replace Additive combo with Subtractive combo when Subtractive Pallet is active",42)]
PictoSubtractivePallet = 1L << 31,
[CustomComboInfo("Additive to Subtractive Combo","Replace Additive combo with Subtractive combo when Subtractive Palette is active",42)]
PictoSubtractivePalette = 1L << 31,

[CustomComboInfo("Motifs and Muses", "Replace Motifs with their relevant Muses", 42)]
PictoMotifMuseFeature = 1L << 34,
PictoMuseCombo = 1L << 34,

[CustomComboInfo("Landscape and Steel follow-ups", "Additionally replace Landscape Motif with Star Prism and Weapon Motif with Hammer Stamp when appropriate", 42)]
PictoMuseCombo = 1L << 38,
[CustomComboInfo("Landscape and Steel follow-ups", "Replace Landscape Motif with Star Prism and Weapon Motif with Hammer Stamp when appropriate", 42)]
PictoMotifCombo = 1L << 38,

[CustomComboInfo("Holy White to Comet Black", "Replace Holy in White with Comet in Black when Monochrome Tones is active", 42)]
PictoHolyWhiteCombo = 1L << 5,
Expand Down
26 changes: 13 additions & 13 deletions XIVComboPlugin/IconReplacer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ private ulong GetIconDetour(byte self, uint actionID)
}

//Pictomancer
if (Configuration.ComboPresets.HasFlag(CustomComboPreset.PictoSubtractivePallet))
if (Configuration.ComboPresets.HasFlag(CustomComboPreset.PictoSubtractivePalette))
{
if (actionID == PCT.Fire1)
{
Expand All @@ -945,36 +945,36 @@ private ulong GetIconDetour(byte self, uint actionID)
}
}

if (Configuration.ComboPresets.HasFlag(CustomComboPreset.PictoMotifMuseFeature))
bool useMuseCombo = Configuration.ComboPresets.HasFlag(CustomComboPreset.PictoMuseCombo);
bool useMotifCombo = Configuration.ComboPresets.HasFlag(CustomComboPreset.PictoMotifCombo);
if (useMuseCombo || useMotifCombo)
{
if (actionID == PCT.CreatureMotif)
{
var PCTGauge = JobGauges.Get<PCTGauge>();
if (PCTGauge.CreatureMotifDrawn)
if (useMuseCombo && PCTGauge.CreatureMotifDrawn)
return iconHook.Original(self, PCT.LivingMuse);
return iconHook.Original(self, actionID);
}

if (actionID == PCT.WeaponMotif)
{
var PCTGauge = JobGauges.Get<PCTGauge>();
if (PCTGauge.WeaponMotifDrawn)
if (useMuseCombo && PCTGauge.WeaponMotifDrawn)
return iconHook.Original(self, PCT.SteelMuse);
if (Configuration.ComboPresets.HasFlag(CustomComboPreset.PictoMuseCombo))
if (SearchBuffArray(PCT.HammerReady))
return iconHook.Original(self, PCT.HammerStamp);
else if (useMotifCombo && SearchBuffArray(PCT.HammerReady))
return iconHook.Original(self, PCT.HammerStamp);
return iconHook.Original(self, actionID);
}

if (actionID == PCT.LandscapeMotif)
{
var PCTGauge = JobGauges.Get<PCTGauge>();
if (PCTGauge.LandscapeMotifDrawn)
return PCT.StarryMuse;
if (Configuration.ComboPresets.HasFlag(CustomComboPreset.PictoMuseCombo))
if (SearchBuffArray(PCT.StarStruck))
return PCT.StarPrism;
return PCT.StarryMotif;
if (useMuseCombo && PCTGauge.LandscapeMotifDrawn)
return iconHook.Original(self, PCT.StarryMuse);
else if (useMotifCombo && SearchBuffArray(PCT.StarStruck))
return iconHook.Original(self, PCT.StarPrism);
return iconHook.Original(self, actionID);
}
}

Expand Down