From 263f416edcd51b9d9d5eb1de178c3d8326b8bf7d Mon Sep 17 00:00:00 2001 From: javierhimura Date: Sun, 23 Apr 2017 16:46:14 +0200 Subject: [PATCH] Fix function name, this return all valid moves after evolving, not only the exclusive moves --- PKHeX/Legality/Checks.cs | 2 +- PKHeX/Legality/Core.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 5cd069913..852a91e48 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -3204,7 +3204,7 @@ private void ParseEvolutionLevelupMove(int[] moves, List[] EggMovesSplitLea if (EncounterMatch == null && pkm.WasEgg && Legal.BabyEvolutionWithMove.Contains(pkm.Species) && !IncenseMovesLearned.Any() && !EggMovesSplitLearned[0].Any()) return; - var ValidMoves = Legal.getExclusivePostEvolutionMoves(pkm, pkm.Species, EvoChainsAllGens, GameVersion.Any); + var ValidMoves = Legal.getValidPostEvolutionMoves(pkm, pkm.Species, EvoChainsAllGens, GameVersion.Any); // Add the evolution moves to valid moves in case some of this moves could not be learned after evolving switch(pkm.Species) { diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index b65695a4b..320bf3c7e 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -1168,18 +1168,18 @@ internal static IEnumerable getBaseEggMoves(PKM pkm, int skipOption, GameVe } return new int[0]; } - internal static List getExclusivePostEvolutionMoves(PKM pkm, int Species, DexLevel[][] evoChains, GameVersion Version) + internal static List getValidPostEvolutionMoves(PKM pkm, int Species, DexLevel[][] evoChains, GameVersion Version) { // Return moves that the pokemon could learn after evolving var moves = new List(); for (int i = 1; i < evoChains.Length; i++) if (evoChains[i].Any()) - moves.AddRange(getExclusivePostEvolutionMoves(pkm, Species, evoChains[i], i, Version)); + moves.AddRange(getValidPostEvolutionMoves(pkm, Species, evoChains[i], i, Version)); if (pkm.GenNumber >= 6) moves.AddRange(pkm.RelearnMoves.Where(m => m != 0)); return moves.Distinct().ToList(); } - internal static IEnumerable getExclusivePostEvolutionMoves(PKM pkm, int Species, DexLevel[] evoChain, int Generation, GameVersion Version) + internal static IEnumerable getValidPostEvolutionMoves(PKM pkm, int Species, DexLevel[] evoChain, int Generation, GameVersion Version) { var evomoves = new List(); var index = Array.FindIndex(evoChain, e => e.Species == Species);