Mercurial > skaapsteker

annotate data/game.json @ 319:bfc3a2548a35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Count scrolls as well
author Neil Muller <drnlmuller@gmail.com>
date Sat, 09 Apr 2011 00:30:18 +0200
parents e63a0261ea1f
children c6552e9fc2e1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
127
e1dd3b785269 Initial game state stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
1 {
189
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
2 "fox": {
206
e2acf4663065 Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents: 194
diff changeset
3 "item": null,
e2acf4663065 Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents: 194
diff changeset
4 "tails" : [],
289
16ffe6f5dbb8 Add fox.shape (which can be 'fox', 'human' or 'human_with_fan') to game.json. Use fox.shape in state checks in guard.json.
Simon Cross <hodgestar@gmail.com>
parents: 288
diff changeset
5 "shape": "fox",
244
5bbf90e6a94b Add minimal support for player death
Neil Muller <drnlmuller@gmail.com>
parents: 237
diff changeset
6 "cur_health" : 40,
288
ddcfc159dc2a Combine 'fox' and 'player' sections in game.json.
Simon Cross <hodgestar@gmail.com>
parents: 287
diff changeset
7 "max_health" : 40,
ddcfc159dc2a Combine 'fox' and 'player' sections in game.json.
Simon Cross <hodgestar@gmail.com>
parents: 287
diff changeset
8 "level": "temple",
312
e63a0261ea1f Add tofu colleced count to fox state
Neil Muller <drnlmuller@gmail.com>
parents: 297
diff changeset
9 "doorway": "starting",
319
bfc3a2548a35 Count scrolls as well
Neil Muller <drnlmuller@gmail.com>
parents: 312
diff changeset
10 "tofu": 0,
bfc3a2548a35 Count scrolls as well
Neil Muller <drnlmuller@gmail.com>
parents: 312
diff changeset
11 "scrolls": 0
189
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
12 },
127
e1dd3b785269 Initial game state stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
13 "missions": {
287
f512e874b2e7 Add monk and kumiko missions to game.json and to monk and kumiko.
Simon Cross <hodgestar@gmail.com>
parents: 284
diff changeset
14 "monk_tea": false,
f512e874b2e7 Add monk and kumiko missions to game.json and to monk and kumiko.
Simon Cross <hodgestar@gmail.com>
parents: 284
diff changeset
15 "fish_in_room": false,
f512e874b2e7 Add monk and kumiko missions to game.json and to monk and kumiko.
Simon Cross <hodgestar@gmail.com>
parents: 284
diff changeset
16 "kumikos_kimono_torn": false,
293
e22b0e4d52ae Add missions.masks_destroyed.
Simon Cross <hodgestar@gmail.com>
parents: 289
diff changeset
17 "kumiko_disgraced": false,
294
74c875f7b1f5 Fill in remaining missions and make remaining npc state machines pass basic sanity tests.
Simon Cross <hodgestar@gmail.com>
parents: 293
diff changeset
18 "masks_destroyed": false,
74c875f7b1f5 Fill in remaining missions and make remaining npc state machines pass basic sanity tests.
Simon Cross <hodgestar@gmail.com>
parents: 293
diff changeset
19 "fire_started_on_road": false,
74c875f7b1f5 Fill in remaining missions and make remaining npc state machines pass basic sanity tests.
Simon Cross <hodgestar@gmail.com>
parents: 293
diff changeset
20 "cannon_destroyed": false,
297
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
21 "all_fishmonger_demons_dead": false,
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
22 "kanedas_agreement_disrupted": false,
294
74c875f7b1f5 Fill in remaining missions and make remaining npc state machines pass basic sanity tests.
Simon Cross <hodgestar@gmail.com>
parents: 293
diff changeset
23 "final_battle_lost": false,
74c875f7b1f5 Fill in remaining missions and make remaining npc state machines pass basic sanity tests.
Simon Cross <hodgestar@gmail.com>
parents: 293
diff changeset
24 "final_battle_won": false
189
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
25 },
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
26 "items": {
219
c83f021cc327 screwed up merge fix
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 217
diff changeset
27 "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
c83f021cc327 screwed up merge fix
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 217
diff changeset
28 "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
296
15b2be883a40 Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents: 294
diff changeset
29 "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2], "brewed": false },
284
8cac6ff88a9d Rename the void level to _limbo. Add teacupfull to _limbo. Change monk state change check to world.fox.item == 'teacupfull'.
Simon Cross <hodgestar@gmail.com>
parents: 274
diff changeset
30 "teacupfull": { "type": "TeaCupFull", "level": "_limbo", "pos": [0, 0] },
297
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
31 "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false },
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
32 "salmon": { "type": "Salmon", "level": "fishmonger_house", "pos": [1, 3] }
127
e1dd3b785269 Initial game state stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
33 },
189
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
34 "npcs": {
219
c83f021cc327 screwed up merge fix
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 217
diff changeset
35 "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
274
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
36 "guard": { "type": "Guard", "level": "temple_grounds", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" },
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
37 "hattori": { "type": "Hattori", "level": "road", "pos": [10, 3], "dsm": "npcs/hattori.json", "state": "start" },
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
38 "ichiro": { "type": "Ichiro", "level": "road", "pos": [11, 3], "dsm": "npcs/ichiro.json", "state": "start" },
297
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
39 "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [10, 10], "dsm": "npcs/kaneda2.json", "state": "start" },
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
40 "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [11, 10], "dsm": "npcs/tetsuo.json", "state": "start" },
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
41 "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
274
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
42 "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 3], "dsm": "npcs/kumiko.json", "state": "start" },
297
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
43 "maneki": { "type": "Maneki", "level": "market", "pos": [10, 10], "dsm": "npcs/maneki.json", "state": "start" },
2844edb6c1cc Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
Simon Cross <hodgestar@gmail.com>
parents: 296
diff changeset
44 "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [10, 10], "dsm": "npcs/fishmonger.json", "state": "start" },
274
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
45 "actor": { "type": "Actor", "level": "theatre", "pos": [8, 3], "dsm": "npcs/actor.json", "state": "start" },
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
46 "sasuke": { "type": "Sasuke", "level": "road", "pos": [9, 3], "dsm": "npcs/sasuke.json", "state": "start" },
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
47 "kitsune": { "type": "Kitsune", "level": "celestial_plane", "pos": [10, 3], "dsm": "npcs/kitsune.json", "state": "start" }
189
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
48 },
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
49 "levels": {
274
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
50 "celestial_plane" : "celestial_plane",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
51 "fishmonger_house" : "fishmonger_house",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
52 "geisha_room" : "geisha_room",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
53 "market" : "market",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
54 "road" : "road",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
55 "tea_house" : "tea_house",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
56 "temple_grounds" : "temple_grounds",
219
c83f021cc327 screwed up merge fix
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 217
diff changeset
57 "temple" : "temple",
274
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
58 "theatre" : "theatre",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
59 "town" : "town"
288
ddcfc159dc2a Combine 'fox' and 'player' sections in game.json.
Simon Cross <hodgestar@gmail.com>
parents: 287
diff changeset
60 }
206
e2acf4663065 Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents: 194
diff changeset
61 }