Skip to content

Commit

Permalink
3.0.19.11 -> update DNC
Browse files Browse the repository at this point in the history
  • Loading branch information
@xhabit
xhabit committed Apr 12, 2024
1 parent 3db785f commit 294f871
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 11 deletions.
13 changes: 13 additions & 0 deletions XIVSlothComboX/Combos/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,19 @@ public enum CustomComboPreset
[CustomComboInfo("Simple AoE Improvisation Option", "Includes Improvisation in the AoE rotation when available.", DNC.JobID, 10, "", "")]
DNC_AoE_Simple_Improvisation = 4080,




[Variant]
[VariantParent(DNC_ST_SimpleMode, DNC_AoE_SimpleMode)]
[CustomComboInfo("铁壁 选项", "冷却结束时使用多变铁壁", DNC.JobID)]
DNC_Variant_Rampart = 4085,

[Variant]
[VariantParent(DNC_DT_SimpleMode, DNC_AoE_SimpleMode)]
[CustomComboInfo("治疗 选项", "在下水道使用治疗当HP低于某个值", DNC.JobID)]
DNC_Variant_Cure = 4086,

#endregion

#endregion
Expand Down
29 changes: 29 additions & 0 deletions XIVSlothComboX/Combos/PvE/DNC.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using Dalamud.Game.ClientState.JobGauge.Types;
using XIVSlothComboX.Combos.JobHelpers;
using XIVSlothComboX.Combos.PvE.Content;
using XIVSlothComboX.Core;
using XIVSlothComboX.CustomComboNS;
using XIVSlothComboX.CustomComboNS.Functions;
using XIVSlothComboX.Extensions;
using XIVSlothComboX.Services;

Expand Down Expand Up @@ -88,6 +90,9 @@ public static class Debuffs

public static class Config
{

public static UserInt DNC_VariantCure = new("DNC_VariantCure");

public const string DNCEspritThreshold_ST = "DNCEspritThreshold_ST"; // Single target Esprit threshold
public const string DNCEspritThreshold_AoE = "DNCEspritThreshold_AoE"; // AoE Esprit threshold

Expand Down Expand Up @@ -550,6 +555,18 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (actionID is 瀑泻Cascade)
{

if (IsEnabled(CustomComboPreset.DNC_Variant_Rampart)
&& IsEnabled(Variant.VariantCure)
&& PlayerHealthPercentageHp() <= Config.DNC_VariantCure)
return Variant.VariantCure;

if (IsEnabled(CustomComboPreset.DNC_Variant_Rampart)
&& IsEnabled(Variant.VariantRampart)
&& IsOffCooldown(Variant.VariantRampart)
&& CanWeave(actionID))
return Variant.VariantRampart;

#region Types

DNCGauge? gauge = GetJobGauge<DNCGauge>();
Expand Down Expand Up @@ -755,6 +772,18 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (actionID is 风车Windmill)
{

if (IsEnabled(CustomComboPreset.DNC_Variant_Rampart)
&& IsEnabled(Variant.VariantCure)
&& PlayerHealthPercentageHp() <= Config.DNC_VariantCure)
return Variant.VariantCure;

if (IsEnabled(CustomComboPreset.DNC_Variant_Rampart)
&& IsEnabled(Variant.VariantRampart)
&& IsOffCooldown(Variant.VariantRampart)
&& CanWeave(actionID))
return Variant.VariantRampart;

#region Types

DNCGauge? gauge = GetJobGauge<DNCGauge>();
Expand Down
20 changes: 12 additions & 8 deletions XIVSlothComboX/Combos/PvE/MCH.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ namespace XIVSlothComboX.Combos.PvE
internal class MCH
{
public const byte JobID = 31;
public static int MaxCartridges(byte level) => level >= 74 ? 2 : 1;

internal const uint 狙击弹CleanShot = 2873,
热狙击弹HeatedCleanShot = 7413,
Expand Down Expand Up @@ -378,7 +379,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
&& GetCooldownRemainingTime(MCH.虹吸弹GaussRound) >= 5
&& !HasEffect(Buffs.整备Reassembled)
&& !HasEffect(Buffs.野火Wildfire)
&& HasCharges(整备Reassemble)
&& 整备Reassemble.ActionReady())
{
return 整备Reassemble;
Expand Down Expand Up @@ -599,9 +599,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
&& CanSpellWeavePlus(actionID)
&& !HasEffect(Buffs.整备Reassembled)
&& HasCharges(整备Reassemble)
&& (OriginalHook(热弹HotShot).GCDActionReady(狙击弹CleanShot)
|| 钻头Drill.GCDActionReady(狙击弹CleanShot)
|| 回转飞锯ChainSaw.GCDActionReady(狙击弹CleanShot)))
&& 整备使用条件())
{

if (HasEffect(RaidBuff.强化药))
Expand Down Expand Up @@ -713,13 +711,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

}


if (IsEnabled(CustomComboPreset.MCH_ST_Adv_Reassembled)
&& !整备ReassembleV2.LevelChecked()
&& MaxCartridges(level) ==1
&& HasCharges(整备Reassemble))
{
if (OriginalHook(热弹HotShot).GCDActionReady(狙击弹CleanShot)
|| 钻头Drill.GCDActionReady(狙击弹CleanShot)
|| 回转飞锯ChainSaw.GCDActionReady(狙击弹CleanShot))
if (整备使用条件())
{
if (InCombat())
{
Expand Down Expand Up @@ -768,6 +765,13 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

return actionID;
}
private static bool 整备使用条件()
{

return OriginalHook(热弹HotShot).GCDActionReady(狙击弹CleanShot)
|| 钻头Drill.GCDActionReady(狙击弹CleanShot)
|| 回转飞锯ChainSaw.GCDActionReady(狙击弹CleanShot);
}


private float 三件套最小冷却Time()
Expand Down
4 changes: 4 additions & 0 deletions XIVSlothComboX/Window/Functions/UserConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1411,6 +1411,10 @@ internal static void Draw(CustomComboPreset preset, bool enabled)
if (preset == CustomComboPreset.DNCPvP_BurstMode_CuringWaltz)
UserConfig.DrawSliderInt(0, 90, DNCPvP.Config.DNCPvP_WaltzThreshold, "治疗之华尔兹 HP% - caps at 90 to prevent waste.", 150, SliderIncrements.Ones);


if (preset == CustomComboPreset.DNC_Variant_Cure)
UserConfig.DrawSliderInt(1, 100, DNC.Config.DNC_VariantCure, "存几层充能？（0 = 用光，一层不留）", 200);

#endregion

#endregion
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.19.10</Version>
<Version>3.0.19.11</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.19.10",
"Changelog": "Update MCH",
"AssemblyVersion": "3.0.19.11",
"Changelog": "Update DNC",
"RepoUrl": "https://github.com/44451516/XIVSlothCombo/",
"ApplicableVersion": "any",
"DalamudApiLevel": 9,
Expand Down

0 comments on commit 294f871

Please sign in to comment.