# HG changeset patch
# User Adrianna Pińska <adrianna.pinska@gmail.com>
# Date 1302382413 -7200
# Node ID 70f26b24241ceb3c32944778cf94f03c616df719
# Parent  bea58fb57a5c8095233275efbee160d67fbbf259
tofu in market and fishmonger's house

diff -r bea58fb57a5c -r 70f26b24241c data/game.json
--- a/data/game.json	Sat Apr 09 22:50:20 2011 +0200
+++ b/data/game.json	Sat Apr 09 22:53:33 2011 +0200
@@ -86,16 +86,16 @@
         "aburage_27": { "type": "Aburage", "level": "town", "pos": [29, 17] },
         "aburage_28": { "type": "Aburage", "level": "town", "pos": [35, 17] },
         "aburage_29": { "type": "Aburage", "level": "town", "pos": [64, 17] },
-        "aburage_30": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_31": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_32": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_33": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_34": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_35": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_36": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_37": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_38": { "type": "Aburage", "level": "market", "pos": [1, 1] },
-        "aburage_39": { "type": "Aburage", "level": "market", "pos": [1, 1] },
+        "aburage_30": { "type": "Aburage", "level": "market", "pos": [14, 2] },
+        "aburage_31": { "type": "Aburage", "level": "market", "pos": [30, 2] },
+        "aburage_32": { "type": "Aburage", "level": "market", "pos": [39, 2] },
+        "aburage_33": { "type": "Aburage", "level": "market", "pos": [72, 6] },
+        "aburage_34": { "type": "Aburage", "level": "market", "pos": [23, 7] },
+        "aburage_35": { "type": "Aburage", "level": "market", "pos": [58, 9] },
+        "aburage_36": { "type": "Aburage", "level": "market", "pos": [1, 10] },
+        "aburage_37": { "type": "Aburage", "level": "market", "pos": [21, 10] },
+        "aburage_38": { "type": "Aburage", "level": "market", "pos": [49, 10] },
+        "aburage_39": { "type": "Aburage", "level": "market", "pos": [71, 10] },
         "aburage_40": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
         "aburage_41": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
         "aburage_42": { "type": "Aburage", "level": "tea_house", "pos": [1, 1] },
@@ -116,16 +116,16 @@
         "aburage_57": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
         "aburage_58": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
         "aburage_59": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_60": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_61": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_62": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_63": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_64": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_65": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_66": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_67": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_68": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
-        "aburage_69": { "type": "Aburage", "level": "fisherman_house", "pos": [1, 1] },
+        "aburage_60": { "type": "Aburage", "level": "fishmonger_house", "pos": [15, 3] },
+        "aburage_61": { "type": "Aburage", "level": "fishmonger_house", "pos": [32, 3] },
+        "aburage_62": { "type": "Aburage", "level": "fishmonger_house", "pos": [1, 7] },
+        "aburage_63": { "type": "Aburage", "level": "fishmonger_house", "pos": [46, 7] },
+        "aburage_64": { "type": "Aburage", "level": "fishmonger_house", "pos": [13, 11] },
+        "aburage_65": { "type": "Aburage", "level": "fishmonger_house", "pos": [15, 11] },
+        "aburage_66": { "type": "Aburage", "level": "fishmonger_house", "pos": [23, 11] },
+        "aburage_67": { "type": "Aburage", "level": "fishmonger_house", "pos": [25, 11] },
+        "aburage_68": { "type": "Aburage", "level": "fishmonger_house", "pos": [31, 11] },
+        "aburage_69": { "type": "Aburage", "level": "fishmonger_house", "pos": [33, 11] },
         "aburage_70": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
         "aburage_71": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
         "aburage_72": { "type": "Aburage", "level": "theatre", "pos": [1, 1] },
diff -r bea58fb57a5c -r 70f26b24241c data/levels/fishmonger_house.json
--- a/data/levels/fishmonger_house.json	Sat Apr 09 22:50:20 2011 +0200
+++ b/data/levels/fishmonger_house.json	Sat Apr 09 22:53:33 2011 +0200
@@ -9,15 +9,15 @@
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "Xd{............}X{............}X{............}bX",
         "X{......?.......X...?......?...X.......?......}X",
-        "X..........<+q?.X..............X.?p=>..........X",
+        "X..........<+q??X..............X??p=>..........X",
         "X............bXXd..............bXXd............X",
         "X.<+q.?p=>..........<+q?.p=>..........<+q?.p=>.X",
         "X...bXXd..............bXXd..............bXXd...X",
-        "X.?........<+q.?p=>....}X....<+q?.p=>........?.X",
-        "X=+q.........bXXd......pd......bXXd.........p=+X",
+        "X??........<+q.?p=>....}X....<+q?.p=>........??X",
+        "X=+q.........bXXd....?.pd.?....bXXd.........p=+X",
         "X..X.?p=>.....}X....().X{.()....}X.....<+q?.X..X",
         "X..bXXd...?...pd.......bq.......pd...?...bXXd..X",
-        "X...}X{.pXXq..X{..pXq..}X..pXq..X{..pXXq.}X{...X",
+        "X...}X{.pXXq.?X{?.pXq.?}X?.pXq.?X{?.pXXq.}X{...X",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
diff -r bea58fb57a5c -r 70f26b24241c data/levels/market.json
--- a/data/levels/market.json	Sat Apr 09 22:50:20 2011 +0200
+++ b/data/levels/market.json	Sat Apr 09 22:53:33 2011 +0200
@@ -8,15 +8,15 @@
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "X{..}bd{............}bXXd{.................}bXXXXXXXXd{........}bXXXXXXXXX",
-        "X....................}bd{.....................}bXXd{...............}bXXXXX",
+        "X.............?......}bd{.....?........?......}bXXd{...............}bXXXXX",
         "X.........<-+bXXXXq........pXXXd=+bXXXXd=->....}bd{...................}bXX",
         "X.?.............}bd......(Xd{............................?.............}bX",
         "XXXq..?..............()..............................pXXXXXXXq...?......}X",
-        "XXXXXXXq...........................?.......pXXX)....(Xd{...}bXd=+bXXq....X",
-        "X{...}bXXXd=>..<+bXq.............pXXXd=+bXXXd{...................}bXXXXXXX",
+        "XXXXXXXq...........................?.......pXXX)....(Xd{...}bXd=+bXXq...?X",
+        "X{...}bXXXd=>..<+bXq...?.........pXXXd=+bXXXd{...................}bXXXXXXX",
         "X.................}bXXXd=>..<+bXXXd{.............().....................}X",
-        "X............pq........................................pXq...............X",
-        "X....?......pXXq..........pq...........?......pXq...pXXXXXXXXXXXq........X",
+        "X............pq........................................pXq?..............X",
+        "X?...?......pXXq.....?....pq...........?......pXq?..pXXXXXXXXXXXq......?.X",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [