From 4e9ea707f9b2a972798a1acabdc248242cedc3a4 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 8 May 2016 18:11:31 -0700 Subject: [PATCH] Fix untraded Glalie/Steelix link gift history chk Has an OT, HT=player but doesn't get a geolocation, behaves like a wc6 gift. --- Legality/Checks.cs | 2 +- Legality/Data.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Legality/Checks.cs b/Legality/Checks.cs index 843f53562..9db728285 100644 --- a/Legality/Checks.cs +++ b/Legality/Checks.cs @@ -583,7 +583,7 @@ private LegalityCheck verifyHistory() if (pk6.OT_Feeling != MatchedWC6.OT_Feeling) return new LegalityCheck(Severity.Invalid, "Event " + (MatchedWC6.OT_Feeling == 0 ? "should not have an OT Memory Feeling value" : "OT Memory Feeling should be index " + MatchedWC6.OT_Feeling) + "."); } - if (!pk6.WasEvent && (pk6.HT_Name.Length == 0 || pk6.Geo1_Country == 0)) // Is not Traded + if (!pk6.WasEvent && !(pk6.WasLink && (EncounterMatch as EncounterLink)?.OT == false) && (pk6.HT_Name.Length == 0 || pk6.Geo1_Country == 0)) // Is not Traded { if (pk6.HT_Name.Length != 0) return new LegalityCheck(Severity.Invalid, "GeoLocation -- HT Name present but has no previous Country."); diff --git a/Legality/Data.cs b/Legality/Data.cs index e7afe9d45..0e0c79f5e 100644 --- a/Legality/Data.cs +++ b/Legality/Data.cs @@ -223,6 +223,7 @@ public class EncounterLink public bool XY = true; public bool ORAS = true; public bool? Shiny = false; + public bool OT = false; } public enum Nature {