Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Merge commit 'refs/pull/1632/head' of https://github.com/Nik-Potokar/…
Browse files Browse the repository at this point in the history 
…XIVSlothCombo
  • Loading branch information
@Taurenkey
Taurenkey committed Jul 31, 2024
2 parents 6f5a010 + 3fcb180 commit 41f7996
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions XIVSlothCombo/Combos/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2315,7 +2315,7 @@ public enum CustomComboPreset
PLD_ST_AdvancedMode_SpiritsWithin = 11006,

[ParentCombo(PLD_ST_AdvancedMode)]
[CustomComboInfo("Sheltron Option", "Adds Sheltron to Advanced Mode.\n- Uses only while in combat.\n- Will not interrupt burst phase.\n- Required HP & gauge thresholds:", PLD.JobID, 3)]
[CustomComboInfo("Sheltron Option", "Adds Sheltron to Advanced Mode.\n- Uses only when taking damage.\n- Will not interrupt burst phase.\n- Required gauge threshold:", PLD.JobID, 3)]
PLD_ST_AdvancedMode_Sheltron = 11007,

[ParentCombo(PLD_ST_AdvancedMode)]
Expand Down Expand Up @@ -2394,7 +2394,7 @@ public enum CustomComboPreset
PLD_AoE_AdvancedMode_BladeOfHonor = 11034,

[ParentCombo(PLD_AoE_AdvancedMode)]
[CustomComboInfo("Sheltron Option", "Adds Sheltron to Advanced Mode.\n- Uses only while in combat.\n- Will not interrupt burst phase.\n- Required HP & gauge thresholds:", PLD.JobID, 3)]
[CustomComboInfo("Sheltron Option", "Adds Sheltron to Advanced Mode.\n- Uses only when taking damage.\n- Will not interrupt burst phase.\n- Required gauge threshold:", PLD.JobID, 3)]
PLD_AoE_AdvancedMode_Sheltron = 11023,

[ParentCombo(PLD_AoE_AdvancedMode)]
Expand Down
16 changes: 8 additions & 8 deletions XIVSlothCombo/Combos/PvE/PLD.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ public const ushort
public static class Config
{
public static UserInt
PLD_ST_FoF_Option = new("PLD_ST_FoF_Option", 50),
PLD_AoE_FoF_Option = new("PLD_AoE_FoF_Option", 50),
PLD_ST_FoF_Trigger = new("PLD_ST_FoF_Trigger", 0),
PLD_AoE_FoF_Trigger = new("PLD_AoE_FoF_Trigger", 0),
PLD_Intervene_HoldCharges = new("PLDKeepInterveneCharges", 1),
PLD_VariantCure = new("PLD_VariantCure"),
PLD_RequiescatOption = new("PLD_RequiescatOption"),
PLD_SpiritsWithinOption = new("PLD_SpiritsWithinOption"),
PLD_ST_SheltronOption = new("PLD_ST_SheltronOption", 50),
PLD_AoE_SheltronOption = new("PLD_AoE_SheltronOption", 50),
PLD_ST_SheltronHP = new("PLD_ST_SheltronHP", 70),
PLD_AoE_SheltronHP = new("PLD_AoE_SheltronHP", 70),
//PLD_ST_SheltronHP = new("PLD_ST_SheltronHP", 70),
//PLD_AoE_SheltronHP = new("PLD_AoE_SheltronHP", 70),
//PLD_ST_RequiescatWeave = new("PLD_ST_RequiescatWeave"),
//PLD_AoE_RequiescatWeave = new("PLD_AoE_RequiescatWeave"),
//PLD_ST_AtonementTiming = new("PLD_ST_EquilibriumTiming"),
Expand Down Expand Up @@ -442,7 +442,7 @@ protected override uint Invoke(uint actionID, uint lastComboActionID, float comb
if (CanWeave(actionID) && InMeleeRange())
{
// Fight or Flight
if (IsEnabled(CustomComboPreset.PLD_ST_AdvancedMode_FoF) && ActionReady(FightOrFlight) && GetTargetHPPercent() >= Config.PLD_ST_FoF_Option)
if (IsEnabled(CustomComboPreset.PLD_ST_AdvancedMode_FoF) && ActionReady(FightOrFlight) && GetTargetHPPercent() >= Config.PLD_ST_FoF_Trigger)
{
if (!LevelChecked(Requiescat))
{
Expand Down Expand Up @@ -477,7 +477,7 @@ protected override uint Invoke(uint actionID, uint lastComboActionID, float comb
// Sheltron Overcap Protection
if (IsEnabled(CustomComboPreset.PLD_ST_AdvancedMode_Sheltron) && InCombat() && CanWeave(actionID) &&
LevelChecked(Sheltron) && !HasEffect(Buffs.Sheltron) && !HasEffect(Buffs.HolySheltron) &&
Gauge.OathGauge >= Config.PLD_ST_SheltronOption && PlayerHealthPercentageHp() <= Config.PLD_ST_SheltronHP)
Gauge.OathGauge >= Config.PLD_ST_SheltronOption && PlayerHealthPercentageHp() < 100)
return OriginalHook(Sheltron);

// Holy Spirit Prioritization
Expand Down Expand Up @@ -597,7 +597,7 @@ protected override uint Invoke(uint actionID, uint lastComboActionID, float comb
if (CanWeave(actionID) && InMeleeRange())
{
// Fight or Flight
if (ActionReady(FightOrFlight) && IsEnabled(CustomComboPreset.PLD_AoE_AdvancedMode_FoF) && GetTargetHPPercent() >= Config.PLD_AoE_FoF_Option &&
if (ActionReady(FightOrFlight) && IsEnabled(CustomComboPreset.PLD_AoE_AdvancedMode_FoF) && GetTargetHPPercent() >= Config.PLD_AoE_FoF_Trigger &&
((GetCooldownRemainingTime(Requiescat) < 0.5f && CanWeave(actionID, 1.5f)) || !LevelChecked(Requiescat)))
return FightOrFlight;

Expand All @@ -614,7 +614,7 @@ protected override uint Invoke(uint actionID, uint lastComboActionID, float comb
// Sheltron Overcap Protection
if (IsEnabled(CustomComboPreset.PLD_AoE_AdvancedMode_Sheltron) && InCombat() && CanWeave(actionID) &&
LevelChecked(Sheltron) && !HasEffect(Buffs.Sheltron) && !HasEffect(Buffs.HolySheltron) &&
Gauge.OathGauge >= Config.PLD_AoE_SheltronOption && PlayerHealthPercentageHp() <= Config.PLD_AoE_SheltronHP)
Gauge.OathGauge >= Config.PLD_AoE_SheltronOption && PlayerHealthPercentageHp() < 100)
return OriginalHook(Sheltron);
}

Expand Down
12 changes: 6 additions & 6 deletions XIVSlothCombo/Window/Functions/UserConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1774,19 +1774,19 @@ internal static void Draw(CustomComboPreset preset, bool enabled)
}

if (preset == CustomComboPreset.PLD_ST_AdvancedMode_FoF)
UserConfig.DrawSliderInt(0, 100, PLD.Config.PLD_ST_FoF_Option, "Target HP%", 200);
UserConfig.DrawSliderInt(0, 50, PLD.Config.PLD_ST_FoF_Trigger, "Target HP%", 200);

if (preset == CustomComboPreset.PLD_AoE_AdvancedMode_FoF)
UserConfig.DrawSliderInt(0, 100, PLD.Config.PLD_AoE_FoF_Option, "Target HP%", 200);
UserConfig.DrawSliderInt(0, 50, PLD.Config.PLD_AoE_FoF_Trigger, "Target HP%", 200);

if (preset == CustomComboPreset.PLD_ST_AdvancedMode_Sheltron)
UserConfig.DrawSliderInt(0, 100, PLD.Config.PLD_ST_SheltronHP, "Player HP%", 200);
//if (preset == CustomComboPreset.PLD_ST_AdvancedMode_Sheltron)
// UserConfig.DrawSliderInt(0, 100, PLD.Config.PLD_ST_SheltronHP, "Player HP%", 200);

if (preset == CustomComboPreset.PLD_ST_AdvancedMode_Sheltron)
UserConfig.DrawSliderInt(50, 100, PLD.Config.PLD_ST_SheltronOption, "Oath Gauge", 200, 5);

if (preset == CustomComboPreset.PLD_AoE_AdvancedMode_Sheltron)
UserConfig.DrawSliderInt(0, 100, PLD.Config.PLD_AoE_SheltronHP, "Player HP%", 200);
//if (preset == CustomComboPreset.PLD_AoE_AdvancedMode_Sheltron)
// UserConfig.DrawSliderInt(0, 100, PLD.Config.PLD_AoE_SheltronHP, "Player HP%", 200);

if (preset == CustomComboPreset.PLD_AoE_AdvancedMode_Sheltron)
UserConfig.DrawSliderInt(50, 100, PLD.Config.PLD_AoE_SheltronOption, "Oath Gauge", 200, 5);
Expand Down

0 comments on commit 41f7996

Please sign in to comment.