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.

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

Replace Machinist Summon with Overdrive when deployed #247

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions XIVComboPlugin/Configuration/CustomComboPreset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ public enum CustomComboPreset : long
[CustomComboInfo("Spread Shot Heat", "Replace Spread Shot or Scattergun with Auto Crossbow when overheated", 31)]
MachinistSpreadShotFeature = 1L << 24,

[CustomComboInfo("Overdrive when summoned", "Replace Rook/Queen with their respective Overdrives when summoned", 31)]
MachinistOverdriveFeature = 1L << 31,

[CustomComboInfo("Heat Blast when overheated", "Replace Hypercharge with Heat Blast when overheated", 31)]
MachinistOverheatFeature = 1L << 47,

Expand Down
19 changes: 19 additions & 0 deletions XIVComboPlugin/IconReplacer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,25 @@ private ulong GetIconDetour(byte self, uint actionID)
return MCH.SpreadShot;
}

// Replace Rook/Queen with Overdrive when deployed
if (Configuration.ComboPresets.HasFlag(CustomComboPreset.MachinistOverdriveFeature))
{
if (actionID == MCH.Rook || actionID == MCH.Queen)
{
if (XIVComboPlugin.JobGauges.Get<MCHGauge>().IsRobotActive)
{
if (level >= 80)
return MCH.QueenOverdrive;
else
return MCH.RookOverdrive;
}
if (level >= 80)
return MCH.Queen;
else
return MCH.Rook;
}
}

// BLACK MAGE

// B4 and F4 change to each other depending on stance, as do Flare and Freeze.
Expand Down
6 changes: 5 additions & 1 deletion XIVComboPlugin/JobActions/MCH.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ public const uint
HeatBlast = 7410,
SpreadShot = 2870,
AutoCrossbow = 16497,
Scattergun = 25786;
Scattergun = 25786,
Rook = 2864,
RookOverdrive = 7415,
Queen = 16501,
QueenOverdrive = 16502;
}
}