Travel-Bug Fix Part 1

AppEngine.py

@@ -173,6 +173,10 @@ def hide(self):
     def show(self):
         self.visible = True 
 
+    def moveToFront(self):
+        sprites.remove(self)
+        sprites.append(self)
+
     def update(self):
         self.edgeLeft = self.x
         self.edgeRight = self.x + self.width
@@ -207,6 +211,8 @@ def collide(self, otherSprite):
 
     def destroy(self):
         self.HPtext.destroy()
+        self.main = None
+        self.rect = None
         sprites.remove(self)
         del(self)
 

Consumable.py

@@ -31,6 +31,10 @@ def __init__(self, name, x, y, standalone = None, standaloneDesc = None):
     def assignInvSlot(self, slot):
         self.invSlot = slot
 
+    def destroy(self):
+        self.spriteImage.destroy()
+        del(self)
+
     def use(self):
         pass
 

GameConfig/levels.txt

@@ -23,17 +23,33 @@
 ###############
 
 // Level Two
-###############
+#####     #####
+#             #
+#             #
+#             #
+#             #
+              #
+              #
+              #
+              #
 #             #
-#####   #######
-#   #  #      #
-#   #   #     #
-#    #   #    #
-#     #   #   #
-#    #   #    #
-#   #   #     #
-#  #   #      #
-#   #   #     #
-#    #   #    #
-#     #   #   #
+#             #
+#             #
+#             #
+###############
+
+// Level Three
 ###############
+#             #
+#             #
+#             #
+#             #
+              #
+              #
+              #
+              #
+#             #
+#             #
+#             #
+#             #
+#####     #####

LevelOne.py

@@ -17,6 +17,13 @@ def __init__(self):
         self.lvl1 = LevelParser.Parser("Level One")
         self.lvl1.parse()
 
+        self.itemInfo = [
+            ["Cherry Juice", 600, 700],
+            ["Blackberry", 500, 700],
+            ["Book", 400, 700],
+            ["Blue Potion", 300, 700]
+        ]
+
         self.items = []
 
     def generateGround(self):
@@ -32,19 +39,26 @@ def destroy(self):
         #    c.sprite.destroy()
         for f in self.groundTiles:
             f.destroy()
-        #for q in self.items:
-        #    q.spriteImage.destroy()
         self.obstacleTiles.clear()
         self.hazards.clear()
         self.groundTiles.clear()
-        self.items.clear()
         self.stopMusic()
 
     def spawnTreasure(self):
-        self.items.append(co.Consumable("Cherry Juice", 600, 700))
-        self.items.append(co.Consumable("Blackberry", 500, 700))
-        self.items.append(co.Consumable("Book", 400, 700))
-        self.items.append(co.Consumable("Blue Potion", 300, 700))
+        if len(self.items) > 0:
+            temp = []
+            for item in self.items:
+                if item.spriteImage.y != 905:
+                    item.spriteImage.destroy()
+                    item.spriteImage = None
+                    del item
+                else:
+                    temp.append(item)
+            self.items = temp
+
+        else:
+            for x in range(len(self.itemInfo)):
+                self.items.append(co.Consumable(self.itemInfo[x][0], self.itemInfo[x][1], self.itemInfo[x][2]))
 
         return self.items
 

LevelParser.py

@@ -25,12 +25,16 @@ def parse(self):
             self.lines = f.read().splitlines()
 
         self.lines = self.lines[self.lines.index("// %s" % self.level):]
+        self.lines.pop(0)
 
+        done = False
         for line in self.lines:
-            if line == "":
-                self.lines = self.lines[:self.lines.index(line)]
+            if line == '':
+                if done == False:
+                    self.lines = self.lines[:self.lines.index(line)]
+                    done = True
+
 
-        self.lines.pop(0)
         self.hasParsed = True
 
     def checkForParse(self):

LevelThree.py

@@ -0,0 +1,87 @@
+import AppEngine
+from AppEngine import *
+
+import Consumable as co
+import LevelParser
+import Spritesheet
+
+import random
+
+
+class StageThree():
+    def __init__(self):
+        self.groundTiles = []
+        self.obstacleTiles = []
+        self.hazards = []
+
+        self.lvl3 = LevelParser.Parser("Level Three")
+        self.lvl3.parse()
+
+        self.itemInfo = []
+
+        self.items = []
+
+    def generateGround(self):
+        self.lvl3.generate_ground(self.groundTiles)
+
+    def generateObstacles(self):
+        self.lvl3.generate_obstacles(self.obstacleTiles)
+
+    def destroy(self):
+        for i in self.obstacleTiles:
+            i.sprite.destroy()
+        #for c in self.hazards:
+        #    c.sprite.destroy()
+        for f in self.groundTiles:
+            f.destroy()
+        self.obstacleTiles.clear()
+        self.hazards.clear()
+        self.groundTiles.clear()
+        self.items.clear()
+        self.stopMusic()
+
+    def spawnTreasure(self):
+        if len(self.items) > 0:
+            temp = []
+            for item in self.items:
+                if item.spriteImage.y != 905:
+                    item.spriteImage.destroy()
+                    item.spriteImage = None
+                    del item
+                else:
+                    temp.append(item)
+            self.items = temp
+
+        else:
+            for x in range(len(self.itemInfo)):
+                self.items.append(co.Consumable(self.itemInfo[x][0], self.itemInfo[x][1], self.itemInfo[x][2]))
+
+        return self.items
+
+    def startMusic(self):
+        au.playMusic("Music/Level1.ogg", -1)
+
+    def stopMusic(self):
+        au.stopMusic()
+
+    def checkCollision(self, hero):
+        heroRect = hero.main.get_rect(topleft=(hero.x, hero.y))
+        heroRect.inflate_ip(10, 10)
+        for f in self.obstacleTiles:
+            fRect = f.sprite.main.get_rect(topleft=(f.sprite.x, f.sprite.y))
+            if f.id_ == "stationary":
+                if fRect.colliderect(heroRect):
+                    if fRect.collidepoint(heroRect.midleft):
+                        return "west"
+                    if fRect.collidepoint(heroRect.midright):
+                        return "east"
+                    if fRect.collidepoint(heroRect.midtop):
+                        return "north"
+                    if fRect.collidepoint(heroRect.midbottom):
+                        return "south"
+        return ""
+
+
+
+
+

LevelTwo.py

@@ -17,6 +17,13 @@ def __init__(self):
         self.lvl2 = LevelParser.Parser("Level Two")
         self.lvl2.parse()
 
+        self.itemInfo = [
+            ["Yellow Potion", 600, 700],
+            ["Small Sword", 500, 700],
+            ["Red Apple", 400, 700],
+            ["Orange Potion", 300, 700]
+        ]
+
         self.items = []
 
     def generateGround(self):
@@ -26,17 +33,32 @@ def generateObstacles(self):
         self.lvl2.generate_obstacles(self.obstacleTiles)
 
     def destroy(self):
+        for i in self.obstacleTiles:
+            i.sprite.destroy()
+        #for c in self.hazards:
+        #    c.sprite.destroy()
+        for f in self.groundTiles:
+            f.destroy()
         self.obstacleTiles.clear()
         self.hazards.clear()
         self.groundTiles.clear()
-        self.items.clear()
         self.stopMusic()
 
     def spawnTreasure(self):
-        self.items.append(co.Consumable("Yellow Potion", 600, 700))
-        self.items.append(co.Consumable("Small Sword", 500, 700))
-        self.items.append(co.Consumable("Red Apple", 400, 700))
-        self.items.append(co.Consumable("Orange Potion", 300, 700))
+        if len(self.items) > 0:
+            temp = []
+            for item in self.items:
+                if item.spriteImage.y != 905:
+                    item.spriteImage.destroy()
+                    item.spriteImage = None
+                    del item
+                else:
+                    temp.append(item)
+            self.items = temp
+
+        else:
+            for x in range(len(self.itemInfo)):
+                self.items.append(co.Consumable(self.itemInfo[x][0], self.itemInfo[x][1], self.itemInfo[x][2]))
 
         return self.items