Reject illegal non-shiny sets rather than fixing

Closes #2197
smogon · Oct 20, 2015 · 7cefd67 · 7cefd67
1 parent f52d50b
commit 7cefd67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/data/rulesets.js b/data/rulesets.js
@@ -160,6 +160,10 @@ exports.BattleFormats = {
 				if (perfectIVs < 3) problems.push((set.name || set.species) + " has less than three perfect IVs.");
 			}
 
+			if (set.shiny && template.unobtainableShiny) {
+				problems.push((set.name || set.species) + " may not be shiny.");
+			}
+
 			// limit one of each move
 			var moves = [];
 			if (set.moves) {
@@ -258,9 +262,6 @@ exports.BattleFormats = {
 				set.species = 'Aegislash';
 			}
 
-			if (template.unobtainableShiny) {
-				set.shiny = false;
-			}
 			return problems;
 		}
 	},

diff --git a/team-validator.js b/team-validator.js
@@ -463,8 +463,8 @@ Validator = (function () {
 						if (eventData.nature && eventData.nature !== set.nature) {
 							problems.push(name + " must have a " + eventData.nature + " nature because it has a move only available from a specific event.");
 						}
-						if (eventData.shiny) {
-							set.shiny = true;
+						if (eventData.shiny && !set.shiny) {
+							problems.push(name + " must be shiny because it has a move only available from a specific event.");
 						}
 						if (eventData.generation < 5) eventData.isHidden = false;
 						if (eventData.isHidden !== undefined && eventData.isHidden !== isHidden) {