Skip to content

Commit

Permalink
Fix showteam in replays (#2164)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Karthik99999
Karthik99999 authored Oct 20, 2023
1 parent ec1ca0e commit b47c593
Show file tree
Hide file tree
Showing 2 changed files with 276 additions and 23 deletions.
26 changes: 23 additions & 3 deletions src/battle-log.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ export class BattleLog {
}
add(args: Args, kwArgs?: KWArgs, preempt?: boolean) {
if (kwArgs?.silent) return;
if (this.scene?.battle.seeking) {
const battle = this.scene.battle;
const battle = this.scene?.battle;
if (battle?.seeking) {
if (battle.stepQueue.length > 2000) {
// adding elements gets slower and slower the more there are
// (so showing 100 turns takes around 2 seconds, and 1000 turns takes around a minute)
Expand All @@ -122,7 +122,6 @@ export class BattleLog {
if (!['name', 'n'].includes(args[0])) this.lastRename = null;
switch (args[0]) {
case 'chat': case 'c': case 'c:':
let battle = this.scene?.battle;
let name;
let message;
if (args[0] === 'c:') {
Expand Down Expand Up @@ -259,6 +258,27 @@ export class BattleLog {
app.rooms[roomid].notifyOnce(title, body, 'highlight');
break;

case 'showteam': {
if (!battle) return;
const team = battle.unpackTeam(args[2]);
if (!team.length) return;
const side = battle.getSide(args[1]);
const exportedTeam = team.map(set => {
let buf = battle.exportTeam([set]).replace(/\n/g, '<br />');
if (set.name && set.name !== set.species) {
buf = buf.replace(set.name, BattleLog.sanitizeHTML(`<span class="picon" style="${Dex.getPokemonIcon(set.species)}"></span><br />${set.name}`));
} else {
buf = buf.replace(set.species, `<span class="picon" style="${Dex.getPokemonIcon(set.species)}"></span><br />${set.species}`);
}
if (set.item) {
buf = buf.replace(set.item, `${set.item} <span class="itemicon" style="${Dex.getItemIcon(set.item)}"></span>`);
}
return buf;
}).join('');
divHTML = `<div class="infobox"><details><summary>Open Team Sheet for ${side.name}</summary>${exportedTeam}</details></div>`;
break;
}

case 'seed': case 'choice': case ':': case 'timer': case 't:':
case 'J': case 'L': case 'N': case 'spectator': case 'spectatorleave':
case 'initdone':
Expand Down
273 changes: 253 additions & 20 deletions src/battle.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3325,6 +3325,256 @@ export class Battle {
} as any;
}

// Taken from Storage, they need to be implemented here so `showteam` can work
unpackTeam(buf: string) {
if (!buf) return [];

const team = [];
let i = 0;
let j = 0;

while (true) {
const set: PokemonSet = {} as any;
team.push(set);

// name
j = buf.indexOf('|', i);
set.name = buf.substring(i, j);
i = j + 1;

// species
j = buf.indexOf('|', i);
set.species = Dex.species.get(buf.substring(i, j)).name || set.name;
i = j + 1;

// item
j = buf.indexOf('|', i);
set.item = Dex.items.get(buf.substring(i, j)).name;
i = j + 1;

// ability
j = buf.indexOf('|', i);
const ability = Dex.abilities.get(buf.substring(i, j)).name;
const species = Dex.species.get(set.species);
set.ability = (species.abilities &&
['', '0', '1', 'H', 'S'].includes(ability) ? species.abilities[ability as '0' || '0'] : ability);
i = j + 1;

// moves
j = buf.indexOf('|', i);
set.moves = buf.substring(i, j).split(',').map(function (moveid) {
return Dex.moves.get(moveid).name;
});
i = j + 1;

// nature
j = buf.indexOf('|', i);
set.nature = buf.substring(i, j) as NatureName;
if (set.nature as any === 'undefined') delete set.nature;
i = j + 1;

// evs
j = buf.indexOf('|', i);
if (j !== i) {
const evstring = buf.substring(i, j);
if (evstring.length > 5) {
const evs = evstring.split(',');
set.evs = {
hp: Number(evs[0]) || 0,
atk: Number(evs[1]) || 0,
def: Number(evs[2]) || 0,
spa: Number(evs[3]) || 0,
spd: Number(evs[4]) || 0,
spe: Number(evs[5]) || 0,
};
} else if (evstring === '0') {
set.evs = {hp: 0, atk: 0, def: 0, spa: 0, spd: 0, spe: 0};
}
}
i = j + 1;

// gender
j = buf.indexOf('|', i);
if (i !== j) set.gender = buf.substring(i, j);
i = j + 1;

// ivs
j = buf.indexOf('|', i);
if (j !== i) {
const ivs = buf.substring(i, j).split(',');
set.ivs = {
hp: ivs[0] === '' ? 31 : Number(ivs[0]),
atk: ivs[1] === '' ? 31 : Number(ivs[1]),
def: ivs[2] === '' ? 31 : Number(ivs[2]),
spa: ivs[3] === '' ? 31 : Number(ivs[3]),
spd: ivs[4] === '' ? 31 : Number(ivs[4]),
spe: ivs[5] === '' ? 31 : Number(ivs[5]),
};
}
i = j + 1;

// shiny
j = buf.indexOf('|', i);
if (i !== j) set.shiny = true;
i = j + 1;

// level
j = buf.indexOf('|', i);
if (i !== j) set.level = parseInt(buf.substring(i, j), 10);
i = j + 1;

// happiness
j = buf.indexOf(']', i);
let misc;
if (j < 0) {
if (i < buf.length) misc = buf.substring(i).split(',', 6);
} else {
if (i !== j) misc = buf.substring(i, j).split(',', 6);
}
if (misc) {
set.happiness = (misc[0] ? Number(misc[0]) : 255);
set.hpType = misc[1];
set.pokeball = misc[2];
set.gigantamax = !!misc[3];
set.dynamaxLevel = (misc[4] ? Number(misc[4]) : 10);
set.teraType = misc[5];
}
if (j < 0) break;
i = j + 1;
}

return team;
}
exportTeam(team: PokemonSet[] | string, gen = this.gen, hidestats = false) {
if (!team) return '';
if (typeof team === 'string') {
if (team.indexOf('\n') >= 0) return team;
team = this.unpackTeam(team);
}
let text = '';
for (const curSet of team) {
if (curSet.name && curSet.name !== curSet.species) {
text += '' + curSet.name + ' (' + curSet.species + ')';
} else {
text += '' + curSet.species;
}
if (curSet.gender === 'M') text += ' (M)';
if (curSet.gender === 'F') text += ' (F)';
if (curSet.item) {
text += ' @ ' + curSet.item;
}
text += " \n";
if (curSet.ability) {
text += 'Ability: ' + curSet.ability + " \n";
}
if (curSet.level && curSet.level !== 100) {
text += 'Level: ' + curSet.level + " \n";
}
if (curSet.shiny) {
text += 'Shiny: Yes \n';
}
if (typeof curSet.happiness === 'number' && curSet.happiness !== 255 && !isNaN(curSet.happiness)) {
text += 'Happiness: ' + curSet.happiness + " \n";
}
if (curSet.pokeball) {
text += 'Pokeball: ' + curSet.pokeball + " \n";
}
if (curSet.hpType) {
text += 'Hidden Power: ' + curSet.hpType + " \n";
}
if (typeof curSet.dynamaxLevel === 'number' && curSet.dynamaxLevel !== 10 && !isNaN(curSet.dynamaxLevel)) {
text += 'Dynamax Level: ' + curSet.dynamaxLevel + " \n";
}
if (curSet.gigantamax) {
text += 'Gigantamax: Yes \n';
}
if (gen === 9) {
const species = Dex.species.get(curSet.species);
text += 'Tera Type: ' + (species.forceTeraType || curSet.teraType || species.types[0]) + " \n";
}
if (!hidestats) {
let first = true;
if (curSet.evs) {
let j: StatName;
for (j in BattleStatNames) {
if (!curSet.evs[j]) continue;
if (first) {
text += 'EVs: ';
first = false;
} else {
text += ' / ';
}
text += '' + curSet.evs[j] + ' ' + BattleStatNames[j];
}
}
if (!first) {
text += " \n";
}
if (curSet.nature) {
text += '' + curSet.nature + ' Nature' + " \n";
}
first = true;
if (curSet.ivs) {
let defaultIvs = true;
let hpType = '';
for (const move of curSet.moves) {
if (move.substr(0, 13) === 'Hidden Power ' && move.substr(0, 14) !== 'Hidden Power [') {
hpType = move.substr(13);
if (!Dex.types.isName(hpType)) {
alert(move + " is not a valid Hidden Power type.");
continue;
}
let stat: StatName;
for (stat in BattleStatNames) {
if ((curSet.ivs[stat] === undefined ? 31 : curSet.ivs[stat]) !== (Dex.types.get(hpType).HPivs?.[stat] || 31)) {
defaultIvs = false;
break;
}
}
}
}
if (defaultIvs && !hpType) {
let stat: StatName;
for (stat in BattleStatNames) {
if (curSet.ivs[stat] !== 31 && curSet.ivs[stat] !== undefined) {
defaultIvs = false;
break;
}
}
}
if (!defaultIvs) {
let stat: StatName;
for (stat in BattleStatNames) {
if (typeof curSet.ivs[stat] === 'undefined' || isNaN(curSet.ivs[stat]) || curSet.ivs[stat] === 31) continue;
if (first) {
text += 'IVs: ';
first = false;
} else {
text += ' / ';
}
text += '' + curSet.ivs[stat] + ' ' + BattleStatNames[stat];
}
}
}
if (!first) {
text += " \n";
}
}
if (curSet.moves) {
for (let move of curSet.moves) {
if (move.substr(0, 13) === 'Hidden Power ') {
move = move.substr(0, 13) + '[' + move.substr(13) + ']';
}
if (move) {
text += '- ' + move + " \n";
}
}
}
text += "\n";
}
return text;
}

add(command?: string) {
if (command) this.stepQueue.push(command);

Expand Down Expand Up @@ -3577,12 +3827,8 @@ export class Battle {
break;
}
case 'showteam': {
if (this.turn !== 0) return;
// @ts-ignore
if (!window.Storage?.unpackTeam || !window.Storage?.exportTeam) return;
// @ts-ignore
const team: PokemonSet[] = Storage.unpackTeam(args[2]);
if (!team) return;
const team = this.unpackTeam(args[2]);
if (!team.length) return;
const side = this.getSide(args[1]);
side.clearPokemon();
for (const set of team) {
Expand All @@ -3596,20 +3842,7 @@ export class Battle {
}
if (set.teraType) pokemon.teraType = set.teraType;
}
const exportedTeam = team.map(set => {
// @ts-ignore
let buf = Storage.exportTeam([set], this.gen).replace(/\n/g, '<br />');
if (set.name && set.name !== set.species) {
buf = buf.replace(set.name, BattleLog.sanitizeHTML(`<psicon pokemon="${set.species}" /> <br />${set.name}`));
} else {
buf = buf.replace(set.species, `<psicon pokemon="${set.species}" /> <br />${set.species}`);
}
if (set.item) {
buf = buf.replace(set.item, `${set.item} <psicon item="${set.item}" />`);
}
return buf;
}).join('');
this.add(`|raw|<div class="infobox"><details><summary>Open Team Sheet for ${side.name}</summary>${exportedTeam}</details></div>`);
this.log(args, kwArgs);
break;
}
case 'switch': case 'drag': case 'replace': {
Expand Down

0 comments on commit b47c593

Please sign in to comment.