From 187ed9775a5827770e2c429662a6b9573b22c74c Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 6 Sep 2020 11:34:50 -0700 Subject: [PATCH] Use trainer details for manaphy egg if possible https://projectpokemon.org/home/forums/topic/57790-bug-manaphy-egg-shown-illegal-wrong-egg-met-date-if-i-import-directly-the-pgt/?tab=comments#comment-260826 --- PKHeX.Core/MysteryGifts/PGT.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/MysteryGifts/PGT.cs b/PKHeX.Core/MysteryGifts/PGT.cs index a667bc9a2..8c57a69b0 100644 --- a/PKHeX.Core/MysteryGifts/PGT.cs +++ b/PKHeX.Core/MysteryGifts/PGT.cs @@ -135,7 +135,7 @@ public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria) } if (IsManaphyEgg) - SetDefaultManaphyEggDetails(pk4); + SetDefaultManaphyEggDetails(pk4, sav); SetPINGA(pk4, criteria); SetMetData(pk4, sav); @@ -166,7 +166,7 @@ private void SetMetData(PK4 pk4, ITrainerInfo trainer) } } - private static void SetDefaultManaphyEggDetails(PK4 pk4) + private static void SetDefaultManaphyEggDetails(PK4 pk4, ITrainerInfo trainer) { // Since none of this data is populated, fill in default info. pk4.Species = (int)Core.Species.Manaphy; @@ -178,8 +178,8 @@ private static void SetDefaultManaphyEggDetails(PK4 pk4) pk4.Ability = (int)Ability.Hydration; pk4.FatefulEncounter = true; pk4.Ball = (int)Core.Ball.Poke; - pk4.Version = (int)GameVersion.D; - pk4.Language = (int)LanguageID.English; + pk4.Version = GameVersion.Gen4.Contains(trainer.Game) ? trainer.Game : (int)GameVersion.D; + pk4.Language = trainer.Language < (int)LanguageID.Korean ? trainer.Language : (int)LanguageID.English; pk4.Egg_Location = 1; // Ranger (will be +3000 later) }