Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-12-03 17:29:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Relocate N OT logic

Browse source 
Make Legal.cs not care about encounter data :)
This commit is contained in:
Kurt 2020-10-06 20:09:14 -07:00
parent fe7a4df17e
commit 6616996905
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Core.cs
View file

@ -342,8 +342,6 @@ namespace PKHeX.Core
return pkm.Format == 5 && pkm.BW; return pkm.Format == 5 && pkm.BW;
} }
public static string GetG5OT_NSparkle(int lang) => lang == (int)LanguageID.Japanese ? "Ｎ" : "N";
public static int GetMaxLengthOT(int gen, LanguageID lang) public static int GetMaxLengthOT(int gen, LanguageID lang)
{ {
switch (lang) switch (lang)

6
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic5N.cs
View file

@ -39,9 +39,11 @@
{ {
pk5.IV_HP = pk5.IV_ATK = pk5.IV_DEF = pk5.IV_SPA = pk5.IV_SPD = pk5.IV_SPE = 30; pk5.IV_HP = pk5.IV_ATK = pk5.IV_DEF = pk5.IV_SPA = pk5.IV_SPD = pk5.IV_SPE = 30;
pk5.NPokémon = NSparkle; pk5.NPokémon = NSparkle;
pk5.OT_Name = Legal.GetG5OT_NSparkle(lang); pk5.OT_Name = GetOT(lang);
pk5.TID = 00002; pk5.TID = 00002;
pk5.SID = 00000; pk5.SID = 00000;
} }
public static string GetOT(int lang) => lang == (int)LanguageID.Japanese ? "Ｎ" : "N";
} }
} }

2
PKHeX.Core/Legality/Verifiers/NHarmoniaVerifier.cs
View file

@ -42,7 +42,7 @@ namespace PKHeX.Core
var ot = pkm.OT_Name; var ot = pkm.OT_Name;
if (ot.Length != 1) if (ot.Length != 1)
return false; return false;
var c = Legal.GetG5OT_NSparkle(pkm.Language); var c = EncounterStatic5N.GetOT(pkm.Language);
return c == ot; return c == ot;
} }
} }