From ab8faac55dd73476a1bd0d4318a5197db0ce90bf Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 8 Nov 2017 20:23:06 -0800 Subject: [PATCH] Update legal tables with usum species --- PKHeX.Core/Legality/Tables.cs | 19 ++++++++++++++++--- PKHeX.Core/Legality/Tables7.cs | 10 +++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Legality/Tables.cs b/PKHeX.Core/Legality/Tables.cs index d46ef91bf..cc9fbdb1b 100644 --- a/PKHeX.Core/Legality/Tables.cs +++ b/PKHeX.Core/Legality/Tables.cs @@ -54,6 +54,8 @@ public static partial class Legal 720, // Hoopa 741, // Oricorio 773, // Silvally + + 800, // Necrozma }; public static readonly HashSet FormChangeMoves = new HashSet { @@ -153,6 +155,12 @@ public static partial class Legal 800, // Necrozma 801, // Magearna 802, // Marshadow + + 803, // Poipole + 804, // Naganadel + 805, // Stakataka + 806, // Blacephalon + 807, // Zeraora }; public static readonly HashSet BattleFrontierBanlist = new HashSet @@ -195,6 +203,7 @@ public static partial class Legal 800, // Necrozma 801, // Magearna 802, // Marshadow + 807, // Zeraora }; public static readonly HashSet BattleForms = new HashSet @@ -223,7 +232,10 @@ public static partial class Legal 302,319,323,334,362,373,376,384, 428,475, 531, - 719 + 719, + + // USUM + 800, // Ultra Necrozma }; public static readonly HashSet BattlePrimals = new HashSet { 382, 383 }; @@ -232,6 +244,7 @@ public static partial class Legal 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 695, 696, 697, 698, 699, 700, 701, 702, 703, 719, + 723, 724, 725, 726, 727, 728 }; internal static readonly HashSet InvalidSketch = new HashSet(new[] { 165, 448 }.Concat(Z_Moves)); // Struggle & Chatter @@ -240,14 +253,14 @@ public static partial class Legal 150, 151, 249, 250, 251, 382, 383, 384, 385, 386, 483, 484, 487, 489, 490, 491, 492, 493, 494, 643, 644, 646, 647, 648, 649, 716, 717, 718, 719, 720, 721, 789, 790, - 791, 792, 800, 801, 802 + 791, 792, 800, 801, 802, 807 }; public static readonly HashSet SubLegends = new HashSet { 144, 145, 146, 243, 244, 245, 377, 378, 379, 380, 381, 480, 481, 482, 485, 486, 488, 638, 639, 640, 641, 642, 645, 772, 773, 787, 788, 785, 786, 793, 794, 795, 796, - 797, 798, 799 + 797, 798, 799, 803, 804, 805, 806, }; public static readonly int[] Arceus_Plate = {303, 306, 304, 305, 309, 308, 310, 313, 298, 299, 301, 300, 307, 302, 311, 312, 644}; diff --git a/PKHeX.Core/Legality/Tables7.cs b/PKHeX.Core/Legality/Tables7.cs index d746f2e12..3a4727d18 100644 --- a/PKHeX.Core/Legality/Tables7.cs +++ b/PKHeX.Core/Legality/Tables7.cs @@ -263,7 +263,15 @@ public static partial class Legal 731, 734, 736, 739, 741, 742, 744, 746, 747, 749, 751, 753, 755, 757, 759, 761, 764, 765, 766, 767, 769, 771, 774, 775, 776, 777, 778, 779, 780, 781, - 782 + 782, + + // USUM Additions + 023, 086, 108, 138, 140, 163, 177, 179, 190, 204, + 206, 214, 223, 228, 238, 246, 303, 309, 341, 343, + 345, 347, 352, 353, 357, 366, 427, 439, 458, 550, + 559, 570, 572, 592, 605, 619, 621, 622, 624, 636, + 667, 669, 676, 686, 690, 692, 696, 698, 701, 702, + 714 }; internal static readonly HashSet AlolanCaptureNoHeavyBall = new HashSet { 374, 785, 786, 787, 788}; // Beldum & Tapus internal static readonly HashSet Inherit_ApricornMale7 = new HashSet