# HG changeset patch
# User Adrianna Pińska <adrianna.pinska@gmail.com>
# Date 1302363391 -7200
# Node ID 5f896e2f78c469b2a94d7f267de9bcef786aa01d
# Parent  bbfc2cc07ba43f7164f296b588404a12ed5d43c7
Geisha's rooms

diff -r bbfc2cc07ba4 -r 5f896e2f78c4 data/game.json
--- a/data/game.json	Sat Apr 09 17:23:07 2011 +0200
+++ b/data/game.json	Sat Apr 09 17:36:31 2011 +0200
@@ -42,10 +42,10 @@
         "kindling": { "type": "Kindling", "level": "road", "pos": [37, 3] },
         "oil": { "type": "Oil", "level": "road", "pos": [17, 8] },
         "cannon": { "type": "Cannon", "level": "road", "pos": [57, 8], "broken": false },
-        "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false },
         "rice": { "type": "Rice", "level": "tea_house", "pos": [3, 8], "broken": false },
         "documents": { "type": "Documents", "level": "tea_house", "pos": [7, 9] },
-        "salmon": { "type": "Salmon", "level": "fishmonger_house", "pos": [1, 3] },
+        "vase": { "type": "Vase", "level": "geisha_room", "pos": [22, 4], "broken": false },
+        "salmon": { "type": "Salmon", "level": "_limbo", "pos": [1, 3] },
         "haiku1": { "type": "HaikuScroll", "level": "temple", "pos": [14, 16], "text": "Remaining in it?" },
         "haiku2": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "The end of autumn." },
         "haiku3": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "With no leaves to blow." },
@@ -63,7 +63,7 @@
         "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start" },
         "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start" },
         "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
-        "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 3], "dsm": "npcs/kumiko.json", "state": "start" },
+        "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start" },
         "maneki": { "type": "Maneki", "level": "market", "pos": [10, 10], "dsm": "npcs/maneki.json", "state": "start" },
         "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [10, 10], "dsm": "npcs/fishmonger.json", "state": "start" },
         "actor": { "type": "Actor", "level": "theatre", "pos": [8, 3], "dsm": "npcs/actor.json", "state": "start" },
diff -r bbfc2cc07ba4 -r 5f896e2f78c4 data/levels/geisha_room.json
--- a/data/levels/geisha_room.json	Sat Apr 09 17:23:07 2011 +0200
+++ b/data/levels/geisha_room.json	Sat Apr 09 17:36:31 2011 +0200
@@ -9,7 +9,7 @@
         "X{...............h.!..h...}X",
         "X..........................X",
         "XXXq...pXXq................X",
-        "X{}bXXXd{}bXXq.?.p)........X",
+        "X{}bXXXd{}bXXq.?.p)...?....X",
         "X..........}bXXXXd{..()....X",
         "X.............h......!.....X",
         "XXXX)...................pXXX",
@@ -18,7 +18,7 @@
         "X........}bXXXXd{..........X",
         "XXXXX).......h.............X",
         "X{......................?..X",
-        "X......pXq......pXXXXXXXXXXX",
+        "X......pXq.?....pXXXXXXXXXXX",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
diff -r bbfc2cc07ba4 -r 5f896e2f78c4 data/sprites/props/vase-broken.png
Binary file data/sprites/props/vase-broken.png has changed
diff -r bbfc2cc07ba4 -r 5f896e2f78c4 data/sprites/props/vase-whole.png
Binary file data/sprites/props/vase-whole.png has changed