Finished updating violence.py

plugins/data/kill_bodyparts.txt

@@ -1,9 +0,0 @@
-head
-arms
-legs
-arm
-leg
-toes
-fingers
-"special parts"
-"man bits"

plugins/data/larts.txt

@@ -1,105 +1,105 @@
-swaps <who>'s shampoo with glue.
+smacks {user} in the face with a burlap sack full of broken glass.
-installs Windows on <who>'s computer.
+swaps {user}'s shampoo with glue.
-forces <who> to use perl for 3 weeks.
+installs Windows on {user}'s computer.
-registers <who>'s name with 50 known spammers.
+forces {user} to use perl for 3 weeks.
-resizes <who>'s console to 40x24.
+registers {user}'s name with 50 known spammers.
-takes <who>'s drink.
+resizes {user}'s console to 40x24.
-dispenses <who>'s email address to a few hundred 'bulk mailing services'.
+takes {user}'s drink.
-pokes <who> in the eye.
+dispenses {user}'s email address to a few hundred 'bulk mailing services'.
-beats <who> senseless with a 50lb Linux manual.
+pokes {user} in the eye.
-cats /dev/random into <who>'s ear.
+beats {user} senseless with a 50lb Linux manual.
-signs <who> up for AOL.
+cats /dev/random into {user}'s ear.
-downvotes <who> on Reddit.
+signs {user} up for AOL.
-enrolls <who> in Visual Basic 101.
+downvotes {user} on Reddit.
-sporks <who>.
+enrolls {user} in Visual Basic 101.
-drops a truckload of support tickets on <who>.
+sporks {user}.
-judo chops <who>.
+drops a truckload of support tickets on {user}.
-sets <who>'s resolution to 800x600.
+judo chops {user}.
-formats <who>'s harddrive to fat12.
+sets {user}'s resolution to 800x600.
-rm -rf's <who>.
+formats {user}'s harddrive to fat12.
-stabs <who>.
+rm -rf's {user}.
-makes <who> learn C++.
+stabs {user}.
-steals <who>'s mojo.
+makes {user} learn C++.
-strangles <who> with a doohicky mouse cord.
+steals {user}'s mojo.
-whacks <who> with the cluebat.
+strangles {user} with a doohicky mouse cord.
-sells <who> on EBay.
+whacks {user} with the cluebat.
-drops creepers on <who>'s house.
+sells {user} on EBay.
-throws all of <who>'s diamond gear into lava.
+drops creepers on {user}'s house.
-uses <who> as a biological warfare study.
+throws all of {user}'s diamond gear into lava.
-uses the 'Customer Appreciation Bat' on <who>.
+uses {user} as a biological warfare study.
-puts <who> in the Total Perspective Vortex.
+uses the 'Customer Appreciation Bat' on {user}.
-casts <who> into the fires of Mt. Doom.
+puts {user} in the Total Perspective Vortex.
-gives <who> a melvin.
+casts {user} into the fires of Mt. Doom.
-turns <who> over to the Fun Police.
+gives {user} a melvin.
-turns over <who> to Agent Smith to be 'bugged'.
+turns {user} over to the Fun Police.
-takes away <who>'s internet connection.
+turns over {user} to Agent Smith to be 'bugged'.
-pushes <who> past the Shoe Event Horizon.
+takes away {user}'s internet connection.
-counts '1, 2, 5... er... 3!' and hurls the Holy Handgrenade Of Antioch at <who>.
+pushes {user} past the Shoe Event Horizon.
-puts <who> in a nest of camel spiders.
+counts '1, 2, 5... er... 3!' and hurls the Holy Handgrenade Of Antioch at {user}.
-makes <who> read slashdot at -1.
+puts {user} in a nest of camel spiders.
-puts 'alias vim=emacs' in <who>'s /etc/profile.
+makes {user} read slashdot at -1.
-uninstalls every web browser from <who>'s system.
+puts 'alias vim=emacs' in {user}'s /etc/profile.
-locks <who> in the Chateau d'If.
+uninstalls every web browser from {user}'s system.
-signs <who> up for getting hit on the head lessons.
+locks {user} in the Chateau d'If.
-makes <who> try to set up a Lexmark printer.
+signs {user} up for getting hit on the head lessons.
-fills <who>'s eyedrop bottle with lime juice.
+makes {user} try to set up a Lexmark printer.
-casts <who> into the fires of Mt. Doom.
+fills {user}'s eyedrop bottle with lime juice.
-gives <who> a Flying Dutchman.
+casts {user} into the fires of Mt. Doom.
-rips off <who>'s arm, and uses it to beat them to death.
+gives {user} a Flying Dutchman.
-pierces <who>'s nose with a rusty paper hole puncher.
+rips off {user}'s arm, and uses it to beat them to death.
-pokes <who> with a rusty nail.
+pierces {user}'s nose with a rusty paper hole puncher.
-puts sugar between <who>'s bedsheets.
+pokes {user} with a rusty nail.
-pours sand into <who>'s breakfast.
+puts sugar between {user}'s bedsheets.
-mixes epoxy into <who>'s toothpaste.
+pours sand into {user}'s breakfast.
-puts Icy-Hot in <who>'s lube container.
+mixes epoxy into {user}'s toothpaste.
-straps <who> to a chair, and plays a endless low bitrate MP3 loop of \"the world's most annoying sound\" from \"Dumb and Dumber\".
+puts Icy-Hot in {user}'s lube container.
-tells Dr. Dre that <who> was talking smack.
+straps {user} to a chair, and plays a endless low bitrate MP3 loop of \"the world's most annoying sound\" from \"Dumb and Dumber\".
-forces <who> to use a Commodore 64 for all their word processing.
+tells Dr. Dre that {user} was talking smack.
-smacks <who> in the face with a burlap sack full of broken glass.
+forces {user} to use a Commodore 64 for all their word processing.
-puts <who> in a room with several heavily armed manic depressives.
+puts {user} in a room with several heavily armed manic depressives.
-makes <who> watch reruns of \"Blue's Clues\".
+makes {user} watch reruns of \"Blue's Clues\".
-puts lye in <who>'s coffee.
+puts lye in {user}'s coffee.
-introduces <who> to the clue-by-four.
+introduces {user} to the clue-by-four.
-tattoos the Windows symbol on <who>'s ass.
+tattoos the Windows symbol on {user}'s ass.
-lets Borg have his way with <who>.
+lets Borg have his way with {user}.
-signs <who> up for line dancing classes at the local senior center.
+signs {user} up for line dancing classes at the local senior center.
-wakes <who> out of a sound sleep with some brand new nipple piercings.
+wakes {user} out of a sound sleep with some brand new nipple piercings.
-gives <who> a 2 gauge Prince Albert.
+gives {user} a 2 gauge Prince Albert.
-forces <who> to eat all their veggies.
+forces {user} to eat all their veggies.
-covers <who>'s toilet paper with lemon-pepper.
+covers {user}'s toilet paper with lemon-pepper.
-fills <who>'s ketchup bottle with Dave's Insanity sauce.
+fills {user}'s ketchup bottle with Dave's Insanity sauce.
-forces <who> to stare at an incredibly frustrating and seemingly never-ending IRC political debate.
+forces {user} to stare at an incredibly frustrating and seemingly never-ending IRC political debate.
-knocks two of <who>'s teeth out with a 2x4.
+knocks two of {user}'s teeth out with a 2x4.
-removes Debian from <who>'s system.
+removes Debian from {user}'s system.
-switches <who> over to CentOS.
+switches {user} over to CentOS.
-uses <who>'s iPod for skeet shooting practice.
+uses {user}'s iPod for skeet shooting practice.
-gives <who>'s phone number to Borg.
+gives {user}'s phone number to Borg.
-posts <who>'s IP, username(s), and password(s) on 4chan.
+posts {user}'s IP, username(s), and password(s) on 4chan.
-forces <who> to use words like 'irregardless' and 'administrate' (thereby sounding like a real dumbass).
+forces {user} to use words like 'irregardless' and 'administrate' (thereby sounding like a real dumbass).
-tickles <who> until they wet their pants and pass out.
+tickles {user} until they wet their pants and pass out.
-replaces <who>'s KY with elmer's clear wood glue.
+replaces {user}'s KY with elmer's clear wood glue.
-replaces <who>'s TUMS with alka-seltzer tablets.
+replaces {user}'s TUMS with alka-seltzer tablets.
-squeezes habanero pepper juice into <who>'s tub of vaseline.
+squeezes habanero pepper juice into {user}'s tub of vaseline.
-forces <who> to learn the Win32 API.
+forces {user} to learn the Win32 API.
-gives <who> an atomic wedgie.
+gives {user} an atomic wedgie.
-ties <who> to a chair and forces them to listen to 'N Sync at full blast.
+ties {user} to a chair and forces them to listen to 'N Sync at full blast.
-forces <who> to use notepad for text editing.
+forces {user} to use notepad for text editing.
-frowns at <who> really, really hard.
+frowns at {user} really, really hard.
-jabs a hot lighter into <who>'s eye sockets.
+jabs a hot lighter into {user}'s eye sockets.
-forces <who> to browse the web with IE6.
+forces {user} to browse the web with IE6.
-takes <who> out at the knees with a broken pool cue.
+takes {user} out at the knees with a broken pool cue.
-forces <who> to listen to emo music.
+forces {user} to listen to emo music.
-lets a few creepers into <who>'s house.
+lets a few creepers into {user}'s house.
-signs <who> up for the Iowa State Ferret Legging Championship.
+signs {user} up for the Iowa State Ferret Legging Championship.
-attempts to hotswap <who>'s RAM.
+attempts to hotswap {user}'s RAM.
-dragon punches <who>.
+dragon punches {user}.
-puts railroad spikes into <who>'s side.
+puts railroad spikes into {user}'s side.
-replaces <who>'s Astroglide with JB Weld.
+replaces {user}'s Astroglide with JB Weld.
-replaces <who>'s stress pills with rat poison pellets.
+replaces {user}'s stress pills with rat poison pellets.
-replaces <who>'s crotch itch cream with Nair.
+replaces {user}'s crotch itch cream with Nair.
-does the Australian Death Grip on <who>.
+does the Australian Death Grip on {user}.
-dances upon the grave of <who>'s ancestors.
+dances upon the grave of {user}'s ancestors.
-farts in <who>'s general direction.
+farts in {user}'s general direction.
-flogs <who> with stinging nettle.
+flogs {user} with stinging nettle.
-intoduces <who> to the Knights who say Ni.
+intoduces {user} to the Knights who say Ni.
-hands <who> a poison ivy joint.
+hands {user} a poison ivy joint.

plugins/violence.py

@@ -1,10 +1,6 @@
 from util import hook
-import re
 import random
 
-nick_re = re.compile(r"^[A-Za-z0-9_|\.\-\]\[]*$")
-
-
 with open("plugins/data/larts.txt") as f:
     larts = [line.strip() for line in f.readlines()
              if not line.startswith("//")]
@@ -21,15 +17,10 @@ with open("plugins/data/kills.txt") as f:
     kills = [line.strip() for line in f.readlines()
              if not line.startswith("//")]
 
-with open("plugins/data/kill_bodyparts.txt") as f:
-    parts = [line.strip() for line in f.readlines()
-             if not line.startswith("//")]
-
 
 @hook.command
 def slap(inp, me=None, nick=None, conn=None, notice=None):
     "slap <user> -- Makes the bot slap <user>."
-
     target = inp.strip()
 
     if " " in target:
@@ -50,21 +41,21 @@ def slap(inp, me=None, nick=None, conn=None, notice=None):
 @hook.command
 def lart(inp, me=None, nick=None, conn=None, notice=None):
     "lart <user> -- LARTs <user>."
-    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(larts)
+    values = {"user": target}
-    out = out.replace('<who>', target)
+    phrase = random.choice(larts)
-    out = out.replace('<item>', random.choice(items))
+
-    me(out)
+    # act out the message
+    me(phrase.format(**values))
 
 
 @hook.command