Update petroll.py

petroll.py

@@ -5,8 +5,9 @@ import random
 import time
 import asyncio
 
-from cash import user_cash
+from cash import user_cash  # Ensure you have a 'cash.py' with a 'user_cash' dictionary
 
+# Dictionaries to manage user states
 luck_multipliers = {}
 luck_expiration = {}
 luck_opportunities = {}
@@ -14,6 +15,7 @@ used_luck_opportunities = {}
 first_luck_claimed = set()
 auto_roll_users = set()
 auto_sell_users = set()
+can_manual_sell = set()  # Tracks users who can perform a manual sell
 
 async def perform_roll(interaction: discord.Interaction):
     async def fetch_data(url):
@@ -81,6 +83,10 @@ async def perform_roll(interaction: discord.Interaction):
     
     embed.set_footer(text=f"Click 'Roll Again' to roll again!{luck_text}")
 
+    # Create buttons
+    view = discord.ui.View()
+
+    # Roll Again Button
     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):
@@ -90,12 +96,11 @@ async def perform_roll(interaction: discord.Interaction):
             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)
 
+    # Sell Button
     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):
@@ -106,18 +111,20 @@ async def perform_roll(interaction: discord.Interaction):
         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
+        
+        # Disable further manual selling until auto-sell is toggled
+        can_manual_sell.discard(user_id)
+        view.remove_item(sell_button)
         await interaction.message.edit(view=view)
 
     sell_button.callback = sell_pet_callback
 
-    # Add sell button only if auto-sell is not enabled
-    if user_id not in auto_sell_users:
+    # Add sell button only if auto-sell is not enabled and user can perform a manual sell
+    if user_id not in auto_sell_users and user_id not in can_manual_sell:
         view.add_item(sell_button)
+        can_manual_sell.add(user_id)
 
+    # First Luck Button
     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")
         
@@ -131,10 +138,7 @@ async def perform_roll(interaction: discord.Interaction):
             
             await interaction.response.send_message("You've claimed 100% luck forever!", ephemeral=True)
             
-            for item in view.children:
-                if item.custom_id == "first_luck":
-                    view.remove_item(item)
-                    break
+            view.remove_item(first_luck_button)
             await interaction.message.edit(view=view)
         
         first_luck_button.callback = first_luck_callback
@@ -156,7 +160,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
+            luck_expiration[user_id] = time.time() + 1800  # 30 minutes
             
             if user_id not in used_luck_opportunities:
                 used_luck_opportunities[user_id] = set()
@@ -165,10 +169,7 @@ 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)
             
-            for item in view.children:
-                if item.custom_id == interaction.custom_id:
-                    view.remove_item(item)
-                    break
+            view.remove_item(increase_luck_button)
             await interaction.message.edit(view=view)
 
             # Schedule the next luck opportunity
@@ -177,6 +178,7 @@ async def perform_roll(interaction: discord.Interaction):
         increase_luck_button.callback = increase_luck_callback
         view.add_item(increase_luck_button)
 
+    # Auto Roll 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",
@@ -199,12 +201,13 @@ async def perform_roll(interaction: discord.Interaction):
             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 Button
     auto_sell_button = discord.ui.Button(
         style=discord.ButtonStyle.primary if user_id not in auto_sell_users else discord.ButtonStyle.danger,
         label="Auto Pet Sell" if user_id not in auto_sell_users else "Stop Auto Pet Sell",
@@ -221,21 +224,24 @@ 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 sell button
+            # Allow one manual sell after stopping auto-sell
+            can_manual_sell.add(user_id)
+            # Add sell button back if appropriate
             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"
-            await interaction.response.send_message("Auto pet sell started.", ephemeral=True)
+            await interaction.response.send_message("Auto pet sell started. You cannot manually sell pets while auto-sell is enabled.", ephemeral=True)
             # Remove the sell button to prevent manual selling
             view.remove_item(sell_button)
-
+        
         await interaction.message.edit(view=view)
 
     auto_sell_button.callback = auto_sell_callback
     view.add_item(auto_sell_button)
 
+    # Handle Auto Sell: Automatically sell the pet if auto-sell is enabled
     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)
@@ -259,7 +265,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
+        luck_expiration[user_id] = time.time() + 1800  # 30 minutes
         
         if user_id not in used_luck_opportunities:
             used_luck_opportunities[user_id] = set()
@@ -268,11 +274,9 @@ 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 used button
         view = interaction.message.components[0]
-        for item in view.children:
-            if item.custom_id == interaction.custom_id:
-                view.remove_item(item)
-                break
+        view.remove_item(increase_luck_button)
         await interaction.message.edit(view=view)
 
         # Schedule the next luck opportunity
@@ -290,7 +294,7 @@ 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 has been automatically stopped after 3 minutes. You can start it again if you wish.", ephemeral=True)
+            await interaction.followup.send("auto roll stopped, to turn it on again roll and turn it on again", ephemeral=True)
             break
         
         result = await perform_roll(interaction)