Merge pull request #1307 from sora10pls/master

Manaphy Egg fixes
This commit is contained in:
Kurt 2017-07-05 17:36:28 -07:00 committed by GitHub
commit e71d9af13e

View file

@ -901,20 +901,26 @@ namespace PKHeX.Core
foreach (var z in validWC3)
yield return z;
}
private static bool IsRangerManaphy(PKM pkm)
{
var egg = pkm.Egg_Location;
const int ranger = 3001;
const int linkegg = 2002;
if (!pkm.IsEgg) // Link Trade Egg or Ranger
return egg == linkegg || egg == ranger;
if (egg != ranger)
return false;
var met = pkm.Met_Location;
return met == linkegg || met == 0;
}
private static IEnumerable<MysteryGift> GetMatchingPCD(PKM pkm, IEnumerable<MysteryGift> DB)
{
if (DB == null)
yield break;
if (pkm.Species == 490 && (pkm.WasEgg || pkm.IsEgg)) // Manaphy
{
if (pkm.IsEgg && pkm.Format != 4) // transferred
yield break;
int loc = pkm.IsEgg ? pkm.Met_Location : pkm.Egg_Location;
if (loc == 2002 || loc == 3001) // Link Trade Egg || Ranger
yield return new PGT { Data = { [0] = 7, [8] = 1 } };
yield break;
}
if (IsRangerManaphy(pkm))
yield return new PGT { Data = { [0] = 7, [8] = 1 } };
yield break;
var validPCD = new List<MysteryGift>();
var vs = GetValidPreEvolutions(pkm).ToArray();