Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-25 03:47:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary logic

Browse source 
Encounters are thoroughly checked for their origins; don't need to check again if it's possible to have it in an egg.
This commit is contained in:
Kurt 2021-01-01 19:45:40 -08:00
parent 2648560684
commit a7b9fafb69
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs
View file

@ -86,24 +86,17 @@ namespace PKHeX.Core
} }
// Eggs // Eggs
private static CheckResult VerifyEncounterEgg(PKM pkm, int gen, bool checkSpecies = true) private static CheckResult VerifyEncounterEgg(PKM pkm, int gen) => gen switch
{ {
// Check Species 2 => new CheckResult(CheckIdentifier.Encounter), // valid -- no met location info
if (checkSpecies && !Breeding.CanHatchAsEgg(pkm.Species)) 3 => pkm.Format != 3 ? VerifyEncounterEgg3Transfer(pkm) : VerifyEncounterEgg3(pkm),
return new CheckResult(Severity.Invalid, LEggSpecies, CheckIdentifier.Encounter); 4 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade4) : VerifyEncounterEgg4(pkm),
5 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade5) : VerifyEncounterEgg5(pkm),
return gen switch 6 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade6) : VerifyEncounterEgg6(pkm),
{ 7 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade6) : VerifyEncounterEgg7(pkm),
2 => new CheckResult(CheckIdentifier.Encounter), // valid -- no met location info 8 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade6) : VerifyEncounterEgg8(pkm),
3 => pkm.Format != 3 ? VerifyEncounterEgg3Transfer(pkm) : VerifyEncounterEgg3(pkm), _ => new CheckResult(Severity.Invalid, LEggLocationInvalid, CheckIdentifier.Encounter)
4 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade4) : VerifyEncounterEgg4(pkm), };
5 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade5) : VerifyEncounterEgg5(pkm),
6 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade6) : VerifyEncounterEgg6(pkm),
7 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade6) : VerifyEncounterEgg7(pkm),
8 => pkm.IsEgg ? VerifyUnhatchedEgg(pkm, Locations.LinkTrade6) : VerifyEncounterEgg8(pkm),
_ => new CheckResult(Severity.Invalid, LEggLocationInvalid, CheckIdentifier.Encounter)
};
}
private static CheckResult VerifyEncounterEgg3(PKM pkm) private static CheckResult VerifyEncounterEgg3(PKM pkm)
{ {
@ -317,7 +310,7 @@ namespace PKHeX.Core
} }
if (!pkm.IsEgg && gift.IsEgg) // hatched if (!pkm.IsEgg && gift.IsEgg) // hatched
{ {
var hatchCheck = VerifyEncounterEgg(pkm, gift.Generation, false); var hatchCheck = VerifyEncounterEgg(pkm, gift.Generation);
if (!hatchCheck.Valid) if (!hatchCheck.Valid)
return hatchCheck; return hatchCheck;
} }