From 17b326223562bda9247b2ce705ec6917c0576cbe Mon Sep 17 00:00:00 2001 From: NikolajDanger Date: Fri, 31 Jul 2020 16:20:24 +0200 Subject: [PATCH] :Money: --- Gwendolyn.py | 4 ++++ funcs/games/fourInARow.py | 29 +++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Gwendolyn.py b/Gwendolyn.py index 254e701..9a39664 100644 --- a/Gwendolyn.py +++ b/Gwendolyn.py @@ -632,6 +632,10 @@ async def fiar(channel,command,user): with open("resources/games/games.json", "r") as f: data = json.load(f) + winner = data["4 in a row games"][str(channel)]["won"] + if winner != 0: + addMoney(data["4 in a row games"][str(channel)]["players"][winner].lower(),20) + del data["4 in a row games"][str(channel)] with open("resources/games/games.json","w") as f: diff --git a/funcs/games/fourInARow.py b/funcs/games/fourInARow.py index d3f37d2..67c41be 100644 --- a/funcs/games/fourInARow.py +++ b/funcs/games/fourInARow.py @@ -8,21 +8,24 @@ def fourInARowStart(channel, user, opponent): with open("resources/games/games.json", "r") as f: data = json.load(f) - if channel not in data["4 in a row games"]: + if user.lower() != opponent.lower(): + if channel not in data["4 in a row games"]: - board = [ [ 0 for i in range(7) ] for j in range(6) ] + board = [ [ 0 for i in range(7) ] for j in range(6) ] - data["4 in a row games"][channel] = {"board": board,"winner":0,"win direction":"", - "win coordinates":[0,0],"players":[user,opponent],"turn":0} + data["4 in a row games"][channel] = {"board": board,"winner":0,"win direction":"", + "win coordinates":[0,0],"players":[user,opponent],"turn":0} - with open("resources/games/games.json", "w") as f: - json.dump(data,f,indent=4) - - draw4InARow.drawImage(channel) + with open("resources/games/games.json", "w") as f: + json.dump(data,f,indent=4) + + draw4InARow.drawImage(channel) - return "Started game. It's "+user+"'s turn", True, False, False + return "Started game. It's "+user+"'s turn", True, False, False + else: + return "There's already a 4 in a row game going on in this channel", False, False, False else: - return "There's already a 4 in a row game going on in this channel", False, False, False + return "You can't play against yourself", False, False, False # Places a piece at the lowest available point in a specific column def placePiece(channel : str,player : int,column : int): @@ -56,10 +59,10 @@ def placePiece(channel : str,player : int,column : int): data["4 in a row games"][channel]["win direction"] = winDirection data["4 in a row games"][channel]["win coordinates"] = winCoordinates - message = data["4 in a row games"][channel]["players"][won-1]+" won" + message = data["4 in a row games"][channel]["players"][won-1]+" won. Adding 20 GwendoBucks to their account." else: gameWon = False - message = "Placed a piece. 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)+". 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) @@ -163,3 +166,5 @@ def isWon(channel): return won, winDirection, winCoordinates + +