From 84abc04d0708c430644fcc7cee1e00cd8101be2a Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 25 Mar 2020 19:02:09 -0700 Subject: [PATCH] 3/25 Wild Area News Restrict abilities for crystal raids (corviknight always hidden, everything else can be anything-except-hidden). --- .../Encounters/Data/Encounters8NestCrystal.cs | 8 +++--- .../Encounters/Data/Encounters8NestDist.cs | 26 +++++++++++++++++++ PKHeX.Core/Legality/Tables/Tables8.cs | 4 +-- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs index f394bfe01..38ab9839b 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestCrystal.cs @@ -6,9 +6,11 @@ internal static partial class Encounters8Nest #region Dynamax Crystal Distributions internal static readonly EncounterStatic8NC[] Crystal_SWSH = { - new EncounterStatic8NC { Species = 782, Level = 16, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {033,029,525,043}, }, // ★And458 Jangmo-o - new EncounterStatic8NC { Species = 246, Level = 16, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {033,157,371,044}, }, // ★And15 Larvitar - new EncounterStatic8NC { Species = 823, Level = 50, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,31}, DynamaxLevel = 5, Moves = new[] {065,442,034,796}, CanGigantamax = true }, // ★And337 4-Star Gigantamax Corviknight + new EncounterStatic8NC { Species = 782, Level = 16, Ability = A3, Location = 126, IVs = new[] {31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {033,029,525,043} }, // ★And458 Jangmo-o + new EncounterStatic8NC { Species = 246, Level = 16, Ability = A3, Location = 126, IVs = new[] {31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {033,157,371,044} }, // ★And15 Larvitar + new EncounterStatic8NC { Species = 823, Level = 50, Ability = A2, Location = 126, IVs = new[] {31,31,31,-1,-1,31}, DynamaxLevel = 5, Moves = new[] {065,442,034,796}, CanGigantamax = true }, // ★And337 Gigantamax Corviknight + 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 }; #endregion } diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestDist.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestDist.cs index 13e1c8894..00802a54d 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters8NestDist.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8NestDist.cs @@ -137,6 +137,24 @@ internal static partial class Encounters8Nest new EncounterStatic8ND(50,08,4) { Species = 871, Ability = A2, Moves = new[]{ 435, 330, 474, 367 } }, // Pincurchin //new EncounterStatic8ND(50,08,4) { Species = 068, Ability = A4, Moves = new[]{ 280, 444, 371, 523 }, CanGigantamax = true }, // Machamp //new EncounterStatic8ND(60,10,5) { Species = 143, Ability = A4, Moves = new[]{ 034, 442, 242, 428 }, CanGigantamax = true }, // Snorlax + + // 3/25 Charizard + new EncounterStatic8ND(17,01,1) { Species = 878, Ability = A4, Moves = new[]{ 091, 249, 205, 523 } }, // Cufant + new EncounterStatic8ND(17,01,1) { Species = 568, Ability = A4, Moves = new[]{ 001, 499, 491, 133 } }, // Trubbish + new EncounterStatic8ND(17,01,1) { Species = 004, Ability = A4, Moves = new[]{ 424, 052, 108, 225 } }, // Charmander + new EncounterStatic8ND(17,01,1) { Species = 884, Ability = A4, Moves = new[]{ 468, 249, 043, 232 } }, // Duraludon + new EncounterStatic8ND(30,03,2) { Species = 878, Ability = A4, Moves = new[]{ 334, 091, 205, 523 } }, // Cufant + new EncounterStatic8ND(30,03,2) { Species = 568, Ability = A4, Moves = new[]{ 036, 499, 124, 133 } }, // Trubbish + new EncounterStatic8ND(30,03,2) { Species = 005, Ability = A4, Moves = new[]{ 053, 163, 108, 225 } }, // Charmeleon + new EncounterStatic8ND(30,03,2) { Species = 884, Ability = A4, Moves = new[]{ 468, 249, 784, 232 } }, // Duraludon + new EncounterStatic8ND(40,05,3) { Species = 879, Ability = A4, Moves = new[]{ 334, 070, 442, 523 }, CanGigantamax = true }, // Copperajah + new EncounterStatic8ND(40,05,3) { Species = 569, Ability = A4, Moves = new[]{ 188, 499, 034, 707 }, CanGigantamax = true }, // Garbodor + new EncounterStatic8ND(40,05,3) { Species = 006, Ability = A4, Moves = new[]{ 053, 403, 108, 225 }, CanGigantamax = true }, // Charizard + new EncounterStatic8ND(40,05,3) { Species = 884, Ability = A4, Moves = new[]{ 442, 555, 784, 334 }, CanGigantamax = true }, // Duraludon + new EncounterStatic8ND(50,08,4) { Species = 879, Ability = A4, Moves = new[]{ 667, 442, 438, 523 }, CanGigantamax = true }, // Copperajah + new EncounterStatic8ND(50,08,4) { Species = 569, Ability = A4, Moves = new[]{ 441, 499, 402, 707 }, CanGigantamax = true }, // Garbodor + new EncounterStatic8ND(50,08,4) { Species = 006, Ability = A4, Moves = new[]{ 053, 403, 076, 257 }, CanGigantamax = true }, // Charizard + new EncounterStatic8ND(50,08,4) { Species = 884, Ability = A4, Moves = new[]{ 337, 430, 784, 776 }, CanGigantamax = true }, // Duraludon }; internal static readonly EncounterStatic8ND[] Dist_SW = @@ -324,6 +342,10 @@ internal static partial class Encounters8Nest new EncounterStatic8ND(60,10,5) { Species = 630, Ability = A2, Moves = new[]{ 403, 555, 492, 211 } }, // Mandibuzz new EncounterStatic8ND(60,10,5) { Species = 078, Ability = A2, Moves = new[]{ 428, 583, 224, 340 }, Form = 1 }, // Rapidash-1 //new EncounterStatic8ND(60,10,5) { Species = 068, Ability = A4, Moves = new[]{ 238, 007, 008, 089 }, CanGigantamax = true }, // Machamp + + // 3/25 - Charizard + new EncounterStatic8ND(60,10,5) { Species = 879, Ability = A4, Moves = new[]{ 442, 583, 438, 089 }, CanGigantamax = true }, // Copperajah + new EncounterStatic8ND(60,10,5) { Species = 884, Ability = A4, Moves = new[]{ 430, 406, 085, 334 }, CanGigantamax = true }, // Duraludon }; internal static readonly EncounterStatic8ND[] Dist_SH = @@ -511,6 +533,10 @@ internal static partial class Encounters8Nest new EncounterStatic8ND(60,10,5) { Species = 628, Ability = A2, Moves = new[]{ 413, 276, 442, 157 } }, // Braviary new EncounterStatic8ND(60,10,5) { Species = 865, Ability = A2, Moves = new[]{ 370, 413, 211, 675 } }, // Sirfetch’d //new EncounterStatic8ND(60,10,5) { Species = 094, Ability = A4, Moves = new[]{ 247, 482, 094, 196 }, CanGigantamax = true }, // Gengar + + // 3/25 - Charizard + new EncounterStatic8ND(60,10,5) { Species = 569, Ability = A4, Moves = new[]{ 441, 409, 402, 707 }, CanGigantamax = true }, // Garbodor + new EncounterStatic8ND(60,10,5) { Species = 006, Ability = A4, Moves = new[]{ 257, 403, 406, 411 }, CanGigantamax = true }, // Charizard }; } } diff --git a/PKHeX.Core/Legality/Tables/Tables8.cs b/PKHeX.Core/Legality/Tables/Tables8.cs index 56a146ac2..ef069dc04 100644 --- a/PKHeX.Core/Legality/Tables/Tables8.cs +++ b/PKHeX.Core/Legality/Tables/Tables8.cs @@ -374,8 +374,8 @@ public static partial class Legal // 1279, // ★And458 (Jangmo-o) // 1280, // ★And15 (Larvitar) // 1281, // ★And337 (Corviknight) - 1282, // ★And603 - 1283, // ★And390 + // 1282, // ★And603 (Eiscue) + // 1283, // ★And390 (Stonjourner) 1284, // ★Sgr6879 1285, // ★Sgr6859 1286, // ★Sgr6913