From 7ec1cab9a7d5bf05e25f0cf63b3e3aa7cba0dca3 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 16 Jul 2018 15:22:40 -0700 Subject: [PATCH] Update gen1/2 trade generator to emit gen1 if match Closes #2060 --- .../Encounters/Generator/EncounterGenerator.cs | 2 +- .../124 - LOLA - 0F0EBB7A9D04.pk7 | Bin 0 -> 232 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/124 - LOLA - 0F0EBB7A9D04.pk7 diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs index e710ab1d2..a5b3a5b32 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs @@ -114,7 +114,7 @@ private static IEnumerable GenerateRawEncounters12(PKM pkm, Gam var deferred = new List(); foreach (var t in GetValidEncounterTrades(pkm, vs, game)) { - if (pkm.Format >= 7) + if (pkm.Format >= 7 && (t.Generation == 2 || t.GetOT(pkm.Language) != pkm.OT_Name)) // ot length collision { deferred.Add(t); continue; diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/124 - LOLA - 0F0EBB7A9D04.pk7 b/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/124 - LOLA - 0F0EBB7A9D04.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..cb9bcdf8aee014e3aa4223790d94a393c47fc4f5 GIT binary patch literal 232 zcmZRXTeX{kfsen2fq_ASmw~}Go`E5pg@IwQ;I;1zOh7>bz=y$~!H2;Siz-HjK87j= zW(H+0IWAOb`K_P!2QYXucrc_gM4(E6c#Q0Z$bxPRj4VJ0L4hkn9zzL35m09yLn1>8 eLq3oV0d6oQ3_|PzK(=iui!6h(Av+^GNCE(I_7emE literal 0 HcmV?d00001