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

Update nickname rules for gen8/=>gen8

Browse source 
Add a setting so that can flag deceptive species nicknames (even though it may be possible).
This commit is contained in:
Kurt 2021-01-31 12:37:03 -08:00
parent 09e5dde609
commit 4456a9dc7a
2 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,8 @@ namespace PKHeX.Core
var pkm = data.pkm;
// If the Pokémon is not nicknamed, it should match one of the language strings.
if (pkm.Nickname.Length == 0)
var nickname = pkm.Nickname;
if (nickname.Length == 0)
{
data.AddLine(GetInvalid(LNickLengthShort));
return;
@ -32,7 +33,7 @@ namespace PKHeX.Core
if (pkm.Format <= 7 && pkm.IsNicknamed) // can nickname afterwards
{
if (pkm.VC)
VerifyG1NicknameWithinBounds(data, pkm.Nickname);
VerifyG1NicknameWithinBounds(data, nickname);
else if (enc is MysteryGift {IsEgg: false})
data.AddLine(Get(LEncGiftNicknamed, ParseSettings.NicknamedMysteryGift));
}
@ -50,7 +51,7 @@ namespace PKHeX.Core
return;
}
string nickname = pkm.Nickname.Replace('\'', '’');
nickname = nickname.Replace('\'', '’');
if (VerifyUnNicknamedEncounter(data, pkm, nickname))
return;
@ -68,12 +69,31 @@ namespace PKHeX.Core
{
if (pkm.IsNicknamed)
{
for (int i = 0; i < SpeciesName.SpeciesLang.Count; i++)
if (data.Info.Generation >= 8)
{
if (!SpeciesName.SpeciesDict[i].TryGetValue(nickname, out int index))
// Can only nickname if it matches your language.
// Setting the nickname to the same as the species name does not set the Nickname flag (equals unmodified, no flag)
if (SpeciesName.IsNicknamed(pkm.Species, nickname, pkm.Language, pkm.Format))
{
data.AddLine(Get(LNickMatchLanguageFlag, Severity.Invalid));
return true;
}
}
else if (pkm.Format >= 8)
{
// Having the Nickname match the species name for the pkm.Language causes it to revert to un-nicknamed.
if (SpeciesName.IsNicknamed(pkm.Species, nickname, pkm.Language, pkm.Format))
{
data.AddLine(Get(LNickMatchLanguageFlag, Severity.Invalid));
return true;
}
}
for (int i = 0; i < SpeciesName.SpeciesDict.Count; i++)
{
if (!SpeciesName.SpeciesDict[i].TryGetValue(nickname, out int species))
continue;
var msg = index == pkm.Species && i != pkm.Language ? LNickMatchNoOthersFail : LNickMatchLanguageFlag;
data.AddLine(Get(msg, Severity.Fishy));
var msg = species == pkm.Species && i != pkm.Language ? LNickMatchNoOthersFail : LNickMatchLanguageFlag;
data.AddLine(Get(msg, ParseSettings.NicknamedAnotherSpecies));
return true;
}
if (pkm.Format <= 7 && StringConverter.HasEastAsianScriptCharacters(nickname) && pkm is not PB7) // East Asian Scripts
@ -118,7 +138,7 @@ namespace PKHeX.Core
// Starting in Generation 8, hatched language-traded eggs will take the Language from the trainer that hatched it.
// Also in Generation 8, evolving in a foreign language game will retain the original language as the source for the newly evolved species name.
// Transferring from Gen7->Gen8 realigns the Nickname string to the Language, if not nicknamed.
bool canHaveAnyLanguage = format <= 7 && (enc.Species != species || pkm.WasTradedEgg);
bool canHaveAnyLanguage = format <= 7 && (enc.Species != species || pkm.WasTradedEgg) && !pkm.GG;
if (canHaveAnyLanguage && !SpeciesName.IsNicknamedAnyLanguage(species, nickname, format))
return true;

1
PKHeX.Core/Legality/Verifiers/ParseSettings.cs
View file

@ -28,6 +28,7 @@ namespace PKHeX.Core
public static Severity Gen7TransferStarPID { get; set; } = Severity.Fishy;
public static Severity Gen8MemoryLocationTextVariable { get; set; } = Severity.Fishy;
public static Severity Gen8TransferTrackerNotPresent { get; set; } = Severity.Fishy;
public static Severity NicknamedAnotherSpecies { get; set; } = Severity.Fishy;
public static IReadOnlyList<string> MoveStrings = Util.GetMovesList(GameLanguage.DefaultLanguage);
public static IReadOnlyList<string> SpeciesStrings = Util.GetSpeciesList(GameLanguage.DefaultLanguage);