diff --git a/funcs/funcs.py b/funcs/funcs.py index 01e1178..2562a34 100644 --- a/funcs/funcs.py +++ b/funcs/funcs.py @@ -11,6 +11,8 @@ class Funcs(): if user != None: return user["user name"] + elif userID == "Gwendolyn": + return userID else: logThis("Couldn't find user "+userID) return userID diff --git a/funcs/games/gameLoops.py b/funcs/games/gameLoops.py index f02478e..8556dcf 100644 --- a/funcs/games/gameLoops.py +++ b/funcs/games/gameLoops.py @@ -185,23 +185,21 @@ class GameLoops(): except: logThis("Error deleting old image (error code 1501)") oldImage = await channel.send(file = discord.File("resources/games/hexBoards/board"+str(channel.id)+".png")) + if gwendoTurn and not gameDone: + try: + response, showImage, deleteImage, gameDone, gwendoTurn = self.bot.hex.hexAI(str(channel.id)) + except: + response, showImage, deleteImage, gameDone, gwendoTurn = "An AI error occured",False,False,False,False + logThis("AI error (error code 1520)") + await channel.send(response) + logThis(response,str(channel.id)) + if showImage: + if deleteImage: + await oldImage.delete() + oldImage = await channel.send(file = discord.File("resources/games/hexBoards/board"+str(channel.id)+".png")) if not gameDone: - if gwendoTurn: - try: - response, showImage, deleteImage, gameDone, gwendoTurn = self.bot.hex.hexAI(str(channel.id)) - except: - response, showImage, deleteImage, gameDone, gwendoTurn = "An AI error occured",False,False,False,False - logThis("AI error (error code 1520)") - await channel.send(response) - logThis(response,str(channel.id)) - if showImage: - if deleteImage: - await oldImage.delete() - oldImage = await channel.send(file = discord.File("resources/games/hexBoards/board"+str(channel.id)+".png")) - - else: - with open("resources/games/oldImages/hex"+str(channel.id), "w") as f: - f.write(str(oldImage.id)) + with open("resources/games/oldImages/hex"+str(channel.id), "w") as f: + f.write(str(oldImage.id)) if gameDone: game = self.bot.database["hex games"].find_one({"_id":str(channel.id)})