Update petroll.py

petroll.py

@@ -5,108 +5,14 @@ import random
 import time
 import asyncio
 
-from cash import user_cash  # Ensure you have a 'cash.py' with a 'user_cash' dictionary
+from cash import user_cash
 
-# Dictionaries to manage user states
 luck_multipliers = {}
 luck_expiration = {}
 luck_opportunities = {}
 used_luck_opportunities = {}
 first_luck_claimed = set()
 auto_roll_users = set()
-auto_sell_users = set()
-
-class PetRollView(discord.ui.View):
-    def __init__(self, rap_value, user_id):
-        super().__init__(timeout=None)
-        self.rap_value = rap_value
-        self.user_id = user_id
-        self.pet_sold = False
-        self.auto_sell = False
-
-        # Add buttons
-        self.add_item(discord.ui.Button(style=discord.ButtonStyle.primary, label="Roll Again", custom_id="roll_again"))
-        self.add_item(discord.ui.Button(style=discord.ButtonStyle.success, label=f"Sell Pet for ${self.rap_value}", custom_id="sell_pet"))
-        self.add_item(discord.ui.Button(style=discord.ButtonStyle.primary, label="Auto Pet Sell", custom_id="auto_pet_sell"))
-    
-    async def interaction_check(self, interaction: discord.Interaction) -> bool:
-        if interaction.user.id != self.user_id:
-            await interaction.response.send_message("You cannot interact with these buttons.", ephemeral=True)
-            return False
-        return True
-
-    @discord.ui.button(style=discord.ButtonStyle.primary, label="Roll Again", custom_id="roll_again")
-    async def roll_again_button(self, button: discord.ui.Button, interaction: discord.Interaction):
-        await interaction.response.defer()
-        result = await perform_roll(interaction)
-        if result:
-            await interaction.followup.send(embed=result[0], view=result[1])
-        else:
-            await interaction.followup.send("An error occurred.")
-
-    @discord.ui.button(style=discord.ButtonStyle.success, label="Sell Pet", custom_id="sell_pet")
-    async def sell_pet_button(self, button: discord.ui.Button, interaction: discord.Interaction):
-        if self.pet_sold:
-            await interaction.response.send_message("This pet has already been sold.", ephemeral=True)
-            return
-
-        sell_value = self.rap_value
-        user_cash[self.user_id] = user_cash.get(self.user_id, 0) + sell_value
-        self.pet_sold = True
-        await interaction.response.send_message(f"You sold the pet for ${sell_value}. Your new balance is ${user_cash[self.user_id]}.", ephemeral=True)
-        
-        # Remove the sell button to prevent duplicate sales
-        self.sell_pet_button.disabled = True
-        self.sell_pet_button.label = "Sold"
-        await interaction.message.edit(view=self)
-
-        # If auto-sell is enabled, ensure it's disabled since the pet is already sold
-        if self.auto_sell:
-            self.auto_sell = False
-            self.auto_pet_sell_button.label = "Auto Pet Sell"
-            await interaction.message.edit(view=self)
-
-    @discord.ui.button(style=discord.ButtonStyle.primary, label="Auto Pet Sell", custom_id="auto_pet_sell")
-    async def auto_pet_sell_button(self, button: discord.ui.Button, interaction: discord.Interaction):
-        if self.auto_sell:
-            self.auto_sell = False
-            auto_sell_users.discard(self.user_id)
-            button.label = "Auto Pet Sell"
-            await interaction.response.send_message("Auto pet sell stopped.", ephemeral=True)
-        else:
-            if self.pet_sold:
-                await interaction.response.send_message("This pet has already been sold.", ephemeral=True)
-                return
-            self.auto_sell = True
-            auto_sell_users.add(self.user_id)
-            button.label = "Stop Auto Pet Sell"
-            await interaction.response.send_message("Auto pet sell started. You cannot manually sell pets while auto-sell is enabled.", ephemeral=True)
-            asyncio.create_task(auto_sell_process(interaction, self))
-
-        await interaction.message.edit(view=self)
-
-async def auto_sell_process(interaction: discord.Interaction, view: PetRollView):
-    user_id = view.user_id
-    try:
-        while view.auto_sell and not view.pet_sold:
-            # Automatically sell the pet
-            sell_value = view.rap_value
-            user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
-            view.pet_sold = True
-            await interaction.followup.send(f"Auto-sell: You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
-
-            # Disable the sell button
-            view.sell_pet_button.disabled = True
-            view.sell_pet_button.label = "Sold"
-            # Disable auto-sell as the pet is already sold
-            view.auto_sell = False
-            view.auto_pet_sell_button.label = "Auto Pet Sell"
-            await interaction.message.edit(view=view)
-            break
-
-            # If you want auto-sell to handle multiple pets rolled, you can extend this logic
-    except Exception as e:
-        print(f"Auto-sell process encountered an error: {e}")
 
 async def perform_roll(interaction: discord.Interaction):
     async def fetch_data(url):
@@ -129,12 +35,12 @@ async def perform_roll(interaction: discord.Interaction):
 
     user_id = interaction.user.id
     luck_multiplier = luck_multipliers.get(user_id, 1)
-
+    
     sorted_pets = sorted(pets, key=lambda x: x['configData']['difficulty'])
-
+    
     max_index = len(sorted_pets) - 1
     index = int(max_index * (luck_multiplier - 1) / 9)
-
+    
     rolled_pet = random.choice(sorted_pets[:index+1])
 
     pet_rap = next((pet for pet in rap_data['data'] if pet['configData']['id'] == rolled_pet['configName']), None)
@@ -156,10 +62,15 @@ async def perform_roll(interaction: discord.Interaction):
         else:
             return f"{difficulty} ({difficulty:,})"
 
+    # Automatically sell the pet
+    sell_value = rap_value
+    user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
+
     embed = discord.Embed(title=f"{interaction.user.name} rolled: {rolled_pet['configData']['name']}", color=0x787878)
     embed.add_field(name="Value", value=f"{rap_value:,} diamonds", inline=True)
     embed.add_field(name="Difficulty", value=format_difficulty(rolled_pet['configData']['difficulty']), inline=True)
     embed.add_field(name="Category", value=rolled_pet['category'], inline=True)
+    embed.add_field(name="Sold For", value=f"${sell_value:,}", inline=True)
     embed.set_thumbnail(url=thumbnail_url)
     
     luck_text = ""
@@ -174,12 +85,22 @@ async def perform_roll(interaction: discord.Interaction):
     
     embed.set_footer(text=f"Click 'Roll Again' to roll again!{luck_text}")
 
-    # Initialize the custom view
-    view = PetRollView(rap_value=rap_value, user_id=user_id)
+    roll_again_button = discord.ui.Button(style=discord.ButtonStyle.primary, label="Roll Again", custom_id="roll_again")
+    
+    async def roll_again_callback(interaction: discord.Interaction):
+        await interaction.response.defer()
+        result = await perform_roll(interaction)
+        if result:
+            await interaction.followup.send(embed=result[0], view=result[1])
+        else:
+            await interaction.followup.send("An error occurred.")
+
+    roll_again_button.callback = roll_again_callback
+
+    view = discord.ui.View()
+    view.add_item(roll_again_button)
 
-    # Handle first luck claim
     if user_id not in first_luck_claimed:
-        # Add the first luck button
         first_luck_button = discord.ui.Button(style=discord.ButtonStyle.success, label="Claim 100% Luck Forever", custom_id="first_luck")
         
         async def first_luck_callback(interaction: discord.Interaction):
@@ -192,15 +113,16 @@ async def perform_roll(interaction: discord.Interaction):
             
             await interaction.response.send_message("You've claimed 100% luck forever!", ephemeral=True)
             
-            # Remove the first luck button
-            view.remove_item(first_luck_button)
+            for item in view.children:
+                if item.custom_id == "first_luck":
+                    view.remove_item(item)
+                    break
             await interaction.message.edit(view=view)
         
         first_luck_button.callback = first_luck_callback
         view.add_item(first_luck_button)
     
     elif random.random() < 0.6 or user_id not in luck_multipliers:
-        # Add the increase luck button
         luck_opportunities[user_id] = luck_opportunities.get(user_id, 0) + 1
         increase_luck_button = discord.ui.Button(style=discord.ButtonStyle.success, label="Increase Luck", custom_id=f"increase_luck_{luck_opportunities[user_id]}")
         
@@ -216,7 +138,7 @@ async def perform_roll(interaction: discord.Interaction):
             current_luck = luck_multipliers.get(user_id, 1)
             new_luck = min(current_luck + 1, 10)
             luck_multipliers[user_id] = new_luck
-            luck_expiration[user_id] = time.time() + 1800  # 30 minutes
+            luck_expiration[user_id] = time.time() + 1800
             
             if user_id not in used_luck_opportunities:
                 used_luck_opportunities[user_id] = set()
@@ -225,8 +147,10 @@ async def perform_roll(interaction: discord.Interaction):
             luck_percentage = (new_luck - 1) * 100
             await interaction.response.send_message(f"Your luck has been increased to {luck_percentage}% for 30 minutes!", ephemeral=True)
             
-            # Remove the increase luck button
-            view.remove_item(increase_luck_button)
+            for item in view.children:
+                if item.custom_id == interaction.custom_id:
+                    view.remove_item(item)
+                    break
             await interaction.message.edit(view=view)
 
             # Schedule the next luck opportunity
@@ -235,13 +159,46 @@ async def perform_roll(interaction: discord.Interaction):
         increase_luck_button.callback = increase_luck_callback
         view.add_item(increase_luck_button)
 
+    auto_roll_button = discord.ui.Button(
+        style=discord.ButtonStyle.primary if user_id not in auto_roll_users else discord.ButtonStyle.danger,
+        label="Auto Roll" if user_id not in auto_roll_users else "Stop Auto Roll",
+        custom_id="auto_roll"
+    )
+
+    async def auto_roll_callback(interaction: discord.Interaction):
+        if interaction.user.id != user_id:
+            await interaction.response.send_message("You cannot use this button.", ephemeral=True)
+            return
+
+        if user_id in auto_roll_users:
+            auto_roll_users.remove(user_id)
+            auto_roll_button.style = discord.ButtonStyle.primary
+            auto_roll_button.label = "Auto Roll"
+            await interaction.response.send_message("Auto roll stopped.", ephemeral=True)
+        else:
+            auto_roll_users.add(user_id)
+            auto_roll_button.style = discord.ButtonStyle.danger
+            auto_roll_button.label = "Stop Auto Roll"
+            await interaction.response.send_message("Auto roll started. It will automatically stop after 3 minutes.", ephemeral=True)
+            asyncio.create_task(auto_roll(interaction))
+
+        await interaction.message.edit(view=view)
+
+    auto_roll_button.callback = auto_roll_callback
+    view.add_item(auto_roll_button)
+
+    # Auto Sell is now default and always active
+    sell_value = rap_value
+    user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
+    embed.add_field(name="Auto Sell", value=f"Pet automatically sold for ${sell_value:,}. New balance: ${user_cash[user_id]:,}", inline=False)
+
     return embed, view
 
 async def schedule_next_luck_opportunity(interaction: discord.Interaction, user_id: int):
     await asyncio.sleep(1800)  # Wait for 30 minutes
     luck_opportunities[user_id] = luck_opportunities.get(user_id, 0) + 1
     increase_luck_button = discord.ui.Button(style=discord.ButtonStyle.success, label="Increase Luck", custom_id=f"increase_luck_{luck_opportunities[user_id]}")
-    
+
     async def increase_luck_callback(interaction: discord.Interaction):
         if interaction.user.id != user_id:
             await interaction.response.send_message("You cannot use this button.", ephemeral=True)
@@ -254,7 +211,7 @@ async def schedule_next_luck_opportunity(interaction: discord.Interaction, user_
         current_luck = luck_multipliers.get(user_id, 1)
         new_luck = min(current_luck + 1, 10)
         luck_multipliers[user_id] = new_luck
-        luck_expiration[user_id] = time.time() + 1800  # 30 minutes
+        luck_expiration[user_id] = time.time() + 1800
         
         if user_id not in used_luck_opportunities:
             used_luck_opportunities[user_id] = set()
@@ -263,9 +220,11 @@ async def schedule_next_luck_opportunity(interaction: discord.Interaction, user_
         luck_percentage = (new_luck - 1) * 100
         await interaction.response.send_message(f"Your luck has been increased to {luck_percentage}% for 30 minutes!", ephemeral=True)
         
-        # Remove the increase luck button
         view = interaction.message.components[0]
-        view.remove_item(increase_luck_button)
+        for item in view.children:
+            if item.custom_id == interaction.custom_id:
+                view.remove_item(item)
+                break
         await interaction.message.edit(view=view)
 
         # Schedule the next luck opportunity
@@ -273,68 +232,9 @@ async def schedule_next_luck_opportunity(interaction: discord.Interaction, user_
     
     increase_luck_button.callback = increase_luck_callback
     
-    # Assuming the original message is the last one sent
-    # This might need adjustment based on your actual bot's message handling
-    try:
-        message = interaction.message
-        view = PetRollView(rap_value=0, user_id=user_id)  # rap_value is irrelevant here
-        view.remove_item(increase_luck_button)
-        view.add_item(increase_luck_button)
-        await message.edit(view=view)
-    except Exception as e:
-        print(f"Error scheduling next luck opportunity: {e}")
-
-async def auto_sell_process_new_pet(interaction: discord.Interaction, view: PetRollView):
-    """
-    This function handles auto-selling new pets rolled while auto-sell is enabled.
-    """
-    user_id = view.user_id
-    sell_value = view.rap_value
-    
-    if not view.pet_sold:
-        # Automatically sell the pet
-        user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
-        view.pet_sold = True
-        await interaction.followup.send(f"Auto-sell: You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
-
-        # Disable the sell button
-        view.sell_pet_button.disabled = True
-        view.sell_pet_button.label = "Sold"
-
-        # Disable auto-sell since the pet is already sold
-        view.auto_sell = False
-        view.auto_pet_sell_button.label = "Auto Pet Sell"
-        await interaction.message.edit(view=view)
-
-        # Notify the user
-        await interaction.followup.send("Auto-sell has been disabled since the pet was automatically sold.", ephemeral=True)
-
-async def auto_sell(interaction: discord.Interaction, view: PetRollView):
-    """
-    This coroutine handles continuous auto-selling while auto-sell is enabled.
-    """
-    user_id = view.user_id
-    while view.auto_sell and not view.pet_sold:
-        # Automatically sell the pet
-        sell_value = view.rap_value
-        user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
-        view.pet_sold = True
-        await interaction.followup.send(f"Auto-sell: You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
-
-        # Disable the sell button
-        view.sell_pet_button.disabled = True
-        view.sell_pet_button.label = "Sold"
-
-        # Disable auto-sell since the pet is already sold
-        view.auto_sell = False
-        view.auto_pet_sell_button.label = "Auto Pet Sell"
-        await interaction.message.edit(view=view)
-
-        # Notify the user
-        await interaction.followup.send("Auto-sell has been disabled since the pet was automatically sold.", ephemeral=True)
-        break  # Exit the loop since the pet is sold
-
-    # If you want auto-sell to handle multiple pets rolled over time, remove the break and implement additional logic
+    view = interaction.message.components[0]
+    view.add_item(increase_luck_button)
+    await interaction.message.edit(view=view)
 
 async def auto_roll(interaction: discord.Interaction):
     user_id = interaction.user.id
@@ -342,32 +242,12 @@ async def auto_roll(interaction: discord.Interaction):
     while user_id in auto_roll_users:
         if time.time() - start_time >= 180:  # 3 minutes
             auto_roll_users.remove(user_id)
-            await interaction.followup.send("auto roll stopped, to turn it on roll again and start it again", ephemeral=True)
+            await interaction.followup.send("autoroll stopped, to turn on again, roll and turn it on", ephemeral=True)
             break
         
         result = await perform_roll(interaction)
         if result:
-            embed, view = result
-            # If auto-sell is enabled, automatically sell the pet
-            if user_id in auto_sell_users:
-                # Wait briefly to ensure the message is sent before auto-selling
-                await asyncio.sleep(1)
-                # Automatically sell the pet
-                sell_value = view.rap_value
-                user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
-                view.pet_sold = True
-                await interaction.followup.send(f"Auto-sell: You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
-
-                # Disable the sell button
-                view.sell_pet_button.disabled = True
-                view.sell_pet_button.label = "Sold"
-
-                # Disable auto-sell since the pet is already sold
-                view.auto_sell = False
-                view.auto_pet_sell_button.label = "Auto Pet Sell"
-                await interaction.message.edit(view=view)
-
-            await interaction.followup.send(embed=embed, view=view)
+            await interaction.followup.send(embed=result[0], view=result[1])
         else:
             await interaction.followup.send("An error occurred.")
         await asyncio.sleep(5)  # Wait for 5 seconds between rolls