🎲

funcs/games/gameLoops.py

@@ -93,10 +93,10 @@ class GameLoops():
             self.bot.funcs.deleteGame("4 in a row games",str(channel.id))
 
     async def runMonopoly(self,channel, command, user):
-        try:
+        #try:
         response, showImage, deleteImage, gameStarted, gameContinue = self.bot.monopoly.parseMonopoly(command,str(channel.id),user)
-        except:
+        #except:
-            logThis("Error parsing command (error code 1610)")
+        #    logThis("Error parsing command (error code 1610)")
         if response != "":
             await channel.send(response)
         logThis(response,str(channel.id))

funcs/games/monopoly.py

@@ -24,10 +24,10 @@ class Monopoly():
 
             self.bot.database["monopoly games"].insert_one(newGame)
 
-            try:
+            #try:
             self.draw.drawImage(channel)
-            except:
+            #except:
-                logThis("Error drawing board (error code 1640)")
+            #    logThis("Error drawing board (error code 1640)")
 
             return "Started a monopoly game. Use \"!monopoly join\" to join within the next minute.", True, False, True, True
         else:
@@ -73,6 +73,8 @@ class Monopoly():
                 return self.monopolyRoll(channel,user)
             except:
                 logThis("Error rolling (error code 1650)")
+        elif commands[0] == "stop":
+            return self.monopolyStop(channel)
         else:
             return "I didn't understand that (error code 1602)", False, False, False, False
 
@@ -95,10 +97,10 @@ class Monopoly():
                 self.bot.database["monopoly games"].update_one({"_id":channel},{"$set":{"turn":turn}})
                 playerList = list(game["players"].keys())
 
-            try:
+            #try:
             self.draw.drawImage(channel)
-            except:
+            #except:
-                logThis("Error drawing board (error code 1640)")
+            #    logThis("Error drawing board (error code 1640)")
 
             if playerList == []:
                 return "No one joined. Ending game.", False, True, True
@@ -112,7 +114,7 @@ class Monopoly():
         turn = game["turn"]
         currentPlayer = game["player list"][turn]
 
-        if user == currentPlayer:
+        if user == currentPlayer or self.bot.options.testing:
             rolls = [random.randint(1,6),random.randint(1,6)]
             message = self.bot.funcs.getName(user)+" rolled a "+str(rolls[0])+" and a "+str(rolls[1])+"."
             if rolls[0] == rolls[1]:
@@ -129,10 +131,14 @@ class Monopoly():
             self.bot.database["monopoly games"].update_one({"_id":channel},{"$set":{"players."+user+".position":newPosition}})
             self.bot.database["monopoly games"].update_one({"_id":channel},{"$set":{"last roll":rolls}})
 
-            try:
+            #try:
             self.draw.drawImage(channel)
-            except:
+            #except:
-                logThis("Error drawing board (error code 1640)")
+            #    logThis("Error drawing board (error code 1640)")
 
             return message, True, True, False, True
         else: return "", False, False, False, False
+
+    def monopolyStop(self,channel):
+        self.bot.funcs.deleteGame("monopoly games",channel)
+        return "Stopped game", False, False, False, False

funcs/games/monopolyDraw.py

@@ -5,10 +5,11 @@ from funcs import logThis
 from PIL import Image, ImageDraw
 
 w, h = 1440, 1440
-largeSpace = 191
+largeSpace = 190
 smallSpace = math.floor((w - 2*largeSpace)/9)
 avatarSize = 50
 avatarHalf = math.floor(avatarSize/2)
+avatarBuffer = 10
 
 class DrawMonopoly():
     def __init__(self,bot):
@@ -20,11 +21,19 @@ class DrawMonopoly():
 
         board = Image.open("resources/games/monopolyBoard.png")
         d = ImageDraw.Draw(board,"RGBA")
+        places = {}
 
         for key, value in list(game["players"].items()):
             logThis("Drawing "+key)
+            if value["position"] in places:
+                places[value["position"]].append(key)
+            else:
+                places[value["position"]] = [key]
+
+        for key, value in list(places.items()):
+            for number, player in enumerate(value):
                 try:
-                x, y = self.getPosition(value["position"])
+                    x, y = self.getPosition(key,number)
                 except:
                     logThis("Error getting position (error code 1641)")
                 d.ellipse([(x-avatarHalf,y-avatarHalf),(x+avatarHalf,y+avatarHalf)],fill=(255,0,0))
@@ -32,7 +41,7 @@ class DrawMonopoly():
         board.save("resources/games/monopolyBoards/monopolyBoard"+channel+".png")
 
 
-    def getPosition(self, positionNumber):
+    def getPosition(self, positionNumber, number):
         x, y = 0, 0
         if positionNumber == 0 or positionNumber >= 30:
             x = math.floor(largeSpace/2)
@@ -52,6 +61,16 @@ class DrawMonopoly():
         elif positionNumber > 30:
             y = h - math.floor(largeSpace - (smallSpace/2)) - (smallSpace*(positionNumber - 30))
 
+        if number%2 == 1:
+            x -= avatarBuffer + avatarSize
+
+        if math.floor(number/2) == 1:
+            y += avatarBuffer + avatarSize
+        elif math.floor(number/2) == 2:
+            y -= avatarBuffer + avatarSize
+
+        x += avatarSize
+
         return x, y