From bc262a7cdf9a107b9497fe1748b524e08b8d3ce0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 15 Aug 2018 14:52:25 -0700 Subject: [PATCH] Remove Plasma Fists from unsketchable Closes #2095 split out unsketchable moves (struggle/chatter) to separate array remove trailing spaces (auto fixed by my visual studio plugin), add space before comment // --- PKHeX.Core/Legality/Tables.cs | 51 ++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/PKHeX.Core/Legality/Tables.cs b/PKHeX.Core/Legality/Tables.cs index aca3a9282..b1ee1b603 100644 --- a/PKHeX.Core/Legality/Tables.cs +++ b/PKHeX.Core/Legality/Tables.cs @@ -269,8 +269,9 @@ public static partial class Legal 723, 724, 725, 726, 727, 728 }; - internal static readonly int[] UnreleasedMoves = {617, 721}; // Light of Ruin & Plasma Fists - internal static readonly HashSet InvalidSketch = new HashSet(new[] { 165, 448 }.Concat(Z_Moves).Concat(UnreleasedMoves)); // Struggle & Chatter + internal static readonly int[] UnreleasedMoves = {617}; // Light of Ruin + internal static readonly int[] CantSketchMoves = {165, 448}; // Struggle & Chatter + internal static readonly HashSet InvalidSketch = new HashSet(CantSketchMoves.Concat(Z_Moves).Concat(UnreleasedMoves)); public static readonly HashSet Legends = new HashSet { @@ -311,29 +312,29 @@ public static partial class Legal }; internal static readonly int[] FairyMoves = { - 186, //Sweet Kiss - 204, //Charm - 236, //Moonlight - 574, //Disarming Voice - 577, //Draining Kiss - 578, //Crafty Shield - 579, //Flower Shield - 581, //Misty Terrain - 583, //Play Rough - 584, //Fairy Wind - 585, //Moonblast - 587, //Fairy Lock - 597, //Aromatic Mist - 601, //Geomancy - 605, //Dazzling Gleam - 608, //Baby-Doll Eyes - 617, //Light of Ruin - 656, //Twinkle Tackle - 657, //Twinkle Tackle - 666, //Floral Healing - 698, //Guardian of Alola - 705, //Fleur Cannon - 717, //Nature's Madness + 186, // Sweet Kiss + 204, // Charm + 236, // Moonlight + 574, // Disarming Voice + 577, // Draining Kiss + 578, // Crafty Shield + 579, // Flower Shield + 581, // Misty Terrain + 583, // Play Rough + 584, // Fairy Wind + 585, // Moonblast + 587, // Fairy Lock + 597, // Aromatic Mist + 601, // Geomancy + 605, // Dazzling Gleam + 608, // Baby-Doll Eyes + 617, // Light of Ruin + 656, // Twinkle Tackle + 657, // Twinkle Tackle + 666, // Floral Healing + 698, // Guardian of Alola + 705, // Fleur Cannon + 717, // Nature's Madness }; // Moves that trigger the evolution by move internal static readonly int[][] MoveEvolutionWithMove =