Mercurial > skaapsteker

changeset 394:df2933311711

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed guard pos and put fan in temple
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sat, 09 Apr 2011 16:34:47 +0200
parents 1af4a838b595
children 135cbb99511f
files data/game.json data/levels/temple.json data/levels/temple_grounds.json
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sat Apr 09 16:25:34 2011 +0200
+++ b/data/game.json	Sat Apr 09 16:34:47 2011 +0200
@@ -38,6 +38,7 @@
         "teacup": { "type": "TeaCup", "level": "temple", "pos": [18, 10] },
         "teapot": { "type": "TeaPot", "level": "temple", "pos": [13, 2], "brewed": false },
         "teacupfull": { "type": "TeaCupFull", "level": "_limbo", "pos": [0, 0] },
+        "fan": { "type": "Fan", "level": "temple", "pos": [18, 5] },
         "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false },
         "salmon": { "type": "Salmon", "level": "fishmonger_house", "pos": [1, 3] },
         "haiku1": { "type": "HaikuScroll", "level": "temple", "pos": [14, 16], "text": "Remaining in it?" },
@@ -45,12 +46,12 @@
         "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." },
-        "aburage_001": { "type": "Aburage", "level": "temple", "pos": [12, 2] },
-        "aburage_002": { "type": "Aburage", "level": "temple", "pos": [14, 2] }
+        "aburage_00": { "type": "Aburage", "level": "temple", "pos": [12, 2] },
+        "aburage_01": { "type": "Aburage", "level": "temple", "pos": [14, 2] }
     },
     "npcs": {
         "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.json", "state": "start" },
-        "guard": { "type": "Guard", "level": "temple_grounds", "pos": [10, 3], "dsm": "npcs/guard.json", "state": "start" },
+        "guard": { "type": "Guard", "level": "temple_grounds", "pos": [5, 11], "dsm": "npcs/guard.json", "state": "start" },
         "hattori": { "type": "Hattori", "level": "road", "pos": [10, 3], "dsm": "npcs/hattori.json", "state": "start" },
         "ichiro": { "type": "Ichiro", "level": "road", "pos": [11, 3], "dsm": "npcs/ichiro.json", "state": "start" },
         "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [10, 10], "dsm": "npcs/kaneda2.json", "state": "start" },
--- a/data/levels/temple.json	Sat Apr 09 16:25:34 2011 +0200
+++ b/data/levels/temple.json	Sat Apr 09 16:34:47 2011 +0200
@@ -10,7 +10,7 @@
         "Xd{..........?...}bX",
         "X{..........(X)...}X",
         "X..................X",
-        "X..<+bd=>..........X",
+        "X..<+bd=>.........?X",
         "X.................pX",
         "X?...........<--+bXX",
         "Xq..?..pq.........}X",
--- a/data/levels/temple_grounds.json	Sat Apr 09 16:25:34 2011 +0200
+++ b/data/levels/temple_grounds.json	Sat Apr 09 16:34:47 2011 +0200
@@ -16,7 +16,7 @@
         "Xq........?..................................X",
         "XXXd=--+bXXXd=--+bXXXd=--+bXXXd=--+bXXXd=>...X",
         "X{...........................................X",
-        "X.........................?.................pX",
+        "X..?.?....................?.................pX",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [