From d4381c597371d8052efe6f2c46ced4df8dc6f989 Mon Sep 17 00:00:00 2001 From: twhaley6 Date: Thu, 25 Apr 2019 12:11:39 -0400 Subject: riddle easter questions added --- bot/resources/easter/easter_riddle.json | 82 +++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 bot/resources/easter/easter_riddle.json (limited to 'bot/resources') diff --git a/bot/resources/easter/easter_riddle.json b/bot/resources/easter/easter_riddle.json new file mode 100644 index 00000000..069d727a --- /dev/null +++ b/bot/resources/easter/easter_riddle.json @@ -0,0 +1,82 @@ +[ + { + "question": "What kind of music do bunnies like?", + "riddles": [ + "two words", + "jump to the beat" + ], + "correct_answer": "Hip hop" + }, + { + "question": "What kind of jewelry do rabbits wear?", + "riddles": [ + "they can eat it too", + "14 ___ gold" + ], + "correct_answer": "14 carrot gold" + }, + { + "question": "What does the easter bunny get for making a basket?", + "riddles": [ + "KOBE!", + "1+1 = ?" + ], + "correct_answer": "2 points!" + }, + { + "question": "Where does the easter bunny eat breakfast?", + "riddles": [ + "No waffles here", + "An international home" + ], + "correct_answer": "IHOP" + }, + { + "question": "What do you call a rabbit with fleas?", + "riddles": [ + "A bit of a looney tune", + "What's up Doc?" + ], + "correct_answer": "Bugs Bunny" + }, + { + "question": "Why was the little girl sad after the race?", + "riddles": [ + "2nd place?", + "Who beat her?" + ], + "correct_answer": "Because an egg beater!" + }, + { + "question": "What happened to the Easter Bunny when he misbehaved at school?", + "riddles": [ + "Won't be back anymore", + "Worse than suspension" + ], + "correct_answer": "He was eggspelled." + }, + { + "question": "What kind of bunny can't hop?", + "riddles": [ + "Might melt in the sun", + "Fragile and Yummy" + ], + "correct_answer": "A chocolate one!" + }, + { + "question": "Where does the Easter Bunny get his eggs?", + "riddles": [ + "Not a bush or tree", + "Emoji for a body part" + ], + "correct_answer": "Eggplants" + }, + { + "question": "Why did the Easter Bunny have to fire the duck?", + "riddles": [ + "quack", + "MY EGGS!!!" + ], + "correct_answer": "He kept quacking the eggs!" + } +] \ No newline at end of file -- cgit v1.2.3 From 0d88fdd2f28bde5d0c6dce6877b5abd9b39286a7 Mon Sep 17 00:00:00 2001 From: JackyFWong Date: Fri, 26 Apr 2019 17:11:29 -0400 Subject: removed punctuation from riddles --- bot/resources/easter/easter_riddle.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bot/resources') diff --git a/bot/resources/easter/easter_riddle.json b/bot/resources/easter/easter_riddle.json index 069d727a..f32b5258 100644 --- a/bot/resources/easter/easter_riddle.json +++ b/bot/resources/easter/easter_riddle.json @@ -21,7 +21,7 @@ "KOBE!", "1+1 = ?" ], - "correct_answer": "2 points!" + "correct_answer": "2 points" }, { "question": "Where does the easter bunny eat breakfast?", @@ -45,7 +45,7 @@ "2nd place?", "Who beat her?" ], - "correct_answer": "Because an egg beater!" + "correct_answer": "Because an egg beater" }, { "question": "What happened to the Easter Bunny when he misbehaved at school?", @@ -53,7 +53,7 @@ "Won't be back anymore", "Worse than suspension" ], - "correct_answer": "He was eggspelled." + "correct_answer": "He was eggspelled" }, { "question": "What kind of bunny can't hop?", @@ -61,7 +61,7 @@ "Might melt in the sun", "Fragile and Yummy" ], - "correct_answer": "A chocolate one!" + "correct_answer": "A chocolate one" }, { "question": "Where does the Easter Bunny get his eggs?", @@ -77,6 +77,6 @@ "quack", "MY EGGS!!!" ], - "correct_answer": "He kept quacking the eggs!" + "correct_answer": "He kept quacking the eggs" } -] \ No newline at end of file +] -- cgit v1.2.3 From 120fa538166eb6fbaa40579633c0d5694cb8199e Mon Sep 17 00:00:00 2001 From: JackyFWong Date: Fri, 26 Apr 2019 18:06:02 -0400 Subject: finalized riddles and fixed various easter_riddle bugs --- bot/resources/easter/easter_riddle.json | 12 ++++++------ bot/seasons/easter/easter_riddle.py | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'bot/resources') diff --git a/bot/resources/easter/easter_riddle.json b/bot/resources/easter/easter_riddle.json index f32b5258..e93f6dad 100644 --- a/bot/resources/easter/easter_riddle.json +++ b/bot/resources/easter/easter_riddle.json @@ -2,15 +2,15 @@ { "question": "What kind of music do bunnies like?", "riddles": [ - "two words", - "jump to the beat" + "Two words", + "Jump to the beat" ], "correct_answer": "Hip hop" }, { "question": "What kind of jewelry do rabbits wear?", "riddles": [ - "they can eat it too", + "They can eat it too", "14 ___ gold" ], "correct_answer": "14 carrot gold" @@ -59,7 +59,7 @@ "question": "What kind of bunny can't hop?", "riddles": [ "Might melt in the sun", - "Fragile and Yummy" + "Fragile and yummy" ], "correct_answer": "A chocolate one" }, @@ -74,8 +74,8 @@ { "question": "Why did the Easter Bunny have to fire the duck?", "riddles": [ - "quack", - "MY EGGS!!!" + "Quack", + "MY EGGS!!" ], "correct_answer": "He kept quacking the eggs" } diff --git a/bot/seasons/easter/easter_riddle.py b/bot/seasons/easter/easter_riddle.py index 18b4c31d..6b2ab5ca 100644 --- a/bot/seasons/easter/easter_riddle.py +++ b/bot/seasons/easter/easter_riddle.py @@ -60,7 +60,7 @@ class EasterRiddle(commands.Cog): await asyncio.sleep(TIMELIMIT) if self.winner != " ": - content = "Well done " + self.winner + " for getting it correct!" + content = "Well done " + self.winner + "for getting it correct!" else: content = "Nobody got it right..." @@ -75,8 +75,9 @@ class EasterRiddle(commands.Cog): @commands.Cog.listener() async def on_message(self, message): - if message.content.lower() == self.correct.lower(): - self.winner = message.author.mention + if self.bot.user != message.author: + if message.content.lower() == self.correct.lower(): + self.winner = self.winner + message.author.mention + " " -- cgit v1.2.3