Merge pull request #1155 from FFXIV-CombatReborn/rework7

Massive overhaul of multiple systems, primarily Intercept system

Author: LTS-FFXIV

RotationSolver.Basic/Actions/ActionBasicInfo.cs

@@ -381,7 +381,7 @@ private bool IsActionEnabled()
 
     private bool IsActionDisabled()
     {
-        return !IBaseAction.ForceEnable && (DataCenter.DisabledActionSequencer?.Contains(ID) ?? false);
+        return !IBaseAction.ForceEnable && _action.Config?.IsEnabled == false;
     }
 
     /// <summary>

RotationSolver.Basic/Actions/ActionTargetInfo.cs

@@ -184,7 +184,21 @@ private readonly List<IBattleChara> GetCanAffects(bool skipStatusProvideCheck, b
                 if (isRestricted) continue;
             }
 
-            if (CheckStatus(tar, skipStatusProvideCheck, skipTargetStatusNeedCheck) && CheckTimeToKill(tar) && CheckResistance(tar))
+			if (DataCenter.IsInM9S && action.AdjustedID == 36982 && DataCenter.RestrictedActionNameIds != null)
+			{
+				bool isRestrictedAction = false;
+				for (int i = 0; i < DataCenter.RestrictedActionNameIds.Count; i++)
+				{
+					if (tar.NameId == DataCenter.RestrictedActionNameIds[i])
+					{
+						isRestrictedAction = true;
+						break;
+					}
+				}
+				if (isRestrictedAction) continue;
+			}
+
+			if (CheckStatus(tar, skipStatusProvideCheck, skipTargetStatusNeedCheck) && CheckTimeToKill(tar) && CheckResistance(tar))
             {
                 validTargets.Add(tar);
             }

RotationSolver.Basic/Actions/BaseItem.cs

@@ -204,11 +204,6 @@ public virtual unsafe bool CanUse(out IAction item, bool clippingCheck = false)
             return false;
         }
 
-        if (DataCenter.DisabledActionSequencer?.Contains(ID) ?? false)
-        {
-            return false;
-        }
-
         if (!IsEnabled)
         {
             return false;