MNK update

Adjusting description of combos Adding Opomatic Chakra feature
MKhayle · Jul 11, 2024 · e945382 · e945382
1 parent 9373f8f
commit e945382
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/XIVComboExpanded/Combos/MNK.cs b/XIVComboExpanded/Combos/MNK.cs
@@ -94,6 +94,13 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
         {
             var gauge = GetJobGauge<MNKGauge>();
 
+            // Opo Chakra
+            if (IsEnabled(CustomComboPreset.MonkOpoChakraFeature))
+            {
+                if (gauge.Chakra > 4 && InCombat())
+                    return OriginalHook(MNK.SteeledPeak);
+            }
+
             if (IsEnabled(CustomComboPreset.MonkBootshineMeditationFeature))
             {
                 if (level >= MNK.Levels.SteeledMeditation && gauge.Chakra < 5 && !InCombat())

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -529,31 +529,36 @@ public enum CustomComboPreset
 
     [SecretCustomCombo]
     [ParentCombo(MonkMonkeyMode)]
-    [CustomComboInfo("Monkey Bootshine Steeled Meditation Feature", "Replace Bootshine with Steeled Meditation when out of combat and the Fifth Chakra is not open.", MNK.JobID)]
+    [CustomComboInfo("Monkey Bootshine Steeled Meditation Feature", "Replace Bootshine/Leaping Opo with Steeled Meditation when out of combat and the Fifth Chakra is not open.", MNK.JobID)]
     MonkMonkeyMeditationFeature = 2022,
 
     [SecretCustomCombo]
     [ParentCombo(MonkMonkeyMode)]
-    [CustomComboInfo("Monkey Form Shift Feature", "Replace Bootshine with Form Shift when out of combat and you don't have Formless Fist.", MNK.JobID)]
+    [CustomComboInfo("Monkey Form Shift Feature", "Replace Bootshine/Leaping Opo with Form Shift when out of combat and you don't have Formless Fist.", MNK.JobID)]
     MonkMonkeyFormShiftFeature = 2024,
 
     [SecretCustomCombo]
     [ParentCombo(MonkMonkeyMode)]
-    [CustomComboInfo("Automatic Chakra Feature", "Replace Bootshine with The Forbidden Chakra when your Fifth Chakra is open.", MNK.JobID)]
+    [CustomComboInfo("Automatic Chakra Feature", "Replace Bootshine/Leaping Opo with The Forbidden Chakra when your Fifth Chakra is open.", MNK.JobID)]
     MonkMonkeyAutoChakraFeature = 2026,
 
     [ConflictingCombos(MonkMonkeyMode)]
     [CustomComboInfo("Opo feature", "Replace Bootshine/Leaping Opo with Dragon Kick if you don't have any Opo's fury stack.", MNK.JobID)]
     MonkOpoFeature = 2017,
 
     [ParentCombo(MonkOpoFeature)]
-    [CustomComboInfo("Bootshine Steeled Meditation Feature", "Replace Bootshine with Steeled Meditation when out of combat and the Fifth Chakra is not open.", MNK.JobID)]
+    [CustomComboInfo("Bootshine Steeled Meditation Feature", "Replace Bootshine/Leaping Opo with Steeled Meditation when out of combat and the Fifth Chakra is not open.", MNK.JobID)]
     MonkBootshineMeditationFeature = 2012,
 
     [ParentCombo(MonkOpoFeature)]
-    [CustomComboInfo("Form Shift Feature", "Replace Bootshine with Form Shift when out of combat and you don't have Formless Fist.", MNK.JobID)]
+    [CustomComboInfo("Form Shift Feature", "Replace Bootshine/Leaping Opo with Form Shift when out of combat and you don't have Formless Fist.", MNK.JobID)]
     MonkBootshineFormShiftFeature = 2023,
 
+    [SecretCustomCombo]
+    [ParentCombo(MonkOpoFeature)]
+    [CustomComboInfo("Opomatic Chakra Feature", "Replace Bootshine/Leaping Opo with The Forbidden Chakra when your Fifth Chakra is open.", MNK.JobID)]
+    MonkOpoChakraFeature = 2029,
+
     [ConflictingCombos(MonkMonkeyMode)]
     [CustomComboInfo("Raptor feature", "Replace True Strike with Twin Snakes if you don't have any Raptor's fury stack.", MNK.JobID)]
     MonkRaptorFeature = 2018,
@@ -562,7 +567,7 @@ public enum CustomComboPreset
     [CustomComboInfo("Coeurl feature", "Replace Snap Punch with Demolish if you don't have any Coeurl's fury stack.", MNK.JobID)]
     MonkCoeurlFeature = 2019,
 
-    [CustomComboInfo("ST Balance Feature", "Replace Bootshine, Dragon Kick True Strike, Twin Snakes, Snap Punch and Demolish with Masterful Blitz if you have 3 Beast Chakra.", MNK.JobID)]
+    [CustomComboInfo("ST Balance Feature", "Replace Bootshine/Leaping Opo, Dragon Kick, True Strike/Rising Raptor, Twin Snakes, Snap Punch/Pouncing Coeurl and Demolish with Masterful Blitz if you have 3 Beast Chakra.", MNK.JobID)]
     MonkSTBalanceFeature = 2005,
 
     [CustomComboInfo("Monk AoE Combo", "Replace Masterful Blitz with the AoE combo chain. This was changed from Rockbreaker due to an action queueing bug.", MNK.JobID)]