From 2319160b5207b1d50f1d82d92032913986794926 Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Sat, 28 Jun 2025 10:36:43 +0200
Subject: [PATCH] Refactor move selection prevention to use interface

---
 PkmnLib.Dynamic/Models/Battle.cs              |  3 +-
 PkmnLib.Dynamic/ScriptHandling/Script.cs      | 18 +++++++-----
 .../ScriptHandling/ScriptExecution.cs         | 29 ++++++++++++++++++-
 .../Scripts/Moves/Belch.cs                    |  4 +--
 .../Scripts/Moves/Celebrate.cs                |  4 +--
 .../Scripts/Moves/LastResort.cs               |  4 +--
 .../Scripts/Pokemon/DisableEffect.cs          |  4 +--
 .../Scripts/Pokemon/HealBlockEffect.cs        |  4 +--
 .../Scripts/Pokemon/ImprisonEffect.cs         |  4 +--
 .../Scripts/Pokemon/TauntEffect.cs            |  4 +--
 .../Scripts/Pokemon/ThroatChopEffect.cs       |  4 +--
 .../Scripts/Pokemon/TormentEffect.cs          |  4 +--
 12 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/PkmnLib.Dynamic/Models/Battle.cs b/PkmnLib.Dynamic/Models/Battle.cs
index fa245b2..11b36ec 100644
--- a/PkmnLib.Dynamic/Models/Battle.cs
+++ b/PkmnLib.Dynamic/Models/Battle.cs
@@ -331,7 +331,8 @@ public class BattleImpl : ScriptSource, IBattle
                     moveChoice.ChosenMove.MoveData.Target, moveChoice.User))
                 return false;
             var preventMove = false;
-            choice.RunScriptHook(script => script.PreventMoveSelection(moveChoice, ref preventMove));
+            choice.RunScriptHookInterface<IScriptPreventMoveSelection>(script =>
+                script.PreventMoveSelection(moveChoice, ref preventMove));
             if (preventMove)
                 return false;
         }
diff --git a/PkmnLib.Dynamic/ScriptHandling/Script.cs b/PkmnLib.Dynamic/ScriptHandling/Script.cs
index 8ee81e1..1093968 100644
--- a/PkmnLib.Dynamic/ScriptHandling/Script.cs
+++ b/PkmnLib.Dynamic/ScriptHandling/Script.cs
@@ -61,13 +61,6 @@ public abstract class Script : IDeepCloneable
     {
     }
 
-    /// <summary>
-    /// Override to customize whether the move can be selected at all.
-    /// </summary>
-    public virtual void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
-    {
-    }
-
     /// <summary>
     /// Force a certain move choice to be selected. If the choice is set, the Pokemon will be forced
     /// to use it, and will not be able to select any other choice.
@@ -854,4 +847,15 @@ public interface IScriptOnInitialize
     /// with parameters that are passed to it.
     /// </summary>
     void OnInitialize(IReadOnlyDictionary<StringKey, object?>? parameters);
+}
+
+/// <summary>
+/// This interface is used to allow scripts to prevent a move from being selected.
+/// </summary>
+public interface IScriptPreventMoveSelection
+{
+    /// <summary>
+    /// Override to customize whether the move can be selected at all.
+    /// </summary>
+    void PreventMoveSelection(IMoveChoice choice, ref bool prevent);
 }
\ No newline at end of file
diff --git a/PkmnLib.Dynamic/ScriptHandling/ScriptExecution.cs b/PkmnLib.Dynamic/ScriptHandling/ScriptExecution.cs
index 4497063..85ff24f 100644
--- a/PkmnLib.Dynamic/ScriptHandling/ScriptExecution.cs
+++ b/PkmnLib.Dynamic/ScriptHandling/ScriptExecution.cs
@@ -13,7 +13,6 @@ public static class ScriptExecution
     /// <summary>
     /// Executes a hook on all scripts in a source.
     /// </summary>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void RunScriptHook(this IScriptSource source, Action<Script> hook)
     {
         var iterator = source.GetScripts();
@@ -37,6 +36,34 @@ public static class ScriptExecution
         }
     }
 
+    /// <summary>
+    /// Executes a hook on all scripts in a source.
+    /// </summary>
+    public static void RunScriptHookInterface<TScriptHook>(this IScriptSource source, Action<TScriptHook> hook)
+    {
+        var iterator = source.GetScripts();
+        List<ScriptCategory>? suppressedCategories = null;
+        foreach (var container in iterator)
+        {
+            if (container.IsEmpty)
+                continue;
+            var script = container.Script;
+            if (script is IScriptOnBeforeAnyHookInvoked onBeforeAnyHookInvoked)
+                onBeforeAnyHookInvoked.OnBeforeAnyHookInvoked(ref suppressedCategories);
+        }
+        foreach (var container in iterator)
+        {
+            if (container.IsEmpty)
+                continue;
+            var script = container.Script;
+            if (script is not TScriptHook scriptHook)
+                continue;
+            if (suppressedCategories != null && suppressedCategories.Contains(script.Category))
+                continue;
+            hook(scriptHook);
+        }
+    }
+
     /// <summary>
     /// Executes a hook on all scripts in a source.
     /// </summary>
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Belch.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Belch.cs
index d93cb38..ba5f8d8 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Belch.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Belch.cs
@@ -1,10 +1,10 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
 
 [Script(ScriptCategory.Move, "belch")]
-public class Belch : Script
+public class Belch : Script, IScriptPreventMoveSelection
 {
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         var battleData = choice.User.BattleData;
         if (battleData == null)
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Celebrate.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Celebrate.cs
index ffeb81b..695f8e8 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Celebrate.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Celebrate.cs
@@ -1,10 +1,10 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
 
 [Script(ScriptCategory.Move, "celebrate")]
-public class Celebrate : Script
+public class Celebrate : Script, IScriptPreventMoveSelection
 {
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         // This move is mostly useless, and it's not worth the effort to implement it.
         // Prevent it from being selected.
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/LastResort.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/LastResort.cs
index 0a20186..72a9e1a 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/LastResort.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/LastResort.cs
@@ -1,10 +1,10 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;
 
 [Script(ScriptCategory.Move, "last_resort")]
-public class LastResort : Script
+public class LastResort : Script, IScriptPreventMoveSelection
 {
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         var battleData = choice.User.BattleData;
         if (battleData == null)
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/DisableEffect.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/DisableEffect.cs
index b5959df..cd27bc0 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/DisableEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/DisableEffect.cs
@@ -1,7 +1,7 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
 
 [Script(ScriptCategory.Pokemon, "disable")]
-public class DisableEffect : Script
+public class DisableEffect : Script, IScriptPreventMoveSelection
 {
     private int _turnsLeft = 4;
     private readonly StringKey _move;
@@ -12,7 +12,7 @@ public class DisableEffect : Script
     }
 
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         if (choice.ChosenMove.MoveData.Name == _move)
             prevent = true;
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/HealBlockEffect.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/HealBlockEffect.cs
index 8be22f3..2384afd 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/HealBlockEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/HealBlockEffect.cs
@@ -1,7 +1,7 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
 
 [Script(ScriptCategory.Pokemon, "heal_block")]
-public class HealBlockEffect : Script
+public class HealBlockEffect : Script, IScriptPreventMoveSelection
 {
     private int _duration;
 
@@ -19,7 +19,7 @@ public class HealBlockEffect : Script
     }
 
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         if (choice.ChosenMove.MoveData.HasFlag("heal"))
             prevent = true;
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ImprisonEffect.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ImprisonEffect.cs
index 8015568..f087d9d 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ImprisonEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ImprisonEffect.cs
@@ -1,7 +1,7 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
 
 [Script(ScriptCategory.Pokemon, "imprison")]
-public class ImprisonEffect : Script
+public class ImprisonEffect : Script, IScriptPreventMoveSelection
 {
     private readonly IPokemon _user;
 
@@ -11,7 +11,7 @@ public class ImprisonEffect : Script
     }
 
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         if (_user.Moves.WhereNotNull().Any(x => x.MoveData.Name == choice.ChosenMove.MoveData.Name))
             prevent = true;
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/TauntEffect.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/TauntEffect.cs
index bff04b6..ce53894 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/TauntEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/TauntEffect.cs
@@ -3,12 +3,12 @@ using PkmnLib.Static.Moves;
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
 
 [Script(ScriptCategory.Pokemon, "taunt")]
-public class TauntEffect(int turns) : Script
+public class TauntEffect(int turns) : Script, IScriptPreventMoveSelection
 {
     private int _turns = turns;
 
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         if (choice.ChosenMove.MoveData.Category == MoveCategory.Status)
         {
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ThroatChopEffect.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ThroatChopEffect.cs
index a152ad4..81aa32a 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ThroatChopEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/ThroatChopEffect.cs
@@ -1,12 +1,12 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
 
 [Script(ScriptCategory.Pokemon, "throat_chop")]
-public class ThroatChopEffect : Script
+public class ThroatChopEffect : Script, IScriptPreventMoveSelection
 {
     private int _turns = 3;
 
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         if (choice.ChosenMove.MoveData.HasFlag("sound"))
             prevent = true;
diff --git a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/TormentEffect.cs b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/TormentEffect.cs
index cb59ae4..bf23f49 100644
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/TormentEffect.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Pokemon/TormentEffect.cs
@@ -1,12 +1,12 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Pokemon;
 
 [Script(ScriptCategory.Pokemon, "torment")]
-public class TormentEffect(IMoveChoice? moveChoice) : Script
+public class TormentEffect(IMoveChoice? moveChoice) : Script, IScriptPreventMoveSelection
 {
     private IMoveChoice? _moveChoice = moveChoice;
 
     /// <inheritdoc />
-    public override void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
+    public void PreventMoveSelection(IMoveChoice choice, ref bool prevent)
     {
         if (_moveChoice == null)
             return;