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

Update EncounterStatic4.cs

Browse Source
This commit is contained in:
Kurt
2023-08-18 11:48:49 -07:00
parent 0b2d167465
commit 15faf8197a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterStatic4.cs
View File

@@ -55,6 +55,7 @@ public PK4 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
var pk = new PK4
{
Species = Species,
Form = Form,
CurrentLevel = LevelMin,
OT_Friendship = PersonalTable.HGSS[Species].BaseFriendship,
@@ -91,17 +92,19 @@ public PK4 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
private void SetPINGA(PK4 pk, EncounterCriteria criteria)
{
// Pichu is special -- use Pokewalker method
if (Species == (int)Core.Species.Pichu)
{
PIDGenerator.SetRandomPIDPokewalker(pk, (byte)Nature, Gender);
criteria.SetRandomIVs(pk);
return;
}
var pi = pk.PersonalInfo;
int gender = criteria.GetGender(Gender, pi);
int nature = (int)criteria.GetNature(Nature);
int ability = criteria.GetAbilityFromNumber(Ability);
PIDType type = this switch
{
{ Shiny: Shiny.Always } => PIDType.ChainShiny,
{ Species: (ushort)Core.Species.Pichu } => PIDType.Pokewalker,
_ => PIDType.Method_1,
};
PIDType type = this is { Shiny: Shiny.Always } ? PIDType.ChainShiny : PIDType.Method_1;
PIDGenerator.SetRandomWildPID4(pk, nature, ability, gender, type);
}