Changeset 201:3495a2025bc6 for nagslang

Timestamp:

Sep 3, 2013, 9:27:25 PM (7 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

rebase_source:

cb4c938f882a6d9c325f13bda95e7f3179bc4475

Message:

Break puzzlers out of game_object.py

Location:

nagslang

Files:

• game_object.py (modified) (6 diffs)
• level.py (modified) (3 diffs)
• puzzle.py (added)
• tests/test_puzzle.py (moved) (moved from nagslang/tests/test_game_object.py) (5 diffs)

nagslang/game_object.py

@@ -5 +5 @@
 import pymunk.pygame_util
 
+from nagslang import puzzle
 from nagslang.constants import (
     SWITCH_PUSHERS, COLLISION_TYPE_SWITCH, COLLISION_TYPE_BOX, ZORDER_LOW,
-    ZORDER_FLOOR, COLLISION_TYPE_DOOR, COLLISION_TYPE_PLAYER)
+    ZORDER_FLOOR, COLLISION_TYPE_DOOR)
 from nagslang.options import options
 from nagslang.resources import resources
@@ -14 +15 @@
 
 
-class PuzzleGlue(object):
-    """Glue that holds bits of a puzzle together.
-    """
-    def __init__(self):
-        self._components = {}
-
-    def add_component(self, name, puzzler):
-        if not isinstance(puzzler, Puzzler):
-            puzzler = puzzler.puzzler
-        self._components[name] = puzzler
-        puzzler.set_glue(self)
-
-    def get_state_of(self, name):
-        return self._components[name].get_state()
-
-
-class Puzzler(object):
-    """Behaviour specific to a puzzle component.
-    """
-    def set_glue(self, glue):
-        self.glue = glue
-
-    def set_game_object(self, game_object):
-        self.game_object = game_object
-
-    def get_state(self):
-        raise NotImplementedError()
-
-
-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):
-        if not collision_types:
-            collision_types = (COLLISION_TYPE_PLAYER,)
-        self._collision_types = collision_types
-
-    def get_state(self):
-        space = self.game_object.get_space()
-        for shape in space.shape_query(self.game_object.get_shape()):
-            if shape.collision_type in self._collision_types:
-                return True
-        return False
-
-
-class StateProxyPuzzler(Puzzler):
-    def __init__(self, state_source):
-        self._state_source = state_source
-
-    def get_state(self):
-        return self.glue.get_state_of(self._state_source)
-
-
-class StateLogicalAndPuzzler(Puzzler):
-    def __init__(self, *state_sources):
-        self._state_sources = state_sources
-
-    def get_state(self):
-        for state_source in self._state_sources:
-            if not self.glue.get_state_of(state_source):
-                return False
-        return True
+# For levels to import, until we get module names in 'classname'
+StateProxyPuzzler = puzzle.StateProxyPuzzler
+StateLogicalAndPuzzler = puzzle.StateLogicalAndPuzzler
 
 
@@ -404 +334 @@
                 False: resources.get_image('objects', 'sensor_off.png'),
             }),
-            CollidePuzzler(*SWITCH_PUSHERS),
+            puzzle.CollidePuzzler(*SWITCH_PUSHERS),
         )
 
@@ -418 +348 @@
             SingleShapePhysicser(space, self.shape),
             ImageRenderer(resources.get_image('objects', 'note.png')),
-            CollidePuzzler(),
+            puzzle.CollidePuzzler(),
             TextOverlay(message),
         )
@@ -437 +367 @@
                 False: resources.get_image('objects', 'light_off.png'),
             }),
-            StateProxyPuzzler(state_source),
+            puzzle.StateProxyPuzzler(state_source),
         )
 
@@ -465 +395 @@
         self.dest_pos = tuple(dest_pos)
         if key_state is None:
-            puzzler = YesPuzzler()
+            puzzler = puzzle.YesPuzzler()
         else:
-            puzzler = StateProxyPuzzler(key_state)
+            puzzler = puzzle.StateProxyPuzzler(key_state)
         super(Door, self).__init__(
             SingleShapePhysicser(space, self.shape),

nagslang/level.py

@@ -4 +4 @@
 from nagslang import game_object as go
 from nagslang import enemies
+from nagslang import puzzle
 from nagslang.resources import resources
 from nagslang.yamlish import load, dump
@@ -33 +34 @@
         self._surface = None
         self._exterior = False
-        self._glue = go.PuzzleGlue()
+        self._glue = puzzle.PuzzleGlue()
         self.drawables = []
         self.overlay_drawables = []
@@ -75 +76 @@
         # At least this is better than just calling `eval`, right?
         cls = getattr(go, classname)
-        if issubclass(cls, go.Puzzler):
+        if issubclass(cls, puzzle.Puzzler):
             gobj = cls(*args)
         elif issubclass(cls, go.GameObject):

nagslang/tests/test_puzzle.py

@@ -2 +2 @@
 
 from nagslang.constants import COLLISION_TYPE_OTHER, SWITCH_PUSHERS
-from nagslang import game_object
+from nagslang import puzzle
 
 
@@ -30 +30 @@
 
 
-class FakePuzzler(game_object.Puzzler):
+class FakePuzzler(puzzle.Puzzler):
     def __init__(self, fake_state):
         self.fake_state = fake_state
@@ -47 +47 @@
         gobj = FakeGameObject(None, FakeSpace(*shapes))
         puzzler = self.mkpuzzler(
-            gobj, game_object.CollidePuzzler, *collision_types)
+            gobj, puzzle.CollidePuzzler, *collision_types)
         self.assertEqual(expected, puzzler.get_state())
 
@@ -61 +61 @@
 
     def test_state_proxy_puzzler(self):
-        glue = game_object.PuzzleGlue()
-        puzzler = game_object.StateProxyPuzzler('faker')
+        glue = puzzle.PuzzleGlue()
+        puzzler = puzzle.StateProxyPuzzler('faker')
         glue.add_component('puzzler', puzzler)
         faker = FakePuzzler('foo')
@@ -72 +72 @@
 
     def test_glue_add_component(self):
-        glue = game_object.PuzzleGlue()
+        glue = puzzle.PuzzleGlue()
         puzzler = FakePuzzler('foo')
         gobj = FakeGameObject(None, None)