Mercurial > skaapsteker

changeset 219:c83f021cc327

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
screwed up merge fix
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Thu, 07 Apr 2011 01:07:15 +0200
parents 7ee5bd883d62
children 9e2949210c07
files data/game.json
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Thu Apr 07 01:02:36 2011 +0200
+++ b/data/game.json	Thu Apr 07 01:07:15 2011 +0200
@@ -8,16 +8,16 @@
         "monk_tea": {}
     },
     "items": {
-        "tealeaf": { "type": "TeaLeaf", "level": "level1", "pos": [1, 7] },
-        "teacup": { "type": "TeaCup", "level": "level1", "pos": [18, 10] },
-        "teapot": { "type": "TeaPot", "level": "level1", "pos": [13, 2] }
+        "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
+        "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
+        "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] }
     },
     "npcs": {
-        "monk": { "type": "Monk", "level": "level1", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
+        "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
         "guard": { "type": "Guard", "level": "level2", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" }
     },
     "levels": {
-        "level1" : "level1",
+        "temple" : "temple",
         "level2" : "level2",
         "level3" : "level3",
         "level4" : "level4",