Guren

Nik-Potokar · Oct 25, 2024 · 6d8fd24 · 6d8fd24
1 parent 23d92b0
commit 6d8fd24
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs
@@ -3625,6 +3625,10 @@ The three digets after RDM.JobID can be used to reorder items in the list
         [CustomComboInfo("Senei Option", "Adds Senei to the rotation.", SAM.JobID)]
         SAM_ST_CDs_Senei = 15020,
 
+        [ParentCombo(SAM_ST_CDs_Senei)]
+        [CustomComboInfo("Guren Option", "Adds Guren to the rotation if Senei is not unlocked.", SAM.JobID)]
+        SAM_ST_CDs_Guren = 15021,
+
         #endregion
 
         [ParentCombo(SAM_ST_AdvancedMode)]

diff --git a/XIVSlothCombo/Combos/PvE/SAM.cs b/XIVSlothCombo/Combos/PvE/SAM.cs
@@ -269,6 +269,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             HasEffect(Buffs.Fugetsu) && HasEffect(Buffs.Fuka))
                             return Senei;
 
+                        //Guren if no Senei
+                        if (!LevelChecked(Senei) &&
+                            gauge.Kenki >= 25 && ActionReady(Guren) &&
+                            HasEffect(Buffs.Fugetsu) && HasEffect(Buffs.Fuka))
+                            return Guren;
+
                         //Zanshin Usage
                         if (LevelChecked(Zanshin) && gauge.Kenki >= 50 &&
                             CanWeave(actionID) && HasEffect(Buffs.ZanshinReady) &&
@@ -481,10 +487,19 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             }
 
                             //Senei Features
-                            if (IsEnabled(CustomComboPreset.SAM_ST_CDs_Senei) &&
-                                gauge.Kenki >= 25 && ActionReady(Senei) &&
-                                HasEffect(Buffs.Fugetsu) && HasEffect(Buffs.Fuka))
-                                return Senei;
+                            if (IsEnabled(CustomComboPreset.SAM_ST_CDs_Senei))
+                            {
+                                if (gauge.Kenki >= 25 && ActionReady(Senei) &&
+                                    HasEffect(Buffs.Fugetsu) && HasEffect(Buffs.Fuka))
+                                    return Senei;
+
+                                //Guren if no Senei
+                                if (IsEnabled(CustomComboPreset.SAM_ST_CDs_Guren) &&
+                                    !LevelChecked(Senei) &&
+                                    gauge.Kenki >= 25 && ActionReady(Guren) &&
+                                    HasEffect(Buffs.Fugetsu) && HasEffect(Buffs.Fuka))
+                                    return Guren;
+                            }
 
                             //Zanshin Usage
                             if (IsEnabled(CustomComboPreset.SAM_ST_CDs_Zanshin) &&