slipstream/discordbot
slipstream/discordbot
1
1
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

hdhd

Browse Source
This commit is contained in:
Slipstream 2025-05-03 12:16:27 -06:00
parent fbbbfc2b11
commit 6d6a6a6f29
Signed by: slipstream
GPG Key ID: 13E498CE010AC6FD
5 changed files with 209 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
cogs/economy/earning.py
View File

@ -37,14 +37,21 @@ class EarningCommands(commands.Cog):
time_left = cooldown_duration - time_since_last_used
hours, remainder = divmod(int(time_left.total_seconds()), 3600)
minutes, seconds = divmod(remainder, 60)
await ctx.send(f"You've already claimed your daily reward. Try again in **{hours}h {minutes}m {seconds}s**.", ephemeral=True)
embed = discord.Embed(description=f"🕒 You've already claimed your daily reward. Try again in **{hours}h {minutes}m {seconds}s**.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
# Not on cooldown or cooldown expired
await database.update_balance(user_id, reward_amount)
await database.set_cooldown(user_id, command_name)
current_balance = await database.get_balance(user_id)
await ctx.send(f"🎉 You claimed your daily reward of **${reward_amount:,}**! Your new balance is **${current_balance:,}**.")
embed = discord.Embed(
title="Daily Reward Claimed!",
description=f"🎉 You claimed your daily reward of **${reward_amount:,}**!",
color=discord.Color.green()
)
embed.add_field(name="New Balance", value=f"${current_balance:,}", inline=False)
await ctx.send(embed=embed)
@commands.hybrid_command(name="beg", description="Beg for some spare change.")
@ -68,7 +75,8 @@ class EarningCommands(commands.Cog):
if time_since_last_used < cooldown_duration:
time_left = cooldown_duration - time_since_last_used
minutes, seconds = divmod(int(time_left.total_seconds()), 60)
await ctx.send(f"You can't beg again so soon. Try again in **{minutes}m {seconds}s**.", ephemeral=True)
embed = discord.Embed(description=f"🕒 You can't beg again so soon. Try again in **{minutes}m {seconds}s**.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
# Set cooldown regardless of success/failure
@ -79,9 +87,20 @@ class EarningCommands(commands.Cog):
reward_amount = random.randint(min_reward, max_reward)
await database.update_balance(user_id, reward_amount)
current_balance = await database.get_balance(user_id)
await ctx.send(f"🙏 Someone took pity on you! You received **${reward_amount:,}**. Your new balance is **${current_balance:,}**.")
embed = discord.Embed(
title="Begging Successful!",
description=f"🙏 Someone took pity on you! You received **${reward_amount:,}**.",
color=discord.Color.green()
)
embed.add_field(name="New Balance", value=f"${current_balance:,}", inline=False)
await ctx.send(embed=embed)
else:
await ctx.send("🤷 Nobody gave you anything. Better luck next time!")
embed = discord.Embed(
title="Begging Failed",
description="🤷 Nobody gave you anything. Better luck next time!",
color=discord.Color.red()
)
await ctx.send(embed=embed)
@commands.hybrid_command(name="work", description="Do some work for a guaranteed reward.")
async def work(self, ctx: commands.Context):
@ -101,7 +120,8 @@ class EarningCommands(commands.Cog):
# job_details = JOB_DEFINITIONS.get(job_key)
# command_to_use = job_details['command'] if job_details else f"your job command (`/{job_key}`)" # Fallback
command_to_use = f"`/{job_key}`" # Simple fallback
await ctx.send(f"You have a job! Use {command_to_use} instead of the generic `/work` command.", ephemeral=True)
embed = discord.Embed(description=f"💼 You have a job! Use {command_to_use} instead of the generic `/work` command.", color=discord.Color.blue())
await ctx.send(embed=embed, ephemeral=True)
return
# --- End Job Check ---
@ -119,7 +139,8 @@ class EarningCommands(commands.Cog):
time_left = cooldown_duration - time_since_last_used
hours, remainder = divmod(int(time_left.total_seconds()), 3600)
minutes, seconds = divmod(remainder, 60)
await ctx.send(f"You need to rest after working. Try again in **{hours}h {minutes}m {seconds}s**.", ephemeral=True)
embed = discord.Embed(description=f"🕒 You need to rest after working. Try again in **{hours}h {minutes}m {seconds}s**.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
# Set cooldown and give reward
@ -132,7 +153,13 @@ class EarningCommands(commands.Cog):
f"Your efforts paid off! You received **${reward_amount:,}**.",
]
current_balance = await database.get_balance(user_id)
await ctx.send(f"{random.choice(work_messages)} Your new balance is **${current_balance:,}**.")
embed = discord.Embed(
title="Work Complete!",
description=random.choice(work_messages),
color=discord.Color.green()
)
embed.add_field(name="New Balance", value=f"${current_balance:,}", inline=False)
await ctx.send(embed=embed)
@commands.hybrid_command(name="scavenge", description="Scavenge around for some spare change.") # Renamed to avoid conflict
async def scavenge(self, ctx: commands.Context): # Renamed function
@ -155,7 +182,8 @@ class EarningCommands(commands.Cog):
if time_since_last_used < cooldown_duration:
time_left = cooldown_duration - time_since_last_used
minutes, seconds = divmod(int(time_left.total_seconds()), 60)
await ctx.send(f"You've searched recently. Try again in **{minutes}m {seconds}s**.", ephemeral=True)
embed = discord.Embed(description=f"🕒 You've searched recently. Try again in **{minutes}m {seconds}s**.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
# Set cooldown regardless of success
@ -172,8 +200,19 @@ class EarningCommands(commands.Cog):
reward_amount = random.randint(min_reward, max_reward)
await database.update_balance(user_id, reward_amount)
current_balance = await database.get_balance(user_id)
await ctx.send(f"🔍 You scavenged {location} and found **${reward_amount:,}**! Your new balance is **${current_balance:,}**.")
embed = discord.Embed(
title="Scavenging Successful!",
description=f"🔍 You scavenged {location} and found **${reward_amount:,}**!",
color=discord.Color.green()
)
embed.add_field(name="New Balance", value=f"${current_balance:,}", inline=False)
await ctx.send(embed=embed)
else:
await ctx.send(f"🔍 You scavenged {location} but found nothing but lint.")
embed = discord.Embed(
title="Scavenging Failed",
description=f"🔍 You scavenged {location} but found nothing but lint.",
color=discord.Color.red()
)
await ctx.send(embed=embed)
# No setup function needed here, it will be in __init__.py

28
cogs/economy/gambling.py
View File

@ -25,11 +25,13 @@ class GamblingCommands(commands.Cog):
choice = choice.lower()
if choice not in ["heads", "tails", "h", "t"]:
await ctx.send("Invalid choice. Please choose 'heads' or 'tails'.", ephemeral=True)
embed = discord.Embed(description="❌ Invalid choice. Please choose 'heads' or 'tails'.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
if amount <= 0:
await ctx.send("Please enter a positive amount to bet.", ephemeral=True)
embed = discord.Embed(description="❌ Please enter a positive amount to bet.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
# Check cooldown
@ -42,13 +44,15 @@ class GamblingCommands(commands.Cog):
time_since_last_used = now_utc - last_used
if time_since_last_used < cooldown_duration:
time_left = cooldown_duration - time_since_last_used
await ctx.send(f"You're flipping too fast! Try again in **{int(time_left.total_seconds())}s**.", ephemeral=True)
embed = discord.Embed(description=f"🕒 You're flipping too fast! Try again in **{int(time_left.total_seconds())}s**.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
# Check balance
user_balance = await database.get_balance(user_id)
if user_balance < amount:
await ctx.send(f"You don't have enough money to bet that much! Your balance is **${user_balance:,}**.", ephemeral=True)
embed = discord.Embed(description=f"❌ You don't have enough money to bet that much! Your balance is **${user_balance:,}**.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
# Set cooldown before proceeding
@ -61,10 +65,22 @@ class GamblingCommands(commands.Cog):
if win:
await database.update_balance(user_id, amount) # Win the amount bet
current_balance = await database.get_balance(user_id)
await ctx.send(f"🪙 The coin landed on **{result}**! You won **${amount:,}**! Your new balance is **${current_balance:,}**.")
embed = discord.Embed(
title="Coin Flip: Win!",
description=f"🪙 The coin landed on **{result}**! You won **${amount:,}**!",
color=discord.Color.green()
)
embed.add_field(name="New Balance", value=f"${current_balance:,}", inline=False)
await ctx.send(embed=embed)
else:
await database.update_balance(user_id, -amount) # Lose the amount bet
current_balance = await database.get_balance(user_id)
await ctx.send(f"🪙 The coin landed on **{result}**. You lost **${amount:,}**. Your new balance is **${current_balance:,}**.")
embed = discord.Embed(
title="Coin Flip: Loss!",
description=f"🪙 The coin landed on **{result}**. You lost **${amount:,}**.",
color=discord.Color.red()
)
embed.add_field(name="New Balance", value=f"${current_balance:,}", inline=False)
await ctx.send(embed=embed)
# No setup function needed here

104
cogs/economy/jobs.py
View File

@ -114,7 +114,8 @@ class JobsCommands(commands.Cog):
job_info = await database.get_user_job(user_id)
if not job_info or not job_info.get("name"):
await ctx.send("You don't currently have a job. Use `/jobs` to see available options and `/choosejob <job_name>` to pick one.", ephemeral=True)
embed = discord.Embed(description="❌ You don't currently have a job. Use `/jobs` to see available options and `/choosejob <job_name>` to pick one.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
job_key = job_info["name"]
@ -123,7 +124,8 @@ class JobsCommands(commands.Cog):
job_details = JOB_DEFINITIONS.get(job_key)
if not job_details:
await ctx.send(f"Error: Your job '{job_key}' is not recognized. Please contact an admin.", ephemeral=True)
embed = discord.Embed(description=f"❌ Error: Your job '{job_key}' is not recognized. Please contact an admin.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
log.error(f"User {user_id} has unrecognized job '{job_key}' in database.")
return
@ -164,18 +166,26 @@ class JobsCommands(commands.Cog):
job_key = job_name.lower()
if job_key not in JOB_DEFINITIONS:
await ctx.send(f"Invalid job name '{job_name}'. Use `/jobs` to see available options.", ephemeral=True)
embed = discord.Embed(description=f"❌ Invalid job name '{job_name}'. Use `/jobs` to see available options.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
current_job_info = await database.get_user_job(user_id)
if current_job_info and current_job_info.get("name") == job_key:
await ctx.send(f"You are already a {JOB_DEFINITIONS[job_key]['name']}.", ephemeral=True)
embed = discord.Embed(description=f"✅ You are already a {JOB_DEFINITIONS[job_key]['name']}.", color=discord.Color.blue())
await ctx.send(embed=embed, ephemeral=True)
return
# Implement switching cost/cooldown here if desired
# For now, allow free switching, resetting progress
await database.set_user_job(user_id, job_key)
await ctx.send(f"Congratulations! You are now a **{JOB_DEFINITIONS[job_key]['name']}**. Your previous job progress (if any) has been reset.")
embed = discord.Embed(
title="Job Changed!",
description=f"💼 Congratulations! You are now a **{JOB_DEFINITIONS[job_key]['name']}**.",
color=discord.Color.green()
)
embed.set_footer(text="Your previous job progress (if any) has been reset.")
await ctx.send(embed=embed)
@commands.hybrid_command(name="leavejob", description="Leave your current job.")
async def leave_job(self, ctx: commands.Context):
@ -184,14 +194,21 @@ class JobsCommands(commands.Cog):
current_job_info = await database.get_user_job(user_id)
if not current_job_info or not current_job_info.get("name"):
await ctx.send("You don't have a job to leave.", ephemeral=True)
embed = discord.Embed(description="❌ You don't have a job to leave.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
job_key = current_job_info["name"]
job_name = JOB_DEFINITIONS.get(job_key, {}).get("name", "Unknown Job")
await database.set_user_job(user_id, None) # Set job to NULL
await ctx.send(f"You have left your job as a **{job_name}**. Your level and XP for this job have been reset. You can choose a new job with `/choosejob`.")
embed = discord.Embed(
title="Job Left",
description=f"🗑️ You have left your job as a **{job_name}**.",
color=discord.Color.orange()
)
embed.set_footer(text="Your level and XP for this job have been reset. You can choose a new job with /choosejob.")
await ctx.send(embed=embed)
# --- Job Action Commands ---
@ -205,9 +222,11 @@ class JobsCommands(commands.Cog):
correct_job_info = await database.get_user_job(user_id)
if correct_job_info and correct_job_info.get("name"):
correct_job_details = JOB_DEFINITIONS.get(correct_job_info["name"])
await ctx.send(f"You need to be a {JOB_DEFINITIONS[job_key]['name']} to use this command. Your current job is {correct_job_details['name']}. Use `{correct_job_details['command']}` instead, or change jobs with `/choosejob`.", ephemeral=True)
embed = discord.Embed(description=f"❌ You need to be a {JOB_DEFINITIONS[job_key]['name']} to use this command. Your current job is {correct_job_details['name']}. Use `{correct_job_details['command']}` instead, or change jobs with `/choosejob`.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
else:
await ctx.send(f"You need to be a {JOB_DEFINITIONS[job_key]['name']} to use this command. You don't have a job. Use `/choosejob {job_key}` first.", ephemeral=True)
embed = discord.Embed(description=f"❌ You need to be a {JOB_DEFINITIONS[job_key]['name']} to use this command. You don't have a job. Use `/choosejob {job_key}` first.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return None # Indicate failure
job_details = JOB_DEFINITIONS[job_key]
@ -221,7 +240,8 @@ class JobsCommands(commands.Cog):
time_since = now_utc - last_action
if time_since < cooldown:
time_left = cooldown - time_since
await ctx.send(f"You need to wait **{format_timedelta(time_left)}** before you can {job_key} again.", ephemeral=True)
embed = discord.Embed(description=f"🕒 You need to wait **{format_timedelta(time_left)}** before you can {job_key} again.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return None # Indicate failure
# 3. Set Cooldown Immediately
@ -294,14 +314,16 @@ class JobsCommands(commands.Cog):
"""Performs the Miner job action."""
result_message = await self._handle_job_action(ctx, "miner")
if result_message:
await ctx.send(result_message)
embed = discord.Embed(title="Mining Results", description=result_message, color=discord.Color.dark_grey())
await ctx.send(embed=embed)
@commands.hybrid_command(name="fish", description="Catch fish and maybe find treasure (Fisher job).")
async def fish(self, ctx: commands.Context):
"""Performs the Fisher job action."""
result_message = await self._handle_job_action(ctx, "fisher")
if result_message:
await ctx.send(result_message)
embed = discord.Embed(title="Fishing Results", description=result_message, color=discord.Color.blue())
await ctx.send(embed=embed)
# --- Crafter Specific ---
async def craft_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
@ -333,7 +355,8 @@ class JobsCommands(commands.Cog):
# 1. Check if user has the correct job
if not job_info or job_info.get("name") != job_key:
await ctx.send("You need to be a Crafter to use this command. Use `/choosejob crafter` first.", ephemeral=True)
embed = discord.Embed(description="❌ You need to be a Crafter to use this command. Use `/choosejob crafter` first.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
job_details = JOB_DEFINITIONS[job_key]
@ -343,13 +366,15 @@ class JobsCommands(commands.Cog):
# 2. Check if recipe exists
recipes = job_details.get("recipes", {})
if recipe_key not in recipes:
await ctx.send(f"Unknown recipe: '{item_to_craft}'. Check available recipes.", ephemeral=True) # TODO: Add /recipes command?
embed = discord.Embed(description=f"❌ Unknown recipe: '{item_to_craft}'. Check available recipes.", color=discord.Color.red()) # TODO: Add /recipes command?
await ctx.send(embed=embed, ephemeral=True)
return
# 3. Check Level Requirement
required_level = job_details.get("level_bonus", {}).get("unlock_recipe_level", {}).get(recipe_key, 1)
if level < required_level:
await ctx.send(f"You need to be Level {required_level} to craft this item. You are currently Level {level}.", ephemeral=True)
embed = discord.Embed(description=f"❌ You need to be Level {required_level} to craft this item. You are currently Level {level}.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
# 4. Check Cooldown
@ -360,7 +385,8 @@ class JobsCommands(commands.Cog):
time_since = now_utc - last_action
if time_since < cooldown:
time_left = cooldown - time_since
await ctx.send(f"You need to wait **{format_timedelta(time_left)}** before you can craft again.", ephemeral=True)
embed = discord.Embed(description=f"🕒 You need to wait **{format_timedelta(time_left)}** before you can craft again.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
# 5. Check Materials
@ -377,7 +403,12 @@ class JobsCommands(commands.Cog):
missing_materials.append(f"{mat_qty - inventory_map.get(mat_key, 0)}x {mat_name}")
if not can_craft:
await ctx.send(f"You don't have the required materials. You still need: {', '.join(missing_materials)}.", ephemeral=True)
embed = discord.Embed(
title="Missing Materials",
description=f"❌ You don't have the required materials. You still need: {', '.join(missing_materials)}.",
color=discord.Color.red()
)
await ctx.send(embed=embed, ephemeral=True)
return
# 6. Set Cooldown Immediately
@ -389,7 +420,8 @@ class JobsCommands(commands.Cog):
if not await database.remove_item_from_inventory(user_id, mat_key, mat_qty):
success = False
log.error(f"Failed to remove material {mat_key} x{mat_qty} for user {user_id} during crafting, despite check.")
await ctx.send("An error occurred while consuming materials. Please try again.", ephemeral=True)
embed = discord.Embed(description="❌ An error occurred while consuming materials. Please try again.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
# Should ideally revert cooldown here, but that's complex.
return
@ -402,13 +434,18 @@ class JobsCommands(commands.Cog):
# 9. Construct Response
crafted_item_details = await database.get_item_details(recipe_key)
crafted_item_details = await database.get_item_details(recipe_key)
crafted_item_name = crafted_item_details['name'] if crafted_item_details else recipe_key
message = f"🛠️ You successfully crafted 1x **{crafted_item_name}** and gained **{xp_earned} XP**."
embed = discord.Embed(
title="Crafting Successful!",
description=f"🛠️ You successfully crafted 1x **{crafted_item_name}** and gained **{xp_earned} XP**.",
color=discord.Color.purple() # Use a different color for crafting
)
if did_level_up:
message += f"\n**Congratulations! You reached Level {new_level} in {job_details['name']}!** 🎉"
embed.add_field(name="Level Up!", value=f"**Congratulations! You reached Level {new_level} in {job_details['name']}!** 🎉", inline=False)
await ctx.send(message)
await ctx.send(embed=embed)
# --- Inventory Commands ---
@ -420,10 +457,11 @@ class JobsCommands(commands.Cog):
inventory_items = await database.get_inventory(user_id)
if not inventory_items:
await ctx.send("Your inventory is empty.", ephemeral=True)
embed = discord.Embed(description="🗑️ Your inventory is empty.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
embed = discord.Embed(title=f"{ctx.author.display_name}'s Inventory", color=discord.Color.orange())
embed = discord.Embed(title=f"{ctx.author.display_name}'s Inventory 🎒", color=discord.Color.orange())
description = ""
for item in inventory_items:
sell_info = f" (Sell: ${item['sell_price']:,})" if item['sell_price'] > 0 else ""
@ -454,16 +492,19 @@ class JobsCommands(commands.Cog):
user_id = ctx.author.id
if quantity <= 0:
await ctx.send("Please enter a positive quantity to sell.", ephemeral=True)
embed = discord.Embed(description="❌ Please enter a positive quantity to sell.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
item_details = await database.get_item_details(item_key)
if not item_details:
await ctx.send(f"Invalid item key '{item_key}'. Check your `/inventory`.", ephemeral=True)
embed = discord.Embed(description=f"❌ Invalid item key '{item_key}'. Check your `/inventory`.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
if item_details['sell_price'] <= 0:
await ctx.send(f"You cannot sell **{item_details['name']}**.", ephemeral=True)
embed = discord.Embed(description=f"❌ You cannot sell **{item_details['name']}**.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
# Try to remove items first
@ -477,7 +518,8 @@ class JobsCommands(commands.Cog):
if item['key'] == item_key:
current_quantity = item['quantity']
break
await ctx.send(f"You don't have {quantity}x **{item_details['name']}** to sell. You only have {current_quantity}.", ephemeral=True)
embed = discord.Embed(description=f"❌ You don't have {quantity}x **{item_details['name']}** to sell. You only have {current_quantity}.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
# Grant money if removal was successful
@ -485,4 +527,10 @@ class JobsCommands(commands.Cog):
await database.update_balance(user_id, total_earnings)
current_balance = await database.get_balance(user_id)
await ctx.send(f"💰 You sold {quantity}x **{item_details['name']}** for **${total_earnings:,}**. Your new balance is **${current_balance:,}**.")
embed = discord.Embed(
title="Item Sold!",
description=f"💰 You sold {quantity}x **{item_details['name']}** for **${total_earnings:,}**.",
color=discord.Color.green()
)
embed.add_field(name="New Balance", value=f"${current_balance:,}", inline=False)
await ctx.send(embed=embed)

39
cogs/economy/risky.py
View File

@ -30,7 +30,8 @@ class RiskyCommands(commands.Cog):
steal_percentage_max = 0.20 # and 20% of target's balance
if robber_id == target_id:
await ctx.send("You can't rob yourself!", ephemeral=True)
embed = discord.Embed(description="❌ You can't rob yourself!", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
# Check cooldown
@ -45,13 +46,15 @@ class RiskyCommands(commands.Cog):
time_left = cooldown_duration - time_since_last_used
hours, remainder = divmod(int(time_left.total_seconds()), 3600)
minutes, seconds = divmod(remainder, 60)
await ctx.send(f"You need to lay low after your last attempt. Try again in **{hours}h {minutes}m {seconds}s**.", ephemeral=True)
embed = discord.Embed(description=f"🕒 You need to lay low after your last attempt. Try again in **{hours}h {minutes}m {seconds}s**.", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
# Check target balance
target_balance = await database.get_balance(target_id)
if target_balance < min_target_balance:
await ctx.send(f"{target.display_name} doesn't have enough money to be worth robbing (minimum ${min_target_balance:,}).", ephemeral=True)
embed = discord.Embed(description=f"❌ {target.display_name} doesn't have enough money to be worth robbing (minimum ${min_target_balance:,}).", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
# Don't apply cooldown if target wasn't viable
return
@ -73,9 +76,20 @@ class RiskyCommands(commands.Cog):
await database.update_balance(robber_id, stolen_amount)
await database.update_balance(target_id, -stolen_amount)
current_robber_balance = await database.get_balance(robber_id)
await ctx.send(f"🚨 Success! You skillfully robbed **${stolen_amount:,}** from {target.mention}! Your new balance is **${current_robber_balance:,}**.")
embed_success = discord.Embed(
title="Robbery Successful!",
description=f"🚨 Success! You skillfully robbed **${stolen_amount:,}** from {target.mention}!",
color=discord.Color.green()
)
embed_success.add_field(name="Your New Balance", value=f"${current_robber_balance:,}", inline=False)
await ctx.send(embed=embed_success)
try:
await target.send(f"🚨 Oh no! {ctx.author.mention} robbed you for **${stolen_amount:,}**!")
embed_target = discord.Embed(
title="You've Been Robbed!",
description=f"🚨 Oh no! {ctx.author.mention} robbed you for **${stolen_amount:,}**!",
color=discord.Color.red()
)
await target.send(embed=embed_target)
except discord.Forbidden:
pass # Ignore if DMs are closed
else:
@ -93,9 +107,20 @@ class RiskyCommands(commands.Cog):
# Optional: Give the fine to the target? Or just remove it? Let's remove it.
# await database.update_balance(target_id, fine_amount)
current_robber_balance = await database.get_balance(robber_id)
await ctx.send(f"👮‍♂️ You were caught trying to rob {target.mention}! You paid a fine of **${fine_amount:,}**. Your new balance is **${current_robber_balance:,}**.")
embed_fail = discord.Embed(
title="Robbery Failed!",
description=f"👮‍♂️ You were caught trying to rob {target.mention}! You paid a fine of **${fine_amount:,}**.",
color=discord.Color.red()
)
embed_fail.add_field(name="Your New Balance", value=f"${current_robber_balance:,}", inline=False)
await ctx.send(embed=embed_fail)
else:
# Robber is broke, can't pay fine
await ctx.send(f"👮‍♂️ You were caught trying to rob {target.mention}, but you're too broke to pay the fine!")
embed_fail_broke = discord.Embed(
title="Robbery Failed!",
description=f"👮‍♂️ You were caught trying to rob {target.mention}, but you're too broke to pay the fine!",
color=discord.Color.red()
)
await ctx.send(embed=embed_fail_broke)
# No setup function needed here

37
cogs/economy/utility.py
View File

@ -21,20 +21,27 @@ class UtilityCommands(commands.Cog):
"""Displays the economy balance for a user."""
target_user = user or ctx.author
balance_amount = await database.get_balance(target_user.id)
await ctx.send(f"{target_user.display_name} has a balance of **${balance_amount:,}**.", ephemeral=True)
embed = discord.Embed(
title=f"{target_user.display_name}'s Balance",
description=f"💰 **${balance_amount:,}**",
color=discord.Color.blue()
)
await ctx.send(embed=embed, ephemeral=True)
@commands.hybrid_command(name="moneylb", aliases=["mlb", "mtop"], description="Show the richest users by money.") # Renamed to avoid conflict
@commands.cooldown(1, 30, commands.BucketType.user) # Prevent spam
async def moneylb(self, ctx: commands.Context, count: int = 10): # Renamed function
"""Displays the top users by balance."""
if not 1 <= count <= 25:
await ctx.send("Please provide a count between 1 and 25.", ephemeral=True)
embed = discord.Embed(description="❌ Please provide a count between 1 and 25.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
results = await database.get_leaderboard(count)
if not results:
await ctx.send("The leaderboard is empty!", ephemeral=True)
embed = discord.Embed(description="📊 The leaderboard is empty!", color=discord.Color.orange())
await ctx.send(embed=embed, ephemeral=True)
return
embed = discord.Embed(title="💰 Economy Leaderboard", color=discord.Color.gold())
@ -67,17 +74,20 @@ class UtilityCommands(commands.Cog):
recipient_id = recipient.id
if sender_id == recipient_id:
await ctx.send("You cannot pay yourself!", ephemeral=True)
embed = discord.Embed(description="❌ You cannot pay yourself!", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
if amount <= 0:
await ctx.send("Please enter a positive amount to pay.", ephemeral=True)
embed = discord.Embed(description="❌ Please enter a positive amount to pay.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
sender_balance = await database.get_balance(sender_id)
if sender_balance < amount:
await ctx.send(f"You don't have enough money! Your balance is **${sender_balance:,}**.", ephemeral=True)
embed = discord.Embed(description=f"❌ You don't have enough money! Your balance is **${sender_balance:,}**.", color=discord.Color.red())
await ctx.send(embed=embed, ephemeral=True)
return
# Perform the transfer
@ -85,10 +95,21 @@ class UtilityCommands(commands.Cog):
await database.update_balance(recipient_id, amount) # Increase recipient's balance
current_sender_balance = await database.get_balance(sender_id)
await ctx.send(f"💸 You successfully paid **${amount:,}** to {recipient.mention}. Your new balance is **${current_sender_balance:,}**.")
embed_sender = discord.Embed(
title="Payment Successful!",
description=f"💸 You successfully paid **${amount:,}** to {recipient.mention}.",
color=discord.Color.green()
)
embed_sender.add_field(name="Your New Balance", value=f"${current_sender_balance:,}", inline=False)
await ctx.send(embed=embed_sender)
try:
# Optionally DM the recipient
await recipient.send(f"💸 You received a payment of **${amount:,}** from {ctx.author.mention}!")
embed_recipient = discord.Embed(
title="You Received a Payment!",
description=f"💸 You received **${amount:,}** from {ctx.author.mention}!",
color=discord.Color.green()
)
await recipient.send(embed=embed_recipient)
except discord.Forbidden:
log.warning(f"Could not DM recipient {recipient_id} about payment.") # User might have DMs closed