From 90f2ea1749318ae0dc65033f4d1b1486765cd60a Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 31 Aug 2020 18:09:15 -0700 Subject: [PATCH] 8/31 - Electric Grass --- .../Encounters/Data/Encounters8NestCrystal.cs | 1 + .../Encounters/Data/Encounters8NestDist.cs | 44 +++++++++++++++++++ PKHeX.Core/Legality/Tables/Tables8.cs | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs index 0457209d1..44eb41fa7 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs @@ -12,6 +12,7 @@ internal static partial class Encounters8Nest new EncounterStatic8NC { Species = 875, Level = 15, Ability = A3, Location = 126, IVs = new[] {31,31,-1,31,-1,-1}, DynamaxLevel = 2, Moves = new[] {181,311,054,556} }, // ★And603 Eiscue new EncounterStatic8NC { Species = 874, Level = 15, Ability = A3, Location = 126, IVs = new[] {31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {397,317,335,157} }, // ★And390 Stonjourner new EncounterStatic8NC { Species = 879, Level = 35, Ability = A3, Location = 126, IVs = new[] {31,31,-1, 0,31,-1}, DynamaxLevel = 4, Moves = new[] {484,174,776,583}, CanGigantamax = true }, // ★Sgr6879 Gigantamax Copperajah + new EncounterStatic8NC { Species = 851, Level = 35, Ability = A2, Location = 126, IVs = new[] {31,31,31,-1,-1,-1}, DynamaxLevel = 5, Moves = new[] {680,679,489,438}, CanGigantamax = true }, // ★Sgr6859 Gigantamax Centiskorch }; #endregion } diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestDist.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestDist.cs index 0baf9854b..f47abfa49 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestDist.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestDist.cs @@ -355,6 +355,30 @@ internal static partial class Encounters8Nest new EncounterStatic8ND(60,10,5) { Species = 026, Ability = A4, Moves = new[]{ 087, 034, 057, 583 }, Form = 1 }, // Raichu-1 new EncounterStatic8ND(60,10,5) { Species = 172, Ability = A4, Moves = new[]{ 253, 609, 085, 583 } }, // Pichu new EncounterStatic8ND(60,10,5) { Species = 778, Ability = A4, Moves = new[]{ 087, 452, 261, 583 } }, // Mimikyu + + // 8/31 Electric Grass + new EncounterStatic8ND(17,01,1) { Species = 848, Ability = A4, Moves = new[]{ 609, 051, 496, 715 } }, // Toxel + new EncounterStatic8ND(17,01,1) { Species = 835, Ability = A4, Moves = new[]{ 609, 033, 044, 046 } }, // Yamper + new EncounterStatic8ND(17,01,1) { Species = 695, Ability = A4, Moves = new[]{ 085, 098, 001, 189 } }, // Heliolisk + new EncounterStatic8ND(17,01,1) { Species = 840, Ability = A4, Moves = new[]{ 110, 310, 000, 000 } }, // Applin + new EncounterStatic8ND(17,01,1) { Species = 597, Ability = A4, Moves = new[]{ 033, 042, 232, 106 } }, // Ferroseed + new EncounterStatic8ND(17,01,1) { Species = 829, Ability = A4, Moves = new[]{ 075, 496, 229, 670 } }, // Gossifleur + new EncounterStatic8ND(30,03,2) { Species = 836, Ability = A4, Moves = new[]{ 609, 209, 204, 706 } }, // Boltund + new EncounterStatic8ND(30,03,2) { Species = 695, Ability = A4, Moves = new[]{ 085, 098, 001, 189 } }, // Heliolisk + new EncounterStatic8ND(30,03,2) { Species = 597, Ability = A4, Moves = new[]{ 442, 042, 232, 106 } }, // Ferroseed + new EncounterStatic8ND(30,03,2) { Species = 830, Ability = A4, Moves = new[]{ 536, 496, 229, 670 } }, // Eldegoss + new EncounterStatic8ND(40,05,3) { Species = 836, Ability = A4, Moves = new[]{ 609, 209, 424, 706 } }, // Boltund + new EncounterStatic8ND(40,05,3) { Species = 695, Ability = A4, Moves = new[]{ 085, 098, 447, 189 } }, // Heliolisk + new EncounterStatic8ND(40,05,3) { Species = 598, Ability = A4, Moves = new[]{ 442, 438, 398, 106 } }, // Ferrothorn + new EncounterStatic8ND(40,05,3) { Species = 830, Ability = A4, Moves = new[]{ 536, 304, 229, 670 } }, // Eldegoss + new EncounterStatic8ND(50,08,4) { Species = 836, Ability = A4, Moves = new[]{ 609, 528, 424, 706 } }, // Boltund + new EncounterStatic8ND(50,08,4) { Species = 695, Ability = A4, Moves = new[]{ 085, 304, 447, 523 } }, // Heliolisk + new EncounterStatic8ND(50,08,4) { Species = 598, Ability = A4, Moves = new[]{ 360, 438, 398, 014 } }, // Ferrothorn + new EncounterStatic8ND(50,08,4) { Species = 830, Ability = A4, Moves = new[]{ 536, 304, 229, 437 } }, // Eldegoss + new EncounterStatic8ND(60,10,5) { Species = 836, Ability = A4, Moves = new[]{ 609, 528, 424, 706 } }, // Boltund + new EncounterStatic8ND(60,10,5) { Species = 695, Ability = A4, Moves = new[]{ 085, 304, 447, 523 } }, // Heliolisk + new EncounterStatic8ND(60,10,5) { Species = 598, Ability = A4, Moves = new[]{ 360, 438, 398, 014 } }, // Ferrothorn + new EncounterStatic8ND(60,10,5) { Species = 830, Ability = A4, Moves = new[]{ 536, 304, 063, 437 } }, // Eldegoss }; internal static readonly EncounterStatic8ND[] Dist_SW = @@ -569,6 +593,16 @@ internal static partial class Encounters8Nest new EncounterStatic8ND(60,10,5) { Species = 849, Ability = A4, Moves = new[]{ 786, 506, 474, 409 }, CanGigantamax = true }, // Toxtricity new EncounterStatic8ND(60,10,5) { Species = 094, Ability = A4, Moves = new[]{ 247, 482, 094, 196 }, CanGigantamax = true }, // Gengar //new EncounterStatic8ND(60,10,5) { Species = 884, Ability = A4, Moves = new[]{ 430, 406, 085, 334 }, CanGigantamax = true }, // Duraludon + + // 8/31 - Electric Grass + new EncounterStatic8ND(30,03,2) { Species = 849, Ability = A4, Moves = new[]{ 351, 506, 491, 103 }, Form = 1, CanGigantamax = true }, // Toxtricity-1 + new EncounterStatic8ND(30,03,2) { Species = 842, Ability = A4, Moves = new[]{ 787, 496, 310, 029 }, CanGigantamax = true }, // Appletun + new EncounterStatic8ND(40,05,3) { Species = 849, Ability = A4, Moves = new[]{ 435, 506, 398, 103 }, Form = 1, CanGigantamax = true }, // Toxtricity-1 + new EncounterStatic8ND(40,05,3) { Species = 842, Ability = A4, Moves = new[]{ 787, 496, 406, 029 }, CanGigantamax = true }, // Appletun + new EncounterStatic8ND(50,08,4) { Species = 849, Ability = A4, Moves = new[]{ 786, 506, 398, 586 }, Form = 1, CanGigantamax = true }, // Toxtricity-1 + new EncounterStatic8ND(50,08,4) { Species = 842, Ability = A4, Moves = new[]{ 787, 496, 406, 523 }, CanGigantamax = true }, // Appletun + new EncounterStatic8ND(60,10,5) { Species = 849, Ability = A4, Moves = new[]{ 786, 506, 599, 586 }, Form = 1, CanGigantamax = true }, // Toxtricity-1 + new EncounterStatic8ND(60,10,5) { Species = 842, Ability = A4, Moves = new[]{ 787, 034, 406, 523 }, CanGigantamax = true }, // Appletun }; internal static readonly EncounterStatic8ND[] Dist_SH = @@ -789,6 +823,16 @@ internal static partial class Encounters8Nest new EncounterStatic8ND(60,10,5) { Species = 839, Ability = A4, Moves = new[]{ 246, 053, 157, 523 }, CanGigantamax = true }, // Coalossal new EncounterStatic8ND(60,10,5) { Species = 068, Ability = A4, Moves = new[]{ 238, 007, 008, 089 }, CanGigantamax = true }, // Machamp new EncounterStatic8ND(60,10,5) { Species = 879, Ability = A4, Moves = new[]{ 442, 583, 438, 089 }, CanGigantamax = true }, // Copperajah + + // 8/31 - Electric Grass + new EncounterStatic8ND(30,03,2) { Species = 849, Ability = A4, Moves = new[]{ 351, 506, 491, 103 }, CanGigantamax = true }, // Toxtricity + new EncounterStatic8ND(30,03,2) { Species = 841, Ability = A4, Moves = new[]{ 406, 073, 491, 184 }, CanGigantamax = true }, // Flapple + new EncounterStatic8ND(40,05,3) { Species = 849, Ability = A4, Moves = new[]{ 435, 506, 474, 103 }, CanGigantamax = true }, // Toxtricity + new EncounterStatic8ND(40,05,3) { Species = 841, Ability = A4, Moves = new[]{ 406, 788, 491, 184 }, CanGigantamax = true }, // Flapple + new EncounterStatic8ND(50,08,4) { Species = 849, Ability = A4, Moves = new[]{ 786, 506, 474, 586 }, CanGigantamax = true }, // Toxtricity + new EncounterStatic8ND(50,08,4) { Species = 841, Ability = A4, Moves = new[]{ 406, 788, 491, 263 }, CanGigantamax = true }, // Flapple + new EncounterStatic8ND(60,10,5) { Species = 849, Ability = A4, Moves = new[]{ 786, 506, 474, 586 }, CanGigantamax = true }, // Toxtricity + new EncounterStatic8ND(60,10,5) { Species = 841, Ability = A4, Moves = new[]{ 406, 788, 491, 263 }, CanGigantamax = true }, // Flapple }; } } diff --git a/PKHeX.Core/Legality/Tables/Tables8.cs b/PKHeX.Core/Legality/Tables/Tables8.cs index 3cef02e3a..b40bd4de9 100644 --- a/PKHeX.Core/Legality/Tables/Tables8.cs +++ b/PKHeX.Core/Legality/Tables/Tables8.cs @@ -405,7 +405,7 @@ public static partial class Legal // 1282, // ★And603 (Eiscue) // 1283, // ★And390 (Stonjourner) // 1284, // ★Sgr6879 (Copperajah) - 1285, // ★Sgr6859 + // 1285, // ★Sgr6859 (Centiskorch) 1286, // ★Sgr6913 1287, // ★Sgr7348 1288, // ★Sgr7121