comparison data/game.json @ 219:c83f021cc327

screwed up merge fix
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Thu, 07 Apr 2011 01:07:15 +0200
parents fcc5eca8eaca
children 3286f1f32263
comparison
equal deleted inserted replaced
218:7ee5bd883d62 219:c83f021cc327
6 }, 6 },
7 "missions": { 7 "missions": {
8 "monk_tea": {} 8 "monk_tea": {}
9 }, 9 },
10 "items": { 10 "items": {
11 "tealeaf": { "type": "TeaLeaf", "level": "level1", "pos": [1, 7] }, 11 "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
12 "teacup": { "type": "TeaCup", "level": "level1", "pos": [18, 10] }, 12 "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
13 "teapot": { "type": "TeaPot", "level": "level1", "pos": [13, 2] } 13 "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2] }
14 }, 14 },
15 "npcs": { 15 "npcs": {
16 "monk": { "type": "Monk", "level": "level1", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" }, 16 "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
17 "guard": { "type": "Guard", "level": "level2", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" } 17 "guard": { "type": "Guard", "level": "level2", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" }
18 }, 18 },
19 "levels": { 19 "levels": {
20 "level1" : "level1", 20 "temple" : "temple",
21 "level2" : "level2", 21 "level2" : "level2",
22 "level3" : "level3", 22 "level3" : "level3",
23 "level4" : "level4", 23 "level4" : "level4",
24 "level5" : "level5" 24 "level5" : "level5"
25 } 25 }