From b03fa25c113251f0e7669288d163a26457216d0d Mon Sep 17 00:00:00 2001 From: NikolajDanger Date: Tue, 28 Jul 2020 14:12:28 +0200 Subject: [PATCH] :bug: dealer blackjack --- funcs/games/blackjack.py | 9 ++++----- funcs/games/blackjackDraw.py | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/funcs/games/blackjack.py b/funcs/games/blackjack.py index 915c094..d25578c 100644 --- a/funcs/games/blackjack.py +++ b/funcs/games/blackjack.py @@ -46,7 +46,9 @@ def calcHandValue(hand : list): for value in values: if value <= 21: handValue = value - + + logThis("Calculated "+str(hand)+" to be "+str(handValue)) + return handValue def drawCard(): @@ -77,9 +79,6 @@ def dealerDraw(channel): if calcHandValue(dealerHand) > 21: data["blackjack games"][channel]["dealer busted"] = True - - if calcHandValue(dealerHand) == 21 and len(dealerHand) == 2: - data["blackjack games"][channel]["dealer blackjack"] = True with open("resources/games/games.json", "w") as f: json.dump(data,f,indent=4) @@ -306,7 +305,7 @@ def blackjackStart(channel:str): data["blackjack games"][channel] = {"dealer hand": dealerHand,"dealer busted":False,"dealer blackjack":False,"user hands": {},"all standing":False,"round":0} if calcHandValue(dealerHand) == 21: - data["blackjack games"][channel]["dealer blackjack"] == True + data["blackjack games"][channel]["dealer blackjack"] = True with open("resources/games/games.json", "w") as f: json.dump(data,f,indent=4) diff --git a/funcs/games/blackjackDraw.py b/funcs/games/blackjackDraw.py index 453260c..873e2da 100644 --- a/funcs/games/blackjackDraw.py +++ b/funcs/games/blackjackDraw.py @@ -35,6 +35,7 @@ def drawImage(channel): return def drawHand(hand, dealer, busted, blackjack): + print(str(hand)+str(blackjack)) fnt = ImageFont.truetype('resources/futura-bold.ttf', 200) fnt2 = ImageFont.truetype('resources/futura-bold.ttf', 120) length = len(hand) @@ -66,14 +67,15 @@ def drawHand(hand, dealer, busted, blackjack): textImage.text((int(w/2)-int(textWidth/2),430),"BUSTED",fill=(255,50,50), font=fnt) elif blackjack: textWidth = fnt2.getsize("BLACKJACK")[0] - textImage.text((int(w/2)-int(textWidth/2)-10,450-10),"BLACKJACK",fill=(0,0,0), font=fnt2) - textImage.text((int(w/2)-int(textWidth/2)+10,450-10),"BLACKJACK",fill=(0,0,0), font=fnt2) - textImage.text((int(w/2)-int(textWidth/2)-10,450+10),"BLACKJACK",fill=(0,0,0), font=fnt2) - textImage.text((int(w/2)-int(textWidth/2)+10,450+10),"BLACKJACK",fill=(0,0,0), font=fnt2) - textImage.text((int(w/2)-int(textWidth/2)-5,430-5),"BLACKJACK",fill=(255,255,255), font=fnt2) - textImage.text((int(w/2)-int(textWidth/2)+5,430-5),"BLACKJACK",fill=(255,255,255), font=fnt2) - textImage.text((int(w/2)-int(textWidth/2)-5,430+5),"BLACKJACK",fill=(255,255,255), font=fnt2) - textImage.text((int(w/2)-int(textWidth/2)+5,430+5),"BLACKJACK",fill=(255,255,255), font=fnt2) + print(textWidth) + textImage.text((int(w/2)-int(textWidth/2)-6,450-6),"BLACKJACK",fill=(0,0,0), font=fnt2) + textImage.text((int(w/2)-int(textWidth/2)+6,450-6),"BLACKJACK",fill=(0,0,0), font=fnt2) + textImage.text((int(w/2)-int(textWidth/2)-6,450+6),"BLACKJACK",fill=(0,0,0), font=fnt2) + textImage.text((int(w/2)-int(textWidth/2)+6,450+6),"BLACKJACK",fill=(0,0,0), font=fnt2) + textImage.text((int(w/2)-int(textWidth/2)-3,430-3),"BLACKJACK",fill=(255,255,255), font=fnt2) + textImage.text((int(w/2)-int(textWidth/2)+3,430-3),"BLACKJACK",fill=(255,255,255), font=fnt2) + textImage.text((int(w/2)-int(textWidth/2)-3,430+3),"BLACKJACK",fill=(255,255,255), font=fnt2) + textImage.text((int(w/2)-int(textWidth/2)+3,430+3),"BLACKJACK",fill=(255,255,255), font=fnt2) textImage.text((int(w/2)-int(textWidth/2),430),"BLACKJACK",fill=(255,223,0), font=fnt2) return background.resize((int(w/3.5),int(h/3.5)))