Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

tolerate spaces in dice modifiers

Browse source
This commit is contained in:
jesopo 2020-01-14 10:48:09 +00:00
parent 21694c39a5
commit 883d61041c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/dice.py
View file

@ -4,7 +4,8 @@ import random, re
from src import ModuleManager, utils from src import ModuleManager, utils
ERROR_FORMAT = "Incorrect format! Format must be [number]d[number], e.g. 1d20" ERROR_FORMAT = "Incorrect format! Format must be [number]d[number], e.g. 1d20"
RE_DICE = re.compile("^([1-9]\d*)?d([1-9]\d*)((?:[-+][1-9]\d{,2})*)$", re.I) RE_DICE = re.compile("^([1-9]\d*)?d([1-9]\d*)((?:\s*[-+][1-9]\d{,2})*)\s*$",
re.I)
RE_MODIFIERS = re.compile("([-+]\d+)") RE_MODIFIERS = re.compile("([-+]\d+)")
MAX_DICE = 6 MAX_DICE = 6
@ -18,7 +19,7 @@ class Module(ModuleManager.BaseModule):
def roll_dice(self, event): def roll_dice(self, event):
args = None args = None
if event["args_split"]: if event["args_split"]:
args = event["args_split"][0] args = event["args"]
else: else:
args = "1d6" args = "1d6"
@ -27,7 +28,8 @@ class Module(ModuleManager.BaseModule):
roll = match.group(0) roll = match.group(0)
dice_count = int(match.group(1) or "1") dice_count = int(match.group(1) or "1")
side_count = int(match.group(2)) side_count = int(match.group(2))
modifiers = RE_MODIFIERS.findall(match.group(3)) modifiers_str = "".join(match.group(3).split())
modifiers = RE_MODIFIERS.findall(modifiers_str)
if dice_count > 6: if dice_count > 6:
raise utils.EventError("Max number of dice is %s" % MAX_DICE) raise utils.EventError("Max number of dice is %s" % MAX_DICE)