From eec14645efc0196279bc280b863eabea693efccd Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 15 Aug 2018 15:26:42 -0700 Subject: [PATCH] Lessen string length severity on egg encounters Hatched eggs can have mismatched languages<->OT/Nick restrictions --- PKHeX.Core/Legality/Core.cs | 2 +- PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs | 2 +- PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs index fc7d7c125..6a9ce1578 100644 --- a/PKHeX.Core/Legality/Core.cs +++ b/PKHeX.Core/Legality/Core.cs @@ -1404,7 +1404,7 @@ public static int GetNicknameOTMaxLength(int gen, LanguageID lang) { case LanguageID.Korean: case LanguageID.Japanese: return gen >= 6 ? 6 : 5; - default: return gen >= 6 ? 12 : 6; + default: return gen >= 6 ? 12 : 10; } } } diff --git a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs index 9dd7a15c5..f60a31601 100644 --- a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs @@ -77,7 +77,7 @@ private bool VerifyUnNicknamedEncounter(LegalityAnalysis data, PKM pkm, string n } if (nickname.Length > Legal.GetNicknameOTMaxLength(data.Info.Generation, (LanguageID)pkm.Language)) { - data.AddLine(GetInvalid(V1)); + data.AddLine(Get(V1, data.EncounterOriginal.EggEncounter ? Severity.Fishy : Severity.Invalid)); return true; } data.AddLine(GetValid(V17)); diff --git a/PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs b/PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs index 7b9527c41..7e585560d 100644 --- a/PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs @@ -61,7 +61,7 @@ public override void Verify(LegalityAnalysis data) else if (ot.Length > Legal.GetNicknameOTMaxLength(data.Info.Generation, (LanguageID)pkm.Language)) { if (!pkm.IsEgg) // ignore eggs, on trade, OT is not updated if language is - data.AddLine(GetInvalid(V38)); + data.AddLine(Get(V38, data.EncounterOriginal.EggEncounter ? Severity.Fishy : Severity.Invalid)); } if (Legal.CheckWordFilter)