From e9792bd5ec40b8615e730fd0e4c22d4d071e6640 Mon Sep 17 00:00:00 2001 From: Bella | Nightshade Date: Wed, 27 Mar 2019 08:49:14 +0930 Subject: [PATCH] Add command notes to member help output, clean up pk;export channel msg --- src/pluralkit/bot/commands/__init__.py | 2 ++ src/pluralkit/bot/commands/misc_commands.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pluralkit/bot/commands/__init__.py b/src/pluralkit/bot/commands/__init__.py index 724be2ca..d1635c0e 100644 --- a/src/pluralkit/bot/commands/__init__.py +++ b/src/pluralkit/bot/commands/__init__.py @@ -201,6 +201,8 @@ async def command_root(ctx: CommandContext): await misc_commands.pkfire(ctx) elif ctx.match("thunder"): await misc_commands.pkthunder(ctx) + elif ctx.match("freeze"): + await misc_commands.pkfreeze(ctx) elif ctx.match("starstorm"): await misc_commands.pkstarstorm(ctx) else: diff --git a/src/pluralkit/bot/commands/misc_commands.py b/src/pluralkit/bot/commands/misc_commands.py index 2c37082b..d8ab6fab 100644 --- a/src/pluralkit/bot/commands/misc_commands.py +++ b/src/pluralkit/bot/commands/misc_commands.py @@ -16,7 +16,7 @@ async def help_root(ctx: CommandContext): elif ctx.match("system"): await ctx.reply(help.system_commands, embed=help_footer_embed()) elif ctx.match("member"): - await ctx.reply(help.member_commands, embed=help_footer_embed()) + await ctx.reply(help.member_commands + "\n\n" + help.command_notes, embed=help_footer_embed()) else: await ctx.reply(help.root, embed=help_footer_embed()) @@ -94,7 +94,7 @@ async def export(ctx: CommandContext): await working_msg.delete() f = io.BytesIO(json.dumps(data).encode("utf-8")) - await ctx.message.channel.send(content="Export successful! File sent in your DMs.") + await ctx.reply_ok("DM'd!") await ctx.message.author.send(content="Here you go!", file=discord.File(fp=f, filename="pluralkit_system.json")) @@ -120,5 +120,8 @@ async def pkfire(ctx: CommandContext): async def pkthunder(ctx: CommandContext): await ctx.message.channel.send("*A giant ball of lightning is conjured and fired directly at your opponent, vanquishing them.*") +async def pkfreeze(ctx: CommandContext): + await ctx.message.channel.send("*A giant crystal ball of ice is charged and hurled toward your opponent, bursting open and freezing them solid on contact.*") + async def pkstarstorm(ctx: CommandContext): await ctx.message.channel.send("*Vibrant colours burst forth from the sky as meteors rain down upon your opponent.*")