Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-09 04:24:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update gender handling

Browse Source 
Closes #1934 , unrelated tho
This commit is contained in:
Kurt 2018-05-10 20:22:32 -07:00
parent 815705bc5e
commit f82e545ab0
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PKHeX.Core/PKM/Editing/CommonEdits.cs
View File

@ -208,17 +208,10 @@ public static void SetMaximumPPCurrent(this PKM pk, int[] Moves = null)
/// <param name="gender">Desired <see cref="PKM.Gender"/> value to set.</param>
public static void SetGender(this PKM pk, string gender)
{
if (gender == null)
{
int cg = pk.Gender;
int sane = pk.GetSaneGender();
if (cg != sane)
pk.Gender = sane;
return;
}
int Gender = PKX.GetGenderFromString(gender);
pk.SetGender(Gender);
int g = gender == null
? pk.GetSaneGender()
: PKX.GetGenderFromString(gender);
pk.SetGender(g);
}
/// <summary>

2
PKHeX.Core/PKM/PKX.cs
View File

@ -345,8 +345,6 @@ public static uint GetEXP(int level, int species)
/// <returns>Gender integer</returns>
public static int GetGenderFromString(string s)
{
if (s == null)
return -1;
if (s == "♂" || s == "M")
return 0;
if (s == "♀" || s == "F")