Changeset 310:fa408430a174

Timestamp:

09/05/13 22:41:49 (9 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Rebase:

65356337356335326138336464366432316561336533636666366439383731396132356634363932

Message:

Now *both* types of enemies die

File:

• nagslang/enemies.py (modified) (3 diffs)

nagslang/enemies.py

@@ -52 +52 @@
         return [("name", "string"), ("position", "coordinates")]
 
+    def hit(self, weapon):
+        self.lose_health(weapon.damage)
+
     def lose_health(self, amount):
         self.health -= amount
@@ -57 +60 @@
             self.physicser.remove_from_space()
             self.remove = True
-            EnemyDeathEvent.post(self.physicser.position, 'A')
+            EnemyDeathEvent.post(self.physicser.position, self.enemy_type)
 
 
@@ -160 +163 @@
     def collide_with_protagonist(self, protagonist):
         protagonist.lose_health(15)
-
-    def hit(self, weapon):
-        self.lose_health(weapon.damage)
 
     @classmethod