Mercurial > skaapsteker

changeset 406:9c043be746fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stuff in the teahouse
author Adrianna Pińska <adrianna.pinska@gmail.com>
date Sat, 09 Apr 2011 17:14:28 +0200
parents a0aad1c66643
children d97840ee6759
files data/game.json data/levels/tea_house.json skaapsteker/sprites/items.py
diffstat 3 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sat Apr 09 17:09:42 2011 +0200
+++ b/data/game.json	Sat Apr 09 17:14:28 2011 +0200
@@ -43,6 +43,8 @@
         "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] },
         "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." },
@@ -57,14 +59,14 @@
         "guard": { "type": "Guard", "level": "temple_grounds", "pos": [5, 11], "dsm": "npcs/guard.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" },
+        "sasuke": { "type": "Sasuke", "level": "road", "pos": [56, 8], "dsm": "npcs/sasuke.json", "state": "start" },
+        "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" },
         "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": [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/tea_house.json	Sat Apr 09 17:09:42 2011 +0200
+++ b/data/levels/tea_house.json	Sat Apr 09 17:14:28 2011 +0200
@@ -13,9 +13,9 @@
         "X{.....!.......h..<>.h.}X",
         "X.......................X",
         "X=>............<>.......X",
-        "X.......................X",
-        "X=-->.......<>.....?....X",
-        "X.................pXXq..X",
+        "X..?....................X",
+        "X=-->..?....<>.....?....X",
+        "X.....?pq?........pXXq..X",
         "XXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
--- a/skaapsteker/sprites/items.py	Sat Apr 09 17:09:42 2011 +0200
+++ b/skaapsteker/sprites/items.py	Sat Apr 09 17:14:28 2011 +0200
@@ -166,5 +166,5 @@
 
 
 class Documents(Item):
-    image_file = 'haiku-scroll.png'
+    image_file = 'props/haiku-scroll.png'