Mercurial > skaapsteker

changeset 284:8cac6ff88a9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename the void level to _limbo. Add teacupfull to _limbo. Change monk state change check to world.fox.item == 'teacupfull'.
author Simon Cross <hodgestar@gmail.com>
date Fri, 08 Apr 2011 20:41:05 +0200
parents ed2bd6eb65e7
children 71f15f6e9274
files data/game.json data/npcs/monk.json skaapsteker/sprites/player.py
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Fri Apr 08 20:15:18 2011 +0200
+++ b/data/game.json	Fri Apr 08 20:41:05 2011 +0200
@@ -12,6 +12,7 @@
         "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
         "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
         "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] },
+        "teacupfull": { "type": "TeaCupFull", "level": "_limbo", "pos": [0, 0] },
         "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false }
     },
     "npcs": {
--- a/data/npcs/monk.json	Fri Apr 08 20:15:18 2011 +0200
+++ b/data/npcs/monk.json	Fri Apr 08 20:41:05 2011 +0200
@@ -19,7 +19,7 @@
     "no_tea" : {
         "text" : "Oh, what I wouldn’t do for a cup of tea.",
         "events" : [
-            { "matches" : "world.fox_has_tea", "next": "state.got_tea" }
+            { "matches" : "world.fox.item == 'tea'", "next": "state.got_tea" }
         ]
     },
     "got_tea" : {
--- a/skaapsteker/sprites/player.py	Fri Apr 08 20:15:18 2011 +0200
+++ b/skaapsteker/sprites/player.py	Fri Apr 08 20:41:05 2011 +0200
@@ -296,7 +296,7 @@
         if my_item is not None:
             print "I already have", my_item
             return
-        getattr(self.the_world.items, item.name).level = "gone"
+        getattr(self.the_world.items, item.name).level = "_limbo"
         self.the_world.fox.item = item.name
         item.kill()
         print "took", item