cadey
/
h
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow dice to be rolled without explicit command 

anything that looks like a dice roll will be rolled as such
This commit is contained in:
Patrick Hurst 2010-08-14 17:27:09 -04:00
parent 219fe44d61
commit 4cc12512ff
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/dice.py
View File

@ -9,8 +9,8 @@ from util import hook
whitespace_re = re.compile(r'\s+') whitespace_re = re.compile(r'\s+')
valid_diceroll_re = re.compile(r'^[+-]?(\d+|\d*d(\d+|F))([+-](\d+|\d*d(\d+|F)))*$', valid_diceroll = r'^([+-]?(\d+|\d*d(\d+|F))([+-](\d+|\d*d(\d+|F)))*)$'
re.I) valid_diceroll_re = re.compile(valid_diceroll, re.I)
sign_re = re.compile(r'[+-]?(?:\d*d)?(?:\d+|F)', re.I) sign_re = re.compile(r'[+-]?(?:\d*d)?(?:\d+|F)', re.I)
split_re = re.compile(r'([\d+-]*)d?(F|\d*)', re.I) split_re = re.compile(r'([\d+-]*)d?(F|\d*)', re.I)
@ -31,11 +31,15 @@ def nrolls(count, n):
@hook.command('roll') @hook.command('roll')
@hook.regex(valid_diceroll, re.I)
@hook.command @hook.command
def dice(inp): def dice(inp):
".dice <diceroll> -- simulates dicerolls, e.g. .dice 2d20-d5+4 roll 2 " \ ".dice <diceroll> -- simulates dicerolls, e.g. .dice 2d20-d5+4 roll 2 " \
"D20s, subtract 1D5, add 4" "D20s, subtract 1D5, add 4"
try:
inp = inp.groups()[0] # try to grab the roll
except AttributeError:
pass # we got called via hook.command, inp is already the roll
spec = whitespace_re.sub('', inp) spec = whitespace_re.sub('', inp)
if not valid_diceroll_re.match(spec): if not valid_diceroll_re.match(spec):
return "Invalid diceroll" return "Invalid diceroll"