Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-14 16:27:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix suggested moveset

Browse source
This commit is contained in:
Kurt 2021-01-21 09:27:33 -08:00
parent 06e6242944
commit 8546ecaf46
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
PKHeX.Core/Editing/Applicators/MoveSetApplicator.cs
View file

@ -22,7 +22,8 @@ namespace PKHeX.Core
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 @@ namespace PKHeX.Core
/// <returns>4 moves</returns>
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)))