diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index fa775961e..c5159bc96 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -1490,7 +1490,7 @@ private void InitializeStrings() GameInfo.Strings = GameInfo.getStrings(l); // Update Legality Strings - // Clipboard.SetText(string.Join(Environment.NewLine, CheckStrings.getLocalization())); + // Clipboard.SetText(string.Join(Environment.NewLine, Util.getLocalization(typeof(LegalityCheckStrings)))); Task.Run(() => Util.setLocalization(typeof(LegalityCheckStrings))); // Force an update to the met locations diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 94f177e70..26ae963a8 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -204,6 +204,11 @@ private void verifyNickname() if (pk.Length > (lang == 2 ? 10 : 5)) AddLine(Severity.Invalid, V1, CheckIdentifier.Nickname); } + else if (EncounterIsMysteryGift) + { + if (pkm.IsNicknamed && (!(EncounterMatch as MysteryGift)?.IsEgg ?? false)) + AddLine(Severity.Fishy, V0, CheckIdentifier.Nickname); + } if (!Encounter.Valid) return; diff --git a/PKHeX/Legality/LegalityCheckStrings.cs b/PKHeX/Legality/LegalityCheckStrings.cs index 6333ced0f..0eb636866 100644 --- a/PKHeX/Legality/LegalityCheckStrings.cs +++ b/PKHeX/Legality/LegalityCheckStrings.cs @@ -110,6 +110,7 @@ public static class LegalityCheckStrings public static string V9 {get; set;} = "Ingame Trade Nickname has been altered."; // Fishy public static string V15 {get; set;} = "Nickname matches another species name (+language)."; // Fishy public static string V16 {get; set;} = "Nickname flagged, matches species name."; // Fishy + public static string V0 {get; set;} = "Event gift has been nicknamed."; // Fishy public static string V21 {get; set;} = "Matches: {0} {1}"; // Valid @@ -339,10 +340,10 @@ public static class LegalityCheckStrings public static string V338 {get; set;} = "Defog and whirpool. One of the two moves should have been removed before transfered to generation 5."; public static string V339 {get; set;} = "Generation {0} HM. Should have been removed before transfered to generation {1}."; public static string V340 {get; set;} = "Not an expected egg move."; - public static string V341 {get; set;} = "Egg Move.Not expected in an event egg."; + public static string V341 {get; set;} = "Egg Move. Not expected in an event egg."; public static string V342 {get; set;} = "Event egg move missing."; - public static string V343 {get; set;} = "Expected the following Moves: { 0}"; - public static string V347 {get; set;} = "Inherited move learned by Level-up.Not expected in an event egg."; + public static string V343 {get; set;} = "Expected the following Moves: {0}"; + public static string V347 {get; set;} = "Inherited move learned by Level-up. Not expected in an event egg."; public static string V348 {get; set;} = "Inherited tutor move. Not expected in an event egg."; public static string V350 {get; set;} = "Inherited TM/HM move. Not expected in an event egg."; public static string V351 {get; set;} = "Invalid Met Location, expected Transporter or Crown."; // Invalid diff --git a/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt b/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt index 1d4a56e97..8cb5bef9b 100644 --- a/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt +++ b/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt @@ -74,6 +74,7 @@ V10 = Ingame Trade OT has been altered. V9 = Ingame Trade Nickname has been altered. V15 = Nickname matches another species name (+language). V16 = Nickname flagged, matches species name. +V0 = Event gift has been nicknamed. V21 = Matches: {0} {1} V25 = EV total cannot be above 510. V22 = Eggs cannot receive EVs. @@ -279,10 +280,10 @@ V337 = Event Egg Move. Incompatible with normal egg moves. V338 = Defog and whirpool. One of the two moves should have been removed before transfered to generation 5. V339 = Generation {0} HM. Should have been removed before transfered to generation {1}. V340 = Not an expected egg move. -V341 = Inherited Egg Move. Not expected in an event egg. +V341 = Egg Move.Not expected in an event egg. V342 = Event egg move missing. -V343 = Expected the following Moves: {0} -V347 = Inherited move learned by Level-up. Not expected in an event egg. +V343 = Expected the following Moves: { 0} +V347 = Inherited move learned by Level-up.Not expected in an event egg. V348 = Inherited tutor move. Not expected in an event egg. V350 = Inherited TM/HM move. Not expected in an event egg. V351 = Invalid Met Location, expected Transporter or Crown. @@ -292,7 +293,7 @@ V354 = Non Platinum Shaymin from Flower Paradise. Unreleased event. V357 = Only one Ninjask move allowed. V358 = Inherited move learned by Level-up. Incompatible with event egg moves. V359 = Unable to match a gift egg encounter from origin game. -V360 = Unable to match an event egg encounter from origin game.; +V360 = Unable to match an event egg encounter from origin game. V363 = Incompatible moves. Learned at the same level in Red/Blue and Yellow. V365 = Incompatible evolution moves. {0} Move learned at a lower level than other {1} moves. V366 = Incompatible evolution moves. {1} Move learned at a higher level than other {0} moves. \ No newline at end of file diff --git a/PKHeX/Resources/text/zh/LegalityCheckStrings_zh.txt b/PKHeX/Resources/text/zh/LegalityCheckStrings_zh.txt index ac9081896..d5c91f87d 100644 --- a/PKHeX/Resources/text/zh/LegalityCheckStrings_zh.txt +++ b/PKHeX/Resources/text/zh/LegalityCheckStrings_zh.txt @@ -30,6 +30,8 @@ V346 = 遗传了教学招式。 V349 = 遗传了TM/HM招式。 V355 = 通过土居忍士进化为铁面忍者习得。 V356 = 通过土居忍士在第{0}世代进化为铁面忍者习得。 +V361 = Default move. +V362 = Default move in generation {0}. V203 = 无性别宝可梦不能有性别。 V201 = 未设置加密常数。 V204 = 持有物未解禁。 @@ -72,6 +74,7 @@ V10 = 游戏内连接交换的初训家被修改。 V9 = 游戏内连接交换的昵称被修改。 V15 = 昵称与另一宝可梦种类名一致 (+language)。 V16 = 昵称被标记, 与种类名一致。 +V0 = Event gift has been nicknamed. V21 = 匹配: {0} {1} V25 = 努力值总和不能超过510。 V22 = 蛋不能有努力值。 @@ -290,4 +293,7 @@ V354 = 非白金版来自花之乐园的谢米,未发布的配信。 V357 = 只能拥有一个铁面忍者的招式。 V358 = 遗传升级招式。与配信蛋招式冲突。 V359 = 无法在来源版本中匹配到相应的礼物蛋。 -V360 = 无法在来源版本中匹配到相应的配信蛋。 \ No newline at end of file +V360 = 无法在来源版本中匹配到相应的配信蛋。 +V363 = Incompatible moves. Learned at the same level in Red/Blue and Yellow. +V365 = Incompatible evolution moves. {0} Move learned at a lower level than other {1} moves. +V366 = Incompatible evolution moves. {1} Move learned at a higher level than other {0} moves. \ No newline at end of file