pendulum
/
schat2-clive
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Compare commits

base: pendulum:fcd159770723508e2f63a2febbd2d6d9e33476ec
Branches Tags
pendulum:master
pendulum:socketio
...
compare: pendulum:650a8d2ec9d14816354b31237114a0dc0b7026eb
Branches Tags
pendulum:master
pendulum:socketio

2 Commits
fcd1597707 ... 650a8d2ec9

Author SHA1 Message Date
Niels Simenon 650a8d2ec9 1.26.5 2023-04-12 17:17:51 +02:00
Niels Simenon d263c42d38 Allow arithmetic functions in numbers. 2023-04-12 17:17:49 +02:00
3 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "schat2-clive",
"version": "1.26.4",
"version": "1.26.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "schat2-clive",
"version": "1.26.4",
"version": "1.26.5",
"license": "ISC",
"dependencies": {
"better-sqlite3": "^8.3.0",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "schat2-clive",
"version": "1.26.4",
"version": "1.26.5",
"description": "Game host for SChat 2-powered chat sites",
"main": "src/app.js",
"scripts": {

6
src/games/numbers.js
View File

@ -30,7 +30,7 @@ function divide(a, b) {
const result = math.divide(a, b);
if (result % 1) {
throw new RuleError(`The division ${style.bold(style.code(`${a} / ${b}`))} resulting in a fraction is not allowed`);
throw new RuleError(`The division ${style.bold(style.code(`${a} / ${b}`))} results in a fraction, which is not allowed`);
}
return result;
@ -239,7 +239,7 @@ function playSolution(solution, context) {
const parsed = limitedMath.parse(solution.replace(/`/g, '')); // backticks may be used to prevent the expression from being expanded by Markdown in SChat
const numbers = parsed.filter((node) => {
if (node.type === 'FunctionNode') {
if (node.type === 'FunctionNode' && !['add', 'subtract', 'multiply', 'divide'].includes(node.fn.name)) {
throw new RuleError(`The ${style.bold(node.name)} function is not allowed`);
}
@ -405,5 +405,5 @@ module.exports = {
onCommand,
onMessage,
commands: ['nums', 'numsgo', 'numgo', 'calculate', 'calc', 'solve'],
help: `Reach the target number using only the ${config.numbers.length} numbers on the board. You can use each number only once, but do not have to use all of them. You may use addition, subtraction, multiplication and divisions, but each intermediate calculation must result in a whole number. You can score ${Array.from(new Set(config.numbers.points)).slice(0, -1).join(', ')} or ${config.numbers.points.at(-1)} points for solutions up to ${config.numbers.points.length - 1} away, but only the first best solution gets the points. Quick-start with ${config.prefix}numsgo, or use ${config.prefix}numbers to fill the board by manually selecting a random *large* or *big* number (100, 75, 50, 25), a random *small* number (1-10), or multiple at once like LLSSSS.`, // eslint-disable-line max-len
help: `Reach the target number using only the ${config.numbers.length} numbers on the board. You can use each number only once, but do not have to use all of them. You may use addition, subtraction, multiplication and division, but each intermediate calculation must result in a whole number. You can score ${Array.from(new Set(config.numbers.points)).slice(0, -1).join(', ')} or ${config.numbers.points.at(-1)} points for solutions up to ${config.numbers.points.length - 1} away, but only the first best solution gets the points. Quick-start with ${config.prefix}numsgo, or use ${config.prefix}numbers to fill the board by manually selecting a random *large* or *big* number (100, 75, 50, 25), a random *small* number (1-10), or multiple at once like LLSSSS.`, // eslint-disable-line max-len
};