diff --git a/BlackJack.py b/BlackJack.py index 72f8c65..160c2da 100644 --- a/BlackJack.py +++ b/BlackJack.py @@ -48,11 +48,7 @@ def generateHand(hand, deck, handSize = 2): addCardToHand(hand, deck) i += 1 -def handNumbersToCards(hand): - cards = "" - for a in hand: - cards += convertNumberToCard(a) - return cards +def handNumbersToCards(hand): return [convertNumberToCard(a) for a in hand] def getHandTotal(hand): cardValue = lambda c: min(c % 13 + 1, 10) @@ -66,7 +62,7 @@ def getHandTotal(hand): i += card return i -class BlackJackLedger(Ledger.Ledger): +class BlackJackLedger(Ledger): def __init__(self) -> None: super().__init__() @@ -95,7 +91,7 @@ class BlackJack: self.recv = recv self.send = send - self.ledger = BlackJackLedger() + ledger = BlackJackLedger() def getPH(self): return self.playerHand @@ -156,7 +152,7 @@ class BlackJack: validInput = False gameOver = False playerStood = False - playerStats = self.ledger.readLedger(ID) + playerStats = self.readLedger(ID) if playerStats is None: playerStats = (ID, 100, 0, 0) @@ -203,19 +199,13 @@ class BlackJack: "\n" + "Dealers hand = " + str(getHandTotal(self.dealerHand)) + ": " + handNumbersToCards(self.dealerHand)) if playerWinState == "w": await self.send("You won!") - win = (ID, 2*bet, 1, 0) - self.ledger.writeLedger(ID, win) + # self.writeLedger(ID, 2*bet, True) elif playerWinState == "l": await self.send("You busted!") - loss = (ID, -bet, 0, 1) - self.ledger.writeLedger(ID, loss) + # self.writeLedger(ID, -bet, False) elif dealerWinState == "w": await self.send("The Dealer reached 21 before you!") - loss = (ID, -bet, 0, 1) - self.ledger.writeLedger(ID, loss) + # self.writeLedger(ID, -bet, False) elif dealerWinState == "l": await self.send("The Dealer busted before you!") - win = (ID, 2*bet, 1, 0) - self.ledger.writeLedger(ID, win) - - await self.send(f"{ID}'s score: {self.ledger.readLedger(ID)}") + # self.writeLedger(ID, 2*bet, True) diff --git a/Ledger.py b/Ledger.py index b63c8cb..fd1ccb9 100644 --- a/Ledger.py +++ b/Ledger.py @@ -1,4 +1,4 @@ -import pickle +import sqlite3 class Ledger(): def __init__(self) -> None: @@ -27,3 +27,14 @@ class Ledger(): def updateLedger(self, data, newData): return data + +def main(): + conn = sqlite3.connect("ledger.db") + cur = conn.cursor() + table = """ CREATE TABLE IF NOT EXISTS + + """ + cur.execute(table) + +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 0c2ff13..fbb709f 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 deleted file mode 100644 index e5cf62f..0000000 Binary files a/__pycache__/Ledger.cpython-310.pyc and /dev/null differ diff --git a/data.pickle b/data.pickle deleted file mode 100644 index e69de29..0000000