Update app.py

app.py

@@ -15,6 +15,7 @@ tree = app_commands.CommandTree(bot)
 
 luck_multipliers = {}
 luck_expiration = {}
+luck_used = set()
 
 @app.get("/")
 async def read_root():
@@ -95,14 +96,11 @@ async def perform_roll(interaction: discord.Interaction):
     user_id = interaction.user.id
     luck_multiplier = luck_multipliers.get(user_id, 1)
     
-    # Sort pets by difficulty
     sorted_pets = sorted(pets, key=lambda x: x['configData']['difficulty'])
     
-    # Calculate the index based on luck
     max_index = len(sorted_pets) - 1
-    index = int(max_index * (luck_multiplier - 1) / 9)  # Assuming max luck is 10
+    index = int(max_index * (luck_multiplier - 1) / 9)
     
-    # Select a random pet from the start of the list to the calculated index
     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)
@@ -135,7 +133,7 @@ async def perform_roll(interaction: discord.Interaction):
         remaining_time = int(luck_expiration[user_id] - time.time())
         if remaining_time > 0:
             luck_percentage = (luck_multiplier - 1) * 100
-            luck_text = f"\nYou have {remaining_time // 60} minutes and {remaining_time % 60} seconds of luck left! (x{luck_percentage}% luck)"
+            luck_text = f"\nYou have {remaining_time // 60} minutes and {remaining_time % 60} seconds of luck left! ({luck_percentage}% luck)"
         else:
             del luck_multipliers[user_id]
             del luck_expiration[user_id]
@@ -157,7 +155,7 @@ async def perform_roll(interaction: discord.Interaction):
     view = discord.ui.View()
     view.add_item(roll_again_button)
 
-    if random.random() < 0.2:
+    if random.random() < 0.2 and user_id not in luck_used:
         increase_luck_button = discord.ui.Button(style=discord.ButtonStyle.success, label="Increase Luck", custom_id="increase_luck")
         
         async def increase_luck_callback(interaction: discord.Interaction):
@@ -165,12 +163,17 @@ async def perform_roll(interaction: discord.Interaction):
                 await interaction.response.send_message("cannot use", ephemeral=True)
                 return
             
+            if user_id in luck_used:
+                await interaction.response.send_message("You've already used your luck increase!", ephemeral=True)
+                return
+            
             current_luck = luck_multipliers.get(user_id, 1)
-            new_luck = min(current_luck + 1, 1000)  # Cap at 10x
+            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
+            luck_used.add(user_id)
             
-            luck_percentage = (new_luck - 10) * 100
+            luck_percentage = (new_luck - 1) * 100
             await interaction.response.send_message(f"Your luck has been increased to x{luck_percentage}% for 30 minutes!", ephemeral=True)
         
         increase_luck_button.callback = increase_luck_callback