From e721713dcae0826b494d59de12094fa0920c9bc6 Mon Sep 17 00:00:00 2001 From: Vertanzil Date: Thu, 1 Mar 2018 22:16:52 +0100 Subject: [PATCH 1/5] Added nipple flick --- plugins/attacks.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/plugins/attacks.py b/plugins/attacks.py index d8c72e7a2..643fe7e34 100644 --- a/plugins/attacks.py +++ b/plugins/attacks.py @@ -32,7 +32,7 @@ def load_attacks(bot): """ :type bot: cloudbot.bot.CloudBot """ - global larts, flirts, kills, slaps, rekts + global larts, flirts, kills, slaps, rekts, flick with codecs.open(os.path.join(bot.data_dir, "larts.txt"), encoding="utf-8") as f: larts = [line.strip() for line in f.readlines() if not line.startswith("//")] @@ -42,7 +42,10 @@ def load_attacks(bot): with codecs.open(os.path.join(bot.data_dir, "rekts.txt"), encoding="utf-8") as f: rekts = [line.strip() for line in f.readlines() if not line.startswith("//")] - + + with codecs.open(os.path.join(bot.data_dir, "flicks.txt"), encoding="utf-8") as f: + rekts = [line.strip() for line in f.readlines() if not line.startswith("//")] + with codecs.open(os.path.join(bot.data_dir, "kills.json"), encoding="utf-8") as f: kills = json.load(f) @@ -83,8 +86,22 @@ def flirt(text, conn, nick, message): target = nick message('{}, {}'.format(target, random.choice(flirts))) + +@asyncio.coroutine +@hook.command +def flick(text, conn, nick, message): + """ - flick nipple""" + target = text.strip() + if not is_valid(target): + return "I can't flick that persons nipple." + + if is_self(conn, target): + # user is trying to make the bot attack itself! + target = nick + message('{}, {}'.format(target, random.choice(flicks))) + @asyncio.coroutine @hook.command def rekt(text, conn, nick, message): From b60ff3a0ce29382cd456201be65202efae44cded Mon Sep 17 00:00:00 2001 From: Vertanzil Date: Thu, 1 Mar 2018 22:19:12 +0100 Subject: [PATCH 2/5] Create flicks.txt --- data/flicks.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/flicks.txt diff --git a/data/flicks.txt b/data/flicks.txt new file mode 100644 index 000000000..59216d99e --- /dev/null +++ b/data/flicks.txt @@ -0,0 +1,5 @@ +flicks {user} left nipple and glares. +flicks {user} right nipple and glares. +flicks {user} nipple. +flicks {user} third nipple. +flicks {user} nipple off. From 937f041651c97c4f1107489172f2dac5254706d0 Mon Sep 17 00:00:00 2001 From: Vertanzil Date: Thu, 1 Mar 2018 22:25:33 +0100 Subject: [PATCH 3/5] Update attacks.py #blamechoco --- plugins/attacks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/attacks.py b/plugins/attacks.py index 643fe7e34..8990b2627 100644 --- a/plugins/attacks.py +++ b/plugins/attacks.py @@ -89,12 +89,12 @@ def flirt(text, conn, nick, message): @asyncio.coroutine @hook.command -def flick(text, conn, nick, message): +def flicks(text, conn, nick, message): """ - flick nipple""" target = text.strip() if not is_valid(target): - return "I can't flick that persons nipple." + return "I can't flick that person's nipple." if is_self(conn, target): # user is trying to make the bot attack itself! From c0341cda91b5e0d20d2a15a019c928b868393ceb Mon Sep 17 00:00:00 2001 From: Vertanzil Date: Thu, 1 Mar 2018 22:33:21 +0100 Subject: [PATCH 4/5] Update attacks.py --- plugins/attacks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/attacks.py b/plugins/attacks.py index 8990b2627..2dd0239de 100644 --- a/plugins/attacks.py +++ b/plugins/attacks.py @@ -89,7 +89,7 @@ def flirt(text, conn, nick, message): @asyncio.coroutine @hook.command -def flicks(text, conn, nick, message): +def flick(text, conn, nick, message): """ - flick nipple""" target = text.strip() From 21d198416a9b2594cfbee757894ed15484659ffe Mon Sep 17 00:00:00 2001 From: Vertanzil Date: Thu, 1 Mar 2018 22:34:16 +0100 Subject: [PATCH 5/5] Update flicks.txt --- data/flicks.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/flicks.txt b/data/flicks.txt index 59216d99e..b20ed2554 100644 --- a/data/flicks.txt +++ b/data/flicks.txt @@ -1,5 +1,5 @@ -flicks {user} left nipple and glares. -flicks {user} right nipple and glares. -flicks {user} nipple. -flicks {user} third nipple. -flicks {user} nipple off. +flick's {user} left nipple and glares. +flick's {user} right nipple and glares. +flick's {user} nipple. +flick's {user} third nipple. +flick's {user} nipple off.