CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-06-28 19:20:34 +12:00
Code Issues Releases Wiki Activity

Corrected a couple issues with battling

Browse source
This commit is contained in:
Phxntxm 2016-07-18 15:01:07 -05:00
parent 66522af1b6
commit 27a2f8f45d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cogs/interaction.py
View file

@ -15,7 +15,7 @@ def battlingOff(**kwargs):
config.saveContent('battling',battling)
elif player2 is not None:
battling = config.getContent('battling')
for p1_id,p2_id in battling:
for p1_id,p2_id in battling.items():
if p2_id == player2:
del battling[p1_id]
config.saveContent('battling',battling)
@ -101,10 +101,10 @@ class Interaction:
await self.bot.say("You are not currently in a battle!")
return
battling = config.getContent('battling')
battleP1 = ctx.message.author
battleP2 = ctx.message.author
for p1_id,p2_id in battling.items():
if p2_id == ctx.message.author.id:
battleP2 = discord.utils.find(lambda m: m.id == p2_id,ctx.message.server.members)
battleP1 = discord.utils.find(lambda m: m.id == p1_id,ctx.message.server.members)
num = random.randint(1, 100)
fmt = config.battleWins[random.randint(0, len(config.battleWins) - 1)]
if num <= 50: