Merge pull request #466 from kaedys/feature/vpr-vice-ogcd-split

[FEATURE] VPR: Vice combo oGCD split
MKhayle · Nov 21, 2024 · e777534 · e777534
2 parents 5dc3f38 + 2a4ca7f
commit e777534
Show file tree

Hide file tree

Showing 2 changed files with 149 additions and 90 deletions.
diff --git a/XIVComboExpanded/Combos/VPR.cs b/XIVComboExpanded/Combos/VPR.cs
@@ -9,57 +9,57 @@ internal static class VPR
     public const byte JobID = 41;
 
     public const uint
-            SteelFangs = 34606,
-            ReavingFangs = 34607,
-            HuntersSting = 34608,
-            SwiftskinsSting = 34609,
-            FlankstingStrike = 34610,
-            FlanksbaneFang = 34611,
-            HindstingStrike = 34612,
-            HindsbaneFang = 34613,
-
-            SteelMaw = 34614,
-            ReavingMaw = 34615,
-            HuntersBite = 34616,
-            SwiftskinsBite = 34617,
-            JaggedMaw = 34618,
-            BloodiedMaw = 34619,
-
-            Vicewinder = 34620,
-            HuntersCoil = 34621,
-            SwiftskinsCoil = 34622,
-            VicePit = 34623,
-            HuntersDen = 34624,
-            SwiftskinsDen = 34625,
-
-            SerpentsTail = 35920,
-            DeathRattle = 34634,
-            LastLash = 34635,
-            Twinfang = 35921,
-            Twinblood = 35922,
-            TwinfangBite = 34636,
-            TwinfangThresh = 34638,
-            TwinbloodBite = 34637,
-            TwinbloodThresh = 34639,
-
-            UncoiledFury = 34633,
-            UncoiledTwinfang = 34644,
-            UncoiledTwinblood = 34645,
-
-            SerpentsIre = 34647,
-            Reawaken = 34626,
-            FirstGeneration = 34627,
-            SecondGeneration = 34628,
-            ThirdGeneration = 34629,
-            FourthGeneration = 34630,
-            Ouroboros = 34631,
-            FirstLegacy = 34640,
-            SecondLegacy = 34641,
-            ThirdLegacy = 34642,
-            FourthLegacy = 34643,
-
-            WrithingSnap = 34632,
-            Slither = 34646;
+        SteelFangs = 34606,
+        ReavingFangs = 34607,
+        HuntersSting = 34608,
+        SwiftskinsSting = 34609,
+        FlankstingStrike = 34610,
+        FlanksbaneFang = 34611,
+        HindstingStrike = 34612,
+        HindsbaneFang = 34613,
+
+        SteelMaw = 34614,
+        ReavingMaw = 34615,
+        HuntersBite = 34616,
+        SwiftskinsBite = 34617,
+        JaggedMaw = 34618,
+        BloodiedMaw = 34619,
+
+        Vicewinder = 34620,
+        HuntersCoil = 34621,
+        SwiftskinsCoil = 34622,
+        VicePit = 34623,
+        HuntersDen = 34624,
+        SwiftskinsDen = 34625,
+
+        SerpentsTail = 35920,
+        DeathRattle = 34634,
+        LastLash = 34635,
+        Twinfang = 35921,
+        Twinblood = 35922,
+        TwinfangBite = 34636,
+        TwinfangThresh = 34638,
+        TwinbloodBite = 34637,
+        TwinbloodThresh = 34639,
+
+        UncoiledFury = 34633,
+        UncoiledTwinfang = 34644,
+        UncoiledTwinblood = 34645,
+
+        SerpentsIre = 34647,
+        Reawaken = 34626,
+        FirstGeneration = 34627,
+        SecondGeneration = 34628,
+        ThirdGeneration = 34629,
+        FourthGeneration = 34630,
+        Ouroboros = 34631,
+        FirstLegacy = 34640,
+        SecondLegacy = 34641,
+        ThirdLegacy = 34642,
+        FourthLegacy = 34643,
+
+        WrithingSnap = 34632,
+        Slither = 34646;
 
     public static class Buffs
     {
@@ -186,17 +186,30 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
                 if (IsEnabled(CustomComboPreset.ViperTwinCoilFeature))
                 {
-                    if (HasEffect(VPR.Buffs.HuntersVenom) && CanUseAction(VPR.TwinfangBite))
-                        return VPR.TwinfangBite;
-
-                    if (HasEffect(VPR.Buffs.SwiftskinsVenom) && CanUseAction(VPR.TwinbloodBite))
-                        return VPR.TwinbloodBite;
-
-                    if (OriginalHook(VPR.Twinfang) == VPR.TwinfangBite && CanUseAction(VPR.TwinfangBite))
-                        return VPR.TwinfangBite;
-
-                    if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodBite && CanUseAction(VPR.TwinbloodBite))
-                        return VPR.TwinbloodBite;
+                    if (IsEnabled(CustomComboPreset.ViperTwinCoilSingularOption))
+                    {
+                        if (OriginalHook(VPR.Twinfang) == VPR.TwinfangBite && CanUseAction(VPR.TwinfangBite) &&
+                            actionID == VPR.SteelFangs)
+                            return VPR.TwinfangBite;
+
+                        if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodBite && CanUseAction(VPR.TwinbloodBite) &&
+                            actionID == VPR.ReavingFangs)
+                            return VPR.TwinbloodBite;
+                    }
+                    else
+                    {
+                        if (HasEffect(VPR.Buffs.HuntersVenom) && CanUseAction(VPR.TwinfangBite))
+                            return VPR.TwinfangBite;
+
+                        if (HasEffect(VPR.Buffs.SwiftskinsVenom) && CanUseAction(VPR.TwinbloodBite))
+                            return VPR.TwinbloodBite;
+
+                        if (OriginalHook(VPR.Twinfang) == VPR.TwinfangBite && CanUseAction(VPR.TwinfangBite))
+                            return VPR.TwinfangBite;
+
+                        if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodBite && CanUseAction(VPR.TwinbloodBite))
+                            return VPR.TwinbloodBite;
+                    }
                 }
 
                 if (gauge.AnguineTribute > 0)
@@ -373,17 +386,30 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
                 if (IsEnabled(CustomComboPreset.ViperTwinCoilFeature))
                 {
-                    if (HasEffect(VPR.Buffs.FellhuntersVenom) && level >= VPR.Levels.TwinsAoE && CanUseAction(VPR.TwinfangThresh))
-                        return VPR.TwinfangThresh;
-
-                    if (HasEffect(VPR.Buffs.FellskinsVenom) && level >= VPR.Levels.TwinsAoE && CanUseAction(VPR.TwinbloodThresh))
-                        return VPR.TwinbloodThresh;
-
-                    if (OriginalHook(VPR.Twinfang) == VPR.TwinfangThresh && CanUseAction(VPR.TwinfangThresh))
-                        return VPR.TwinfangThresh;
-
-                    if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodThresh && CanUseAction(VPR.TwinbloodThresh))
-                        return VPR.TwinbloodThresh;
+                    if (IsEnabled(CustomComboPreset.ViperTwinCoilSingularOption))
+                    {
+                        if (OriginalHook(VPR.Twinfang) == VPR.TwinfangThresh && CanUseAction(VPR.TwinfangThresh) &&
+                            actionID == VPR.SteelMaw)
+                            return VPR.TwinfangThresh;
+
+                        if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodThresh && CanUseAction(VPR.TwinbloodThresh) &&
+                            actionID == VPR.ReavingMaw)
+                            return VPR.TwinbloodThresh;
+                    }
+                    else
+                    {
+                        if (HasEffect(VPR.Buffs.FellhuntersVenom) && level >= VPR.Levels.TwinsAoE && CanUseAction(VPR.TwinfangThresh))
+                            return VPR.TwinfangThresh;
+
+                        if (HasEffect(VPR.Buffs.FellskinsVenom) && level >= VPR.Levels.TwinsAoE && CanUseAction(VPR.TwinbloodThresh))
+                            return VPR.TwinbloodThresh;
+
+                        if (OriginalHook(VPR.Twinfang) == VPR.TwinfangThresh && CanUseAction(VPR.TwinfangThresh))
+                            return VPR.TwinfangThresh;
+
+                        if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodThresh && CanUseAction(VPR.TwinbloodThresh))
+                            return VPR.TwinbloodThresh;
+                    }
                 }
 
                 if (gauge.AnguineTribute > 0)
@@ -484,17 +510,30 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.ViperTwinCoilFeature))
             {
-                if (HasEffect(VPR.Buffs.HuntersVenom) && CanUseAction(VPR.TwinfangBite))
-                    return VPR.TwinfangBite;
+                if (IsEnabled(CustomComboPreset.ViperTwinCoilSingularOption))
+                {
+                    if (OriginalHook(VPR.Twinfang) == VPR.TwinfangBite && CanUseAction(VPR.TwinfangBite) &&
+                        actionID == VPR.HuntersCoil)
+                        return VPR.TwinfangBite;
+
+                    if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodBite && CanUseAction(VPR.TwinbloodBite) &&
+                        actionID == VPR.SwiftskinsCoil)
+                        return VPR.TwinbloodBite;
+                }
+                else
+                {
+                    if (HasEffect(VPR.Buffs.HuntersVenom) && CanUseAction(VPR.TwinfangBite))
+                        return VPR.TwinfangBite;
 
-                if (HasEffect(VPR.Buffs.SwiftskinsVenom) && CanUseAction(VPR.TwinbloodBite))
-                    return VPR.TwinbloodBite;
+                    if (HasEffect(VPR.Buffs.SwiftskinsVenom) && CanUseAction(VPR.TwinbloodBite))
+                        return VPR.TwinbloodBite;
 
-                if (OriginalHook(VPR.Twinfang) == VPR.TwinfangBite && CanUseAction(VPR.TwinfangBite))
-                    return VPR.TwinfangBite;
+                    if (OriginalHook(VPR.Twinfang) == VPR.TwinfangBite && CanUseAction(VPR.TwinfangBite))
+                        return VPR.TwinfangBite;
 
-                if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodBite && CanUseAction(VPR.TwinbloodBite))
-                    return VPR.TwinbloodBite;
+                    if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodBite && CanUseAction(VPR.TwinbloodBite))
+                        return VPR.TwinbloodBite;
+                }
             }
         }
 
@@ -521,17 +560,30 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.ViperTwinCoilFeature))
             {
-                if (HasEffect(VPR.Buffs.FellhuntersVenom) && level >= VPR.Levels.TwinsAoE && CanUseAction(VPR.TwinfangThresh))
-                    return VPR.TwinfangThresh;
+                if (IsEnabled(CustomComboPreset.ViperTwinCoilSingularOption))
+                {
+                    if (OriginalHook(VPR.Twinfang) == VPR.TwinfangThresh && CanUseAction(VPR.TwinfangThresh) &&
+                        actionID == VPR.SteelMaw)
+                        return VPR.TwinfangThresh;
 
-                if (HasEffect(VPR.Buffs.FellskinsVenom) && level >= VPR.Levels.TwinsAoE && CanUseAction(VPR.TwinbloodThresh))
-                    return VPR.TwinbloodThresh;
+                    if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodThresh && CanUseAction(VPR.TwinbloodThresh) &&
+                        actionID == VPR.ReavingMaw)
+                        return VPR.TwinbloodThresh;
+                }
+                else
+                {
+                    if (HasEffect(VPR.Buffs.FellhuntersVenom) && level >= VPR.Levels.TwinsAoE && CanUseAction(VPR.TwinfangThresh))
+                        return VPR.TwinfangThresh;
 
-                if (OriginalHook(VPR.Twinfang) == VPR.TwinfangThresh && CanUseAction(VPR.TwinfangThresh))
-                    return VPR.TwinfangThresh;
+                    if (HasEffect(VPR.Buffs.FellskinsVenom) && level >= VPR.Levels.TwinsAoE && CanUseAction(VPR.TwinbloodThresh))
+                        return VPR.TwinbloodThresh;
 
-                if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodThresh && CanUseAction(VPR.TwinbloodThresh))
-                    return VPR.TwinbloodThresh;
+                    if (OriginalHook(VPR.Twinfang) == VPR.TwinfangThresh && CanUseAction(VPR.TwinfangThresh))
+                        return VPR.TwinfangThresh;
+
+                    if (OriginalHook(VPR.Twinblood) == VPR.TwinbloodThresh && CanUseAction(VPR.TwinbloodThresh))
+                        return VPR.TwinbloodThresh;
+                }
             }
         }
 

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -2378,7 +2378,7 @@ public enum CustomComboPreset
     [SectionCombo("Vice Combos")]
     [IconsCombo([VPR.SteelFangs, VPR.ReavingFangs, VPR.SteelMaw, VPR.ReavingMaw, UTL.ArrowLeft, VPR.HuntersCoil, VPR.SwiftskinsCoil, VPR.HuntersDen, VPR.SwiftskinsDen])]
     [ExpandedCustomCombo]
-    [CustomComboInfo("Steel Coil Feature", "Replace Steel Fangs with Swiftskin's Coil, Reaving Fangs with Hunter's Coil, Steel Maw with Swiftskin's Den, and Reaving Maw with Hunter's Den when usable.\n\nNOTE: Also replaces Steel Fangs/Maw with both First and Third Generation, and Reaving Fangs/Maw with both Second and Fourth Generation.", VPR.JobID)]
+    [CustomComboInfo("Steel Coil Feature", "Replace Steel Fangs with Hunter's Coil, Reaving Fangs with Swiftskins's Coil, Steel Maw with Hunter's Den, and Reaving Maw with Swiftskin's Den when usable.\n\nNOTE: Also replaces Steel Fangs/Maw with both First and Third Generation, and Reaving Fangs/Maw with both Second and Fourth Generation.", VPR.JobID)]
     ViperSteelCoilFeature = 4126,
 
     [SectionCombo("Vice Combos")]
@@ -2387,6 +2387,13 @@ public enum CustomComboPreset
     [CustomComboInfo("Twin Coil Feature", "Replace Swiftskin's Coil/Den and Hunter's Coil/Den with their respective Twinblood and Twinfang skills, in the correct order.", VPR.JobID)]
     ViperTwinCoilFeature = 4103,
 
+    [SectionCombo("Vice Combos")]
+    [IconsCombo([VPR.HuntersCoil, VPR.HuntersDen, UTL.ArrowLeft, VPR.Twinfang, UTL.Blank, VPR.SwiftskinsCoil, VPR.SwiftskinsDen, UTL.ArrowLeft, VPR.Twinblood])]
+    [AccessibilityCustomCombo]
+    [ParentCombo(ViperTwinCoilFeature)]
+    [CustomComboInfo("Twin Coil Single Replacement", "Instead of replacing both Coil/Den abilities with both Twin oGCDs in the correct order, Hunter's Coil/Den will always be replaced with only Twinfang, and Swiftskin's Coil/Den will always be replaced with only Twinblood, regardless of which is empowered./n/nNOTE: This is for players that enjoy the quick 1-2 of having the Twin oGCDs on separate buttons, but still want to place the oGCDs on the Coil/Den buttons.", VPR.JobID)]
+    ViperTwinCoilSingularOption = 4130,
+
     [SectionCombo("Vice Combos")]
     [IconsCombo([VPR.SteelFangs, VPR.ReavingFangs, UTL.ArrowLeft, VPR.Vicewinder])]
     [AccessibilityCustomCombo]