From 8546ecaf460241facb76df1f56798b72859d8d2e Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 21 Jan 2021 09:27:33 -0800 Subject: [PATCH] Fix suggested moveset --- PKHeX.Core/Editing/Applicators/MoveSetApplicator.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Editing/Applicators/MoveSetApplicator.cs b/PKHeX.Core/Editing/Applicators/MoveSetApplicator.cs index f9a58267d..69f8738b9 100644 --- a/PKHeX.Core/Editing/Applicators/MoveSetApplicator.cs +++ b/PKHeX.Core/Editing/Applicators/MoveSetApplicator.cs @@ -22,7 +22,8 @@ public static int[] GetMoveSet(this PKM pk, bool random = false) var clone = pk.Clone(); clone.SetMoves(moves); - var newLa = new LegalityAnalysis(pk); + clone.SetMaximumPPCurrent(moves); + var newLa = new LegalityAnalysis(clone); // ReSharper disable once TailRecursiveCall return newLa.Valid ? moves : GetMoveSet(pk, true); @@ -36,7 +37,7 @@ public static int[] GetMoveSet(this PKM pk, bool random = false) /// 4 moves public static int[] GetMoveSet(this LegalityAnalysis la, bool random = false) { - int[] m = la.GetSuggestedCurrentMoves(random ? MoveSourceType.All : MoveSourceType.None); + int[] m = la.GetSuggestedCurrentMoves(random ? MoveSourceType.All : MoveSourceType.Encounter); var learn = la.GetSuggestedMovesAndRelearn(); if (!m.All(z => learn.Contains(z)))