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

Handle traded BDSP egg transfers

Browse Source
This commit is contained in:
Kurt 2022-08-25 23:04:38 -07:00
parent 528a377f84
commit e700a0e3e6
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8b.cs
View File

@ -58,7 +58,7 @@ protected override bool IsMatchEggLocation(PKM pk)
if (EggLocation > 60000 && pk.Egg_Location == Locations.HOME_SWSHBDSPEgg)
return true;
// >60000 can be reset to Link Trade (30001), then altered differently.
return Locations.IsValidMetBDSP(pk.Egg_Location, pk.Version);
return Locations.IsValidMetBDSP(pk.Egg_Location, pk.Version) && pk.Egg_Location == pk.Met_Location;
}
// Hatched

9
PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator8b.cs
View File

@ -102,7 +102,14 @@ public static IEnumerable<IEncounterable> GetEncountersFuzzy(PKM pk, EvoCriteria
if (ctr != 0) yield break;
}
if (pk.Egg_Location == Locations.HOME_SWSHBDSPEgg && pk.Met_Level == 1)
var wasEgg = pk.Egg_Location switch
{
Locations.HOME_SWSHBDSPEgg => true, // Regular hatch location (not link trade)
Locations.HOME_SWBD => pk.Met_Location == Locations.HOME_SWBD, // Link Trade transferred over must match Met Location
Locations.HOME_SHSP => pk.Met_Location == Locations.HOME_SHSP, // Link Trade transferred over must match Met Location
_ => false,
};
if (wasEgg && pk.Met_Level == 1)
{
foreach (var z in GenerateEggs(pk, 8))
{ yield return z; ++ctr; }

20
PKHeX.Core/PKM/PB8.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
namespace PKHeX.Core;
@ -132,14 +132,24 @@ private void TradeHT(ITrainerInfo tr)
public PK8 ConvertToPK8()
{
var pk = ConvertTo<PK8>();
if (pk.Egg_Location == Locations.Default8bNone)
pk.Egg_Location = 0;
else
pk.Egg_Location = Locations.HOME_SWSHBDSPEgg;
pk.SanitizeImport();
pk.Egg_Location = GetEggLocationPK8();
return pk;
}
private int GetEggLocationPK8()
{
var egg = Egg_Location;
if (egg == Locations.Default8bNone)
return 0;
return Version switch
{
(int)GameVersion.BD => egg is Locations.LinkTrade6NPC ? Locations.HOME_SWBD : Locations.HOME_SWSHBDSPEgg,
(int)GameVersion.SH => egg is Locations.LinkTrade6NPC ? Locations.HOME_SHSP : Locations.HOME_SWSHBDSPEgg,
_ => egg,
};
}
public override PA8 ConvertToPA8()
{
var pk = base.ConvertToPA8();