diff --git a/PKHeX.Core/Legality/Encounters/Data/EncountersWC3.cs b/PKHeX.Core/Legality/Encounters/Data/EncountersWC3.cs index 27dfed91c..9d5c1e2e7 100644 --- a/PKHeX.Core/Legality/Encounters/Data/EncountersWC3.cs +++ b/PKHeX.Core/Legality/Encounters/Data/EncountersWC3.cs @@ -34,10 +34,10 @@ IEnumerable GetIngame(int l) var id = (LanguageID) l; return new[] { - new WC3 { Species = 239, Level = 20, Language = l, Location = 164, TID = 41400, SID = -1, OT_Gender = 0, OT_Name = h[l], Version = GameVersion.XD, CardTitle = $"Trade Togepi ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 008, 007, 009, 238 } }, // Elekid @ Snagem Hideout - new WC3 { Species = 307, Level = 20, Language = l, Location = 116, TID = 37149, SID = -1, OT_Gender = 0, OT_Name = d[l], Version = GameVersion.XD, CardTitle = $"Trade Trapinch ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 223, 093, 247, 197 } }, // Meditite @ Pyrite Town - new WC3 { Species = 213, Level = 20, Language = l, Location = 116, TID = 37149, SID = -1, OT_Gender = 0, OT_Name = d[l], Version = GameVersion.XD, CardTitle = $"Trade Surskit ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 092, 164, 188, 277 } }, // Shuckle @ Pyrite Town - new WC3 { Species = 246, Level = 20, Language = l, Location = 116, TID = 37149, SID = -1, OT_Gender = 0, OT_Name = d[l], Version = GameVersion.XD, CardTitle = $"Trade Wooper ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 201, 349, 044, 200 } }, // Larvitar @ Pyrite Town + new WC3 { Species = 239, Level = 20, Language = l, Location = 164, TID = 41400, SID = -1, OT_Gender = 0, OT_Name = h[l], Version = GameVersion.XD, CardTitle = $"Trade Togepi ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 008, 007, 009, 238 }, Fateful = true }, // Elekid @ Snagem Hideout + new WC3 { Species = 307, Level = 20, Language = l, Location = 116, TID = 37149, SID = -1, OT_Gender = 0, OT_Name = d[l], Version = GameVersion.XD, CardTitle = $"Trade Trapinch ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 223, 093, 247, 197 }, Fateful = true }, // Meditite @ Pyrite Town + new WC3 { Species = 213, Level = 20, Language = l, Location = 116, TID = 37149, SID = -1, OT_Gender = 0, OT_Name = d[l], Version = GameVersion.XD, CardTitle = $"Trade Surskit ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 092, 164, 188, 277 }, Fateful = true }, // Shuckle @ Pyrite Town + new WC3 { Species = 246, Level = 20, Language = l, Location = 116, TID = 37149, SID = -1, OT_Gender = 0, OT_Name = d[l], Version = GameVersion.XD, CardTitle = $"Trade Wooper ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 201, 349, 044, 200 }, Fateful = true }, // Larvitar @ Pyrite Town new WC3 { Species = 311, Level = 13, Language = l, Location = 254, TID = 37149, SID = 0, OT_Gender = 0, OT_Name = d[l], Version = GameVersion.COLO, CardTitle = $"Special Gift ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 045, 086, 098, 270 } }, // Plusle @ Ingame Trade new WC3 { Species = 250, Level = 70, Language = l, Location = 255, TID = 10048, SID = 0, OT_Gender = 0, OT_Name = m[l], Version = GameVersion.S, CardTitle = $"Mt. Battle Ho-oh ({id})", Method = PIDType.CXD, Shiny = Shiny.Never, Moves = new[] { 105, 126, 241, 129 } }, // Ho-oh @ Mt. Battle }; diff --git a/PKHeX.Core/MysteryGifts/WC3.cs b/PKHeX.Core/MysteryGifts/WC3.cs index 5a136b273..cc7e171eb 100644 --- a/PKHeX.Core/MysteryGifts/WC3.cs +++ b/PKHeX.Core/MysteryGifts/WC3.cs @@ -151,7 +151,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV) PIDGenerator.SetValuesFromSeed(pk, Method, seed); if (Version == GameVersion.XD) - pk.FatefulEncounter = true; // set this + pk.FatefulEncounter = false; // set later when XK3->PK3 if (Moves == null || Moves.Length == 0) // not completely defined Moves = Legal.GetBaseEggMoves(pk, Species, (GameVersion)pk.Version, Level); diff --git a/Tests/PKHeX.Tests/Legality/Illegal/Misc/XD Shuckle Gift no Fateful.ck3 b/Tests/PKHeX.Tests/Legality/Illegal/Misc/XD Shuckle Gift no Fateful.ck3 new file mode 100644 index 000000000..c6656d816 Binary files /dev/null and b/Tests/PKHeX.Tests/Legality/Illegal/Misc/XD Shuckle Gift no Fateful.ck3 differ diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 1904411103A3 NoFateful.xk3 b/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 1904411103A3 NoFateful.xk3 new file mode 100644 index 000000000..6c6debb84 Binary files /dev/null and b/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 1904411103A3 NoFateful.xk3 differ diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 475E411103A3 Fateful.xk3 b/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 475E411103A3 Fateful.xk3 new file mode 100644 index 000000000..40342c229 Binary files /dev/null and b/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 475E411103A3 Fateful.xk3 differ diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 6FC4411103A3 Fateful.ck3 b/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 6FC4411103A3 Fateful.ck3 new file mode 100644 index 000000000..99d3b683f Binary files /dev/null and b/Tests/PKHeX.Tests/Legality/Legal/Generation 3/XD Fateful Gifts/213 - SHUCKLE - 6FC4411103A3 Fateful.ck3 differ