# HG changeset patch
# User Adrianna Pińska <adrianna.pinska@gmail.com>
# Date 1302131235 -7200
# Node ID c83f021cc327e514acebdef2ed4e6d10050fedeb
# Parent  7ee5bd883d6209e9a2f261d4cdbdabeb94d7f0d0
screwed up merge fix

diff -r 7ee5bd883d62 -r c83f021cc327 data/game.json
--- 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",