Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Emojistory fixes; few more discrims nixed; oops fixed give/bal commands too #166

Merged
merged 1 commit into from
Jul 24, 2024
+38 −21
Merged

Emojistory fixes; few more discrims nixed; oops fixed give/bal commands too #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 34 additions & 17 deletions crimsobot/cogs/games.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ async def crimsoball(self, ctx: commands.Context, *, question: str) -> None:
thumb_name='8ball',
)
embed.add_field(
name='{} asks:'.format(ctx.message.author),
name=f'{ctx.message.author.name} asks:',
value=question,
inline=False
)
Expand Down Expand Up @@ -324,7 +324,7 @@ async def emojistory(self, ctx: CrimsoContext) -> None:
elif len(submissions.stories) == 1:
title = '**WINNER BY DEFAULT!**'
descr = '\n\n'.join([
'Only one submission by **{}**:'.format(submissions.stories[0].author),
f'Only one submission by **{submissions.stories[0].author.name}**:',
emojis,
submissions.stories[0].content,
])
Expand Down Expand Up @@ -377,7 +377,7 @@ async def emojistory(self, ctx: CrimsoContext) -> None:
# then the embed info
title = '**EMOJI STORY WINNER!**'
descr = '\n\n'.join([
f'The winner is **{winner.author}** with {votes_for_winner} vote{s_or_no_s} for their story:',
f'The winner is **{winner.author.name}** with {votes_for_winner} vote{s_or_no_s} for their story:',
emojis,
winner.content,
])
Expand All @@ -387,7 +387,7 @@ async def emojistory(self, ctx: CrimsoContext) -> None:
title=title,
descr=descr,
thumb_name='random',
footer=f'{winner.author} gets {winning_amount} crimsoCOIN!' if winner else None,
footer=f'{winner.author.name} gets {winning_amount:.2f} crimsoCOIN!' if winner else None,
)

await ctx.send(embed=embed)
Expand All @@ -412,9 +412,13 @@ async def balance(self, ctx: commands.Context, whose: Optional[discord.Member] =

bal = await crimsogames.check_balance(whose)

balance_negative = True if bal < 0 else False
neg = '-' if balance_negative else '' # negative sign on amount below if need be

embed = c.crimbed(
title=f'\u200B\n{whose} has **\u20A2{bal:.2f}**.',
descr=random.choice(encourage) if bal > 0 else '=[',
title=random.choice(encourage) if not balance_negative else '=[',
descr=f"{whose.name}'s balance is\n**{neg}\u20A2{abs(bal):.2f}**.",
footer='Earn more by playing games! See >help games.',
thumb_name='crimsoCOIN',
)

Expand All @@ -433,8 +437,9 @@ async def give(self, ctx: commands.Context, recipient: discord.Member, amount: f
raise commands.BadArgument('Amount less than 0.')
elif amount > await crimsogames.check_balance(ctx.message.author) * 0.25:
embed = c.crimbed(
title=f'\u200B\n{ctx.message.author}, you cannot give more than 1/4 of your balance!',
descr='Check your `>balance`.',
title='Hold up—',
descr=f'{ctx.message.author.name}, you cannot give away more than 1/4 of your balance at a time!',
footer='Check your >balance.',
thumb_name='crimsoCOIN',
)
await ctx.send(embed=embed)
Expand All @@ -444,9 +449,15 @@ async def give(self, ctx: commands.Context, recipient: discord.Member, amount: f
return

# transaction
old_bal_give = await crimsogames.check_balance(ctx.message.author)
old_bal_rec = await crimsogames.check_balance(recipient)

await crimsogames.win(ctx.message.author, -amount) # credit
await crimsogames.win(recipient, amount) # debit

new_bal_give = await crimsogames.check_balance(ctx.message.author)
new_bal_rec = await crimsogames.check_balance(recipient)

# message (embed)
encourage = [
'Nice!',
Expand All @@ -459,9 +470,11 @@ async def give(self, ctx: commands.Context, recipient: discord.Member, amount: f
]

embed = c.crimbed(
title='\u200B\n{} has given {} **\u20A2{:.2f}** crimsoCOIN.'.format(ctx.message.author, recipient, amount),
descr=random.choice(encourage),
title=random.choice(encourage),
descr=f'{ctx.message.author.name} has given {recipient.name} **\u20A2{amount:.2f}** crimsoCOIN.',
thumb_name='crimsoCOIN',
footer=f'{ctx.message.author.name}: \u20A2{old_bal_give:.2f} ➡️ \u20A2{new_bal_give:.2f}\n'
f'{recipient.name}: \u20A2{old_bal_rec:.2f} ➡️ \u20A2{new_bal_rec:.2f}',
)

await ctx.send(embed=embed)
Expand All @@ -471,15 +484,19 @@ async def give(self, ctx: commands.Context, recipient: discord.Member, amount: f
async def cgive(self, ctx: commands.Context, recipient: discord.Member, amount: float) -> None:
"""Manual adjustment of crimsoCOIN values."""

# change to float
amount = float(amount)

# transaction
old_bal_rec = await crimsogames.check_balance(recipient)
await crimsogames.win(recipient, amount) # debit
new_bal_rec = await crimsogames.check_balance(recipient)

amount_negative = True if amount < 0 else False
neg = '-' if amount_negative else '' # negative sign on amount below if need be

embed = c.crimbed(
title="\u200B\n{} has adjusted {}'s balance by {neg}\u20A2**{:.2f}**.".format(
ctx.message.author, recipient, abs(amount), neg='-' if amount < 0 else ''
),
descr='Life is inherently unfair.' if amount < 0 else 'Rejoice in your good fortune!',
title='Life is inherently unfair.' if amount_negative else 'Rejoice in your good fortune!',
descr=f"{ctx.message.author.name} has adjusted {recipient.name}'s balance by "
f'**{neg}\u20A2{abs(amount):.2f}**.',
footer=f'{recipient.name}: \u20A2{old_bal_rec:.2f} ➡️ \u20A2{new_bal_rec:.2f}',
thumb_name='crimsoCOIN',
)

Expand Down
2 changes: 1 addition & 1 deletion crimsobot/data/games/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cringo:
4: 9
6: 9
emojistory:
join_timer: 63
join_timer: 90
minimum_length: 5
maximum_length: 300
vote_timer: 45
Expand Down
6 changes: 3 additions & 3 deletions crimsobot/handlers/games.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ async def on_event(self, message: discord.Message) -> None: # type: ignore

embed = c.crimbed(
title=None,
descr=f'**{message.author}** joined!',
descr='Story submitted!',
)

await self.context.send(embed=embed, delete_after=8)
await self.context.send(embed=embed, delete_after=5)


@must_be_event('on_message')
Expand Down Expand Up @@ -110,7 +110,7 @@ async def on_event(self, message: discord.Message) -> None: # type: ignore

embed = c.crimbed(
title=None,
descr=f'**{message.author}** voted.',
descr=f'**{message.author.name}** voted.',
)

await self.context.send(embed=embed, delete_after=8)
Empty file added reload
View file
Open in desktop
Empty file.
Loading