From e729647f6505fd29245878720be8702e468403b4 Mon Sep 17 00:00:00 2001 From: BigGamerGary Date: Mon, 28 Nov 2022 19:10:35 +1000 Subject: [PATCH] Sadness --- BlackJack.py | 26 ++++++++------------------ Ledger.py | 13 ++++++++++++- __pycache__/BlackJack.cpython-310.pyc | Bin 5837 -> 6332 bytes __pycache__/Ledger.cpython-310.pyc | Bin 2122 -> 0 bytes data.pickle | 0 5 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 __pycache__/Ledger.cpython-310.pyc delete mode 100644 data.pickle 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 0c2ff13fd850cd96fc03cd53b40ff64bfddbfcae..fbb709fdb15eea1e6f234d21d5d3f8015503eee8 100644 GIT binary patch literal 6332 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 diff --git a/data.pickle b/data.pickle deleted file mode 100644 index e69de29..0000000