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

Ignore NonEgg Encounter for gen 3 illegal transfer unhatched eggs

Browse source
This commit is contained in:
javierhimura 2017-03-27 00:48:50 +02:00
parent 7f21973038
commit 6d8d6b7758
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
PKHeX/Legality/Checks.cs
View file

@ -722,6 +722,11 @@ namespace PKHeX.Core
if (pkm.WasLink) if (pkm.WasLink)
return verifyEncounterLink(); return verifyEncounterLink();
if (pkm.Gen3 && !pkm.HasOriginalMetLocation)
{
return verifyEncounterG3Transfer();
}
bool wasEvent = pkm.WasEvent || pkm.WasEventEgg; bool wasEvent = pkm.WasEvent || pkm.WasEventEgg;
if (wasEvent) if (wasEvent)
{ {
@ -730,11 +735,6 @@ namespace PKHeX.Core
return result; return result;
} }
if (pkm.Gen3 && !pkm.HasOriginalMetLocation)
{
return verifyEncounterG3Transfer();
}
if (null != (EncounterMatch = Legal.getValidStaticEncounter(pkm))) if (null != (EncounterMatch = Legal.getValidStaticEncounter(pkm)))
{ {
var result = verifyEncounterStatic(); var result = verifyEncounterStatic();
@ -770,8 +770,11 @@ namespace PKHeX.Core
{ {
pkm.WasEgg = true; pkm.WasEgg = true;
EggResult = verifyEncounterEgg3Transfer(); EggResult = verifyEncounterEgg3Transfer();
if (pkm.IsEgg)
return EggResult;
} }
// TODO: Include also gen 3 events
if (null != (EncounterMatch = Legal.getValidStaticEncounter(pkm))) if (null != (EncounterMatch = Legal.getValidStaticEncounter(pkm)))
{ {
NonEggResult = verifyEncounterStatic(); NonEggResult = verifyEncounterStatic();