Changeset 378:8069c9be1c3e

Timestamp:

09/06/13 21:07:27 (9 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Rebase:

30363039646438663036346661616331646364613966636335323132303738666539633366303632

Message:

Create a nagslang.collectable module for collectables

Files:

• data/levels/level1 (modified) (1 diff)
• data/levels/level2 (modified) (1 diff)
• nagslang/collectable.py (added)
• nagslang/game_object.py (modified) (2 diffs)
• nagslang/level.py (modified) (2 diffs)

data/levels/level1

@@ -19 +19 @@
 - args:
   - [300, 600]
-  classname: Gun
+  classname: collectable.Gun
 - args:
   - [300, 500]

data/levels/level2

@@ -40 +40 @@
   - [400, 200]
   - keycard_red
-  classname: KeyCard
+  classname: collectable.KeyCard
   name: keycard_red
 lines: []

nagslang/game_object.py

@@ -487 +487 @@
 
 
-class CollectibleGameObject(GameObject):
-    zorder = ZORDER_LOW
-
-    def __init__(self, space, name, shape, renderer):
-        self._name = name
-        shape.sensor = True
-        super(CollectibleGameObject, self).__init__(
-            SingleShapePhysicser(space, shape),
-            renderer,
-            interactible=environment.Interactible(
-                environment.Action(
-                    self._collect, environment.HumanFormCondition())),
-        )
-
-    def _collect(self, protagonist):
-        protagonist.add_item(self._name)
-        # TODO: Make this less hacky.
-        self.physicser.remove_from_space()
-        self.renderer = render.NullRenderer()
-
-
-class Gun(CollectibleGameObject):
-    def __init__(self, space, position):
-        body = make_body(None, None, position)
-        self.shape = pymunk.Circle(body, 20)
-        super(Gun, self).__init__(
-            space, 'gun', self.shape,
-            render.ImageRenderer(resources.get_image('objects', 'gun.png')),
-        )
-
-
 class ClawAttack(GameObject):
     def __init__(self, space, pos, vector, damage):
@@ -599 +568 @@
     def apply_effect(self, protagonist):
         protagonist.force_wolf_form()
-
-
-class KeyCard(CollectibleGameObject):
-    def __init__(self, space, position, name):
-        body = make_body(None, None, position)
-        self.shape = pymunk.Circle(body, 20)
-        super(KeyCard, self).__init__(
-            space, name, self.shape,
-            render.ImageRenderer(
-                resources.get_image('objects', '%s.png' % (name,))),
-        )
-
-    @classmethod
-    def requires(cls):
-        return [("name", "string"), ("position", "coordinates"),
-                ("item_name", "string")]

nagslang/level.py

@@ -2 +2 @@
 import pygame.locals as pgl
 
+from nagslang import collectable
 from nagslang import game_object as go
 from nagslang import enemies
@@ -83 +84 @@
     def _create_game_object(self, space, classname, args, name=None):
         modules = {
+            'collectable': collectable,
             'game_object': go,
             'puzzle': puzzle,