NikolajDanger/Gwendolyn
1
0
Fork 0
Code Issues 50 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:NikolajDanger/Gwendolyn

Browse Source
This commit is contained in:
Nikolaj Danger
2020-07-31 16:48:49 +02:00
parent 562e4ae4f4 17b3262235
commit 557c7479f9
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
funcs/games/fourInARow.py
View File

@ -8,21 +8,31 @@ 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}
<<<<<<< HEAD
with open("resources/games/games.json", "w") as f:
json.dump(data,f,indent=4)
4InARowDraw.drawImage(channel)
=======
with open("resources/games/games.json", "w") as f:
json.dump(data,f,indent=4)
draw4InARow.drawImage(channel)
>>>>>>> 17b326223562bda9247b2ce705ec6917c0576cbe
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 +66,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 +173,5 @@ def isWon(channel):
return won, winDirection, winCoordinates