diff --git a/plugins/data/kills.json b/plugins/data/kills.json index b657209..5f6d046 100644 --- a/plugins/data/kills.json +++ b/plugins/data/kills.json @@ -1,79 +1,79 @@ { - "templates":[ - "rips off {user}'s {limbs} and leaves them to die.", - "grabs {user}'s head and rips it clean off their body.", - "grabs a {gun} and riddles {user}'s body with bullets.", - "gags and ties {user} then throws them off a {tall_thing}.", - "crushes {user} with a huge spiked {spiked_thing}.", - "glares at {user} until they die of boredom.", - "stabs {user} in the heart a few times with a {weapon_stab}.", - "rams a {weapon_explosive} up {user}'s ass and lets off a few rounds.", - "crushes {user}'s skull in with a {weapon_crush}.", - "unleashes the armies of Isengard on {user}.", - "gags and ties {user} then throws them off a {tall_thing} to their death.", - "reaches out and punches right through {user}'s chest.", - "slices {user}'s limbs off with a {weapon_slice}.", - "throws {user} to Cthulu and watches them get ripped to shreds.", - "feeds {user} to an owlbear who then proceeds to maul them violently.", - "turns {user} into a snail and covers then in salt.", - "snacks on {user}'s dismembered body.", - "stuffs {bomb} up {user}'s ass and waits for it to go off.", - "puts {user} into a sack, throws the sack in the river, and hurls the river into space.", - "goes bowling with {user}'s bloody disembodied head.", - "sends {user} to /dev/null!", - "feeds {user} coke and mentos till they violently explode." - ], - "parts": { - "gun":[ - "AK47", - "machine gun", - "automatic pistol", - "Uzi" - ], - "limbs": [ - "legs", - "arms", - "limbs" - ], - "weapon_stab": [ - "knife", - "shard of glass", - "sword blade", - "butchers knife", - "corkscrew" - ], - "weapon_slice": [ - "sharpened katana", - "chainsaw", - "polished axe" - ], - "weapon_crush": [ - "spiked mace", - "baseball bat", - "wooden club", - "massive steel ball", - "heavy iron rod" - ], - "weapon_explosive": [ - "rocket launcher", - "grenade launcher", - "napalm launcher" - ], - "tall_thing": [ - "bridge", - "tall building", - "cliff", - "mountain" - ], - "spiked_thing": [ - "boulder", - "rock", - "barrel of rocks" - ], - "bomb": [ - "a bomb", - "some TNT", - "a bunch of C4" - ] - } + "templates": [ + "rips off {user}'s {limbs} and leaves them to die.", + "grabs {user}'s head and rips it clean off their body.", + "grabs a {gun} and riddles {user}'s body with bullets.", + "gags and ties {user} then throws them off a {tall_thing}.", + "crushes {user} with a huge spiked {spiked_thing}.", + "glares at {user} until they die of boredom.", + "stabs {user} in the heart a few times with a {weapon_stab}.", + "rams a {weapon_explosive} up {user}'s ass and lets off a few rounds.", + "crushes {user}'s skull in with a {weapon_crush}.", + "unleashes the armies of Isengard on {user}.", + "gags and ties {user} then throws them off a {tall_thing} to their death.", + "reaches out and punches right through {user}'s chest.", + "slices {user}'s limbs off with a {weapon_slice}.", + "throws {user} to Cthulu and watches them get ripped to shreds.", + "feeds {user} to an owlbear who then proceeds to maul them violently.", + "turns {user} into a snail and covers then in salt.", + "snacks on {user}'s dismembered body.", + "stuffs {bomb} up {user}'s ass and waits for it to go off.", + "puts {user} into a sack, throws the sack in the river, and hurls the river into space.", + "goes bowling with {user}'s bloody disembodied head.", + "sends {user} to /dev/null!", + "feeds {user} coke and mentos till they violently explode." + ], + "parts": { + "gun": [ + "AK47", + "machine gun", + "automatic pistol", + "Uzi" + ], + "limbs": [ + "legs", + "arms", + "limbs" + ], + "weapon_stab": [ + "knife", + "shard of glass", + "sword blade", + "butchers knife", + "corkscrew" + ], + "weapon_slice": [ + "sharpened katana", + "chainsaw", + "polished axe" + ], + "weapon_crush": [ + "spiked mace", + "baseball bat", + "wooden club", + "massive steel ball", + "heavy iron rod" + ], + "weapon_explosive": [ + "rocket launcher", + "grenade launcher", + "napalm launcher" + ], + "tall_thing": [ + "bridge", + "tall building", + "cliff", + "mountain" + ], + "spiked_thing": [ + "boulder", + "rock", + "barrel of rocks" + ], + "bomb": [ + "a bomb", + "some TNT", + "a bunch of C4" + ] + } } diff --git a/plugins/reddit.py b/plugins/reddit.py index add83d1..80fcb76 100644 --- a/plugins/reddit.py +++ b/plugins/reddit.py @@ -1,9 +1,11 @@ -from util import hook, http, text, timesince from datetime import datetime import re import random -reddit_re = (r'.*((www\.)?reddit\.com/r[^ ]+)', re.I) +from util import hook, http, text, timesince + + +reddit_re = (r'.*(((www\.)?reddit\.com/r|redd\.it)[^ ]+)', re.I) base_url = "http://reddit.com/r/{}/.json" short_url = "http://redd.it/{}" diff --git a/plugins/rottentomatoes.py b/plugins/rottentomatoes.py index 34e50d8..fae99dd 100644 --- a/plugins/rottentomatoes.py +++ b/plugins/rottentomatoes.py @@ -36,4 +36,4 @@ def rottentomatoes(inp, bot=None): rotten = review_count - fresh return u"{} - Critics Rating: \x02{}%\x02 ({} liked, {} disliked) " \ - "Audience Rating: \x02{}%\x02 - {}".format(title, critics_score, fresh, rotten, audience_score, url) + "Audience Rating: \x02{}%\x02 - {}".format(title, critics_score, fresh, rotten, audience_score, url)