diff --git a/plugins/data/kills.txt b/plugins/data/kills.txt index 9e20cb2..115b667 100755 --- a/plugins/data/kills.txt +++ b/plugins/data/kills.txt @@ -1,22 +1,22 @@ -rips off 's and leaves them to die. -grabs 's head and rips it clean off their body. -grabs a machine gun and riddles 's body with bullets. -gags and ties then throws them off a bridge. -crushes with a huge spiked boulder. -glares at until they die of boredom. -shivs in the a few times. -rams a rocket launcher up 's ass and lets off a few rounds. -crushes 's skull in with a spiked mace. -unleashes the armies of Isengard on . -gags and ties then throws them off a building to their death. -reaches out and punches right through 's chest. -slices 's off with a sharpened Katana. -throws to Cthulu and watches them get ripped to shreds. -feeds to an owlbear who then proceeds to maul them violently. -turns into a snail and salts them. -snacks on 's dismembered . -stuffs some TNT up 's ass and waits for it to go off. -puts into a sack, throws the sack in the river, and hurls the river into space. -goes bowling with 's bloody disembodied head. -sends to /dev/null! -feeds coke and mentos till they violently explode. +rips off {user}'s legs and leaves them to die. +grabs {user}'s head and rips it clean off their body. +grabs a machine gun and riddles {user}'s body with bullets. +gags and ties {user} then throws them off a bridge. +crushes {user} with a huge spiked boulder. +glares at {user} until they die of boredom. +shivs {user} in the heart a few times. +rams a rocket launcher up {user}'s ass and lets off a few rounds. +crushes {user}'s skull in with a spiked mace. +unleashes the armies of Isengard on {user}. +gags and ties {user} then throws them off a building to their death. +reaches out and punches right through {user}'s chest. +slices {user}'s limbs off with a sharpened Katana. +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 salts them. +snacks on {user}'s dismembered body. +stuffs some TNT 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. diff --git a/plugins/violence.py b/plugins/violence.py index 30c3758..76395ff 100755 --- a/plugins/violence.py +++ b/plugins/violence.py @@ -70,18 +70,18 @@ def lart(inp, me=None, nick=None, conn=None, notice=None): @hook.command def kill(inp, me=None, nick=None, conn=None, notice=None): "kill -- Makes the bot kill ." - target = inp.lower() + target = inp.strip() - if not re.match(nick_re, target): + if " " in target: notice("Invalid username!") return - if target == conn.nick.lower() or target == "itself": + # if the user is trying to make the bot slap itself, slap them + if target.lower() == conn.nick.lower() or target.lower() == "itself": target = nick - else: - target = inp - out = random.choice(kills) - out = out.replace('', target) - out = out.replace('', random.choice(parts)) - me(out) + values = {"user": target} + phrase = random.choice(kills) + + # act out the message + me(phrase.format(**values))