Mercurial > skaapsteker

annotate data/game.json @ 591:87947e4afa02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix kumiko's position
author Neil Muller <drnlmuller@gmail.com>
date Sun, 10 Apr 2011 18:31:06 +0200
parents 635cf02186e6
children
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,
531
5f1058593462 Remove all tails by default
Stefano Rivera <stefano@rivera.za.net>
parents: 530
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,
347
e035f6951a91 Add had_fan flag to game.json
Neil Muller <drnlmuller@gmail.com>
parents: 340
diff changeset
11 "scrolls": [],
e035f6951a91 Add had_fan flag to game.json
Neil Muller <drnlmuller@gmail.com>
parents: 340
diff changeset
12 "has_fan": 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
13 },
127
e1dd3b785269 Initial game state stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
14 "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
15 "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
16 "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
17 "kumikos_kimono_torn": false,
293
e22b0e4d52ae Add missions.masks_destroyed.
Simon Cross <hodgestar@gmail.com>
parents: 289
diff changeset
18 "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
19 "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
20 "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
21 "cannon_destroyed": false,
549
b7f912705adb Fishmonger now mongers fish.
Jeremy Thurgood <firxen@gmail.com>
parents: 546
diff changeset
22 "fishmonger_demons_killed": 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
23 "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
24 "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
25 "final_battle_lost": false,
483
b48c194c4af9 Some haiku and encoding fixes.
Jeremy Thurgood <firxen@gmail.com>
parents: 481
diff changeset
26 "final_battle_won": false,
b48c194c4af9 Some haiku and encoding fixes.
Jeremy Thurgood <firxen@gmail.com>
parents: 481
diff changeset
27 "haiku_wins": 0,
b48c194c4af9 Some haiku and encoding fixes.
Jeremy Thurgood <firxen@gmail.com>
parents: 481
diff changeset
28 "haiku_losses": 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
29 },
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
30 "items": {
219
c83f021cc327 screwed up merge fix
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 217
diff changeset
31 "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
c83f021cc327 screwed up merge fix
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 217
diff changeset
32 "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
296
15b2be883a40 Ancient and honorable tea ceremony.
Jeremy Thurgood <firxen@gmail.com>
parents: 294
diff changeset
33 "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
34 "teacupfull": { "type": "TeaCupFull", "level": "_limbo", "pos": [0, 0] },
472
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
35 "fan": { "type": "Fan", "level": "temple", "pos": [15, 6] },
488
2521fcb7b6d3 Refix litness state
Neil Muller <drnlmuller@gmail.com>
parents: 485
diff changeset
36 "signal_fire": { "type": "SignalFire", "level": "road", "pos": [16, 6], "litness": "set"},
520
17987763b80f Move kindling slightly to make it more visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 519
diff changeset
37 "kindling": { "type": "Kindling", "level": "road", "pos": [36, 3] },
402
a13d541b9e24 stuff in the road
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 394
diff changeset
38 "oil": { "type": "Oil", "level": "road", "pos": [17, 8] },
525
8087e95ade2f More cannon stuff
Neil Muller <drnlmuller@gmail.com>
parents: 520
diff changeset
39 "cannon": { "type": "Cannon", "level": "road", "pos": [57, 8], "broken": false, "block": true },
406
9c043be746fa stuff in the teahouse
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 402
diff changeset
40 "rice": { "type": "Rice", "level": "tea_house", "pos": [3, 8], "broken": false },
573
ebca2f14517f made agreement depend on both rice and document; made table square
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 550
diff changeset
41 "documents": { "type": "Documents", "level": "tea_house", "pos": [7, 9], "broken": false },
413
5f896e2f78c4 Geisha's rooms
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 406
diff changeset
42 "vase": { "type": "Vase", "level": "geisha_room", "pos": [22, 4], "broken": false },
5f896e2f78c4 Geisha's rooms
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 406
diff changeset
43 "salmon": { "type": "Salmon", "level": "_limbo", "pos": [1, 3] },
418
c6e9b3006ef9 stuff in theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 413
diff changeset
44 "no_mask": { "type": "NoMask", "level": "theatre", "pos": [10, 10], "broken": false },
c6e9b3006ef9 stuff in theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 413
diff changeset
45 "no_costume": { "type": "NoCostume", "level": "theatre", "pos": [13, 10] },
530
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
46 "haiku1": { "type": "HaikuScroll", "level": "temple", "pos": [6, 4], "text": "remaining in it?" },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
47 "haiku2": { "type": "HaikuScroll", "level": "town", "pos": [72, 17], "text": "the end of autumn." },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
48 "haiku3": { "type": "HaikuScroll", "level": "geisha_room", "pos": [1, 13], "text": "with no leaves to blow." },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
49 "haiku4": { "type": "HaikuScroll", "level": "market", "pos": [21, 4], "text": "and it passes by." },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
50 "haiku5": { "type": "HaikuScroll", "level": "town", "pos": [1, 2], "text": "the Galaxy." },
472
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
51 "aburage_00": { "type": "Aburage", "level": "temple", "pos": [18, 5] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
52 "aburage_01": { "type": "Aburage", "level": "temple", "pos": [1, 15] },
456
2dcaaf6abb9c began to place tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 451
diff changeset
53 "aburage_02": { "type": "Aburage", "level": "temple", "pos": [5, 4] },
2dcaaf6abb9c began to place tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 451
diff changeset
54 "aburage_03": { "type": "Aburage", "level": "temple", "pos": [1, 12] },
2dcaaf6abb9c began to place tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 451
diff changeset
55 "aburage_04": { "type": "Aburage", "level": "temple", "pos": [10, 15] },
2dcaaf6abb9c began to place tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 451
diff changeset
56 "aburage_05": { "type": "Aburage", "level": "temple_grounds", "pos": [1, 1] },
472
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
57 "aburage_06": { "type": "Aburage", "level": "temple_grounds", "pos": [1, 7] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
58 "aburage_07": { "type": "Aburage", "level": "temple_grounds", "pos": [44, 4] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
59 "aburage_08": { "type": "Aburage", "level": "temple_grounds", "pos": [44, 10] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
60 "aburage_09": { "type": "Aburage", "level": "temple_grounds", "pos": [1, 11] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
61 "aburage_10": { "type": "Aburage", "level": "road", "pos": [1, 4] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
62 "aburage_11": { "type": "Aburage", "level": "road", "pos": [14, 2] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
63 "aburage_12": { "type": "Aburage", "level": "road", "pos": [26, 8] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
64 "aburage_13": { "type": "Aburage", "level": "road", "pos": [28, 6] },
2375bc040e63 more tofu
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 468
diff changeset
65 "aburage_14": { "type": "Aburage", "level": "road", "pos": [38, 4] },
480
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
66 "aburage_15": { "type": "Aburage", "level": "town", "pos": [65, 1] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
67 "aburage_16": { "type": "Aburage", "level": "town", "pos": [12, 2] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
68 "aburage_17": { "type": "Aburage", "level": "town", "pos": [45, 2] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
69 "aburage_18": { "type": "Aburage", "level": "town", "pos": [28, 6] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
70 "aburage_19": { "type": "Aburage", "level": "town", "pos": [60, 6] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
71 "aburage_20": { "type": "Aburage", "level": "town", "pos": [72, 7] },
481
2f1bafc93177 tofu tweak
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 480
diff changeset
72 "aburage_21": { "type": "Aburage", "level": "town", "pos": [45, 8] },
480
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
73 "aburage_22": { "type": "Aburage", "level": "town", "pos": [43, 9] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
74 "aburage_23": { "type": "Aburage", "level": "town", "pos": [72, 11] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
75 "aburage_24": { "type": "Aburage", "level": "town", "pos": [28, 12] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
76 "aburage_25": { "type": "Aburage", "level": "town", "pos": [14, 16] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
77 "aburage_26": { "type": "Aburage", "level": "town", "pos": [52, 16] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
78 "aburage_27": { "type": "Aburage", "level": "town", "pos": [29, 17] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
79 "aburage_28": { "type": "Aburage", "level": "town", "pos": [35, 17] },
30077905d697 put tofu all over town
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 477
diff changeset
80 "aburage_29": { "type": "Aburage", "level": "town", "pos": [64, 17] },
498
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
81 "aburage_30": { "type": "Aburage", "level": "market", "pos": [14, 2] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
82 "aburage_31": { "type": "Aburage", "level": "market", "pos": [30, 2] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
83 "aburage_32": { "type": "Aburage", "level": "market", "pos": [39, 2] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
84 "aburage_33": { "type": "Aburage", "level": "market", "pos": [72, 6] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
85 "aburage_34": { "type": "Aburage", "level": "market", "pos": [23, 7] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
86 "aburage_35": { "type": "Aburage", "level": "market", "pos": [58, 9] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
87 "aburage_36": { "type": "Aburage", "level": "market", "pos": [1, 10] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
88 "aburage_37": { "type": "Aburage", "level": "market", "pos": [21, 10] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
89 "aburage_38": { "type": "Aburage", "level": "market", "pos": [49, 10] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
90 "aburage_39": { "type": "Aburage", "level": "market", "pos": [71, 10] },
519
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
91 "aburage_40": { "type": "Aburage", "level": "tea_house", "pos": [1, 3] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
92 "aburage_41": { "type": "Aburage", "level": "tea_house", "pos": [23, 3] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
93 "aburage_42": { "type": "Aburage", "level": "tea_house", "pos": [19, 4] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
94 "aburage_43": { "type": "Aburage", "level": "tea_house", "pos": [1, 6] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
95 "aburage_44": { "type": "Aburage", "level": "tea_house", "pos": [16, 6] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
96 "aburage_45": { "type": "Aburage", "level": "tea_house", "pos": [13, 8] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
97 "aburage_46": { "type": "Aburage", "level": "tea_house", "pos": [1, 10] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
98 "aburage_47": { "type": "Aburage", "level": "tea_house", "pos": [23, 10] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
99 "aburage_48": { "type": "Aburage", "level": "tea_house", "pos": [17, 10] },
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
100 "aburage_49": { "type": "Aburage", "level": "tea_house", "pos": [13, 3] },
530
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
101 "aburage_50": { "type": "Aburage", "level": "geisha_room", "pos": [1, 2] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
102 "aburage_51": { "type": "Aburage", "level": "geisha_room", "pos": [4, 3] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
103 "aburage_52": { "type": "Aburage", "level": "geisha_room", "pos": [11, 3] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
104 "aburage_53": { "type": "Aburage", "level": "geisha_room", "pos": [14, 4] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
105 "aburage_54": { "type": "Aburage", "level": "geisha_room", "pos": [22, 4] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
106 "aburage_55": { "type": "Aburage", "level": "geisha_room", "pos": [1, 6] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
107 "aburage_56": { "type": "Aburage", "level": "geisha_room", "pos": [26, 6] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
108 "aburage_57": { "type": "Aburage", "level": "geisha_room", "pos": [1, 10] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
109 "aburage_58": { "type": "Aburage", "level": "geisha_room", "pos": [19, 12] },
f6bd04e5a414 tofu in geisha room, and all scrolls
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 525
diff changeset
110 "aburage_59": { "type": "Aburage", "level": "geisha_room", "pos": [26, 12] },
498
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
111 "aburage_60": { "type": "Aburage", "level": "fishmonger_house", "pos": [15, 3] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
112 "aburage_61": { "type": "Aburage", "level": "fishmonger_house", "pos": [32, 3] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
113 "aburage_62": { "type": "Aburage", "level": "fishmonger_house", "pos": [1, 7] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
114 "aburage_63": { "type": "Aburage", "level": "fishmonger_house", "pos": [46, 7] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
115 "aburage_64": { "type": "Aburage", "level": "fishmonger_house", "pos": [13, 11] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
116 "aburage_65": { "type": "Aburage", "level": "fishmonger_house", "pos": [15, 11] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
117 "aburage_66": { "type": "Aburage", "level": "fishmonger_house", "pos": [23, 11] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
118 "aburage_67": { "type": "Aburage", "level": "fishmonger_house", "pos": [25, 11] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
119 "aburage_68": { "type": "Aburage", "level": "fishmonger_house", "pos": [31, 11] },
70f26b24241c tofu in market and fishmonger's house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 494
diff changeset
120 "aburage_69": { "type": "Aburage", "level": "fishmonger_house", "pos": [33, 11] },
533
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
121 "aburage_70": { "type": "Aburage", "level": "theatre", "pos": [1, 2] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
122 "aburage_71": { "type": "Aburage", "level": "theatre", "pos": [22, 2] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
123 "aburage_72": { "type": "Aburage", "level": "theatre", "pos": [6, 3] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
124 "aburage_73": { "type": "Aburage", "level": "theatre", "pos": [17, 3] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
125 "aburage_74": { "type": "Aburage", "level": "theatre", "pos": [1, 5] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
126 "aburage_75": { "type": "Aburage", "level": "theatre", "pos": [22, 5] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
127 "aburage_76": { "type": "Aburage", "level": "theatre", "pos": [1, 9] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
128 "aburage_77": { "type": "Aburage", "level": "theatre", "pos": [22, 9] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
129 "aburage_78": { "type": "Aburage", "level": "theatre", "pos": [1, 11] },
89f7ea0f4b0e tofu in the theatre
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 531
diff changeset
130 "aburage_79": { "type": "Aburage", "level": "theatre", "pos": [22, 11] },
542
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
131 "aburage_80": { "type": "Aburage", "level": "celestial_plane", "pos": [4, 1] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
132 "aburage_81": { "type": "Aburage", "level": "celestial_plane", "pos": [5, 2] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
133 "aburage_82": { "type": "Aburage", "level": "celestial_plane", "pos": [12, 2] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
134 "aburage_83": { "type": "Aburage", "level": "celestial_plane", "pos": [31, 2] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
135 "aburage_84": { "type": "Aburage", "level": "celestial_plane", "pos": [7, 3] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
136 "aburage_85": { "type": "Aburage", "level": "celestial_plane", "pos": [24, 3] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
137 "aburage_86": { "type": "Aburage", "level": "celestial_plane", "pos": [12, 5] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
138 "aburage_87": { "type": "Aburage", "level": "celestial_plane", "pos": [17, 7] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
139 "aburage_88": { "type": "Aburage", "level": "celestial_plane", "pos": [5, 8] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
140 "aburage_89": { "type": "Aburage", "level": "celestial_plane", "pos": [23, 12] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
141 "aburage_90": { "type": "Aburage", "level": "celestial_plane", "pos": [31, 14] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
142 "aburage_91": { "type": "Aburage", "level": "celestial_plane", "pos": [24, 17] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
143 "aburage_92": { "type": "Aburage", "level": "celestial_plane", "pos": [14, 19] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
144 "aburage_93": { "type": "Aburage", "level": "celestial_plane", "pos": [9, 20] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
145 "aburage_94": { "type": "Aburage", "level": "celestial_plane", "pos": [11, 22] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
146 "aburage_95": { "type": "Aburage", "level": "celestial_plane", "pos": [24, 23] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
147 "aburage_96": { "type": "Aburage", "level": "celestial_plane", "pos": [4, 25] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
148 "aburage_97": { "type": "Aburage", "level": "celestial_plane", "pos": [32, 25] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
149 "aburage_98": { "type": "Aburage", "level": "celestial_plane", "pos": [1, 28] },
fef3a942ea28 tofu on celestial plane
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 533
diff changeset
150 "aburage_99": { "type": "Aburage", "level": "celestial_plane", "pos": [35, 28] },
494
89f5056518cc Add tails back to game state.
Simon Cross <hodgestar@gmail.com>
parents: 488
diff changeset
151 "tail_shapeshift": { "type": "ShapeshiftTail", "level": "_limbo", "pos": [1, 1] },
89f5056518cc Add tails back to game state.
Simon Cross <hodgestar@gmail.com>
parents: 488
diff changeset
152 "tail_fireball": { "type": "FireballTail", "level": "_limbo", "pos": [1, 1] },
89f5056518cc Add tails back to game state.
Simon Cross <hodgestar@gmail.com>
parents: 488
diff changeset
153 "tail_sprint": { "type": "SprintTail", "level": "_limbo", "pos": [1, 1] },
89f5056518cc Add tails back to game state.
Simon Cross <hodgestar@gmail.com>
parents: 488
diff changeset
154 "tail_invisibility": { "type": "InvisibilityTail", "level": "_limbo", "pos": [1, 1] },
89f5056518cc Add tails back to game state.
Simon Cross <hodgestar@gmail.com>
parents: 488
diff changeset
155 "tail_flight": { "type": "FlightTail", "level": "_limbo", "pos": [1, 1] },
89f5056518cc Add tails back to game state.
Simon Cross <hodgestar@gmail.com>
parents: 488
diff changeset
156 "tail_shield": { "type": "ShieldTail", "level": "_limbo", "pos": [1, 1] },
89f5056518cc Add tails back to game state.
Simon Cross <hodgestar@gmail.com>
parents: 488
diff changeset
157 "tail_steal": { "type": "StealTail", "level": "_limbo", "pos": [1, 1] },
89f5056518cc Add tails back to game state.
Simon Cross <hodgestar@gmail.com>
parents: 488
diff changeset
158 "tail_lightning": { "type": "LightningTail", "level": "_limbo", "pos": [1, 1] }
127
e1dd3b785269 Initial game state stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
159 },
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
160 "npcs": {
481
2f1bafc93177 tofu tweak
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 480
diff changeset
161 "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
2f1bafc93177 tofu tweak
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 480
diff changeset
162 "guard": { "type": "Guard", "level": "temple_grounds", "pos": [5, 11], "dsm": "npcs/guard.json", "state": "start", "block": true },
485
79b8269e5bf8 graaaaaaargh, facing
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 483
diff changeset
163 "hattori": { "type": "Hattori", "level": "road", "pos": [37, 8], "dsm": "npcs/hattori.json", "state": "start", "block": true, "facing": "left" },
79b8269e5bf8 graaaaaaargh, facing
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 483
diff changeset
164 "ichiro": { "type": "Ichiro", "level": "road", "pos": [36, 8], "dsm": "npcs/ichiro.json", "state": "start", "block": true, "facing": "right" },
525
8087e95ade2f More cannon stuff
Neil Muller <drnlmuller@gmail.com>
parents: 520
diff changeset
165 "sasuke": { "type": "Sasuke", "level": "road", "pos": [54, 8], "dsm": "npcs/sasuke.json", "state": "start", "present": true},
546
05d93c10e5ae Remove Kaneda after the deal is off
Neil Muller <drnlmuller@gmail.com>
parents: 542
diff changeset
166 "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start", "facing": "right", "present": true },
519
62222d36f1ed tofu in the tea house
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 510
diff changeset
167 "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start", "facing": "left" },
587
79a9b61e12ff Magical appearing and disappearing Kaneda
Neil Muller <drnlmuller@gmail.com>
parents: 573
diff changeset
168 "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [13, 13], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left", "present": false },
591
87947e4afa02 Fix kumiko's position
Neil Muller <drnlmuller@gmail.com>
parents: 589
diff changeset
169 "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start", "facing": "left" },
481
2f1bafc93177 tofu tweak
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 480
diff changeset
170 "maneki": { "type": "Maneki", "level": "market", "pos": [35, 6], "dsm": "npcs/maneki.json", "state": "start" },
2f1bafc93177 tofu tweak
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 480
diff changeset
171 "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [23, 5], "dsm": "npcs/fishmonger.json", "state": "start" },
2f1bafc93177 tofu tweak
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 480
diff changeset
172 "actor": { "type": "Actor", "level": "theatre", "pos": [12, 9], "dsm": "npcs/actor.json", "state": "start" },
2f1bafc93177 tofu tweak
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 480
diff changeset
173 "kitsune": { "type": "Kitsune", "level": "celestial_plane", "pos": [17, 20], "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
174 },
9d08f99b5ddf Add npcs to gamestate. Update gamestate. Pass world around a bit. Some other stuff.
Simon Cross <hodgestar@gmail.com>
parents: 127
diff changeset
175 "levels": {
274
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
176 "celestial_plane" : "celestial_plane",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
177 "fishmonger_house" : "fishmonger_house",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
178 "geisha_room" : "geisha_room",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
179 "market" : "market",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
180 "road" : "road",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
181 "tea_house" : "tea_house",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
182 "temple_grounds" : "temple_grounds",
219
c83f021cc327 screwed up merge fix
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 217
diff changeset
183 "temple" : "temple",
274
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
184 "theatre" : "theatre",
e006ec7b3d8f proper levels
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 264
diff changeset
185 "town" : "town"
288
ddcfc159dc2a Combine 'fox' and 'player' sections in game.json.
Simon Cross <hodgestar@gmail.com>
parents: 287
diff changeset
186 }
206
e2acf4663065 Move fox properties to the world
Neil Muller <drnlmuller@gmail.com>
parents: 194
diff changeset
187 }