Mercurial > skaapsteker

changeset 237:e06c54d7701f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add vase to demonstrate item state testing in dialogues.
author Simon Cross <hodgestar@gmail.com>
date Thu, 07 Apr 2011 14:39:50 +0200
parents 9528c6fc7f75
children df306bfd632e
files data/game.json data/npcs/kumiko.json skaapsteker/sprites/items.py
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Thu Apr 07 12:38:45 2011 +0200
+++ b/data/game.json	Thu Apr 07 14:39:50 2011 +0200
@@ -10,7 +10,8 @@
     "items": {
         "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
         "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
-        "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] }
+        "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] },
+        "vase": { "type": "Vase", "level": "level2", "pos": [1, 3], "broken": false }
     },
     "npcs": {
         "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
--- a/data/npcs/kumiko.json	Thu Apr 07 12:38:45 2011 +0200
+++ b/data/npcs/kumiko.json	Thu Apr 07 14:39:50 2011 +0200
@@ -6,7 +6,7 @@
     "temptingfate" : {
         "text" : "The room smells fresh, I have my best kimono on and I’ve set out my most magnificent vase. Everything is perfect (just like me)!",
         "events" : [
-            { "matches" : "world.vase_broken", "next": "state.broken" }
+            { "matches" : "world.items.vase.broken", "next": "state.broken" }
         ]
     },
     "broken" : {
--- a/skaapsteker/sprites/items.py	Thu Apr 07 12:38:45 2011 +0200
+++ b/skaapsteker/sprites/items.py	Thu Apr 07 14:39:50 2011 +0200
@@ -16,3 +16,11 @@
 class TeaPot(Item):
     image_file = 'teapot.png'
     portable = False
+
+
+class Vase(Item):
+    image_file = 'dummy.png'
+
+    def setup(self, broken, **opts):
+        super(Vase, self).setup(**opts)
+        self.broken = broken