From 425de6242a1c0af2781ae6a8399e32f2d4e062b4 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 14 Mar 2016 23:26:51 -0700 Subject: [PATCH] Add duplicate move check Cleanup the class too. --- Legality/Checks.cs | 5 +++++ Legality/Data.cs | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Legality/Checks.cs b/Legality/Checks.cs index 835c5be22..e1c4ad961 100644 --- a/Legality/Checks.cs +++ b/Legality/Checks.cs @@ -227,6 +227,11 @@ private LegalityCheck[] verifyMoves() if (Moves[0] == 0) res[0] = new LegalityCheck(Severity.Invalid, "Invalid Move."); + // Duplicate Moves Check + for (int i = 0; i < 4; i++) + if (Moves.Count(m => m != 0 && m == Moves[i]) > 1) + res[i] = new LegalityCheck(Severity.Invalid, "Duplicate Move."); + return res; } private LegalityCheck[] verifyRelearn() diff --git a/Legality/Data.cs b/Legality/Data.cs index cccb4eeb3..cba4e4791 100644 --- a/Legality/Data.cs +++ b/Legality/Data.cs @@ -150,8 +150,6 @@ public class EncounterStatic public Nature Nature = Nature.Random; public bool Gift = false; public GameVersion Version = GameVersion.Any; - - public EncounterStatic() { } } public enum Nature {