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

Make pgt ranger manaphy IsEgg true

Browse source
This commit is contained in:
Kurt 2020-01-12 23:00:32 -08:00
parent 81f280f4d1
commit 11978dab4f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}

4
PKHeX.Core/MysteryGifts/PGT.cs
View file

@ -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 { } }