Mercurial > skaapsteker

changeset 509:c85363a8ff56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make Sasuke non-blocking again
author Neil Muller <drnlmuller@gmail.com>
date Sat, 09 Apr 2011 23:14:21 +0200
parents e4b1a79504f2
children 8d78fba1735e
files data/game.json skaapsteker/sprites/npcs.py
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sat Apr 09 23:13:53 2011 +0200
+++ b/data/game.json	Sat Apr 09 23:14:21 2011 +0200
@@ -170,7 +170,7 @@
         "guard": { "type": "Guard", "level": "temple_grounds", "pos": [5, 11], "dsm": "npcs/guard.json", "state": "start", "block": true },
         "hattori": { "type": "Hattori", "level": "road", "pos": [37, 8], "dsm": "npcs/hattori.json", "state": "start", "block": true, "facing": "left" },
         "ichiro": { "type": "Ichiro", "level": "road", "pos": [36, 8], "dsm": "npcs/ichiro.json", "state": "start", "block": true, "facing": "right" },
-        "sasuke": { "type": "Sasuke", "level": "road", "pos": [56, 8], "dsm": "npcs/sasuke.json", "state": "start", "block": true },
+        "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", "facing": "left" },
         "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start", "facing": "right" },
         "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start" },
--- a/skaapsteker/sprites/npcs.py	Sat Apr 09 23:13:53 2011 +0200
+++ b/skaapsteker/sprites/npcs.py	Sat Apr 09 23:14:21 2011 +0200
@@ -83,10 +83,11 @@
     ]
 
 
-class Sasuke(BlockingNPC):
+class Sasuke(NPC):
     image_dir = 'sprites/sasuke'
 
 
+
 class Kitsune(NPC):
     image_dir = 'sprites'
     animation_regexes = [