Skip to content

Commit

Permalink
update GNB
Browse files Browse the repository at this point in the history
  • Loading branch information
@xhabit
xhabit committed Jul 5, 2024
1 parent 851bf84 commit 4dfc98e
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 26 deletions.
43 changes: 25 additions & 18 deletions XIVSlothComboX/Combos/PvE/GNB.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ internal static class GNB
超高速Hypervelocity = 25759,
粗分斩RoughDivide = 16154,
闪雷弹LightningShot = 16143,
师心连1FatedBrand = 39636,
师心连2ReignOfBeasts = 39637,
师心连3NobleBlood = 39638;
师心连1FatedBrand = 36937,
师心连2ReignOfBeasts = 36938,
师心连3NobleBlood = 36939;

public static class Buffs
{
Expand All @@ -58,6 +58,8 @@ public static class Buffs
ReadyToRip = 1842,
ReadyToTear = 1843,
ReadyToGouge = 1844,
//音速破
ReadyToBreak = 3886,
ReadyToBlast = 2686,
ReadyToReign = 3840,
ReadyToRaze = 3839;
Expand Down Expand Up @@ -422,7 +424,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}


if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
{
return 音速破SonicBreak;
}
Expand Down Expand Up @@ -451,7 +453,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(血壤Bloodfest);
}

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
{
return 音速破SonicBreak;
}
Expand All @@ -478,7 +480,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return 倍攻DoubleDown;
}

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
{
return 音速破SonicBreak;
}
Expand Down Expand Up @@ -507,7 +509,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(烈牙GnashingFang);
}

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
{
return 音速破SonicBreak;
}
Expand Down Expand Up @@ -535,7 +537,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(烈牙GnashingFang);
}

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
{
return 音速破SonicBreak;
}
Expand Down Expand Up @@ -564,7 +566,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}


if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
{
return 音速破SonicBreak;
}
Expand All @@ -582,7 +584,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return 倍攻DoubleDown;
}

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
{
return 音速破SonicBreak;
}
Expand Down Expand Up @@ -822,8 +824,13 @@ private static bool 使用师心连(uint lastComboMove)
{
return true;
}

// if (CustomComboFunctions.LevelChecked(师心连1FatedBrand) && CustomComboFunctions.HasEffect(Buffs.ReadyToRaze))
// {
// return true;
// }

if (lastComboMove is 师心连1FatedBrand or 师心连2ReignOfBeasts)
if (ActionWatching.LastWeaponskill is 师心连1FatedBrand or 师心连2ReignOfBeasts)
{
return true;
}
Expand Down Expand Up @@ -947,7 +954,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(血壤Bloodfest);
}

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
{
return 音速破SonicBreak;
}
Expand All @@ -970,7 +977,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return 倍攻DoubleDown;


if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
return 音速破SonicBreak;


Expand All @@ -994,7 +1001,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return 倍攻DoubleDown;


if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
return 音速破SonicBreak;

break;
Expand All @@ -1015,7 +1022,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (子弹连_使用子弹连(gauge, level, lastComboMove))
return OriginalHook(烈牙GnashingFang);

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
return 音速破SonicBreak;


Expand All @@ -1038,7 +1045,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(烈牙GnashingFang);


if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
return 音速破SonicBreak;

break;
Expand All @@ -1060,7 +1067,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(血壤Bloodfest);
}

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
return 音速破SonicBreak;

break;
Expand All @@ -1080,7 +1087,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return OriginalHook(血壤Bloodfest);
}

if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak))
if (IsEnabled(CustomComboPreset.GNB_ST_SonicBreak) && ActionReady(音速破SonicBreak) && HasEffect(Buffs.ReadyToBreak))
return 音速破SonicBreak;


Expand Down
17 changes: 9 additions & 8 deletions XIVSlothComboX/Window/Tabs/Debug.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,18 @@ internal class DebugCombo : CustomCombo
ImGui.TextUnformatted($"LAST WEAPONSKILL: {ActionWatching.GetActionName(ActionWatching.LastWeaponskill)}");
ImGui.TextUnformatted($"LAST SPELL: {ActionWatching.GetActionName(ActionWatching.LastSpell)}");
ImGui.TextUnformatted($"LAST ABILITY: {ActionWatching.GetActionName(ActionWatching.LastAbility)}");
ImGui.TextUnformatted($"ComboAction: {CustomComboFunctions.ComboAction}");
ImGui.TextUnformatted($"ZONE: {Service.ClientState.TerritoryType}");
ImGui.TextUnformatted($"战斗时间 : {CustomComboFunctions.CombatEngageDuration().TotalSeconds}");

ImGui.TextUnformatted($"倒计时 : {Countdown.TimeRemaining()} ");
{
uint itemId = 4551;
ImGui.TextUnformatted($"恢复药数量 : {InventoryManager.Instance()->GetInventoryItemCount(itemId, true)}");
ImGui.TextUnformatted($"恢复药状态 : {ActionManager.Instance()->GetActionStatus(ActionType.Item,itemId+ 1000000)}");
// uint itemId = 4551;
// ImGui.TextUnformatted($"恢复药数量 : {InventoryManager.Instance()->GetInventoryItemCount(itemId, true)}");
// ImGui.TextUnformatted($"恢复药状态 : {ActionManager.Instance()->GetActionStatus(ActionType.Item,itemId+ 1000000)}");


ImGui.TextUnformatted($"TimelineList.Count : {ActionWatching.TimelineList.Count}");
// ImGui.TextUnformatted($"TimelineList.Count : {ActionWatching.TimelineList.Count}");


// ActionManager.Instance()->UseActionLocation()
Expand Down Expand Up @@ -227,10 +228,10 @@ internal class DebugCombo : CustomCombo
// ImGui.TextUnformatted($"1-{CustomComboFunctions.GetJobGauge<ASTGauge>().DrawnCard}");
// ImGui.TextUnformatted($"2-{CustomComboFunctions.GetJobGauge<ASTGauge>().DrawnCrownCard}");

ImGui.TextUnformatted($"1-{CustomComboFunctions.GetCooldownRemainingTime(DRK.LivingShadow)}");
ImGui.TextUnformatted($"2-{CustomComboFunctions.GetRemainingCharges(DRK.Shadowbringer暗影使者)}");
ImGui.TextUnformatted($"3-{CustomComboFunctions.GetJobGauge<DRKGauge>().ShadowTimeRemaining}");
ImGui.TextUnformatted($"4-{CustomComboFunctions.GetJobGauge<DRKGauge>().DarksideTimeRemaining}");
// ImGui.TextUnformatted($"1-{CustomComboFunctions.GetCooldownRemainingTime(DRK.LivingShadow)}");
// ImGui.TextUnformatted($"2-{CustomComboFunctions.GetRemainingCharges(DRK.Shadowbringer暗影使者)}");
// ImGui.TextUnformatted($"3-{CustomComboFunctions.GetJobGauge<DRKGauge>().ShadowTimeRemaining}");
// ImGui.TextUnformatted($"4-{CustomComboFunctions.GetJobGauge<DRKGauge>().DarksideTimeRemaining}");
//骑士 end
}
}
Expand Down

0 comments on commit 4dfc98e

Please sign in to comment.