# HG changeset patch
# User Adrianna Pińska <adrianna.pinska@gmail.com>
# Date 1302364296 -7200
# Node ID c6e9b3006ef9c34ba002236e30523dcba48193f7
# Parent  e289a111c74329b479dd663843f789a978876a8b
stuff in theatre

diff -r e289a111c743 -r c6e9b3006ef9 data/game.json
--- a/data/game.json	Sat Apr 09 17:43:39 2011 +0200
+++ b/data/game.json	Sat Apr 09 17:51:36 2011 +0200
@@ -46,6 +46,8 @@
         "documents": { "type": "Documents", "level": "tea_house", "pos": [7, 9] },
         "vase": { "type": "Vase", "level": "geisha_room", "pos": [22, 4], "broken": false },
         "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." },
@@ -66,7 +68,7 @@
         "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "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" },
+        "actor": { "type": "Actor", "level": "theatre", "pos": [12, 9], "dsm": "npcs/actor.json", "state": "start" },
         "kitsune": { "type": "Kitsune", "level": "celestial_plane", "pos": [10, 3], "dsm": "npcs/kitsune.json", "state": "start" }
     },
     "levels": {
diff -r e289a111c743 -r c6e9b3006ef9 data/sprites/props/no-maks-broken.png
Binary file data/sprites/props/no-maks-broken.png has changed
diff -r e289a111c743 -r c6e9b3006ef9 data/sprites/props/no-mask-whole.png
Binary file data/sprites/props/no-mask-whole.png has changed
diff -r e289a111c743 -r c6e9b3006ef9 skaapsteker/sprites/npcs.py
--- a/skaapsteker/sprites/npcs.py	Sat Apr 09 17:43:39 2011 +0200
+++ b/skaapsteker/sprites/npcs.py	Sat Apr 09 17:51:36 2011 +0200
@@ -47,9 +47,9 @@
 
 
 class Actor(NPC):
-    image_dir = 'sprites'
+    image_dir = 'sprites/fishmonger'
     animation_regexes = [
-        ("noh", "dummy.png"),
+        ("standing", r"^.*_standing.png$"),
     ]