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

Add duking glyph remap check for Colo Plusle

Browse source 
Only applies to Spanish; other languages don't use special accent-mark chars.
make logic flow easier to understand for this if-duking case.
This commit is contained in:
Kurt 2024-07-13 10:34:55 -05:00
parent 50930b0cc5
commit 3a131f61aa
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Legality/Encounters/Data/Gen3/Encounters3Colo.cs
View file

@ -13,6 +13,12 @@ internal static class Encounters3Colo
internal static readonly string[] TrainerNameDuking = [string.Empty, "ギンザル", "DUKING", "DOKING", "RODRIGO", "GRAND", string.Empty, "GERMÁN"]; internal static readonly string[] TrainerNameDuking = [string.Empty, "ギンザル", "DUKING", "DOKING", "RODRIGO", "GRAND", string.Empty, "GERMÁN"];
/// <summary>
/// When transferring from Gen3->Gen4, a Spanish OT:Duking has the Á char changed to い.
/// </summary>
/// <see cref="StringConverter345.TransferGlyphs34(System.ReadOnlySpan{byte},int,int,System.Span{byte})"/> cref=""/>
internal const string TrainerNameDukingSpanish4 = "GERMいN";
internal static readonly EncounterGift3Colo[] Gifts = internal static readonly EncounterGift3Colo[] Gifts =
[ [
// In-Game without Bonus Disk // In-Game without Bonus Disk

11
PKHeX.Core/Legality/Encounters/Templates/Gen3/Colo/EncounterGift3Colo.cs
View file

@ -170,14 +170,19 @@ public sealed record EncounterGift3Colo : IEncounterable, IEncounterMatch, IEnco
if ((uint)language >= TrainerNames.Length) if ((uint)language >= TrainerNames.Length)
return false; return false;
var max = language == 1 ? 5 : 7;
var expect = TrainerNames[language].AsSpan(); var expect = TrainerNames[language].AsSpan();
if (pk is CK3 && expect.SequenceEqual(trainer)) if (pk is CK3 && expect.SequenceEqual(trainer))
return true; // not yet transferred to mainline Gen3 return true; // not yet transferred to mainline Gen3
var max = language == 1 ? 5 : 7;
if (expect.Length > max) if (expect.Length > max)
expect = expect[..max]; expect = expect[..max];
return expect.SequenceEqual(trainer); if (pk.Context == EntityContext.Gen3)
return trainer.SequenceEqual(expect);
if (IsSpanishDuking(language)) // Gen4+
return trainer is Encounters3Colo.TrainerNameDukingSpanish4;
return trainer.SequenceEqual(expect);
} }
private bool IsSpanishDuking(int language) => language is (int)LanguageID.Spanish && Species is (int)Core.Species.Plusle;
} }

9
PKHeX.Core/Legality/Encounters/Templates/Gen3/XD/EncounterTrade3XD.cs
View file

@ -182,12 +182,13 @@ public sealed record EncounterTrade3XD : IEncounterable, IEncounterMatch, IEncou
var name = TrainerNames[language]; var name = TrainerNames[language];
if (pk.Context == EntityContext.Gen3) if (pk.Context == EntityContext.Gen3)
return trainer.SequenceEqual(name); return trainer.SequenceEqual(name);
if (IsSpanishDuking(language)) // Gen4+
Span<char> tmp = stackalloc char[name.Length]; return trainer is Encounters3Colo.TrainerNameDukingSpanish4;
StringConverter345.TransferGlyphs34(name, language, tmp); return trainer.SequenceEqual(name);
return trainer.SequenceEqual(tmp);
} }
private bool IsSpanishDuking(int language) => language is (int)LanguageID.Spanish && Species is not (int)Core.Species.Elekid;
public bool IsNicknameMatch(PKM pk, ReadOnlySpan<char> nickname, int language) public bool IsNicknameMatch(PKM pk, ReadOnlySpan<char> nickname, int language)
{ {
if (!IsFixedNickname) if (!IsFixedNickname)