Fix relearnmove suggestion for set relearn moves

This commit is contained in:
Kurt
2017-05-30 18:28:06 -07:00
parent 2e30878e8b
commit f60f36081a
2 changed files with 1 additions and 7 deletions

View File

@@ -173,15 +173,8 @@ private static CheckResult[] parseMovesSpecialMoveset(PKM pkm, int[] Moves, Lega
var emptyegg = new int[0];
CheckResult[] res = parseMoves(pkm, Moves, SpecialMoves, emptyegg, emptyegg, empty, new int[0], new int[0], false, info);
if (res.Any(r => !r.Valid))
{
info.RelearnBase = new int[4];
return res;
}
if (pkm.GenNumber >= 6 && info.EncounterMatch is MysteryGift z)
info.RelearnBase = z.RelearnMoves;
else
info.RelearnBase = new int[4];
return res;
}
private static CheckResult[] parseMovesRelearn(PKM pkm, int[] Moves, LegalInfo info)

View File

@@ -743,6 +743,7 @@ private void clickMoves(object sender, EventArgs e)
else if (sender == GB_RelearnMoves)
{
int[] m = Legality.getSuggestedRelearn();
if (m.All(z => z == 0))
if (!pkm.WasEgg && !pkm.WasEvent && !pkm.WasEventEgg && !pkm.WasLink)
{
var encounter = Legality.getSuggestedMetInfo();