mirror of
https://github.com/smogon/pokemon-showdown-client.git
synced 2026-05-05 21:16:26 -05:00
Use new-size pokemon icons in Switch menu
This also slightly redesigns the switch menu.
This commit is contained in:
Guangcong Luo
parent
7aaf8f3cdb
commit
3509b782f7
|
|
@ -387,9 +387,9 @@
|
|||
if (disabled) {
|
||||
controls += '<button disabled="disabled" style="visibility:hidden"></button> ';
|
||||
} else if (!pokemon || pokemon.zerohp) {
|
||||
controls += '<button class="disabled" name="chooseMoveTarget" value="' + (i + 1) + '"><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon('missingno') + '"></span></button> ';
|
||||
controls += '<button class="disabled" name="chooseMoveTarget" value="' + (i + 1) + '"><span class="picon" style=""></span></button> ';
|
||||
} else {
|
||||
controls += '<button name="chooseMoveTarget" value="' + (i + 1) + '"' + this.tooltipAttrs("your" + i, 'pokemon', true, true) + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') + '</button> ';
|
||||
controls += '<button name="chooseMoveTarget" value="' + (i + 1) + '"' + this.tooltipAttrs("your" + i, 'pokemon', true, true) + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') + '</button> ';
|
||||
}
|
||||
}
|
||||
controls += '<div style="clear:both"></div> </div><div class="switchmenu" style="display:block">';
|
||||
|
|
@ -407,9 +407,9 @@
|
|||
if (disabled) {
|
||||
controls += '<button disabled="disabled" style="visibility:hidden"></button> ';
|
||||
} else if (!pokemon || pokemon.zerohp) {
|
||||
controls += '<button class="disabled" name="chooseMoveTarget" value="' + (-(i + 1)) + '"><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon('missingno') + '"></span></button> ';
|
||||
controls += '<button class="disabled" name="chooseMoveTarget" value="' + (-(i + 1)) + '"><span class="picon" style=""></span></button> ';
|
||||
} else {
|
||||
controls += '<button name="chooseMoveTarget" value="' + (-(i + 1)) + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') + '</button> ';
|
||||
controls += '<button name="chooseMoveTarget" value="' + (-(i + 1)) + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') + '</button> ';
|
||||
}
|
||||
}
|
||||
controls += '</div>';
|
||||
|
|
@ -476,9 +476,9 @@
|
|||
var pokemon = switchables[i];
|
||||
pokemon.name = pokemon.ident.substr(4);
|
||||
if (pokemon.zerohp || i < this.battle.mySide.active.length || this.choice.switchFlags[i]) {
|
||||
controls += '<button class="disabled" name="chooseDisabled" value="' + pokemon.name + (pokemon.zerohp ? ',fainted' : i < this.battle.mySide.active.length ? ',active' : '') + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + (!pokemon.zerohp ? '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') : '') + '</button> ';
|
||||
controls += '<button class="disabled" name="chooseDisabled" value="' + pokemon.name + (pokemon.zerohp ? ',fainted' : i < this.battle.mySide.active.length ? ',active' : '') + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + (!pokemon.zerohp ? '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') : '') + '</button> ';
|
||||
} else {
|
||||
controls += '<button name="chooseSwitch" value="' + i + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') + '</button> ';
|
||||
controls += '<button name="chooseSwitch" value="' + i + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') + '</button> ';
|
||||
}
|
||||
}
|
||||
if (this.finalDecisionSwitch && this.battle.gen > 2) {
|
||||
|
|
@ -528,11 +528,11 @@
|
|||
pokemon = this.myPokemon[i];
|
||||
|
||||
if (pokemon && !pokemon.zerohp || this.choice.switchOutFlags[i]) {
|
||||
controls += '<button disabled' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + (!pokemon.zerohp ? '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') : '') + '</button> ';
|
||||
controls += '<button disabled' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + (!pokemon.zerohp ? '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') : '') + '</button> ';
|
||||
} else if (!pokemon) {
|
||||
controls += '<button disabled></button> ';
|
||||
} else {
|
||||
controls += '<button name="chooseSwitchTarget" value="' + i + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') + '</button> ';
|
||||
controls += '<button name="chooseSwitchTarget" value="' + i + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') + '</button> ';
|
||||
}
|
||||
}
|
||||
controls += '</div>';
|
||||
|
|
@ -553,7 +553,7 @@
|
|||
} else {
|
||||
controls += '<button name="chooseSwitch" value="' + i + '"' + this.tooltipAttrs(i, 'sidepokemon') + '>';
|
||||
}
|
||||
controls += '<span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + (!pokemon.zerohp ? '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') : '') + '</button> ';
|
||||
controls += '<span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + (!pokemon.zerohp ? '<span class="hpbar' + pokemon.getHPColorClass() + '"><span style="width:' + (Math.round(pokemon.hp * 92 / pokemon.maxhp) || 1) + 'px"></span></span>' + (pokemon.status ? '<span class="status ' + pokemon.status + '"></span>' : '') : '') + '</button> ';
|
||||
}
|
||||
controls += '</div></div></div>';
|
||||
this.$controls.html(controls);
|
||||
|
|
@ -584,7 +584,7 @@
|
|||
if (toId(pokemon.baseAbility) === 'illusion') {
|
||||
this.choice.count = 6;
|
||||
}
|
||||
controls += '<button name="chooseTeamPreview" value="' + i + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '</button> ';
|
||||
controls += '<button name="chooseTeamPreview" value="' + i + '"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '</button> ';
|
||||
}
|
||||
if (this.battle.teamPreviewCount) this.choice.count = parseInt(this.battle.teamPreviewCount, 10);
|
||||
controls += '</div>';
|
||||
|
|
@ -597,9 +597,9 @@
|
|||
break;
|
||||
}
|
||||
if (i < this.choice.done) {
|
||||
controls += '<button disabled="disabled"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '</button> ';
|
||||
controls += '<button disabled="disabled"' + this.tooltipAttrs(i, 'sidepokemon') + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '</button> ';
|
||||
} else {
|
||||
controls += '<button name="chooseTeamPreview" value="' + i + '"' + this.tooltipAttrs(this.choice.teamPreview[i] - 1, 'sidepokemon') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '</button> ';
|
||||
controls += '<button name="chooseTeamPreview" value="' + i + '"' + this.tooltipAttrs(this.choice.teamPreview[i] - 1, 'sidepokemon') + '><span class="picon" style="' + Tools.getPokemonIcon(pokemon) + '"></span>' + Tools.escapeHTML(pokemon.name) + '</button> ';
|
||||
}
|
||||
}
|
||||
controls += '</div>';
|
||||
|
|
|
|||
|
|
@ -1671,7 +1671,7 @@ a.ilink.yours {
|
|||
font-size: 12pt;
|
||||
display: block;
|
||||
margin: 0;
|
||||
padding: 9px 7px 1px 7px;
|
||||
padding: 9px 7px 0 7px;
|
||||
}
|
||||
.shiftselect button {
|
||||
color: #445588;
|
||||
|
|
@ -1689,16 +1689,16 @@ a.ilink.yours {
|
|||
position: relative;
|
||||
display: block;
|
||||
float: left;
|
||||
width: 100px;
|
||||
margin-right: 6px;
|
||||
width: 102px;
|
||||
margin-right: 4px;
|
||||
font: 9pt Verdana, sans-serif;
|
||||
padding: 5px 5px 5px 0;
|
||||
white-space: pre;
|
||||
overflow: hidden;
|
||||
}
|
||||
.switchmenu button .pokemonicon {
|
||||
.switchmenu button .picon {
|
||||
float: left;
|
||||
margin: -4px 0;
|
||||
margin: -6px -3px -6px -4px;
|
||||
opacity: 0.8;
|
||||
}
|
||||
.switchmenu button .hpbar {
|
||||
|
|
@ -1709,7 +1709,7 @@ a.ilink.yours {
|
|||
height: 2px;
|
||||
bottom: 2px; left: 2px; right: 2px;
|
||||
border-radius: 2px;
|
||||
opacity: .6;
|
||||
opacity: .8;
|
||||
}
|
||||
|
||||
/* The declaration order of these three hpbar* classes is significant. */
|
||||
|
|
@ -1768,8 +1768,8 @@ a.ilink.yours {
|
|||
.movemenu button {
|
||||
float: left;
|
||||
display: block;
|
||||
width: 153px;
|
||||
margin-right: 6px;
|
||||
width: 155px;
|
||||
margin-right: 4px;
|
||||
height: 40px;
|
||||
font: 10pt/100% Verdana, sans-serif;
|
||||
position: relative;
|
||||
|
|
@ -1791,10 +1791,10 @@ a.ilink.yours {
|
|||
.megaevo {
|
||||
clear: both;
|
||||
display: block;
|
||||
width: 220px;
|
||||
margin: 0 auto 10px;
|
||||
width: 180px;
|
||||
margin: 0 auto 0;
|
||||
position: relative;
|
||||
top: 7px;
|
||||
top: 6px;
|
||||
left: -7px;
|
||||
padding: 2px;
|
||||
text-align: center;
|
||||
|
|
@ -1804,7 +1804,7 @@ a.ilink.yours {
|
|||
border-radius: 3px;
|
||||
color: #333;
|
||||
background: #EEF2F5;
|
||||
font-size: 11pt;
|
||||
font-size: 10pt;
|
||||
font-weight: bold;
|
||||
}
|
||||
.megaevo:hover {
|
||||
|
|
@ -1817,7 +1817,7 @@ a.ilink.yours {
|
|||
.movemenu {
|
||||
display: block;
|
||||
margin-right: -10px;
|
||||
padding-left: 5px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
.switchmenu button,
|
||||
.movemenu button {
|
||||
|
|
@ -1828,11 +1828,11 @@ a.ilink.yours {
|
|||
text-decoration: none;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.4);
|
||||
border-radius: 5px;
|
||||
margin-top: 2px;
|
||||
margin-top: 4px;
|
||||
box-shadow: 0 1px 2px rgba(0,0,0,.2), inset 0 -1px 2px rgba(255,255,255,1);
|
||||
|
||||
/* default colors */
|
||||
color: #111111;
|
||||
color: #000000;
|
||||
border: solid 1px #AAAAAA;
|
||||
background: #e3e3e3;
|
||||
background: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user