Merge pull request #267 from mikel-gh/master

[FEATURE] SAM - Shinten to Zanshin Support
MKhayle · Jul 5, 2024 · 02d7148 · 02d7148
2 parents e03d5e8 + 0cd5a4e
commit 02d7148
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/XIVComboExpanded/Combos/SAM.cs b/XIVComboExpanded/Combos/SAM.cs
@@ -34,7 +34,8 @@ public const uint
         Ikishoten = 16482,
         //Shoha2 = 25779,
         OgiNamikiri = 25781,
-        KaeshiNamikiri = 25782;
+        KaeshiNamikiri = 25782,
+        Zanshin = 36964;
 
     public static class Buffs
     {
@@ -296,6 +297,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         return SAM.HissatsuGuren;
                 }
             }
+
+            if (IsEnabled(CustomComboPreset.SamuraiShintenZanshinFeature))
+            {
+                if (level >= SAM.Levels.Zanshin && HasEffect(SAM.Buffs.ZanshinReady))
+                    return SAM.Zanshin;
+            }
         }
 
         return actionID;

diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs
@@ -965,14 +965,17 @@ public enum CustomComboPreset
     [CustomComboInfo("Iaijutsu to Shoha", "Replace Iaijutsu with Shoha when meditation is 3.", SAM.JobID)]
     SamuraiIaijutsuShohaFeature = 3410,
 
-    [CustomComboInfo("Senei to Guren Level Sync", "Replace Hissatsu: Senei with Guren when level synced below 72.", SAM.JobID)]
-    SamuraiSeneiGurenFeature = 3418,
+    [CustomComboInfo("Shinten to Zanshin", "Replace Hissatsu: Shinten with Zanshin when available.", SAM.JobID)]
+    SamuraiShintenZanshinFeature = 3420,
+
+    [CustomComboInfo("Shinten to Shoha", "Replace Hissatsu: Shinten with Shoha when Meditation is full.", SAM.JobID)]
+    SamuraiShintenShohaFeature = 3413,
 
     [CustomComboInfo("Shinten to Senei", "Replace Hissatsu: Shinten with Senei when available.", SAM.JobID)]
     SamuraiShintenSeneiFeature = 3414,
 
-    [CustomComboInfo("Shinten to Shoha", "Replace Hissatsu: Shinten with Shoha when Meditation is full.", SAM.JobID)]
-    SamuraiShintenShohaFeature = 3413,
+    [CustomComboInfo("Senei to Guren Level Sync", "Replace Hissatsu: Senei with Guren when level synced below 72.", SAM.JobID)]
+    SamuraiSeneiGurenFeature = 3418,
 
     [CustomComboInfo("Kyuten to Guren", "Replace Hissatsu: Kyuten with Guren when available.", SAM.JobID)]
     SamuraiKyutenGurenFeature = 3415,