Blackjack is a state machine

Acronymbot.py

@@ -85,7 +85,7 @@ async def bj(interaction: discord.Interaction):
 	discinput = lambda m: discordInput(interaction, m)
 	discoutput = lambda m: discordOutput(interaction, m)
 	await interaction.response.send_message("Let's play Black Jack!")
-	await blackJack.play_game(interaction.user.id, interaction.message, discinput, discoutput)
+	await blackJack.play_game(interaction.user.id, 100, discinput, discoutput)
 
 async def discordInput(interaction: discord.Interaction, message:str):
 	response = HitOrStand()

BlackJack.py

@@ -1,6 +1,16 @@
 import random
 import Ledger
 
+# Game States
+INIT = 0
+PLAYING = 1
+ENDING = 2
+FINISHED = 3
+OVER = 5
+CHECKING = 6
+
+
+
 def convertNumberToCard(cardNumber):
     # Cards index from 0 i.e ace is 0, and the highest card value is 51
     if cardNumber <= 12:
@@ -49,13 +59,21 @@ def handNumbersToCards(hand):
 def getHandTotal(hand):
     cardValue = lambda c: min(c % 13 + 1, 10)
     i = 0
+    aces = 0
     for card in hand:
         card = cardValue(card)
-        if (card == 1) and (i < 20):
+        if card == 1:
+            aces += 1
+        else:
+            i += card
+    
+    while aces > 0:
+        if i < 20:
             card = 11
             if (i + card) > 21:
                 card = 1
         i += card
+        aces -= 1
     return i        
 
 def showDeck(deck):
@@ -66,6 +84,7 @@ def showDeck(deck):
 
 class BlackJack:
     def __init__(self):
+        self.gameState = INIT
         self.playerTurn = True
         self.deck = generateDeck()
         random.shuffle(self.deck)
@@ -118,11 +137,12 @@ class BlackJack:
         else:
             return "c"
 
-    def dealerHitLogic(self, hand):
+    def dealerHitLogic(self):
-        total = getHandTotal()
+        total = getHandTotal(self.dealerHand)
         if total > 17:
             self.stand()
-        elif total <= 16:
+            return True
+        else:
             self.hit()
 
 
@@ -134,77 +154,100 @@ class BlackJack:
             gameOver = True
         return gameOver
     
+    def compareHands(self):
+        dealerTotal = getHandTotal(self.dealerHand)
+        playerTotal = getHandTotal(self.playerHand)
+        if dealerTotal < playerTotal:
+            return "l"
+        else:
+            return "w"
+
     async def play_game(self, ID, bet, recv, send):
-        gameOver = False
-        playerStats = self.ledger.read(ID)
-        if playerStats is None:
-            self.ledger.write(ID)
-            playerStats = self.ledger.read(ID)
         
-        self.deal()
+        while self.gameState != OVER:
-        while not gameOver:
-            play = None
-            playerStood = False
-            validInput = False
 
-            playerWinState = self.checkHandState(self.playerHand)
+            if self.gameState == INIT:
-            dealerWinState = self.checkHandState(self.dealerHand)
-            gameOver = self.checkGameOver(playerWinState) or self.checkGameOver(dealerWinState)
-            if gameOver:
-                continue
 
-            await send("Players hand = " + str(getHandTotal(self.playerHand)) + ": " + handNumbersToCards(
+                gameOver = False
-                self.playerHand) + "\n" + "Dealers hand = ??: " + convertNumberToCard(self.dealerHand[0]) + "??")
+                playerStats = self.ledger.read(ID)
-            play = await recv("Hit or Stand? (h/s)")
+                if playerStats is None:
-            while not validInput:
+                    self.ledger.write(ID)
-                if play == "h":
+                    playerStats = self.ledger.read(ID)
-                    self.hit()
+                self.deal()
-                    validInput = True
-                elif play == "s":
-                    self.stand()
-                    validInput = True
-                    playerStood = True
 
-            playerWinState = self.checkHandState(self.playerHand)
+                play = None
-            if self.checkGameOver(playerWinState):
+                playerStood = False
-                continue
+                dealerStood = False
+                validInput = False
+                self.gameState = PLAYING
 
-            # Dealers turn
+            elif self.gameState == PLAYING:
-            if playerStood:
+                
-                while dealerWinState == 'c':
+                await send("Players hand = " + str(getHandTotal(self.playerHand)) + ": " + handNumbersToCards(
-                    # Dealer hits
+                    self.playerHand) + "\n" + "Dealers hand = ??: " + convertNumberToCard(self.dealerHand[0]) + "??")
-                    self.hit()
+                play = await recv("Hit or Stand? (h/s)")
-                    # Player stands
+                while not validInput:
-                    self.stand()
+                    if play == "h":
-                    # Loop ends when game is over
+                        self.hit()
-                    dealerWinState = self.checkHandState(self.dealerHand)        
+                        validInput = True
-            else:
+                    elif play == "s":
-                self.hit()
+                        self.stand()
+                        playerStood = True
+                        validInput = True
+            
+                self.dealerHitLogic()
+                playerWinState = self.checkHandState(self.playerHand)
                 dealerWinState = self.checkHandState(self.dealerHand)
+                self.gameState = CHECKING
 
-            if self.checkGameOver(dealerWinState):
+            elif self.gameState == ENDING:
-                continue
             
-        await send("Players hand = " + str(getHandTotal(self.playerHand)) + ": " + handNumbersToCards(self.playerHand) +
+                # Players turn
-              "\n" + "Dealers hand = " + str(getHandTotal(self.dealerHand)) + ": " + handNumbersToCards(self.dealerHand))
+                self.stand()
-        if playerWinState == "w":
+                # Dealers turn
-            await send("You won!")
+                dealerStood = self.dealerHitLogic()
-            win = (2*bet, 1, 0, ID)
+                # Loop ends when game is over
-            self.ledger.update(ID, win)
+                dealerWinState = self.checkHandState(self.dealerHand)  
-        elif playerWinState == "l":
+                if dealerStood:
-            await send("You busted!")
-            loss = (-bet, 0, 1, ID)
-            self.ledger.update(ID, loss)
-        elif dealerWinState == "w":
-            await send("The Dealer reached 21 before you!")
-            loss = (-bet, 0, 1, ID)
-            self.ledger.update(ID, loss)
-        elif dealerWinState == "l":
-            await send("The Dealer busted before you!")
-            win = (2*bet, 1, 0, ID)
-            self.ledger.update(ID, win)
                     
-        self.returnCards()
+                    if dealerWinState == "c":
-        if len(self.deck) < 0.25 * 52:
+
-            await send("Shuffling Deck")
+                        dealerWinState = self.compareHands()   
-            self.shuffle()
+                self.gameState = CHECKING
+                        
+            elif self.gameState == CHECKING:
+            
+                if self.checkGameOver(playerWinState) or self.checkGameOver(dealerWinState):
+                    self.gameState = FINISHED  
+                elif playerStood:
+                    self.gameState = ENDING
+                else:
+                    self.gameState = PLAYING  
+            
+            elif self.gameState == FINISHED:
+            
+                await send("Players hand = " + str(getHandTotal(self.playerHand)) + ": " + handNumbersToCards(self.playerHand) +
+                    "\n" + "Dealers hand = " + str(getHandTotal(self.dealerHand)) + ": " + handNumbersToCards(self.dealerHand))
+                if playerWinState == "w":
+                    await send("You won!")
+                    win = (2*bet, 1, 0, ID)
+                    self.ledger.update(ID, win)
+                elif playerWinState == "l":
+                    await send("You busted!")
+                    loss = (-bet, 0, 1, ID)
+                    self.ledger.update(ID, loss)
+                elif dealerWinState == "w":
+                    await send("The Dealer reached 21 before you!")
+                    loss = (-bet, 0, 1, ID)
+                    self.ledger.update(ID, loss)
+                elif dealerWinState == "l":
+                    await send("The Dealer busted before you!")
+                    win = (2*bet, 1, 0, ID)
+                    self.ledger.update(ID, win)
+
+                self.returnCards()
+                if len(self.deck) < 0.25 * 52:
+                    await send("Shuffling Deck")
+                    self.shuffle()
+                
+                self.gameState = OVER