Many more tests and fixes

2026-08-27 17:11:12 +02:00
parent 32b3ef9c4a
commit d2a82b5fe3
204 changed files with 20255 additions and 242 deletions
--- a/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Instruct.cs
+++ b/Plugins/PkmnLib.Plugin.Gen7/Scripts/Moves/Instruct.cs
@@ -1,4 +1,5 @@
 using PkmnLib.Dynamic.BattleFlow;
+using PkmnLib.Plugin.Gen7.Scripts.Utils;

 namespace PkmnLib.Plugin.Gen7.Scripts.Moves;

@@ -16,7 +17,8 @@ public class Instruct : Script, IScriptOnSecondaryEffect

        var lastMoveChoiceByTarget = target.BattleData?.LastMoveChoice;

-        if (lastMoveChoiceByTarget == null || !battleData.Battle.CanUse(lastMoveChoiceByTarget))
+        if (lastMoveChoiceByTarget == null || !battleData.Battle.CanUse(lastMoveChoiceByTarget) ||
+            !lastMoveChoiceByTarget.ChosenMove.MoveData.CanCopyMove())
        {
            move.GetHitData(target, hit).Fail();
            return;