Mercurial > skaapsteker

changeset 402:a13d541b9e24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stuff in the road
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sat, 09 Apr 2011 16:56:23 +0200
parents 55e00f186c6f
children 2da0db41cdf0
files data/game.json data/levels/road.json data/sprites/props/oil.png
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sat Apr 09 16:53:38 2011 +0200
+++ b/data/game.json	Sat Apr 09 16:56:23 2011 +0200
@@ -39,6 +39,9 @@
         "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] },
+        "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 },
         "salmon": { "type": "Salmon", "level": "fishmonger_house", "pos": [1, 3] },
         "haiku1": { "type": "HaikuScroll", "level": "temple", "pos": [14, 16], "text": "Remaining in it?" },
@@ -52,8 +55,8 @@
     "npcs": {
         "monk": { "type": "Monk", "level": "temple", "pos": [15, 16], "dsm": "npcs/monk.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" },
+        "hattori": { "type": "Hattori", "level": "road", "pos": [36, 8], "dsm": "npcs/hattori.json", "state": "start" },
+        "ichiro": { "type": "Ichiro", "level": "road", "pos": [37, 8], "dsm": "npcs/ichiro.json", "state": "start" },
         "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [10, 10], "dsm": "npcs/kaneda2.json", "state": "start" },
         "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [11, 10], "dsm": "npcs/tetsuo.json", "state": "start" },
         "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
@@ -61,7 +64,7 @@
         "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" },
-        "sasuke": { "type": "Sasuke", "level": "road", "pos": [9, 3], "dsm": "npcs/sasuke.json", "state": "start" },
+        "sasuke": { "type": "Sasuke", "level": "road", "pos": [56, 8], "dsm": "npcs/sasuke.json", "state": "start" },
         "kitsune": { "type": "Kitsune", "level": "celestial_plane", "pos": [10, 3], "dsm": "npcs/kitsune.json", "state": "start" }
     },
     "levels": {
--- a/data/levels/road.json	Sat Apr 09 16:53:38 2011 +0200
+++ b/data/levels/road.json	Sat Apr 09 16:56:23 2011 +0200
@@ -13,7 +13,7 @@
         "Xq................(XXXXXq............}XXX{................}XXX{.......pXXXX",
         "XXXXq.s.......s.....|.}bXXXq..........XXd|.....pq..........XXd|.....pXXXXXX",
         "XXXXXXq..?....pXXXX).....}bXXq........bd{....pXXXXq........bd{....pXXXXXXXX",
-        "XXXXXXXXXXXXXXXX{?...?.....}XXXq...........pXXXXXXXXq...........pXXXXXXXXXX",
+        "XXXXXXXXXXXXXXXX{?...?.....}XXXq....??.....pXXXXXXXXq...?.?.....pXXXXXXXXXX",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [    
Binary file data/sprites/props/oil.png has changed