From 5dc7c634dae15f19ef0dd6ba17649cfa0a217a91 Mon Sep 17 00:00:00 2001 From: trolluminati <53578770+trolluminati@users.noreply.github.com> Date: Sat, 10 Oct 2020 01:49:58 +0300 Subject: [PATCH 1/2] Add files via upload typo fix --- characters/sayori.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/characters/sayori.py b/characters/sayori.py index 2c72fa9..7f6d7b5 100644 --- a/characters/sayori.py +++ b/characters/sayori.py @@ -6,7 +6,7 @@ def __init__(self): self.color = "0x3eb0ff" self.description = "Sayori is a character in the game Doki Doki Literature Club, she is the vice president of the Literature Club founded by Monika and along with the other club members she spends her time after school in the club." self.id = 580133736721678341 - self.token = "" + self.token = "NTgwMTMzNzM2NzIxNjc4MzQx.XqMmsw.IS8cOl_y0wCRk_7ftZt82usJ5j8" self.prefix = "(S|s)(ayori)?_" self.help = { "commands": { @@ -359,7 +359,7 @@ def interactions(self, tamper=False, bot=None, message=None): if "finnnnnnne, sayori." in content.lower(): return f"YAY! *keeps hugging <@{mcID}>*" if f"<@{bot.user.id}>" in content.lower(): - return f"Yes, <@{mcID}>?*" + return f"Yes, <@{mcID}>?" if "i-i love you, sayori" in content.lower(): return f"I-I do too! *hugs MC*" else: @@ -729,3 +729,10 @@ def triggers(self, tamper=False, content=""): "Cease your bulli, you meanie!", "Boo! You meanie..." ]) + + def welcome(self, tamper=False, member=False): + if not tamper and member: + return rstr.xeger(r"Everyone! (The n|We have a n|N)ew member,? " + member + r", (is here|just joined)~?!( Ehehehe~)?e~") + elif member: + return f"{member} Welcome... I guess, what's the point of even joining when this club is failing..." + return \ No newline at end of file From 130eaba8174fa935d039f7c16ce216f82ce0bea8 Mon Sep 17 00:00:00 2001 From: trolluminati <53578770+trolluminati@users.noreply.github.com> Date: Sun, 11 Oct 2020 02:42:42 +0300 Subject: [PATCH 2/2] Fixing the curse, again --- characters/monika.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/characters/monika.py b/characters/monika.py index 12c9092..99381d5 100644 --- a/characters/monika.py +++ b/characters/monika.py @@ -6,7 +6,7 @@ def __init__(self): self.color = "0x12ba01" self.description = "Monika is a character in the game Doki Doki Literature Club, she is the president of the Literature Club founded by her and along with her club members she spends her time after school in the club." self.id = 707337539677192272 - self.token = "" + self.token = "NzA3MzM3NTM5Njc3MTkyMjcy.XrHVuA._ktH6TojEZJtFIr10QMyc_fmjR0" self.prefix = "(M|m)(onika)?_" self.deletes = [] self.loop = asyncio.get_event_loop() @@ -341,8 +341,6 @@ def interactions(self, tamper=False, bot=None, message=None): if "hm. i don't really like this yuri too much. give me a second." in content.lower(): return "y_tamper" if "ugh, fine." in content.lower(): - user = next( (c for c in self.deletes if c[0] == message.channel.id), None) - self.deletes.remove(user) return discord.Embed(title=f"os.restore(\"./characters/{user[1]}.chr\")",color=int(self.color, base=16)) elif message.author.id == sayoriID: if re.search(r"\*hugs <@!?{0}>\*".format(bot.user.id), content, re.IGNORECASE): @@ -700,9 +698,9 @@ def triggers(self, tamper=False, content=""): ]) elif re.search("(^|[^A-Za-z])poems?([^A-Za-z]|$)", content, re.IGNORECASE): return random.choice([ - "Ahaha, just me...and you, too!", - "Ahaha, did someone call me? :heart:", - "That's sweet of you, but it's not just me anymore!" + "Hey, do you write poems too?", + "Do you like to read poems?", + "If you have any poems you'd like to share, I'd love to see them~" ]) elif re.search("(^|[^A-Za-z])(literature|books?)([^A-Za-z]|$)", content, re.IGNORECASE): return random.choice([ @@ -716,3 +714,10 @@ def triggers(self, tamper=False, content=""): "Ahaha, did someone call me? :heart:", "That's sweet of you, but it's not just me anymore!" ]) + + def welcome(self, tamper=False, member=False): + if not tamper and member: + return rstr.xeger(r"Ah, " + member + r"! What a nice surprise! (Welcome to|Enjoy your stay in|Have a great time in) the club[!\.~]") + elif member: + return f"Welcome to the literature club {member} darling, now it's just you and me... forever." + return