From 1b1068c59c546d0a33f7e35de8d331303b66ca18 Mon Sep 17 00:00:00 2001 From: Nikolaj Danger Date: Thu, 6 Aug 2020 15:20:26 +0200 Subject: [PATCH] :bug: --- cogs/GamesCog.py | 2 +- cogs/SwCog.py | 2 +- funcs/games/fourInARowDraw.py | 3 +-- funcs/games/money.py | 2 +- funcs/miscFuncs.py | 2 +- gameLoops.py | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cogs/GamesCog.py b/cogs/GamesCog.py index 1692dea..0cb2eb9 100644 --- a/cogs/GamesCog.py +++ b/cogs/GamesCog.py @@ -21,7 +21,7 @@ class GamesCog(commands.Cog): else: new_message = ctx.message.author.display_name + " has " + str(response) + " GwendoBucks" await ctx.send(new_message) - + # Gives another user an amount of GwendoBucks @commands.command() async def give(self, ctx, *, content): diff --git a/cogs/SwCog.py b/cogs/SwCog.py index c13e93b..0bf9af0 100644 --- a/cogs/SwCog.py +++ b/cogs/SwCog.py @@ -9,7 +9,7 @@ class SwCog(commands.Cog): def __init__(self,client): self.client = client - + # Rolls star wars dice @commands.command() async def swroll(self, ctx, *, content): diff --git a/funcs/games/fourInARowDraw.py b/funcs/games/fourInARowDraw.py index fddef65..fdc6ad8 100644 --- a/funcs/games/fourInARowDraw.py +++ b/funcs/games/fourInARowDraw.py @@ -121,8 +121,7 @@ def drawImage(channel): winBar = winBar.rotate(diagonalAngle,expand=1) startx -= placeGridSize[0]*3 + border starty -= gridBorder + border - - + mask = winBar.copy()#.convert("L") #mask.putalpha(128) #mask.save("test.png") diff --git a/funcs/games/money.py b/funcs/games/money.py index 14d1167..dfa854f 100644 --- a/funcs/games/money.py +++ b/funcs/games/money.py @@ -24,7 +24,7 @@ def addMoney(user,amount): data[user]["money"] = points + amount else: logThis("Error adding money") - + with open("resources/users.json", "w") as f: json.dump(data,f,indent=4) diff --git a/funcs/miscFuncs.py b/funcs/miscFuncs.py index cf528c8..bf223ed 100644 --- a/funcs/miscFuncs.py +++ b/funcs/miscFuncs.py @@ -165,7 +165,7 @@ def makeFolder(path): def makeFiles(): with open("resources/startingFiles.json") as f: data = json.load(f) - + for path, content in data["json"].items(): makeJsonFile(path,content) diff --git a/gameLoops.py b/gameLoops.py index b3ec204..ac400be 100644 --- a/gameLoops.py +++ b/gameLoops.py @@ -207,7 +207,7 @@ async def runMonopoly(channel, command, user): oldImage = await channel.send(file = discord.File("resources/games/monopolyBoards/monopolyBoard"+str(channel.id)+".png")) with open("resources/games/oldImages/monopoly"+str(channel.id), "w") as f: f.write(str(oldImage.id)) - + if gameContinue: if gameStarted: await asyncio.sleep(60)