diff --git a/Gwendolyn.py b/Gwendolyn.py index 0be30ea..5182b97 100644 --- a/Gwendolyn.py +++ b/Gwendolyn.py @@ -634,7 +634,11 @@ async def fiar(channel,command,user): winner = data["4 in a row games"][str(channel)]["winner"] if winner != 0: + with open("resources/games/games.json","w") as f: + json.dump(data,f,indent=4) addMoney(data["4 in a row games"][str(channel)]["players"][winner].lower(),20) + with open("resources/games/games.json", "r") as f: + data = json.load(f) del data["4 in a row games"][str(channel)] diff --git a/funcs/games/fourInARow.py b/funcs/games/fourInARow.py index 4033564..736e63f 100644 --- a/funcs/games/fourInARow.py +++ b/funcs/games/fourInARow.py @@ -62,7 +62,7 @@ def placePiece(channel : str,player : int,column : int): message = data["4 in a row games"][channel]["players"][won-1]+" won. Adding 20 GwendoBucks to their account." else: gameWon = False - message = data["4 in a row games"][channel]["players"][player-1]+" placed a piece in column "+str(column)+". It's now "+data["4 in a row games"][channel]["players"][turn]+"'s turn." + message = data["4 in a row games"][channel]["players"][player-1]+" placed a piece in column "+str(column+1)+". It's now "+data["4 in a row games"][channel]["players"][turn]+"'s turn." with open("resources/games/games.json", "w") as f: json.dump(data,f,indent=4) @@ -80,7 +80,7 @@ def parseFourInARow(command, channel, user): print(command) if command == "" or command == " ": - return "I didn't get that. \"Use !fourinarow start\" to start a game.", False, False, False + return "I didn't get that. \"Use !fourinarow start [opponent]\" to start a game.", False, False, False elif command.startswith(" start "): diff --git a/funcs/games/fourInARowDraw.py b/funcs/games/fourInARowDraw.py index ee32a9a..acd0603 100644 --- a/funcs/games/fourInARowDraw.py +++ b/funcs/games/fourInARowDraw.py @@ -22,6 +22,7 @@ def drawImage(channel): backgroundColor = (128,128,128,255) boardColor = (0,0,170) placeSize = 285 + winBarColor = (130,160,130,255) fnt = ImageFont.truetype('resources/futura-bold.ttf', exampleCircles) @@ -78,23 +79,23 @@ def drawImage(channel): if data["4 in a row games"][channel]["win direction"] == "h": winBar = Image.new("RGBA",(placeGridSize[0]*4,placeGridSize[1]),(0,0,0,0)) winD = ImageDraw.Draw(winBar) - winD.ellipse([(0,0),(placeGridSize[0],placeGridSize[1])],fill=(128,128,180,255)) - winD.ellipse([((placeGridSize[0]*3),0),(placeGridSize[0]*4,placeGridSize[1])],fill=(128,128,180,255)) - winD.rectangle([(int(placeGridSize[0]*0.5),0),(int(placeGridSize[0]*3.5),placeGridSize[1])],fill=(128,128,180,255)) + winD.ellipse([(0,0),(placeGridSize[0],placeGridSize[1])],fill=winBarColor) + winD.ellipse([((placeGridSize[0]*3),0),(placeGridSize[0]*4,placeGridSize[1])],fill=winBarColor) + winD.rectangle([(int(placeGridSize[0]*0.5),0),(int(placeGridSize[0]*3.5),placeGridSize[1])],fill=winBarColor) elif data["4 in a row games"][channel]["win direction"] == "v": winBar = Image.new("RGBA",(placeGridSize[0],placeGridSize[1]*4),(0,0,0,0)) winD = ImageDraw.Draw(winBar) - winD.ellipse([(0,0),(placeGridSize[0],placeGridSize[1])],fill=(128,128,180,255)) - winD.ellipse([(0,(placeGridSize[1]*3)),(placeGridSize[0],placeGridSize[1]*4)],fill=(128,128,180,255)) - winD.rectangle([0,(int(placeGridSize[1]*0.5)),(placeGridSize[0],int(placeGridSize[1]*3.5))],fill=(128,128,180,255)) + winD.ellipse([(0,0),(placeGridSize[0],placeGridSize[1])],fill=winBarColor) + winD.ellipse([(0,(placeGridSize[1]*3)),(placeGridSize[0],placeGridSize[1]*4)],fill=winBarColor) + winD.rectangle([0,(int(placeGridSize[1]*0.5)),(placeGridSize[0],int(placeGridSize[1]*3.5))],fill=winBarColor) elif data["4 in a row games"][channel]["win direction"] == "r": winBar = Image.new("RGBA",(int(placeGridSize[0]*diagonalLength),placeGridSize[1]),(0,0,0,0)) winD = ImageDraw.Draw(winBar) - winD.ellipse([(0,0),(placeGridSize[0],placeGridSize[1])],fill=(128,128,180,255)) - winD.ellipse([((placeGridSize[0]*(diagonalLength-1)),0),(placeGridSize[0]*diagonalLength,placeGridSize[1])],fill=(128,128,180,255)) - winD.rectangle([(int(placeGridSize[0]*0.5),0),(int(placeGridSize[0]*(diagonalLength-0.5)),placeGridSize[1])],fill=(128,128,180,255)) + winD.ellipse([(0,0),(placeGridSize[0],placeGridSize[1])],fill=winBarColor) + winD.ellipse([((placeGridSize[0]*(diagonalLength-1)),0),(placeGridSize[0]*diagonalLength,placeGridSize[1])],fill=winBarColor) + winD.rectangle([(int(placeGridSize[0]*0.5),0),(int(placeGridSize[0]*(diagonalLength-0.5)),placeGridSize[1])],fill=winBarColor) winBar = winBar.rotate(-diagonalAngle,expand=1) startx -= border starty -= gridBorder + border @@ -102,9 +103,9 @@ def drawImage(channel): elif data["4 in a row games"][channel]["win direction"] == "l": winBar = Image.new("RGBA",(int(placeGridSize[0]*diagonalLength),placeGridSize[1]),(0,0,0,0)) winD = ImageDraw.Draw(winBar) - winD.ellipse([(0,0),(placeGridSize[0],placeGridSize[1])],fill=(128,128,180,255)) - winD.ellipse([((placeGridSize[0]*(diagonalLength-1)),0),(placeGridSize[0]*diagonalLength,placeGridSize[1])],fill=(128,128,180,255)) - winD.rectangle([(int(placeGridSize[0]*0.5),0),(int(placeGridSize[0]*(diagonalLength-0.5)),placeGridSize[1])],fill=(128,128,180,255)) + winD.ellipse([(0,0),(placeGridSize[0],placeGridSize[1])],fill=winBarColor) + winD.ellipse([((placeGridSize[0]*(diagonalLength-1)),0),(placeGridSize[0]*diagonalLength,placeGridSize[1])],fill=winBarColor) + winD.rectangle([(int(placeGridSize[0]*0.5),0),(int(placeGridSize[0]*(diagonalLength-0.5)),placeGridSize[1])],fill=winBarColor) winBar = winBar.rotate(diagonalAngle,expand=1) startx -= placeGridSize[0]*3 + border starty -= gridBorder + border