Mercurial > skaapsteker
changeset 436:32df272a163a
maneki neko and fisherman's house
| author | Adrianna Pińska <adrianna.pinska@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 19:16:09 +0200 |
| parents | b6fdaf8e453c |
| children | 8fc3f8894d0f |
| files | data/game.json data/levels/fishmonger_house.json data/sprites/maneki neko/maneki-neko.png data/sprites/maneki neko/maneki-neko_standing.png skaapsteker/sprites/npcs.py |
| diffstat | 5 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/data/game.json Sat Apr 09 19:15:37 2011 +0200 +++ b/data/game.json Sat Apr 09 19:16:09 2011 +0200 @@ -67,8 +67,8 @@ "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, 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" }, + "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" }, "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" } },
--- a/data/levels/fishmonger_house.json Sat Apr 09 19:15:37 2011 +0200 +++ b/data/levels/fishmonger_house.json Sat Apr 09 19:16:09 2011 +0200 @@ -7,19 +7,26 @@ "tiles": [ "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "Xd{............}X{............}X{............}bX", - "X{..............X..............X..............}X", + "X{......?.......X...?......?...X.......?......}X", "X..........<+q?.X..............X.?p=>..........X", "X............bXXd..............bXXd............X", "X.<+q.?p=>..........<+q?.p=>..........<+q?.p=>.X", "X...bXXd..............bXXd..............bXXd...X", - "X..........<+q.?p=>....}X....<+q?.p=>..........X", + "X.?........<+q.?p=>....}X....<+q?.p=>........?.X", "X=+q.........bXXd......pd......bXXd.........p=+X", "X..X.?p=>.....}X....().X{.()....}X.....<+q?.X..X", - "X..bXXd...?...pd.......bq.......pd.......bXXd..X", + "X..bXXd...?...pd.......bq.......pd...?...bXXd..X", "X...}X{.pXXq..X{..pXq..}X..pXq..X{..pXXq.}X{...X", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ], "enemies": [ + {"type": "PatrollingOni", "pos": [2, 7], "direction": "right" }, + {"type": "PatrollingOni", "pos": [45, 7], "direction": "right" }, + {"type": "PatrollingOni", "pos": [37, 10], "direction": "left" }, + {"type": "FlyingOni", "pos": [8, 2], "direction": "left" }, + {"type": "FlyingOni", "pos": [20, 2], "direction": "right" }, + {"type": "FlyingOni", "pos": [27, 2], "direction": "left" }, + {"type": "FlyingOni", "pos": [39, 2], "direction": "right" }, {"type": "RedOni", "pos": [6, 5], "direction": "left" }, {"type": "RedOni", "pos": [5, 9], "direction": "right" }, {"type": "RedOni", "pos": [14, 3], "direction": "left" },
--- a/skaapsteker/sprites/npcs.py Sat Apr 09 19:15:37 2011 +0200 +++ b/skaapsteker/sprites/npcs.py Sat Apr 09 19:16:09 2011 +0200 @@ -40,9 +40,9 @@ class Maneki(NPC): - image_dir = 'sprites/' + image_dir = 'sprites/maneki neko' animation_regexes = [ - ("manekiing", "dummy.png"), + ("standing", r"^.*_standing.png$"), ]