Skip to content

Commit

Permalink
Disallow non-standard Pokemon in Gen1/2 randbats (#5235)
Browse files Browse the repository at this point in the history
  • Loading branch information
KamilaBorowska authored and TheImmortal committed Mar 3, 2019
1 parent 79bb4a2 commit 8289374
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion data/mods/gen1/random-teams.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class RandomGen1Teams extends RandomGen2Teams {
let pokemonPool = [];
for (let id in this.data.FormatsData) {
let template = this.getTemplate(id);
if (template.gen <= this.gen && template.randomBattleMoves) {
if (!template.isNonstandard && template.gen <= this.gen && template.randomBattleMoves) {
pokemonPool.push(id);
}
}
Expand Down
2 changes: 1 addition & 1 deletion data/mods/gen2/random-teams.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class RandomGen2Teams extends RandomGen3Teams {
let pokemonPool = [];
for (let id in this.data.FormatsData) {
let template = this.getTemplate(id);
if (template.gen <= this.gen && this.data.FormatsData[id].randomSet1) {
if (!template.isNonstandard && template.gen <= this.gen && this.data.FormatsData[id].randomSet1) {
pokemonPool.push(id);
}
}
Expand Down

0 comments on commit 8289374

Please sign in to comment.