Adjusted size of components, begun maze gen; TODO reconfig movement r…

…estrictions
1024Adam · Mar 1, 2017 · 003e687 · 003e687
1 parent ac72a77
commit 003e687
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 21 deletions.
diff --git a/img/player.png b/img/player.png
diff --git a/infinite_maze/Game.py b/infinite_maze/Game.py
@@ -52,7 +52,7 @@ def updateScreen(self, player, lines):
             self.pace += 1
 
         # Print Display Text
-        pygame.draw.line(self.getScreen(), self.fgColor, (78, self.yMin), (78, self.yMax + 15), 2)
+        pygame.draw.line(self.getScreen(), self.fgColor, (80, self.yMin), (80, self.yMax + 15), 2)
         timeText = self.font.render('Time: ' + self.clock.getTimeString(), 1, self.fgColor)
         self.screen.blit(timeText, (10, 10))
         scoreText = self.font.render('Score: ' + str(self.score), 1, self.fgColor)

diff --git a/infinite_maze/Line.py b/infinite_maze/Line.py
@@ -2,10 +2,14 @@ class Line:
     def __init__(self):
         self.start = (0, 0)
         self.end = (0, 0)
+        self.sideA = 0
+        self.sideB = 0
 
-    def __init__(self, startPos, endPos):
+    def __init__(self, startPos, endPos, sideA, sideB):
         self.start = startPos
         self.end = endPos
+        self.sideA = sideA
+        self.sideB = sideB
 
     def getStart(self):
         return (self.start)
@@ -42,3 +46,19 @@ def getYEnd(self):
 
     def setYEnd(self, newY):
         self.end = (self.end[0], newY)
+
+    @staticmethod
+    def generateMaze(game, width, height):
+        lines = []
+        for x in range(width):
+            xPos = (22 * x) + game.getXMax()
+            for y in range(height):
+                yPos = (22 * y) + game.getYMin()
+                lines.append(Line((xPos, yPos), (xPos + 22, yPos), 0, 0))
+        for y in range(height - 1):
+            yPos = (22 * y) + game.getYMin()
+            for x in range(1, width):
+                xPos = (22 * x) + game.getXMax()
+                lines.append(Line((xPos, yPos), (xPos, yPos + 22), 0, 0))
+
+        return (lines)
diff --git a/infinite_maze/infinite_maze.py b/infinite_maze/infinite_maze.py
@@ -9,16 +9,10 @@ def maze():
     game = Game() 
 
     # Player Stats/Position/Details
-    player = Player(80, (game.getHeight() / 2))
+    player = Player(80, 223)
 
     # Maze Details
-    lines = []
-    lines.append(Line((120, 230), (125, 230)))
-    lines.append(Line((125, 230), (130, 230)))
-    lines.append(Line((130, 230), (135, 230)))
-    lines.append(Line((135, 230), (140, 230)))
-    lines.append(Line((190, 265), (195, 265)))
-    lines.append(Line((195, 265), (200, 265)))
+    lines = Line.generateMaze(game, 15, 20)
 
     while (game.isPlaying()): 
         while (game.isActive()):
@@ -29,29 +23,29 @@ def maze():
             if (keys[pygame.K_RIGHT] or keys[pygame.K_d]):
                 blocked = 0
                 for line in lines:
-                    if ((player.getX() + 10 + player.getSpeed() >= line.getXStart()) and (player.getX() + 10 <= line.getXStart()) and (player.getY() + 20 > line.getYStart()) and (player.getY() - 5 < line.getYStart())):
+                    if ((player.getX() + player.getSpeed() >= line.getXStart()) and (player.getX() <= line.getXStart()) and (player.getY() + 5 > line.getYStart()) and (player.getY() - 5 < line.getYStart())):
                         blocked = 1
                 if (not blocked):
                     player.moveX(1)
                     game.updateScore(1)
             if (keys[pygame.K_DOWN] or keys[pygame.K_s]):
                 blocked = 0
                 for line in lines:
-                    if ((player.getY() + 15 + player.getSpeed() >= line.getYStart()) and (player.getY() + 15 <= line.getYStart()) and (player.getX() + 15 > line.getXStart()) and (player.getX() - 15 < line.getXStart())):
+                    if ((player.getY() + player.getSpeed() >= line.getYStart()) and (player.getY() <= line.getYStart()) and (player.getX() + 5 > line.getXStart()) and (player.getX() - 5 < line.getXStart())):
                         blocked = 1
                 if (not blocked):
                     player.moveY(1)
             if (keys[pygame.K_UP] or keys[pygame.K_w]):
                 blocked = 0
                 for line in lines:
-                    if ((player.getY() - player.getSpeed() <= line.getYStart()) and (player.getY() >= line.getYStart()) and (player.getX() + 15 > line.getXStart()) and (player.getX() - 15 < line.getXStart())):
+                    if ((player.getY() - player.getSpeed() <= line.getYStart()) and (player.getY() >= line.getYStart()) and (player.getX() + 5 > line.getXStart()) and (player.getX() - 5 < line.getXStart())):
                         blocked = 1
                 if (not blocked):
                     player.moveY(-1)
             if (keys[pygame.K_LEFT] or keys[pygame.K_a]):
                 blocked = 0
                 for line in lines:
-                    if ((player.getX() - 5 - player.getSpeed() <= line.getXStart()) and (player.getX() - 5 >= line.getXStart()) and (player.getY() + 20 > line.getYStart()) and (player.getY() - 5 < line.getYStart())):
+                    if ((player.getX() - player.getSpeed() <= line.getXStart()) and (player.getX() >= line.getXStart()) and (player.getY() + 5 > line.getYStart()) and (player.getY() - 5 < line.getYStart())):
                         blocked = 1
                 if (not blocked):
                     player.moveX(-1)
@@ -99,13 +93,7 @@ def maze():
             player.reset(80, (game.getHeight() / 2))
 
             # Maze Details
-            lines = []
-            lines.append(Line((120, 230), (125, 230)))
-            lines.append(Line((125, 230), (130, 230)))
-            lines.append(Line((130, 230), (135, 230)))
-            lines.append(Line((135, 230), (140, 230)))
-            lines.append(Line((190, 265), (195, 265)))
-            lines.append(Line((195, 265), (200, 265)))
+            lines = Line.generateMaze(5, 5)
 
         if (keys[pygame.K_n]):
             game.quit()