Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 06:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check for bdsp traded eggs being re-flagged for Nicknamed

Browse source
This commit is contained in:
Kurt 2021-11-28 14:32:41 -08:00
parent 73159053e2
commit 488b411716
2 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Legality/Verifiers/Egg/EggStateLegality.cs
View file

@ -41,14 +41,14 @@
_ => false,
};
public static bool IsNicknameFlagSet(IEncounterTemplate enc) => enc switch
public static bool IsNicknameFlagSet(IEncounterTemplate enc, PKM pk) => enc switch
{
EncounterStatic7 => false,
WB8 or EncounterStatic8b => false,
WB8 or EncounterStatic8b when pk.IsUntraded => false,
{ Generation: 4 } => false,
_ => true,
};
public static bool IsNicknameFlagSet(PKM pk) => IsNicknameFlagSet(new LegalityAnalysis(pk).EncounterMatch);
public static bool IsNicknameFlagSet(PKM pk) => IsNicknameFlagSet(new LegalityAnalysis(pk).EncounterMatch, pk);
}
}

22
PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs
View file

@ -234,25 +234,13 @@ namespace PKHeX.Core
{
var Info = data.Info;
var pkm = data.pkm;
var format = pkm.Format;
switch (format)
{
case 4:
if (pkm.IsNicknamed) // gen4 doesn't use the nickname flag for eggs
data.AddLine(GetInvalid(LNickFlagEggNo, CheckIdentifier.Egg));
break;
case 7:
if (pkm.IsNicknamed == Info.EncounterMatch is EncounterStatic7) // gen7 doesn't use for ingame gifts
data.AddLine(GetInvalid(pkm.IsNicknamed ? LNickFlagEggNo : LNickFlagEggYes, CheckIdentifier.Egg));
break;
default:
if (pkm.IsNicknamed == Info.EncounterMatch is (EncounterStatic8b or WB8)) // bdsp doesn't use for ingame gifts
data.AddLine(GetInvalid(pkm.IsNicknamed ? LNickFlagEggNo : LNickFlagEggYes, CheckIdentifier.Egg));
break;
}
bool flagState = EggStateLegality.IsNicknameFlagSet(Info.EncounterMatch, pkm);
if (pkm.IsNicknamed != flagState)
data.AddLine(GetInvalid(pkm.IsNicknamed ? LNickFlagEggNo : LNickFlagEggYes, CheckIdentifier.Egg));
var nick = pkm.Nickname;
if (format == 2 && !SpeciesName.IsNicknamedAnyLanguage(0, nick, 2))
if (pkm.Format == 2 && !SpeciesName.IsNicknamedAnyLanguage(0, nick, 2))
data.AddLine(GetValid(LNickMatchLanguageEgg, CheckIdentifier.Egg));
else if (nick != SpeciesName.GetSpeciesNameGeneration(0, pkm.Language, Info.Generation))
data.AddLine(GetInvalid(LNickMatchLanguageEggFail, CheckIdentifier.Egg));