From efc60c3bf83d6b72f9bf2ce62ed9585059915046 Mon Sep 17 00:00:00 2001 From: javierhimura Date: Sat, 23 Sep 2017 12:58:46 +0200 Subject: [PATCH] Change VC1 pokemon tradeback initial status to allow VC2 origin, there is no way to know if the pokemon was traded to gen7 after or before VC2 release Do not allow gen1 evolutions for VC2 pokemon without gen1 evolutions or preevolutions --- PKHeX.Core/Legality/Analysis.cs | 15 +++++---------- PKHeX.Core/Legality/Core.cs | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs index fb0edd19d..c3fa7dfa3 100644 --- a/PKHeX.Core/Legality/Analysis.cs +++ b/PKHeX.Core/Legality/Analysis.cs @@ -224,16 +224,11 @@ namespace PKHeX.Core else pkm.TradebackStatus = TradebackType.Any; } - else if (pkm.VC1) - { - // If VC2 is ever released, we can assume it will be TradebackType.Any. - // Met date cannot be used definitively as the player can change their system clock. - pkm.TradebackStatus = TradebackType.Gen1_NotTradeback; - } - else - { - pkm.TradebackStatus = TradebackType.Any; - } + + // VC2 is released, we can assume it will be TradebackType.Any. + // Met date cannot be used definitively as the player can change their system clock. + // Is impossible to difference between a VC1 pokemon trade to gen7 after or before VC2 release. + pkm.TradebackStatus = TradebackType.Any; } private void UpdateTypeInfo() { diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs index 3916fbd6a..430a56ee7 100644 --- a/PKHeX.Core/Legality/Core.cs +++ b/PKHeX.Core/Legality/Core.cs @@ -1459,7 +1459,7 @@ namespace PKHeX.Core { var CompleteEvoChain = GetEvolutionChain(pkm, Encounter).ToArray(); int maxgen = pkm.Format == 1 && !pkm.Gen1_NotTradeback ? 2 : pkm.Format; - int mingen = pkm.Format == 2 && !pkm.Gen2_NotTradeback || pkm.Format >= 7 && pkm.GenNumber < 3 ? 1 : pkm.GenNumber; + int mingen = (pkm.Format == 2 || pkm.VC2) && !pkm.Gen2_NotTradeback ? 1 : pkm.GenNumber; DexLevel[][] GensEvoChains = new DexLevel[maxgen + 1][]; for (int i = 0; i <= maxgen; i++) GensEvoChains[i] = new DexLevel[0];