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

Sanitize gender on species/form change

Browse source 
clean up some if expressions
This commit is contained in:
Kurt 2022-04-25 17:30:16 -07:00
parent ecee948107
commit 5be9863ef4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/PKM/PKM.cs
View file

@ -622,7 +622,7 @@ namespace PKHeX.Core
return gender == 0; return gender == 0;
int gen = Generation; int gen = Generation;
if (gen is <= 2 or >= 6) // not 3-5 if (gen is not (3 or 4 or 5))
return gender == (gender & 1); return gender == (gender & 1);
return gender == PKX.GetGenderFromPIDAndRatio(PID, gv); return gender == PKX.GetGenderFromPIDAndRatio(PID, gv);

8
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View file

@ -960,7 +960,7 @@ namespace PKHeX.WinForms.Controls
private void UpdateForm(object sender, EventArgs e) private void UpdateForm(object sender, EventArgs e)
{ {
if (CB_Form == sender && FieldsLoaded) if (FieldsLoaded && sender == CB_Form)
{ {
Entity.Form = CB_Form.SelectedIndex; Entity.Form = CB_Form.SelectedIndex;
uint EXP = Experience.GetEXP(Entity.CurrentLevel, Entity.PersonalInfo.EXPGrowth); uint EXP = Experience.GetEXP(Entity.CurrentLevel, Entity.PersonalInfo.EXPGrowth);
@ -994,12 +994,12 @@ namespace PKHeX.WinForms.Controls
if (CB_Form.Items.Count == 2) // actually M/F; Pumpkaboo formes in German are S,M,L,XL if (CB_Form.Items.Count == 2) // actually M/F; Pumpkaboo formes in German are S,M,L,XL
{ {
Entity.Gender = CB_Form.SelectedIndex; Entity.Gender = CB_Form.SelectedIndex;
UC_Gender.Gender = Entity.Gender; UC_Gender.Gender = Entity.GetSaneGender();
} }
} }
else else
{ {
UC_Gender.Gender = Entity.Gender; UC_Gender.Gender = Entity.GetSaneGender();
} }
RefreshFormArguments(); RefreshFormArguments();
@ -1160,7 +1160,7 @@ namespace PKHeX.WinForms.Controls
TB_EXP.Text = EXP.ToString(); TB_EXP.Text = EXP.ToString();
// Check for Gender Changes // Check for Gender Changes
UC_Gender.Gender = Entity.Gender; UC_Gender.Gender = Entity.GetSaneGender();
// If species changes and no nickname, set the new name == speciesName. // If species changes and no nickname, set the new name == speciesName.
if (!CHK_Nicknamed.Checked) if (!CHK_Nicknamed.Checked)