CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-06-23 08:40:41 +12:00
Code Issues Releases Wiki Activity

Added a cooldown reset on failed commands

Browse source
This commit is contained in:
phxntxm 2016-09-06 14:56:34 -05:00
parent 52eea3753b
commit 1a15c12c3e
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cogs/hangman.py
View file

@ -114,6 +114,9 @@ class Hangman:
"""Makes a guess towards the server's currently running hangman game"""
game = self.games.get(ctx.message.server.id)
if not game:
bucket = ctx.command._buckets.get_bucket(ctx)
bucket.is_rate_limited()
bucket._token = bucket.rate
await self.bot.say("There are currently no hangman games running!")
return
@ -123,6 +126,9 @@ class Hangman:
# And also add a message for a loss/win
if len(guess) == 1:
if guess in game.guessed_letters:
bucket = ctx.command._buckets.get_bucket(ctx)
bucket.is_rate_limited()
bucket._token = bucket.rate
await self.bot.say("That letter has already been guessed!")
# Return here as we don't want to count this as a failure
return

15
cogs/interaction.py
View file

@ -93,12 +93,21 @@ class Interaction:
async def battle(self, ctx, player2: discord.Member):
"""Challenges the mentioned user to a battle"""
if ctx.message.author.id == player2.id:
bucket = ctx.command._buckets.get_bucket(ctx)
bucket.is_rate_limited()
bucket._token = bucket.rate
await self.bot.say("Why would you want to battle yourself? Suicide is not the answer")
return
if self.bot.user.id == player2.id:
bucket = ctx.command._buckets.get_bucket(ctx)
bucket.is_rate_limited()
bucket._token = bucket.rate
await self.bot.say("I always win, don't even try it.")
return
if self.user_battling(ctx, player2):
bucket = ctx.command._buckets.get_bucket(ctx)
bucket.is_rate_limited()
bucket._token = bucket.rate
await self.bot.say("You or the person you are trying to battle is already in a battle!")
return
@ -167,9 +176,15 @@ class Interaction:
"""Boops the mentioned person"""
booper = ctx.message.author
if boopee.id == booper.id:
bucket = ctx.command._buckets.get_bucket(ctx)
bucket.is_rate_limited()
bucket._token = bucket.rate
await self.bot.say("You can't boop yourself! Silly...")
return
if boopee.id == self.bot.user.id:
bucket = ctx.command._buckets.get_bucket(ctx)
bucket.is_rate_limited()
bucket._token = bucket.rate
await self.bot.say("Why the heck are you booping me? Get away from me >:c")
return