From 4b83fdbe2c3ac510d28498bed7563f780eb87781 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 7 Sep 2017 23:53:12 -0700 Subject: [PATCH] Add preliminary VC2 legality checking Surprisingly easy to toggle on If VC, provide possible version the encounter was matched to (to indicate GS vs RBY). --- PKHeX.Core/Legality/Analysis.cs | 4 +++- PKHeX.Core/Legality/Core.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs index 30934c3b6..fb0edd19d 100644 --- a/PKHeX.Core/Legality/Analysis.cs +++ b/PKHeX.Core/Legality/Analysis.cs @@ -73,7 +73,7 @@ public LegalityAnalysis(PKM pk) case 5: ParsePK5(pk); break; case 6: ParsePK6(pk); break; - case 1: ParsePK7(pk); break; + case 1: case 2: case 7: ParsePK7(pk); break; } @@ -344,6 +344,8 @@ private string GetVerboseLegalityReport() lines.AddRange(br); lines.Add(string.Format(V195, EncounterName)); + if (pkm.VC) + lines.Add(string.Format(V196, nameof(GameVersion), Info.Game)); var pidiv = Info.PIDIV ?? MethodFinder.Analyze(pkm); if (pidiv != null) { diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs index f1e506d5c..383c6170b 100644 --- a/PKHeX.Core/Legality/Core.cs +++ b/PKHeX.Core/Legality/Core.cs @@ -34,7 +34,7 @@ public static partial class Legal /// Setting to specify if an analysis should permit data sourced from the physical cartridge era of GameBoy games. public static bool AllowGBCartEra { get; set; } public static bool AllowGen1Tradeback { get; set; } - public static bool AllowGen2VCTransfer => AllowGen1Tradeback; + public static bool AllowGen2VCTransfer => true; public static bool AllowGen2VCCrystal => false; public static bool AllowGen2Crystal => AllowGBCartEra || AllowGen2VCCrystal; public static bool AllowGen2MoveReminder => AllowGBCartEra;