Skip to content

Commit

Permalink
3.0.18.53
Browse files Browse the repository at this point in the history 
机工优化：更科学的使用整备
  • Loading branch information
@xhabit
xhabit committed Dec 24, 2023
1 parent 10881f0 commit 2e1c7d0
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 22 deletions.
10 changes: 9 additions & 1 deletion XIVSlothComboX/Combos/JobHelpers/MCH.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ public bool DoFullOpener(ref uint actionID, bool simpleMode)
{
if (!LevelChecked) return false;

var 使用过的技能集合 = 技能过滤(ActionWatching.特殊起手Actions);
if (currentState == OpenerState.PrePull && !CanOpener && 使用过的技能集合.Count == 0)
{
currentState = OpenerState.FailedOpener;
return false;
}


if (currentState != OpenerState.PrePull)
{
if (CanOpener && !CustomComboFunctions.InCombat() && (DateTime.Now - lastCheck).TotalSeconds > 5)
Expand Down Expand Up @@ -71,7 +79,7 @@ public bool DoFullOpener(ref uint actionID, bool simpleMode)
if (CustomComboFunctions.InCombat())
{

var 使用过的技能集合 = 技能过滤(ActionWatching.特殊起手Actions);


if (下一个使用的技能(ref actionID))
{
Expand Down
64 changes: 48 additions & 16 deletions XIVSlothComboX/Combos/PvE/MCH.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,27 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (IsEnabled(CustomComboPreset.MCH_ST_Adv_Interrupt) && interruptReady)
return All.伤头HeadGraze;



//这里一般是爆发药 加入
if (IsEnabled(CustomComboPreset.MCH_ST_Adv_Reassembled)
&& !gauge.IsOverheated
&& gauge.Heat >= 50
&& !WasLastAction(热冲击HeatBlast)
&& GetCooldownRemainingTime(回转飞锯ChainSaw) <= 2.13f
&& GetCooldownRemainingTime(野火Wildfire) <= 1.1f
&& CanSpellWeavePlus(actionID)
&& GetCooldownRemainingTime(MCH.弹射Ricochet) >= 5
&& GetCooldownRemainingTime(MCH.虹吸弹GaussRound) >= 5
&& !HasEffect(Buffs.整备Reassembled)
&& !HasEffect(Buffs.野火Wildfire)
&& HasCharges(整备Reassemble)
&& 整备Reassemble.ActionReady())
{
return 整备Reassemble;
}


// Wildfire
if (IsEnabled(CustomComboPreset.MCH_ST_Adv_WildFire))
{
Expand All @@ -374,6 +395,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return 野火Wildfire;
}







if (GetCooldownRemainingTime(回转飞锯ChainSaw) < 1.5f
&& GetCooldownRemainingTime(空气锚AirAnchor) > 8
&& GetCooldownRemainingTime(钻头Drill) > 8
Expand Down Expand Up @@ -564,35 +591,40 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

// TOOLS!! ChainSaw Drill Air Anchor
if (IsEnabled(CustomComboPreset.MCH_ST_Adv_Reassembled)
&& wildfireCDTime > 20
&& !gauge.IsOverheated
&& CanSpellWeavePlus(狙击弹CleanShot)
&& !HasEffect(Buffs.野火Wildfire)
&& wildfireCDTime > 60
&& wildfireCDTime > GetCooldownRemainingTime(整备Reassemble)
&& GetCooldownRemainingTime(MCH.弹射Ricochet) >= 5
&& GetCooldownRemainingTime(MCH.虹吸弹GaussRound) >= 5
&& CanSpellWeavePlus(actionID)
&& !HasEffect(Buffs.整备Reassembled)
&& HasCharges(整备Reassemble)
&& (OriginalHook(热弹HotShot).GCDActionReady(狙击弹CleanShot)
|| 钻头Drill.GCDActionReady(狙击弹CleanShot)
|| 回转飞锯ChainSaw.GCDActionReady(狙击弹CleanShot)))
{
return 整备Reassemble;
}

if (HasEffect(RaidBuff.强化药))
{
return 整备Reassemble;
}

if (IsEnabled(CustomComboPreset.MCH_ST_Adv_Reassembled)
&& HasEffect(RaidBuff.强化药)
&& CanSpellWeavePlus(狙击弹CleanShot)
&& !HasEffect(Buffs.野火Wildfire)
&& !HasEffect(Buffs.整备Reassembled)
&& HasCharges(整备Reassemble)
&& (OriginalHook(热弹HotShot).GCDActionReady(狙击弹CleanShot)
|| 钻头Drill.GCDActionReady(狙击弹CleanShot)
|| 回转飞锯ChainSaw.GCDActionReady(狙击弹CleanShot)))
{
return 整备Reassemble;
if (!HasEffect(Buffs.野火Wildfire))
{
return 整备Reassemble;
}

if (HasEffect(Buffs.野火Wildfire) && FindEffect(Buffs.野火Wildfire)?.RemainingTime < 2f)
{
return 整备Reassemble;
}
}






if (IsEnabled(CustomComboPreset.MCH_ST_Adv_GaussRicochet) && LevelChecked(热冲击HeatBlast))
{
if (CanSpellWeavePlus(actionID))
Expand Down
7 changes: 5 additions & 2 deletions XIVSlothComboX/Window/Tabs/Debug.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,11 @@ internal class DebugCombo : CustomCombo
// ImGui.TextUnformatted($"倒计时 : {Countdown.TimeRemaining()} HasPrePullCooldowns:{MCHOpenerLogic.HasPrePullCooldowns()} HasCooldowns:{MCHOpenerLogic.HasCooldowns()}");
// ImGui.TextUnformatted($"HasPrePullCooldowns:{MCHOpenerLogic.HasPrePullCooldowns()} HasCooldowns:{MCHOpenerLogic.HasCooldowns()}");
// ImGui.TextUnformatted($"倒计时 : {Countdown.TimeRemaining()} ");

ImGui.TextUnformatted($"整备Reassemble:{CustomComboFunctions.GetCooldownRemainingTime(MCH.整备Reassemble)}，野火:{CustomComboFunctions.GetCooldownRemainingTime(MCH.野火Wildfire)} ");
;
;
;
ImGui.TextUnformatted($"回转飞锯ChainSaw:{CustomComboFunctions.GetCooldownRemainingTime(MCH.回转飞锯ChainSaw)}，野火:{CustomComboFunctions.GetCooldownRemainingTime(MCH.野火Wildfire)}，整备Reassemble:{CustomComboFunctions.GetCooldownRemainingTime(MCH.整备Reassemble)} ");
ImGui.TextUnformatted($"{CustomComboFunctions.FindEffect(MCH.Buffs.野火Wildfire)?.RemainingTime}");
// ImGui.TextUnformatted($"虹吸弹GaussRound:{CustomComboFunctions.GetRemainingCharges(MCH.虹吸弹GaussRound)}，弹射Ricochet:{CustomComboFunctions.GetCooldownRemainingTime(MCH.弹射Ricochet)} ");

// ImGui.TextUnformatted($"GetRemainingCharges{CustomComboFunctions. GetRemainingCharges(MCH.虹吸弹GaussRound)} IsOffCooldown {CustomComboFunctions.IsOffCooldown(MCH.虹吸弹GaussRound)}");
Expand Down
1 change: 1 addition & 0 deletions XIVSlothComboX/XIVSlothComboX.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public XIVSlothComboX(DalamudPluginInterface pluginInterface)

autoToken = autoTokenSource.Token; // 开关绑

TestFeatures.function(null,null);
KillRedundantIDs();
}
private unsafe void OnFramework(Framework framework)
Expand Down
2 changes: 1 addition & 1 deletion XIVSlothComboX/XIVSlothComboX.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<Authors>Aki, k-kz, ele-starshade, damolitionn, Taurenkey, Augporto, grimgal, Genesis-Nova, Tartarga</Authors>
<Company>-</Company>
<Version>3.0.18.52</Version>
<Version>3.0.18.53</Version>
<!-- This is the version that will be used when pushing to the repo.-->
<Description>XIVCombo for lazy players</Description>
<Copyright>Copyleft attick 2021 thanks attick UwU</Copyright>
Expand Down
Binary file modified release/XIVSlothComboX/latest.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions release/pluginmaster.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"Punchline": "Condenses combos and mutually exclusive abilities onto a single button - and then some.",
"Description": "Condenses combos and mutually exclusive abilities onto a single button - and then some.",
"InternalName": "XIVSlothComboX",
"AssemblyVersion": "3.0.18.52",
"Changelog": "机工优化：野火会在回转飞转快好的时候用，野火快好的时候整备延后,三大件延后的问题",
"AssemblyVersion": "3.0.18.53",
"Changelog": "机工优化：更科学的使用整备",
"RepoUrl": "https://github.com/44451516/XIVSlothCombo/",
"ApplicableVersion": "any",
"DalamudApiLevel": 8,
Expand Down

0 comments on commit 2e1c7d0

Please sign in to comment.