diff --git a/js/search.js b/js/search.js index fcc7df00e..99a5e8e13 100644 --- a/js/search.js +++ b/js/search.js @@ -212,6 +212,72 @@ return buf; }; + Search.renderTaggedPokemonRow = function(pokemon, tag, errorMessage) { + var attrs = ''; + if (Search.urlRoot) attrs = ' href="'+Search.urlRoot+'pokemon/'+toId(pokemon.species)+'" data-target="push"'; + var buf = '
  • '; + + // tag + buf += ''+tag+' '; + + // icon + buf += ''; + buf += ''; + buf += ' '; + + // name + var name = pokemon.species; + var tagStart = (pokemon.forme ? name.length-pokemon.forme.length-1 : 0); + if (tagStart) name = name.substr(0, tagStart) + ''+pokemon.species.substr(tagStart)+''; + buf += ''+name+' '; + + // error + if (errorMessage) { + buf += ''+errorMessage+' '; + buf += '
  • '; + return buf; + } + + // type + buf += ''; + for (var i=0; i'; + buf += ability; + } + if (!pokemon.abilities['DW']) buf += ''; + buf += ''; + buf += ''; + + // base stats + buf += ''; + buf += 'HP
    '+pokemon.baseStats.hp+'
    '; + buf += 'Atk
    '+pokemon.baseStats.atk+'
    '; + buf += 'Def
    '+pokemon.baseStats.def+'
    '; + buf += 'SpA
    '+pokemon.baseStats.spa+'
    '; + buf += 'SpD
    '+pokemon.baseStats.spd+'
    '; + buf += 'Spe
    '+pokemon.baseStats.spe+'
    '; + buf += '
    '; + + buf += ''; + + return buf; + }; Search.renderItemRow = function(item, matchStart, matchLength, errorMessage) { var attrs = ''; @@ -318,6 +384,44 @@ return buf; }; + Search.renderTaggedMoveRow = function(move, tag, errorMessage) { + var attrs = ''; + if (Search.urlRoot) attrs = ' href="'+Search.urlRoot+'move/'+toId(move.name)+'" data-target="push"'; + var buf = '
  • '; + + // tag + buf += ''+tag+' '; + + // name + var name = move.name; + if (name.substr(0, 12) === 'Hidden Power') name = 'Hidden Power'; + buf += ''+name+' '; + + // error + if (errorMessage) { + buf += ''+errorMessage+' '; + buf += '
  • '; + return buf; + } + + // type + buf += ''; + buf += Tools.getTypeIcon(move.type); + buf += ''+move.category+''; + buf += ' '; + + // power, accuracy + buf += ''+(move.category!=='Status'?('Power
    '+(move.basePower||'—')):'')+'
    '; + buf += 'Accuracy
    '+(move.accuracy && move.accuracy!==true?move.accuracy+'%':'—')+'
    '; + + // desc + buf += ''+Tools.escapeHTML(move.shortDesc || move.desc)+' '; + + buf += ''; + + return buf; + }; + Search.renderAbilityRow = function(ability, matchStart, matchLength, errorMessage) { var attrs = ''; if (Search.urlRoot) attrs = ' href="'+Search.urlRoot+'ability/'+toId(ability.name)+'" data-target="push"'; diff --git a/style/utilichart.css b/style/utilichart.css index 8fc0021b1..ed3d5fead 100644 --- a/style/utilichart.css +++ b/style/utilichart.css @@ -133,6 +133,25 @@ color: #000000; font-size: 10pt; } +.utilichart .shortmovenamecol +{ + padding-top: 5px; + height: 23px; + width: 112px; + color: #000000; + font-size: 10pt; +} +.utilichart .tagcol +{ + padding-top: 5px; + height: 23px; + width: 42px; + border-right: 1px solid #CCCCCC; + margin-right: 5px; + text-align: center; + color: #000000; + font-size: 10pt; +} .utilichart .typecol { width: 70px;