Mercurial > skaapsteker

changeset 468:73868503c470

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make road Samuri blocking
author Neil Muller <drnlmuller@gmail.com>
date Sat, 09 Apr 2011 21:08:21 +0200
parents 73288045cec5
children 7607854eafc4
files data/game.json skaapsteker/sprites/npcs.py
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Sat Apr 09 21:05:22 2011 +0200
+++ b/data/game.json	Sat Apr 09 21:08:21 2011 +0200
@@ -158,9 +158,9 @@
     "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", "block": true },
-        "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" },
-        "sasuke": { "type": "Sasuke", "level": "road", "pos": [56, 8], "dsm": "npcs/sasuke.json", "state": "start" },
+        "hattori": { "type": "Hattori", "level": "road", "pos": [37, 8], "dsm": "npcs/hattori.json", "state": "start", "block": true },
+        "ichiro": { "type": "Ichiro", "level": "road", "pos": [36, 8], "dsm": "npcs/ichiro.json", "state": "start", "block": true },
+        "sasuke": { "type": "Sasuke", "level": "road", "pos": [56, 8], "dsm": "npcs/sasuke.json", "state": "start", "block": true },
         "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" },
--- a/skaapsteker/sprites/npcs.py	Sat Apr 09 21:05:22 2011 +0200
+++ b/skaapsteker/sprites/npcs.py	Sat Apr 09 21:08:21 2011 +0200
@@ -18,11 +18,11 @@
         super(Guard, self).update()
 
 
-class Hattori(NPC):
+class Hattori(BlockingNPC):
     image_dir = 'sprites/hattori'
 
 
-class Ichiro(NPC):
+class Ichiro(BlockingNPC):
     image_dir = 'sprites/ichiro'
 
 
@@ -59,7 +59,7 @@
     ]
 
 
-class Sasuke(NPC):
+class Sasuke(BlockingNPC):
     image_dir = 'sprites/sasuke'