# HG changeset patch
# User Neil Muller <drnlmuller@gmail.com>
# Date 1302381625 -7200
# Node ID 9a16483e49cb992d7e6df6ebb4b7441902fa6d79
# Parent  906fae3d3688c3f68ce79d6fd0f01ceb4a57bf3e
Remove 1st set of blocking samuri

diff -r 906fae3d3688 -r 9a16483e49cb data/npcs/hattori.json
--- a/data/npcs/hattori.json	Sat Apr 09 22:58:32 2011 +0200
+++ b/data/npcs/hattori.json	Sat Apr 09 22:40:25 2011 +0200
@@ -40,6 +40,6 @@
         "auto_next": "state.gone"
     },
     "gone" : {
-        "on_entry" : "drop_item('tail_sprint')"
+        "on_entry" : "drop_item('tail_sprint'); npcs.hattori.block = False"
     }
 }
diff -r 906fae3d3688 -r 9a16483e49cb data/npcs/ichiro.json
--- a/data/npcs/ichiro.json	Sat Apr 09 22:58:32 2011 +0200
+++ b/data/npcs/ichiro.json	Sat Apr 09 22:40:25 2011 +0200
@@ -35,6 +35,6 @@
         "auto_next" : "state.gone",
         "on_exit" : "switch_to('hattori')"
     },
-    "gone" : {
+    "gone" : { "on_entry": "npcs.ichiro.block = False"
     }
 }
diff -r 906fae3d3688 -r 9a16483e49cb skaapsteker/sprites/base.py
--- a/skaapsteker/sprites/base.py	Sat Apr 09 22:58:32 2011 +0200
+++ b/skaapsteker/sprites/base.py	Sat Apr 09 22:40:25 2011 +0200
@@ -279,6 +279,10 @@
     def player_action(self, player):
         OpenDialog.post(self)
 
+    def remove(self):
+        self._me.level = '_limbo'
+        self.kill()
+
 
 class BlockingNPC(NPC):
 
diff -r 906fae3d3688 -r 9a16483e49cb skaapsteker/sprites/npcs.py
--- a/skaapsteker/sprites/npcs.py	Sat Apr 09 22:58:32 2011 +0200
+++ b/skaapsteker/sprites/npcs.py	Sat Apr 09 22:40:25 2011 +0200
@@ -28,6 +28,11 @@
                 ('right', lambda x: transform.flip(x, True, False))),
                 }
 
+    def update(self):
+        if not self._me.block:
+            self.remove()
+
+
 
 
 class Ichiro(BlockingNPC):
@@ -39,6 +44,10 @@
                 ('right', lambda x: transform.flip(x, True, False))),
                 }
 
+    def update(self):
+        if not self._me.block:
+            self.remove()
+
 
 
 class Kaneda(NPC):