From 4188a0fd73d166be243300ad85e769eabbc0287f Mon Sep 17 00:00:00 2001 From: Frigidwalrus Date: Tue, 16 Jul 2024 21:16:14 -0500 Subject: [PATCH] SAM issues Disabling SAM for review --- XIVComboVX/Combos/SAM.cs | 4 ++-- XIVComboVX/CustomComboPreset.cs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/XIVComboVX/Combos/SAM.cs b/XIVComboVX/Combos/SAM.cs index 9c0f1cb9..b7791184 100644 --- a/XIVComboVX/Combos/SAM.cs +++ b/XIVComboVX/Combos/SAM.cs @@ -74,7 +74,7 @@ public const byte } // returning Soon™ (when we have the time to go over everything) - +/* internal class SamuraiBloodbathReplacer: SecondBloodbathCombo { public override CustomComboPreset Preset => CustomComboPreset.SamuraiBloodbathReplacer; } @@ -185,7 +185,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } } -/* internal class SamuraiTsubameGaeshiFeature: CustomCombo { + internal class SamuraiTsubameGaeshiFeature: CustomCombo { public override CustomComboPreset Preset => CustomComboPreset.SamAny; public override uint[] ActionIDs { get; } = [SAM.TsubameGaeshi]; diff --git a/XIVComboVX/CustomComboPreset.cs b/XIVComboVX/CustomComboPreset.cs index b5e4197b..86a584d2 100644 --- a/XIVComboVX/CustomComboPreset.cs +++ b/XIVComboVX/CustomComboPreset.cs @@ -1148,7 +1148,8 @@ public enum CustomComboPreset { #endregion // ==================================================================================== #region SAMURAI (34xx) - // Working on updating SAM. Will gradually be releasing more features as they are verified working. + // Working on updating SAM. Will gradually be releasing more features as they are verified working. + /* [CustomComboInfo("Bloodbath Replacer Feature", "Replace Bloodbath with Second Wind when underlevel or when Bloodbath is on cooldown and Second Wind is not.", SAM.JobID)] SamuraiBloodbathReplacer = 3419, @@ -1212,6 +1213,7 @@ public enum CustomComboPreset { [CustomComboInfo("Hissatsu Senei/Guren Sync Feature", "Replace Hissatsu Senei with Hissatsu Guren when underlevel.", SAM.JobID)] SamuraiGurenSeneiLevelSyncFeature = 3418, + */ #endregion // ====================================================================================