Skip to content

Commit

Permalink
[PUSH] v2.0.1.1
Browse files Browse the repository at this point in the history 
hoping stg works
  • Loading branch information
@MKhayle
MKhayle committed Nov 15, 2024
1 parent 1317c94 commit dddd5ba
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion XIVComboExpanded/Combos/ADV.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (actionID == ADV.HeadGraze && ((int)LocalPlayer?.ClassJob.RowId == BRD.ClassID || (int)LocalPlayer?.ClassJob.RowId == BRD.JobID || (int)LocalPlayer?.ClassJob.RowId == MCH.JobID || (int)LocalPlayer?.ClassJob.RowId == DNC.JobID))
{
if (!HasEffect(ADV.Buffs.Peloton) && !InCombat())
if (!HasEffect(ADV.Buffs.Peloton) && !InCombat() && CanUseAction(OriginalHook(ADV.Peloton)))
{
return ADV.Peloton;
}
Expand Down
8 changes: 4 additions & 4 deletions XIVComboExpanded/Combos/GNB.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,13 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (IsEnabled(CustomComboPreset.GunbreakerBurstStrikeCont))
{
if (level >= GNB.Levels.EnhancedContinuation && HasEffect(GNB.Buffs.ReadyToBlast))
if (level >= GNB.Levels.EnhancedContinuation && HasEffect(GNB.Buffs.ReadyToBlast) && CanUseAction(OriginalHook(GNB.Hypervelocity)))
return GNB.Hypervelocity;
}

if (IsEnabled(CustomComboPreset.GunbreakerBurstStrikeDangerZone))
{
if (level >= GNB.Levels.DangerZone && IsCooldownUsable(GNB.DangerZone))
if (level >= GNB.Levels.DangerZone && IsCooldownUsable(GNB.DangerZone) && CanUseAction(OriginalHook(GNB.DangerZone)))
return OriginalHook(GNB.DangerZone);
}

Expand Down Expand Up @@ -327,7 +327,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (level >= GNB.Levels.NoMercy && HasEffect(GNB.Buffs.NoMercy))
{
if (level >= GNB.Levels.DoubleDown && gauge.Ammo >= 2 && IsCooldownUsable(GNB.DoubleDown))
if (level >= GNB.Levels.DoubleDown && gauge.Ammo >= 1 && IsCooldownUsable(GNB.DoubleDown))
return GNB.DoubleDown;
}
}
Expand Down Expand Up @@ -423,7 +423,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (actionID == GNB.Trajectory)
{
if (level <= GNB.Levels.Trajectory)
if (level <= GNB.Levels.Trajectory || !CanUseAction(GNB.Trajectory))
return GNB.LightningShot;
}

Expand Down
10 changes: 5 additions & 5 deletions XIVComboExpanded/Combos/PCT.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

if (IsEnabled(CustomComboPreset.PictomancerAutoMogCombo))
{
if ((gauge.MooglePortraitReady || gauge.MadeenPortraitReady) && GetRemainingCharges(PCT.MogOftheAges) > 0)
if ((gauge.MooglePortraitReady || gauge.MadeenPortraitReady) && GetRemainingCharges(PCT.MogOftheAges) > 0 && CanUseAction(OriginalHook(PCT.MogOftheAges)))
{
return OriginalHook(PCT.MogOftheAges);
}
}

if (IsEnabled(CustomComboPreset.PictomancerSubtractiveAutoCombo) && !HasEffect(PCT.Buffs.SubstractivePalette))
if (IsEnabled(CustomComboPreset.PictomancerSubtractiveAutoCombo) && !HasEffect(PCT.Buffs.SubstractivePalette) && CanUseAction(OriginalHook(PCT.SubstractivePalette)))
{
if (IsEnabled(CustomComboPreset.PictomancerSubtractiveEarlyAutoCombo)
&& (gauge.PalleteGauge >= 50 || HasEffect(PCT.Buffs.SubstractivePaletteReady)))
Expand Down Expand Up @@ -215,7 +215,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

if (actionID == PCT.ExtraBlizzardCyan)
{
if (IsEnabled(CustomComboPreset.PictomancerSubtractiveAutoCombo) && !HasEffect(PCT.Buffs.SubstractivePalette))
if (IsEnabled(CustomComboPreset.PictomancerSubtractiveAutoCombo) && !HasEffect(PCT.Buffs.SubstractivePalette) && CanUseAction(OriginalHook(PCT.SubstractivePalette)))
{
if (IsEnabled(CustomComboPreset.PictomancerSubtractiveEarlyAutoCombo)
&& (gauge.PalleteGauge >= 50 || HasEffect(PCT.Buffs.SubstractivePaletteReady)))
Expand Down Expand Up @@ -259,7 +259,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
var gauge = GetJobGauge<PCTGauge>();
if (actionID == PCT.WaterBlue || actionID == PCT.ExtraWaterBlue)
{
if (HasEffect(PCT.Buffs.Chroma3Ready) && !HasEffect(PCT.Buffs.SubstractivePalette) && gauge.PalleteGauge == 100)
if (HasEffect(PCT.Buffs.Chroma3Ready) && !HasEffect(PCT.Buffs.SubstractivePalette) && gauge.PalleteGauge == 100 && CanUseAction(OriginalHook(PCT.SubstractivePalette)))
{
return PCT.SubstractivePalette;
}
Expand Down Expand Up @@ -300,7 +300,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

if (actionID == PCT.CreatureMotif)
{
if (IsEnabled(CustomComboPreset.PictomancerCreatureMogCombo))
if (IsEnabled(CustomComboPreset.PictomancerCreatureMogCombo) && CanUseAction(OriginalHook(PCT.MogOftheAges)))
{
if (gauge.MooglePortraitReady || gauge.MadeenPortraitReady)
{
Expand Down
11 changes: 6 additions & 5 deletions XIVComboExpanded/Combos/VPR.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public const byte
ReavingMaw = 35,
Slither = 40,
HuntersBite = 40,
SwiftskinsBike = 45,
SwiftskinsBite = 45,
AoE3rdCombo = 50, // Jagged Maw and Bloodied Maw
DeathRattle = 55,
LastLash = 60,
Expand Down Expand Up @@ -241,10 +241,10 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (IsEnabled(CustomComboPreset.ViperAutoSteelReavingFeature) &&
OriginalHook(VPR.SteelFangs) == VPR.SteelFangs)
{
if (HasEffect(VPR.Buffs.HonedReavers))
if (HasEffect(VPR.Buffs.HonedReavers) && level >= VPR.Levels.ReavingFangs)
return VPR.ReavingFangs;

if (HasEffect(VPR.Buffs.HonedSteel))
if (HasEffect(VPR.Buffs.HonedSteel) && level >= VPR.Levels.SteelFangs)
return VPR.SteelFangs;
}

Expand All @@ -260,7 +260,8 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
// Combo step 2, prioritize whichever buff we don't have. Starts with Swiftscaled since that speeds up the rotation significantly
case VPR.HuntersSting:
if (HasEffect(VPR.Buffs.FlanksbaneVenom) ||
HasEffect(VPR.Buffs.FlankstungVenom))
HasEffect(VPR.Buffs.FlankstungVenom) ||
level <= VPR.Levels.SwiftskinsSting)
return VPR.HuntersSting;
if (HasEffect(VPR.Buffs.HindsbaneVenom) ||
HasEffect(VPR.Buffs.HindstungVenom))
Expand Down Expand Up @@ -439,7 +440,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
case VPR.HuntersBite:
var swift = FindEffect(VPR.Buffs.Swiftscaled);
var instinct = FindEffect(VPR.Buffs.HuntersInstinct);
if (swift is null || swift?.RemainingTime <= instinct?.RemainingTime) // We'd always want to prioritize swift since it speeds up the rotation
if ((swift is null || swift?.RemainingTime <= instinct?.RemainingTime) && level >= VPR.Levels.SwiftskinsBite) // We'd always want to prioritize swift since it speeds up the rotation
return VPR.SwiftskinsBite;

return VPR.HuntersBite;
Expand Down
2 changes: 2 additions & 0 deletions XIVComboExpanded/Interface/Changelog.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ public static Dictionary<string, string[]> GetChangelog()
"Reworked SAM's Shoha features to prioritize it over Zanshin if both are available when replacing Shinten by @kaedys.",
"Reworked SGE's Sectioning by @kaedys.",
"Reworked DRG's Geirskogul to Wyrmwind Thrust feature to prioritize it over Nastrond, since the latter has effectively no cooldown during LotD.\n The priority for usage is now Geirskogal > Wyrmwind > Nastrond.",
"Added PCT checks to determine whether oGCDs can be used or not to prevent No Abilities in Deep Dungeons to lock you in unusable skills.",
"Added level check for NIN's Trick Attack in the Kassatsu Trick feature by @kaedys.",
"Added level check for RPR's Automatic Soul Slice/Scythe features by @kaedys.",
"Added level checks for VPR's PvP Main & AoE Style Combos.",
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion XIVComboExpanded/XIVComboExpanded.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Authors>attick, daemitus, Khayle</Authors>
<Company>-</Company>
<Version>2.0.1.0</Version>
<Version>2.0.1.1</Version>
<Description>This plugin condenses combos and mutually exclusive abilities onto a single button.</Description>
<Copyright>Copyleft attick 2020 baybeeee</Copyright>
<PackageProjectUrl>https://github.com/daemitus/XIVComboPlugin</PackageProjectUrl>
Expand Down

0 comments on commit dddd5ba

Please sign in to comment.