Mercurial > skaapsteker

diff data/npcs/hattori.json @ 193:897eec397cbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix state checks for hattori, ichiro, kaneda and kumiko. In the process provide easier access to other npcs.
author Simon Cross <hodgestar@gmail.com>
date Wed, 06 Apr 2011 21:44:54 +0200
parents a7cdf8458edd
children 691278e89399
line wrap: on
line diff
--- a/data/npcs/hattori.json	Wed Apr 06 21:39:30 2011 +0200
+++ b/data/npcs/hattori.json	Wed Apr 06 21:44:54 2011 +0200
@@ -2,31 +2,31 @@
     "start" : {
         "text" : "Ichiro, there is nothing to fear. Uesugi will light the signal fire if they come close.",
         "events" : [
-            { "matches" : "world.npc_is('ichiro', 'prepared')", "next": "state.wait" }
+            { "matches" : "npcs.ichiro.state ==  'prepared'", "next": "state.wait" }
         ]
     },
     "wait" : {
         "text" : "There’s nothing more for us to do but sit and wait. Sasuke will arrive with our cannon in a while. We can’t take on the entire Hayashi clan without it.",
         "events" : [
-            { "matches" : "world.npc_is('ichiro', 'sitting')", "next": "state.relax" }
+            { "matches" : "npcs.ichiro.state ==  'sitting'", "next": "state.relax" }
         ]
     },
     "relax" : {
         "text" : "Relax! You’re with me, the most fearsome katana in the East. We’re not moving from this spot until we have to. Besides, I need to meditate.",
         "events" : [
-            { "matches" : "world.npc_is('ichiro', 'but')", "next": "state.omm" }
+            { "matches" : "npcs.ichiro.state ==  'but'", "next": "state.omm" }
         ]
     },
     "omm" : {
         "text" : "Ommmmm...",
         "events" : [
-            { "matches" : "world.npc_is('ichiro', 'wakeup')", "next": "state.letsgo" }
+            { "matches" : "npcs.ichiro.state ==  'wakeup'", "next": "state.letsgo" }
         ]
     },
     "letsgo" : {
         "text" : "Ha- huh? Uesugi’s fire! Let’s go!",
         "events" : [
-            { "matches" : "world.npc_is('ichiro', 'cannon')", "next": "state.attack" }
+            { "matches" : "npcs.ichiro.state ==  'cannon'", "next": "state.attack" }
         ]
     },
     "attack" : {