diff --git a/funcs/games/blackjack.py b/funcs/games/blackjack.py index eac4a7b..d8627f3 100644 --- a/funcs/games/blackjack.py +++ b/funcs/games/blackjack.py @@ -472,20 +472,20 @@ def blackjackFinish(channel): winnings += math.floor(2.5 * data["blackjack games"][channel]["user hands"][user]["bet"]) elif data["blackjack games"][channel]["dealer blackjack"]: reason += "(dealer blackjack)" + elif data["blackjack games"][channel]["user hands"][user]["busted"]: + reason = "(busted)" else: - if data["blackjack games"][channel]["user hands"][user]["busted"] == False: - if data["blackjack games"][channel]["dealer busted"]: - reason = "(dealer busted)" - winnings += 2 * data["blackjack games"][channel]["user hands"][user]["bet"] - elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["hand"]) > dealerValue: - winnings += 2 * data["blackjack games"][channel]["user hands"][user]["bet"] - elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["hand"]) == dealerValue: - reason = "(pushed)" - winnings += data["blackjack games"][channel]["user hands"][user]["bet"] - else: - reason = "(highest value)" + if data["blackjack games"][channel]["dealer busted"]: + reason = "(dealer busted)" + winnings += 2 * data["blackjack games"][channel]["user hands"][user]["bet"] + elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["hand"]) > dealerValue: + winnings += 2 * data["blackjack games"][channel]["user hands"][user]["bet"] + elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["hand"]) == dealerValue: + reason = "(pushed)" + winnings += data["blackjack games"][channel]["user hands"][user]["bet"] else: - reason = "(busted)" + reason = "(highest value)" + if data["blackjack games"][channel]["user hands"][user]["split"]: 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"]) elif data["blackjack games"][channel]["dealer blackjack"]: reason += "(dealer blackjack)" - else: - if data["blackjack games"][channel]["user hands"][user]["other hand"]["busted"] == False: - if data["blackjack games"][channel]["dealer busted"]: - reason += "(dealer busted)" - winnings += 2 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] - elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["other hand"]["hand"]) > dealerValue: - reason += "(highest value)" - winnings += 2 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] - elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["other hand"]["hand"]) == dealerValue: - reason += "(pushed)" - winnings += data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] - else: - reason += "(highest value)" + elif data["blackjack games"][channel]["user hands"][user]["busted"]: + reason = "(busted)" + else: + if data["blackjack games"][channel]["dealer busted"]: + reason += "(dealer busted)" + winnings += 2 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] + elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["other hand"]["hand"]) > dealerValue: + reason += "(highest value)" + winnings += 2 * data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] + elif calcHandValue(data["blackjack games"][channel]["user hands"][user]["other hand"]["hand"]) == dealerValue: + reason += "(pushed)" + winnings += data["blackjack games"][channel]["user hands"][user]["other hand"]["bet"] else: - reason += "(busted)" + reason += "(highest value)" + if winnings < 0: