Update app.py

app.py

@@ -99,22 +99,12 @@ async def perform_roll(interaction: discord.Interaction):
     # Sort pets by difficulty
     sorted_pets = sorted(pets, key=lambda x: x['configData']['difficulty'])
     
-    # Define difficulty ranges based on luck
-    if luck_multiplier == 1:
-        min_difficulty, max_difficulty = 2, 3000
-    elif luck_multiplier == 2:
-        min_difficulty, max_difficulty = 100, 20000
-    else:
-        min_difficulty, max_difficulty = 1000, 100000000
-    
-    # Filter pets based on difficulty range
-    eligible_pets = [pet for pet in sorted_pets if min_difficulty <= pet['configData']['difficulty'] <= max_difficulty]
-    
-    if not eligible_pets:
-        return None
+    # 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
     
-    # Select a random pet from the eligible pets
-    rolled_pet = random.choice(eligible_pets)
+    # 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)
 
@@ -145,7 +135,8 @@ async def perform_roll(interaction: discord.Interaction):
     if user_id in luck_expiration:
         remaining_time = int(luck_expiration[user_id] - time.time())
         if remaining_time > 0:
-            luck_text = f"\nYou have {remaining_time // 60} minutes and {remaining_time % 60} seconds of luck left!"
+            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)"
         else:
             del luck_multipliers[user_id]
             del luck_expiration[user_id]
@@ -175,10 +166,14 @@ async def perform_roll(interaction: discord.Interaction):
                 await interaction.response.send_message("cannot use", ephemeral=True)
                 return
             
-            luck_multipliers[user_id] = 2 if user_id not in luck_multipliers else 10
+            if user_id in luck_button_used:
+                await interaction.response.send_message("You've already used your luck", ephemeral=True)
+                return
+            
+            luck_multipliers[user_id] = 2
             luck_expiration[user_id] = time.time() + 1800  # 30 minutes
             luck_button_used.add(user_id)
-            await interaction.response.send_message("luck Increased", ephemeral=True)
+            await interaction.response.send_message("your luck has been increased to x100% for 30 minutes!", ephemeral=True)
         
         increase_luck_button.callback = increase_luck_callback
         view.add_item(increase_luck_button)