Changeset 385:51deb78cae52

Timestamp:

Sep 6, 2013, 9:58:15 PM (7 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

rebase_source:

5077a64a868295383cfa281f1f69c605a3d6437c

Message:

Use a result object to get new drawables back to the area

Location:

nagslang

Files:

• collectable.py (modified) (3 diffs)
• enemies.py (modified) (6 diffs)
• game_object.py (modified) (4 diffs)
• screens/area.py (modified) (1 diff)

nagslang/collectable.py

@@ -4 +4 @@
 from nagslang import render
 from nagslang.constants import ZORDER_LOW
-from nagslang.game_object import GameObject, SingleShapePhysicser, make_body
+from nagslang.game_object import (GameObject, SingleShapePhysicser, Result,
+                                  make_body)
 from nagslang.resources import resources
 
@@ -13 +14 @@
     def __init__(self, space, name, shape, renderer):
         self._name = name
+        self.collected = False
         shape.sensor = True
         super(CollectibleGameObject, self).__init__(
@@ -24 +26 @@
     def _collect(self, protagonist):
         protagonist.add_item(self._name)
-        # TODO: Make this less hacky.
         self.physicser.remove_from_space()
-        self.renderer = render.NullRenderer()
+        self.collected = True
+
+    def update(self, dt):
+        if self.collected:
+            return Result(remove=[self])
 
 

nagslang/enemies.py

@@ -10 +10 @@
                                 ACID_SPEED, ACID_DAMAGE, ZORDER_MID)
 from nagslang.events import EnemyDeathEvent, FireEvent
-from nagslang.game_object import GameObject, SingleShapePhysicser, make_body
+from nagslang.game_object import (GameObject, SingleShapePhysicser, Result,
+                                  make_body)
 from nagslang.mutators import FLIP_H
 from nagslang.resources import resources
@@ -69 +70 @@
     def lose_health(self, amount):
         self.health -= amount
-        if self.health < 0:
+        if self.health <= 0:
             self.physicser.remove_from_space()
-            self.remove = True
             EnemyDeathEvent.post(self.physicser.position, self.enemy_type)
 
@@ -126 +126 @@
         return x_step, y_step
 
+    def update(self, dt):
+        super(Enemy, self).update(dt)
+        if self.health <= 0:
+            return Result(remove=[self])
+
 
 class DeadEnemy(GameObject):
@@ -195 +200 @@
         self.set_direction(x_step, y_step)
         self.ranged_attack(300, ACID_SPEED, ACID_DAMAGE, 'acid', 0.2)
-        super(PatrollingAlien, self).update(dt)
+        return super(PatrollingAlien, self).update(dt)
 
     @classmethod
@@ -251 +256 @@
         dx, dy = self._calc_movement()
         self.set_direction(dx, dy)
-        super(ChargingAlien, self).update(dt)
+        return super(ChargingAlien, self).update(dt)
 
     @classmethod
@@ -291 +296 @@
 
     def update(self, dt):
-        super(RunAndGunAlien, self).update(dt)
         self.count += 1
+        return super(RunAndGunAlien, self).update(dt)
 
     @classmethod

nagslang/game_object.py

@@ -14 +14 @@
 from nagslang.resources import resources
 from nagslang.events import DoorEvent
+
+
+class Result(object):
+    '''
+    Return from an update() function, to add new objects to the world, and/or
+    remove old objects.
+    '''
+    def __init__(self, add=(), remove=()):
+        self.add = add
+        self.remove = remove
 
 
@@ -126 +136 @@
         if interactible is not None:
             self.interactible.set_game_object(self)
-        self.remove = False  # If true, will be removed from drawables
         self._timers = {}
         self._active_timers = {}
@@ -483 +492 @@
                 shape.physicser.game_object.hit(self)
             self.physicser.remove_from_space()
-            self.remove = True
-            break
+            return Result(remove=[self])
 
 
@@ -508 +516 @@
         if self.lifetime > 0.1:
             self.physicser.remove_from_space()
-            self.remove = True
+            return Result(remove=[self])
 
 

nagslang/screens/area.py

@@ -244 +244 @@
         self.tick_protagonist()
         for drawable in self._drawables:
-            drawable.update(seconds)
-            if drawable.remove:
-                self._drawables.remove(drawable)
+            result = drawable.update(seconds)
+            if result is not None:
+                for new_drawable in result.add:
+                    self._drawables.add(new_drawable)
+                for old_drawable in result.remove:
+                    self._drawables.remove(old_drawable)
 
     def render_health_bar(self, surface, damage_experienced=None):