From e8c1fbb73b26d4fe4eb6dc0317a725b0461a9367 Mon Sep 17 00:00:00 2001 From: BigGamerGary Date: Fri, 9 Jun 2023 20:51:57 +1000 Subject: [PATCH] Blackjack ledger works --- Acronymbot.py | 7 +++---- BlackJack.py | 10 +++++----- Calculator.py | 7 +++++++ Ledger.py | 12 +++++++----- __pycache__/BlackJack.cpython-310.pyc | Bin 5464 -> 5540 bytes __pycache__/Ledger.cpython-310.pyc | Bin 2742 -> 2820 bytes ledger.db | Bin 8192 -> 8192 bytes ledger.db-journal | Bin 0 -> 4616 bytes 8 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 ledger.db-journal diff --git a/Acronymbot.py b/Acronymbot.py index 4c4fcd6..26e9fa5 100644 --- a/Acronymbot.py +++ b/Acronymbot.py @@ -98,11 +98,10 @@ async def discordOutput(interaction: discord.Interaction, message): @tree.command(description="Find your Balance") async def bal(interaction: discord.Interaction): - conn = sqlite3.connect("ledger.db") - cur = conn.cursor() ID = interaction.user.id - data = cur.execute("SELECT * FROM ledger WHERE USERID = ?", (ID,)) - await interaction.response.send_message(data) + data = blackJack.ledger.read(ID) + data = list(data) + await interaction.response.send_message(f"Wins:{data[2]}, Losses:{data[3]}. ${data[1]}") """ #### Calculator #### diff --git a/BlackJack.py b/BlackJack.py index 474069d..702230b 100644 --- a/BlackJack.py +++ b/BlackJack.py @@ -139,7 +139,7 @@ class BlackJack: playerStats = self.ledger.read(ID) if playerStats is None: self.ledger.write(ID) - playerStats = self.ledger.read + playerStats = self.ledger.read(ID) self.deal() while not gameOver: @@ -190,19 +190,19 @@ class BlackJack: if playerWinState == "w": await send("You won!") win = (2*bet, 1, 0, ID) - # self.ledger.updateLedger(playerStats, win) + self.ledger.update(ID, win) elif playerWinState == "l": await send("You busted!") loss = (-bet, 0, 1, ID) - # self.ledger.updateLedger(playerStats, loss) + self.ledger.update(ID, loss) elif dealerWinState == "w": await send("The Dealer reached 21 before you!") loss = (-bet, 0, 1, ID) - # self.ledger.updateLedger(playerStats, loss) + self.ledger.update(ID, loss) elif dealerWinState == "l": await send("The Dealer busted before you!") win = (2*bet, 1, 0, ID) - # self.ledger.updateLedger(playerStats, win) + self.ledger.update(ID, win) self.returnCards() if len(self.deck) < 0.25 * 52: diff --git a/Calculator.py b/Calculator.py index 6a874cc..fb9d45f 100644 --- a/Calculator.py +++ b/Calculator.py @@ -36,6 +36,7 @@ class Calculator(discord.ui.View): self.inputOne = 0 self.inputTwo = None self.output = None + self.clearRequirement = 0 def display(self): inputOneLength = self.numDigits(self.inputOne) @@ -129,6 +130,12 @@ class Calculator(discord.ui.View): @discord.ui.button(label="=", style=discord.ButtonStyle.green, row=4) async def equals(self, interaction: discord.Interaction, button: discord.ui.Button): + + if self.inputTwo is None: + await interaction.response.edit_message( + content="ERROR", + view=self) + if self.clearRequirement: self.clear() else: diff --git a/Ledger.py b/Ledger.py index 534c62e..8df1653 100644 --- a/Ledger.py +++ b/Ledger.py @@ -14,8 +14,9 @@ class Database(): self.data.execute(insertQuery, (ID,)) self.db.commit() - def update(self, data, newData, updateQuery): + def update(self, ID, data, newData, updateQuery): data = [data[i] + newData[i] for i in range(len(data))] + data.append(ID) self.data.execute(updateQuery, data) class Ledger(Database): @@ -37,15 +38,16 @@ class Ledger(Database): def write(self, ID): insertQuery = """ INSERT INTO ledger(USERID) VALUES(?) """ - super().read(ID, insertQuery) + super().write(ID, insertQuery) - def update(self, data, newData): + def update(self, ID, newData): query = """ UPDATE ledger SET MONEY = ?, WINS = ?, - LOSSES = ?, + LOSSES = ? WHERE USERID = ?""" - super().update(data, newData, query) + data = list(self.read(ID))[1:] + super().update(ID, data, newData, query) def main(): pass diff --git a/__pycache__/BlackJack.cpython-310.pyc b/__pycache__/BlackJack.cpython-310.pyc index 9b2f7de9e3c0ee5ad7303149a6dad8596daeb9fc..557540f4f64098ae811d7cd723ca135285619978 100644 GIT binary patch delta 453 zcmZXQJxc>Y5QcZoTyl50%k5oaM2*oPDky$60WItV12z`6g0LwxpyrIIuz`^DVwlvD z1JQt$mFSPqR?_(w>{L+aE})3J3_Hxb&%DDtPhZYh`<7)eIE!CgY^3QuS8Kc)};KV=w4+854R*@hbRY z_b=7xn-zeV$&^X-RRMQ s*sc_@>)zNM+P_kZfC(CfiLK;umIDU^5_JE*oGO}vxs-%0yhuHK1JU1god5s; delta 355 zcmY+Ay-EW?5XW~ex!m{d-6bZF#4kh$N<>Jbkj6^$0AgjgAS8H_RY;LN38b|U=LPN{ zR@zvI;4_#$&tPe3qjQRd3$yI}=KtT>+1d7D%e(MAo6&k}?~C}!`}E-sP2OCuDb{DH zrXT}g`MD2CNwKt$G0OGJ7wqwNxJSfLP6mmtblDv?FbOvCk?(dU$`IB-ladr}?h$rk z#V%2Y=rvLAk5a`{mOMiqEb*IRLz(hkIl?8~3_HOFz33!ZHJ+)W%Vp|ttbeGY;5ZKJ zZroM2hz8m%$PzkX(~Vo?^?yJe4{}f;@T=ItQMlGh{k-!Pr>TM|i0Xim`H*g`O`*pG yJIW_yX^8Xi3nH9HJzOb2@RWW@n-swXGY?#pN7V>y&4=LMZWi#oqTm$YE3e-IXjwb} diff --git a/__pycache__/Ledger.cpython-310.pyc b/__pycache__/Ledger.cpython-310.pyc index 7f10395fbd525f51fd2d1dc36409d29e18dff60c..1f8cdbd40fd02c003f7b0ac6158049cf7c2598cf 100644 GIT binary patch delta 599 zcmZ8eO-md>5bf&j*_|ETH6**UCXu*)>~0206ft7{fDi~F7|1OQgENRSZZ#nMzY-(s%G6j`!jzNpE^Kg2+$Z~-7vv84t&)#gZDy|gk5gU&{jsW|Fng`nGwIw6)Q z54nJ6;RtireALUu0?`R@%&}gBhM9Njzy9i5fV#OZoN7;E%j^~>t8GrGFpM!gA(%3k z#gi6C@J*ee#_%AN9WC?OZm;qHTrD49fk+4kszoMD)yt^__}%90FKXb{WF zzP}y^NwOZrvF{J1%k|5v<{~yJ&LvCuQ*2RzQD@YuTG%wodAGR49!a19U(uG?zP}x8 gc6^_vVkwcG$dBZHoTkqkH)l@0RJC8&$^m_M4>-GQcK`qY delta 499 zcmZ8dJxc>Y5WT&SOLD57fA7Hp(p>-@4OCf@d zWe{xa{2A9O_z!G#=CE>M-puZs*_k)D+1HHKO(aYWPmy=rx5&)e=8Fd1{|?1u9IaPZ z$J~~_cB)Ug&((y_3PvEH)oFVHKl3^e!z`fh90TT5+t?9QTU1ZRA+y!k%)MCRi?OWw zj@%p1I@Hu%)K0HZl|?X5kU}V__vpliHM(aA{^jKGt)_-@wN4ELS~y@H1DB0?U%Sz! z%xAvt^GD7!S3A-ieSh?zKIBl}EU7J-QQcVb+QAvH25bbHnc`4H0i!@%4m`N}-8TYV2oNIDYA=wO+kLXadNZ9v0^9Rrmy7b>B&P9e#*OFIrm0JWLZ0kra#RBYV+sH%(hm~= delta 50 zcmZp0XmFSy&B!!S#+i|6W5N=CHb(yU4E*mm3ksa&pV%NF$j`{ez{beI!MHtsa#RBY GV+sIV?hNSw diff --git a/ledger.db-journal b/ledger.db-journal new file mode 100644 index 0000000000000000000000000000000000000000..fe062861408064a61c6f1169b8aefc3fa2fc93c9 GIT binary patch literal 4616 zcmZQzKmc>8Z(%?l6BscFAS6av!#M<)ctMfQe~*FxJ&+g$qaiRF0;3@?8UmvsFd71* zAut*OqaiRF0;3@?8UmvsFd70wFa-FS*cjLtIXIXsYp2uz$97Wq86g6U+v6ukH83!y HfX00QVw?-A literal 0 HcmV?d00001