Add gameMap, pushing

arctic-masher.py

@@ -2,6 +2,8 @@ import pygame
 import sys
 import random
 
+from player import *
+
 pygame.init()
 clock = pygame.time.Clock()
 
@@ -12,54 +14,29 @@ green = pygame.Color('green3')
 black = pygame.Color("black")
 
 tile = 34
+tileCountx = 50
+tileCounty = 30
 
-screen_width = tile * 50
-screen_height = tile * 30
+screen_width = tile * tileCountx
+screen_height = tile * tileCounty
 
 screen = pygame.display.set_mode((screen_width,screen_height))
 pygame.display.set_caption('Arctic Masher')
 
-class Player:
-    def __init__(self, x, y, color, keys):
-        self.x = x
-        self.y = y
-        self.color = color
-        commands = {
-            "n": lambda: self.move(0,-1),
-            "ne": lambda: self.move(1,-1),
-            "e": lambda: self.move(1,0),
-            "se": lambda: self.move(1,1),
-            "s": lambda: self.move(0,1),
-            "sw": lambda: self.move(-1,1),
-            "w": lambda: self.move(-1,0),
-            "nw": lambda: self.move(-1,-1),
-        }
-        self.commands = []
-        for key in keys:
-            self.commands.append([key[0], commands[key[1]], 0, 0])
-        self.sprite = pygame.Rect((tile*x)+2,(tile*y)+2,tile-2,tile-2)
+gameMap = []
 
-    def useKeys(self, keys):
-        try:
-            for command in self.commands:
-                if keys[command[0]]:
-                    if command[2] == 0 or (command[2] > 10 and command[3] > 2):
-                        command[1]()
-                        command[3] = 0
-                    command[2] += 1
-                    command[3] += 1
-                else:
-                    command[2] = 0
-                    command[3] = 0
-        except:
-            pass
-
-    def move(self, x, y):
-        self.x += x
-        self.y += y
+for i in range(tileCountx):
+    column = []
+    for j in range(tileCounty):
+        column.append(False)
+    gameMap.append(column)
 
 players = []
-players.append(Player(5, 5, red, [
+players.append(Player(
+    5,
+    5,
+    red,
+    [
         (pygame.K_w, "n"),
         (pygame.K_e, "ne"),
         (pygame.K_d, "e"),
@@ -68,8 +45,14 @@ players.append(Player(5, 5, red, [
         (pygame.K_z, "sw"),
         (pygame.K_a, "w"),
         (pygame.K_q, "nw"),
-]))
-players.append(Player(3, 3, green, [
+    ],
+    gameMap,
+))
+players.append(Player(
+    3,
+    3,
+    green,
+    [
         (pygame.K_KP_8, "n"),
         (pygame.K_KP_9, "ne"),
         (pygame.K_KP_6, "e"),
@@ -78,8 +61,14 @@ players.append(Player(3, 3, green, [
         (pygame.K_KP_1, "sw"),
         (pygame.K_KP_4, "w"),
         (pygame.K_KP_7, "nw"),
-]))
-players.append(Player(5, 5, red, [
+    ],
+    gameMap,
+))
+players.append(Player(
+    5,
+    5,
+    red,
+    [
         (pygame.K_y, "n"),
         (pygame.K_u, "ne"),
         (pygame.K_j, "e"),
@@ -88,7 +77,25 @@ players.append(Player(5, 5, red, [
         (pygame.K_b, "sw"),
         (pygame.K_g, "w"),
         (pygame.K_t, "nw"),
-]))
+    ],
+    gameMap,
+))
+
+for player in players:
+    for i in range(50):
+        try:
+            spot = [random.randint(0, tileCountx - 1), random.randint(0, tileCounty - 1)]
+            if gameMap[spot[0]][spot[1]]:
+                raise Exception("spot taken!")
+            gameMap[spot[0]][spot[1]] = player
+            player.x = spot[0]
+            player.y = spot[1]
+            break
+        except Exception as error:
+            print(error)
+            if i > 45:
+                pygame.quit()
+                sys.exit()
 
 sprite_sheet_image = pygame.image.load('assets/penguin.png').convert_alpha()
 

blocks.py

@@ -0,0 +1,16 @@
+class Block:
+    def __init__(self, x, y, gameMap):
+        self.x = x
+        self.y = y
+        self.gameMap = gameMap
+
+    def move(self, x, y, caller=False):
+        try:
+            if self.gameMap[self.x + x][self.y + y]:
+                self.gameMap[self.x + x][self.y + y].move(x, y, caller=self)
+            self.gameMap[self.x][self.y] = 0
+            self.x += x
+            self.y += y
+            self.gameMap[self.x][self.y] = self
+        except:
+            pass

player.py

@@ -0,0 +1,47 @@
+class Player:
+    def __init__(self, x, y, sprite, keys, gameMap):
+        self.x = x
+        self.y = y
+        self.sprite = sprite
+        self.gameMap = gameMap
+        commands = {
+            "n": lambda: self.move(0,-1),
+            "ne": lambda: self.move(1,-1),
+            "e": lambda: self.move(1,0),
+            "se": lambda: self.move(1,1),
+            "s": lambda: self.move(0,1),
+            "sw": lambda: self.move(-1,1),
+            "w": lambda: self.move(-1,0),
+            "nw": lambda: self.move(-1,-1),
+        }
+        self.commands = []
+        for key in keys:
+            self.commands.append([key[0], commands[key[1]], 0, 0])
+
+    def useKeys(self, keys):
+        try:
+            for command in self.commands:
+                if keys[command[0]]:
+                    if command[2] == 0 or (command[2] > 10 and command[3] > 2):
+                        command[1]()
+                        command[3] = 0
+                    command[2] += 1
+                    command[3] += 1
+                else:
+                    command[2] = 0
+                    command[3] = 0
+        except:
+            pass
+
+    def move(self, x, y, caller=False):
+        try:
+            if isinstance(caller, Player):
+                raise Exception("Cannot push other players.")
+            if self.gameMap[self.x + x][self.y + y]:
+                self.gameMap[self.x + x][self.y + y].move(x, y, caller=self)
+            self.gameMap[self.x][self.y] = 0
+            self.x += x
+            self.y += y
+            self.gameMap[self.x][self.y] = self
+        except Exception as error:
+            raise error