diff --git a/BlackJack.py b/BlackJack.py index 443d71c..70447c1 100644 --- a/BlackJack.py +++ b/BlackJack.py @@ -58,6 +58,12 @@ def getHandTotal(hand): i += card return i +def showDeck(deck): + string = "" + for card in deck: + string += convertNumberToCard(card) + return string + class BlackJack: def __init__(self): self.playerTurn = True @@ -78,7 +84,7 @@ class BlackJack: self.discard.extend(self.playerHand) self.playerHand.clear() self.discard.extend(self.dealerHand) - self.playerHand.clear() + self.dealerHand.clear() def deal(self): generateHand(self.playerHand, self.deck) @@ -136,9 +142,9 @@ class BlackJack: if playerStats is None: self.ledger.writeLedger(ID) playerStats = self.ledger.readLedger - + + self.deal() while not gameOver: - self.deal() playerWinState = self.checkHandState(self.playerHand) dealerWinState = self.checkHandState(self.dealerHand) gameOver = self.checkGameOver(playerWinState) or self.checkGameOver(dealerWinState) @@ -176,28 +182,27 @@ class BlackJack: if self.checkGameOver(dealerWinState): continue - + 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.updateLedger(playerStats, win) + # self.ledger.updateLedger(playerStats, win) elif playerWinState == "l": await send("You busted!") loss = (-bet, 0, 1, ID) - self.ledger.updateLedger(playerStats, loss) + # self.ledger.updateLedger(playerStats, loss) elif dealerWinState == "w": await send("The Dealer reached 21 before you!") loss = (-bet, 0, 1, ID) - self.ledger.updateLedger(playerStats, loss) + # self.ledger.updateLedger(playerStats, loss) elif dealerWinState == "l": await send("The Dealer busted before you!") win = (2*bet, 1, 0, ID) - self.ledger.updateLedger(playerStats, win) + # self.ledger.updateLedger(playerStats, win) + self.returnCards() if len(self.deck) < 0.25 * 52: await send("Shuffling Deck") - self.returnCards() self.shuffle() - diff --git a/__pycache__/BlackJack.cpython-310.pyc b/__pycache__/BlackJack.cpython-310.pyc index cd158b5..257f604 100644 Binary files a/__pycache__/BlackJack.cpython-310.pyc and b/__pycache__/BlackJack.cpython-310.pyc differ diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e69de29..0000000