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

Fix rendering of pokemon gender

Browse Source 
Now that `pokemon.gender` matches what it says it does (genderless is
now 'N' and not ''), all the rendering code needs to be updated. I made
them all pixelated while I was at it.
This commit is contained in:
Guangcong Luo
2020-03-12 00:25:25 -04:00
parent 5e3ea5174e
commit 7fe8ac794b
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/battle-animations.ts
View File

@@ -746,10 +746,9 @@ class BattleScene {
// if (this.paused) url.replace('/xyani', '/xy').replace('.gif', '.png');
buf += '<img src="' + url + '" width="' + spriteData.w + '" height="' + spriteData.h + '" style="position:absolute;top:' + Math.floor(y - spriteData.h / 2) + 'px;left:' + Math.floor(x - spriteData.w / 2) + 'px" />';
buf2 += '<div style="position:absolute;top:' + (y + 45) + 'px;left:' + (x - 40) + 'px;width:80px;font-size:10px;text-align:center;color:#FFF;">';
if (pokemon.gender === 'F') {
buf2 += '<img src="' + Dex.resourcePrefix + 'fx/gender-f.png" width="7" height="10" alt="F" style="margin-bottom:-1px" /> ';
} else if (pokemon.gender === 'M') {
buf2 += '<img src="' + Dex.resourcePrefix + 'fx/gender-m.png" width="7" height="10" alt="M" style="margin-bottom:-1px" /> ';
const gender = pokemon.gender;
if (gender === 'M' || gender === 'F') {
buf2 += `<img src="${Dex.resourcePrefix}fx/gender-${gender.toLowerCase()}.png" alt="${gender}" width="7" height="10" class="pixelated" style="margin-bottom:-1px" /> `;
}
if (pokemon.level !== 100) {
buf2 += '<span style="text-shadow:#000 1px 1px 0,#000 1px -1px 0,#000 -1px 1px 0,#000 -1px -1px 0"><small>L</small>' + pokemon.level + '</span>';
@@ -2427,9 +2426,9 @@ class PokemonSprite extends Sprite {
let buf = '<div class="statbar' + (this.siden ? ' lstatbar' : ' rstatbar') + '" style="display: none">';
const ignoreNick = this.siden && (this.scene.battle.ignoreOpponent || this.scene.battle.ignoreNicks);
buf += `<strong>${BattleLog.escapeHTML(ignoreNick ? pokemon.species : pokemon.name)}`;
let gender = pokemon.gender;
if (gender) {
buf += ` <img src="${Dex.resourcePrefix}fx/gender-${gender.toLowerCase()}.png" alt="${gender}" />`;
const gender = pokemon.gender;
if (gender === 'M' || gender === 'F') {
buf += ` <img src="${Dex.resourcePrefix}fx/gender-${gender.toLowerCase()}.png" alt="${gender}" width="7" height="10" class="pixelated" />`;
}
buf += (pokemon.level === 100 ? `` : ` <small>L${pokemon.level}</small>`);

5
src/battle-tooltips.ts
View File

@@ -668,8 +668,9 @@ class BattleTooltips {
const pokemon = clientPokemon || serverPokemon!;
let text = '';
let genderBuf = '';
if (pokemon.gender) {
genderBuf = ` <img src="${Dex.resourcePrefix}fx/gender-${pokemon.gender.toLowerCase()}.png" alt="${pokemon.gender}" />`;
const gender = pokemon.gender;
if (gender === 'M' || gender === 'F') {
genderBuf = ` <img src="${Dex.resourcePrefix}fx/gender-${gender.toLowerCase()}.png" alt="${gender}" width="7" height="10" class="pixelated" /> `;
}
let name = BattleLog.escapeHTML(pokemon.name);

8
src/battle.ts
View File

@@ -706,10 +706,10 @@ class Side {
this.battle.scene.removeSideCondition(this.n, id);
}
addPokemon(name: string, ident: string, details: string, replaceSlot = -1) {
const oldItem = replaceSlot ? this.pokemon[replaceSlot].item : undefined;
const oldItem = replaceSlot >= 0 ? this.pokemon[replaceSlot].item : undefined;
const data = this.battle.parseDetails(name, ident, details);
let poke = new Pokemon(data, this);
const poke = new Pokemon(data, this);
if (oldItem) poke.item = oldItem;
if (!poke.ability && poke.baseAbility) poke.ability = poke.baseAbility;
@@ -2993,7 +2993,7 @@ class Battle {
}
if (!pokemon.searchid && pokemon.checkDetails(details)) {
// switch-in matches Team Preview entry
pokemon = this.p1.addPokemon(name, pokemonid, details, i);
pokemon = side.addPokemon(name, pokemonid, details, i);
if (slot >= 0) pokemon.slot = slot;
return pokemon;
}
@@ -3025,7 +3025,7 @@ class Battle {
pokemonid = parsedPokemonid;
/** if true, don't match an active pokemon */
const isInactive = (slot >= 0);
const isInactive = (slot < 0);
const side = this.sides[siden];
// search player's pokemon