From 0a3864087950ec5e4228ba6cbb31f4c86927e502 Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Fri, 19 Sep 2025 12:31:05 -0600 Subject: [PATCH] roll: forgot to fix parsing --- src/modules/misc/roll.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/modules/misc/roll.js b/src/modules/misc/roll.js index f2b3b8c..21b1edd 100644 --- a/src/modules/misc/roll.js +++ b/src/modules/misc/roll.js @@ -6,33 +6,33 @@ const roll = new Command("roll"); roll.category = "misc"; roll.helpText = "Roll a dice"; roll.usage = ""; -roll.callback = function (msg, line, args, {advantage, disadvantage}) { - if (line == null || line == "") line = 6; - line = Number(line); - if (Number.isNaN(line)) line = 6; - if (line < 0) line = Math.abs(line); +roll.callback = function (msg, line, [sides], {advantage, disadvantage}) { + if (sides == null || sides == "") sides = 6; + sides = Number(sides); + if (Number.isNaN(sides)) sides = 6; + if (sides < 0) sides = Math.abs(sides); - if (line == 0) return ":hole:"; - if (line == 1) return ":one:"; + if (sides == 0) return ":hole:"; + if (sides == 1) return ":one:"; - const res = Math.floor(Math.random() * line); + const res = Math.floor(Math.random() * sides); - if (line == 2) { + if (sides == 2) { return `:coin:: ${res == 1 ? "Heads" : "Tails"}`; } if (advantage) { - const res2 = Math.floor(Math.random() * line); + const res2 = Math.floor(Math.random() * sides); const adv = Math.max(res + 1, res2 + 1); - return `:game_die: (d${line} with advantage): ${adv}`; + return `:game_die: (d${sides} with advantage): ${adv}`; } else if (disadvantage) { - const res2 = Math.floor(Math.random() * line); + const res2 = Math.floor(Math.random() * sides); const adv = Math.min(res + 1, res2 + 1); - return `:game_die: (d${line} with disadvantage): ${adv}`; + return `:game_die: (d${sides} with disadvantage): ${adv}`; } else { - return `:game_die: (d${line}): ${1 + res}`; + return `:game_die: (d${sides}): ${1 + res}`; } }; hf.registerCommand(roll);