Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-06 06:22:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make RandomGender a method instead of property

Browse Source 
See pkNX for similar change; the functionality is really *method*
This commit is contained in:
Kurt 2019-02-17 22:13:40 -08:00
parent dab2300cc5
commit 7c3e5aa83c
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Generator/EncounterCriteria.cs
View File

@ -80,7 +80,7 @@ public int GetGender(int gender, PersonalInfo pkPersonalInfo)
return pkPersonalInfo.FixedGender;
if (Gender >= 0)
return Gender;
return pkPersonalInfo.RandomGender;
return pkPersonalInfo.RandomGender();
}
public int GetAbility(int abilityType, PersonalInfo pkPersonalInfo)

2
PKHeX.Core/MysteryGifts/PGF.cs
View File

@ -183,7 +183,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria)
HeldItem = HeldItem,
Met_Level = currentLevel,
Nature = Nature != -1 ? Nature : Util.Rand.Next(25),
Gender = pi.Gender == 255 ? 2 : (Gender != 2 ? Gender : pi.RandomGender),
Gender = pi.Gender == 255 ? 2 : (Gender != 2 ? Gender : pi.RandomGender()),
AltForm = Form,
Version = OriginGame == 0 ? SAV.Game : OriginGame,
Language = Language == 0 ? SAV.Language : Language,

9
PKHeX.Core/PersonalInfo/PersonalInfo.cs
View File

@ -293,13 +293,10 @@ public int FormeIndex(int species, int forme)
/// <summary>
/// Gets a random valid gender for the entry.
/// </summary>
public int RandomGender
public int RandomGender()
{
get
{
var fix = FixedGender;
return fix >= 0 ? fix : Util.Rand.Next(2);
}
var fix = FixedGender;
return fix >= 0 ? fix : Util.Rand.Next(2);
}
public bool IsDualGender => FixedGender < 0;

2
PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs
View File

@ -68,7 +68,7 @@ public virtual void SetSeen(int species, bool value = true)
if (GetFlag(OFS_SEEN + (i * BitSeenSize), species - 1))
return;
}
var gender = SAV.Personal[species].RandomGender & 1;
var gender = SAV.Personal[species].RandomGender() & 1;
SetAllDexSeenFlags(species - 1, 0, gender, false);
}

2
PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs
View File

@ -666,7 +666,7 @@ private void B_RandForest_Click(object sender, EventArgs e)
s.Species = slot.Species;
s.Form = slot.Form;
s.Move = slot.Moves?[Util.Rand.Next(slot.Moves.Length)] ?? 0;
s.Gender = slot.Gender == -1 ? PersonalTable.B2W2[slot.Species].RandomGender : slot.Gender;
s.Gender = slot.Gender == -1 ? PersonalTable.B2W2[slot.Species].RandomGender() : slot.Gender;
}
ChangeArea(null, EventArgs.Empty); // refresh
NUD_Unlocked.Value = 8;