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

Misc gen3 related legal check fixes

Browse source
This commit is contained in:
Kurt 2017-05-28 15:49:20 -07:00
parent 87e99bf183
commit e01c8a5786
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKHeX.Core/Legality/Checks.cs
View file

@ -95,9 +95,7 @@ namespace PKHeX.Core
if (pkm.Species == 265)
AddLine(Severity.Valid, string.Format(V212, evoVal == 0 ? specieslist[267] : specieslist[269]), CheckIdentifier.EC);
int wIndex = Array.IndexOf(Legal.WurmpleEvolutions, pkm.Species) / 2;
if (evoVal != wIndex)
else if (evoVal != Array.IndexOf(Legal.WurmpleEvolutions, pkm.Species) / 2)
AddLine(Severity.Invalid, V210, CheckIdentifier.EC);
}
private void verifyEC()

4
PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
View file

@ -154,10 +154,10 @@ namespace PKHeX.Core
foreach (var z in getValidFriendSafari(pkm))
{ yield return z; ++ctr; }
if (ctr != 0) yield break;
if (ctr != 0 && !gen3egg) yield break;
foreach (var z in getValidWildEncounters(pkm))
{ yield return z; ++ctr; }
if (ctr != 0) yield break;
if (ctr != 0 && !gen3egg) yield break;
foreach (var z in getValidEncounterTrade(pkm))
{ yield return z; ++ctr; }
// if (ctr != 0) yield break;

4
PKHeX.Core/Legality/Encounters/VerifyEncounter.cs
View file

@ -10,8 +10,6 @@ namespace PKHeX.Core
if (encounter is EncounterEgg e)
{
pkm.WasEgg = true;
if (pkm.GenNumber == 3)
return verifyEncounterEgg3Transfer(pkm);
return verifyEncounterEgg(pkm, e);
}
if (encounter is EncounterLink l)
@ -55,7 +53,7 @@ namespace PKHeX.Core
{
case 1:
case 2: return new CheckResult(CheckIdentifier.Encounter); // no met location info
case 3: return verifyEncounterEgg3(pkm);
case 3: return pkm.Format != 3 ? verifyEncounterEgg3Transfer(pkm) : verifyEncounterEgg3(pkm);
case 4: return pkm.IsEgg ? verifyUnhatchedEgg(pkm, 02002) : verifyEncounterEgg4(pkm);
case 5: return pkm.IsEgg ? verifyUnhatchedEgg(pkm, 30002) : verifyEncounterEgg5(pkm);
case 6: return pkm.IsEgg ? verifyUnhatchedEgg(pkm, 30002) : verifyEncounterEgg6(pkm);