Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix a few bugs in the team validator

Browse Source
This commit is contained in:
Guangcong Luo 2011-12-23 02:21:13 -05:00
parent 45abd0bbc1
commit 8a76fb4099
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools.js
View File

@ -214,7 +214,7 @@ function BattleTools()
}
else
{
if (format.banlistTable) format.banlistTable = {};
if (!format.banlistTable) format.banlistTable = {};
if (!format.setBanTable) format.setBanTable = [];
if (!format.teamBanTable) format.teamBanTable = [];
@ -224,10 +224,10 @@ function BattleTools()
{
for (var i=0; i<subformat.banlist.length; i++)
{
banlistTable[subformat.banlist[i]] = true;
// make sure we don't infinitely recurse
if (banlistTable[toId(subformat.banlist[i])]) continue;
banlistTable[subformat.banlist[i]] = true;
banlistTable[toId(subformat.banlist[i])] = true;
var plusPos = subformat.banlist[i].indexOf('+');
@ -255,7 +255,7 @@ function BattleTools()
}
var subsubformat = selfT.getEffect(subformat.banlist[i]);
if (subsubformat.banlist)
if (subsubformat.banlist && subsubformat.effectType === 'Banlist')
{
selfT.getBanlistTable(format, subsubformat);
}
@ -280,9 +280,10 @@ function BattleTools()
{
return ["Your team has no pokemon."];
}
var teamHas = {};
for (var i=0; i<team.length; i++)
{
var setProblems = selfT.validateSet(team[i], format);
var setProblems = selfT.validateSet(team[i], format, teamHas);
if (setProblems)
{
problems = problems.concat(setProblems);
@ -294,7 +295,7 @@ function BattleTools()
var bannedCombo = '';
for (var j=0; j<format.teamBanTable[i].length; j++)
{
if (!setHas[format.teamBanTable[i][j]])
if (!teamHas[format.teamBanTable[i][j]])
{
bannedCombo = false;
break;
@ -386,7 +387,7 @@ function BattleTools()
unreleasedDW = {
Serperior: 1, Chandelure: 1, Ditto: 1,
Breloom: 1, Zapdos: 1, Lucario: 1, Feraligatr: 1, Gothitelle: 1,
'Ho-Oh': 1, Lugia: 1
'Ho-Oh': 1, Lugia: 1, Raikou: 1
};
if (unreleasedDW[set.species] && banlistTable['Unreleased'])