merge

main.py

@@ -1,35 +0,0 @@
-import sys
-from src.graphics import *
-from src.matrix import Matrix
-from src.waiter import Waiter
-
-if __name__ == "__main__":
-    # SETUP
-    pygame.init()
-    clock = pygame.time.Clock()
-    fps = 40
-    waiter = Waiter()
-    graphics = Graphics()
-
-    # init functions
-    graphics.drawBackground(waiter.matrix)
-    graphics.update(waiter.X, waiter.Y)
-
-    while True:
-        for event in pygame.event.get():
-            if event.type == pygame.QUIT:
-                pygame.quit()
-                sys.exit()
-                break
-
-            if event.type == pygame.KEYDOWN:
-                if event.key == pygame.K_ESCAPE:
-                    pygame.quit()
-                    sys.exit()
-                    break
-
-            graphics.clear(waiter.X, waiter.Y)
-            waiter.update(event)
-            graphics.update(waiter.X, waiter.Y)
-        pygame.display.flip()
-        clock.tick(fps)

src/graphics.py

@@ -1,23 +0,0 @@
-import pygame
-
-
-class Graphics:
-    def __init__(self):
-        self.image = {
-            'floor': pygame.image.load('../resources/images/floor.jpg'),
-            'table': pygame.image.load('../resources/images/table.png'),
-            'waiter': pygame.image.load('../resources/images/waiter.png'),
-        }
-        self.screen = pygame.display.set_mode((700, 750))
-        self.block_size = 50
-
-    def drawBackground(self, matrix):
-        for y in range(15):
-            for x in range(14):
-                self.screen.blit(self.image[matrix.get_type(x, y)], (x * self.block_size, y * self.block_size))
-
-    def clear(self, x, y):
-        self.screen.blit(self.image['floor'], (x * self.block_size, y * self.block_size))
-
-    def update(self, x, y):
-        self.screen.blit(self.image['waiter'], (x * self.block_size, y * self.block_size))

src/matrix.py

@@ -1,20 +0,0 @@
-from src.tile import Tile
-
-
-class Matrix:
-    def __init__(self):
-        self.matrix = []
-        for x in range(14):
-            self.matrix.append([0] * 15)
-
-        for x in range(14):
-            for y in range(15):
-                self.matrix[x][y] = Tile(type_='floor', watch_through=1)
-        self.matrix[1][0].type = 'waiter'
-        self.matrix[1][0].walk_through = 0
-
-    def get_type(self, x, y):
-        return self.matrix[x][y].type
-
-    def walk_through(self, x, y):
-        return self.matrix[x][y].walk_through

src/waiter.py

@@ -1,31 +0,0 @@
-import pygame
-from src.matrix import Matrix
-
-
-# WAITER
-class Waiter(pygame.sprite.Sprite):
-    def __init__(self):
-        pygame.sprite.Sprite.__init__(self)
-        self.X = 0
-        self.Y = 0
-        self.frame = 0
-        self.matrix = Matrix()
-
-    # Borders
-    def move(self, x, y):
-        if self.matrix.walk_through(self.X + x, self.Y + y) == 1:
-            if 0 <= self.X + x <= 14:
-                self.X += x
-            if 0 <= self.Y + y <= 15:
-                self.Y += y
-
-    def update(self, event):
-        if event.type == pygame.KEYDOWN:
-            if event.key == pygame.K_LEFT:
-                self.move(-1, 0)
-            if event.key == pygame.K_RIGHT:
-                self.move(1, 0)
-            if event.key == pygame.K_UP:
-                self.move(0, -1)
-            if event.key == pygame.K_DOWN:
-                self.move(0, 1)