Return version-sensitive moves for nonspecial fetch

Closes #1998 , GetValidMoves returns moves without sensitivity for
current version for pre gen6 moves... can resolve that later.
This commit is contained in:
Kurt 2018-06-11 20:23:28 -07:00
parent fb6e28112a
commit 5ad8a4e5a4

View file

@ -363,6 +363,8 @@ namespace PKHeX.Core
return new int[4]; return new int[4];
if (pkm.IsEgg && pkm.Format <= 5) // pre relearn if (pkm.IsEgg && pkm.Format <= 5) // pre relearn
return Legal.GetBaseEggMoves(pkm, pkm.Species, (GameVersion)pkm.Version, pkm.CurrentLevel); return Legal.GetBaseEggMoves(pkm, pkm.Species, (GameVersion)pkm.Version, pkm.CurrentLevel);
if (!(tm || tutor || reminder))
return MoveLevelUp.GetEncounterMoves(pkm, pkm.CurrentLevel, (GameVersion)pkm.Version);
return Legal.GetValidMoves(pkm, Info.EvoChainsAllGens, Tutor: tutor, Machine: tm, MoveReminder: reminder).Skip(1).ToArray(); // skip move 0 return Legal.GetValidMoves(pkm, Info.EvoChainsAllGens, Tutor: tutor, Machine: tm, MoveReminder: reminder).Skip(1).ToArray(); // skip move 0
} }
public EncounterStatic GetSuggestedMetInfo() => EncounterSuggestion.GetSuggestedMetInfo(pkm); public EncounterStatic GetSuggestedMetInfo() => EncounterSuggestion.GetSuggestedMetInfo(pkm);