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

Revise "Is HOME" gift check, add height/weight scalar condition

Browse source
This commit is contained in:
Kurt 2020-07-02 17:18:36 -05:00
parent 9da5263a52
commit 5d8a5ba045
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
PKHeX.Core/MysteryGifts/WC8.cs
View file

@ -294,7 +294,7 @@ namespace PKHeX.Core
return 0x12C + (index * 0x1C);
}
private bool IsHOMEGift => PIDType == Shiny.FixedValue && PID == 0 && EncryptionConstant == 0;
private bool IsHOMEGift => Location == 30018 || GetOT(2) == "HOME";
public override PKM ConvertToPKM(ITrainerInfo sav, EncounterCriteria criteria)
{
@ -396,8 +396,11 @@ namespace PKHeX.Core
SetEggMetData(pk);
pk.CurrentFriendship = pk.IsEgg ? pi.HatchCycles : pi.BaseFriendship;
pk.HeightScalar = PokeSizeUtil.GetRandomScalar();
pk.WeightScalar = PokeSizeUtil.GetRandomScalar();
if (!IsHOMEGift)
{
pk.HeightScalar = PokeSizeUtil.GetRandomScalar();
pk.WeightScalar = PokeSizeUtil.GetRandomScalar();
}
pk.RefreshChecksum();
return pk;
@ -565,6 +568,14 @@ namespace PKHeX.Core
if (!(pkm is IDynamaxLevel dl && dl.DynamaxLevel >= DynamaxLevel))
return false;
if (IsHOMEGift && pkm is IScaledSize s)
{
if (s.HeightScalar != 0)
return false;
if (s.WeightScalar != 0)
return false;
}
return PIDType != 0 || pkm.PID == PID;
}