Changeset 359:d42752ab3231

Timestamp:

09/06/13 17:42:01 (9 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Phase:

public

Rebase:

33333137366430386561343463636366353337306634363738373239393134316439383830653765

Message:

Refactor doors and add horrible temporoary image for someone to fix later.

Files:

• data/images/objects/locked_door.png (added)
• data/levels/level1 (modified) (1 diff)
• nagslang/environment.py (modified) (1 diff)
• nagslang/game_object.py (modified) (5 diffs)

data/levels/level1

@@ -60 +60 @@
   - 0
   - door_switch
-  classname: Door
+  classname: PuzzleDoor
   name: switch_door
 lines:

nagslang/environment.py

@@ -7 +7 @@
         """
         raise NotImplementedError()
+
+
+class YesCondition(ProtagonistCondition):
+    """Condition that is always met.
+    """
+    def check(self, protagonist):
+        return True
 
 

nagslang/game_object.py

@@ -269 +269 @@
 
 
-class Door(GameObject):
+class BaseDoor(GameObject):
     zorder = ZORDER_FLOOR
+    is_open = True
 
     def __init__(self, space, position, destination, dest_pos, angle,
-                 key_state=None):
+                 renderer, condition):
         body = make_body(pymunk.inf, pymunk.inf, position, damping=0.5)
         self.shape = pymunk.Circle(body, 30)
@@ -281 +282 @@
         self.destination = destination
         self.dest_pos = tuple(dest_pos)
+        super(BaseDoor, self).__init__(
+            SingleShapePhysicser(space, self.shape),
+            renderer,
+            puzzle.ParentAttrPuzzler('is_open'),
+            interactible=environment.Interactible(
+                environment.Action(self._post_door_event, condition)),
+        )
+
+    def _post_door_event(self, protagonist):
+        DoorEvent.post(self.destination, self.dest_pos)
+
+
+class Door(BaseDoor):
+    def __init__(self, space, position, destination, dest_pos, angle):
+        super(Door, self).__init__(
+            space, position, destination, dest_pos, angle,
+            render.ImageRenderer(resources.get_image('objects', 'door.png')),
+            environment.YesCondition(),
+        )
+
+    @classmethod
+    def requires(cls):
+        return [("name", "string"), ("position", "coordinates"),
+                ("destination", "level name"), ("dest_pos", "coordinate"),
+                ("angle", "degrees")]
+
+
+class PuzzleDoor(BaseDoor):
+    def __init__(self, space, position, destination, dest_pos, angle,
+                 key_state):
         self._key_state = key_state
-        super(Door, self).__init__(
-            SingleShapePhysicser(space, self.shape),
+        super(PuzzleDoor, self).__init__(
+            space, position, destination, dest_pos, angle,
             render.ImageStateRenderer({
                 True: resources.get_image('objects', 'door.png'),
-                # TODO: Locked door image.
-                False: resources.get_image('objects', 'door.png'),
+                False: resources.get_image('objects', 'locked_door.png'),
             }),
-            puzzle.ParentAttrPuzzler('is_open'),
-            interactible=environment.Interactible(
-                environment.Action(
-                    self._post_door_event,
-                    environment.FunctionCondition(lambda p: self.is_open))),
+            environment.FunctionCondition(lambda p: self.is_open),
         )
 
@@ -300 +326 @@
         return self._stored_state['is_open']
 
-    def _post_door_event(self, protagonist):
-        DoorEvent.post(self.destination, self.dest_pos)
-
     def set_stored_state_dict(self, stored_state):
         self._stored_state = stored_state
-        if self._key_state is not None:
-            # We're lockable, so we start locked and want to save our state.
-            self._stored_state.setdefault('is_open', False)
-            return True
-        # Not lockable, so we're always open and don't bother saving state.
-        self._stored_state['is_open'] = True
-        return False
+        self._stored_state.setdefault('is_open', False)
+        return True
 
     def update(self, dt):
@@ -317 +335 @@
             self._stored_state['is_open'] = self.puzzler.glue.get_state_of(
                 self._key_state)
-        super(Door, self).update(dt)
+        super(PuzzleDoor, self).update(dt)
 
     @classmethod
@@ -324 +342 @@
                 ("destination", "level name"), ("dest_pos", "coordinate"),
                 ("angle", "degrees"),
-                ("key_state", "puzzler (optional)")]
+                ("key_state", "puzzler")]
+
+
+class KeyedDoor(BaseDoor):
+    def __init__(self, space, position, destination, dest_pos, angle,
+                 key_item=None):
+        self._key_item = key_item
+        super(KeyedDoor, self).__init__(
+            space, position, destination, dest_pos, angle,
+            render.ImageRenderer(resources.get_image('objects', 'door.png')),
+            environment.ItemRequiredCondition(key_item),
+        )
+
+    @classmethod
+    def requires(cls):
+        return [("name", "string"), ("position", "coordinates"),
+                ("destination", "level name"), ("dest_pos", "coordinate"),
+                ("angle", "degrees"), ("key_item", "item name")]