Update roulette.py

roulette.py

@@ -2,101 +2,130 @@ import discord
 from discord import app_commands
 import random
 
-# Simple in-memory storage for user balances
-user_cash = {}
-
-# Colors for roulette
-ROULETTE_COLORS = ["red", "green", "black"]
+from cash import user_cash  # Ensure you have a 'cash.py' with a 'user_cash' dictionary
 
 class RouletteView(discord.ui.View):
-    def __init__(self, user_id, bet, choice, balance):
+    def __init__(self, user_id: int, bet: int, balance: float):
         super().__init__(timeout=None)
         self.user_id = user_id
         self.bet = bet
-        self.choice = choice
         self.balance = balance
+        self.add_item(RollRouletteButton())
+
+class RollRouletteButton(discord.ui.Button):
+    def __init__(self):
+        super().__init__(style=discord.ButtonStyle.primary, label="Spin the Wheel", custom_id="roll_roulette")
 
-    @discord.ui.button(label="Spin the Roulette", style=discord.ButtonStyle.primary, custom_id="spin_button")
-    async def spin_button_callback(self, interaction: discord.Interaction, button: discord.ui.Button):
-        if interaction.user.id != self.user_id:
-            await interaction.response.send_message("You are not authorized to use this button.", ephemeral=True)
+    async def callback(self, interaction: discord.Interaction):
+        if interaction.user.id != self.view.user_id:
+            await interaction.response.send_message("You can't spin this wheel.", ephemeral=True)
             return
 
-        # Simulate spinning the roulette
-        await interaction.response.defer()  # Acknowledge the interaction to allow more time
+        # Simulate roulette spin
+        number = random.randint(0, 36)
+        color = self.get_color(number)
+        win = False
+        payout = 0
 
-        result = random.choices(ROULETTE_COLORS, weights=[18, 1, 18], k=1)[0]
+        # Simple roulette logic: win if number is even, lose otherwise
+        if number != 0 and number % 2 == 0:
+            win = True
+            payout = self.view.bet  # 1:1 payout
 
-        if result == self.choice:
-            if result == "green":
-                winnings = self.bet * 14  # Green typically has higher payout
-                self.balance += winnings
-                result_text = f"🎉 You won ${winnings:.2f}! The ball landed on **GREEN**."
-            else:
-                winnings = self.bet * 2
-                self.balance += winnings
-                result_text = f"🎉 You won ${winnings:.2f}! The ball landed on **{result.upper()}**."
+        if win:
+            self.view.balance += payout
+            result_text = f"🎉 You won ${payout:.2f}! The ball landed on {number} ({color})."
         else:
-            self.balance -= self.bet
-            result_text = f"😞 You lost ${self.bet:.2f}. The ball landed on **{result.upper()}**."
+            self.view.balance -= self.view.bet
+            result_text = f"😞 You lost ${self.view.bet:.2f}. The ball landed on {number} ({color})."
 
-        # Update user balance
-        user_cash[self.user_id] = self.balance
+        # Update user's balance
+        user_cash[self.view.user_id] = self.view.balance
 
-        embed = discord.Embed(title="🎰 Roulette Result", color=0xFFD700)
-        embed.add_field(name="Result", value=result_text, inline=False)
-        embed.add_field(name="New Balance", value=f"${self.balance:.2f}", inline=False)
+        # Create a new embed with the result
+        embed = discord.Embed(title="🎰 Roulette Spin", description=result_text, color=0x787878)
+        embed.add_field(name="New Balance", value=f"${self.view.balance:.2f}", inline=False)
 
-        # Disable the button after spin to prevent multiple spins
-        self.disable_all_items()
+        # Update the view with a "Spin Again" button
+        self.view.clear_items()
+        self.view.add_item(SpinAgainButton())
 
-        await interaction.edit_original_response(embed=embed, view=self)
+        await interaction.response.edit_message(embed=embed, view=self.view)
 
-class RouletteBotClient(discord.Client):
+    @staticmethod
+    def get_color(number: int) -> str:
+        if number == 0:
+            return "Green"
+        # Simplified color assignment for demonstration
+        return "Red" if number % 2 == 0 else "Black"
+
+class SpinAgainButton(discord.ui.Button):
     def __init__(self):
-        intents = discord.Intents.default()
-        intents.message_content = True
-        super().__init__(intents=intents)
-        self.tree = app_commands.CommandTree(self)
-
-    async def setup_hook(self):
-        await self.tree.sync()
-
-    async def on_ready(self):
-        print(f'Logged in as {self.user} (ID: {self.user.id})')
-        print('------')
-
-client = RouletteBotClient()
-
-@client.tree.command(name="roulette", description="Play a game of roulette!")
-@app_commands.describe(
-    bet="Amount you want to bet",
-    choice="Choose red, green, or black"
-)
-async def roulette(interaction: discord.Interaction, bet: float, choice: str):
-    user_id = interaction.user.id
-    choice = choice.lower()
+        super().__init__(style=discord.ButtonStyle.success, label="Spin Again", custom_id="spin_again")
 
-    if choice not in ROULETTE_COLORS:
-        await interaction.response.send_message("choose **red**, **green**, or **black**.", ephemeral=True)
-        return
+    async def callback(self, interaction: discord.Interaction):
+        if interaction.user.id != self.view.user_id:
+            await interaction.response.send_message("You can't spin this wheel.", ephemeral=True)
+            return
+
+        # Prevent betting if balance is insufficient
+        if self.view.bet > self.view.balance:
+            await interaction.response.send_message(
+                f"You don't have enough cash to spin again. Your current balance is ${self.view.balance:.2f}",
+                ephemeral=True
+            )
+            return
+
+        await interaction.response.defer()
+
+        # Create an embed to show the betting status
+        embed = discord.Embed(
+            title="🎰 Roulette Spin",
+            description=f"{interaction.user.name} is betting ${self.view.bet:.2f}",
+            color=0xFFA500
+        )
+        embed.add_field(name="Current Balance", value=f"${self.view.balance:.2f}", inline=False)
+
+        # Replace buttons with a new roll button
+        self.view.clear_items()
+        self.view.add_item(RollRouletteButton())
+
+        await interaction.edit_message(embed=embed, view=self.view)
+
+@app_commands.command(name="roulette", description="Play roulette and place a bet.")
+async def roulette(interaction: discord.Interaction, bet: int):
+    await play_roulette(interaction, bet)
+
+async def play_roulette(interaction: discord.Interaction, bet: int):
+    user_id = interaction.user.id
+    balance = user_cash.get(user_id, 0)
 
     if bet <= 0:
-        await interaction.response.send_message("Your bet must be higher than $0.", ephemeral=True)
+        await interaction.response.send_message("❌ Your bet must be higher than $0.", ephemeral=True)
         return
 
-    balance = user_cash.get(user_id, 1000.0)  # Default starting balance
-
     if bet > balance:
-        await interaction.response.send_message(f"You don't have MONEY. Your current balance is ${balance:.2f}.", ephemeral=True)
+        await interaction.response.send_message(
+            f"❌ You don't have enough cash to bet ${bet:.2f}. Your current balance is ${balance:.2f}.",
+            ephemeral=True
+        )
         return
 
-    # Deduct the bet initially
-    balance -= bet
-    user_cash[user_id] = balance
-
-    embed = discord.Embed(title="🎲 Roulette Started", description=f"{interaction.user.mention} has placed a bet of ${bet:.2f} on **{choice.upper()}**.", color=0x787878)
+    # Create an embed to show the betting status
+    embed = discord.Embed(
+        title="🎰 Roulette Spin",
+        description=f"{interaction.user.name} is betting ${bet:.2f}",
+        color=0xFFA500
+    )
     embed.add_field(name="Current Balance", value=f"${balance:.2f}", inline=False)
 
-    view = RouletteView(user_id, bet, choice, balance)
-    await interaction.response.send_message(embed=embed, view=view)
+    # Initialize the view with the Spin button
+    view = RouletteView(user_id=user_id, bet=bet, balance=balance)
+    
+    # Add the RollRouletteButton to the view
+    view.add_item(RollRouletteButton())
+
+    if interaction.response.is_done():
+        await interaction.followup.send(embed=embed, view=view)
+    else:
+        await interaction.response.send_message(embed=embed, view=view)