semicolon support. multiple rolls on one line, separated by ;
This commit is contained in:
parent
ec2be10aca
commit
9f6ae529fe
107
dr.botzo.py
107
dr.botzo.py
|
@ -189,67 +189,70 @@ def sub_countdown(connection, event, nick, userhost, replypath, what, admin_unlo
|
||||||
#####
|
#####
|
||||||
|
|
||||||
def sub_dice(connection, event, nick, userhost, replypath, what, admin_unlocked):
|
def sub_dice(connection, event, nick, userhost, replypath, what, admin_unlocked):
|
||||||
pattern = '^(?:(\d+)#)?(?:(\d+)/)?(\d+)?d(\d+)(?:(\+|\-)(\d+))?(?:\s+(.*))?'
|
overallroll = what
|
||||||
regex = re.compile(pattern)
|
|
||||||
roll = what
|
|
||||||
matches = regex.search(roll)
|
|
||||||
|
|
||||||
if matches is not None:
|
rolls = re.split(';\s*', overallroll)
|
||||||
# set variables including defaults for unspecified stuff
|
for roll in rolls:
|
||||||
faces = int(matches.group(4))
|
pattern = '^(?:(\d+)#)?(?:(\d+)/)?(\d+)?d(\d+)(?:(\+|\-)(\d+))?(?:\s+(.*))?'
|
||||||
comment = matches.group(7)
|
regex = re.compile(pattern)
|
||||||
|
matches = regex.search(roll)
|
||||||
|
|
||||||
if matches.group(1) is None:
|
if matches is not None:
|
||||||
times = 1
|
# set variables including defaults for unspecified stuff
|
||||||
else:
|
faces = int(matches.group(4))
|
||||||
times = int(matches.group(1))
|
comment = matches.group(7)
|
||||||
|
|
||||||
if matches.group(3) is None:
|
if matches.group(1) is None:
|
||||||
dice = 1
|
times = 1
|
||||||
else:
|
|
||||||
dice = int(matches.group(3))
|
|
||||||
|
|
||||||
if matches.group(2) is None:
|
|
||||||
top = dice
|
|
||||||
else:
|
|
||||||
top = int(matches.group(2))
|
|
||||||
|
|
||||||
if matches.group(5) is None or matches.group(6) is None:
|
|
||||||
modifier = 0
|
|
||||||
else:
|
|
||||||
if str(matches.group(5)) == '-':
|
|
||||||
modifier = -1 * int(matches.group(6))
|
|
||||||
else:
|
else:
|
||||||
modifier = int(matches.group(6))
|
times = int(matches.group(1))
|
||||||
|
|
||||||
result = ''
|
if matches.group(3) is None:
|
||||||
if comment is not None:
|
dice = 1
|
||||||
result += comment + ': '
|
else:
|
||||||
|
dice = int(matches.group(3))
|
||||||
|
|
||||||
for t in range(times):
|
if matches.group(2) is None:
|
||||||
ressubstr = ""
|
top = dice
|
||||||
rolls = []
|
else:
|
||||||
for d in range(dice):
|
top = int(matches.group(2))
|
||||||
rolls.append(str(random.randint(1, faces)))
|
|
||||||
rolls.sort()
|
if matches.group(5) is None or matches.group(6) is None:
|
||||||
rolls.reverse()
|
modifier = 0
|
||||||
ressubstr = ','.join(rolls[0:top])
|
else:
|
||||||
sum = 0
|
if str(matches.group(5)) == '-':
|
||||||
for r in rolls[0:top]:
|
modifier = -1 * int(matches.group(6))
|
||||||
sum += int(r)
|
|
||||||
sumplus = sum + modifier
|
|
||||||
result += str(sumplus) + ' [' + ressubstr
|
|
||||||
if modifier != 0:
|
|
||||||
if modifier > 0:
|
|
||||||
result += ' + ' + str(modifier)
|
|
||||||
else:
|
else:
|
||||||
result += ' - ' + str(-1 * modifier)
|
modifier = int(matches.group(6))
|
||||||
result += ']'
|
|
||||||
|
|
||||||
if t != times-1:
|
result = ''
|
||||||
result += ', '
|
if comment is not None:
|
||||||
|
result += comment + ': '
|
||||||
|
|
||||||
connection.privmsg(replypath, result)
|
for t in range(times):
|
||||||
|
ressubstr = ""
|
||||||
|
rolls = []
|
||||||
|
for d in range(dice):
|
||||||
|
rolls.append(str(random.randint(1, faces)))
|
||||||
|
rolls.sort()
|
||||||
|
rolls.reverse()
|
||||||
|
ressubstr = ','.join(rolls[0:top])
|
||||||
|
sum = 0
|
||||||
|
for r in rolls[0:top]:
|
||||||
|
sum += int(r)
|
||||||
|
sumplus = sum + modifier
|
||||||
|
result += str(sumplus) + ' [' + ressubstr
|
||||||
|
if modifier != 0:
|
||||||
|
if modifier > 0:
|
||||||
|
result += ' + ' + str(modifier)
|
||||||
|
else:
|
||||||
|
result += ' - ' + str(-1 * modifier)
|
||||||
|
result += ']'
|
||||||
|
|
||||||
|
if t != times-1:
|
||||||
|
result += ', '
|
||||||
|
|
||||||
|
connection.privmsg(replypath, result)
|
||||||
|
|
||||||
#####
|
#####
|
||||||
# on_connect
|
# on_connect
|
||||||
|
|
Loading…
Reference in New Issue