Update petroll.py

petroll.py

@@ -96,32 +96,28 @@ async def perform_roll(interaction: discord.Interaction):
     view = discord.ui.View()
     view.add_item(roll_again_button)
 
-    # Only add the sell button if auto-sell is not active for this user
-    if user_id not in auto_sell_users:
-        sell_button = discord.ui.Button(style=discord.ButtonStyle.success, label=f"Sell Pet for ${rap_value}", custom_id="sell_pet")
+    sell_button = discord.ui.Button(style=discord.ButtonStyle.success, label=f"Sell Pet for ${rap_value}", custom_id="sell_pet")
+    
+    async def sell_pet_callback(interaction: discord.Interaction):
+        if interaction.user.id != user_id:
+            await interaction.response.send_message("You cannot sell this pet.", ephemeral=True)
+            return
 
-        async def sell_pet_callback(interaction: discord.Interaction):
-            if interaction.user.id != user_id:
-                await interaction.response.send_message("You cannot sell this pet.", ephemeral=True)
-                return
+        sell_value = rap_value
+        user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
+        await interaction.response.send_message(f"You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
+        for item in view.children:
+            if item.custom_id == "sell_pet":
+                view.remove_item(item)
+                break
+        await interaction.message.edit(view=view)
 
-            sell_value = rap_value
-            user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
-            await interaction.response.send_message(f"You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
-            for item in view.children:
-                if item.custom_id == "sell_pet":
-                    view.remove_item(item)
-                    break
-            await interaction.message.edit(view=view)
+    sell_button.callback = sell_pet_callback
 
-        sell_button.callback = sell_pet_callback
+    # Add sell button only if auto-sell is not enabled
+    if user_id not in auto_sell_users:
         view.add_item(sell_button)
 
-    # Automatically process sale when auto-sell is active
-    if user_id in auto_sell_users:
-        user_cash[user_id] += rap_value
-        embed.add_field(name="Auto Sell", value=f"Pet automatically sold for ${rap_value}. New balance: ${user_cash[user_id]}", inline=False)
-
     if user_id not in first_luck_claimed:
         first_luck_button = discord.ui.Button(style=discord.ButtonStyle.success, label="Claim 100% Luck Forever", custom_id="first_luck")
         
@@ -225,82 +221,84 @@ async def perform_roll(interaction: discord.Interaction):
             auto_sell_button.style = discord.ButtonStyle.primary
             auto_sell_button.label = "Auto Pet Sell"
             await interaction.response.send_message("Auto pet sell stopped.", ephemeral=True)
-
-             # Re-add the normal sell button when stopping auto-sell
-             sell_button.style=discord.ButtonStyle.success 
-             sell_button.label=f"Sell Pet for ${rap_value}"
-             view.add_item(sell_button)
-
+            # Re-add the sell button
+            view.add_item(sell_button)
         else:
             auto_sell_users.add(user_id)
             auto_sell_button.style = discord.ButtonStyle.danger
             auto_sell_button.label = "Stop Auto Pet Sell"
-            
-             # Automatically add cash and notify when starting auto-sell
-             user_cash[user_id] += rap_value 
-             embed.add_field(name="Auto Sell", value=f"Pet automatically sold for ${rap_value}. New balance: ${user_cash[user_id]}", inline=False)
-
-             await interaction.response.send_message(f"Auto pet sell started. Pet sold for ${rap_value}. New balance is ${user_cash[user_id]}.", ephemeral=True)
-
-         await interaction.message.edit(view=view)
-
-     auto_sell_button.callback=auto_sell_callback 
-     view.add_item(auto_sell_button)
-
-     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) 
-             return 
-
-         if user id in used luck opportunities and len(used luck opportunities[user id])>=4: 
-             await interaction.response.send message("You have already used all your luck opportunities.",ephemeral=True) 
-             return 
+            await interaction.response.send_message("Auto pet sell started.", ephemeral=True)
+            # Remove the sell button to prevent manual selling
+            view.remove_item(sell_button)
 
-         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 
-
-         if user id not in used luck opportunities: 
-             used luck opportunities[user id]=set() 
-         used luck opportunities[user id].add(luck opportunities[user id]) 
+        await interaction.message.edit(view=view)
 
-         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) 
+    auto_sell_button.callback = auto_sell_callback
+    view.add_item(auto_sell_button)
 
-         view=interaction.message.components[0] 
-         for item in view.children: 
-             if item.custom id==interaction.custom id: 
-                 view.remove item(item) 
-                 break 
-         await interaction.message.edit(view=view) 
+    if user_id in auto_sell_users:
+        user_cash[user_id] = user_cash.get(user_id, 0) + rap_value
+        embed.add_field(name="Auto Sell", value=f"Pet automatically sold for ${rap_value}. New balance: ${user_cash[user_id]}", inline=False)
 
-         # Schedule the next luck opportunity 
-         asyncio.create task(schedule next luck opportunity(interaction,user id)) 
+    return embed, view
 
-     increase.luck button.callback=increase.luck callback 
+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)
+            return
+        
+        if user_id in used_luck_opportunities and len(used_luck_opportunities[user_id]) >= 4:
+            await interaction.response.send_message("You have already used all your luck opportunities.", ephemeral=True)
+            return
 
-     view=interaction.message.components[0] 
-     view.add item(increase.luck button) 
-     await interaction.message.edit(view=view) 
+        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
+        
+        if user_id not in used_luck_opportunities:
+            used_luck_opportunities[user_id] = set()
+        used_luck_opportunities[user_id].add(luck_opportunities[user_id])
+        
+        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)
+        
+        view = interaction.message.components[0]
+        for item in view.children:
+            if item.custom_id == interaction.custom_id:
+                view.remove_item(item)
+                break
+        await interaction.message.edit(view=view)
 
-async def.auto roll(interaction:discord.Interaction): 
-     user id=interaction.user.id 
-     start time=time.time() 
-     while useridinauto roll users: 
-         if time.time()-start time>=180:#3minutes 
-             autoroll users.remove(userid) 
-             await.interaction.followup send("auto roll stopped, to auto roll again roll normally and start it",ephemeral=True) break 
+        # Schedule the next luck opportunity
+        asyncio.create_task(schedule_next_luck_opportunity(interaction, user_id))
+    
+    increase_luck_button.callback = increase_luck_callback
+    
+    view = interaction.message.components[0]
+    view.add_item(increase_luck_button)
+    await interaction.message.edit(view=view)
 
-         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.")await.asyncio.sleep(5)#Waitfor5secondsbetweenrolls 
+async def auto_roll(interaction: discord.Interaction):
+    user_id = interaction.user.id
+    start_time = time.time()
+    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 has been automatically stopped after 3 minutes. You can start it again if you wish.", ephemeral=True)
+            break
+        
+        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.")
+        await asyncio.sleep(5)  # Wait for 5 seconds between rolls
 
 @app_commands.command(name="petroll", description="Roll for a random pet")
 async def petroll(interaction: discord.Interaction):