Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-14 08:17:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update stadium check again

Browse source 
#2065
This commit is contained in:
Kurt 2018-07-20 05:57:57 -07:00
parent 1ff8ebf777
commit c9abeda508
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs
View file

@ -62,7 +62,7 @@ namespace PKHeX.Core
VerifyG1OTWithinBounds(data, tr);
if (data.EncounterOriginal is EncounterStatic s && (s.Version == GameVersion.Stadium || s.Version == GameVersion.Stadium2))
data.AddLine(VerifyG1OTStadium(data, tr));
data.AddLine(VerifyG1OTStadium(pkm, tr, s));
if (pkm.Species == 151)
{
@ -97,17 +97,16 @@ namespace PKHeX.Core
data.AddLine(GetInvalid(V421));
}
}
private CheckResult VerifyG1OTStadium(LegalityAnalysis data, string tr)
private CheckResult VerifyG1OTStadium(PKM pkm, string tr, EncounterStatic s)
{
var pkm = data.pkm;
bool jp = pkm.Japanese;
bool valid = pkm.TID == 2000 && tr == GetStadiumOT(data.Info.Generation, jp);
bool valid;
if (s.Version == GameVersion.Stadium)
valid = pkm.TID == 1999 && tr == (jp ? "スタジアム" : "STADIUM");
else // == GameVersion.Stadium2
valid = pkm.TID == 2000 && tr == (jp ? "スタジアム" : "Stadium");
return valid ? GetValid(jp ? V404 : V403) : GetInvalid(V402);
}
private static string GetStadiumOT(int gen, bool jp)
{
return jp ? "スタジアム" : (gen == 1 ? "STADIUM" : "Stadium");
}
private bool IsOTNameSuspicious(string name)
{