mirror of
https://github.com/wlinator/luminara.git
synced 2024-10-03 02:43:12 +00:00
Merge branch 'dev' into 'main'
Small changes See merge request wlinator/Racu!30
This commit is contained in:
commit
b8090fec5d
4 changed files with 2 additions and 17 deletions
|
@ -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}** "
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue