From feb36f58b515d34e62eeae10d59d04b868568ebc Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 11 May 2019 13:10:51 -0700 Subject: [PATCH] Minor simplification #2298 #2299 --- PKHeX.Core/Legality/LegalityCheckStrings.cs | 1 - PKHeX.Core/Legality/Verifiers/PIDVerifier.cs | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/PKHeX.Core/Legality/LegalityCheckStrings.cs b/PKHeX.Core/Legality/LegalityCheckStrings.cs index 1eb51f86b..d29a2ae87 100644 --- a/PKHeX.Core/Legality/LegalityCheckStrings.cs +++ b/PKHeX.Core/Legality/LegalityCheckStrings.cs @@ -132,7 +132,6 @@ namespace PKHeX.Core public static string LEncGiftNotFound { get; set; } = "Unable to match to a Mystery Gift in the database."; public static string LEncGiftPIDMismatch { get; set; } = "Mystery Gift fixed PID mismatch."; public static string LEncGiftShinyMismatch { get; set; } = "Mystery Gift shiny mismatch."; - public static string LEncGiftShinyAshGreninja { get; set; } = "Ash-Greninja cannot be shiny"; public static string LEncGiftVersionNotDistributed { get; set; } = "Mystery Gift cannot be received by this version."; public static string LEncInvalid { get; set; } = "Unable to match an encounter from origin game."; diff --git a/PKHeX.Core/Legality/Verifiers/PIDVerifier.cs b/PKHeX.Core/Legality/Verifiers/PIDVerifier.cs index 574a1ab5b..ef448b5bf 100644 --- a/PKHeX.Core/Legality/Verifiers/PIDVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/PIDVerifier.cs @@ -66,11 +66,8 @@ namespace PKHeX.Core if (d.Gift.PK.PID != 1 && pkm.EncryptionConstant != d.Gift.PK.PID) data.AddLine(GetInvalid(LEncGiftPIDMismatch, CheckIdentifier.Shiny)); break; - case WC7 seventhGenerationMysteryGift: - if (seventhGenerationMysteryGift.IsAshGreninjaWC7(pkm) && pkm.IsShiny) - { - data.AddLine(GetInvalid(LEncGiftShinyAshGreninja, CheckIdentifier.Shiny)); - } + case WC7 wc7 when wc7.IsAshGreninjaWC7(pkm) && pkm.IsShiny: + data.AddLine(GetInvalid(LEncGiftShinyMismatch, CheckIdentifier.Shiny)); break; } }