diff --git a/funcs/games/fourInARow.py b/funcs/games/fourInARow.py index 53bddc0..3947681 100644 --- a/funcs/games/fourInARow.py +++ b/funcs/games/fourInARow.py @@ -101,7 +101,7 @@ 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 = getName(data["4 in a row games"][channel]["players"][won-1])+"placed a piece in column "+str(column+1)+" and won." + message = getName(data["4 in a row games"][channel]["players"][won-1])+" placed a piece in column "+str(column+1)+" and won." winAmount = int(data["4 in a row games"][channel]["difficulty"])**2+5 if data["4 in a row games"][channel]["players"][won-1] != "Gwendolyn": message += " Adding "+str(winAmount)+" GwendoBucks to their account." diff --git a/funcs/games/fourInARowDraw.py b/funcs/games/fourInARowDraw.py index fdc6ad8..0e99d22 100644 --- a/funcs/games/fourInARowDraw.py +++ b/funcs/games/fourInARowDraw.py @@ -14,19 +14,23 @@ def drawImage(channel): border = 40 gridBorder = 40 - cornerSize = 100 - outlineSize = 20 + cornerSize = 300 + boardOutlineSize = 10 + pieceOutlineSize = 10 + emptyOutlineSize = 0 bottomBorder = 110 exampleCircles = 100 - w, h = 2800,2000 - backgroundColor = (128,128,128,255) - outlineColor = (0,0,0) - player1Color = (200,0,0) - player2Color = (255,255,0) - boardColor = (0,0,170) - placeSize = 285 + w, h = 2800,2400 + backgroundColor = (255,255,255,255) + boardOutlineColor = (0,0,0) + pieceOutlineColor = (255,255,255) + emptyOutlineColor = (0,0,0) + player1Color = (230,65,40) + player2Color = (255,220,70) + boardColor = (45,125,225) + placeSize = 300 white = (255,255,255,160) - winBarColor = (140,160,140,255) + winBarColor = (250,250,250,255) fnt = ImageFont.truetype('resources/futura-bold.ttf', exampleCircles) @@ -51,17 +55,17 @@ def drawImage(channel): # This whole part was the easiest way to make a rectangle with rounded corners and an outline # - Corners: - d.ellipse([(border,border),(border+cornerSize,border+cornerSize)],fill=boardColor,outline=outlineColor,width=outlineSize) - d.ellipse([(w-(border+cornerSize),h-(border+cornerSize)),(w-border,h-border)],fill=boardColor,outline=outlineColor,width=outlineSize) - d.ellipse([(border,h-(border+cornerSize)),(border+cornerSize,h-border)],fill=boardColor,outline=outlineColor,width=outlineSize) - d.ellipse([(w-(border+cornerSize),border),(w-border,border+cornerSize)],fill=boardColor,outline=outlineColor,width=outlineSize) + d.ellipse([(border,border),(border+cornerSize,border+cornerSize)],fill=boardColor,outline=boardOutlineColor,width=boardOutlineSize) + d.ellipse([(w-(border+cornerSize),h-(border+cornerSize)),(w-border,h-border)],fill=boardColor,outline=boardOutlineColor,width=boardOutlineSize) + d.ellipse([(border,h-(border+cornerSize)),(border+cornerSize,h-border)],fill=boardColor,outline=boardOutlineColor,width=boardOutlineSize) + d.ellipse([(w-(border+cornerSize),border),(w-border,border+cornerSize)],fill=boardColor,outline=boardOutlineColor,width=boardOutlineSize) # - Rectangle: - d.rectangle([(border+math.floor(cornerSize/2),border),(w-(border+math.floor(cornerSize/2)),h-border)],fill=boardColor,outline=outlineColor,width=outlineSize) - d.rectangle([(border,border+math.floor(cornerSize/2)),(w-border,h-(border+math.floor(cornerSize/2)))],fill=boardColor,outline=outlineColor,width=outlineSize) + d.rectangle([(border+math.floor(cornerSize/2),border),(w-(border+math.floor(cornerSize/2)),h-border)],fill=boardColor,outline=boardOutlineColor,width=boardOutlineSize) + d.rectangle([(border,border+math.floor(cornerSize/2)),(w-border,h-(border+math.floor(cornerSize/2)))],fill=boardColor,outline=boardOutlineColor,width=boardOutlineSize) # - Removing outline on the inside: d.rectangle([(border+math.floor(cornerSize/2),border+math.floor(cornerSize/2)),(w-(border+math.floor(cornerSize/2)),h-(border+math.floor(cornerSize/2)))],fill=boardColor) - d.rectangle([(border+math.floor(cornerSize/2),border+outlineSize),(w-(border+math.floor(cornerSize/2)),h-(border+outlineSize))],fill=boardColor) - d.rectangle([(border+outlineSize,border+math.floor(cornerSize/2)),(w-(border+outlineSize),h-(border+math.floor(cornerSize/2)))],fill=boardColor) + d.rectangle([(border+math.floor(cornerSize/2),border+boardOutlineSize),(w-(border+math.floor(cornerSize/2)),h-(border+boardOutlineSize))],fill=boardColor) + d.rectangle([(border+boardOutlineSize,border+math.floor(cornerSize/2)),(w-(border+boardOutlineSize),h-(border+math.floor(cornerSize/2)))],fill=boardColor) for line in range(len(board)): for place in range(len(board[line])): @@ -69,15 +73,21 @@ def drawImage(channel): if piece == 1: pieceColor = player1Color + outlineWidth = pieceOutlineSize + outlineColor = pieceOutlineColor elif piece == 2: pieceColor = player2Color + outlineWidth = pieceOutlineSize + outlineColor = pieceOutlineColor else: pieceColor = backgroundColor + outlineWidth = emptyOutlineSize + outlineColor = emptyOutlineColor startx = pieceStartx + placeGridSize[0]*place starty = pieceStarty + placeGridSize[1]*line - d.ellipse([(startx,starty),(startx+placeSize,starty+placeSize)],fill=pieceColor,outline=outlineColor,width=outlineSize) + d.ellipse([(startx,starty),(startx+placeSize,starty+placeSize)],fill=pieceColor,outline=outlineColor,width=outlineWidth) if data["4 in a row games"][channel]["winner"] != 0: coordinates = data["4 in a row games"][channel]["win coordinates"] @@ -109,8 +119,8 @@ def drawImage(channel): winD.ellipse([((placeGridSize[0]*(diagonalLength-1)),0),(placeGridSize[0]*diagonalLength,placeGridSize[1])],fill=white) winD.rectangle([(int(placeGridSize[0]*0.5),0),(int(placeGridSize[0]*(diagonalLength-0.5)),placeGridSize[1])],fill=white) winBar = winBar.rotate(-diagonalAngle,expand=1) - startx -= border - starty -= gridBorder + border + startx -= 90 + starty -= 100 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)) @@ -119,9 +129,10 @@ def drawImage(channel): winD.ellipse([((placeGridSize[0]*(diagonalLength-1)),0),(placeGridSize[0]*diagonalLength,placeGridSize[1])],fill=white) winD.rectangle([(int(placeGridSize[0]*0.5),0),(int(placeGridSize[0]*(diagonalLength-0.5)),placeGridSize[1])],fill=white) winBar = winBar.rotate(diagonalAngle,expand=1) - startx -= placeGridSize[0]*3 + border - starty -= gridBorder + border + startx -= placeGridSize[0]*3 + 90 + starty -= gridBorder + 60 + mask = winBar.copy()#.convert("L") #mask.putalpha(128) #mask.save("test.png") @@ -133,11 +144,11 @@ def drawImage(channel): textPadding = 20 exampleHeight = h - border + int((bottomBorder+border)/2) - int(exampleCircles/2) - d.ellipse([(border,exampleHeight),(border+exampleCircles),(exampleHeight+exampleCircles)],fill=player1Color,outline=outlineColor,width=3) + d.ellipse([(border,exampleHeight),(border+exampleCircles),(exampleHeight+exampleCircles)],fill=player1Color,outline=boardOutlineColor,width=3) d.text((border+exampleCircles+textPadding,exampleHeight),player1,font=fnt,fill=(0,0,0)) textWidth = fnt.getsize(player2)[0] - d.ellipse([(w-border-exampleCircles-textWidth-textPadding,exampleHeight),(w-border-textWidth-textPadding),(exampleHeight+exampleCircles)],fill=player2Color,outline=outlineColor,width=3) + d.ellipse([(w-border-exampleCircles-textWidth-textPadding,exampleHeight),(w-border-textWidth-textPadding),(exampleHeight+exampleCircles)],fill=player2Color,outline=boardOutlineColor,width=3) d.text((w-border-textWidth,exampleHeight),player2,font=fnt,fill=(0,0,0))