diff --git a/Gwendolyn.py b/Gwendolyn.py index 7c29cf8..ed63aed 100644 --- a/Gwendolyn.py +++ b/Gwendolyn.py @@ -58,7 +58,7 @@ async def parseCommands(message,content): # Stops the bot elif content.startswith("stop"): try: - if "#"+str(message.author.id) == "#266269899859427329" or "#"+str(message.author.id) == "#380732645602230272": + if "#"+str(message.author.id) in ["#266269899859427329", "#380732645602230272"]: await message.channel.send("Logging out...") stopServer() diff --git a/funcs/games/hex.py b/funcs/games/hex.py index fe59ce8..081e144 100644 --- a/funcs/games/hex.py +++ b/funcs/games/hex.py @@ -4,7 +4,7 @@ import copy import math from . import hexDraw -from funcs import logThis +from funcs import logThis, getName, getID # This is totally copied from the four in a row game. Just modified @@ -97,7 +97,7 @@ def hexStart(channel, user, opponent): # in case she has the first move gwendoTurn = True - return "Started hex game against "+opponent+". It's "+players[0]+"'s turn", True, False, False, gwendoTurn + return "Started game against "+getName(opponent)+diffText+". It's "+getName(players[0])+"'s turn", True, False, False, gwendoTurn else: return "There's already a hex game going on in this channel", False, False, False, False else: