Changeset 186:d63c19003aec

Timestamp:

09/03/13 18:06:12 (9 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Phase:

public

Message:

Some refactoring and fixing, start of better collision handling.

Location:

nagslang

Files:

• constants.py (modified) (1 diff)
• events.py (modified) (1 diff)
• game_object.py (modified) (5 diffs)
• tests/test_game_object.py (modified) (1 diff)
• tests/test_level.py (modified) (1 diff)

nagslang/constants.py

@@ -19 +19 @@
 SWITCH_PUSHERS = [COLLISION_TYPE_PLAYER, COLLISION_TYPE_BOX]
 
+CALLBACK_COLLIDERS = [
+    # Collisions between the player and shapes with these collision types will
+    # fire callbacks on the game object associated with the shape.
+    COLLISION_TYPE_SWITCH,
+    COLLISION_TYPE_BOX,
+    COLLISION_TYPE_ENEMY,
+    COLLISION_TYPE_DOOR,
+]
+
 ZORDER_FLOOR = 0
 ZORDER_LOW = 1

nagslang/events.py

@@ -2 +2 @@
 
 import pygame
+import pygame.locals
 
 

nagslang/game_object.py

@@ -42 +42 @@
 
 
+class YesPuzzler(Puzzler):
+    """Yes sir, I'm always on.
+    """
+    def get_state(self):
+        return True
+
+
+class NoPuzzler(Puzzler):
+    """No sir, I'm always off.
+    """
+    def get_state(self):
+        return False
+
+
 class CollidePuzzler(Puzzler):
     def __init__(self, *collision_types):
@@ -108 +122 @@
         super(SingleShapePhysicser, self).__init__(space)
         self._shape = shape
+        shape.physicser = self
 
     def get_shape(self):
@@ -342 +357 @@
         self.renderer.animate()
 
+    def collide_with_protagonist(self):
+        """Called as a `pre_solve` collision callback with the protagonist.
+
+        You can return `False` to ignore the collision, anything else
+        (including `None`) to process the collision as normal.
+        """
+        pass
+
 
 class FloorSwitch(GameObject):
@@ -394 +417 @@
     zorder = ZORDER_FLOOR
 
-    def __init__(self, space, position, destination, dest_pos):
+    def __init__(self, space, position, destination, dest_pos, key_state=None):
         body = make_body(pymunk.inf, pymunk.inf, position, damping=0.5)
         self.shape = pymunk.Poly(
@@ -402 +425 @@
         self.destination = destination
         self.dest_pos = tuple(dest_pos)
+        if key_state is None:
+            puzzler = YesPuzzler()
+        else:
+            puzzler = StateProxyPuzzler(key_state)
         super(Door, self).__init__(
             SingleShapePhysicser(space, self.shape),
             ImageRenderer(resources.get_image('objects', 'door.png')),
+            puzzler,
         )
 

nagslang/tests/test_game_object.py

@@ -44 +44 @@
         return puzzler
 
-    def assert_floor_switch(self, expected, shapes):
+    def assert_collide_state(self, expected, shapes, collision_types):
         gobj = FakeGameObject(None, FakeSpace(*shapes))
-        puzzler = self.mkpuzzler(gobj, game_object.FloorSwitchPuzzler)
+        puzzler = self.mkpuzzler(
+            gobj, game_object.CollidePuzzler, *collision_types)
         self.assertEqual(expected, puzzler.get_state())
 
-    def test_floor_switch_puzzler(self):
-        self.assert_floor_switch(False, [])
-        self.assert_floor_switch(False, [FakeShape()])
+    def test_collide_puzzler(self):
+        self.assert_collide_state(False, [], [])
+        self.assert_collide_state(False, [FakeShape()], SWITCH_PUSHERS)
 
         for collision_type in SWITCH_PUSHERS:
-            self.assert_floor_switch(True, [FakeShape(collision_type)])
-            self.assert_floor_switch(
-                True, [FakeShape(), FakeShape(collision_type)])
+            self.assert_collide_state(
+                True, [FakeShape(collision_type)], SWITCH_PUSHERS)
+            self.assert_collide_state(
+                True, [FakeShape(), FakeShape(collision_type)], SWITCH_PUSHERS)
 
     def test_state_proxy_puzzler(self):

nagslang/tests/test_level.py

@@ -79 +79 @@
                 isinstance(puzzle_bits['foo_proxy'], go.StateProxyPuzzler))
             self.assertEqual('foo', puzzle_bits['foo_proxy']._state_source)
-            self.assertTrue(isinstance(puzzle_bits['foo'],
-                            go.FloorSwitchPuzzler))
+            self.assertTrue(isinstance(puzzle_bits['foo'], go.CollidePuzzler))
 
         level = self.make_level('foo', {