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

More generator updates

Browse source 
Graveler (SM Trade) -> Force applying handling trainer details for
ingame trades
Ponyta (Ranch Trade) Apply correct ability for encountertradePID

Up to 98 : Wild Gen2 Krabby (safari zone impossible location needs to
get filtered from possible encounters)
This commit is contained in:
Kurt 2018-04-29 21:29:34 -07:00
parent 997ca29fe6
commit ab71ea2d8b
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
PKHeX.Core/Legality/Encounters/EncounterTrade.cs
View file

@ -93,7 +93,10 @@ namespace PKHeX.Core
pk.SetNickname(GetNickname(lang));
pk.Language = lang;
pk.RefreshAbility(Ability >> 1);
if (this is EncounterTradePID a && a.Generation == 4)
pk.RefreshAbility((int)(pk.PID & 1));
else
pk.RefreshAbility(Ability >> 1);
if (IVs != null)
pk.SetRandomIVs(IVs, 0);
@ -123,7 +126,7 @@ namespace PKHeX.Core
if (pk.Format < 6)
return pk;
SAV.ApplyHandlingTrainerInfo(pk);
SAV.ApplyHandlingTrainerInfo(pk, force: true);
pk.SetRandomEC();
if (pk.Format == 7)

4
PKHeX.Core/Legality/Structures/ITrainerInfo.cs
View file

@ -33,9 +33,9 @@ namespace PKHeX.Core
pk.ConsoleRegion = info.ConsoleRegion;
}
public static void ApplyHandlingTrainerInfo(this ITrainerInfo SAV, PKM pk)
public static void ApplyHandlingTrainerInfo(this ITrainerInfo SAV, PKM pk, bool force = false)
{
if (pk.Format == SAV.Generation)
if (pk.Format == SAV.Generation && !force)
return;
pk.HT_Name = SAV.OT;