diff --git a/plugins/data/slap_items.txt b/plugins/data/slap_items.txt new file mode 100755 index 0000000..2f53980 --- /dev/null +++ b/plugins/data/slap_items.txt @@ -0,0 +1,19 @@ +cast iron skillet +large trout +baseball bat +wooden cane +CRT monitor +diamond sword +physics textbook +television +mau5head +five ton truck +roll of duct tape +book +cobblestone block +lava bucket +rubber chicken +gold block +fire extinguisher +heavy rock +chunk of dirt diff --git a/plugins/data/slaps.txt b/plugins/data/slaps.txt new file mode 100755 index 0000000..ae23e7b --- /dev/null +++ b/plugins/data/slaps.txt @@ -0,0 +1,12 @@ +slaps with a . +slaps around a bit with a . +throws a at . +chucks a few s at . +grabs a and throws it in 's face. +launches a in 's general direction. +sits on 's face, while slamming a into their crotch. +holds down and repeatedly whacks them with a . +prods with a flaming . +picks up a , and whacks with it. +ties to a chair and throws a at them. +hits on the head with a . diff --git a/plugins/sieve.py b/plugins/sieve.py index 64411ee..05bf678 100755 --- a/plugins/sieve.py +++ b/plugins/sieve.py @@ -36,6 +36,7 @@ def sieve_suite(bot, input, func, kind, args): if args.get('adminonly', False): admins = bot.config.get('admins', []) + if input.mask not in admins and input.nick not in admins: return None diff --git a/plugins/violence.py b/plugins/violence.py index 286ca1c..613ee4f 100644 --- a/plugins/violence.py +++ b/plugins/violence.py @@ -3,38 +3,20 @@ import re import random -slaps = ["slaps with a .", - "slaps around a bit with a .", - "throws a at .", - "chucks a few s at .", - "grabs a and throws it in 's face.", - "launches a in 's general direction.", - "sits on 's face, while slamming a into their crotch.", - "holds down and repeatedly whacks them with a .", - "prods with a flaming .", - "picks up a , and whacks with it.", - "ties to a chair and throws a at them.", - "hits on the head with a ."] +slaps = [] +slap_items = [] -items = ["cast iron skillet", - "large trout", - "baseball bat", - "wooden cane", - "CRT monitor", - "diamond sword", - "physics textbook", - "television", - "mau5head", - "five ton truck", - "roll of duct tape", - "book", - "cobblestone block", - "lava bucket", - "rubber chicken", - "gold block", - "fire extinguisher", - "heavy rock", - "chunk of dirt"] +with open("plugins/data/slaps.txt") as f: + for line in f.readlines(): + if line.startswith("//"): + continue + slaps.append(line) + +with open("plugins/data/slap_items.txt") as f: + for line in f.readlines(): + if line.startswith("//"): + continue + items.append(line) larts = ["swaps 's shampoo with glue.", "installs Windows on 's computer.",