Many more tests and fixes

Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/FairyLockEffect.cs

@@ -8,13 +8,15 @@ public class FairyLockEffect : Script, IScriptOnEndTurn, IScriptPreventSelfRunAw
     /// <inheritdoc />
     public void PreventSelfRunAway(IFleeChoice choice, ref bool prevent)
     {
-        prevent = true;
+        if (choice.User.Types.All(x => x.Name != "ghost"))
+            prevent = true;
     }
 
     /// <inheritdoc />
     public void PreventSelfSwitch(ISwitchChoice choice, ref bool prevent)
     {
-        prevent = true;
+        if (choice.User.Types.All(x => x.Name != "ghost"))
+            prevent = true;
     }
 
     /// <inheritdoc />

Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/FutureSightEffect.cs

@@ -3,34 +3,73 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Battle;
 [Script(ScriptCategory.Battle, "future_sight")]
 public class FutureSightEffect : Script, IScriptOnEndTurn
 {
-    private int _turnsLeft = 3;
-    private readonly IMoveChoice _moveChoice;
+    private class PendingStrike
+    {
+        public IMoveChoice MoveChoice { get; }
+        public int Turns { get; set; }
+
+        public PendingStrike(IMoveChoice moveChoice)
+        {
+            MoveChoice = moveChoice;
+            Turns = 3;
+        }
+    }
+
+    private readonly List<PendingStrike> _strikes = new();
 
     public FutureSightEffect(IMoveChoice moveChoice)
     {
-        _moveChoice = moveChoice;
+        AddStrike(moveChoice);
+    }
+
+    public void AddStrike(IMoveChoice moveChoice)
+    {
+        _strikes.Add(new PendingStrike(moveChoice));
+    }
+
+    public bool HasStrikeAt(byte side, byte position)
+    {
+        return _strikes.Exists(x => x.MoveChoice.TargetSide == side && x.MoveChoice.TargetPosition == position);
     }
 
     /// <inheritdoc />
     public void OnEndTurn(IScriptSource owner, IBattle battle)
     {
-        _turnsLeft -= 1;
-        if (_turnsLeft <= 0)
+        var toRemove = new List<PendingStrike>();
+        foreach (var strike in _strikes)
         {
-            var target = battle.GetPokemon(_moveChoice.TargetSide, _moveChoice.TargetPosition);
-            if (target is not { IsUsable: true })
+            strike.Turns--;
+            if (strike.Turns == 0)
             {
-                battle.EventHook.Invoke(new DialogEvent("move_failed"));
-                return;
+                ExecuteStrike(battle, strike.MoveChoice);
+                toRemove.Add(strike);
             }
-            var damageCalculator = battle.Library.DamageCalculator;
-            var executingMove = new ExecutingMoveImpl([target], 1, _moveChoice.ChosenMove,
-                _moveChoice.ChosenMove.MoveData, _moveChoice, battle);
-            var hitData = executingMove.GetHitData(target, 0);
-            var damage = damageCalculator.GetDamage(executingMove, executingMove.UseMove.Category, executingMove.User,
-                target, executingMove.TargetCount, 1, hitData);
-
-            target.Damage(damage, DamageSource.Misc);
+        }
+        foreach (var strike in toRemove)
+        {
+            _strikes.Remove(strike);
+        }
+        if (_strikes.Count == 0)
+        {
+            RemoveSelf();
         }
     }
+
+    private static void ExecuteStrike(IBattle battle, IMoveChoice moveChoice)
+    {
+        var target = battle.GetPokemon(moveChoice.TargetSide, moveChoice.TargetPosition);
+        if (target is not { IsUsable: true })
+        {
+            battle.EventHook.Invoke(new DialogEvent("move_failed"));
+            return;
+        }
+        var damageCalculator = battle.Library.DamageCalculator;
+        var executingMove = new ExecutingMoveImpl([target], 1, moveChoice.ChosenMove, moveChoice.ChosenMove.MoveData,
+            moveChoice, battle);
+        var hitData = executingMove.GetHitData(target, 0);
+        var damage = damageCalculator.GetDamage(executingMove, executingMove.UseMove.Category, executingMove.User,
+            target, executingMove.TargetCount, 1, hitData);
+
+        target.Damage(damage, DamageSource.Misc);
+    }
 }

Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/IonDelugeEffect.cs

@@ -1,7 +1,7 @@
 namespace PkmnLib.Plugin.Gen7.Scripts.Battle;
 
 [Script(ScriptCategory.Move, "ion_deluge")]
-public class IonDelugeEffect : Script, IScriptChangeMoveType
+public class IonDelugeEffect : Script, IScriptChangeMoveType, IScriptOnEndTurn
 {
     /// <inheritdoc />
     public void ChangeMoveType(IExecutingMove move, IPokemon target, byte hit, ref TypeIdentifier? moveType)
@@ -12,4 +12,9 @@ public class IonDelugeEffect : Script, IScriptChangeMoveType
             moveType = electricType;
         }
     }
+
+    public void OnEndTurn(IScriptSource owner, IBattle battle)
+    {
+        RemoveSelf();
+    }
 }

Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/MagicRoomEffect.cs

@@ -3,7 +3,7 @@ namespace PkmnLib.Plugin.Gen7.Scripts.Battle;
 [Script(ScriptCategory.Battle, "magic_room")]
 public class MagicRoomEffect : Script, IScriptOnBeforeAnyHookInvoked, IScriptOnEndTurn, IScriptPreventHeldItemConsume
 {
-    private int _turnsLeft = 5;
+    private int _turnsLeft = 4;
 
     /// <inheritdoc />
     public void PreventHeldItemConsume(IPokemon pokemon, IItem heldItem, ref bool prevented)

Plugins/PkmnLib.Plugin.Gen7/Scripts/Battle/MudSportEffect.cs

@@ -10,7 +10,7 @@ public class MudSportEffect : Script, IScriptChangeBasePower, IScriptOnEndTurn
     {
         if (move.UseMove.MoveType.Name == "electric")
         {
-            basePower = basePower.MultiplyOrMax(2f / 3f);
+            basePower = basePower.MultiplyOrMax(1352 / 4096f);
         }
     }