From 39f1805940a3a12cdcd40ed71c48db326bccd522 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 1 Apr 2018 20:25:40 -0700 Subject: [PATCH] Fix gen2 met data setting --- PKHeX.Core/Legality/Encounters/EncounterSlot.cs | 14 +++++++++++--- PKHeX.Core/Legality/Encounters/EncounterStatic.cs | 13 ++++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot.cs index a19865931..e871e9531 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot.cs @@ -84,9 +84,17 @@ public PKM ConvertToPKM(ITrainerInfo SAV) pk.Gender = gender = pk.GetSaneGender(gender); pk.Nickname = PKX.GetSpeciesNameGeneration(Species, lang, Generation); pk.Ball = 4; - pk.Met_Level = level; - pk.Met_Location = Location; - pk.MetDate = DateTime.Today; + + if (pk.Format > 2 || Version == GameVersion.C) + { + pk.Met_Location = Location; + pk.Met_Level = level; + if (Version == GameVersion.C && pk is PK2 pk2 && this is EncounterSlot1 slot) + pk2.Met_TimeOfDay = slot.Time.RandomValidTime(); + + if (pk.Format >= 4) + pk.MetDate = DateTime.Today; + } pk.Language = lang; pk.SetRandomIVs(flawless: 3); diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic.cs index c594f228e..03477b440 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic.cs @@ -96,9 +96,16 @@ public PKM ConvertToPKM(ITrainerInfo SAV) } pk.Nickname = PKX.GetSpeciesNameGeneration(Species, lang, Generation); pk.Ball = Ball; - pk.Met_Level = level; - pk.Met_Location = Location; - pk.MetDate = today; + if (pk.Format > 2 || Version == GameVersion.C) + { + pk.Met_Location = Location; + pk.Met_Level = level; + if (Version == GameVersion.C && pk is PK2 pk2) + pk2.Met_TimeOfDay = EncounterTime.Any.RandomValidTime(); + + if (pk.Format >= 4) + pk.MetDate = DateTime.Today; + } if (EggEncounter) { pk.Egg_Location = EggLocation;