From 620dd438987649e0627ddb22c61beb9c37b334a1 Mon Sep 17 00:00:00 2001 From: NikolajDanger Date: Tue, 28 Jul 2020 02:20:10 +0200 Subject: [PATCH] :bug: Players can't bet negative amounts --- funcs/games/blackjack.py | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/funcs/games/blackjack.py b/funcs/games/blackjack.py index 2ee077f..778a6ec 100644 --- a/funcs/games/blackjack.py +++ b/funcs/games/blackjack.py @@ -195,28 +195,32 @@ def blackjackPlayerDrawHand(channel,user,bet): if user not in data["blackjack games"][channel]["user hands"]: if len(data["blackjack games"][channel]["user hands"]) < 5: if data["blackjack games"][channel]["open for bets"]: - if money.checkBalance(user) >= bet: - money.addMoney(user,-1 * bet) - playerHand = [drawCard(),drawCard()] + if bet >= 0: + if money.checkBalance(user) >= bet: + money.addMoney(user,-1 * bet) + playerHand = [drawCard(),drawCard()] - handValue = calcHandValue(playerHand) + handValue = calcHandValue(playerHand) - with open("resources/games/games.json", "r") as f: - data = json.load(f) + with open("resources/games/games.json", "r") as f: + data = json.load(f) - if handValue == 21: - data["blackjack games"][channel]["user hands"][user] = {"hand":playerHand,"bet":bet,"standing":True,"busted":False,"blackjack":True,"hit":True} + if handValue == 21: + data["blackjack games"][channel]["user hands"][user] = {"hand":playerHand,"bet":bet,"standing":True,"busted":False,"blackjack":True,"hit":True} + else: + data["blackjack games"][channel]["user hands"][user] = {"hand":playerHand,"bet":bet,"standing":False,"busted":False,"blackjack":False,"hit":True} + + with open("resources/games/games.json", "w") as f: + json.dump(data,f,indent=4) + + logThis(user+" entered the game") + return user+" entered the game" else: - data["blackjack games"][channel]["user hands"][user] = {"hand":playerHand,"bet":bet,"standing":False,"busted":False,"blackjack":False,"hit":True} - - with open("resources/games/games.json", "w") as f: - json.dump(data,f,indent=4) - - logThis(user+" entered the game") - return user+" entered the game" + logThis(user+" doesn't have enough GwendoBucks") + return "You don't have enough GwendoBucks to place that bet" else: - logThis(user+" doesn't have enough GwendoBucks") - return "You don't have enough GwendoBucks to place that bet" + logThis(user+" tried to bet a negative amount") + return "You can't bet a negative amount" else: logThis("The table is no longer open for bets") return "The table is no longer open for bets"