Enemies effect health of castle

osgcc · Nov 6, 2011 · b50b0a1 · b50b0a1
1 parent a86f5b9
commit b50b0a1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/Enemy.py b/Enemy.py
@@ -29,11 +29,15 @@ def __init__(self, right, speed):
         self.rect = self.rect.move(self.x, self.y)
 
 
-    def updateEnemyPos(self):
+    def updateEnemyPos(self,enemyList, index):
         self.image = (self.image + 1) % 8
         if self.x + self.speed < 513 or self.x + self.speed > 745:
             self.x += self.speed
             self.rect = self.rect.move(self.speed,0)
+        else:
+            enemyList.pop(index)
+            return True
+        return False
 
     def swordHit(self, enemyList, index):
         self.HP = slef.HP - 5

diff --git a/Enemyflying.py b/Enemyflying.py
@@ -29,11 +29,15 @@ def __init__(self, right, speed):
         self.rect = self.rect.move(self.x, self.y)
 
 
-    def updateEnemyPos(self):
+    def updateEnemyPos(self, enemyList, index):
         self.image = (self.image + 1) % 8
         if self.x + self.speed < 513 or self.x + self.speed > 745:
             self.x += self.speed
             self.rect = self.rect.move(self.speed,0)
+        else:
+            enemyList.pop(index)
+            return True
+        return False
 
     def swordHit(self, enemyList, index):
         self.HP = slef.HP - 5

diff --git a/Main.py b/Main.py
@@ -41,9 +41,14 @@ def main():
 
         #Enemy code
         enemyGenerator(enemyList, maxEnemies)
-        for enemy in enemyList:
-            windowSurfaceObj.blit(enemy.images[enemy.image],enemy.rect)
-            enemy.updateEnemyPos()
+        count = len(enemyList) - 1
+        while(count >= 0):
+            windowSurfaceObj.blit(enemyList[count].images[enemyList[count].image], enemyList[count].rect)
+            if enemyList[count].updateEnemyPos(enemyList, count):
+                HP = HP -5
+                if HP < 0:
+                    HP = 0
+            count = count - 1
 
         skipFall = False
         for event in pygame.event.get():
@@ -101,6 +106,9 @@ def main():
             skipFall = True
 
         #player.updateVector(mousex,mousey)
+        #Castle health bar
+        pygame.draw.rect(windowSurfaceObj, pygame.Color(255,0,0), (540, 260, 200, 20))
+        pygame.draw.rect(windowSurfaceObj, pygame.Color(0,255,0), (540, 260, HP * 2, 20))
         #player.updatePos()
         if not skipFall:
             player.fall()
@@ -112,9 +120,6 @@ def main():
                 windowSurfaceObj.blit(ArrowObj, ArrowList[i].rect)
 
         windowSurfaceObj.blit(player.images[player.image],player.rect)
-        #Castle health bar
-        pygame.draw.rect(windowSurfaceObj, pygame.Color(255,0,0), (540, 260, 200, 20))
-        pygame.draw.rect(windowSurfaceObj, pygame.Color(0,255,0), (540, 260, HP * 2, 20))
         #pygame.display.update()
         pygame.display.flip()
         fpsClock.tick(30)