Chaotic Glide added [PUSH]

Grammernatzi · Aug 8, 2024 · 35a9a82 · 35a9a82
1 parent 3cd3218
commit 35a9a82
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/XIVComboExpanded/Combos/DRG.cs b/XIVComboExpanded/Combos/DRG.cs
@@ -1,5 +1,6 @@
 using Dalamud.Game.ClientState.JobGauge.Enums;
 using Dalamud.Game.ClientState.JobGauge.Types;
+using System.Linq;
 
 namespace XIVComboExpandedestPlugin.Combos
 {
@@ -13,6 +14,7 @@ public const uint
             TrueThrust = 75,
             VorpalThrust = 78,
             Disembowel = 87,
+            SpiralBlow = 36955,
             FullThrust = 84,
             ChaosThrust = 88,
             HeavensThrust = 25771,
@@ -22,6 +24,7 @@ public const uint
             Drakesbane = 36952,
             RaidenThrust = 16479,
             PiercingTalon = 90,
+            WingedGlide = 36951,
             // AoE
             DoomSpike = 86,
             SonicThrust = 7397,
@@ -77,6 +80,21 @@ public const byte
         }
     }
 
+    internal class DragoonChaoticGlideFeature : CustomCombo
+    {
+        protected override CustomComboPreset Preset => CustomComboPreset.DragoonChaoticGlideFeature;
+
+        protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
+        {
+            if (new[] { DRG.Disembowel, DRG.SpiralBlow, DRG.ChaosThrust, DRG.ChaoticSpring }.Contains(actionID) && !InMeleeRange() && CanUseAction(DRG.WingedGlide))
+            {
+                return DRG.WingedGlide;
+            }
+
+            return actionID;
+        }
+    }
+
     internal class DragoonCoerthanTormentCombo : CustomCombo
     {
         protected override CustomComboPreset Preset => CustomComboPreset.DragoonCoerthanTormentCombo;

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -367,7 +367,7 @@ public enum CustomComboPreset
         // ====================================================================================
         #region DRAGOON
 
-        // latest enum: 2219
+        // latest enum: 2220
 
         [OrderedEnum]
         [CustomComboInfo("Heavens' Thrust Combo", "Replace Heavens'/Full Thrust with its combo chain.", DRG.JobID, DRG.FullThrust, DRG.HeavensThrust)]
@@ -393,9 +393,13 @@ public enum CustomComboPreset
         DragoonChaosThrustComboOption = 2209,
 
         [OrderedEnum]
-        [CustomComboInfo("Heavens' Thrust to Chaotic Spring", "Heavens'/Full Thrust becomes Chaotic Spring/Chaos Thrust after using Spiral Blow/Disembowel. Works even with combos on.", DRG.JobID, DRG.FullThrust, DRG.HeavensThrust)]
+        [CustomComboInfo("Heavens' Thrust to Chaotic Spring", "Heavens'/Full Thrust becomes Chaotic Spring/Chaos Thrust after using Spiral Blow/Disembowel.\nWith combos, the Heavens' Thrust combo becomes the Chaotic Spring combo.", DRG.JobID, DRG.FullThrust, DRG.HeavensThrust)]
         DragoonFullChaosFeature = 2215,
 
+        [OrderedEnum]
+        [CustomComboInfo("Chaotic Glide", "Spiral Blow/Disembowel and Chaotic Spring/Chaos Thrust (plus their combos) become Winged Glide when out of melee range.", DRG.JobID, DRG.Disembowel, DRG.SpiralBlow, DRG.ChaosThrust, DRG.ChaoticSpring)]
+        DragoonChaoticGlideFeature = 2220,
+
         [OrderedEnum]
         [CustomComboInfo("True/Raiden Thrust to Wyrmwind", "Replace True/Raiden Thrust with Wyrmwind Thrust when available.", DRG.JobID, DRG.FullThrust, DRG.ChaosThrust, DRG.TrueThrust)]
         DragoonRaidenWyrmwindFeature = 2213,

diff --git a/XIVComboExpanded/XIVComboExpanded.csproj b/XIVComboExpanded/XIVComboExpanded.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors>attick, daemitus, alymphocyte, grammernatzi</Authors>
     <Company>-</Company>
-    <Version>1.5.0.50</Version>
+    <Version>1.5.0.51</Version>
     <Description>This plugin condenses combos and mutually exclusive abilities onto a single button.</Description>
     <Copyright>Copyaaaaaaaaaaaa</Copyright>
     <PackageProjectUrl>https://github.com/grammernatzi/XIVComboPluginExpandedest</PackageProjectUrl>

diff --git a/XIVComboExpanded/XIVComboExpandedest.json b/XIVComboExpanded/XIVComboExpandedest.json
@@ -6,7 +6,10 @@
   "RepoUrl": "https://github.com/Grammernatzi/XIVComboPluginExpandedest",
   "IconUrl": "https://raw.githubusercontent.com/grammernatzi/XIVComboPluginExpandedest/master/res/icon.png",
   "ImageUrls": [],
-  "Changelog": "1.5.0.49:
+  "Changelog": "1.5.0.51:
+    * Chaotic Glide added.
+
+    1.5.0.49:
     * Standard Step into Technical Step added.
 
     1.5.0.41: