Fix VGC '17 validation

config/formats.js

@@ -212,7 +212,7 @@ exports.Formats = [
 		},
 		ruleset: ['Pokemon', 'Species Clause', 'Nickname Clause', 'Item Clause', 'Team Preview', 'Cancel Mod', 'Alola Pokedex'],
 		banlist: ['Illegal', 'Unreleased', 'Solgaleo', 'Lunala', 'Necrozma', 'Magearna', 'Marshadow', 'Zygarde', 'Mega'],
-		requirePentagon: true,
+		requirePlus: true,
 	},
 	{
 		name: "[Gen 7] Battle Spot Doubles",

team-validator.js

@@ -340,6 +340,8 @@ class Validator {
 							problemString = problemString.concat(` because it can only sketch ${problem.maxSketches} move${plural}.`);
 						} else if (problem.type === 'pentagon') {
 							problemString = problemString.concat(` because it's only obtainable before gen 6.`);
+						} else if (problem.type === 'pastGen') {
+							problemString = problemString.concat(` because it's only obtainable from a previous generation.`);
 						} else {
 							problemString = problemString.concat(`.`);
 						}
@@ -453,7 +455,7 @@ class Validator {
 				events:
 				for (let i = 0; i < eventPokemon.length; i++) {
 					let eventData = eventPokemon[i];
-					if (format.requirePentagon && eventData.generation < 6) continue;
+					if ((format.requirePentagon && eventData.generation < 6) || (format.requirePlus && eventData.generation < 7)) continue;
 					if (eventData.level && set.level < eventData.level) continue;
 					if ((eventData.shiny === true && !set.shiny) || (!eventData.shiny && set.shiny)) continue;
 					if (eventData.nature && set.nature !== eventData.nature) continue;
@@ -685,6 +687,7 @@ class Validator {
 		// the equivalent of adding "every source at or before this gen" to sources
 		let sourcesBefore = 0;
 		if (lsetData.sourcesBefore === undefined) lsetData.sourcesBefore = tools.gen;
+		let noPastGen = !!format.requirePlus;
 		// Pokemon cannot be traded to past generations except in Gen 1 Tradeback
 		let noFutureGen = !(format.banlistTable && format.banlistTable['allowtradeback']);
 		// if a move can only be learned from a gen 2-5 egg, we have to check chainbreeding validity
@@ -720,7 +723,7 @@ class Validator {
 				for (let i = 0, len = lset.length; i < len; i++) {
 					let learned = lset[i];
 					let learnedGen = parseInt(learned.charAt(0));
-					if (format.requirePentagon && learnedGen < 6) continue;
+					if ((format.requirePentagon && learnedGen < 6) || (noPastGen && learnedGen < tools.gen)) continue;
 					if (noFutureGen && learnedGen > tools.gen) continue;
 
 					// redundant
@@ -767,7 +770,8 @@ class Validator {
 					} else if (learned.charAt(1) === 'E') {
 						// egg moves:
 						//   only if that was the source
-						if (learnedGen >= 6 || lsetData.fastCheck) {
+						const noPastGenBreeding = noPastGen && tools.gen === 7;
+						if ((learnedGen >= 6 && !noPastGenBreeding) || lsetData.fastCheck) {
 							// gen 6 doesn't have egg move incompatibilities except for certain cases with baby Pokemon
 							learned = learnedGen + 'E' + (template.prevo ? template.id : '');
 							sources.push(learned);
@@ -807,12 +811,17 @@ class Validator {
 							if (!father.eggGroups.some(eggGroup => eggGroupsSet.has(eggGroup))) continue;
 
 							// detect unavailable egg moves
+							const fatherLatestMoveGen = parseInt(fatherSources[0].charAt(0));
 							if (format.requirePentagon) {
-								const fatherLatestMoveGen = fatherSources[0].charAt(0);
 								if (parseInt(fatherLatestMoveGen) < 6) continue;
 								atLeastOne = true;
 								break;
 							}
+							if (noPastGenBreeding) {
+								if (parseInt(fatherLatestMoveGen) < tools.gen) continue;
+								atLeastOne = true;
+								break;
+							}
 
 							// we can breed with it
 							atLeastOne = true;
@@ -823,7 +832,7 @@ class Validator {
 							sources.push(learned + father.id);
 							if (limitedEgg !== false) limitedEgg = true;
 						}
-						if (atLeastOne) {
+						if (atLeastOne && noPastGenBreeding) {
 							// gen 6+ doesn't have egg move incompatibilities except for certain cases with baby Pokemon
 							learned = learnedGen + 'E' + (template.prevo ? template.id : '');
 							sources.push(learned);
@@ -833,6 +842,7 @@ class Validator {
 						// chainbreeding with itself
 						// e.g. ExtremeSpeed Dragonite
 						if (!atLeastOne) {
+							if (noPastGenBreeding) continue;
 							sources.push(learned + template.id);
 							limitedEgg = 'self';
 						}
@@ -915,6 +925,7 @@ class Validator {
 		// Now that we have our list of possible sources, intersect it with the current list
 		if (!sourcesBefore && !sources.length) {
 			if (format.requirePentagon && sometimesPossible) return {type:'pentagon'};
+			if (noPastGen && sometimesPossible) return {type:'pastGen'};
 			if (incompatibleAbility) return {type:'incompatibleAbility'};
 			return true;
 		}