| ';
- const icon = {};
+ const icon: {[k: string]: string} = {};
for (const type in dex.data.TypeChart) {
icon[type] = `
`;
// row of icons at top
- buffer += '' + icon[type] + ' | ';
+ buffer += `${icon[type]} | `;
}
buffer += '
|---|
';
for (const type1 in dex.data.TypeChart) {
// assembles the rest of the rows
- buffer += '| ' + icon[type1] + ' | ';
+ buffer += `
|---|
| ${icon[type1]} | `;
for (const type2 in dex.data.TypeChart) {
- let typing;
+ let typing: string;
let cell = ' bestEff) bestEff = curEff;
}
@@ -1081,21 +1126,21 @@ const commands = {
}
switch (bestEff) {
case 0:
- cell += 'bgcolor=#666666 title="' + typing + '">' + bestEff + '';
+ cell += `bgcolor=#666666 title="${typing}">${bestEff}`;
break;
case 0.25:
case 0.5:
- cell += 'bgcolor=#AA5544 title="' + typing + '">' + bestEff + '';
+ cell += `bgcolor=#AA5544 title="${typing}">${bestEff}`;
break;
case 1:
- cell += 'bgcolor=#6688AA title="' + typing + '">' + bestEff + '';
+ cell += `bgcolor=#6688AA title="${typing}">${bestEff}`;
break;
case 2:
case 4:
- cell += 'bgcolor=#559955 title="' + typing + '">' + bestEff + '';
+ cell += `bgcolor=#559955 title="${typing}">${bestEff}`;
break;
default:
- throw new Error("/coverage effectiveness of " + bestEff + " from parameters: " + target);
+ throw new Error(`/coverage effectiveness of ${bestEff} from parameters: ${target}`);
}
cell += ' | ';
buffer += cell;
@@ -1107,7 +1152,7 @@ const commands = {
buffer += "
Thousand Arrows has neutral type effectiveness on Flying-type Pok\u00e9mon if not already smacked down.";
}
- this.sendReplyBox('Coverage for ' + sources.join(' + ') + ':
' + buffer);
+ this.sendReplyBox(`Coverage for ${sources.join(' + ')}:
${buffer}`);
}
},
coveragehelp: [
@@ -1123,10 +1168,23 @@ const commands = {
const targets = target.split(' ');
- let lvlSet, natureSet, ivSet, evSet, baseSet, modSet, realSet = false;
+ let lvlSet = false;
+ let natureSet = false;
+ let ivSet = false;
+ let evSet = false;
+ let baseSet = false;
+ let modSet = false;
+ let realSet = false;
- let pokemon;
- let useStat = '';
+ let pokemon: StatsTable = {
+ hp: 0,
+ atk: 0,
+ def: 0,
+ spa: 0,
+ spd: 0,
+ spe: 0,
+ };
+ let useStat: StatName | '' = '';
let level = 100;
let calcHP = false;
@@ -1136,7 +1194,7 @@ const commands = {
let baseStat = -1;
let modifier = 0;
let positiveMod = true;
- let realStat;
+ let realStat = 0;
for (const arg of targets) {
const lowercase = arg.toLowerCase();
@@ -1226,7 +1284,8 @@ const commands = {
} else if (lowercase === 'uninvested') {
ev = 0;
evSet = true;
- } else if (lowercase.endsWith('ev') || lowercase.endsWith('evs') || lowercase.endsWith('+') || lowercase.endsWith('-')) {
+ } else if (lowercase.endsWith('ev') || lowercase.endsWith('evs') ||
+ lowercase.endsWith('+') || lowercase.endsWith('-')) {
ev = parseInt(arg);
evSet = true;
@@ -1264,7 +1323,7 @@ const commands = {
modSet = true;
}
if (isNaN(modifier)) {
- return this.sendReplyBox('Invalid value for modifier: ' + Chat.escapeHTML(modifier));
+ return this.sendReplyBox('Invalid value for modifier: ' + Chat.escapeHTML(String(modifier)));
}
if (modifier > 6) {
return this.sendReplyBox('Modifier should be a number between -6 and +6');
@@ -1353,7 +1412,7 @@ const commands = {
return this.sendReplyBox('No valid value for base stat found.');
}
- let output;
+ let output: number;
if (calcHP) {
output = (((iv + (2 * baseStat) + (ev / 4) + 100) * level) / 100) + 10;
@@ -1365,7 +1424,7 @@ const commands = {
output *= 2 / (2 + modifier);
}
}
- return this.sendReplyBox('Base ' + baseStat + (calcHP ? ' HP ' : ' ') + 'at level ' + level + ' with ' + iv + ' IVs, ' + ev + (nature === 1.1 ? '+' : (nature === 0.9 ? '-' : '')) + ' EVs' + (modifier > 0 && !calcHP ? ' at ' + (positiveMod ? '+' : '-') + modifier : '') + ': ' + Math.floor(output) + '.');
+ return this.sendReplyBox(`Base ${baseStat} ${calcHP ? ' HP ' : ' '}at level ${level} with ${iv} IVs, ${ev}${nature === 1.1 ? '+' : nature === 0.9 ? '-' : ''} EVs${modifier > 0 && !calcHP ? ` at ${positiveMod ? '+' : '-'}${modifier}` : ''}: ${Math.floor(output)}.`);
},
statcalchelp: [
`/statcalc [level] [base stat] [IVs] [nature] [EVs] [modifier] (only base stat is required) - Calculates what the actual stat of a Pokémon is with the given parameters. For example, '/statcalc lv50 100 30iv positive 252ev scarf' calculates the speed of a base 100 scarfer with HP Ice in Battle Spot, and '/statcalc uninvested 90 neutral' calculates the attack of an uninvested Crobat.`,
@@ -1526,7 +1585,7 @@ const commands = {
bugreports: 'bugs',
bugs(target, room, user) {
if (!this.runBroadcast()) return;
- if (room && room.battle) {
+ if (room?.battle) {
this.sendReplyBox(` — Questions — Bug Reports`);
} else {
this.sendReplyBox(
@@ -1608,11 +1667,17 @@ const commands = {
const DEFAULT_CALC_COMMANDS = ['honkalculator', 'honkocalc'];
const RANDOMS_CALC_COMMANDS = ['randomscalc', 'randbatscalc', 'rcalc'];
const BATTLESPOT_CALC_COMMANDS = ['bsscalc', 'cantsaycalc'];
- const SUPPORTED_RANDOM_FORMATS = ['gen8randombattle', 'gen8unratedrandombattle', 'gen7randombattle', 'gen6randombattle', 'gen5randombattle', 'gen4randombattle', 'gen3randombattle', 'gen2randombattle', 'gen1randombattle'];
- const SUPPORTED_BATTLESPOT_FORMATS = ['gen5gbusingles', 'gen5gbudoubles', 'gen6battlespotsingles', 'gen6battlespotdoubles', 'gen6battlespottriples', 'gen7battlespotsingles', 'gen7battlespotdoubles', 'gen7bssfactory'];
- const isRandomBattle = (room && room.battle && SUPPORTED_RANDOM_FORMATS.includes(room.battle.format));
- const isBattleSpotBattle = (room && room.battle && (SUPPORTED_BATTLESPOT_FORMATS.includes(room.battle.format) || room.battle.format.includes("battlespotspecial")));
- if (RANDOMS_CALC_COMMANDS.includes(cmd) || (isRandomBattle && !DEFAULT_CALC_COMMANDS.includes(cmd) && !BATTLESPOT_CALC_COMMANDS.includes(cmd))) {
+ const SUPPORTED_RANDOM_FORMATS = [
+ 'gen8randombattle', 'gen8unratedrandombattle', 'gen7randombattle', 'gen6randombattle', 'gen5randombattle', 'gen4randombattle', 'gen3randombattle', 'gen2randombattle', 'gen1randombattle',
+ ];
+ const SUPPORTED_BATTLESPOT_FORMATS = [
+ 'gen5gbusingles', 'gen5gbudoubles', 'gen6battlespotsingles', 'gen6battlespotdoubles', 'gen6battlespottriples', 'gen7battlespotsingles', 'gen7battlespotdoubles', 'gen7bssfactory',
+ ];
+ const isRandomBattle = (room?.battle && SUPPORTED_RANDOM_FORMATS.includes(room.battle.format));
+ const isBattleSpotBattle = (room?.battle && (SUPPORTED_BATTLESPOT_FORMATS.includes(room.battle.format) ||
+ room.battle.format.includes("battlespotspecial")));
+ if (RANDOMS_CALC_COMMANDS.includes(cmd) ||
+ (isRandomBattle && !DEFAULT_CALC_COMMANDS.includes(cmd) && !BATTLESPOT_CALC_COMMANDS.includes(cmd))) {
return this.sendReplyBox(
`Random Battles damage calculator. (Courtesy of Austin & pre)
` +
`- Random Battles Damage Calculator`
@@ -1686,32 +1751,42 @@ const commands = {
const isOMSearch = (cmd === 'om' || cmd === 'othermetas');
let targetId = toID(target);
- if (targetId === 'ladder') targetId = 'search';
+ if (targetId === 'ladder') targetId = 'search' as ID;
if (targetId === 'all') targetId = '';
- let formatList;
+ let formatList: string[] = [];
const format = Dex.getFormat(targetId);
- if (format.effectType === 'Format' || format.effectType === 'ValidatorRule' || format.effectType === 'Rule') formatList = [targetId];
- if (!formatList) {
+ if (['Format', 'ValidatorRule', 'Rule'].includes(format.effectType)) formatList = [targetId];
+ if (!formatList.length) {
formatList = Object.keys(Dex.formats);
}
// Filter formats and group by section
let exactMatch = '';
- const sections = {};
+ const sections: {[k: string]: {name: string, formats: string[]}} = {};
let totalMatches = 0;
for (const mode of formatList) {
- const format = Dex.getFormat(mode);
- const sectionId = toID(format.section);
- let formatId = format.id;
- if (!/^gen\d+/.test(targetId)) formatId = formatId.replace(/^gen\d+/, ''); // skip generation prefix if it wasn't provided
- if (targetId && !format[targetId + 'Show'] && sectionId !== targetId && format.id === mode && !formatId.startsWith(targetId)) continue;
- if (isOMSearch && format.id.startsWith('gen') && ['ou', 'uu', 'ru', 'ubers', 'lc', 'customgame', 'doublescustomgame', 'gbusingles', 'gbudoubles'].includes(format.id.slice(4))) continue;
- if (isOMSearch && (format.id === 'gen5nu')) continue;
+ const subformat = Dex.getFormat(mode);
+ const sectionId = toID(subformat.section);
+ let formatId = subformat.id;
+ if (!/^gen\d+/.test(targetId)) {
+ // Skip generation prefix if it wasn't provided
+ formatId = formatId.replace(/^gen\d+/, '') as ID;
+ }
+ if (targetId && !(subformat as any)[targetId + 'Show'] && sectionId !== targetId &&
+ subformat.id === mode && !formatId.startsWith(targetId)) continue;
+ if (isOMSearch) {
+ const officialFormats = [
+ 'ou', 'uu', 'ru', 'nu', 'pu', 'ubers', 'lc', 'monotype', 'customgame', 'doublescustomgame', 'gbusingles', 'gbudoubles',
+ ];
+ if (subformat.id.startsWith('gen') && officialFormats.includes(subformat.id.slice(4))) {
+ continue;
+ }
+ }
totalMatches++;
- if (!sections[sectionId]) sections[sectionId] = {name: format.section, formats: []};
- sections[sectionId].formats.push(format.id);
- if (format.id !== targetId) continue;
+ if (!sections[sectionId]) sections[sectionId] = {name: subformat.section!, formats: []};
+ sections[sectionId].formats.push(subformat.id);
+ if (subformat.id !== targetId) continue;
exactMatch = sectionId;
break;
}
@@ -1719,33 +1794,39 @@ const commands = {
if (!totalMatches) return this.errorReply("No matched formats found.");
if (!this.runBroadcast()) return;
if (totalMatches === 1) {
- const rules = [];
+ const rules: string[] = [];
let rulesetHtml = '';
- const format = Dex.getFormat(Object.values(sections)[0].formats[0]);
- if (format.effectType === 'ValidatorRule' || format.effectType === 'Rule' || format.effectType === 'Format') {
- if (format.ruleset && format.ruleset.length) rules.push("Ruleset - " + Chat.escapeHTML(format.ruleset.join(", ")));
- if (format.removedRules && format.removedRules.length) rules.push("Removed rules - " + Chat.escapeHTML(format.removedRules.join(", ")));
- if (format.banlist && format.banlist.length) rules.push("Bans - " + Chat.escapeHTML(format.banlist.join(", ")));
- if (format.unbanlist && format.unbanlist.length) rules.push("Unbans - " + Chat.escapeHTML(format.unbanlist.join(", ")));
- if (format.restricted && format.restricted.length) rules.push("Restricted - " + Chat.escapeHTML(format.restricted.join(", ")));
+ const subformat = Dex.getFormat(Object.values(sections)[0].formats[0]);
+ if (['Format', 'Rule', 'ValidatorRule'].includes(subformat.effectType)) {
+ if (subformat.ruleset?.length) {
+ rules.push(`Ruleset - ${Chat.escapeHTML(subformat.ruleset.join(", "))}`);
+ }
+ if (subformat.banlist?.length) {
+ rules.push(`Bans - ${Chat.escapeHTML(subformat.banlist.join(", "))}`);
+ }
+ if (subformat.unbanlist?.length) {
+ rules.push(`Unbans - ${Chat.escapeHTML(subformat.unbanlist.join(", "))}`);
+ }
+ if (subformat.restricted?.length) {
+ rules.push(`Restricted - ${Chat.escapeHTML(subformat.restricted.join(", "))}`);
+ }
if (rules.length > 0) {
rulesetHtml = `Banlist/Ruleset
${rules.join("
")}
" + rulesetHtml);
+ return this.sendReplyBox(`No description found for this ${formatType} ${format.section} format.
${rulesetHtml}`);
} else {
- return this.sendReplyBox("No description found for this rule." + "
" + rulesetHtml);
+ return this.sendReplyBox(`No description found for this rule.
${rulesetHtml}`);
}
}
- let descHtml = format.desc ? [format.desc] : [];
- if (format.threads) descHtml = descHtml.concat(format.threads);
- return this.sendReplyBox(descHtml.join("
") + "
" + rulesetHtml);
+ const descHtml = [...(format.desc ? [format.desc] : []), ...(format.threads || [])];
+ return this.sendReplyBox(`${descHtml.join("
")}
${rulesetHtml}`);
}
let tableStyle = `border:1px solid gray; border-collapse:collapse`;
@@ -1760,16 +1841,15 @@ const commands = {
if (exactMatch && sectionId !== exactMatch) continue;
buf.push(Chat.html`${sections[sectionId].name} | `);
for (const section of sections[sectionId].formats) {
- const format = Dex.getFormat(section);
- const nameHTML = Chat.escapeHTML(format.name);
- let desc = format.desc ? [format.desc] : [];
- if (format.threads) desc = desc.concat(format.threads);
+ const subformat = Dex.getFormat(section);
+ const nameHTML = Chat.escapeHTML(subformat.name);
+ const desc = [...(subformat.desc ? [subformat.desc] : []), ...(subformat.threads || [])];
const descHTML = desc.length ? desc.join("
") : "—";
buf.push(`
|---|
| ${nameHTML} | ${descHTML} |
`);
}
}
buf.push(`
`);
- return this.sendReply("|raw|" + buf.join("") + "");
+ return this.sendReply(`|raw|${buf.join("")}`);
},
'!roomhelp': true,
@@ -1853,7 +1933,7 @@ const commands = {
if (!this.runBroadcast()) return;
this.sendReplyBox(
`${room ? this.tr("Please follow the rules:") + '
' : ``}` +
- (room && room.rulesLink ? Chat.html`-
${this.tr `${room.title} room rules`}` : ``) +
+ `${room?.rulesLink ? Chat.html`-
${this.tr `${room.title} room rules`}` : ``}` +
`-
${this.tr("Global Rules")}`
);
return;
@@ -1987,12 +2067,13 @@ const commands = {
return this.sendReplyBox(`${pokemon.name} did not exist in ${generation.toUpperCase()}!`);
}
- if ((pokemon.battleOnly && pokemon.baseSpecies !== 'Greninja') || ['Keldeo', 'Genesect'].includes(pokemon.baseSpecies)) {
+ if ((pokemon.battleOnly && pokemon.baseSpecies !== 'Greninja') ||
+ ['Keldeo', 'Genesect'].includes(pokemon.baseSpecies)) {
pokemon = Dex.getSpecies(pokemon.changesFrom || pokemon.baseSpecies);
}
let formatName = extraFormat.name;
- let formatId = extraFormat.id;
+ let formatId: string = extraFormat.id;
if (formatName.startsWith('[Gen ')) {
formatName = formatName.replace('[Gen ' + formatName[formatName.indexOf('[') + 5] + '] ', '');
formatId = toID(formatName);
@@ -2018,7 +2099,7 @@ const commands = {
} else if (extraFormat.effectType !== 'Format') {
formatName = formatId = '';
}
- const supportedLanguages = {
+ const supportedLanguages: {[k: string]: string} = {
spanish: 'es',
french: 'fr',
italian: 'it',
@@ -2027,8 +2108,9 @@ const commands = {
};
let id = pokemon.id;
// Special case for Meowstic-M
- if (id === 'meowstic') id = 'meowsticm';
- if (['ou', 'uu'].includes(formatId) && generation === 'sm' && room && room.language in supportedLanguages) {
+ if (id === 'meowstic') id = 'meowsticm' as ID;
+ if (['ou', 'uu'].includes(formatId) && generation === 'sm' &&
+ room?.language && room.language in supportedLanguages) {
// Limited support for translated analysis
// Translated analysis do not support automatic redirects from a id to the proper page
this.sendReplyBox(Chat.html`
${generation.toUpperCase()} ${formatName} ${pokemon.name} analysis, brought to you by
Smogon University`);
@@ -2064,7 +2146,7 @@ const commands = {
// Format
if (format.id) {
let formatName = format.name;
- let formatId = format.id;
+ let formatId: string = format.id;
if (formatId === 'battlespotdoubles') {
formatId = 'battle_spot_doubles';
} else if (formatId === 'battlespottriples') {
@@ -2081,8 +2163,8 @@ const commands = {
} else if (formatId === 'ubers') {
formatId = 'uber';
} else if (formatId.includes('vgc')) {
- formatId = 'vgc' + formatId.slice(-2);
- formatName = 'VGC20' + formatId.slice(-2);
+ formatId = `vgc${formatId.slice(-2)}`;
+ formatName = `VGC20${formatId.slice(-2)}`;
} else if (format.effectType !== 'Format') {
formatName = formatId = '';
}
@@ -2118,9 +2200,11 @@ const commands = {
// Pokemon
if (pokemon.exists) {
atLeastOne = true;
- if (pokemon.isNonstandard && pokemon.isNonstandard !== 'Past') return this.errorReply(`${pokemon.species} is not a real Pok\u00e9mon.`);
+ if (pokemon.isNonstandard && pokemon.isNonstandard !== 'Past') {
+ return this.errorReply(`${pokemon.name} is not a real Pok\u00e9mon.`);
+ }
- const baseSpecies = pokemon.baseSpecies || pokemon.species;
+ const baseSpecies = pokemon.baseSpecies || pokemon.name;
let forme = pokemon.forme;
// Showdown and Veekun have different names for various formes
@@ -2134,43 +2218,49 @@ const commands = {
if (baseSpecies === 'Mimikyu') forme += forme === 'Busted-Totem' ? '-Busted' : '-Disguised';
}
- let link = baseLink + 'pokemon/' + baseSpecies.toLowerCase();
+ let link = `${baseLink}pokemon/${baseSpecies.toLowerCase()}`;
if (forme) {
if (baseSpecies === 'Arceus' || baseSpecies === 'Silvally') link += '/flavor';
- link += '?form=' + forme.toLowerCase();
+ link += `?form=${forme.toLowerCase()}`;
}
- this.sendReplyBox(`
${pokemon.species} description by Veekun`);
+ this.sendReplyBox(`
${pokemon.name} description by Veekun`);
}
// Item
if (item.exists) {
atLeastOne = true;
- if (item.isNonstandard && item.isNonstandard !== 'Past') return this.errorReply(`${item.name} is not a real item.`);
- const link = baseLink + 'items/' + item.name.toLowerCase();
+ if (item.isNonstandard && item.isNonstandard !== 'Past') {
+ return this.errorReply(`${item.name} is not a real item.`);
+ }
+ const link = `${baseLink}items/${item.name.toLowerCase()}`;
this.sendReplyBox(`
${item.name} item description by Veekun`);
}
// Ability
if (ability.exists) {
atLeastOne = true;
- if (ability.isNonstandard && ability.isNonstandard !== 'Past') return this.errorReply(`${ability.name} is not a real ability.`);
- const link = baseLink + 'abilities/' + ability.name.toLowerCase();
+ if (ability.isNonstandard && ability.isNonstandard !== 'Past') {
+ return this.errorReply(`${ability.name} is not a real ability.`);
+ }
+ const link = `${baseLink}abilities/${ability.name.toLowerCase()}`;
this.sendReplyBox(`
${ability.name} ability description by Veekun`);
}
// Move
if (move.exists) {
atLeastOne = true;
- if (move.isNonstandard && move.isNonstandard !== 'Past') return this.errorReply(`${move.name} is not a real move.`);
- const link = baseLink + 'moves/' + move.name.toLowerCase();
+ if (move.isNonstandard && move.isNonstandard !== 'Past') {
+ return this.errorReply(`${move.name} is not a real move.`);
+ }
+ const link = `${baseLink}moves/${move.name.toLowerCase()}`;
this.sendReplyBox(`
${move.name} move description by Veekun`);
}
// Nature
if (nature.exists) {
atLeastOne = true;
- const link = baseLink + 'natures/' + nature.name.toLowerCase();
+ const link = `${baseLink}natures/${nature.name.toLowerCase()}`;
this.sendReplyBox(`
${nature.name} nature description by Veekun`);
}
@@ -2193,21 +2283,6 @@ const commands = {
* Miscellaneous commands
*********************************************************/
- potd(target, room, user) {
- if (!this.can('potd')) return false;
-
- Config.potd = target;
- // TODO: support eval in new PM
- Rooms.PM.eval('Config.potd = \'' + toID(target) + '\'');
- if (target) {
- if (Rooms.lobby) Rooms.lobby.addRaw(`
The Pokémon of the Day is now ${target}!
This Pokemon will be guaranteed to show up in random battles.
`);
- this.modlog('POTD', null, target);
- } else {
- if (Rooms.lobby) Rooms.lobby.addRaw(`
The Pokémon of the Day was removed!
No pokemon will be guaranteed in random battles.
`);
- this.modlog('POTD', null, 'removed');
- }
- },
-
'!dice': true,
roll: 'dice',
dice(target, room, user) {
@@ -2223,12 +2298,14 @@ const commands = {
if (diceDataStart >= 0) {
if (diceDataStart) diceQuantity = Number(target.slice(0, diceDataStart));
target = target.slice(diceDataStart + 1);
- if (!Number.isInteger(diceQuantity) || diceQuantity <= 0 || diceQuantity > maxDice) return this.sendReply(`The amount of dice rolled should be a natural number up to ${maxDice}.`);
+ if (!Number.isInteger(diceQuantity) || diceQuantity <= 0 || diceQuantity > maxDice) {
+ return this.sendReply(`The amount of dice rolled should be a natural number up to ${maxDice}.`);
+ }
}
let offset = 0;
let removeOutlier = 0;
- const modifierData = target.match(/[+-]/);
+ const modifierData = /[+-]/.exec(target);
if (modifierData) {
switch (target.slice(modifierData.index).trim().toLowerCase()) {
case '-l':
@@ -2240,9 +2317,13 @@ const commands = {
default:
offset = Number(target.slice(modifierData.index));
if (isNaN(offset)) return this.parse('/help dice');
- if (!Number.isSafeInteger(offset)) return this.errorReply(`The specified offset must be an integer up to ${Number.MAX_SAFE_INTEGER}.`);
+ if (!Number.isSafeInteger(offset)) {
+ return this.errorReply(`The specified offset must be an integer up to ${Number.MAX_SAFE_INTEGER}.`);
+ }
+ }
+ if (removeOutlier && diceQuantity <= 1) {
+ return this.errorReply(`More than one dice should be rolled before removing outliers.`);
}
- if (removeOutlier && diceQuantity <= 1) return this.errorReply(`More than one dice should be rolled before removing outliers.`);
target = target.slice(0, modifierData.index);
}
@@ -2288,7 +2369,7 @@ const commands = {
// Reply with relevant information
let offsetFragment = "";
- if (offset) offsetFragment += (offset > 0 ? " + " + offset : offset);
+ if (offset) offsetFragment += `${offset > 0 ? ` + ${offset}` : offset}`;
if (diceQuantity === 1) return this.sendReplyBox(`Rolling (1 to ${diceFaces})${offsetFragment}: ${rollSum}`);
@@ -2348,7 +2429,7 @@ const commands = {
return this.parse('/help showimage');
}
- let image = targets[0].trim();
+ let image: string | null = targets[0].trim();
if (!image) return this.errorReply(`No image URL was provided!`);
image = this.canEmbedURI(image);
@@ -2357,11 +2438,11 @@ const commands = {
if (targets.length === 3) {
let width = targets[1].trim();
if (!width) return this.errorReply(`No width for the image was provided!`);
- if (!isNaN(width)) width += `px`;
+ if (!isNaN(parseInt(width))) width += `px`;
let height = targets[2].trim();
if (!height) return this.errorReply(`No height for the image was provided!`);
- if (!isNaN(height)) height += `px`;
+ if (!isNaN(parseInt(height))) height += `px`;
const unitRegex = /^\d+(?:p[xtc]|%|[ecm]m|ex|in)$/;
if (!unitRegex.test(width)) {
@@ -2374,7 +2455,7 @@ const commands = {
return this.sendReply(Chat.html`|raw|
`);
}
- Chat.fitImage(image).then(([width, height]) => {
+ void Chat.fitImage(image).then(([width, height]) => {
this.sendReply(Chat.html`|raw|
`);
room.update();
});
@@ -2396,7 +2477,7 @@ const commands = {
// XXX: target is trimmed by Chat#splitMessage. Let's not add another
// awful hack like ! or help command keys for whether or not the target
// is raw for now.
- target = this.message.substr(this.cmdToken.length + this.cmd.length + +this.message.includes(' ')).trimEnd();
+ target = this.message.substr(this.cmdToken.length + this.cmd.length + +this.message.includes(' ')).trimRight();
if (!target) return this.parse('/help code');
if (target.length >= 8192) return this.errorReply("Your code must be under 8192 characters long!");
@@ -2434,8 +2515,7 @@ const commands = {
],
};
-/** @type {PageTable} */
-const pages = {
+export const pages: PageTable = {
punishments(query, user) {
this.title = 'Punishments';
let buf = "";
@@ -2444,8 +2524,13 @@ const pages = {
if (!this.room.chatRoomData) return;
if (!this.can('mute', null, this.room)) return;
// Ascending order
- const sortedPunishments = Array.from(Punishments.getPunishments(this.room.roomid)).sort((a, b) => a[1].expireTime - b[1].expireTime);
- buf += Punishments.visualizePunishments(sortedPunishments, user);
+ const sortedPunishments = Array.from(Punishments.getPunishments(this.room.roomid))
+ .sort((a, b) => a[1].expireTime - b[1].expireTime);
+ const sP = new Map();
+ for (const punishment of sortedPunishments) {
+ sP.set(punishment[0], punishment[1]);
+ }
+ buf += Punishments.visualizePunishments(sP, user);
return buf;
},
globalpunishments(query, user) {
@@ -2455,14 +2540,15 @@ const pages = {
if (!this.can('lock')) return;
// Ascending order
const sortedPunishments = Array.from(Punishments.getPunishments()).sort((a, b) => a[1].expireTime - b[1].expireTime);
- buf += Punishments.visualizePunishments(sortedPunishments, user);
+ const sP = new Map();
+ for (const punishment of sortedPunishments) {
+ sP.set(punishment[0], punishment[1]);
+ }
+ buf += Punishments.visualizePunishments(sP, user);
return buf;
},
};
-exports.pages = pages;
-exports.commands = commands;
-
process.nextTick(() => {
Dex.includeData();
Chat.multiLinePattern.register(
diff --git a/sim/dex-data.ts b/sim/dex-data.ts
index d4bce61c52..211fe6fa7a 100644
--- a/sim/dex-data.ts
+++ b/sim/dex-data.ts
@@ -591,6 +591,11 @@ export class Species extends BasicEffect implements Readonly