Changeset 145:0c49627920eb

Timestamp:

09/02/13 21:05:25 (8 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Phase:

public

Message:

Load game objects from level.

Files:

• data/levels/level1 (modified) (1 diff)
• nagslang/game_object.py (modified) (4 diffs)
• nagslang/level.py (modified) (4 diffs)
• nagslang/screens/area.py (modified) (3 diffs)
• nagslang/tests/test_game_object.py (modified) (1 diff)
• nagslang/tests/test_level.py (added)

data/levels/level1

@@ -18 +18 @@
   - [60, 780]
 size: [1200, 900]
+game_objects:
+  - classname: Box
+    args:
+      - [250, 350]
+  - classname: FloorSwitch
+    args:
+      - [300, 400]
+    name: switch
+  - classname: FloorSwitch
+    args:
+      - [300, 600]
+    name: switch2
+  - classname: FloorLight
+    args:
+      - [300, 500]
+      - switch
+    name: light
+  - classname: FloorLight
+    args:
+      - [250, 500]
+      - both_switches
+    name: light2
+  - classname: StateLogicalAndPuzzler
+    args:
+      - switch
+      - switch2
+    name: both_switches

nagslang/game_object.py

@@ -17 +17 @@
 
     def add_component(self, name, puzzler):
+        if not isinstance(puzzler, Puzzler):
+            puzzler = puzzler.puzzler
         self._components[name] = puzzler
         puzzler.set_glue(self)
@@ -277 +279 @@
 def make_body(mass, moment, position, damping=None):
     body = pymunk.Body(mass, moment)
-    body.position = position
+    body.position = tuple(position)
     if damping is not None:
         body.damping = damping
@@ -322 +324 @@
 class FloorSwitch(GameObject):
     def __init__(self, space, position):
-        body = pymunk.Body()
-        body.position = position
+        body = make_body(None, None, position)
         self.shape = pymunk.Circle(body, 30)
         self.shape.collision_type = COLLISION_TYPE_SWITCH
@@ -336 +337 @@
 class FloorLight(GameObject):
     def __init__(self, space, position, state_source):
-        body = pymunk.Body()
-        body.position = position
+        body = make_body(None, None, position)
         self.shape = pymunk.Circle(body, 10)
         self.shape.collision_type = COLLISION_TYPE_SWITCH

nagslang/level.py

@@ -2 +2 @@
 import pygame.locals as pgl
 
+from nagslang import game_object as go
 from nagslang.resources import resources
 from nagslang.yamlish import load, dump
@@ -27 +28 @@
         self._surface = None
         self._exterior = False
+        self._glue = go.PuzzleGlue()
+        self._drawables = []
 
-    def load(self):
+    def _get_data(self):
+        # For overriding in tests.
         with resources.get_file('levels', self.name) as f:
-            data = load(f)
+            return load(f)
+
+    def load(self, space):
+        data = self._get_data()
         self.x, self.y = data['size']
         self.base_tile = data['base_tile']
@@ -37 +44 @@
             for point in points:
                 self.polygons[i].append(tuple(point))
+        for game_object_dict in data.get('game_objects', []):
+            self._create_game_object(space, **game_object_dict)
+
+    def _create_game_object(self, space, classname, args, name=None):
+        # We should probably build a registry of game objects or something.
+        # At least this is better than just calling `eval`, right?
+        cls = getattr(go, classname)
+        if issubclass(cls, go.Puzzler):
+            gobj = cls(*args)
+        elif issubclass(cls, go.GameObject):
+            gobj = cls(space, *args)
+            self._drawables.append(gobj)
+        else:
+            raise TypeError(
+                "Expected a subclass of Puzzler or GameObject, got %s" % (
+                    classname))
+        if name is not None:
+            self._glue.add_component(name, gobj)
 
     def all_closed(self):
@@ -80 +105 @@
     def get_walls(self):
         return self.polygons.values()
+
+    def get_drawables(self):
+        return self._drawables
 
     def _draw_walls(self):

nagslang/screens/area.py

@@ -69 +69 @@
         self.keys = ControlKeys()
         self._level = Level(self.name)
-        self._level.load()
+        self._level.load(self.space)
         self._drawables = Drawables()
         self.add_walls()
         self.add_protagonist()
-        self._setup_demo_objects()
+        self.add_game_objects()
+        # self._setup_demo_objects()
 
     def _setup_demo_objects(self):
@@ -83 +84 @@
         light2 = FloorLight(self.space, (250, 500), 'both_switches')
         light2.zorder = ZORDER_HIGH
-        glue.add_component('switch', switch.puzzler)
-        glue.add_component('switch2', switch2.puzzler)
-        glue.add_component('light', light.puzzler)
-        glue.add_component('light2', light2.puzzler)
+        glue.add_component('switch', switch)
+        glue.add_component('switch2', switch2)
+        glue.add_component('light', light)
+        glue.add_component('light2', light2)
         glue.add_component(
             'both_switches', StateLogicalAndPuzzler('switch', 'switch2'))
@@ -110 +111 @@
                 corner = next_corner
         self.space.add(*self.walls)
+
+    def add_game_objects(self):
+        for drawable in self._level.get_drawables():
+            self._drawables.add(drawable)
 
     def add_protagonist(self):

nagslang/tests/test_game_object.py

@@ -68 +68 @@
         faker.fake_state = 'bar'
         self.assertEqual('bar', puzzler.get_state())
+
+    def test_glue_add_component(self):
+        glue = game_object.PuzzleGlue()
+        puzzler = FakePuzzler('foo')
+        gobj = FakeGameObject(None, None)
+        gobj.puzzler = FakePuzzler('bar')
+
+        self.assertEqual({}, glue._components)
+        glue.add_component('foo', puzzler)
+        self.assertEqual({'foo': puzzler}, glue._components)
+        glue.add_component('bar', gobj)
+        self.assertEqual(
+            {'foo': puzzler, 'bar': gobj.puzzler}, glue._components)