Mercurial > skaapsteker

changeset 530:f6bd04e5a414

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tofu in geisha room, and all scrolls
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sun, 10 Apr 2011 00:14:30 +0200
parents 0ffb493a6fa4
children 5f1058593462
files data/game.json data/levels/geisha_room.json data/levels/market.json data/levels/town.json
diffstat 4 files changed, 29 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sun Apr 10 00:11:18 2011 +0200
+++ b/data/game.json	Sun Apr 10 00:14:30 2011 +0200
@@ -51,11 +51,11 @@
         "salmon": { "type": "Salmon", "level": "_limbo", "pos": [1, 3] },
         "no_mask": { "type": "NoMask", "level": "theatre", "pos": [10, 10], "broken": false },
         "no_costume": { "type": "NoCostume", "level": "theatre", "pos": [13, 10] },
-        "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." },
-        "haiku4": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "and it passes by." },
-        "haiku5": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "the Galaxy." },
+        "haiku1": { "type": "HaikuScroll", "level": "temple", "pos": [6, 4], "text": "remaining in it?" },
+        "haiku2": { "type": "HaikuScroll", "level": "town", "pos": [72, 17], "text": "the end of autumn." },
+        "haiku3": { "type": "HaikuScroll", "level": "geisha_room", "pos": [1, 13], "text": "with no leaves to blow." },
+        "haiku4": { "type": "HaikuScroll", "level": "market", "pos": [21, 4], "text": "and it passes by." },
+        "haiku5": { "type": "HaikuScroll", "level": "town", "pos": [1, 2], "text": "the Galaxy." },
         "aburage_00": { "type": "Aburage", "level": "temple", "pos": [18, 5] },
         "aburage_01": { "type": "Aburage", "level": "temple", "pos": [1, 15] },
         "aburage_02": { "type": "Aburage", "level": "temple", "pos": [5, 4] },
@@ -106,16 +106,16 @@
         "aburage_47": { "type": "Aburage", "level": "tea_house", "pos": [23, 10] },
         "aburage_48": { "type": "Aburage", "level": "tea_house", "pos": [17, 10] },
         "aburage_49": { "type": "Aburage", "level": "tea_house", "pos": [13, 3] },
-        "aburage_50": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_51": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_52": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_53": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_54": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_55": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_56": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "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_50": { "type": "Aburage", "level": "geisha_room", "pos": [1, 2] },
+        "aburage_51": { "type": "Aburage", "level": "geisha_room", "pos": [4, 3] },
+        "aburage_52": { "type": "Aburage", "level": "geisha_room", "pos": [11, 3] },
+        "aburage_53": { "type": "Aburage", "level": "geisha_room", "pos": [14, 4] },
+        "aburage_54": { "type": "Aburage", "level": "geisha_room", "pos": [22, 4] },
+        "aburage_55": { "type": "Aburage", "level": "geisha_room", "pos": [1, 6] },
+        "aburage_56": { "type": "Aburage", "level": "geisha_room", "pos": [26, 6] },
+        "aburage_57": { "type": "Aburage", "level": "geisha_room", "pos": [1, 10] },
+        "aburage_58": { "type": "Aburage", "level": "geisha_room", "pos": [19, 12] },
+        "aburage_59": { "type": "Aburage", "level": "geisha_room", "pos": [26, 12] },
         "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] },
@@ -173,7 +173,7 @@
         "sasuke": { "type": "Sasuke", "level": "road", "pos": [54, 8], "dsm": "npcs/sasuke.json", "state": "start", "present": true},
         "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start", "facing": "right" },
         "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start", "facing": "left" },
-        "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left" },
+        "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left" },
         "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start" },
         "maneki": { "type": "Maneki", "level": "market", "pos": [35, 6], "dsm": "npcs/maneki.json", "state": "start" },
         "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [23, 5], "dsm": "npcs/fishmonger.json", "state": "start" },
--- a/data/levels/geisha_room.json	Sun Apr 10 00:11:18 2011 +0200
+++ b/data/levels/geisha_room.json	Sun Apr 10 00:14:30 2011 +0200
@@ -8,18 +8,18 @@
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "X{...............h.!..h...}X",
-        "X..........................X",
-        "XXXq...pXXq................X",
-        "X{}bXXXd{}bXXq.?.p)...?....X",
+        "X?.........................X",
+        "XXXq?..pXXq?...............X",
+        "X{}bXXXd{}bXXq??.p)...?....X",
         "X..........}bXXXXd{..()....X",
-        "X.............h......!.....X",
+        "X?............h......!....?X",
         "XXXX)...................pXXX",
-        "X{..h............pXXq..pXXXX",
+        "X{..h............pXXq.?pXXXX",
         "X........(q.?.pXXd{}bXXXd{}X",
-        "X........}bXXXXd{..........X",
+        "X?.......}bXXXXd{..........X",
         "XXXXX).......h.............X",
-        "X{......................?..X",
-        "X......pXq.?....pXXXXXXXXXXX",
+        "X{.................?....?.?X",
+        "X?.....pXq.?....pXXXXXXXXXXX",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
--- a/data/levels/market.json	Sun Apr 10 00:11:18 2011 +0200
+++ b/data/levels/market.json	Sun Apr 10 00:14:30 2011 +0200
@@ -10,7 +10,7 @@
         "X{..}bd{............}bXXd{.................}bXXXXXXXXd{........}bXXXXXXXXX",
         "X.............?......}bd{.....?........?......}bXXd{...............}bXXXXX",
         "X.........<-+bXXXXq........pXXXd=+bXXXXd=->....}bd{...................}bXX",
-        "X.?.............}bd......(Xd{............................?.............}bX",
+        "X.?.............}bd...?..(Xd{............................?.............}bX",
         "XXXq..?..............()..............................pXXXXXXXq...?......}X",
         "XXXXXXXq...........................?.......pXXX)....(Xd{...}bXd=+bXXq...?X",
         "X{...}bXXXd=>..<+bXq...?.........pXXXd=+bXXXd{...................}bXXXXXXX",
--- a/data/levels/town.json	Sun Apr 10 00:11:18 2011 +0200
+++ b/data/levels/town.json	Sun Apr 10 00:14:30 2011 +0200
@@ -8,9 +8,9 @@
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "X{..........}X{............................}X{............}X{....?......}X",
-        "X...........?X..............................X?.............X....<bd>.....X",
-        "X.........<+bXd=>......<+bq..?..pd=>.....<+bXd=>...........X.............X",         
-        "X........................}bXXXXXd{.........................Xd=>..........X",
+        "X?.pd=>....?X..............................X?.............X....<bd>.....X",
+        "XXXd{.....<+bXd=>......<+bq..?..pd=>.....<+bXd=>...........X.............X",         
+        "X{.......................}bXXXXXd{.........................Xd=>..........X",
         "X......<+bq..?..pd=>........}X{.......?....................X{........<-+bX",
         "X........}bXXXXXd{..........?X......p=-+bq..?..pd=>.....<+bX?...?.......}X",
         "X...<bd>....}X{..........<+bXX...<+bd...}bXXXXXd{.........}Xd=----->....?X",
@@ -23,7 +23,7 @@
         "X............Xd=--->........}X.............}X......<--+bq..?...?.pd=>....X",
         "XXXq.?.......X{..............Xd=-->.........Xd=>.......}bXXXXXXXXd{......X",
         "X{}bd=>......X?........<--+bXd{.......<--+bXX{....pq?...............pq...X",    
-        "X.........?..Xd=-->..........?.....?.......}X....<+bd=>.........?p=-+bq..X",
+        "X.........?..Xd=-->..........?.....?.......}X....<+bd=>.........?p=-+bq.?X",
         "X........pXXXX{.............pq....<bd>......X............pq...<+bd...}bXXX",
         "X.....<+bd{}bd........<---+bd=>..........<+bd.........<+bd=>............}X",
         "X.................?..............................?.......................X",