Compare commits

..

No commits in common. "a45d00c1054b8ff8686383e786917855f8b3e917" and "09e78a8bbbeb072f5d7b42eae6ecfc054dfce5a1" have entirely different histories.

3 changed files with 6 additions and 14 deletions

4
package-lock.json generated
View File

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

View File

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

View File

@ -1,7 +1,6 @@
'use strict';
const config = require('config');
const { intervalToDuration } = require('date-fns');
const style = require('../utils/style');
const pickRandom = require('../utils/pick-random');
@ -57,18 +56,11 @@ function onCommand(args, context) {
}
const hit = Math.random() > config.duck.missRatio;
const time = new Date().getTime() - duck.getTime();
const distance = time < 600 * 1000 // show exact time up to ten minutes
? `${(time / 1000).toFixed(3)} seconds`
: Object.entries(intervalToDuration({ start: duck, end: new Date() }))
.filter(([, value]) => value > 0)
.map(([key, value]) => `${value} ${key}`)
.join(', ');
const time = ((new Date().getTime() - duck.getTime()) / 1000).toFixed(3);
if (['bang', 'shoot'].includes(context.command)) {
if (hit) {
context.sendMessage(`${context.user.prefixedUsername}: You shot a duck in ${style.bold(style.red(distance))}`, context.room.id);
context.sendMessage(`You shot a duck in ${style.bold(`${time} seconds`)}, ${context.user.prefixedUsername}`, context.room.id);
launchDuck(context);
context.setPoints(context.user, 1, { key: 'bang' });
@ -91,7 +83,7 @@ function onCommand(args, context) {
if (['bef', 'befriend'].includes(context.command)) {
if (hit) {
context.sendMessage(`${context.user.prefixedUsername}: You befriended a duck in ${style.bold(style.sky(distance))}`, context.room.id);
context.sendMessage(`You befriended a duck in ${style.bold(style.green(`${time} seconds`))}, ${context.user.prefixedUsername}`, context.room.id);
launchDuck(context);
context.setPoints(context.user, 1, { key: 'befriend' });