diff --git a/geoffrey/DatabaseModels.py b/geoffrey/DatabaseModels.py index 6d00f73..451423b 100644 --- a/geoffrey/DatabaseModels.py +++ b/geoffrey/DatabaseModels.py @@ -215,7 +215,7 @@ class Location(SQL_Base): def pos_to_str(self): pos_str = '**(x= {}, z= {})** {}'.format(self.x, self.z, self.dimension.value.title()) if self.tunnel is not None: - return pos_str + ', **{}**'.format(self.tunnel) + return pos_str + ', Tunnel: **{}**'.format(self.tunnel) else: return pos_str diff --git a/geoffrey/cogs/Add_Commands.py b/geoffrey/cogs/Add_Commands.py index a494fa9..82aff45 100644 --- a/geoffrey/cogs/Add_Commands.py +++ b/geoffrey/cogs/Add_Commands.py @@ -87,7 +87,8 @@ class Add_Commands: async def add_tunnel(self, ctx, tunnel_color: str, tunnel_number: int, *args): """ Adds your tunnel to the database. If you only have one location, you do not need to specify a location name. - ?tunnel [Tunnel Color] [Tunnel Number] [Location Name] + Directions: North South East West + ?tunnel [Tunnel Direction] [Tunnel Number] [Location Name] """ loc_name = get_name(args) diff --git a/geoffrey/cogs/Admin_Commands.py b/geoffrey/cogs/Admin_Commands.py index 6c806c5..dce70d9 100644 --- a/geoffrey/cogs/Admin_Commands.py +++ b/geoffrey/cogs/Admin_Commands.py @@ -2,6 +2,7 @@ from discord import Game from discord.ext import commands from geoffrey.BotErrors import * +from geoffrey.DiscordHelperFunctions import get_name def check_mod(user, admin_users): @@ -116,10 +117,11 @@ class Admin_Commands: await self.error(ctx, error) @mod.command(pass_context=True) - async def status(self, ctx, status: str): + async def status(self, ctx, *args): """ Updates "playing [game]" status of the bot. """ + status = get_name(args) await self.bot.change_presence(activity=Game(status)) await ctx.send('{}, status has been changed'.format(ctx.message.author.mention))