Merge pull request #15 from zbee/gnb-ids

Revert ID changes
Nik-Potokar · Sep 7, 2024 · 2ac0555 · 2ac0555
2 parents 04026bb + 3d06550
commit 2ac0555
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs
@@ -1487,58 +1487,58 @@ public enum CustomComboPreset
         #region Cooldowns
         [ParentCombo(GNB_ST_Advanced)]
         [CustomComboInfo("Cooldowns Option", "Adds various cooldowns into the rotation.", GNB.JobID)]
-        GNB_ST_Advanced_CooldownsGroup = 7004,
+        GNB_ST_Advanced_CooldownsGroup = 7007,
 
         [ConflictingCombos(GNB_NM_Features)]
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("No Mercy Option", "Adds No Mercy into the rotation when appropriate.", GNB.JobID)]
-        GNB_ST_NoMercy = 7005,
+        GNB_ST_NoMercy = 7008,
 
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("Sonic Break Option", "Adds Sonic Break into the rotation when appropriate.", GNB.JobID)]
-        GNB_ST_SonicBreak = 7006,
+        GNB_ST_SonicBreak = 7012,
 
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("Danger/Blasting Zone Option", "Adds Danger/Blasting Zone into the rotation when available.", GNB.JobID)]
-        GNB_ST_BlastingZone = 7007,
+        GNB_ST_BlastingZone = 7009,
 
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("Bow Shock Option", "Adds Bow Shock into the rotation when appropriate.", GNB.JobID)]
-        GNB_ST_BowShock = 7008,
+        GNB_ST_BowShock = 7010,
 
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("Bloodfest Option", "Adds Bloodfest into the rotation when appropriate.", GNB.JobID)]
-        GNB_ST_Bloodfest = 7009,
+        GNB_ST_Bloodfest = 7011,
 
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("Gnashing Fang Option", "Adds Gnashing Fang combo into the rotation.", GNB.JobID)]
-        GNB_ST_Gnashing = 7010,
+        GNB_ST_Gnashing = 7016,
 
         [ParentCombo(GNB_ST_Gnashing)]
         [CustomComboInfo("Continuation Option", "Adds Continuation & Hypervelocity into the rotation.\n'Gnashing Fang' option must be enabled or started manually.", GNB.JobID)]
-        GNB_ST_Continuation = 7011,
+        GNB_ST_Continuation = 7005,
 
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("Double Down Option", "Adds Double Down into the rotation when appropriate.", GNB.JobID)]
-        GNB_ST_DoubleDown = 7012,
+        GNB_ST_DoubleDown = 7017,
 
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("Reign Combo Option", "Adds Reign/Noble/Lionheart into the rotation when appropriate.", GNB.JobID)]
-        GNB_ST_Reign = 7013,
+        GNB_ST_Reign = 7014,
 
         [ParentCombo(GNB_ST_Advanced_CooldownsGroup)]
         [CustomComboInfo("Burst Strike Option", "Adds Burst Strike into the rotation when appropriate.", GNB.JobID)]
-        GNB_ST_BurstStrike = 7014,
+        GNB_ST_BurstStrike = 7015,
 
         [ParentCombo(GNB_ST_Advanced)]
         [CustomComboInfo("Ammo Overcap Option", "Adds Burst Strike into the rotation if you have max cartridges & your last combo action was Brutal Shell.", GNB.JobID)]
-        GNB_ST_Overcap = 7015,
+        GNB_ST_Overcap = 7018,
         #endregion
 
         #region Lightning Shot
         [ParentCombo(GNB_ST_Advanced)]
         [CustomComboInfo("Lightning Shot Uptime Option", "Adds Lightning Shot to the main combo when you are out of range.", GNB.JobID)]
-        GNB_ST_RangedUptime = 7016,
+        GNB_ST_RangedUptime = 7004,
         #endregion
 
         #endregion 
@@ -1584,11 +1584,11 @@ public enum CustomComboPreset
 
         [ParentCombo(GNB_AoE_FatedCircle)]
         [CustomComboInfo("Burst Strike Option", "Adds Burst Strike into the AoE rotation if you do not have Fated Circle unlocked yet.", GNB.JobID)]
-        GNB_AoE_noFatedCircle = 7209,
+        GNB_AoE_noFatedCircle = 7212,
 
         [ParentCombo(GNB_AoE_Advanced)]
         [CustomComboInfo("Ammo Overcap Option", "Adds Fated Circle into the AoE rotation if you have max cartridges & your last combo action was Demon Slice.", GNB.JobID)]
-        GNB_AoE_Overcap = 7210,
+        GNB_AoE_Overcap = 7209,
 
         [ParentCombo(GNB_AoE_Overcap)]
         [CustomComboInfo("Ammo Overcap Burst Strike Option", "Adds Burst Strike into the AoE rotation if you have max cartridges, your last combo action was Demon Slice, & you do not have Fated Circle unlocked yet.", GNB.JobID)]