Skip to content

Commit

Permalink
Add DNC weaving into Devilment after Flourish
Browse files Browse the repository at this point in the history
  • Loading branch information
PrincessRTFM committed Sep 20, 2023
1 parent 001ee80 commit dd0e20e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
6 changes: 6 additions & 0 deletions XIVComboVX/Combos/DNC.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public const byte
Bloodshower = 45,
FanDance2 = 50,
CuringWaltz = 52,
Devilment = 62,
FanDance3 = 66,
TechnicalStep = 70,
Flourish = 72,
Expand Down Expand Up @@ -206,6 +207,11 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}
}

if (IsEnabled(CustomComboPreset.DancerSingleTargetDevilmentWeave) && level >= DNC.Levels.Devilment) {
if (CanUse(DNC.Devilment))
return DNC.Devilment;
}

}

if (IsEnabled(CustomComboPreset.DancerSingleTargetStarfall) && level >= DNC.Levels.StarfallDance) {
Expand Down
4 changes: 4 additions & 0 deletions XIVComboVX/CustomComboPreset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ public enum CustomComboPreset {
[CustomComboInfo("Flourish Weaving", "Also change into Flourish when you can weave without clipping AND have none of the effects Flourish grants.", DNC.JobID)]
DancerSingleTargetFlourishWeave = 3817,

[ParentPreset(DancerSingleTargetMultibutton)]
[CustomComboInfo("Devilment Weaving", "Also change into Devilment when you can weave without clipping and Devilment is off cooldown.", DNC.JobID)]
DancerSingleTargetDevilmentWeave = 3823,

[ParentPreset(DancerSingleTargetMultibutton)]
[CustomComboInfo("Fan Dance 1/3 Weaving", "Also change into Fan Dance 1/3 when you can weave without clipping.", DNC.JobID)]
DancerSingleTargetFanDanceWeave = 3810,
Expand Down
2 changes: 1 addition & 1 deletion XIVComboVX/XIVComboVX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Product>XIVComboVX</Product>
<Authors>attick, daemitus, VariableVixen</Authors>
<Version>9.9.1</Version>
<Version>9.10.0</Version>
<Description>This plugin condenses various abilities onto single buttons.</Description>
<PackageProjectUrl>https://github.com/PrincessRTFM/XIVComboPlugin</PackageProjectUrl>
<Copyright>Copyleft attick 2020 baybeeee</Copyright>
Expand Down

0 comments on commit dd0e20e

Please sign in to comment.