Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-02 11:56:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revise enc1/2 -> pk1/2 nickname set

Browse Source 
Skip the IsNicknamed evaluation, saving at least 1 string allocation on ctor. Remember the IsNicknamed state when we set false.
GUI: provide the selected language rather than recalculate
This commit is contained in:
Kurt
2024-11-10 09:32:33 -06:00
parent 51464fb4af
commit 3c574a45f1
10 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Templates/Gen1/EncounterGift1.cs
View File

@@ -109,7 +109,6 @@ public PK1 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
{
Species = Species,
CurrentLevel = LevelMin,
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, (int)lang, Generation),
Type1 = pi.Type1,
Type2 = pi.Type2,
DV16 = IVs.IsSpecified ? EncounterUtil.GetDV16(IVs) : EncounterUtil.GetRandomDVs(rand),
@@ -144,6 +143,7 @@ public PK1 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
_ => EncounterUtil.GetTrainerName(tr, (int)lang),
},
};
pk.SetNotNicknamed((int)lang);
pk.SetMoves(Moves);
pk.ResetPartyStats();

2
PKHeX.Core/Legality/Encounters/Templates/Gen1/EncounterSlot1.cs
View File

@@ -43,10 +43,10 @@ public PK1 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
OriginalTrainerName = EncounterUtil.GetTrainerName(tr, lang),
TID16 = tr.TID16,
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
Type1 = pi.Type1,
Type2 = pi.Type2,
};
pk.SetNotNicknamed(lang);
EncounterUtil.SetEncounterMoves(pk, Version, LevelMin);

2
PKHeX.Core/Legality/Encounters/Templates/Gen1/EncounterStatic1.cs
View File

@@ -46,10 +46,10 @@ public PK1 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
OriginalTrainerName = EncounterUtil.GetTrainerName(tr, lang),
TID16 = tr.TID16,
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
Type1 = pi.Type1,
Type2 = pi.Type2,
};
pk.SetNotNicknamed(lang);
EncounterUtil.SetEncounterMoves(pk, Version, LevelMin);

2
PKHeX.Core/Legality/Encounters/Templates/Gen2/EncounterGift2.cs
View File

@@ -100,7 +100,6 @@ public PK2 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Species = Species,
CurrentLevel = CurrentLevel == 0 ? LevelMin : CurrentLevel,
OriginalTrainerFriendship = pi.BaseFriendship,
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, (int)lang, Generation),
TID16 = Trainer switch
{
@@ -127,6 +126,7 @@ public PK2 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
_ => EncounterUtil.GetTrainerName(tr, 1),
},
};
pk.SetNotNicknamed((int)lang);
if (IsEgg)
{

2
PKHeX.Core/Legality/Encounters/Templates/Gen2/EncounterSlot2.cs
View File

@@ -94,8 +94,8 @@ public PK2 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
Language = lang,
OriginalTrainerName = tr.OT,
TID16 = tr.TID16,
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
};
pk.SetNotNicknamed(lang);
if (Version == GameVersion.C)
{

3
PKHeX.Core/Legality/Encounters/Templates/Gen2/EncounterStatic2.cs
View File

@@ -51,9 +51,8 @@ public PK2 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
OriginalTrainerName = tr.OT,
OriginalTrainerFriendship = pi.BaseFriendship,
Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation),
};
pk.SetNotNicknamed(lang);
if (IsEgg)
{

4
PKHeX.Core/PKM/SK2.cs
View File

@@ -134,10 +134,10 @@ public override string OriginalTrainerName
public override bool HasOriginalMetLocation => CaughtData != 0;
public override GameVersion Version { get => GameVersion.GSC; set { } }
protected override void GetNonNickname(int language, Span<byte> data)
protected override int GetNonNickname(int language, Span<byte> data)
{
var name = SpeciesName.GetSpeciesNameGeneration(Species, language, 2);
StringConverter2.SetString(data, name, data.Length, language, StringConverterOption.Clear50);
return StringConverter2.SetString(data, name, data.Length, language, StringConverterOption.Clear50);
}
public override void SetNotNicknamed(int language) => GetNonNickname(language, NicknameTrash);

35
PKHeX.Core/PKM/Shared/GBPKM.cs
View File

@@ -31,8 +31,8 @@ public abstract class GBPKM : PKM
public override bool Valid { get => true; set { } }
public sealed override void RefreshChecksum() { }
private bool? _isnicknamed;
protected abstract void GetNonNickname(int language, Span<byte> data);
private protected bool? _isnicknamed;
protected abstract int GetNonNickname(int language, Span<byte> data);
public sealed override bool IsNicknamed
{
@@ -41,11 +41,8 @@ public sealed override bool IsNicknamed
if (_isnicknamed is {} actual)
return actual;
var current = NicknameTrash;
Span<byte> expect = stackalloc byte[current.Length];
var language = GuessedLanguage();
GetNonNickname(language, expect);
var result = !current.SequenceEqual(expect);
bool result = GetIsNicknamedTrash(language);
_isnicknamed = result;
return result;
}
@@ -57,18 +54,26 @@ public sealed override bool IsNicknamed
}
}
protected bool IsNicknamedBank
private bool GetIsNicknamedTrash(int language)
{
get
{
var spName = SpeciesName.GetSpeciesNameGeneration(Species, GuessedLanguage(), Format);
Span<char> nickname = stackalloc char[TrashCharCountNickname];
int len = LoadString(NicknameTrash, nickname);
return !nickname[..len].SequenceEqual(spName);
}
// Verify that all trash bytes match the expected nickname.
var current = NicknameTrash;
Span<byte> expect = stackalloc byte[current.Length];
GetNonNickname(language, expect);
return !current.SequenceEqual(expect);
}
private bool GetIsNicknamedLength(int language)
{
// Verify that only the displayed nickname bytes match the expected nickname.
var current = NicknameTrash;
Span<byte> expect = stackalloc byte[current.Length];
int length = GetNonNickname(language, expect);
return !current[..length].SequenceEqual(expect[..length]);
}
protected bool IsNicknamedBank => GetIsNicknamedLength(GuessedLanguage());
public sealed override int Language
{
get

18
PKHeX.Core/PKM/Shared/GBPKML.cs
View File

@@ -46,17 +46,19 @@ protected GBPKML(byte[] data, bool jp = false) : base(data)
NicknameTrash.Fill(StringConverter1.TerminatorCode);
}
public override void SetNotNicknamed(int language) => GetNonNickname(language, RawNickname);
public override void SetNotNicknamed(int language)
{
GetNonNickname(language, RawNickname);
_isnicknamed = false;
}
protected override void GetNonNickname(int language, Span<byte> data)
protected override int GetNonNickname(int language, Span<byte> data)
{
var name = SpeciesName.GetSpeciesNameGeneration(Species, language, Format);
SetString(data, name, data.Length, StringConverterOption.Clear50);
if (Korean)
return;
// Decimal point<->period fix
data.Replace<byte>(0xF2, 0xE8);
int length = SetString(data, name, data.Length, StringConverterOption.Clear50);
if (!Korean) // Decimal point<->period fix
data.Replace<byte>(0xF2, 0xE8);
return length;
}
public sealed override string Nickname

13
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View File

@@ -1354,25 +1354,24 @@ private void UpdateNickname(object sender, EventArgs e)
return;
}
string nick;
string nickname;
int language = WinFormsUtil.GetIndex(CB_Language);
if (CHK_IsEgg.Checked)
{
// Get the egg name.
int language = WinFormsUtil.GetIndex(CB_Language);
nick = SpeciesName.GetEggName(language, Entity.Format);
nickname = SpeciesName.GetEggName(language, Entity.Format);
}
else
{
// If name is that of another language, don't replace the nickname
if (sender != CB_Language && !SpeciesName.IsNicknamedAnyLanguage(species, TB_Nickname.Text, Entity.Format))
return;
int lang = WinFormsUtil.GetIndex(CB_Language);
nick = SpeciesName.GetSpeciesNameGeneration(species, lang, Entity.Format);
nickname = SpeciesName.GetSpeciesNameGeneration(species, language, Entity.Format);
}
TB_Nickname.Text = nick;
TB_Nickname.Text = nickname;
if (Entity is GBPKM pk)
pk.SetNotNicknamed();
pk.SetNotNicknamed(language);
}
private void UpdateNicknameClick(object sender, MouseEventArgs e)