From e3a8894e87347aaebb509f9de48bc8c32b25a4e5 Mon Sep 17 00:00:00 2001 From: wlinator Date: Tue, 26 Mar 2024 10:59:29 +0100 Subject: [PATCH 1/3] Change info embeds to blurple --- lib/embeds/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/embeds/info.py b/lib/embeds/info.py index 6ab9661..ef5102d 100644 --- a/lib/embeds/info.py +++ b/lib/embeds/info.py @@ -12,7 +12,7 @@ streak_icon = resources["icons"]["racu_streak"] def clean_info_embed(ctx): embed = discord.Embed( - color=discord.Color.brand_green(), + color=discord.Color.blurple(), description=f"**{ctx.author.name}** " ) From 5f1c2a2eb489aa910fd63b9fe38d06ca7643fe9b Mon Sep 17 00:00:00 2001 From: wlinator Date: Tue, 26 Mar 2024 11:07:51 +0100 Subject: [PATCH 2/3] Remove item handling --- modules/economy/blackjack.py | 8 -------- modules/economy/slots.py | 7 ------- 2 files changed, 15 deletions(-) diff --git a/modules/economy/blackjack.py b/modules/economy/blackjack.py index 4fc7313..fac6676 100644 --- a/modules/economy/blackjack.py +++ b/modules/economy/blackjack.py @@ -5,7 +5,6 @@ import discord import pytz from dotenv import load_dotenv -from handlers.ItemHandler import ItemHandler from lib import economy_functions, interaction from lib.embeds.error import EconErrors from lib.embeds.error import GenericErrors @@ -127,13 +126,6 @@ async def cmd(ctx, bet: int): embed = blackjack_finished(ctx, Currency.format_human(bet), player_hand_value, dealer_hand_value, Currency.format_human(payout), status) - item_reward = ItemHandler(ctx) - field = await item_reward.rave_coin(is_won=is_won, bet=bet, field="") - field = await item_reward.bitch_coin(status, field) - - if field is not "": - embed.add_field(name="Extra Rewards", value=field, inline=False) - if playing_embed: await ctx.edit(embed=embed, view=None, content=ctx.author.mention) else: diff --git a/modules/economy/slots.py b/modules/economy/slots.py index b716f6d..cceabdc 100644 --- a/modules/economy/slots.py +++ b/modules/economy/slots.py @@ -6,7 +6,6 @@ from collections import Counter import discord import pytz -from handlers.ItemHandler import ItemHandler from lib.embeds.error import EconErrors from config.parser import JsonCache from services.Currency import Currency @@ -58,12 +57,6 @@ async def cmd(self, ctx, bet): finished_output = slots_finished(ctx, type, Currency.format_human(bet), Currency.format_human(payout), results, emojis) - item_reward = ItemHandler(ctx) - field = await item_reward.rave_coin(is_won=is_won, bet=bet, field="") - - if field is not "": - finished_output.add_field(name="Extra Rewards", value=field, inline=False) - await ctx.edit(embed=finished_output) # user payout From 01b04078982a0838dcb20a9b50781c361239b40b Mon Sep 17 00:00:00 2001 From: wlinator Date: Tue, 26 Mar 2024 11:13:48 +0100 Subject: [PATCH 3/3] Fix .award command --- modules/admin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/admin/__init__.py b/modules/admin/__init__.py index c2cce87..839ecf9 100644 --- a/modules/admin/__init__.py +++ b/modules/admin/__init__.py @@ -22,7 +22,7 @@ class BotAdmin(commands.Cog): ) @commands.guild_only() @commands.is_owner() - async def award_command(self, ctx, *, user: discord.User, amount: int): + async def award_command(self, ctx, user: discord.User, *, amount: int): return await award.cmd(ctx, user, amount) @award_command.error