diff --git a/BlackJack.py b/BlackJack.py index 160c2da..72f8c65 100644 --- a/BlackJack.py +++ b/BlackJack.py @@ -48,7 +48,11 @@ def generateHand(hand, deck, handSize = 2): addCardToHand(hand, deck) i += 1 -def handNumbersToCards(hand): return [convertNumberToCard(a) for a in hand] +def handNumbersToCards(hand): + cards = "" + for a in hand: + cards += convertNumberToCard(a) + return cards def getHandTotal(hand): cardValue = lambda c: min(c % 13 + 1, 10) @@ -62,7 +66,7 @@ def getHandTotal(hand): i += card return i -class BlackJackLedger(Ledger): +class BlackJackLedger(Ledger.Ledger): def __init__(self) -> None: super().__init__() @@ -91,7 +95,7 @@ class BlackJack: self.recv = recv self.send = send - ledger = BlackJackLedger() + self.ledger = BlackJackLedger() def getPH(self): return self.playerHand @@ -152,7 +156,7 @@ class BlackJack: validInput = False gameOver = False playerStood = False - playerStats = self.readLedger(ID) + playerStats = self.ledger.readLedger(ID) if playerStats is None: playerStats = (ID, 100, 0, 0) @@ -199,13 +203,19 @@ class BlackJack: "\n" + "Dealers hand = " + str(getHandTotal(self.dealerHand)) + ": " + handNumbersToCards(self.dealerHand)) if playerWinState == "w": await self.send("You won!") - # self.writeLedger(ID, 2*bet, True) + win = (ID, 2*bet, 1, 0) + self.ledger.writeLedger(ID, win) elif playerWinState == "l": await self.send("You busted!") - # self.writeLedger(ID, -bet, False) + loss = (ID, -bet, 0, 1) + self.ledger.writeLedger(ID, loss) elif dealerWinState == "w": await self.send("The Dealer reached 21 before you!") - # self.writeLedger(ID, -bet, False) + loss = (ID, -bet, 0, 1) + self.ledger.writeLedger(ID, loss) elif dealerWinState == "l": await self.send("The Dealer busted before you!") - # self.writeLedger(ID, 2*bet, True) + win = (ID, 2*bet, 1, 0) + self.ledger.writeLedger(ID, win) + + await self.send(f"{ID}'s score: {self.ledger.readLedger(ID)}") diff --git a/Ledger.py b/Ledger.py index ebd3163..b63c8cb 100644 --- a/Ledger.py +++ b/Ledger.py @@ -22,19 +22,8 @@ class Ledger(): self.data.append(data) index = len(self.data) - 1 self.indexes.update({ID: index}) + + self.saveLedger() def updateLedger(self, data, newData): return data - - -def main(): - ledger = Ledger() - ledger.writeLedger("Sus", [0,1]) - ledger.writeLedger("Cum", [2,2]) - print(ledger.readLedger("Cum")) - ledger.writeLedger("Cum", [2,3]) - print(ledger.readLedger("Cum")) - - -if __name__ == "__main__": - main() \ No newline at end of file diff --git a/__pycache__/BlackJack.cpython-310.pyc b/__pycache__/BlackJack.cpython-310.pyc index fbb709f..0c2ff13 100644 Binary files a/__pycache__/BlackJack.cpython-310.pyc and b/__pycache__/BlackJack.cpython-310.pyc differ diff --git a/__pycache__/Ledger.cpython-310.pyc b/__pycache__/Ledger.cpython-310.pyc new file mode 100644 index 0000000..e5cf62f Binary files /dev/null and b/__pycache__/Ledger.cpython-310.pyc differ diff --git a/data.pickle b/data.pickle new file mode 100644 index 0000000..e69de29