From 4dfc98ec0e1cd1922220b8f71aa055ee5de648d2 Mon Sep 17 00:00:00 2001 From: x Date: Fri, 5 Jul 2024 10:47:25 +0800 Subject: [PATCH] update GNB --- XIVSlothComboX/Combos/PvE/GNB.cs | 43 +++++++++++++++++------------ XIVSlothComboX/Window/Tabs/Debug.cs | 17 ++++++------ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/XIVSlothComboX/Combos/PvE/GNB.cs b/XIVSlothComboX/Combos/PvE/GNB.cs index a5a18bc19..151670a79 100644 --- a/XIVSlothComboX/Combos/PvE/GNB.cs +++ b/XIVSlothComboX/Combos/PvE/GNB.cs @@ -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 { @@ -58,6 +58,8 @@ public static class Buffs ReadyToRip = 1842, ReadyToTear = 1843, ReadyToGouge = 1844, + //音速破 + ReadyToBreak = 3886, ReadyToBlast = 2686, ReadyToReign = 3840, ReadyToRaze = 3839; @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/XIVSlothComboX/Window/Tabs/Debug.cs b/XIVSlothComboX/Window/Tabs/Debug.cs index 7091b03e2..319373bc3 100644 --- a/XIVSlothComboX/Window/Tabs/Debug.cs +++ b/XIVSlothComboX/Window/Tabs/Debug.cs @@ -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() @@ -227,10 +228,10 @@ internal class DebugCombo : CustomCombo // ImGui.TextUnformatted($"1-{CustomComboFunctions.GetJobGauge().DrawnCard}"); // ImGui.TextUnformatted($"2-{CustomComboFunctions.GetJobGauge().DrawnCrownCard}"); - ImGui.TextUnformatted($"1-{CustomComboFunctions.GetCooldownRemainingTime(DRK.LivingShadow)}"); - ImGui.TextUnformatted($"2-{CustomComboFunctions.GetRemainingCharges(DRK.Shadowbringer暗影使者)}"); - ImGui.TextUnformatted($"3-{CustomComboFunctions.GetJobGauge().ShadowTimeRemaining}"); - ImGui.TextUnformatted($"4-{CustomComboFunctions.GetJobGauge().DarksideTimeRemaining}"); + // ImGui.TextUnformatted($"1-{CustomComboFunctions.GetCooldownRemainingTime(DRK.LivingShadow)}"); + // ImGui.TextUnformatted($"2-{CustomComboFunctions.GetRemainingCharges(DRK.Shadowbringer暗影使者)}"); + // ImGui.TextUnformatted($"3-{CustomComboFunctions.GetJobGauge().ShadowTimeRemaining}"); + // ImGui.TextUnformatted($"4-{CustomComboFunctions.GetJobGauge().DarksideTimeRemaining}"); //骑士 end } }