From aa25d10e53edcf4460caa31bb45dc009b3adbef4 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 25 Mar 2017 12:26:14 -0700 Subject: [PATCH] Misc matching fixes Transferred 4->5 event met level Add fateful encounter flags for gen3 encounters gen5 legendary trio met locations --- PKHeX/Legality/Core.cs | 9 +++++++-- PKHeX/Legality/Tables3.cs | 8 ++++---- PKHeX/Legality/Tables4.cs | 3 +-- PKHeX/Legality/Tables5.cs | 6 +++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index f635ae086..5e12e13ef 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -1130,6 +1130,7 @@ private static IEnumerable getMatchingPCD(PKM pkm, IEnumerable getMatchingPCD(PKM pkm, IEnumerable pkm.Met_Level) continue; + } + else + { + if (wc.Egg_Location + 3000 != pkm.Met_Location) continue; + if (wc.CurrentLevel != pkm.Met_Level) continue; } - else if (wc.Egg_Location + 3000 != pkm.Met_Location) continue; } - if (wc.CurrentLevel != pkm.Met_Level) continue; if (wc.Ball != pkm.Ball) continue; if (wc.OT_Gender < 3 && wc.OT_Gender != pkm.OT_Gender) continue; if (wc.PID == 1 && pkm.IsShiny) continue; diff --git a/PKHeX/Legality/Tables3.cs b/PKHeX/Legality/Tables3.cs index 9379346fc..d3de454f8 100644 --- a/PKHeX/Legality/Tables3.cs +++ b/PKHeX/Legality/Tables3.cs @@ -258,10 +258,10 @@ public static partial class Legal new EncounterStatic { Species = 384, Level = 70, Location = 085, }, // Rayquaza @ Sky Pillar // Event - new EncounterStatic { Species = 151, Level = 30, Location = 201, Version = GameVersion.E, }, // Mew @ Faraway Island + new EncounterStatic { Species = 151, Level = 30, Location = 201, Version = GameVersion.E, Fateful = true }, // Mew @ Faraway Island new EncounterStatic { Species = 249, Level = 70, Location = 211, Version = GameVersion.E, }, // Lugia @ Navel Rock new EncounterStatic { Species = 250, Level = 70, Location = 211, Version = GameVersion.E, }, // Ho-Oh @ Navel Rock - new EncounterStatic { Species = 386, Level = 30, Location = 200, Version = GameVersion.E, Form = 3 }, // Deoxys @ Birth Island + new EncounterStatic { Species = 386, Level = 30, Location = 200, Version = GameVersion.E, Form = 3, Fateful = true }, // Deoxys @ Birth Island }; @@ -306,8 +306,8 @@ public static partial class Legal // Event new EncounterStatic { Species = 249, Level = 70, Location = 174, }, // Lugia @ Navel Rock new EncounterStatic { Species = 250, Level = 70, Location = 174, }, // Ho-Oh @ Navel Rock - new EncounterStatic { Species = 386, Level = 30, Location = 187, Version = GameVersion.FR, Form = 1 }, // Deoxys @ Birth Island - new EncounterStatic { Species = 386, Level = 30, Location = 187, Version = GameVersion.LG, Form = 2 }, // Deoxys @ Birth Island + new EncounterStatic { Species = 386, Level = 30, Location = 187, Version = GameVersion.FR, Form = 1, Fateful = true }, // Deoxys @ Birth Island + new EncounterStatic { Species = 386, Level = 30, Location = 187, Version = GameVersion.LG, Form = 2, Fateful = true }, // Deoxys @ Birth Island }; internal static readonly EncounterStatic[] Encounter_RSE = Encounter_RSE_Roam.SelectMany(e => e.Clone(Roaming_MetLocation_RSE)).Concat(Encounter_RSE_Regular).Concat(Encounter_Box).ToArray(); diff --git a/PKHeX/Legality/Tables4.cs b/PKHeX/Legality/Tables4.cs index d4475424a..b279ff209 100644 --- a/PKHeX/Legality/Tables4.cs +++ b/PKHeX/Legality/Tables4.cs @@ -440,7 +440,7 @@ public static partial class Legal new EncounterStatic { Species = 490, Level = 01, EggLocation = 3001, Fateful = true, Gift = true }, //Manaphy from Pokemon Ranger new EncounterStatic { Species = 491, Level = 40, Location = 079, Version = GameVersion.DP,}, //Darkrai @ Newmoon Island new EncounterStatic { Species = 491, Level = 50, Location = 079, Version = GameVersion.Pt,}, //Darkrai @ Newmoon Island - new EncounterStatic { Species = 492, Form = 0, Level = 30, Location = 063,}, //Shaymin @ Flower Paradise + new EncounterStatic { Species = 492, Form = 0, Level = 30, Location = 063, Fateful = true,}, //Shaymin @ Flower Paradise //new EncounterStatic { Species = 493, Level = 80, Location = 086,}, //Arceus @ Hall of Origin }; internal static readonly EncounterStatic[] Encounter_DPPt = Encounter_DPPt_Roam.SelectMany(e => e.Clone(Roaming_MetLocation_DPPt)).Concat(Encounter_DPPt_Regular).ToArray(); @@ -497,7 +497,6 @@ public static partial class Legal new EncounterStatic { Gift = true, Species = 179, Level = 01, EggLocation = 2014,}, // Mareep Egg from Primo new EncounterStatic { Gift = true, Species = 194, Level = 01, EggLocation = 2014,}, // Wooper Egg from Primo new EncounterStatic { Gift = true, Species = 218, Level = 01, EggLocation = 2014,}, // Slugma Egg from Primo - new EncounterStatic { Gift = true, Species = 490, Level = 01, EggLocation = 3001, Fateful = true, }, //Manaphy from Pokemon Ranger //Stationary new EncounterStatic { Species = 130, Level = 30, Location = 135, Shiny = true }, //Gyarados @ Lake of Rage new EncounterStatic { Species = 131, Level = 20, Location = 210, }, //Lapras @ Union Cave Friday Only diff --git a/PKHeX/Legality/Tables5.cs b/PKHeX/Legality/Tables5.cs index dfde861a4..5de6586a9 100644 --- a/PKHeX/Legality/Tables5.cs +++ b/PKHeX/Legality/Tables5.cs @@ -520,9 +520,9 @@ public static partial class Legal new EncounterStatic { Species = 555, Level = 35, Location = 34, Ability = 4, }, //Darmanitan @ Desert Resort new EncounterStatic { Species = 637, Level = 70, Location = 35, }, //Volcarona @ Relic Castle //Stationary Lengerdary - new EncounterStatic { Species = 638, Level = 42, Location = 54,}, //Cobalion @ Mistralton Cave - new EncounterStatic { Species = 639, Level = 42, Location = 40,}, //Terrakion @ Victory Road - new EncounterStatic { Species = 640, Level = 42, Location = 33,}, //Virizion @ Pinwheel Forest + new EncounterStatic { Species = 638, Level = 42, Location = 74,}, //Cobalion @ Guidance Chamber + new EncounterStatic { Species = 639, Level = 42, Location = 73,}, //Terrakion @ Trial Chamber + new EncounterStatic { Species = 640, Level = 42, Location = 55,}, //Virizion @ Rumination Field new EncounterStatic { Species = 643, Level = 50, Location = 45, Shiny = false, Version = GameVersion.B, }, //Reshiram @ N'Castle new EncounterStatic { Species = 643, Level = 50, Location = 39, Shiny = false, Version = GameVersion.B, }, //Reshiram @ Dragonspiral Tower new EncounterStatic { Species = 644, Level = 50, Location = 45, Shiny = false, Version = GameVersion.W, }, //Zekrom @ N'Castle