ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	disabled_stuff/mygengo_translate.py
	plugins/attacks.py
	plugins/core_sieve.py
	plugins/fortune.py
	plugins/geoip.py
	plugins/mark.py
This commit is contained in:
Luke Rogers 2014-02-14 16:41:51 +13:00
commit bf9468a4aa
82 changed files with 530 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plugins/dice.py
View file

@ -15,7 +15,7 @@ sign_re = re.compile(r'[+-]?(?:\d*d)?(?:\d+|F)', re.I)
split_re = re.compile(r'([\d+-]*)d?(F|\d*)', re.I)
def nrolls(count, n):
def n_rolls(count, n):
"""roll an n-sided die count times"""
if n == "F":
return [random.randint(-1, 1) for x in xrange(min(count, 100))]
@ -37,7 +37,7 @@ def nrolls(count, n):
#@hook.regex(valid_diceroll, re.I)
@hook.command
def dice(inp):
"""dice <diceroll> -- Simulates dicerolls. Example of <diceroll>:
"""dice <dice roll> -- Simulates dice rolls. Example of <dice roll>:
'dice 2d20-d5+4 roll 2'. D20s, subtract 1D5, add 4"""
try: # if inp is a re.match object...
@ -50,7 +50,7 @@ def dice(inp):
spec = whitespace_re.sub('', inp)
if not valid_diceroll_re.match(spec):
return "Invalid diceroll"
return "Invalid dice roll"
groups = sign_re.findall(spec)
total = 0
@ -60,7 +60,7 @@ def dice(inp):
count, side = split_re.match(roll).groups()
count = int(count) if count not in " +-" else 1
if side.upper() == "F": # fudge dice are basically 1d3-2
for fudge in nrolls(count, "F"):
for fudge in n_rolls(count, "F"):
if fudge == 1:
rolls.append("\x033+\x0F")
elif fudge == -1:
@ -74,14 +74,15 @@ def dice(inp):
side = int(side)
try:
if count > 0:
dice = nrolls(count, side)
rolls += map(str, dice)
total += sum(dice)
d = n_rolls(count, side)
rolls += map(str, d)
total += sum(d)
else:
dice = nrolls(-count, side)
rolls += [str(-x) for x in dice]
total -= sum(dice)
d = n_rolls(-count, side)
rolls += [str(-x) for x in d]
total -= sum(d)
except OverflowError:
# I have never seen this happen. If you make this happen, you win a cookie
return "Thanks for overflowing a float, jerk >:["
if desc: