Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

4->5/6 transfer encountertype preference fix

Browse source 
Add a preference check when appropriate so that invalid encounter types
are not preferred over the wild encounters that may follow.

Closes #1095
This commit is contained in:
Kurt 2017-05-10 18:52:14 -07:00
parent 753d18b751
commit 5a96169cc2
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
PKHeX/Legality/Checks.cs
View file

@ -857,7 +857,7 @@ namespace PKHeX.Core
EncounterType type = EncounterType.None;
// Encounter type data is only stored for gen 4 encounters
// Gen 6 -> 7 transfer delete encounter type data
// Gen 6 -> 7 transfer deletes encounter type data
// All eggs have encounter type none, even if they are from static encounters
if (pkm.Gen4 && !pkm.WasEgg)
{
@ -1053,14 +1053,21 @@ namespace PKHeX.Core
if (Gen4Result == null && pkm.Ball != 5 && pkm.Ball != 0x18 && null != (EncounterStaticMatch = Legal.getValidStaticEncounter(pkm)))
{
EncounterMatch = EncounterStaticMatch.First();
EncounterMatch = EncounterStaticMatch[0];
var result = verifyEncounterStatic();
// A pokemon could match a static encounter and a wild encounter at the same time, by default static encounter have preferences
// But if the pokemon does not match the static encounter ball and there is a valid wild encounter skip static encounter
if (result != null && (pkm.WasEgg || Gen4WildResult == null || EncounterStaticMatch.Any(s => !s.Gift || pkm.Ball == s.Ball)))
{
verifyTransferLegalityG4();
return result;
// Sanity check EncounterType if wild encounters are still an alternative and the EncounterType info is still available
var type = (EncounterType)pkm.EncounterType;
if (Gen4WildResult == null || pkm.Format <= 6 && type == 0
? EncounterStaticMatch.Any(s => !(s is EncounterStaticTyped))
: EncounterStaticMatch.Any(s => (s as EncounterStaticTyped)?.TypeEncounter == type))
{
verifyTransferLegalityG4();
return result;
}
}
EncounterStaticMatch = null;