Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-01 07:10:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Teambuilder: Fix various bugs in search.js refactor

Browse Source 
- Add pokemon list for CAP
- Add pokemon list for AG
- Add pokemon list for PU
- Make sure the move "Psychic" is above the type for move searches
- Fix bug in generating learnsets
- Fix move list for Smeargle
- Show tier instead of National dex number in pokemon charts
- Fix bug in pokemon field defocusing
This commit is contained in:
Guangcong Luo
2015-12-22 07:31:02 -05:00
parent 877239bcb4
commit e1ffede0f3
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
githooks/build-indexes
View File

@@ -131,7 +131,7 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
const tiers = BattleTeambuilderTable.tiers = [];
const formatSlices = BattleTeambuilderTable.formatSlices = {};
const tierOrder = ["Uber", "OU", "BL", "(OU)", "UU", "BL2", "RU", "BL3", "NU", "BL4", "PU", "NFE", "LC Uber", "LC"];
const tierOrder = ["CAP", "Uber", "OU", "BL", "(OU)", "UU", "BL2", "RU", "BL3", "NU", "BL4", "PU", "NFE", "LC Uber", "LC"];
for (const tier of tierOrder) {
if (tier === "OU" || tier === "Uber" || tier === "UU" || tier === "RU" || tier === "NU" || tier === "PU" || tier === "LC") {

2
js/client-teambuilder.js
View File

@@ -2146,7 +2146,7 @@
var val = '';
switch (name) {
case 'pokemon':
val = (id in BattlePokedex ? BattlePokedex[id].name : '');
val = (id in BattlePokedex ? BattlePokedex[id].species : '');
break;
case 'ability':
val = (id in BattleAbilities ? BattleAbilities[id].name : '');

30
js/search.js
View File

@@ -211,6 +211,7 @@
if (this.filters) {
topbuf = Search.renderRow(this.getFilterText(1), 'html', 0);
}
if (qTypeIndex === 2 && query === 'psychic') topbufIndex = 2;
if (topbufIndex >= 0) {
topbuf += bufs[topbufIndex];
bufs[topbufIndex] = '';
@@ -514,11 +515,15 @@
BattleTeambuilderTable.tiers = null;
}
var tierSet = BattleTeambuilderTable.tierSet;
if (format === 'ou') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.OU);
if (format === 'uu') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.UU);
if (format === 'ru') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.RU);
if (format === 'nu') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.NU);
if (format === 'lc') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.LC);
if (format === 'uber') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.Uber);
else if (format === 'ou') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.OU);
else if (format === 'uu') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.UU);
else if (format === 'ru') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.RU);
else if (format === 'nu') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.NU);
else if (format === 'pu') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.PU);
else if (format === 'lc') tierSet = tierSet.slice(BattleTeambuilderTable.formatSlices.LC);
else if (format === 'cap') tierSet = tierSet.slice(0, BattleTeambuilderTable.formatSlices.Uber).concat(tierSet.slice(BattleTeambuilderTable.formatSlices.OU));
else tierSet = [['header', "AG", 0], ['pokemon', 'rayquazamega', 0]].concat(tierSet.slice(BattleTeambuilderTable.formatSlices.Uber));
this.defaultResultSet = tierSet;
this.legalityLabel = "Banned";
break;
@@ -552,8 +557,9 @@
case 'move':
template = Tools.getTemplate(set.species);
if (!(toId(template.species)) in BattleLearnsets) template = Tools.getTemplate(template.baseSpecies);
if (!(toId(template.species) in BattleLearnsets)) template = Tools.getTemplate(template.baseSpecies);
var moves = [];
var sketch = false;
while (true) {
var learnsetTemplate = BattleLearnsets[toId(template.species)];
if (learnsetTemplate) {
@@ -561,6 +567,7 @@
if (requirePentagon && !learnsetTemplate.learnset[l].length) continue;
if (moves.indexOf(l) >= 0) continue;
moves.push(l);
if (l === 'sketch') sketch = true;
if (l === 'hiddenpower') {
moves.push('hiddenpowerbug', 'hiddenpowerdark', 'hiddenpowerdragon', 'hiddenpowerelectric', 'hiddenpowerfighting', 'hiddenpowerfire', 'hiddenpowerflying', 'hiddenpowerghost', 'hiddenpowergrass', 'hiddenpowerground', 'hiddenpowerice', 'hiddenpowerpoison', 'hiddenpowerpsychic', 'hiddenpowerrock', 'hiddenpowersteel', 'hiddenpowerwater');
}
@@ -569,6 +576,14 @@
if (!template.prevo) break;
template = BattlePokedex[template.prevo];
}
if (sketch) {
moves = [];
for (var i in BattleMovedex) {
if (i === 'chatter' || i === 'magikarpsrevenge' || i === 'paleowave' || i === 'shadowstrike') continue;
moves.push(i);
}
}
moves.sort();
var usableMoves = [];
@@ -684,7 +699,8 @@
var buf = '<li class="result"><a' + attrs + ' data-entry="pokemon:' + Tools.escapeHTML(pokemon.species) + '">';
// number
buf += '<span class="col numcol">' + (pokemon.num >= 0 ? pokemon.num : 'CAP') + '</span> ';
// buf += '<span class="col numcol">' + (pokemon.num >= 0 ? pokemon.num : 'CAP') + '</span> ';
buf += '<span class="col numcol">' + (pokemon.tier || Tools.getTemplate(pokemon.baseSpecies).tier) + '</span> ';
// icon
buf += '<span class="col iconcol">';