🐛 checking if busted before comparing

This commit is contained in:
NikolajDanger
2020-07-28 18:32:57 +02:00
parent 217c160395
commit 44a6ef65ca

View File

@ -472,20 +472,20 @@ def blackjackFinish(channel):
winnings += math.floor(2.5 * data["blackjack games"][channel]["user hands"][user]["bet"]) winnings += math.floor(2.5 * data["blackjack games"][channel]["user hands"][user]["bet"])
elif data["blackjack games"][channel]["dealer blackjack"]: elif data["blackjack games"][channel]["dealer blackjack"]:
reason += "(dealer blackjack)" reason += "(dealer blackjack)"
elif data["blackjack games"][channel]["user hands"][user]["busted"]:
reason = "(busted)"
else: else:
if data["blackjack games"][channel]["user hands"][user]["busted"] == False: if data["blackjack games"][channel]["dealer busted"]:
if data["blackjack games"][channel]["dealer busted"]: reason = "(dealer busted)"
reason = "(dealer busted)" winnings += 2 * data["blackjack games"][channel]["user hands"][user]["bet"]
winnings += 2 * data["blackjack games"][channel]["user hands"][user]["bet"] elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["hand"]) > dealerValue:
elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["hand"]) > dealerValue: winnings += 2 * data["blackjack games"][channel]["user hands"][user]["bet"]
winnings += 2 * data["blackjack games"][channel]["user hands"][user]["bet"] elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["hand"]) == dealerValue:
elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["hand"]) == dealerValue: reason = "(pushed)"
reason = "(pushed)" winnings += data["blackjack games"][channel]["user hands"][user]["bet"]
winnings += data["blackjack games"][channel]["user hands"][user]["bet"]
else:
reason = "(highest value)"
else: else:
reason = "(busted)" reason = "(highest value)"
if data["blackjack games"][channel]["user hands"][user]["split"]: if data["blackjack games"][channel]["user hands"][user]["split"]:
winnings -= data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] winnings -= data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"]
@ -494,21 +494,21 @@ def blackjackFinish(channel):
winnings += math.floor(2.5 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"]) winnings += math.floor(2.5 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"])
elif data["blackjack games"][channel]["dealer blackjack"]: elif data["blackjack games"][channel]["dealer blackjack"]:
reason += "(dealer blackjack)" reason += "(dealer blackjack)"
else: elif data["blackjack games"][channel]["user hands"][user]["busted"]:
if data["blackjack games"][channel]["user hands"][user]["other hand"]["busted"] == False: reason = "(busted)"
if data["blackjack games"][channel]["dealer busted"]: else:
reason += "(dealer busted)" if data["blackjack games"][channel]["dealer busted"]:
winnings += 2 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] reason += "(dealer busted)"
elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["other hand"]["hand"]) > dealerValue: winnings += 2 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"]
reason += "(highest value)" elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["other hand"]["hand"]) > dealerValue:
winnings += 2 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] reason += "(highest value)"
elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["other hand"]["hand"]) == dealerValue: winnings += 2 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"]
reason += "(pushed)" elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["other hand"]["hand"]) == dealerValue:
winnings += data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] reason += "(pushed)"
else: winnings += data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"]
reason += "(highest value)"
else: else:
reason += "(busted)" reason += "(highest value)"
if winnings < 0: if winnings < 0: