Skip to content

Commit

Permalink
Addition
Browse files Browse the repository at this point in the history
-Added replacer for Meticulous actions under certain conditions
  • Loading branch information
FrigidWalrus committed Jul 9, 2024
1 parent 07c58e1 commit 487b9ab
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 4 deletions.
30 changes: 29 additions & 1 deletion XIVComboVX/Combos/DOL.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Dalamud.Game.ClientState.Conditions;

using Lumina.Excel.GeneratedSheets;

namespace PrincessRTFM.XIVComboVX.Combos;

internal static class DOL {
Expand All @@ -10,7 +12,9 @@ internal static class DOL {

public static class Buffs {
public const ushort
EurekaMoment = 2765;
EurekaMoment = 2765,
CollectorsStandard = 2418,
CollectorsHighStandard = 3911;
}

public static class Debuffs {
Expand Down Expand Up @@ -63,6 +67,11 @@ public const uint
CollectorsFocus = 21206,
WiseToTheWorld = 26522,
PrimingTouch = 34872;

public static class Levels {
public const byte
PrimingTouch = 95;
}
}
public static class MIN {
public const uint
Expand Down Expand Up @@ -185,6 +194,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
MIN.NaldthalsTidings => BTN.NophicasTidings,
MIN.CollectorsFocus => BTN.CollectorsFocus,
MIN.WiseToTheWorld => BTN.WiseToTheWorld,
MIN.PrimingTouch => BTN.PrimingTouch,
_ => actionID,
};
case DOL.MinID:
Expand Down Expand Up @@ -216,6 +226,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
BTN.NophicasTidings => MIN.NaldthalsTidings,
BTN.CollectorsFocus => MIN.CollectorsFocus,
BTN.WiseToTheWorld => MIN.WiseToTheWorld,
BTN.PrimingTouch => MIN.PrimingTouch,
_ => actionID,
};
}
Expand Down Expand Up @@ -324,3 +335,20 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return thaliak(actionID, level);
}
}
internal class PrimedMetFeature: CustomCombo {

public override CustomComboPreset Preset { get; } = CustomComboPreset.PrimedMetFeature;

public override uint[] ActionIDs => [MIN.MeticulousProspector, BTN.MeticulousWoodsman];

protected override uint Invoke(uint actionID, uint lastComboActionId, float comboTime, byte level) {

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;
}
return actionID;

}
}
6 changes: 3 additions & 3 deletions XIVComboVX/CustomComboPreset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1566,9 +1566,9 @@ public enum CustomComboPreset {
[CustomComboInfo("Chum / Electric Current Feature", "Replace Chum with Electric Current when swimming.", DOL.JobID)]
FisherElectricChumFeature = 9908,

// [CustomComboInfo("Priming Meticulous combo", "Replace Meticulous actions with Priming Touch when Special Collector active and have more than 400GP.", DOL.JobID)]
// PrimedMetFeatureMIN = 9927,
// Trying to get this to work.
[CustomComboInfo("Priming Meticulous combo", "Replace Meticulous actions with Priming Touch when Special Collector active and have more than 400GP.", DOL.JobID)]
PrimedMetFeature = 9927,


#if DEBUG
[CustomComboInfo("Mooch / Spareful Hand Feature", "Replace Mooch with Spareful Hand if you have space available in Swimbait box.", DOL.JobID)]
Expand Down

0 comments on commit 487b9ab

Please sign in to comment.