Skip to content

Commit efdfcdf

Browse files
YoshiblazeKrisXV
andauthored
Modern Gen 2: Fix Move Validation + Do Not Use: Unban Capsakid & Snorunt (#10243)
* Update scripts.ts * Update scripts.ts * Update scripts.ts * Update scripts.ts * Update formats.ts * Update data/mods/moderngen2/scripts.ts * Update data/mods/moderngen2/scripts.ts --------- Co-authored-by: Kris Johnson <[email protected]>
1 parent c89f896 commit efdfcdf

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

config/formats.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,13 +498,13 @@ export const Formats: FormatList = [
498498
banlist: ['Huge Power', 'Pure Power', 'Shadow Tag', 'Arena Trap', 'Baton Pass', 'Moody', 'Dewpider', 'Smeargle', 'Zigzagoon-Base', 'Flittle', 'Nidoran-M', 'Wingull', 'Wishiwashi'],
499499
onBegin() {
500500
this.add('-message', `Welcome to Do Not Use!`);
501-
this.add('-message', `This is a metagame where only Pokemon with less than 280 BST are allowed, plus Unown and Luvdisc!`);
501+
this.add('-message', `This is a metagame where only Pokemon with less than 280 BST are allowed, plus a select few others!`);
502502
this.add('-message', `You can find our thread and metagame resources here:`);
503503
this.add('-message', `https://www.smogon.com/forums/threads/3734326/`);
504504
},
505505
onValidateSet(set) {
506506
const species = this.dex.species.get(set.species);
507-
if (species.bst > 280 && !['Luvdisc', 'Unown'].includes(species.baseSpecies)) {
507+
if (species.bst > 280 && !['Luvdisc', 'Unown', 'Capsakid', 'Snorunt'].includes(species.baseSpecies)) {
508508
return [`Only Pok\u00e9mon with a BST of 280 or lower are allowed.`, `(${species.name}'s BST is ${species.bst}.)`];
509509
}
510510
},

data/mods/moderngen2/scripts.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ export const Scripts: ModdedBattleScriptsData = {
55
const specialTypes = ['Fire', 'Water', 'Grass', 'Ice', 'Electric', 'Dark', 'Psychic', 'Dragon'];
66
for (const i in this.data.Moves) {
77
if (this.data.Moves[i].num! >= 252) this.modData('Moves', i).gen = 2;
8-
if (this.data.Moves[i].isNonstandard === 'Past') this.modData('Moves', i).isNonstandard = null;
8+
const illegalities = ['Past', 'LGPE', 'Unobtainable'];
9+
if (this.data.Moves[i].isNonstandard && illegalities.includes(this.data.Moves[i].isNonstandard as string)) {
10+
this.modData('Moves', i).isNonstandard = null;
11+
}
912
if (this.data.Moves[i].category === 'Status') continue;
1013
const newCategory = specialTypes.includes(this.data.Moves[i].type) ? 'Special' : 'Physical';
1114
if (newCategory !== this.data.Moves[i].category) {

0 commit comments

Comments
 (0)