From 09c96558eacfe36614bb63ab2ae95f17e9f1e464 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 24 Jun 2018 08:02:22 -0700 Subject: [PATCH] Disable gen2 chain clamp not sure of the implications, but fixes #2031 might have to rework this method to clean up the optional params if things are misbehaving --- PKHeX.Core/Legality/Evolutions/EvolutionChain.cs | 2 +- .../466 - エレキブル - 45ED6A2454B8.pk7 | Bin 0 -> 232 bytes .../700 - ニンフィア - F14C560A57A2.pk7 | Bin 0 -> 232 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/466 - エレキブル - 45ED6A2454B8.pk7 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/700 - ニンフィア - F14C560A57A2.pk7 diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionChain.cs b/PKHeX.Core/Legality/Evolutions/EvolutionChain.cs index 92e03cb21..635e36322 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionChain.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionChain.cs @@ -251,7 +251,7 @@ internal static List GetValidPreEvolutions(PKM pkm, int maxspecieso new EvoCriteria { Species = 290, Level = pkm.GenNumber < 5 ? lvl : lvl-1, MinLevel = 1 } // Shedinja spawns after evolving, which is after level up moves were prompted. Not for future generations. }; - if (maxspeciesorigin == -1 && pkm.InhabitedGeneration(2) && pkm.GenNumber == 1) + if (maxspeciesorigin == -1 && pkm.InhabitedGeneration(2) && pkm.Format <= 2 && pkm.GenNumber == 1) maxspeciesorigin = MaxSpeciesID_2; int tree = maxspeciesorigin == MaxSpeciesID_2 ? 2 : pkm.Format; diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/466 - エレキブル - 45ED6A2454B8.pk7 b/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/466 - エレキブル - 45ED6A2454B8.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..22f51d862c4598140eebea03817fa86048d22f8c GIT binary patch literal 232 zcmdlHqLRhH@YeMbBLl-6Q3i&JOa=xI76yi88gYgUM1U0rZw%HNTr+rWfUY=+K^rV& z0F+^7MwWeAZ)yL);E%yx3_T!KjEqc-OomJyOumd0K>Yvz8Cek8{{Zz|0O|$Fpo0H! Xt`MUXkZoJaBFCV{$ix8j83O|Vt{WQf literal 0 HcmV?d00001 diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/700 - ニンフィア - F14C560A57A2.pk7 b/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/700 - ニンフィア - F14C560A57A2.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..4db2671c1e641ea27d35c3620f818daa034ca115 GIT binary patch literal 232 zcmZ1!&K1VM;PY`069dB>Q3i$^3=9n0SQr>y*i5(yWD*3Y4L%!OHCSx0$N*ibB7-_u z$O0(C%#1Ai{r`Tw2L^u(_G0J(sbXYgVq`L8>R|F^oB-ng|If(63Sxl4AE2HKK)o