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

also show "total" when there's modifiers

Browse source
This commit is contained in:
jesopo 2019-09-26 14:22:56 +01:00
parent e2ececa9fd
commit 0c211528ef
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/dice.py
View file

@ -4,7 +4,7 @@ import random, re
from src import ModuleManager, utils
ERROR_FORMAT = "Incorrect format! Format must be [number]d[number], e.g. 1d20"
RE_DICE = re.compile("([1-9]\d*)d([1-9]\d*)((?:[-+]\d+)*)", re.I)
RE_DICE = re.compile("([1-9]\d*)d([1-9]\d*)((?:[-+][1-9]\d*)*)", re.I)
RE_MODIFIERS = re.compile("([-+]\d+)")
MAX_DICE = 6
@ -39,7 +39,7 @@ class Module(ModuleManager.BaseModule):
total_n -= int(modifier[1:])
total = ""
if len(results) > 1:
if len(results) > 1 or modifiers:
total = " (total: %d)" % total_n
results_str = ", ".join(str(r) for r in results)