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 9b2f7de..557540f 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 index 7f10395..1f8cdbd 100644 Binary files a/__pycache__/Ledger.cpython-310.pyc and b/__pycache__/Ledger.cpython-310.pyc differ diff --git a/ledger.db b/ledger.db index 64d1303..4a67600 100644 Binary files a/ledger.db and b/ledger.db differ diff --git a/ledger.db-journal b/ledger.db-journal new file mode 100644 index 0000000..fe06286 Binary files /dev/null and b/ledger.db-journal differ