diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs index 82b588a09..9a57e21f1 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EncounterVerifier.cs @@ -112,10 +112,10 @@ namespace PKHeX.Core } // Eggs - private static CheckResult VerifyEncounterEgg(PKM pkm) + private static CheckResult VerifyEncounterEgg(PKM pkm, bool checkSpecies = true) { // Check Species - if (Legal.NoHatchFromEgg.Contains(pkm.Species)) + if (checkSpecies && Legal.NoHatchFromEgg.Contains(pkm.Species)) return new CheckResult(Severity.Invalid, LEggSpecies, CheckIdentifier.Encounter); switch (pkm.GenNumber) @@ -357,7 +357,7 @@ namespace PKHeX.Core } if (!pkm.IsEgg && MatchedGift.IsEgg) // hatched { - var hatchCheck = VerifyEncounterEgg(pkm); + var hatchCheck = VerifyEncounterEgg(pkm, false); if (!hatchCheck.Valid) return hatchCheck; } diff --git a/PKHeX.Core/MysteryGifts/PGT.cs b/PKHeX.Core/MysteryGifts/PGT.cs index e7eb5cf55..9fc0225b8 100644 --- a/PKHeX.Core/MysteryGifts/PGT.cs +++ b/PKHeX.Core/MysteryGifts/PGT.cs @@ -108,9 +108,9 @@ namespace PKHeX.Core private GiftType PGTGiftType { get => (GiftType)Data[0]; set => Data[0] = (byte)value; } public bool IsHatched => PGTGiftType == GiftType.Pokémon; - public override bool IsEgg { get => PGTGiftType == GiftType.PokémonEgg; set { if (value) { PGTGiftType = GiftType.PokémonEgg; PK.IsEgg = true; } } } + public override bool IsEgg { get => PGTGiftType == GiftType.PokémonEgg || IsManaphyEgg; set { if (value) { PGTGiftType = GiftType.PokémonEgg; PK.IsEgg = true; } } } public bool IsManaphyEgg { get => PGTGiftType == GiftType.ManaphyEgg; set { if (value) PGTGiftType = GiftType.ManaphyEgg; } } - public override bool EggEncounter => IsEgg || IsManaphyEgg; + public override bool EggEncounter => IsEgg; public override bool IsItem { get => PGTGiftType == GiftType.Item; set { if (value) PGTGiftType = GiftType.Item; } } public override bool IsPokémon { get => PGTGiftType == GiftType.Pokémon || PGTGiftType == GiftType.PokémonEgg || PGTGiftType == GiftType.ManaphyEgg; set { } }