diff --git a/Acronymbot.py b/Acronymbot.py index cb789b6..8d85260 100644 --- a/Acronymbot.py +++ b/Acronymbot.py @@ -120,7 +120,7 @@ async def calculator(interaction: discord.Interaction): async def gg(interaction: discord.Interaction): game = pick_game() - await interaction.response.send_message(game) + await interaction.response.send_message("Barotrauma") """ diff --git a/BlackJack.py b/BlackJack.py index e6f8258..0e7ae30 100644 --- a/BlackJack.py +++ b/BlackJack.py @@ -1,7 +1,6 @@ import random from Ledger import Ledger -#TODO Kill Benson #TODO Starting a game with 21 fucks with hidden cards #TODO Look into 5card jack thingo that Tim mentioned #TODO Insurance - If dealer starts with 21, you can bet against it and win your money back @@ -127,10 +126,11 @@ class Hand(): def remove_from_hand(self, index): return self.hand.pop(index) + def peek_card(self, index): + return self.hand[index] + def hide_card(self, index): - card = self.remove_from_hand(index) - card.turn_card() - self.add_to_hand(card, index) + self.peek_card(index).turn_card() def __len__(self): return len(self.hand) diff --git a/Calculator.py b/Calculator.py index 37437e0..d67c57a 100644 --- a/Calculator.py +++ b/Calculator.py @@ -141,7 +141,7 @@ class Calculator(discord.ui.View): else: self.clearRequirement += 1 self.output = self.expression(self.inputTwo, self.inputOne) - if (self.inputTwo == 9) and (self.inputOne == 10): + if (self.inputTwo == 9) and (self.inputOne == 10) and (self.expression == addition): self.output = 21 await interaction.response.edit_message( content=self.display(), diff --git a/Gamepicker.py b/Gamepicker.py index 2f07d3b..fd5cfe4 100644 --- a/Gamepicker.py +++ b/Gamepicker.py @@ -22,7 +22,6 @@ def pick_game(): randomIndex = random.randrange(0, len(games)) coinFlip = random.randrange(0, 2) - print(coinFlip) if coinFlip: return f"Valorant ({games[randomIndex]})" diff --git a/__pycache__/BlackJack.cpython-310.pyc b/__pycache__/BlackJack.cpython-310.pyc index d5d9e8c..78ebbd4 100644 Binary files a/__pycache__/BlackJack.cpython-310.pyc and b/__pycache__/BlackJack.cpython-310.pyc differ diff --git a/ledger.db b/ledger.db index 3b89f7e..556beaf 100644 Binary files a/ledger.db and b/ledger.db differ