Browse Source

Merge branch 'development' into alpha

# Conflicts:
#	roxbot/__init__.py
tags/v2.0.0
Roxie Gibson 6 years ago
parent
commit
db97b27cbb
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      roxbot/cogs/fun.py

+ 1
- 1
roxbot/cogs/fun.py View File



m = re.findall('(-?)((?:(\d*)d(\d+))|\d+)(r\d+)?([h,l]{1}\d+)?', parts[0]) m = re.findall('(-?)((?:(\d*)d(\d+))|\d+)(r\d+)?([h,l]{1}\d+)?', parts[0])


if m: # either no arguments, or the expression contained nothing that could be seen as a number or roll
if not m: # either no arguments, or the expression contained nothing that could be seen as a number or roll
return await ctx.send("Expression missing. If you are unsure of what the format should be, please use `{}help roll`".format(ctx.prefix)) return await ctx.send("Expression missing. If you are unsure of what the format should be, please use `{}help roll`".format(ctx.prefix))


dice = [] # this is the list of all dice sets to be rolled dice = [] # this is the list of all dice sets to be rolled

Loading…
Cancel
Save