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

Update fxPrefix for gender sprites (#1891)

Browse Source
This commit is contained in:
Aegide 2021-11-22 20:03:11 +01:00 committed by GitHub
parent 0f9cf6e094
commit 8d7637a60d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sprites/scene-test.html
View File

@ -557,7 +557,7 @@
const img = e('img', {class: 'pixelated'}); const img = e('img', {class: 'pixelated'});
img.width = 7; img.width = 7;
img.height = 10; img.height = 10;
img.src = `${Dex.resourcePrefix}fx/gender-${gender.toLowerCase()}.png`; img.src = `${Dex.fxPrefix}gender-${gender.toLowerCase()}.png`;
strong.textContent += ' '; strong.textContent += ' ';
strong.appendChild(img); strong.appendChild(img);
} }

4
src/battle-animations.ts
View File

@ -831,7 +831,7 @@ export class BattleScene implements BattleSceneStub {
buf2 += '<div style="position:absolute;top:' + (y + 45) + 'px;left:' + (x - 40) + 'px;width:80px;font-size:10px;text-align:center;color:#FFF;">'; buf2 += '<div style="position:absolute;top:' + (y + 45) + 'px;left:' + (x - 40) + 'px;width:80px;font-size:10px;text-align:center;color:#FFF;">';
const gender = pokemon.gender; const gender = pokemon.gender;
if (gender === 'M' || gender === 'F') { 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" /> `; buf2 += `<img src="${Dex.fxPrefix}gender-${gender.toLowerCase()}.png" alt="${gender}" width="7" height="10" class="pixelated" style="margin-bottom:-1px" /> `;
} }
if (pokemon.level !== 100) { 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>'; 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>';
@ -2643,7 +2643,7 @@ export class PokemonSprite extends Sprite {
buf += `<strong>${BattleLog.escapeHTML(ignoreNick ? pokemon.speciesForme : pokemon.name)}`; buf += `<strong>${BattleLog.escapeHTML(ignoreNick ? pokemon.speciesForme : pokemon.name)}`;
const gender = pokemon.gender; const gender = pokemon.gender;
if (gender === 'M' || gender === 'F') { if (gender === 'M' || gender === 'F') {
buf += ` <img src="${Dex.resourcePrefix}fx/gender-${gender.toLowerCase()}.png" alt="${gender}" width="7" height="10" class="pixelated" />`; buf += ` <img src="${Dex.fxPrefix}gender-${gender.toLowerCase()}.png" alt="${gender}" width="7" height="10" class="pixelated" />`;
} }
buf += (pokemon.level === 100 ? `` : ` <small>L${pokemon.level}</small>`); buf += (pokemon.level === 100 ? `` : ` <small>L${pokemon.level}</small>`);

7
src/battle-dex.ts
View File

@ -186,11 +186,8 @@ const Dex = new class implements ModdedDex {
})(); })();
fxPrefix = (() => { fxPrefix = (() => {
if (window.document?.location?.protocol === 'file:') { const protocol = (window.document?.location?.protocol !== 'http:') ? 'https:' : '';
if (window.Replays) return `https://${window.Config ? Config.routes.client : 'play.pokemonshowdown.com'}/fx/`; return `${protocol}//${window.Config ? Config.routes.client : 'play.pokemonshowdown.com'}/fx/`;
return `fx/`;
}
return `//${window.Config ? Config.routes.client : 'play.pokemonshowdown.com'}/fx/`;
})(); })();
loadedSpriteData = {xy: 1, bw: 0}; loadedSpriteData = {xy: 1, bw: 0};

2
src/battle-tooltips.ts
View File

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