🐛

Gwendolyn.py

@@ -10,7 +10,7 @@ import random
 #import math
 import os
 
-from funcs import helloFunc, cap, imageFunc, logThis, findWikiPage, makeFiles, emojiToNumber, fiarReactionTest, deleteGame, stopServer, checkBalance, giveMoney, triviaCountPoints, triviaStart, triviaAnswer, blackjackShuffle, blackjackStart, blackjackPlayerDrawHand, blackjackContinue, blackjackFinish, blackjackHit, blackjackStand, blackjackDouble, blackjackSplit, parseFourInARow, fourInARowAI, spellFunc, monsterFunc, nameGen, tavernGen, movieFunc, roll_dice, parseChar, parseRoll, critRoll, parseDestiny
+from funcs import helloFunc, cap, imageFunc, logThis, findWikiPage, makeFiles, emojiToNumber, fiarReactionTest, deleteGame, stopServer, checkBalance, giveMoney, triviaCountPoints, triviaStart, triviaAnswer, blackjackShuffle, blackjackStart, blackjackPlayerDrawHand, blackjackContinue, blackjackFinish, blackjackHit, blackjackStand, blackjackDouble, blackjackSplit, parseFourInARow, fourInARowAI, spellFunc, monsterFunc, nameGen, tavernGen, movieFunc, roll_dice, parseChar, parseRoll, critRoll, parseDestiny, parseHex
 
 from gameLoops import fiar, blackjackLoop
 
@@ -564,11 +564,11 @@ async def parseCommands(message,content):
 
     # Runs a game of Hex
     elif content.startswith("hex"):
-        try:
-            command = content.replace("hex","")
-            await hex(message.channel,command,message.author.display_name)
-        except:
-            logThis("Something went wrong (error code 1500)")
+        #try:
+        command = content.replace("hex","")
+        await parseHex(command,str(message.channel),message.author.display_name)
+        #except:
+        #    logThis("Something went wrong (error code 1500)")
 
     # Not a command
     else:

funcs/__init__.py

@@ -1,10 +1,10 @@
 """A collection of all Gwendolyn functions."""
 
-__all__ = ["helloFunc", "cap", "imageFunc", "logThis", "findWikiPage", "makeFiles", "emojiToNumber", "fiarReactionTest", "deleteGame", "stopServer", "checkBalance", "giveMoney", "addMoney", "triviaCountPoints", "triviaStart", "triviaAnswer", "blackjackShuffle", "blackjackStart", "blackjackPlayerDrawHand", "blackjackContinue", "blackjackFinish", "blackjackHit", "blackjackStand", "blackjackDouble", "blackjackSplit", "parseFourInARow", "fourInARowAI", "spellFunc", "monsterFunc", "nameGen", "tavernGen", "movieFunc", "roll_dice", "parseChar", "parseRoll", "critRoll", "parseDestiny"]
+__all__ = ["helloFunc", "cap", "imageFunc", "logThis", "findWikiPage", "makeFiles", "emojiToNumber", "fiarReactionTest", "deleteGame", "stopServer", "checkBalance", "giveMoney", "addMoney", "triviaCountPoints", "triviaStart", "triviaAnswer", "blackjackShuffle", "blackjackStart", "blackjackPlayerDrawHand", "blackjackContinue", "blackjackFinish", "blackjackHit", "blackjackStand", "blackjackDouble", "blackjackSplit", "parseFourInARow", "fourInARowAI", "spellFunc", "monsterFunc", "nameGen", "tavernGen", "movieFunc", "roll_dice", "parseChar", "parseRoll", "critRoll", "parseDestiny","parseHex"]
 
 from .miscFuncs import helloFunc, cap, imageFunc, logThis, findWikiPage, makeFiles, replaceMultiple, emojiToNumber, fiarReactionTest, deleteGame, stopServer
 
-from .games import checkBalance, giveMoney, addMoney, triviaCountPoints, triviaStart, triviaAnswer, blackjackShuffle, blackjackStart, blackjackPlayerDrawHand, blackjackContinue, blackjackFinish, blackjackHit, blackjackStand, blackjackDouble, blackjackSplit, parseFourInARow, fourInARowAI
+from .games import checkBalance, giveMoney, addMoney, triviaCountPoints, triviaStart, triviaAnswer, blackjackShuffle, blackjackStart, blackjackPlayerDrawHand, blackjackContinue, blackjackFinish, blackjackHit, blackjackStand, blackjackDouble, blackjackSplit, parseFourInARow, fourInARowAI, parseHex
 
 from .lookup import spellFunc, monsterFunc
 

funcs/games/__init__.py

@@ -1,8 +1,9 @@
 """Functions for games Gwendolyn can play."""
 
-__all__ = ["checkBalance", "giveMoney", "addMoney","triviaCountPoints", "triviaStart", "triviaAnswer", "blackjackShuffle", "blackjackStart", "blackjackPlayerDrawHand", "blackjackContinue", "blackjackFinish", "blackjackHit", "blackjackStand", "blackjackDouble", "blackjackSplit", "parseFourInARow", "fourInARowAI"]
+__all__ = ["checkBalance", "giveMoney", "addMoney","triviaCountPoints", "triviaStart", "triviaAnswer", "blackjackShuffle", "blackjackStart", "blackjackPlayerDrawHand", "blackjackContinue", "blackjackFinish", "blackjackHit", "blackjackStand", "blackjackDouble", "blackjackSplit", "parseFourInARow", "fourInARowAI", "parseHex"]
 
 from .money import checkBalance, giveMoney, addMoney
 from .trivia import triviaCountPoints, triviaStart, triviaAnswer
 from .blackjack import blackjackShuffle, blackjackStart, blackjackPlayerDrawHand, blackjackContinue, blackjackFinish, blackjackHit, blackjackStand, blackjackDouble, blackjackSplit
 from .fourInARow import parseFourInARow, fourInARowAI
+from .hex import parseHex

funcs/games/fourInARow.py

@@ -31,12 +31,14 @@ def fourInARowStart(channel, user, opponent):
             
             if opponent in ["1","2","3","4","5"]:
                 difficulty = int(opponent)
+                diffText = " with difficulty "+opponent
                 opponent = "Gwendolyn"
             elif opponent in ["0","6","7","8","9","10","69","100","420"]:
                 return "That difficulty doesn't exist", False, False, False, False
             else:
                 # Opponent is another player
-                difficulty = "NA"
+                difficulty = None
+                diffText = ""
 
             board = [ [ 0 for i in range(columnCount) ] for j in range(rowCount) ]
             players = [user,opponent]
@@ -55,7 +57,7 @@ def fourInARowStart(channel, user, opponent):
             if players[0] == "Gwendolyn":
                 gwendoTurn = True
 
-            return "Started game against "+opponent+". It's "+players[0]+"'s turn", True, False, False, gwendoTurn
+            return "Started game against "+opponent+diffText+". It's "+players[0]+"'s turn", True, False, False, gwendoTurn
         else:
             return "There's already a 4 in a row game going on in this channel", False, False, False, False
     else:

funcs/games/hex.py

@@ -55,7 +55,7 @@ def hexStart(channel, user, opponent):
                 return "That difficulty doesn't exist", False, False, False, False
             else:
                 # Opponent is another player
-                difficulty = "NA"
+                difficulty = None
 
             board = [ [ 0 for i in range(columnCount) ] for j in range(rowCount) ]
             players = [user,opponent]