`;
+ for (const [val] of Chat.namefilterwhitelist) {
+ content += `
${val}
`;
+ }
+ }
+ if (!content) {
+ buf += `
There are no filtered words.
`;
+ } else {
+ buf += `
${content}
`;
+ }
+ buf += ``;
+ return buf;
+ },
+};
+exports.pages = pages;
+
+/** @type {ChatCommands} */
+let commands = {
+ filters: 'filter',
+ filter: {
+ add: function (target, room, user) {
+ if (!this.can('updateserver')) return false;
+
+ let [list, ...rest] = target.split(',');
+ list = toId(list);
+
+ if (!list || !rest.length) return this.errorReply("Syntax: /filter add list, word, reason");
+
+ if (!(list in filterWords)) return this.errorReply(`Invalid list: ${list}. Possible options: ${Object.keys(filterWords).join(', ')}`);
+
+ if (filterKeys[list][1] === 'FILTERTO') {
+ let [word, filterTo, ...reasonParts] = rest;
+ if (!filterTo) return this.errorReply(`Syntax for word filters: /filter add ${list}, regex, filter to, reason`);
+ word = word.trim();
+ filterTo = filterTo.trim();
+ let reason = reasonParts.join(',').trim();
+
+ let regex;
+ try {
+ regex = new RegExp(word, 'ig'); // eslint-disable-line no-unused-vars
+ } catch (e) {
+ return this.errorReply(e.message.startsWith('Invalid regular expression: ') ? e.message : `Invalid regular expression: /${word}/: ${e.message}`);
+ }
+
+ filterWords[list].push([regex, reason, filterTo, 0]);
+ this.globalModlog(`ADDFILTER`, null, `'${String(regex)} => ${filterTo}' to ${list} list by ${user.name}${reason ? ` (${reason})` : ''}`);
+ saveFilters(true);
+ return this.sendReply(`'${String(regex)} => ${filterTo}' was added to the ${list} list.`);
+ } else {
+ let [word, ...reasonParts] = rest;
+ word = word.trim();
+ let reason = reasonParts.join(',').trim();
+ if (filterWords[list].some(val => val[0] === word)) return this.errorReply(`${word} is already added to the ${list} list.`);
+ filterWords[list].push([word, reason, null, 0]);
+ this.globalModlog(`ADDFILTER`, null, `'${word}' to ${list} list by ${user.name}${reason ? ` (${reason})` : ''}`);
+ saveFilters(true);
+ return this.sendReply(`'${word}' was added to the ${list} list.`);
+ }
+ },
+ remove: function (target, room, user) {
+ if (!this.can('updateserver')) return false;
+
+ let [list, ...words] = target.split(',').map(param => param.trim());
+ list = toId(list);
+
+ if (!list || !words.length) return this.errorReply("Syntax: /filter remove list, words");
+
+ if (!(list in filterWords)) return this.errorReply(`Invalid list: ${list}. Possible options: ${Object.keys(filterWords).join(', ')}`);
+
+ if (filterKeys[list][1] === 'FILTERTO') {
+ const notFound = words.filter(val => !filterWords[list].filter(entry => String(entry[0]).slice(1, -3) === val).length);
+ if (notFound.length) return this.errorReply(`${notFound.join(', ')} ${Chat.plural(notFound, "are", "is")} not on the ${list} list.`);
+ filterWords[list] = filterWords[list].filter(entry => !words.includes(String(entry[0]).slice(1, -3)));
+ this.globalModlog(`REMOVEFILTER`, null, `'${words.join(', ')}' from ${list} list by ${user.name}`);
+ saveFilters();
+ return this.sendReply(`'${words.join(', ')}' ${Chat.plural(words, "were", "was")} removed from the ${list} list.`);
+ } else {
+ const notFound = words.filter(val => !filterWords[list].filter(entry => entry[0] === val).length);
+ if (notFound.length) return this.errorReply(`${notFound.join(', ')} ${Chat.plural(notFound, "are", "is")} not on the ${list} list.`);
+ filterWords[list] = filterWords[list].filter(entry => !words.includes(String(entry[0]))); // This feels wrong
+ this.globalModlog(`REMOVEFILTER`, null, `'${words.join(', ')}' from ${list} list by ${user.name}`);
+ saveFilters();
+ return this.sendReply(`'${words.join(', ')}' ${Chat.plural(words, "were", "was")} removed from the ${list} list.`);
+ }
+ },
+ '': 'view',
+ list: 'view',
+ view: function (target, room, user) {
+ this.parse(`/join view-filters`);
+ },
+ help: function (target, room, user) {
+ this.parse(`/help filter`);
+ },
+ },
+ filterhelp: [
+ `- /filter add list, word, reason - Adds a word to the given filter list. Requires: ~`,
+ `- /filter remove list, words - Removes words from the given filter list. Requires: ~`,
+ `- /filter view - Opens the list of filtered words. Requires: % @ * & ~`,
+ ],
+ allowname: function (target, room, user) {
+ if (!this.can('forcerename')) return false;
+ target = toId(target);
+ if (!target) return this.errorReply(`Syntax: /allowname username`);
+ Chat.namefilterwhitelist.set(target, user.name);
+
+ const msg = `${target} was allowed as a username by ${user.name}.`;
+ const staffRoom = Rooms('staff');
+ const upperStaffRoom = Rooms('upperstaff');
+ if (staffRoom) staffRoom.add(msg).update();
+ if (upperStaffRoom) upperStaffRoom.add(msg).update();
+ },
+};
+
+exports.commands = commands;
+exports.chatfilter = chatfilter;
+exports.namefilter = namefilter;
diff --git a/chat-plugins/datasearch.js b/chat-plugins/datasearch.js
index 29ec6f207972..2fd2da8c0c1c 100644
--- a/chat-plugins/datasearch.js
+++ b/chat-plugins/datasearch.js
@@ -755,7 +755,7 @@ function runMovesearch(target, cmd, canAll, message) {
let allCategories = ['physical', 'special', 'status'];
let allContestTypes = ['beautiful', 'clever', 'cool', 'cute', 'tough'];
let allProperties = ['basePower', 'accuracy', 'priority', 'pp'];
- let allFlags = ['authentic', 'bite', 'bullet', 'contact', 'defrost', 'powder', 'protect', 'pulse', 'punch', 'secondary', 'snatch', 'sound'];
+ let allFlags = ['authentic', 'bite', 'bullet', 'contact', 'dance', 'defrost', 'powder', 'protect', 'pulse', 'punch', 'secondary', 'snatch', 'sound'];
let allStatus = ['psn', 'tox', 'brn', 'par', 'frz', 'slp'];
let allVolatileStatus = ['flinch', 'confusion', 'partiallytrapped'];
let allBoosts = ['hp', 'atk', 'def', 'spa', 'spd', 'spe', 'accuracy', 'evasion'];
@@ -1424,6 +1424,8 @@ function runLearn(target, cmd) {
format = Dex.getFormat(targetid);
formatid = targetid;
formatName = format.name;
+ targets.shift();
+ continue;
}
if (targetid.startsWith('gen') && parseInt(targetid.charAt(3))) {
gen = parseInt(targetid.slice(3));
@@ -1440,12 +1442,14 @@ function runLearn(target, cmd) {
}
break;
}
- if (!formatid) format = new Dex.Data.Format(format);
- if (!formatid) formatid = 'gen' + gen + 'ou';
- if (!formatName) formatName = 'Gen ' + gen;
+ if (!formatName) {
+ format = new Dex.Data.Format(format, {mod: `gen${gen}`});
+ formatName = `Gen ${gen}`;
+ if (format.requirePentagon) formatName += ' Pentagon';
+ }
let lsetData = {set: {}, sources: [], sourcesBefore: gen};
- const validator = TeamValidator(formatid);
+ const validator = TeamValidator(format);
let template = validator.dex.getTemplate(targets.shift());
let move = {};
let all = (cmd === 'learnall');
diff --git a/chat-plugins/info.js b/chat-plugins/info.js
index ed8cb5a92971..8e46855242f1 100644
--- a/chat-plugins/info.js
+++ b/chat-plugins/info.js
@@ -84,16 +84,24 @@ const commands = {
}
buf += ' ';
if (user.can('alts', targetUser) || user.can('alts') && user === targetUser) {
- let prevNames = Object.keys(targetUser.prevNames).join(", ");
+ let prevNames = Object.keys(targetUser.prevNames).map(userid => {
+ const punishment = Punishments.userids.get(userid);
+ return userid + (punishment ? ` (${Punishments.punishmentTypes.get(punishment[0]) || 'punished'}${punishment[1] !== targetUser.userid ? ` as ${punishment[1]}` : ''})` : '');
+ }).join(", ");
if (prevNames) buf += Chat.html` Previous names: ${prevNames}`;
for (const targetAlt of targetUser.getAltUsers(true)) {
if (!targetAlt.named && !targetAlt.connected) continue;
if (targetAlt.group === '~' && user.group !== '~') continue;
- buf += Chat.html` Alt: ${targetAlt.name}`;
+ const punishment = Punishments.userids.get(targetAlt.userid);
+ const punishMsg = punishment ? ` (${Punishments.punishmentTypes.get(punishment[0]) || 'punished'}${punishment[1] !== targetAlt.userid ? ` as ${punishment[1]}` : ''})` : '';
+ buf += Chat.html` Alt: ${targetAlt.name}${punishMsg}`;
if (!targetAlt.connected) buf += ` (offline)`;
- prevNames = Object.keys(targetAlt.prevNames).join(", ");
+ prevNames = Object.keys(targetAlt.prevNames).map(userid => {
+ const punishment = Punishments.userids.get(userid);
+ return userid + (punishment ? ` (${Punishments.punishmentTypes.get(punishment[0]) || 'punished'}${punishment[1] !== targetAlt.userid ? ` as ${punishment[1]}` : ''})` : '');
+ }).join(", ");
if (prevNames) buf += ` Previous names: ${prevNames}`;
}
if (targetUser.namelocked) {
@@ -406,13 +414,12 @@ const commands = {
target = sep[0].trim();
let targetId = toId(target);
if (!targetId) return this.parse('/help data');
- let targetNum = parseInt(targetId);
+ let targetNum = parseInt(target);
if (!isNaN(targetNum) && '' + targetNum === target) {
for (let p in Dex.data.Pokedex) {
let pokemon = Dex.getTemplate(p);
if (pokemon.num === targetNum) {
target = pokemon.species;
- targetId = pokemon.id;
break;
}
}
@@ -552,6 +559,7 @@ const commands = {
if (move.flags['powder']) details["✓ Powder"] = "";
if (move.flags['reflectable']) details["✓ Bounceable"] = "";
if (move.flags['gravity'] && mod.gen >= 4) details["✗ Suppressed by Gravity"] = "";
+ if (move.flags['dance'] && mod.gen >= 7) details["✓ Dance move"] = "";
if (mod.gen >= 7) {
if (move.zMovePower) {
@@ -814,46 +822,54 @@ const commands = {
bestCoverage[type] = -5;
}
- for (const arg of targets) {
- let move = arg.trim();
- if (toId(move) === mod.currentMod) continue;
- move = move.charAt(0).toUpperCase() + move.slice(1).toLowerCase();
- if (move === 'Table' || move === 'All') {
+ for (let arg of targets) {
+ arg = toId(arg);
+
+ // arg is the gen?
+ if (arg === mod.currentMod) continue;
+
+ // arg is 'table' or 'all'?
+ if (arg === 'table' || arg === 'all') {
if (this.broadcasting) return this.sendReplyBox("The full table cannot be broadcast.");
dispTable = true;
continue;
}
+ // arg is a type?
+ let argType = arg.charAt(0).toUpperCase() + arg.slice(1);
let eff;
- if (move in mod.data.TypeChart) {
- sources.push(move);
+ if (argType in mod.data.TypeChart) {
+ sources.push(argType);
for (let type in bestCoverage) {
- if (!mod.getImmunity(move, type) && !move.ignoreImmunity) continue;
- eff = mod.getEffectiveness(move, type);
+ if (!mod.getImmunity(argType, type)) continue;
+ eff = mod.getEffectiveness(argType, type);
if (eff > bestCoverage[type]) bestCoverage[type] = eff;
}
continue;
}
- move = mod.getMove(move);
- if (move.exists && move.gen <= mod.gen) {
- if (!move.basePower && !move.basePowerCallback) continue;
- if (move.id === 'thousandarrows') hasThousandArrows = true;
- sources.push(move);
- for (let type in bestCoverage) {
- if (move.id === "struggle") {
- eff = 0;
- } else {
- if (!mod.getImmunity(move.type, type) && !move.ignoreImmunity) continue;
- let baseMod = mod.getEffectiveness(move, type);
- let moveMod = move.onEffectiveness && move.onEffectiveness.call(mod, baseMod, type, move);
- eff = typeof moveMod === 'number' ? moveMod : baseMod;
- }
- if (eff > bestCoverage[type]) bestCoverage[type] = eff;
- }
- continue;
+
+ // arg is a move?
+ let move = mod.getMove(arg);
+ if (!move.exists) {
+ return this.errorReply(`Type or move '${arg}' not found.`);
+ } else if (move.gen > mod.gen) {
+ return this.errorReply(`Move '${arg}' is not available in Gen ${mod.gen}.`);
}
- return this.errorReply(`No type or move '${arg}' found${Dex.gen > mod.gen ? ` in Gen ${mod.gen}` : ""}.`);
+ if (!move.basePower && !move.basePowerCallback) continue;
+ if (move.id === 'thousandarrows') hasThousandArrows = true;
+ sources.push(move);
+ for (let type in bestCoverage) {
+ if (move.id === "struggle") {
+ eff = 0;
+ } else {
+ if (!mod.getImmunity(move.type, type) && !move.ignoreImmunity) continue;
+ let baseMod = mod.getEffectiveness(move, type);
+ let moveMod = move.onEffectiveness && move.onEffectiveness.call(mod, baseMod, type, move);
+ eff = typeof moveMod === 'number' ? moveMod : baseMod;
+ }
+ if (eff > bestCoverage[type]) bestCoverage[type] = eff;
+ }
}
if (sources.length === 0) return this.errorReply("No moves using a type table for determining damage were specified.");
if (sources.length > 4) return this.errorReply("Specify a maximum of 4 moves or types.");
@@ -1528,7 +1544,7 @@ const commands = {
break;
}
- if (!totalMatches) return this.errorReply("No " + (target ? "matched " : "") + "formats found.");
+ if (!totalMatches) return this.errorReply("No matched formats found.");
if (totalMatches === 1) {
let rules = [];
let rulesetHtml = '';
@@ -1674,11 +1690,27 @@ const commands = {
rule: 'rules',
rules: function (target, room, user) {
if (!target) {
+ const languageTable = {
+ portuguese: ['Por favor siga as regras:', 'pages/rules-pt', 'Regras Globais', room ? `Regras da sala ${room.title}` : ``],
+ spanish: ['Por favor sigue las reglas:', 'pages/rules-es', 'Reglas Globales', room ? `Reglas de la sala ${room.title}` : ``],
+ italian: ['Per favore, rispetta le seguenti regole:', 'pages/rules-it', 'Regole Globali', room ? `Regole della room ${room.title}` : ``],
+ french: ['Veuillez suivre ces règles:', 'pages/rules-fr', 'Règles Générales', room ? `Règles de la room ${room.title}` : ``],
+ simplifiedchinese: ['请遵守规则:', 'pages/rules-zh', '全站规则', room ? `${room.title}房间规则` : ``],
+ traditionalchinese: ['請遵守規則:', 'pages/rules-tw', '全站規則', room ? `${room.title}房間規則` : ``],
+ japanese: ['ルールを守ってください:', 'pages/rules-ja', '全部屋共通ルール', room ? `${room.title}部屋のルール` : ``],
+ hindi: ['कृपया इन नियमों का पालन करें:', 'pages/rules-hi', 'सामान्य नियम', room ? `${room.title} Room के नियम` : ``],
+ turkish: ['Lütfen kurallara uyun:', 'pages/rules-tr', 'Genel kurallar', room ? `${room.title} odası kuralları` : ``],
+ dutch: ['Volg de regels:', 'pages/rules-nl', 'Globale Regels ', room ? `Regels van de ${room.title} room` : ``],
+ german: ['Bitte befolgt die Regeln:', 'pages/rules-de', 'Globale Regeln', room ? `Regeln des ${room.title} Raumes` : ``],
+ english: ['Please follow the rules:', 'rules', 'Global Rules', room ? `${room.title} room rules` : ``],
+ };
if (!this.runBroadcast()) return;
+ const globalRulesLink = `https://pokemonshowdown.com/${languageTable[room && room.language ? room.language : 'english'][1]}`;
+ const globalRulesLinkText = languageTable[room && room.language ? room.language : 'english'][2];
this.sendReplyBox(
- `Please follow the rules: ` +
- (room && room.rulesLink ? Chat.html`- ${room.title} room rules ` : ``) +
- `- ${room && room.rulesLink ? "Global rules" : "Rules"}`
+ `${room ? languageTable[room.language || 'english'][0] + ' ' : ``}` +
+ (room && room.rulesLink ? Chat.html`- ${languageTable[room.language || 'english'][3]} ` : ``) +
+ `- ${globalRulesLinkText}`
);
return;
}
@@ -1837,11 +1869,23 @@ const commands = {
} else if (extraFormat.effectType !== 'Format') {
formatName = formatId = '';
}
+ const supportedLanguages = {
+ spanish: 'es',
+ french: 'fr',
+ italian: 'ita',
+ german: 'ger',
+ portuguese: 'por',
+ };
let speciesid = pokemon.speciesid;
// Special case for Meowstic-M
if (speciesid === 'meowstic') speciesid = 'meowsticm';
if (pokemon.tier === 'CAP') {
this.sendReplyBox(`${generation.toUpperCase()} ${Chat.escapeHTML(formatName)} ${pokemon.name} analysis preview, brought to you by Smogon UniversityCAP Project`);
+ } else if (formatId === 'ou' && generation === 'sm' && room && room.language in supportedLanguages) {
+ // Limited support for translated analysis
+ // Translated analysis do not support automatic redirects from a speciesid to the proper page
+ let pageid = pokemon.name.toLowerCase().replace(' ', '_');
+ this.sendReplyBox(`${generation.toUpperCase()} ${Chat.escapeHTML(formatName)} ${pokemon.name} analysis, brought to you by Smogon University`);
} else {
this.sendReplyBox(`${generation.toUpperCase()} ${Chat.escapeHTML(formatName)} ${pokemon.name} analysis, brought to you by Smogon University`);
}
@@ -2169,7 +2213,7 @@ const commands = {
},
showimagehelp: [`/showimage [url], [width], [height] - Show an image. Any CSS units may be used for the width or height (default: px). Requires: # & ~`],
- htmlbox: function (target, room, user, connection, cmd, message) {
+ htmlbox: function (target, room, user) {
if (!target) return this.parse('/help htmlbox');
target = this.canHTML(target);
if (!target) return;
@@ -2181,8 +2225,12 @@ const commands = {
this.sendReplyBox(target);
},
- addhtmlbox: function (target, room, user, connection, cmd, message) {
- if (!target) return this.parse('/help htmlbox');
+ htmlboxhelp: [
+ `/htmlbox [message] - Displays a message, parsing HTML code contained.`,
+ `!htmlbox [message] - Shows everyone a message, parsing HTML code contained. Requires: * # & ~`,
+ ],
+ addhtmlbox: function (target, room, user, connection, cmd) {
+ if (!target) return this.parse('/help ' + cmd);
if (!this.canTalk()) return;
target = this.canHTML(target);
if (!target) return;
@@ -2194,9 +2242,26 @@ const commands = {
this.addBox(target);
},
- htmlboxhelp: [
- `/htmlbox [message] - Displays a message, parsing HTML code contained.`,
- `!htmlbox [message] - Shows everyone a message, parsing HTML code contained. Requires: ~ & #`,
+ addhtmlboxhelp: [
+ `/addhtmlbox [message] - Shows everyone a message, parsing HTML code contained. Requires: * & ~`,
+ ],
+ addrankhtmlbox: function (target, room, user, connection, cmd) {
+ if (!target) return this.parse('/help ' + cmd);
+ if (!this.canTalk()) return;
+ let [rank, html] = this.splitOne(target);
+ if (!(rank in Config.groups)) return this.errorReply(`Group '${rank}' does not exist.`);
+ html = this.canHTML(html);
+ if (!html) return;
+ if (!this.can('addhtml', null, room)) return;
+
+ if (!user.can('addhtml')) {
+ html += Chat.html`
[${user.name}]
`;
+ }
+
+ this.room.sendRankedUsers(`|html|
${html}
`, rank);
+ },
+ addrankhtmlboxhelp: [
+ `/addrankhtmlbox [rank], [message] - Shows everyone with the specified rank or higher a message, parsing HTML code contained. Requires: * & ~`,
],
changeuhtml: 'adduhtml',
adduhtml: function (target, room, user, connection, cmd) {
@@ -2213,13 +2278,40 @@ const commands = {
html += Chat.html`
[${user.name}]
`;
}
- this.add(`|uhtml${(cmd === 'changeuhtml' ? 'change' : '')}|${name}|${html}`);
+ html = `|uhtml${(cmd === 'changeuhtml' ? 'change' : '')}|${name}|${html}`;
+ this.add(html);
},
adduhtmlhelp: [
- `/adduhtml [name], [message] - Shows everyone a message that can change, parsing HTML code contained.`,
+ `/adduhtml [name], [message] - Shows everyone a message that can change, parsing HTML code contained. Requires: * & ~`,
],
changeuhtmlhelp: [
- `/changeuhtml [name], [message] - Changes a message previously shown with /adduhtml`,
+ `/changeuhtml [name], [message] - Changes the message previously shown with /adduhtml [name]. Requires: * & ~`,
+ ],
+ changerankuhtml: 'addrankuhtml',
+ addrankuhtml: function (target, room, user, connection, cmd) {
+ if (!target) return this.parse('/help ' + cmd);
+ if (!this.canTalk()) return;
+
+ let [rank, uhtml] = this.splitOne(target);
+ if (!(rank in Config.groups)) return this.errorReply(`Group '${rank}' does not exist.`);
+ let [name, html] = this.splitOne(uhtml);
+ name = toId(name);
+ html = this.canHTML(html);
+ if (!html) return;
+ if (!this.can('addhtml', null, room)) return;
+
+ if (!user.can('addhtml')) {
+ html += Chat.html`
[${user.name}]
`;
+ }
+
+ html = `|uhtml${(cmd === 'changerankuhtml' ? 'change' : '')}|${name}|${html}`;
+ this.room.sendRankedUsers(html, rank);
+ },
+ addrankuhtmlhelp: [
+ `/addrankuhtml [rank], [name], [message] - Shows everyone with the specified rank or higher a message that can change, parsing HTML code contained. Requires: * & ~`,
+ ],
+ changerankuhtmlhelp: [
+ `/changerankuhtml [rank], [name], [message] - Changes the message previously shown with /addrankuhtml [rank], [name]. Requires: * & ~`,
],
};
diff --git a/chat-plugins/mafia-data.js b/chat-plugins/mafia-data.js
index 88af2f73cff0..724624b64ddd 100644
--- a/chat-plugins/mafia-data.js
+++ b/chat-plugins/mafia-data.js
@@ -1,5 +1,5 @@
'use strict';
-/** @typedef {{name: string, plural: string, id: string, color?: string, memo: string[], image?: string}} MafiaAlignment */
+/** @typedef {{name: string, plural: string, id: string, color?: string, buttonColor?: string, memo: string[], image?: string}} MafiaAlignment */
/** @typedef {{[k: string]: MafiaAlignment | string}} MafiaAlignments */
/** @typedef {{name: string, id: string, memo: string[], alignment?: string, image?: string}} MafiaRole */
@@ -23,6 +23,7 @@ const alignments = {
plural: `Town`,
id: `town`,
color: `#060`,
+ buttonColor: `#0A0`,
memo: [`You are aligned with the Town. You win when all threats to the Town are eliminated and at least one Town-aligned player is still alive, or nothing can prevent the same.`],
image: ``,
},
diff --git a/chat-plugins/mafia.js b/chat-plugins/mafia.js
index 8bdf8af40c10..d87fe2c1ea01 100644
--- a/chat-plugins/mafia.js
+++ b/chat-plugins/mafia.js
@@ -161,9 +161,14 @@ class MafiaPlayer extends Rooms.RoomGamePlayer {
this.IDEA = null;
}
- getRole() {
+ /**
+ * @param {boolean} button
+ */
+ getRole(button = false) {
if (!this.role) return;
- return `${this.role.safeName}`;
+ let color = MafiaData.alignments[this.role.alignment].color;
+ if (button && MafiaData.alignments[this.role.alignment].buttonColor) color = MafiaData.alignments[this.role.alignment].buttonColor;
+ return `${this.role.safeName}`;
}
updateHtmlRoom() {
@@ -175,115 +180,6 @@ class MafiaPlayer extends Rooms.RoomGamePlayer {
}
}
-// Parses a single role into an object
-/**
- *
- * @param {string} roleString
- * @return {MafiaParsedRole}
- */
-function parseRole(roleString) {
- /** @type {MafiaRole} */
- let role = {
- name: roleString.split(' ').map(p => toId(p) === 'solo' ? '' : p).join(' '),
- safeName: '', // MAKE SURE THESE ARE SET BELOW
- id: '',
- image: '',
- memo: ['During the Day, you may vote for whomever you want lynched.'],
- alignment: '',
- };
- roleString = roleString.replace(/\s*\(.*?\)\s*/g, ' ');
- let target = roleString.toLowerCase().replace(/[^\w\d\s]/g, '').split(' ');
- let problems = [];
- role.safeName = Chat.escapeHTML(role.name);
- role.id = toId(role.name);
- for (let key in MafiaData.roles) {
- if (key.includes('_')) {
- let roleKey = target.slice().map(toId).join('_');
- if (roleKey.includes(key)) {
- let originalKey = key;
- if (typeof MafiaData.roles[key] === 'string') key = MafiaData.roles[key];
- if (!role.image && MafiaData.roles[key].image) role.image = MafiaData.roles[key].image;
- if (MafiaData.roles[key].alignment) {
- if (role.alignment && role.alignment !== MafiaData.roles[key].alignment) {
- // A role cant have multiple alignments
- problems.push(`The role "${role.name}" has multiple possible alignments (${MafiaData.roles[key].alignment} or ${role.alignment})`);
- break;
- }
- role.alignment = MafiaData.roles[key].alignment;
- }
- if (MafiaData.roles[key].memo) role.memo = role.memo.concat(MafiaData.roles[key].memo);
- let index = roleKey.split('_').indexOf(originalKey.split('_')[0]);
- target.splice(index, originalKey.split('_').length);
- }
- } else if (target.includes(key)) {
- let index = target.indexOf(key);
- if (typeof MafiaData.roles[key] === 'string') key = MafiaData.roles[key];
- if (!role.image && MafiaData.roles[key].image) role.image = MafiaData.roles[key].image;
- if (MafiaData.roles[key].memo) role.memo = role.memo.concat(MafiaData.roles[key].memo);
- target.splice(index, 1);
- }
- }
- // Add modifiers
- for (let key in MafiaData.modifiers) {
- if (key.includes('_')) {
- let roleKey = target.slice().map(toId).join('_');
- if (roleKey.includes(key)) {
- if (typeof MafiaData.modifiers[key] === 'string') key = MafiaData.modifiers[key];
- if (!role.image && MafiaData.modifiers[key].image) role.image = MafiaData.modifiers[key].image;
- if (MafiaData.modifiers[key].memo) role.memo = role.memo.concat(MafiaData.modifiers[key].memo);
- let index = roleKey.split('_').indexOf(key.split('_')[0]);
- target.splice(index, key.split('_').length);
- }
- } else if (key === 'xshot') {
- // Special case for X-Shot modifier
- for (let [i, xModifier] of target.entries()) {
- if (toId(xModifier).endsWith('shot')) {
- let num = parseInt(toId(xModifier).substring(0, toId(xModifier).length - 4));
- if (isNaN(num)) continue;
- let memo = MafiaData.modifiers.xshot.memo.slice();
- memo = memo.map((/** @type {string} */m) => m.replace(/X/g, num.toString()));
- role.memo = role.memo.concat(memo);
- target.splice(i, 1);
- i--;
- }
- }
- } else if (target.includes(key)) {
- let index = target.indexOf(key);
- if (typeof MafiaData.modifiers[key] === 'string') key = MafiaData.modifiers[key];
- if (!role.image && MafiaData.modifiers[key].image) role.image = MafiaData.modifiers[key].image;
- if (MafiaData.modifiers[key].memo) role.memo = role.memo.concat(MafiaData.modifiers[key].memo);
- target.splice(index, 1);
- }
- }
- // Determine the role's alignment
- for (let [j, targetId] of target.entries()) {
- let id = toId(targetId);
- if (MafiaData.alignments[id]) {
- if (typeof MafiaData.alignments[id] === 'string') id = MafiaData.alignments[id];
- if (role.alignment && role.alignment !== MafiaData.alignments[id].id) {
- // A role cant have multiple alignments
- problems.push(`The role "${role.name}" has multiple possible alignments (${MafiaData.alignments[id].id} or ${role.alignment})`);
- break;
- }
- role.alignment = MafiaData.alignments[id].id;
- role.memo = role.memo.concat(MafiaData.alignments[id].memo);
- if (!role.image && MafiaData.alignments[id].image) role.image = MafiaData.alignments[id].image;
- target.splice(j, 1);
- j--;
- }
- }
- if (!role.alignment) {
- // Default to town
- role.alignment = 'town';
- role.memo = role.memo.concat(MafiaData.alignments.town.memo);
- }
- // Handle anything that is unknown
- if (target.length) {
- role.memo.push(`To learn more about your role, PM the host.`);
- }
- return {role, problems};
-}
-
class MafiaTracker extends Rooms.RoomGame {
/**
* @param {ChatRoom} room
@@ -303,6 +199,8 @@ class MafiaTracker extends Rooms.RoomGame {
this.hostid = host.userid;
this.host = Chat.escapeHTML(host.name);
+ /** @type {string[]} */
+ this.cohosts = [];
/** @type {{[userid: string]: MafiaPlayer}} */
this.players = Object.create(null);
@@ -404,9 +302,10 @@ class MafiaTracker extends Rooms.RoomGame {
* @param {User} user
* @param {string} roleString
* @param {boolean} force
+ * @param {boolean} reset
* @return {void}
*/
- setRoles(user, roleString, force = false) {
+ setRoles(user, roleString, force = false, reset = false) {
let roles = (/** @type {string[]} */roleString.split(',').map(x => x.trim()));
if (roles.length === 1) {
// Attempt to set roles from a theme
@@ -426,14 +325,7 @@ class MafiaTracker extends Rooms.RoomGame {
} else if (roles.length > this.playerCount) {
user.sendTo(this.room, `|error|You have provided too many roles, ${roles.length - this.playerCount} ${Chat.plural(roles.length - this.playerCount, 'roles', 'role')} will not be assigned.`);
}
- if (this.originalRoles.length) {
- // Reset roles
- this.originalRoles = [];
- this.originalRoleString = '';
- this.roles = [];
- this.roleString = '';
- }
- if (this.IDEA.data) this.IDEA.data = null;
+
if (force) {
this.originalRoles = roles.map(r => {
return {
@@ -450,6 +342,8 @@ class MafiaTracker extends Rooms.RoomGame {
this.roleString = this.originalRoleString;
return this.sendRoom(`The roles have been set.`);
}
+
+ let newRoles = [];
/** @type {string[]} */
let problems = [];
/** @type {string[]} */
@@ -459,29 +353,141 @@ class MafiaTracker extends Rooms.RoomGame {
for (const string of roles) {
const roleId = string.toLowerCase().replace(/[^\w\d\s]/g, '');
if (roleId in cache) {
- this.originalRoles.push(Object.assign(Object.create(null), cache[roleId]));
+ newRoles.push(Object.assign(Object.create(null), cache[roleId]));
} else {
- const role = parseRole(string);
+ const role = MafiaTracker.parseRole(string);
if (role.problems.length) problems = problems.concat(role.problems);
if (alignments.indexOf(role.role.alignment) === -1) alignments.push(role.role.alignment);
cache[roleId] = role.role;
- this.originalRoles.push(role.role);
+ newRoles.push(role.role);
}
}
if (alignments.length < 2 && alignments[0] !== 'solo') problems.push(`There must be at least 2 different alignments in a game!`);
if (problems.length) {
- this.originalRoles = [];
for (const problem of problems) {
user.sendTo(this.room, `|error|${problem}`);
}
- return user.sendTo(this.room, `|error|To forcibly set the roles, use /mafia forcesetroles`);
+ return user.sendTo(this.room, `|error|To forcibly set the roles, use /mafia force${reset ? "re" : ""}setroles`);
}
+
+ this.IDEA.data = null;
+
+ this.originalRoles = newRoles;
this.roles = this.originalRoles.slice();
this.originalRoleString = this.originalRoles.slice().map(r => `${r.safeName}`).join(', ');
this.roleString = this.originalRoleString;
- this.phase = 'locked';
+ if (!reset) this.phase = 'locked';
this.updatePlayers();
- this.sendRoom(`The roles have been set.`);
+ this.sendRoom(`The roles have been ${reset ? 're' : ''}set.`);
+ if (reset) this.distributeRoles();
+ }
+
+ /**
+ * Parses a single role into an object
+ * @param {string} roleString
+ * @return {MafiaParsedRole}
+ */
+ static parseRole(roleString) {
+ /** @type {MafiaRole} */
+ let role = {
+ name: roleString.split(' ').map(p => toId(p) === 'solo' ? '' : p).join(' '),
+ safeName: '', // MAKE SURE THESE ARE SET BELOW
+ id: '',
+ image: '',
+ memo: ['During the Day, you may vote for whomever you want lynched.'],
+ alignment: '',
+ };
+ roleString = roleString.replace(/\s*\(.*?\)\s*/g, ' ');
+ let target = roleString.toLowerCase().replace(/[^\w\d\s]/g, '').split(' ');
+ let problems = [];
+ role.safeName = Chat.escapeHTML(role.name);
+ role.id = toId(role.name);
+ for (let key in MafiaData.roles) {
+ if (key.includes('_')) {
+ let roleKey = target.slice().map(toId).join('_');
+ if (roleKey.includes(key)) {
+ let originalKey = key;
+ if (typeof MafiaData.roles[key] === 'string') key = MafiaData.roles[key];
+ if (!role.image && MafiaData.roles[key].image) role.image = MafiaData.roles[key].image;
+ if (MafiaData.roles[key].alignment) {
+ if (role.alignment && role.alignment !== MafiaData.roles[key].alignment) {
+ // A role cant have multiple alignments
+ problems.push(`The role "${role.name}" has multiple possible alignments (${MafiaData.roles[key].alignment} or ${role.alignment})`);
+ break;
+ }
+ role.alignment = MafiaData.roles[key].alignment;
+ }
+ if (MafiaData.roles[key].memo) role.memo = role.memo.concat(MafiaData.roles[key].memo);
+ let index = roleKey.split('_').indexOf(originalKey.split('_')[0]);
+ target.splice(index, originalKey.split('_').length);
+ }
+ } else if (target.includes(key)) {
+ let index = target.indexOf(key);
+ if (typeof MafiaData.roles[key] === 'string') key = MafiaData.roles[key];
+ if (!role.image && MafiaData.roles[key].image) role.image = MafiaData.roles[key].image;
+ if (MafiaData.roles[key].memo) role.memo = role.memo.concat(MafiaData.roles[key].memo);
+ target.splice(index, 1);
+ }
+ }
+ // Add modifiers
+ for (let key in MafiaData.modifiers) {
+ if (key.includes('_')) {
+ let roleKey = target.slice().map(toId).join('_');
+ if (roleKey.includes(key)) {
+ if (typeof MafiaData.modifiers[key] === 'string') key = MafiaData.modifiers[key];
+ if (!role.image && MafiaData.modifiers[key].image) role.image = MafiaData.modifiers[key].image;
+ if (MafiaData.modifiers[key].memo) role.memo = role.memo.concat(MafiaData.modifiers[key].memo);
+ let index = roleKey.split('_').indexOf(key.split('_')[0]);
+ target.splice(index, key.split('_').length);
+ }
+ } else if (key === 'xshot') {
+ // Special case for X-Shot modifier
+ for (let [i, xModifier] of target.entries()) {
+ if (toId(xModifier).endsWith('shot')) {
+ let num = parseInt(toId(xModifier).substring(0, toId(xModifier).length - 4));
+ if (isNaN(num)) continue;
+ let memo = MafiaData.modifiers.xshot.memo.slice();
+ memo = memo.map((/** @type {string} */m) => m.replace(/X/g, num.toString()));
+ role.memo = role.memo.concat(memo);
+ target.splice(i, 1);
+ i--;
+ }
+ }
+ } else if (target.includes(key)) {
+ let index = target.indexOf(key);
+ if (typeof MafiaData.modifiers[key] === 'string') key = MafiaData.modifiers[key];
+ if (!role.image && MafiaData.modifiers[key].image) role.image = MafiaData.modifiers[key].image;
+ if (MafiaData.modifiers[key].memo) role.memo = role.memo.concat(MafiaData.modifiers[key].memo);
+ target.splice(index, 1);
+ }
+ }
+ // Determine the role's alignment
+ for (let [j, targetId] of target.entries()) {
+ let id = toId(targetId);
+ if (MafiaData.alignments[id]) {
+ if (typeof MafiaData.alignments[id] === 'string') id = MafiaData.alignments[id];
+ if (role.alignment && role.alignment !== MafiaData.alignments[id].id) {
+ // A role cant have multiple alignments
+ problems.push(`The role "${role.name}" has multiple possible alignments (${MafiaData.alignments[id].id} or ${role.alignment})`);
+ break;
+ }
+ role.alignment = MafiaData.alignments[id].id;
+ role.memo = role.memo.concat(MafiaData.alignments[id].memo);
+ if (!role.image && MafiaData.alignments[id].image) role.image = MafiaData.alignments[id].image;
+ target.splice(j, 1);
+ j--;
+ }
+ }
+ if (!role.alignment) {
+ // Default to town
+ role.alignment = 'town';
+ role.memo = role.memo.concat(MafiaData.alignments.town.memo);
+ }
+ // Handle anything that is unknown
+ if (target.length) {
+ role.memo.push(`To learn more about your role, PM the host.`);
+ }
+ return {role, problems};
}
/**
@@ -505,9 +511,8 @@ class MafiaTracker extends Rooms.RoomGame {
if (Object.keys(this.roles).length < this.playerCount) return user.sendTo(this.room, `You have not provided enough roles for the players.`);
}
this.started = true;
- this.played = Object.keys(this.players);
this.sendRoom(`The game of ${this.title} is starting!`, {declare: true});
- this.played.push(this.hostid);
+ // MafiaTracker#played gets set in distributeRoles
this.distributeRoles();
this.day(null, true);
if (this.IDEA.data) this.room.add(`|html|
IDEA discards:${this.IDEA.discardsHtml}
`).update();
@@ -517,15 +522,17 @@ class MafiaTracker extends Rooms.RoomGame {
* @return {void}
*/
distributeRoles() {
- if (this.phase !== 'locked' || !Object.keys(this.roles).length) return;
- this.sendRoom(`The roles are being distributed...`);
let roles = Dex.shuffle(this.roles.slice());
- for (let p in this.players) {
- let role = roles.shift();
- this.players[p].role = role;
- let u = Users(p);
- if (u && u.connected) u.send(`>${this.room.id}\n|notify|Your role is ${role.safeName}. For more details of your role, check your Role PM.`);
+ if (roles.length) {
+ for (let p in this.players) {
+ let role = roles.shift();
+ this.players[p].role = role;
+ let u = Users(p);
+ if (u && u.connected) u.send(`>${this.room.id}\n|notify|Your role is ${role.safeName}. For more details of your role, check your Role PM.`);
+ }
}
+ this.dead = {};
+ this.played = [this.hostid, ...this.cohosts, ...Object.keys(this.players)];
this.sendRoom(`The roles have been distributed.`, {declare: true});
this.updatePlayers();
}
@@ -580,11 +587,14 @@ class MafiaTracker extends Rooms.RoomGame {
if (this.phase !== 'day') return;
if (this.timer) this.setDeadline(0, true);
this.phase = 'night';
- let host = Users(this.hostid);
- if (host && host.connected) host.send(`>${this.room.id}\n|notify|It's night in your game of Mafia!`);
+ for (const hostid of [...this.cohosts, this.hostid]) {
+ let host = Users(hostid);
+ if (host && host.connected) host.send(`>${this.room.id}\n|notify|It's night in your game of Mafia!`);
+ }
this.sendRoom(`Night ${this.dayNum}. PM the host your action, or idle.`, {declare: true});
const hasPlurality = this.getPlurality();
if (!early && hasPlurality) this.sendRoom(`Plurality is on ${this.players[hasPlurality] ? this.players[hasPlurality].name : 'No Lynch'}`);
+ if (!early) this.sendRoom(`|raw|
`;
for (const role of IDEA.originalChoices) {
- const roleObject = parseRole(role).role;
+ const roleObject = MafiaTracker.parseRole(role).role;
buf += `${role}`;
buf += `
${roleObject.memo.map(m => `
${m}
`).join('')}
`;
buf += ``;
@@ -1655,7 +1700,7 @@ const pages = {
for (let p in game.players) {
let player = game.players[p];
buf += `
`;
- buf += `${player.safeName} (${player.role ? player.getRole() : ''})${game.lynchModifiers[p] !== undefined ? `(lynches worth ${game.getLynchValue(p)})` : ''}`;
+ buf += `${player.safeName} (${player.role ? player.getRole(true) : ''})${game.lynchModifiers[p] !== undefined ? `(lynches worth ${game.getLynchValue(p)})` : ''}`;
buf += ` `;
buf += ` `;
buf += ` `;
@@ -1766,8 +1811,10 @@ const commands = {
if (room.game) return this.errorReply(`There is already a game of ${room.game.title} in progress in this room.`);
if (!user.can('broadcast', null, room)) return this.errorReply(`/mafia ${cmd} - Access denied.`);
+ let nextHost = false;
if (room.id === 'mafia') {
if (cmd === 'nexthost') {
+ nextHost = true;
if (!hostQueue.length) return this.errorReply(`Nobody is on the host queue.`);
let skipped = [];
do {
@@ -1789,7 +1836,7 @@ const commands = {
}
if (!this.targetUser || !this.targetUser.connected) return this.errorReply(`The user "${this.targetUsername}" was not found.`);
- if (this.targetUser.userid !== user.userid && !this.can('mute', null, room)) return false;
+ if (!nextHost && this.targetUser.userid !== user.userid && !this.can('mute', null, room)) return false;
if (!room.users[this.targetUser.userid]) return this.errorReply(`${this.targetUser.name} is not in this room, and cannot be hosted.`);
if (room.id === 'mafia' && isHostBanned(this.targetUser.userid)) return this.errorReply(`${this.targetUser.name} is banned from hosting games.`);
@@ -1815,8 +1862,10 @@ const commands = {
if (!room.mafiaEnabled) return this.errorReply(`Mafia is disabled for this room.`);
if (room.id !== 'mafia') return this.errorReply(`This command can only be used in the Mafia room.`);
const args = target.split(',').map(toId);
- if (['forceadd', 'add', 'remove', 'del', 'delete'].includes(args[0]) && !this.can('broadcast', null, room)) {
- return false;
+ if (['forceadd', 'add', 'remove', 'del', 'delete'].includes(args[0])) {
+ const permission = (user.userid === args[1]) ? 'broadcast' : 'mute';
+ if (['forceadd', 'add'].includes(args[0]) && !this.can(permission, null, room)) return;
+ if (['remove', 'del', 'delete'].includes(args[0]) && user.userid !== args[1] && !this.can('mute', null, room)) return;
} else {
if (!this.runBroadcast()) return false;
}
@@ -1901,7 +1950,7 @@ const commands = {
playercap: function (target, room, user) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return this.errorReply(`/mafia playercap - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (game.phase !== 'signups') return this.errorReply(`Signups are already closed.`);
if (toId(target) === 'none') target = '20';
const num = parseInt(target);
@@ -1922,7 +1971,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, targetRoom) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia close - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (game.phase !== 'signups') return user.sendTo(targetRoom, `|error|Signups are already closed.`);
if (game.playerCount < 2) return user.sendTo(targetRoom, `|error|You need at least 2 players to start.`);
game.phase = 'locked';
@@ -1944,7 +1993,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, targetRoom) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia closedsetup - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
const action = toId(args.join(''));
if (!['on', 'off'].includes(action)) return this.parse('/help mafia closedsetup');
if (game.started) return user.sendTo(targetRoom, `|error|You can't ${action === 'on' ? 'enable' : 'disable'} closed setup because the game has already started.`);
@@ -1966,7 +2015,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, targetRoom) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia reveal - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
const action = toId(args.join(''));
if (!['on', 'off'].includes(action)) return this.parse('/help mafia reveal');
if ((action === 'off' && game.noReveal) || (action === 'on' && !game.noReveal)) return user.sendTo(targetRoom, `|error|Revealing of roles is already ${game.noReveal ? 'disabled' : 'enabled'}.`);
@@ -1976,25 +2025,33 @@ const commands = {
},
revealhelp: [`/mafia reveal [on|off] - Sets if roles reveal on death or not. Requires host % @ * # & ~`],
+ resetroles: 'setroles',
+ forceresetroles: 'setroles',
forcesetroles: 'setroles',
setroles: function (target, room, user, connection, cmd) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return this.errorReply(`/mafia ${cmd} - Access denied.`);
- if (game.phase !== 'locked' && game.phase !== 'IDEAlocked') return this.errorReply(game.phase === 'signups' ? `You need to close signups first.` : `The game has already started.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
+ const reset = cmd.includes('reset');
+ if (reset) {
+ if (game.phase !== 'day' && game.phase !== 'night') return this.errorReply(`The game has not started yet.`);
+ } else {
+ if (game.phase !== 'locked' && game.phase !== 'IDEAlocked') return this.errorReply(game.phase === 'signups' ? `You need to close signups first.` : `The game has already started.`);
+ }
if (!target) return this.parse('/help mafia setroles');
- game.setRoles(user, target, cmd === 'forcesetroles');
+ game.setRoles(user, target, cmd.includes('force'), reset);
},
setroleshelp: [
- `/mafia setroles [comma seperated roles] - Set the roles for a game of mafia. You need to provide one role per player.`,
- `/mafia forcesetroles [comma seperated roles] - Forcibly set the roles for a game of mafia. No role PM information or alignment will be set.`,
+ `/mafia setroles [comma separated roles] - Set the roles for a game of mafia. You need to provide one role per player.`,
+ `/mafia forcesetroles [comma separated roles] - Forcibly set the roles for a game of mafia. No role PM information or alignment will be set.`,
+ `/mafia resetroles [comma separated roles] - Reset the roles in an ongoing game.`,
],
idea: function (target, room, user) {
if (!room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
- if (!user.can('broadcast', null, room) || (!user.can('mute', null, room) && game.hostid !== user.userid)) return this.errorReply(`/mafia idea - Access denied.`);
+ if (!user.can('broadcast', null, room) || (!user.can('mute', null, room) && game.hostid !== user.userid && !game.cohosts.includes(user.userid))) return this.errorReply(`/mafia idea - Access denied.`);
if (game.started) return this.errorReply(`You cannot start an IDEA after the game has started.`);
if (game.phase !== 'locked' && game.phase !== 'IDEAlocked') return this.errorReply(`You need to close the signups first.`);
game.ideaInit(user, toId(target));
@@ -2050,7 +2107,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, targetRoom) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia idereroll - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
game.ideaDistributeRoles(user);
},
idearerollhelp: [`/mafia ideareroll - rerolls the roles for the current IDEA module. Requires host % @ * # & ~`],
@@ -2073,7 +2130,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia start - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
game.start(user);
},
starthelp: [`/mafia start - Start the game of mafia. Signups must be closed. Requires host % @ * # & ~`],
@@ -2092,7 +2149,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia ${cmd} - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (cmd === 'night') {
game.night();
} else {
@@ -2167,7 +2224,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia ${cmd} - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
let action = toId(args.shift());
if (!action) return this.parse(`/help mafia selflynch`);
if (this.meansYes(action)) {
@@ -2198,7 +2255,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia kill - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
const player = game.players[toId(args.join(''))];
if (!player) return user.sendTo(targetRoom, `|error|"${args.join(',')}" is not a living player.`);
if (game.phase === 'IDEApicking') return this.errorReply(`You cannot add or remove players while IDEA roles are being picked.`); // needs to be here since eliminate doesn't pass the user
@@ -2225,7 +2282,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia revive - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (!toId(args.join(''))) return this.parse('/help mafia revive');
for (const targetUser of args) {
game.revive(user, toId(targetUser), cmd === 'forceadd');
@@ -2238,13 +2295,13 @@ const commands = {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
target = toId(target);
- if (!user.can('mute', null, room) && game.hostid !== user.userid && target) return this.errorReply(`/mafia deadline - Access denied.`);
+ if (target && game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (target === 'off') {
return game.setDeadline(0);
} else {
const num = parseInt(target);
if (isNaN(num)) {
- if (game.hostid === user.userid && this.cmdToken === "!") {
+ if ((game.hostid === user.userid || game.cohosts.includes(user.userid)) && this.cmdToken === "!") {
const broadcastMessage = this.message.toLowerCase().replace(/[^a-z0-9\s!,]/g, '');
if (room && room.lastBroadcast === broadcastMessage &&
room.lastBroadcastTime >= Date.now() - 20 * 1000) {
@@ -2273,7 +2330,7 @@ const commands = {
applyhammermodifier: function (target, room, user, connection, cmd) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return this.errorReply(`/mafia ${cmd} - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (!game.started) return this.errorReply(`The game has not started yet.`);
const [player, mod] = target.split(',');
if (cmd === 'applyhammermodifier') {
@@ -2286,7 +2343,7 @@ const commands = {
clearhammermodifiers: function (target, room, user, connection, cmd) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return this.errorReply(`/mafia ${cmd} - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (!game.started) return this.errorReply(`The game has not started yet.`);
if (cmd === 'clearhammermodifiers') {
game.clearHammerModifiers(user);
@@ -2339,7 +2396,7 @@ const commands = {
hammer: function (target, room, user, connection, cmd) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return this.errorReply(`/mafia ${cmd} - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (!game.started) return this.errorReply(`The game has not started yet.`);
const hammer = parseInt(target);
if ((isNaN(hammer) || hammer < 1) && cmd.toLowerCase() !== `resethammer`) return this.errorReply(`${target} is not a valid hammer count.`);
@@ -2356,8 +2413,8 @@ const commands = {
}
},
hammerhelp: [
- `/mafia hammer (hammer) - sets the hammer count to (hammer) and resets lynches`,
- `/mafia shifthammer (hammer) - sets the hammer count to (hammer) without resetting lynches`,
+ `/mafia hammer [hammer] - sets the hammer count to [hammer] and resets lynches`,
+ `/mafia shifthammer [hammer] - sets the hammer count to [hammer] without resetting lynches`,
`/mafia resethammer - sets the hammer to the default, resetting lynches`,
],
@@ -2371,20 +2428,20 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia ${cmd} - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (cmd === 'enablenl') {
game.setNoLynch(user, true);
} else {
game.setNoLynch(user, false);
}
},
- enablenlhelp: [`/mafia enablenl OR /mafia disablenl - Allows or disallows players abstain from lynching. Requires host % @ # & ~`],
+ enablenlhelp: [`/mafia [enablenl|disablenl] - Allows or disallows players abstain from lynching. Requires host % @ # & ~`],
lynches: function (target, room, user) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
if (!game.started) return this.errorReply(`The game of mafia has not started yet.`);
- if (game.hostid === user.userid && this.cmdToken === "!") {
+ if ((game.hostid === user.userid || game.cohosts.includes(user.userid)) && this.cmdToken === "!") {
const broadcastMessage = this.message.toLowerCase().replace(/[^a-z0-9\s!,]/g, '');
if (room && room.lastBroadcast === broadcastMessage &&
room.lastBroadcastTime >= Date.now() - 20 * 1000) {
@@ -2398,24 +2455,14 @@ const commands = {
}
if (!this.runBroadcast()) return false;
- let buf = `Lynches (Hammer: ${game.hammerCount}) `;
- const plur = game.getPlurality();
- const list = Object.keys(game.lynches).sort((a, b) => {
- if (a === plur) return -1;
- if (b === plur) return 1;
- return game.lynches[b].count - game.lynches[a].count;
- });
- for (const key of list) {
- buf += `${game.lynches[key].count}${plur === key ? '*' : ''} ${game.players[key] ? game.players[key].safeName : 'No Lynch'} (${game.lynches[key].lynchers.map(a => game.players[a] ? game.players[a].safeName : a).join(', ')}) `;
- }
- this.sendReplyBox(buf);
+ this.sendReplyBox(game.lynchBox());
},
pl: 'players',
players: function (target, room, user) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
- if (game.hostid === user.userid && this.cmdToken === "!") {
+ if ((game.hostid === user.userid || game.cohosts.includes(user.userid)) && this.cmdToken === "!") {
const broadcastMessage = this.message.toLowerCase().replace(/[^a-z0-9\s!,]/g, '');
if (room && room.lastBroadcast === broadcastMessage &&
room.lastBroadcastTime >= Date.now() - 20 * 1000) {
@@ -2458,6 +2505,15 @@ const commands = {
this.sendReplyBox(`${showOrl ? `Original Rolelist: ` : `Rolelist: `}${roleString}`);
},
+ playerroles: function (target, room, user) {
+ if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
+ const game = /** @type {MafiaTracker} */ (room.game);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid)) return this.errorReply(`Only the host can view roles.`);
+ if (!game.started) return this.errorReply(`The game has not started.`);
+ const players = [...Object.values(game.players), ...Object.values(game.dead)];
+ this.sendReplyBox(players.map(p => `${p.safeName}: ${p.role ? p.role.safeName : 'No role'}`).join(' '));
+ },
+
spectate: 'view',
view: function (target, room, user, connection) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
@@ -2508,7 +2564,7 @@ const commands = {
game.players[user.userid].updateHtmlRoom();
game.nextSub();
} else {
- if (game.hostid === user.userid) return user.sendTo(targetRoom, `|error|The host cannot sub out of the game.`);
+ if (game.hostid === user.userid || game.cohosts.includes(user.userid)) return user.sendTo(targetRoom, `|error|The host cannot sub out of the game.`);
if (!game.subs.includes(user.userid)) return user.sendTo(targetRoom, `|error|You are not on the sub list.`);
game.subs.splice(game.subs.indexOf(user.userid), 1);
// Update spectator's view
@@ -2516,7 +2572,7 @@ const commands = {
}
break;
case 'next':
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia sub - Access denied for force substituting a player.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
let toSub = args.shift();
if (!(toId(toSub) in game.players)) return user.sendTo(targetRoom, `|error|${toSub} is not in the game.`);
if (!game.subs.length) {
@@ -2528,7 +2584,7 @@ const commands = {
}
break;
case 'remove':
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia sub - Access denied for force substituting a player.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
const toRemove = toId(args.shift());
const toRemoveIndex = game.subs.indexOf(toRemove);
if (toRemoveIndex === -1) return user.sendTo(room, `|error|${toRemove} is not on the sub list.`);
@@ -2536,7 +2592,7 @@ const commands = {
user.sendTo(room, `${toRemove} has been removed from the sublist`);
break;
case 'unrequest':
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia sub - Access denied for removing a player's sub request.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
const toUnrequest = toId(args.shift());
const userIndex = game.requestedSub.indexOf(toUnrequest);
const hostIndex = game.hostRequestedSub.indexOf(toUnrequest);
@@ -2551,7 +2607,7 @@ const commands = {
}
break;
default:
- if (!user.can('mute', null, room) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia sub - Access denied for force substituting a player.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
const toSubOut = action;
const toSubIn = toId(args.shift());
if (!(toSubOut in game.players)) return user.sendTo(targetRoom, `|error|${toSubOut} is not in the game.`);
@@ -2587,6 +2643,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('mute', null, room)) return;
if (this.meansYes(toId(args.join('')))) {
if (game.autoSub) return user.sendTo(targetRoom, `|error|Automatic subbing of players is already enabled.`);
game.autoSub = true;
@@ -2602,38 +2659,69 @@ const commands = {
},
autosubhelp: [`/mafia autosub [yes|no] - Sets if players will automatically sub out if a user is on the sublist. Requires host % @ * # & ~`],
+ cohost: 'subhost',
+ forcecohost: 'subhost',
forcesubhost: 'subhost',
subhost: function (target, room, user, connection, cmd) {
if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (room.game);
if (!this.canTalk()) return;
- if (!target) return this.parse('/help mafia subhost');
+ if (!target) return this.parse(`/help mafia ${cmd}`);
if (!this.can('mute', null, room)) return false;
this.splitTarget(target, false);
let targetUser = this.targetUser;
if (!targetUser || !targetUser.connected) return this.errorReply(`The user "${this.targetUsername}" was not found.`);
if (!room.users[targetUser.userid]) return this.errorReply(`${targetUser.name} is not in this room, and cannot be hosted.`);
if (game.hostid === targetUser.userid) return this.errorReply(`${targetUser.name} is already the host.`);
- if (targetUser.userid in game.players) return this.errorReply(`You cannot subhost to a user in the game.`);
+ if (game.cohosts.includes(targetUser.userid)) return this.errorReply(`${targetUser.name} is already a cohost.`);
+ if (targetUser.userid in game.players) return this.errorReply(`The host cannot be ingame.`);
if (targetUser.userid in game.dead) {
- if (cmd !== 'forcesubhost') return this.errorReply(`${targetUser.name} could potentially be revived. To subhost anyway, use /mafia forcesubhost ${target}.`);
+ if (!cmd.includes('force')) return this.errorReply(`${targetUser.name} could potentially be revived. To continue anyway, use /mafia force${cmd} ${target}.`);
+ if (game.dead[targetUser.userid].lynching) game.unlynch(targetUser.userid);
game.dead[targetUser.userid].destroy();
delete game.dead[targetUser.userid];
}
- const oldHostid = game.hostid;
- const oldHost = Users(game.hostid);
- if (oldHost) oldHost.send(`>view-mafia-${room.id}\n|deinit`);
- if (game.subs.includes(targetUser.userid)) game.subs.splice(game.subs.indexOf(targetUser.userid), 1);
- const queueIndex = hostQueue.indexOf(targetUser.userid);
- if (queueIndex > -1) hostQueue.splice(queueIndex, 1);
- game.host = Chat.escapeHTML(targetUser.name);
- game.hostid = targetUser.userid;
- game.played.push(targetUser.userid);
- targetUser.send(`>view-mafia-${room.id}\n|init|html\n${Chat.pages.mafia([room.id], targetUser)}`);
- game.sendRoom(`${Chat.escapeHTML(targetUser.name)} has been substituted as the new host, replacing ${oldHostid}.`, {declare: true});
- this.modlog('MAFIASUBHOST', targetUser, `replacing ${oldHostid}`, {noalts: true, noip: true});
+ if (cmd.includes('cohost')) {
+ game.cohosts.push(targetUser.userid);
+ game.sendRoom(`${Chat.escapeHTML(targetUser.name)} has been added as a cohost by ${Chat.escapeHTML(user.name)}`, {declare: true});
+ targetUser.send(`>view-mafia-${room.id}\n|init|html\n|${Chat.pages.mafia([room.id], targetUser)}`);
+ this.modlog('MAFIACOHOST', targetUser, null, {noalts: true, noip: true});
+ } else {
+ const oldHostid = game.hostid;
+ const oldHost = Users(game.hostid);
+ if (oldHost) oldHost.send(`>view-mafia-${room.id}\n|deinit`);
+ if (game.subs.includes(targetUser.userid)) game.subs.splice(game.subs.indexOf(targetUser.userid), 1);
+ const queueIndex = hostQueue.indexOf(targetUser.userid);
+ if (queueIndex > -1) hostQueue.splice(queueIndex, 1);
+ game.host = Chat.escapeHTML(targetUser.name);
+ game.hostid = targetUser.userid;
+ game.played.push(targetUser.userid);
+ targetUser.send(`>view-mafia-${room.id}\n|init|html\n${Chat.pages.mafia([room.id], targetUser)}`);
+ game.sendRoom(`${Chat.escapeHTML(targetUser.name)} has been substituted as the new host, replacing ${oldHostid}.`, {declare: true});
+ this.modlog('MAFIASUBHOST', targetUser, `replacing ${oldHostid}`, {noalts: true, noip: true});
+ }
},
subhosthelp: [`/mafia subhost [user] - Substitues the user as the new game host.`],
+ cohosthelp: [`/mafia cohost [user] - Adds the user as a cohost. Cohosts can talk during the game, as well as perform host actions.`],
+
+ uncohost: 'removecohost',
+ removecohost: function (target, room, user) {
+ if (!room || !room.game || room.game.gameid !== 'mafia') return this.errorReply(`There is no game of mafia running in this room.`);
+ const game = /** @type {MafiaTracker} */ (room.game);
+ if (!this.canTalk()) return;
+ if (!target) return this.parse('/help mafia subhost');
+ if (!this.can('mute', null, room)) return false;
+ target = toId(target);
+
+ const cohostIndex = game.cohosts.indexOf(target);
+ if (cohostIndex < 0) {
+ if (game.hostid === target) return this.errorReply(`${target} is the host, not a cohost. Use /mafia subhost to replace them.`);
+ return this.errorReply(`${target} is not a cohost.`);
+ }
+ game.cohosts.splice(cohostIndex, 1);
+ game.sendRoom(`${target} was removed as a cohost by ${Chat.escapeHTML(user.name)}`, {declare: true});
+ this.modlog('MAFIAUNCOHOST', target, null, {noalts: true, noip: true});
+ },
'!end': true,
end: function (target, room, user) {
@@ -2644,7 +2732,7 @@ const commands = {
}
if (!targetRoom.game || targetRoom.game.gameid !== 'mafia') return user.sendTo(targetRoom, `|error|There is no game of mafia running in this room.`);
const game = /** @type {MafiaTracker} */ (targetRoom.game);
- if (!user.can('broadcast', null, targetRoom) && game.hostid !== user.userid) return user.sendTo(targetRoom, `|error|/mafia end - Access denied.`);
+ if (game.hostid !== user.userid && !game.cohosts.includes(user.userid) && !this.can('broadcast', null, room)) return;
game.end();
this.room = targetRoom;
this.modlog('MAFIAEND', null);
@@ -2865,7 +2953,7 @@ const commands = {
},
hostbanhelp: [
`/mafia hostban [user], [duration] - Ban a user from hosting games for [duration] days. Requires % @ * # & ~`,
- `/mafia (un)hostban [user] - Unbans a user from hosting games. Requires % @ * # & ~`,
+ `/mafia unhostban [user] - Unbans a user from hosting games. Requires % @ * # & ~`,
],
disable: function (target, room, user) {
@@ -2898,47 +2986,101 @@ const commands = {
},
enablehelp: [`/mafia enable - Enables mafia in this room. Requires # & ~`],
},
- mafiahelp: [
- `Commands for the Mafia plugin:`,
- `/mafia host [user] - Create a game of Mafia with [user] as the host. Requires + % @ * # & ~`,
- `/mafia nexthost - Host the next user in the host queue. Requires + % @ * # & ~`,
- `/mafia queue [add|remove|view], [user] - Add: Adds the user to the queue. Requires + % @ * # & ~. Remove: Removes the user from the queue. Requires + % @ * # & ~. View: Shows the upcoming users who are going to host.`,
- `/mafia join - Join the game.`,
- `/mafia leave - Leave the game. Can only be done while signups are open.`,
- `/mafia close - Closes signups for the current game. Requires: host % @ * # & ~`,
- `/mafia closedsetup [on|off] - Sets if the game is a closed setup. Closed setups don't show the role list to players. Requires host % @ * # & ~`,
- `/mafia reveal [on|off] - Sets if roles reveal on death or not. Requires host % @ * # & ~`,
- `/mafia selflynch [on|hammer|off] - Allows players to self lynch themselves either at hammer or anytime. Requires host % @ * # & ~`,
- `/mafia enablenl OR /mafia disablenl - Allows or disallows players abstain from lynching. Requires host % @ # & ~`,
- `/mafia setroles [comma seperated roles] - Set the roles for a game of mafia. You need to provide one role per player.`,
- `/mafia forcesetroles [comma seperated roles] - Forcibly set the roles for a game of mafia. No role PM information or alignment will be set.`,
- `/mafia start - Start the game of mafia. Signups must be closed. Requires host % @ * # & ~`,
- `/mafia day - Move to the next game day. Requires host % @ * # & ~`,
- `/mafia night - Move to the next game night. Requires host % @ * # & ~`,
- `/mafia extend (minutes) - Return to the previous game day. If (minutes) is provided, set the deadline for (minutes) minutes. Requires host % @ * # & ~`,
- `/mafia lynch [player|nolynch] - Vote to lynch the specified player or to not lynch anyone.`,
- `/mafia unlynch - Withdraw your lynch vote. Fails if you're not voting to lynch anyone`,
- `/mafia kill [player] - Kill a player, eliminating them from the game. Requires host % @ * # & ~`,
- `/mafia treestump [player] - Kills a player, but allows them to talk during the day still.`,
- `/mafia spirit [player] - Kills a player, but allows them to vote on the lynch still.`,
- `/mafia spiritstump [player] - Kills a player, but allows them to talk during the day, and vote on the lynch.`,
- `/mafia kick [player] - Kicks a player from the game without revealing their role.`,
- `/mafia revive [player] - Revive a player who died or add a new player to the game. Requires host % @ * # & ~`,
- `/mafia deadline [minutes|off] - Sets or removes the deadline for the game. Cannot be more than 20 minutes.`,
- `/mafia sub in - Request to sub into the game, or cancel a request to sub out.`,
- `/mafia sub out - Request to sub out of the game, or cancel a request to sub in.`,
- `/mafia sub next [player] - Forcibly sub [player] out of the game. Requires host % @ * # & ~`,
- `/mafia subhost [user] - Substitues the user as the new game host.`,
- `/mafia end - End the current game of mafia. Requires host % @ * # & ~`,
- `/mafia data [alignment|role|modifier|theme] - Get information on a mafia alignment, role, modifier, or theme.`,
- `/mafia win (points) [user1], [user2], [user3], ... - Award the specified users points to the mafia leaderboard for this month. The amount of points can be negative to take points. Defaults to 10 points.`,
- `/mafia mvp [user1], [user2], ... - Gives a MVP point and 5 leaderboard points to the users specified.`,
- `/mafia unmvp [user1], [user2], ... - Takes away a MVP point and 5 leaderboard points from the users specified.`,
- `/mafia [leaderboard|mvpladder] - View the leaderboard or MVP ladder for the current or last month.`,
- `/mafia [hostlost|playlogs] - View the host logs or play logs for the current or last month. Requires % @ * # & ~`,
- `/mafia disable - Disables mafia in this room. Requires # & ~`,
- `/mafia enable - Enables mafia in this room. Requires # & ~`,
- ],
+ mafiahelp: function (target, room, user) {
+ if (!this.runBroadcast()) return;
+ let buf = `Commands for the Mafia Plugin Most commands are used through buttons in the game screen.
`;
+ buf += `General Commands`;
+ buf += [
+ ` General Commands for the Mafia Plugin: `,
+ `/mafia host [user] - Create a game of Mafia with [user] as the host. Roomvoices can only host themselves. Requires + % @ * # & ~`,
+ `/mafia nexthost - Host the next user in the host queue. Only works in the Mafia Room. Requires + % @ * # & ~`,
+ `/mafia forcehost [user] - Bypass the host queue and host [user]. Only works in the Mafia Room. Requires % @ * # & ~`,
+ `/mafia sub in - Request to sub into the game, or cancel a request to sub out.`,
+ `/mafia sub out - Request to sub out of the game, or cancel a request to sub in.`,
+ `/mafia spectate - Spectate the game of mafia.`,
+ `/mafia ideadiscards - Shows the discarded roles list for an IDEA module.`,
+ `/mafia lynches - Display the current lynch count, and whos lynching who.`,
+ `/mafia players - Display the current list of players, will highlight players.`,
+ `/mafia [rl|orl] - Display the role list or the original role list for the current game.`,
+ `/mafia data [alignment|role|modifier|theme] - Get information on a mafia alignment, role, modifier, or theme.`,
+ `/mafia subhost [user] - Substitues the user as the new game host. Requires % @ * # & ~`,
+ `/mafia cohost [user] - Adds the user as a cohost. Cohosts can talk during the game, as well as perform host actions. Requires % @ * # & ~`,
+ `/mafia uncohost [user] - Remove [user]'s cohost status. Requires % @ * # & ~`,
+ `/mafia disable - Disables mafia in this room. Requires # & ~`,
+ `/mafia enable - Enables mafia in this room. Requires # & ~`,
+ ].join(' ');
+ buf += `Player Commands`;
+ buf += [
+ ` Commands that players can use: `,
+ `/mafia join - Join the game.`,
+ `/mafia leave - Leave the game. Can only be done while signups are open.`,
+ `/mafia lynch [player|nolynch] - Vote to lynch the specified player or to not lynch anyone.`,
+ `/mafia unlynch - Withdraw your lynch vote. Fails if you're not voting to lynch anyone`,
+ `/mafia deadline - View the deadline for the current game.`,
+ `/mafia sub in - Request to sub into the game, or cancel a request to sub out.`,
+ `/mafia sub out - Request to sub out of the game, or cancel a request to sub in.`,
+ `/mafia ideapick [selection], [role] - Selects a role from an IDEA module`,
+ ].join(' ');
+ buf += `Host Commands`;
+ buf += [
+ ` Commands for game hosts and Cohosts to use: `,
+ `/mafia playercap [cap|none]- Limit the number of players able to join the game. Player cap cannot be more than 20 or less than 2. Requires: host % @ # & ~`,
+ `/mafia close - Closes signups for the current game. Requires: host % @ * # & ~`,
+ `/mafia closedsetup [on|off] - Sets if the game is a closed setup. Closed setups don't show the role list to players. Requires host % @ * # & ~`,
+ `/mafia reveal [on|off] - Sets if roles reveal on death or not. Requires host % @ * # & ~`,
+ `/mafia selflynch [on|hammer|off] - Allows players to self lynch themselves either at hammer or anytime. Requires host % @ * # & ~`,
+ `/mafia [enablenl|disablenl] - Allows or disallows players abstain from lynching. Requires host % @ # & ~`,
+ `/mafia setroles [comma seperated roles] - Set the roles for a game of mafia. You need to provide one role per player. Requires host % @ # & ~`,
+ `/mafia forcesetroles [comma seperated roles] - Forcibly set the roles for a game of mafia. No role PM information or alignment will be set. Requires host % @ # & ~`,
+ `/mafia idea [idea] - starts an IDEA module. Requires + % @ * # & ~, voices can only start for themselves`,
+ `/mafia ideareroll - rerolls the current IDEA module. Requires host % @ * # & ~`,
+ `/mafia customidea choices, picks (new line here, shift+enter)`,
+ `(comma or newline separated rolelist) - Starts an IDEA module with custom roles. Requires % @ # & ~`,
+ `/mafia start - Start the game of mafia. Signups must be closed. Requires host % @ * # & ~`,
+ `/mafia day - Move to the next game day. Requires host % @ * # & ~`,
+ `/mafia night - Move to the next game night. Requires host % @ * # & ~`,
+ `/mafia extend (minutes) - Return to the previous game day. If (minutes) is provided, set the deadline for (minutes) minutes. Requires host % @ * # & ~`,
+ `/mafia kill [player] - Kill a player, eliminating them from the game. Requires host % @ * # & ~`,
+ `/mafia treestump [player] - Kills a player, but allows them to talk during the day still. Requires host % @ * # & ~`,
+ `/mafia spirit [player] - Kills a player, but allows them to vote on the lynch still. Requires host % @ * # & ~`,
+ `/mafia spiritstump [player] - Kills a player, but allows them to talk during the day, and vote on the lynch. Requires host % @ * # & ~`,
+ `/mafia kick [player] - Kicks a player from the game without revealing their role. Requires host % @ * # & ~`,
+ `/mafia revive [player] - Revive a player who died or add a new player to the game. Requires host % @ * # & ~`,
+ `/mafia deadline [minutes|off] - Sets or removes the deadline for the game. Cannot be more than 20 minutes.`,
+ `/mafia sub next, [player] - Forcibly sub [player] out of the game. Requires host % @ * # & ~`,
+ `/mafia sub remove, [user] - Forcibly remove [user] from the sublist. Requres host % @ * # & ~`,
+ `/mafia sub unrequest, [player] - Remove's a player's request to sub out of the game. Requires host % @ * # & ~`,
+ `/mafia sub [player], [user] - Forcibly sub [player] for [user]. Requires host % @ * # & ~`,
+ `/mafia autosub [yes|no] - Sets if players will automatically sub out if a user is on the sublist. Defaults to yes. Requires host % @ * # & ~`,
+ `/mafia [love|hate] [player] - Makes it take 1 more (love) or less (hate) lynch to hammer [player]. Requires host % @ * # & ~`,
+ `/mafia [unlove|unhate] [player] - Removes loved or hated status from [player]. Requires host % @ * # & ~`,
+ `/mafia [mayor|voteless] [player] - Makes [player]'s' lynch worth 2 votes (mayor) or makes [player]'s lynch worth 0 votes (voteless). Requires host % @ * # & ~`,
+ `/mafia [unmayor|unvoteless] [player] - Removes mayor or voteless status from [player]. Requires host % @ * # & ~`,
+ `/mafia hammer [hammer] - sets the hammer count to [hammer] and resets lynches`,
+ `/mafia shifthammer [hammer] - sets the hammer count to [hammer] without resetting lynches`,
+ `/mafia resethammer - sets the hammer to the default, resetting lynches`,
+ `/mafia playerroles - View all the player's roles in chat. Requires host`,
+ `/mafia end - End the current game of mafia. Requires host % @ * # & ~`,
+ ].join(' ');
+ buf += `Mafia Room Specific Commands`;
+ buf += [
+ ` Commands that are only useable in the Mafia Room: `,
+ `/mafia queue add, [user] - Adds the user to the host queue. Requires % @ * # & ~.`,
+ `/mafia queue remove, [user] - Removes the user from the queue. You can remove yourself regardless of rank. Requires % @ * # & ~.`,
+ `/mafia queue - Shows the list of users who are in queue to host.`,
+ `/mafia win (points) [user1], [user2], [user3], ... - Award the specified users points to the mafia leaderboard for this month. The amount of points can be negative to take points. Defaults to 10 points.`,
+ `/mafia winfaction (points), [faction] - Award the specified points to all the players in the given faction. Requires % @ * # & ~`,
+ `/mafia mvp [user1], [user2], ... - Gives a MVP point and 10 leaderboard points to the users specified.`,
+ `/mafia unmvp [user1], [user2], ... - Takes away a MVP point and 10 leaderboard points from the users specified.`,
+ `/mafia [leaderboard|mvpladder] - View the leaderboard or MVP ladder for the current or last month.`,
+ `/mafia [hostlost|playlogs] - View the host logs or play logs for the current or last month. Requires % @ * # & ~`,
+ `/mafia hostban [user], [duration] - Ban a user from hosting games for [duration] days. Requires % @ * # & ~`,
+ `/mafia unhostban [user] - Unbans a user from hosting games. Requires % @ * # & ~`,
+ ].join(' ');
+ buf += ``;
+
+ return this.sendReplyBox(buf);
+ },
};
module.exports = {
diff --git a/chat-plugins/modlog.js b/chat-plugins/modlog.js
index 79a543a991a1..6e0ac24d7931 100644
--- a/chat-plugins/modlog.js
+++ b/chat-plugins/modlog.js
@@ -38,7 +38,7 @@ class SortedLimitedLengthList {
return this.list.slice();
}
- tryInsert(element) {
+ insert(element) {
let insertedAt = -1;
for (let i = this.list.length - 1; i >= 0; i--) {
if (element.localeCompare(this.list[i]) < 0) {
@@ -54,9 +54,7 @@ class SortedLimitedLengthList {
if (insertedAt < 0) this.list.splice(0, 0, element);
if (this.list.length > this.maxSize) {
this.list.pop();
- if (insertedAt === this.list.length) return false;
}
- return true;
}
}
@@ -76,7 +74,7 @@ function checkRipgrepAvailability() {
return Config.ripgrepmodlog;
}
-function getMoreButton(room, search, useExactSearch, lines, maxLines) {
+function getMoreButton(roomid, search, useExactSearch, lines, maxLines) {
let newLines = 0;
for (let increase of MORE_BUTTON_INCREMENTS) {
if (increase > lines) {
@@ -88,7 +86,7 @@ function getMoreButton(room, search, useExactSearch, lines, maxLines) {
return ''; // don't show a button if no more pre-set increments are valid or if the amount of results is already below the max
} else {
if (useExactSearch) search = Chat.escapeHTML(`"${search}"`);
- return ` `;
+ return ` `;
}
}
@@ -144,8 +142,7 @@ async function checkRoomModlog(path, regex, results) {
let line;
while ((line = await fileStream.readLine()) !== null) {
if (!regex || regex.test(line)) {
- const insertionSuccessful = results.tryInsert(line);
- if (!insertionSuccessful) break;
+ results.insert(line);
}
}
fileStream.destroy();
@@ -160,17 +157,17 @@ function runRipgrepModlog(paths, regexString, results) {
return results;
}
for (const fileName of stdout.toString().split('\n').reverse()) {
- if (fileName) results.tryInsert(fileName);
+ if (fileName) results.insert(fileName);
}
return results;
}
-function prettifyResults(resultArray, room, searchString, exactSearch, addModlogLinks, hideIps, maxLines) {
+function prettifyResults(resultArray, roomid, searchString, exactSearch, addModlogLinks, hideIps, maxLines) {
if (resultArray === null) {
return "The modlog query has crashed.";
}
let roomName;
- switch (room) {
+ switch (roomid) {
case 'all':
roomName = "all rooms";
break;
@@ -178,13 +175,13 @@ function prettifyResults(resultArray, room, searchString, exactSearch, addModlog
roomName = "all public rooms";
break;
default:
- roomName = `room ${room}`;
+ roomName = `room ${roomid}`;
}
if (!resultArray.length) {
return `|popup|No moderator actions containing ${searchString} found on ${roomName}.` +
(exactSearch ? "" : " Add quotes to the search parameter to search for a phrase, rather than a user.");
}
- const title = `[${room}]` + (searchString ? ` ${searchString}` : ``);
+ const title = `[${roomid}]` + (searchString ? ` ${searchString}` : ``);
let lines = resultArray.length;
let curDate = '';
resultArray.unshift('');
@@ -218,15 +215,17 @@ function prettifyResults(resultArray, room, searchString, exactSearch, addModlog
return `${date}[${timestamp}] (${thisRoomID})${Chat.escapeHTML(line.slice(parenIndex + 1))}`;
}).join(` `);
let preamble;
- const modlogid = room + (searchString ? '-' + Dashycode.encode(searchString) : '');
+ const modlogid = roomid + (searchString ? '-' + Dashycode.encode(searchString) : '');
if (searchString) {
const searchStringDescription = (exactSearch ? `containing the string "${searchString}"` : `matching the username "${searchString}"`);
- preamble = `>view-modlog-${modlogid}\n|init|html\n|title|[Modlog]${title}\n|pagehtml|
The last ${Chat.count(lines, "logged actions")} ${searchStringDescription} on ${roomName}.` +
+ preamble = `>view-modlog-${modlogid}\n|init|html\n|title|[Modlog]${title}\n` +
+ `|pagehtml|
The last ${Chat.count(lines, "logged actions")} ${searchStringDescription} on ${roomName}.` +
(exactSearch ? "" : " Add quotes to the search parameter to search for a phrase, rather than a user.");
} else {
- preamble = `>view-modlog-${modlogid}\n|init|html\n|title|[Modlog]${title}\n|pagehtml|
The last ${Chat.count(lines, "lines")} of the Moderator Log of ${roomName}.`;
+ preamble = `>view-modlog-${modlogid}\n|init|html\n|title|[Modlog]${title}\n` +
+ `|pagehtml|
The last ${Chat.count(lines, "lines")} of the Moderator Log of ${roomName}.`;
}
- let moreButton = getMoreButton(room, searchString, exactSearch, lines, maxLines);
+ let moreButton = getMoreButton(roomid, searchString, exactSearch, lines, maxLines);
return `${preamble}${resultString}${moreButton}
`;
}
diff --git a/chat-plugins/room-events.js b/chat-plugins/room-events.js
index 7abb0fe71f33..bb0d0dc1ba96 100644
--- a/chat-plugins/room-events.js
+++ b/chat-plugins/room-events.js
@@ -94,11 +94,71 @@ exports.commands = {
help: function (target, room, user) {
return this.parse('/help roomevents');
},
+ sortby: function (target, room, user) {
+ // preconditions
+ if (!room.chatRoomData) return this.errorReply("This command is unavailable in temporary rooms.");
+ if (!room.events || !Object.keys(room.events).length) {
+ return this.errorReply("There are currently no planned upcoming events for this room.");
+ }
+ if (!this.can('ban', null, room)) return false;
+
+ // declare variables
+ let multiplier = 1;
+ let columnName = "";
+ let delimited = target.split(target.includes('|') ? '|' : ',');
+ let sortable = Object.values(room.events);
+
+ // id tokens
+ if (delimited.length === 1) {
+ columnName = target;
+ } else {
+ let order = "";
+ [columnName, order] = delimited;
+ order = toId(order);
+ multiplier = (order === 'desc') ? -1 : 1;
+ }
+
+ // sort the array by the appropriate column name
+ columnName = toId(columnName);
+ switch (columnName) {
+ case "date":
+ case "eventdate":
+ sortable.sort((a, b) => { return (toId(a.date) < toId(b.date)) ? -1 * multiplier : (toId(b.date) < toId(a.date)) ? 1 * multiplier : 0; });
+ break;
+ case "desc":
+ case "description":
+ case "eventdescription":
+ sortable.sort((a, b) => { return (toId(a.desc) < toId(b.desc)) ? -1 * multiplier : (toId(b.desc) < toId(a.desc)) ? 1 * multiplier : 0; });
+ break;
+ case "eventname":
+ case "name":
+ sortable.sort((a, b) => { return (toId(a.eventName) < toId(b.eventName)) ? -1 * multiplier : (toId(b.eventName) < toId(a.eventName)) ? 1 * multiplier : 0; });
+ break;
+ default:
+ return this.errorReply("No or invalid column name specified. Please use one of: date, eventdate, desc, description, eventdescription, eventname, name.");
+ }
+
+ // rebuild the room.events object
+ room.events = {};
+ for (const sortedObj of sortable) {
+ const eventId = toId(sortedObj.eventName);
+ room.events[eventId] = sortedObj;
+ }
+ room.chatRoomData.events = room.events;
+
+ // build communication string
+ const resultString = `sorted by column:` + columnName +
+ ` in ${multiplier === 1 ? "ascending" : "descending"} order` +
+ `${delimited.length === 1 ? " (by default)" : ""}`;
+ this.modlog('ROOMEVENT', null, resultString);
+ return this.sendReply(resultString);
+ },
},
roomeventshelp: [
`/roomevents - Displays a list of upcoming room-specific events.`,
`/roomevents add [event name] | [event date/time] | [event description] - Adds a room event. Requires: @ # & ~`,
`/roomevents remove [event name] - Deletes an event. Requires: @ # & ~`,
`/roomevents view [event name] - Displays information about a specific event.`,
+ `/roomevents sortby [column name] | [asc/desc (optional)] - Sorts events table by column name and an optional argument to ascending or descending order. Ascending order is default`,
],
};
diff --git a/chat-plugins/roomsettings.js b/chat-plugins/roomsettings.js
index b5d3e735c7ea..ef1c5f1dac27 100644
--- a/chat-plugins/roomsettings.js
+++ b/chat-plugins/roomsettings.js
@@ -157,8 +157,20 @@ class RoomSettings {
return `${this.button('Mafia enabled', null, 'mafia enable')} ${this.button('off', true)}`;
}
}
+ language() {
+ const languageList = ['Portuguese', 'Spanish', 'Italian', 'French', 'Simplified Chinese', 'Traditional Chinese', 'Japanese', 'Hindi', 'Turkish', 'Dutch', 'German'];
+ if (!this.user.can('editroom', null, this.room)) return this.button(this.room.language ? this.room.language : 'English', true);
+
+ let languageOutput = [];
+ languageOutput.push(this.button(`English`, !this.room.language, 'roomlanguage english'));
+ for (let language of languageList) {
+ languageOutput.push(this.button(`${language}`, this.room.language === toId(language), `roomlanguage ${toId(language)}`));
+ }
+ return languageOutput.join(' ');
+ }
generateDisplay(user, room, connection) {
let output = Chat.html`
Room Settings for ${this.room.title} `;
+ output += `Language: ${this.language()} `;
output += `Modchat: ${this.modchat()} `;
output += `Modjoin: ${this.modjoin()} `;
output += `Stretch filter: ${this.stretching()} `;
@@ -349,6 +361,43 @@ exports.commands = {
`/modjoin [sync|off] - Sets modjoin. Only users who can speak in modchat can join this room. Requires: \u2606 # & ~`,
],
+ roomlanguage: function (target, room, user) {
+ const languageTable = {
+ __proto__: null,
+ portuguese: 'Portuguese',
+ spanish: 'Spanish',
+ italian: 'Italian',
+ french: 'French',
+ simplifiedchinese: 'Simplified Chinese',
+ traditionalchinese: 'Traditional Chinese',
+ japanese: 'Japanese',
+ hindi: 'Hindi',
+ turkish: 'Turkish',
+ dutch: 'Dutch',
+ german: 'German',
+ // Listed as "false" under room.language
+ english: 'English',
+ };
+ if (!target) return this.sendReply(`This room's primary language is ${languageTable[room.language] || 'English'}`);
+ if (!this.can('editroom', null, room)) return false;
+
+ let targetLanguage = toId(target);
+ if (!(targetLanguage in languageTable)) return this.errorReply(`"${target}" is not a supported language.`);
+
+ room.language = targetLanguage === 'english' ? false : targetLanguage;
+
+ if (room.chatRoomData) {
+ room.chatRoomData.language = room.language;
+ Rooms.global.writeChatRoomData();
+ }
+ this.modlog(`LANGUAGE`, null, languageTable[targetLanguage]);
+ this.sendReply(`The room's language has been set to ${languageTable[targetLanguage]}`);
+ },
+ roomlanguagehelp: [
+ `/roomlanguage [language] - Sets the the language for the room, which changes language of a few commands. Requires # & ~`,
+ `Supported Languages: English, Spanish, Italian, French, Simplified Chinese, Traditional Chinese, Japanese, Hindi, Turkish, Dutch, German.`,
+ ],
+
slowchat: function (target, room, user) {
if (!target) {
const slowchatSetting = (room.slowchat || "OFF");
@@ -361,14 +410,12 @@ exports.commands = {
if (this.meansNo(target)) {
if (!room.slowchat) return this.errorReply(`Slow chat is already disabled in this room.`);
room.slowchat = false;
- this.add("|raw|
Slow chat was disabled! There is no longer a set minimum time between messages.
");
} else if (targetInt) {
if (!user.can('bypassall') && room.userCount < SLOWCHAT_USER_REQUIREMENT) return this.errorReply(`This room must have at least ${SLOWCHAT_USER_REQUIREMENT} users to set slowchat; it only has ${room.userCount} right now.`);
if (room.slowchat === targetInt) return this.errorReply(`Slow chat is already set to ${room.slowchat} seconds in this room.`);
if (targetInt < SLOWCHAT_MINIMUM) targetInt = SLOWCHAT_MINIMUM;
if (targetInt > SLOWCHAT_MAXIMUM) targetInt = SLOWCHAT_MAXIMUM;
room.slowchat = targetInt;
- this.add(`|raw|
Slow chat was enabled! Messages must have at least ${room.slowchat} seconds between them.
`);
} else {
return this.parse("/help slowchat");
}
diff --git a/chat-plugins/scavenger-games.js b/chat-plugins/scavenger-games.js
index 67f635b96ec9..9a34feb3169e 100644
--- a/chat-plugins/scavenger-games.js
+++ b/chat-plugins/scavenger-games.js
@@ -526,7 +526,10 @@ class Incognito extends ScavGame {
value = toId(value);
let player = hunt.players[user.userid];
- if (player.completed) return player.sendRoom(`That may or may not be the right answer - if you aren't confident, you can try again!`);
+ if (player.completed) {
+ if (!this.blind) return;
+ return player.sendRoom(`That may or may not be the right answer - if you aren't confident, you can try again!`);
+ }
hunt.validatePlayer(player);
diff --git a/chat-plugins/scavengers.js b/chat-plugins/scavengers.js
index 4f36c9d3aa47..5349819fb3d0 100644
--- a/chat-plugins/scavengers.js
+++ b/chat-plugins/scavengers.js
@@ -522,7 +522,7 @@ class ScavengerHunt extends Rooms.RoomGame {
}
let uniqueConnections = this.getUniqueConnections(Users(player.userid));
- if (uniqueConnections > 1) {
+ if (uniqueConnections > 1 && this.room.scavmod && this.room.scavmod.ipcheck) {
// multiple users on one alt
player.sendRoom("You have been caught for attempting a hunt with multiple connections on your account. Staff has been notified.");
@@ -1373,6 +1373,46 @@ let commands = {
this.privateModAction(`(${user.name} has ${(change > 0 ? 'given' : 'taken')} one infraction point ${(change > 0 ? 'to' : 'from')} '${targetId}'.)`);
this.modlog(`SCAV ${this.cmd.toUpperCase()}`, user);
},
+
+ modsettings: {
+ '': 'update',
+ 'update': function (target, room, user) {
+ if (!this.can('declare', null, room) || room.id !== 'scavengers') return false;
+ let settings = room.scavmod || {};
+
+ this.sendReply(`|uhtml${this.cmd === 'update' ? 'change' : ''}|scav-modsettings|
` : ""}`
);
}
}
-exports.commands = {
+/** @typedef {(this: CommandContext, target: string, room: ChatRoom, user: User, connection: Connection, cmd: string, message: string) => (void)} ChatHandler */
+/** @typedef {{[k: string]: { [k: string]: ChatHandler | string | true | string[] | ChatCommands} | string[]}} ChatCommands */
+
+/** @type {ChatCommands} */
+const commands = {
uno: {
// roomowner commands
off: 'disable',
@@ -558,15 +736,19 @@ exports.commands = {
let suppressMessages = cmd.includes('private') || !(cmd.includes('public') || room.id === 'gamecorner');
- room.game = new UNOgame(room, target, suppressMessages);
+ let cap = parseInt(target);
+ if (isNaN(cap)) cap = 6;
+ if (cap < 2) cap = 2;
+ room.game = new UnoGame(room, cap, suppressMessages);
this.privateModAction(`(A game of UNO was created by ${user.name}.)`);
this.modlog('UNO CREATE');
},
start: function (target, room, user) {
if (!this.can('minigame', null, room)) return;
- if (!room.game || room.game.gameid !== 'uno' || room.game.state !== 'signups') return this.errorReply("There is no UNO game in signups phase in this room.");
- if (room.game.onStart()) {
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno' || game.state !== 'signups') return this.errorReply("There is no UNO game in signups phase in this room.");
+ if (game.onStart()) {
this.privateModAction(`(The game of UNO was started by ${user.name}.)`);
this.modlog('UNO START');
}
@@ -584,36 +766,36 @@ exports.commands = {
timer: function (target, room, user) {
if (!this.can('minigame', null, room)) return;
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room.");
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room.");
let amount = parseInt(target);
if (!amount || amount < 5 || amount > 300) return this.errorReply("The amount must be a number between 5 and 300.");
- room.game.maxTime = amount;
- if (room.game.timer) {
- clearTimeout(room.game.timer);
- room.game.timer = setTimeout(() => {
- room.game.eliminate(room.game.currentPlayer);
- }, amount * 1000);
- }
+ game.maxTime = amount;
+ if (game.timer) clearTimeout(game.timer);
+ game.timer = setTimeout(() => {
+ game.eliminate(game.currentPlayerid);
+ }, amount * 1000);
this.addModAction(`${user.name} has set the UNO automatic disqualification timer to ${amount} seconds.`);
this.modlog('UNO TIMER', null, `${amount} seconds`);
},
autostart: function (target, room, user) {
if (!this.can('minigame', null, room)) return;
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
if (toId(target) === 'off') {
- if (!room.game.autostartTimer) return this.errorReply("There is no autostart timer running on.");
+ if (!game.autostartTimer) return this.errorReply("There is no autostart timer running on.");
this.addModAction(`${user.name} has turned off the UNO autostart timer.`);
- clearTimeout(room.game.autostartTimer);
+ clearTimeout(game.autostartTimer);
return;
}
const amount = parseInt(target);
if (!amount || amount < 30 || amount > 600) return this.errorReply("The amount must be a number between 30 and 600 seconds.");
- if (room.game.state !== 'signups') return this.errorReply("The game of UNO has already started.");
- if (room.game.autostartTimer) clearTimeout(room.game.autostartTimer);
- room.game.autostartTimer = setTimeout(() => {
- room.game.onStart();
+ if (game.state !== 'signups') return this.errorReply("The game of UNO has already started.");
+ if (game.autostartTimer) clearTimeout(game.autostartTimer);
+ game.autostartTimer = setTimeout(() => {
+ game.onStart();
}, amount * 1000);
this.addModAction(`${user.name} has set the UNO autostart timer to ${amount} seconds.`);
},
@@ -621,9 +803,10 @@ exports.commands = {
dq: 'disqualify',
disqualify: function (target, room, user) {
if (!this.can('minigame', null, room)) return;
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
- let disqualified = room.game.eliminate(toId(target));
+ let disqualified = game.eliminate(toId(target));
if (disqualified === false) return this.errorReply(`Unable to disqualify ${target}.`);
this.privateModAction(`(${user.name} has disqualified ${disqualified} from the UNO game.)`);
this.modlog('UNO DQ', toId(target));
@@ -631,68 +814,101 @@ exports.commands = {
},
// player/user commands
- j: 'join',
- join: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ j: 'unojoin',
+ // TypeScript doesn't like 'join' being defined as a function
+ join: 'unojoin',
+ unojoin: function (target, room, user) {
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
if (!this.canTalk()) return false;
- if (!room.game.joinGame(user)) return this.errorReply("Unable to join the game.");
+ if (!game.joinGame(user)) return this.errorReply("Unable to join the game.");
return this.sendReply("You have joined the game of UNO.");
},
l: 'leave',
leave: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
- if (!room.game.leaveGame(user)) return this.errorReply("Unable to leave the game.");
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ if (!game.leaveGame(user)) return this.errorReply("Unable to leave the game.");
return this.sendReply("You have left the game of UNO.");
},
play: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
- let error = room.game.onPlay(user, target);
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ /** @type {UnoGamePlayer | undefined} */
+ let player = game.players[user.userid];
+ if (!player) return this.errorReply(`You are not in the game of UNO.`);
+ let error = game.onPlay(player, target);
if (error) this.errorReply(error);
},
draw: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
- let error = room.game.onDraw(user);
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ /** @type {UnoGamePlayer | undefined} */
+ let player = game.players[user.userid];
+ if (!player) return this.errorReply(`You are not in the game of UNO.`);
+ let error = game.onDraw(player);
if (error) return this.errorReply("You have already drawn a card this turn.");
},
pass: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
- if (room.game.currentPlayer !== user.userid) return this.errorReply("It is currently not your turn.");
- if (!room.game.players[user.userid].cardLock) return this.errorReply("You cannot pass until you draw a card.");
- if (room.game.state === 'color') return this.errorReply("You cannot pass until you choose a color.");
-
- room.game.sendToRoom(`${user.name} has passed.`);
- room.game.nextTurn();
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ if (game.currentPlayerid !== user.userid) return this.errorReply("It is currently not your turn.");
+ /** @type {UnoGamePlayer | undefined} */
+ let player = game.players[user.userid];
+ if (!player) return this.errorReply(`You are not in the game of UNO.`);
+ if (!player.cardLock) return this.errorReply("You cannot pass until you draw a card.");
+ if (game.state === 'color') return this.errorReply("You cannot pass until you choose a color.");
+
+ game.sendToRoom(`${user.name} has passed.`);
+ game.nextTurn();
},
color: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return false;
- room.game.onSelectcolor(user, target);
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return false;
+ /** @type {UnoGamePlayer | undefined} */
+ let player = game.players[user.userid];
+ if (!player) return this.errorReply(`You are not in the game of UNO.`);
+ /** @type {Color} */
+ let color;
+ if (target === 'Red' || target === 'Green' || target === 'Blue' || target === 'Yellow' || target === 'Black') {
+ color = target;
+ } else {
+ return this.errorReply(`"${target}" is not a valid color.`);
+ }
+ game.onSelectColor(player, color);
},
uno: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return false;
- room.game.onUno(user, target);
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return false;
+ /** @type {UnoGamePlayer | undefined} */
+ let player = game.players[user.userid];
+ if (!player) return this.errorReply(`You are not in the game of UNO.`);
+ game.onUno(player, target);
},
// information commands
'': 'hand',
hand: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.parse("/help uno");
- room.game.onSendHand(user);
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.parse("/help uno");
+ game.onSendHand(user);
},
players: 'getusers',
users: 'getusers',
getplayers: 'getusers',
getusers: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
if (!this.runBroadcast()) return false;
- this.sendReplyBox(`Players (${room.game.playerCount}): ${room.game.getPlayers().join(', ')}`);
+ this.sendReplyBox(`Players (${game.playerCount}): ${game.getPlayers().join(', ')}`);
},
help: function (target, room, user) {
@@ -701,38 +917,41 @@ exports.commands = {
// suppression commands
suppress: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
if (!this.can('minigame', null, room)) return;
target = toId(target);
let state = target === 'on' ? true : target === 'off' ? false : undefined;
- if (state === undefined) return this.sendReply(`Suppression of UNO game messages is currently ${(room.game.suppressMessages ? 'on' : 'off')}.`);
- if (state === room.game.suppressMessages) return this.errorReply(`Suppression of UNO game messages is already ${(room.game.suppressMessages ? 'on' : 'off')}.`);
+ if (state === undefined) return this.sendReply(`Suppression of UNO game messages is currently ${(game.suppressMessages ? 'on' : 'off')}.`);
+ if (state === game.suppressMessages) return this.errorReply(`Suppression of UNO game messages is already ${(game.suppressMessages ? 'on' : 'off')}.`);
- room.game.suppressMessages = state;
+ game.suppressMessages = state;
this.addModAction(`${user.name} has turned ${(state ? 'on' : 'off')} suppression of UNO game messages.`);
this.modlog('UNO SUPRESS', null, (state ? 'ON' : 'OFF'));
},
spectate: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
- if (!room.game.suppressMessages) return this.errorReply("The current UNO game is not suppressing messages.");
- if (user.userid in room.game.spectators) return this.errorReply("You are already spectating this game.");
+ if (!game.suppressMessages) return this.errorReply("The current UNO game is not suppressing messages.");
+ if (user.userid in game.spectators) return this.errorReply("You are already spectating this game.");
- room.game.spectators[user.userid] = 1;
+ game.spectators[user.userid] = 1;
this.sendReply("You are now spectating this private UNO game.");
},
unspectate: function (target, room, user) {
- if (!room.game || room.game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
+ const game = /** @type {UnoGame} */ (room.game);
+ if (!game || game.gameid !== 'uno') return this.errorReply("There is no UNO game going on in this room right now.");
- if (!room.game.suppressMessages) return this.errorReply("The current UNO game is not suppressing messages.");
- if (!(user.userid in room.game.spectators)) return this.errorReply("You are currently not spectating this game.");
+ if (!game.suppressMessages) return this.errorReply("The current UNO game is not suppressing messages.");
+ if (!(user.userid in game.spectators)) return this.errorReply("You are currently not spectating this game.");
- delete room.game.spectators[user.userid];
+ delete game.spectators[user.userid];
this.sendReply("You are no longer spectating this private UNO game.");
},
},
@@ -750,3 +969,5 @@ exports.commands = {
`/uno suppress [on|off] - Toggles suppression of game messages.`,
],
};
+
+exports.commands = commands;
diff --git a/chat.js b/chat.js
index 1449280685e0..0233d2cc7a1d 100644
--- a/chat.js
+++ b/chat.js
@@ -165,8 +165,17 @@ Chat.namefilter = function (name, user) {
// \u534d\u5350 swastika
// \u2a0d crossed integral (f)
name = name.replace(/[\u00a1\u2580-\u2590\u25A0\u25Ac\u25AE\u25B0\u2a0d\u534d\u5350]/g, '');
+
// e-mail address
if (name.includes('@') && name.includes('.')) return '';
+
+ // url
+ if (/[a-z0-9]\.(com|net|org)/.test(name)) name = name.replace(/\./g, '');
+
+ // Limit the amount of symbols allowed in usernames to 4 maximum, and disallow (R) and (C) from being used in the middle of names.
+ let nameSymbols = name.replace(/[^\u00A1-\u00BF\u00D7\u00F7\u02B9-\u0362\u2012-\u2027\u2030-\u205E\u2050-\u205F\u2090-\u23FA\u2500-\u2BD1]+/g, '');
+ // \u00ae\u00a9 (R) (C)
+ if (nameSymbols.length > 4 || /[^a-z0-9][a-z0-9][^a-z0-9]/.test(name.toLowerCase() + ' ') || /[\u00ae\u00a9].*[a-zA-Z0-9]/.test(name)) name = name.replace(/[\u00A1-\u00BF\u00D7\u00F7\u02B9-\u0362\u2012-\u2027\u2030-\u205E\u2050-\u205F\u2190-\u23FA\u2500-\u2BD1\u2E80-\u32FF\u3400-\u9FFF\uF900-\uFAFF\uFE00-\uFE6F]+/g, '').replace(/[^A-Za-z0-9]{2,}/g, ' ').trim();
}
name = name.replace(/^[^A-Za-z0-9]+/, ""); // remove symbols from start
@@ -624,20 +633,22 @@ class CommandContext {
}
/**
* @param {string} action
- * @param {string | User} user
+ * @param {string | User?} user
* @param {string} note
*/
globalModlog(action, user, note) {
let buf = `(${this.room.id}) ${action}: `;
- if (typeof user === 'string') {
- buf += `[${user}]`;
- } else {
- let userid = user.getLastId();
- buf += `[${userid}]`;
- if (user.autoconfirmed && user.autoconfirmed !== userid) buf += ` ac:[${user.autoconfirmed}]`;
- const alts = user.getAltUsers(false, true).map(user => user.getLastId()).join('], [');
- if (alts.length) buf += ` alts:[${alts}]`;
- buf += ` [${user.latestIp}]`;
+ if (user) {
+ if (typeof user === 'string') {
+ buf += `[${user}]`;
+ } else {
+ let userid = user.getLastId();
+ buf += `[${userid}]`;
+ if (user.autoconfirmed && user.autoconfirmed !== userid) buf += ` ac:[${user.autoconfirmed}]`;
+ const alts = user.getAltUsers(false, true).slice(1).map(user => user.getLastId()).join('], [');
+ if (alts.length) buf += ` alts:[${alts}]`;
+ buf += ` [${user.latestIp}]`;
+ }
}
buf += note;
@@ -660,7 +671,7 @@ class CommandContext {
buf += `[${userid}]`;
if (!options.noalts) {
if (user.autoconfirmed && user.autoconfirmed !== userid) buf += ` ac:[${user.autoconfirmed}]`;
- const alts = user.getAltUsers(false, true).map(user => user.getLastId()).join('], [');
+ const alts = user.getAltUsers(false, true).slice(1).map(user => user.getLastId()).join('], [');
if (alts.length) buf += ` alts:[${alts}]`;
}
if (!options.noip) buf += ` [${user.latestIp}]`;
@@ -922,7 +933,7 @@ class CommandContext {
return false;
}
if (!this.checkBanwords(room, message) && !user.can('mute', null, room)) {
- this.errorReply("Your message contained banned words.");
+ this.errorReply("Your message contained banned words in this room.");
return false;
}
@@ -1587,3 +1598,11 @@ Chat.stringify = function (value, depth = 0) {
Chat.formatText = require('./chat-formatter').formatText;
Chat.linkRegex = require('./chat-formatter').linkRegex;
Chat.updateServerLock = false;
+
+// Used (and populated) by ChatMonitor.
+/** @type {{[k: string]: string[]}} */
+Chat.filterKeys = {};
+/** @type {{[k: string]: string[]}} */
+Chat.filterWords = {};
+/** @type {Map} */
+Chat.namefilterwhitelist = new Map();
diff --git a/config/datacenters.csv b/config/datacenters.csv
index 61aaff888323..10f01595105d 100644
--- a/config/datacenters.csv
+++ b/config/datacenters.csv
@@ -8,7 +8,7 @@
5.39.216.0,5.39.223.255,HostKey,http://www.hostkey.com/
5.44.26.144,5.44.26.159,PEER 1,http://www.peer1.com/
5.45.72.0,5.45.75.255,3NT UK,http://3nt.com/
-5.62.46.0,5.62.47.255,Privax LTD,http://www.privax.com/
+5.62.0.0,5.62.63.255,Privax LTD,http://www.privax.com/
5.77.32.0,5.77.63.255,eukhost.com,http://eukhost.com/
5.79.0.0,5.79.7.255,Rackspace,http://www.rackspace.com/
5.79.16.0,5.79.24.255,Rackspace,http://www.rackspace.com/
@@ -859,7 +859,7 @@
69.175.0.0,69.175.127.255,SingleHop,http://www.singlehop.com/
69.176.80.0,69.176.95.255,ethr.net,http://ethr.net/
69.192.0.0,69.192.255.255,Akamai,http://akamai.com/
-69.194.0.0,69.194.127.255,Peak Web Hosting,http://www.peakwebhosting.com/
+69.194.7.0,69.194.7.255,Peak Web Hosting,http://www.peakwebhosting.com/
69.194.128.0,69.194.143.255,SWITCH Communications Group LLC,http://www.switchnap.com/
69.194.160.0,69.194.175.255,Fortress Integrated Technologies,http://fortressitx.com/
69.194.224.0,69.194.239.255,180Servers,http://www.180servers.com/
@@ -1014,6 +1014,7 @@
77.111.244.0,77.111.247.255,Opera Mini Proxy,https://www.opera.com/
77.120.108.128,77.120.108.191,Volia Datacenter,http://www.hosting-service.com.ua
77.222.40.0,77.222.43.255,SpaceWeb,https://sweb.ru/
+77.234.40.0,77.234.47.255,Avast Cloud,https://www.avast.com
77.235.32.0,77.235.63.255,EuroVPS,http://eurovps.com/
77.237.228.0,77.237.231.255,servhost.de,http://servhost.de/
77.237.241.128,77.237.241.255,webhoster.de,http://webhoster.de/
@@ -2391,7 +2392,7 @@
192.110.160.0,192.110.167.255,Input Output Flood LLC,http://ioflood.com/
192.111.128.0,192.111.143.255,Total Server Solutions,http://totalserversolutions.com/
192.119.64.0,192.119.127.255,hostwinds.com,http://www.hostwinds.com/
-192.119.144.0,192.119.159.255,avantehosting.net,https://avantehosting.net/
+192.119.160.0,192.119.175.255,madgenius.com,http://www.madgenius.com/
192.124.170.0,192.124.219.255,demos,http://demos.ru/
192.129.128.0,192.129.255.255,hostwinds.com,http://www.hostwinds.com/
192.138.16.0,192.138.23.255,wiredtree,http://www.wiredtree.com/
@@ -2608,7 +2609,7 @@
198.50.96.0,198.50.127.255,iWeb Technologies Inc.,http://iweb.com/
198.50.128.0,198.50.255.255,OVH,http://www.ovh.co.uk/
198.52.96.0,198.52.127.255,multacom.com,http://multacom.com/
-198.52.128.0,198.52.255.255,avantehosting.net,https://avantehosting.net/
+198.52.192.0,198.52.255.255,avantehosting.net,https://avantehosting.net/
198.55.96.0,198.55.127.255,QuadraNet,http://quadranet.com/
198.58.96.0,198.58.127.255,Linode,http://www.linode.com/
198.61.128.0,198.61.255.255,Rackspace,http://www.rackspace.com/
@@ -2746,7 +2747,7 @@
199.193.248.0,199.193.255.255,Enzu Inc,https://www.enzu.com/
199.195.116.0,199.195.119.255,A2 Hosting,http://www.a2hosting.com/
199.195.128.0,199.195.131.255,fiberhub.com,http://www.fiberhub.com/
-199.195.156.0,199.195.159.255,avantehosting.net,https://avantehosting.net/
+199.195.156.0,199.195.159.255,softsyshosting.com,https://www.softsyshosting.com
199.195.192.0,199.195.199.255,Midphase,http://www.midphase.com/
199.195.212.0,199.195.215.255,Forta Trust,http://www.fortatrust.com/
199.204.44.0,199.204.47.255,vexxhost web hosting,http://vexxhost.com/
diff --git a/config/formats.js b/config/formats.js
index cd8142843d53..06ca50e67b0a 100644
--- a/config/formats.js
+++ b/config/formats.js
@@ -60,7 +60,7 @@ let Formats = [
name: "[Gen 7] UU",
threads: [
`• UU Metagame Discussion`,
- `• UU Viability Rankings`,
+ `• UU Viability Rankings`,
`• UU Sample Teams`,
],
@@ -104,9 +104,6 @@ let Formats = [
mod: 'gen7',
ruleset: ['[Gen 7] NU'],
banlist: ['NU', 'PUBL'],
- onBegin: function () {
- if (this.rated) this.add('html', `
PU is currently suspecting Pyroar! For information on how to participate check out the suspect thread.
`,
},
diff --git a/chat-plugins/mafia.js b/chat-plugins/mafia.js
index 8bdf8af40c10..d87fe2c1ea01 100644
--- a/chat-plugins/mafia.js
+++ b/chat-plugins/mafia.js
@@ -161,9 +161,14 @@ class MafiaPlayer extends Rooms.RoomGamePlayer {
this.IDEA = null;
}
- getRole() {
+ /**
+ * @param {boolean} button
+ */
+ getRole(button = false) {
if (!this.role) return;
- return `${this.role.safeName}`;
+ let color = MafiaData.alignments[this.role.alignment].color;
+ if (button && MafiaData.alignments[this.role.alignment].buttonColor) color = MafiaData.alignments[this.role.alignment].buttonColor;
+ return `${this.role.safeName}`;
}
updateHtmlRoom() {
@@ -175,115 +180,6 @@ class MafiaPlayer extends Rooms.RoomGamePlayer {
}
}
-// Parses a single role into an object
-/**
- *
- * @param {string} roleString
- * @return {MafiaParsedRole}
- */
-function parseRole(roleString) {
- /** @type {MafiaRole} */
- let role = {
- name: roleString.split(' ').map(p => toId(p) === 'solo' ? '' : p).join(' '),
- safeName: '', // MAKE SURE THESE ARE SET BELOW
- id: '',
- image: '',
- memo: ['During the Day, you may vote for whomever you want lynched.'],
- alignment: '',
- };
- roleString = roleString.replace(/\s*\(.*?\)\s*/g, ' ');
- let target = roleString.toLowerCase().replace(/[^\w\d\s]/g, '').split(' ');
- let problems = [];
- role.safeName = Chat.escapeHTML(role.name);
- role.id = toId(role.name);
- for (let key in MafiaData.roles) {
- if (key.includes('_')) {
- let roleKey = target.slice().map(toId).join('_');
- if (roleKey.includes(key)) {
- let originalKey = key;
- if (typeof MafiaData.roles[key] === 'string') key = MafiaData.roles[key];
- if (!role.image && MafiaData.roles[key].image) role.image = MafiaData.roles[key].image;
- if (MafiaData.roles[key].alignment) {
- if (role.alignment && role.alignment !== MafiaData.roles[key].alignment) {
- // A role cant have multiple alignments
- problems.push(`The role "${role.name}" has multiple possible alignments (${MafiaData.roles[key].alignment} or ${role.alignment})`);
- break;
- }
- role.alignment = MafiaData.roles[key].alignment;
- }
- if (MafiaData.roles[key].memo) role.memo = role.memo.concat(MafiaData.roles[key].memo);
- let index = roleKey.split('_').indexOf(originalKey.split('_')[0]);
- target.splice(index, originalKey.split('_').length);
- }
- } else if (target.includes(key)) {
- let index = target.indexOf(key);
- if (typeof MafiaData.roles[key] === 'string') key = MafiaData.roles[key];
- if (!role.image && MafiaData.roles[key].image) role.image = MafiaData.roles[key].image;
- if (MafiaData.roles[key].memo) role.memo = role.memo.concat(MafiaData.roles[key].memo);
- target.splice(index, 1);
- }
- }
- // Add modifiers
- for (let key in MafiaData.modifiers) {
- if (key.includes('_')) {
- let roleKey = target.slice().map(toId).join('_');
- if (roleKey.includes(key)) {
- if (typeof MafiaData.modifiers[key] === 'string') key = MafiaData.modifiers[key];
- if (!role.image && MafiaData.modifiers[key].image) role.image = MafiaData.modifiers[key].image;
- if (MafiaData.modifiers[key].memo) role.memo = role.memo.concat(MafiaData.modifiers[key].memo);
- let index = roleKey.split('_').indexOf(key.split('_')[0]);
- target.splice(index, key.split('_').length);
- }
- } else if (key === 'xshot') {
- // Special case for X-Shot modifier
- for (let [i, xModifier] of target.entries()) {
- if (toId(xModifier).endsWith('shot')) {
- let num = parseInt(toId(xModifier).substring(0, toId(xModifier).length - 4));
- if (isNaN(num)) continue;
- let memo = MafiaData.modifiers.xshot.memo.slice();
- memo = memo.map((/** @type {string} */m) => m.replace(/X/g, num.toString()));
- role.memo = role.memo.concat(memo);
- target.splice(i, 1);
- i--;
- }
- }
- } else if (target.includes(key)) {
- let index = target.indexOf(key);
- if (typeof MafiaData.modifiers[key] === 'string') key = MafiaData.modifiers[key];
- if (!role.image && MafiaData.modifiers[key].image) role.image = MafiaData.modifiers[key].image;
- if (MafiaData.modifiers[key].memo) role.memo = role.memo.concat(MafiaData.modifiers[key].memo);
- target.splice(index, 1);
- }
- }
- // Determine the role's alignment
- for (let [j, targetId] of target.entries()) {
- let id = toId(targetId);
- if (MafiaData.alignments[id]) {
- if (typeof MafiaData.alignments[id] === 'string') id = MafiaData.alignments[id];
- if (role.alignment && role.alignment !== MafiaData.alignments[id].id) {
- // A role cant have multiple alignments
- problems.push(`The role "${role.name}" has multiple possible alignments (${MafiaData.alignments[id].id} or ${role.alignment})`);
- break;
- }
- role.alignment = MafiaData.alignments[id].id;
- role.memo = role.memo.concat(MafiaData.alignments[id].memo);
- if (!role.image && MafiaData.alignments[id].image) role.image = MafiaData.alignments[id].image;
- target.splice(j, 1);
- j--;
- }
- }
- if (!role.alignment) {
- // Default to town
- role.alignment = 'town';
- role.memo = role.memo.concat(MafiaData.alignments.town.memo);
- }
- // Handle anything that is unknown
- if (target.length) {
- role.memo.push(`To learn more about your role, PM the host.`);
- }
- return {role, problems};
-}
-
class MafiaTracker extends Rooms.RoomGame {
/**
* @param {ChatRoom} room
@@ -303,6 +199,8 @@ class MafiaTracker extends Rooms.RoomGame {
this.hostid = host.userid;
this.host = Chat.escapeHTML(host.name);
+ /** @type {string[]} */
+ this.cohosts = [];
/** @type {{[userid: string]: MafiaPlayer}} */
this.players = Object.create(null);
@@ -404,9 +302,10 @@ class MafiaTracker extends Rooms.RoomGame {
* @param {User} user
* @param {string} roleString
* @param {boolean} force
+ * @param {boolean} reset
* @return {void}
*/
- setRoles(user, roleString, force = false) {
+ setRoles(user, roleString, force = false, reset = false) {
let roles = (/** @type {string[]} */roleString.split(',').map(x => x.trim()));
if (roles.length === 1) {
// Attempt to set roles from a theme
@@ -426,14 +325,7 @@ class MafiaTracker extends Rooms.RoomGame {
} else if (roles.length > this.playerCount) {
user.sendTo(this.room, `|error|You have provided too many roles, ${roles.length - this.playerCount} ${Chat.plural(roles.length - this.playerCount, 'roles', 'role')} will not be assigned.`);
}
- if (this.originalRoles.length) {
- // Reset roles
- this.originalRoles = [];
- this.originalRoleString = '';
- this.roles = [];
- this.roleString = '';
- }
- if (this.IDEA.data) this.IDEA.data = null;
+
if (force) {
this.originalRoles = roles.map(r => {
return {
@@ -450,6 +342,8 @@ class MafiaTracker extends Rooms.RoomGame {
this.roleString = this.originalRoleString;
return this.sendRoom(`The roles have been set.`);
}
+
+ let newRoles = [];
/** @type {string[]} */
let problems = [];
/** @type {string[]} */
@@ -459,29 +353,141 @@ class MafiaTracker extends Rooms.RoomGame {
for (const string of roles) {
const roleId = string.toLowerCase().replace(/[^\w\d\s]/g, '');
if (roleId in cache) {
- this.originalRoles.push(Object.assign(Object.create(null), cache[roleId]));
+ newRoles.push(Object.assign(Object.create(null), cache[roleId]));
} else {
- const role = parseRole(string);
+ const role = MafiaTracker.parseRole(string);
if (role.problems.length) problems = problems.concat(role.problems);
if (alignments.indexOf(role.role.alignment) === -1) alignments.push(role.role.alignment);
cache[roleId] = role.role;
- this.originalRoles.push(role.role);
+ newRoles.push(role.role);
}
}
if (alignments.length < 2 && alignments[0] !== 'solo') problems.push(`There must be at least 2 different alignments in a game!`);
if (problems.length) {
- this.originalRoles = [];
for (const problem of problems) {
user.sendTo(this.room, `|error|${problem}`);
}
- return user.sendTo(this.room, `|error|To forcibly set the roles, use /mafia forcesetroles`);
+ return user.sendTo(this.room, `|error|To forcibly set the roles, use /mafia force${reset ? "re" : ""}setroles`);
}
+
+ this.IDEA.data = null;
+
+ this.originalRoles = newRoles;
this.roles = this.originalRoles.slice();
this.originalRoleString = this.originalRoles.slice().map(r => `${r.safeName}`).join(', ');
this.roleString = this.originalRoleString;
- this.phase = 'locked';
+ if (!reset) this.phase = 'locked';
this.updatePlayers();
- this.sendRoom(`The roles have been set.`);
+ this.sendRoom(`The roles have been ${reset ? 're' : ''}set.`);
+ if (reset) this.distributeRoles();
+ }
+
+ /**
+ * Parses a single role into an object
+ * @param {string} roleString
+ * @return {MafiaParsedRole}
+ */
+ static parseRole(roleString) {
+ /** @type {MafiaRole} */
+ let role = {
+ name: roleString.split(' ').map(p => toId(p) === 'solo' ? '' : p).join(' '),
+ safeName: '', // MAKE SURE THESE ARE SET BELOW
+ id: '',
+ image: '',
+ memo: ['During the Day, you may vote for whomever you want lynched.'],
+ alignment: '',
+ };
+ roleString = roleString.replace(/\s*\(.*?\)\s*/g, ' ');
+ let target = roleString.toLowerCase().replace(/[^\w\d\s]/g, '').split(' ');
+ let problems = [];
+ role.safeName = Chat.escapeHTML(role.name);
+ role.id = toId(role.name);
+ for (let key in MafiaData.roles) {
+ if (key.includes('_')) {
+ let roleKey = target.slice().map(toId).join('_');
+ if (roleKey.includes(key)) {
+ let originalKey = key;
+ if (typeof MafiaData.roles[key] === 'string') key = MafiaData.roles[key];
+ if (!role.image && MafiaData.roles[key].image) role.image = MafiaData.roles[key].image;
+ if (MafiaData.roles[key].alignment) {
+ if (role.alignment && role.alignment !== MafiaData.roles[key].alignment) {
+ // A role cant have multiple alignments
+ problems.push(`The role "${role.name}" has multiple possible alignments (${MafiaData.roles[key].alignment} or ${role.alignment})`);
+ break;
+ }
+ role.alignment = MafiaData.roles[key].alignment;
+ }
+ if (MafiaData.roles[key].memo) role.memo = role.memo.concat(MafiaData.roles[key].memo);
+ let index = roleKey.split('_').indexOf(originalKey.split('_')[0]);
+ target.splice(index, originalKey.split('_').length);
+ }
+ } else if (target.includes(key)) {
+ let index = target.indexOf(key);
+ if (typeof MafiaData.roles[key] === 'string') key = MafiaData.roles[key];
+ if (!role.image && MafiaData.roles[key].image) role.image = MafiaData.roles[key].image;
+ if (MafiaData.roles[key].memo) role.memo = role.memo.concat(MafiaData.roles[key].memo);
+ target.splice(index, 1);
+ }
+ }
+ // Add modifiers
+ for (let key in MafiaData.modifiers) {
+ if (key.includes('_')) {
+ let roleKey = target.slice().map(toId).join('_');
+ if (roleKey.includes(key)) {
+ if (typeof MafiaData.modifiers[key] === 'string') key = MafiaData.modifiers[key];
+ if (!role.image && MafiaData.modifiers[key].image) role.image = MafiaData.modifiers[key].image;
+ if (MafiaData.modifiers[key].memo) role.memo = role.memo.concat(MafiaData.modifiers[key].memo);
+ let index = roleKey.split('_').indexOf(key.split('_')[0]);
+ target.splice(index, key.split('_').length);
+ }
+ } else if (key === 'xshot') {
+ // Special case for X-Shot modifier
+ for (let [i, xModifier] of target.entries()) {
+ if (toId(xModifier).endsWith('shot')) {
+ let num = parseInt(toId(xModifier).substring(0, toId(xModifier).length - 4));
+ if (isNaN(num)) continue;
+ let memo = MafiaData.modifiers.xshot.memo.slice();
+ memo = memo.map((/** @type {string} */m) => m.replace(/X/g, num.toString()));
+ role.memo = role.memo.concat(memo);
+ target.splice(i, 1);
+ i--;
+ }
+ }
+ } else if (target.includes(key)) {
+ let index = target.indexOf(key);
+ if (typeof MafiaData.modifiers[key] === 'string') key = MafiaData.modifiers[key];
+ if (!role.image && MafiaData.modifiers[key].image) role.image = MafiaData.modifiers[key].image;
+ if (MafiaData.modifiers[key].memo) role.memo = role.memo.concat(MafiaData.modifiers[key].memo);
+ target.splice(index, 1);
+ }
+ }
+ // Determine the role's alignment
+ for (let [j, targetId] of target.entries()) {
+ let id = toId(targetId);
+ if (MafiaData.alignments[id]) {
+ if (typeof MafiaData.alignments[id] === 'string') id = MafiaData.alignments[id];
+ if (role.alignment && role.alignment !== MafiaData.alignments[id].id) {
+ // A role cant have multiple alignments
+ problems.push(`The role "${role.name}" has multiple possible alignments (${MafiaData.alignments[id].id} or ${role.alignment})`);
+ break;
+ }
+ role.alignment = MafiaData.alignments[id].id;
+ role.memo = role.memo.concat(MafiaData.alignments[id].memo);
+ if (!role.image && MafiaData.alignments[id].image) role.image = MafiaData.alignments[id].image;
+ target.splice(j, 1);
+ j--;
+ }
+ }
+ if (!role.alignment) {
+ // Default to town
+ role.alignment = 'town';
+ role.memo = role.memo.concat(MafiaData.alignments.town.memo);
+ }
+ // Handle anything that is unknown
+ if (target.length) {
+ role.memo.push(`To learn more about your role, PM the host.`);
+ }
+ return {role, problems};
}
/**
@@ -505,9 +511,8 @@ class MafiaTracker extends Rooms.RoomGame {
if (Object.keys(this.roles).length < this.playerCount) return user.sendTo(this.room, `You have not provided enough roles for the players.`);
}
this.started = true;
- this.played = Object.keys(this.players);
this.sendRoom(`The game of ${this.title} is starting!`, {declare: true});
- this.played.push(this.hostid);
+ // MafiaTracker#played gets set in distributeRoles
this.distributeRoles();
this.day(null, true);
if (this.IDEA.data) this.room.add(`|html|