Merge pull request #409 from kaedys/bugfix/rpr-vpr

[BUGFIX] Reaper and Viper
MKhayle · Aug 10, 2024 · f155acb · f155acb
2 parents 829a715 + 1dee1ae
commit f155acb
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,4 +5,8 @@ dotnet_style_qualification_for_event =true:silent
 dotnet_style_qualification_for_field=true:silent
 dotnet_style_qualification_for_property=true:silent
 dotnet_style_qualification_for_method=true:silent
+
 dotnet_diagnostic.CA1822.severity=silent
+dotnet_diagnostic.SA1518.severity = none
+dotnet_diagnostic.SA1516.severity = none
+dotnet_diagnostic.SA1005.severity = none
diff --git a/XIVComboExpanded/Combos/PLD.cs b/XIVComboExpanded/Combos/PLD.cs
@@ -288,10 +288,9 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                    return PLD.HolyCircle;
             }
 
-
             if (IsEnabled(CustomComboPreset.PaladinProminenceCombo))
             {
-                if(lastComboMove == PLD.TotalEclipse && level >= PLD.Levels.Prominence)
+                if (lastComboMove == PLD.TotalEclipse && level >= PLD.Levels.Prominence)
                     return PLD.Prominence;
 
                 return PLD.TotalEclipse;

diff --git a/XIVComboExpanded/Combos/RPR.cs b/XIVComboExpanded/Combos/RPR.cs
@@ -570,12 +570,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
             {
                 if (level >= RPR.Levels.PlentifulHarvest && HasEffect(RPR.Buffs.ImmortalSacrifice))
                     return RPR.PlentifulHarvest;
-            }
 
-            if (IsEnabled(CustomComboPreset.ReaperPerfectHarvestFeature))
-            {
-                if (level >= RPR.Levels.Perfectio && HasEffect(RPR.Buffs.PerfectioParata))
-                    return RPR.Perfectio;
+                if (IsEnabled(CustomComboPreset.ReaperPerfectHarvestFeature))
+                {
+                    if (level >= RPR.Levels.Perfectio && HasEffect(RPR.Buffs.PerfectioParata))
+                        return RPR.Perfectio;
+                }
             }
         }
 

diff --git a/XIVComboExpanded/Combos/VPR.cs b/XIVComboExpanded/Combos/VPR.cs
@@ -145,6 +145,15 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.ViperSteelCoilFeature))
             {
+                if (IsEnabled(CustomComboPreset.ViperGenerationLegaciesFeature))
+                {
+                    if (actionID == VPR.SteelFangs && OriginalHook(VPR.SerpentsTail) == VPR.ThirdLegacy)
+                        return VPR.ThirdLegacy;
+
+                    if (actionID == VPR.ReavingFangs && OriginalHook(VPR.SerpentsTail) == VPR.FourthLegacy)
+                        return VPR.FourthLegacy;
+                }
+
                 if (IsEnabled(CustomComboPreset.ViperTwinCoilFeature))
                 {
                     if (HasEffect(VPR.Buffs.HuntersVenom))
@@ -171,7 +180,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 else
                 {
                     if (CanUseAction(VPR.SwiftskinsCoil) || CanUseAction(VPR.HuntersCoil))
-                        return actionID == VPR.SteelFangs ? VPR.HuntersCoil: VPR.SwiftskinsCoil;
+                        return actionID == VPR.SteelFangs ? VPR.HuntersCoil : VPR.SwiftskinsCoil;
                 }
             }
 
@@ -213,6 +222,15 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
             if (IsEnabled(CustomComboPreset.ViperSteelCoilFeature))
             {
+                if (IsEnabled(CustomComboPreset.ViperGenerationLegaciesFeature))
+                {
+                    if (actionID == VPR.SteelMaw && OriginalHook(VPR.SerpentsTail) == VPR.ThirdLegacy)
+                        return VPR.ThirdLegacy;
+
+                    if (actionID == VPR.ReavingMaw && OriginalHook(VPR.SerpentsTail) == VPR.FourthLegacy)
+                        return VPR.FourthLegacy;
+                }
+
                 if (IsEnabled(CustomComboPreset.ViperTwinCoilFeature))
                 {
                     if (HasEffect(VPR.Buffs.FellhuntersVenom))
@@ -239,7 +257,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 else
                 {
                     if (CanUseAction(VPR.SwiftskinsDen) || CanUseAction(VPR.HuntersDen))
-                        return actionID == VPR.SteelMaw ? VPR.HuntersDen: VPR.SwiftskinsDen;
+                        return actionID == VPR.SteelMaw ? VPR.HuntersDen : VPR.SwiftskinsDen;
                 }
             }
 

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -826,7 +826,7 @@ public enum CustomComboPreset
     GunbreakerFatedCircleCont = 3714,
 
     [SectionCombo("Area of Effect")]
-    [IconsCombo([ GNB.FatedCircle, GNB.BurstStrike, UTL.ArrowLeft, GNB.DoubleDown])]
+    [IconsCombo([GNB.FatedCircle, GNB.BurstStrike, UTL.ArrowLeft, GNB.DoubleDown])]
     [AccessibilityCustomCombo]
     [CustomComboInfo("Double Down Feature", "Replace Burst Strike and Fated Circle with Double Down when available.", GNB.JobID)]
     GunbreakerDoubleDownFeature = 3709,
@@ -939,7 +939,6 @@ public enum CustomComboPreset
     [CustomComboInfo("Overdrive Feature", "Replace Rook Autoturret and Automaton Queen with Overdrive while active.", MCH.JobID)]
     MachinistOverdriveFeature = 3104,
 
-
     #endregion
     // ====================================================================================
     #region MONK
@@ -1172,7 +1171,7 @@ public enum CustomComboPreset
     [CustomComboInfo("Royal Authority Combo", "Replace Royal Authority/Rage of Halone with its combo chain.", PLD.JobID)]
     PaladinRoyalAuthorityCombo = 1902,
 
-    [IconsCombo([PLD.RoyalAuthority, UTL.ArrowLeft, PLD.Atonement,PLD.Supplication, PLD.Sepulchre])]
+    [IconsCombo([PLD.RoyalAuthority, UTL.ArrowLeft, PLD.Atonement, PLD.Supplication, PLD.Sepulchre])]
     [SectionCombo("Single Target")]
     [AccessibilityCustomCombo]
     [CustomComboInfo("Royal Authority Atonement Feature", "Replace Royal Authority with Atonement, Supplication & Sepulchre when under the effect of the corresponding buffs.\nNOTE: Does not require the Royal Authority Combo, if you prefer to do your standard 1-2-3 combo yourself.", PLD.JobID)]
@@ -1189,7 +1188,7 @@ public enum CustomComboPreset
     [CustomComboInfo("Combo Divine Might Feature", "Replace Royal Authority with Holy Spirit and Prominence with Holy Circle when Divine Might is active.", PLD.JobID)]
     PaladinComboDivineMightFeature = 1912,
 
-    [IconsCombo([ PLD.CircleOfScorn, UTL.Cycle, PLD.SpiritsWithin, UTL.Cycle, PLD.Expiacion])]
+    [IconsCombo([PLD.CircleOfScorn, UTL.Cycle, PLD.SpiritsWithin, UTL.Cycle, PLD.Expiacion])]
     [SectionCombo("Combined/Other")]
     [SecretCustomCombo]
     [CustomComboInfo("Scornful Spirits Feature", "Replace Spirits Within/Expiacion and Circle of Scorn with whichever is available soonest.", PLD.JobID)]
@@ -2090,7 +2089,6 @@ public enum CustomComboPreset
     [CustomComboInfo("Adloquium Level Sync", "Replace Adloquium with Physick when below level 30 in synced content.", SCH.JobID)]
     ScholarAdloquiumSyncFeature = 2810,
 
-
     #endregion
     // ====================================================================================
     #region SUMMONER