Mercurial > skaapsteker

diff data/npcs/ichiro.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 74c875f7b1f5
line wrap: on
line diff
--- a/data/npcs/ichiro.json	Wed Apr 06 21:39:30 2011 +0200
+++ b/data/npcs/ichiro.json	Wed Apr 06 21:44:54 2011 +0200
@@ -2,43 +2,43 @@
     "start" : {
         "text" : "I’m telling you, Hattori. The Hayashi clan will arrive any minute now.",
         "events" : [
-            { "matches" : "world.npc_is('hattori', 'start')", "next": "state.prepared" }
+            { "matches" : "world.npcs.hattori.state ==  'start'", "next": "state.prepared" }
         ]
     },
     "prepared" : {
         "text" : "It doesn’t hurt to be prepared.",
         "events" : [
-            { "matches" : "world.npc_is('hattori', 'wait')", "next": "state.sitting" }
+            { "matches" : "npcs.hattori.state ==  'wait'", "next": "state.sitting" }
         ]
     },
     "sitting" : {
         "text" : "I just don’t like sitting out in the open like this.",
         "events" : [
-            { "matches" : "world.npc_is('hattori', 'relax')", "next": "state.but" }
+            { "matches" : "npcs.hattori.state ==  'relax'", "next": "state.but" }
         ]
     },
     "but" : {
         "text" : "But-",
         "events" : [
-            { "matches" : "world.npc_is('hattori', 'omm')", "next": "state.sigh" }
+            { "matches" : "npcs.hattori.state ==  'omm'", "next": "state.sigh" }
         ]
     },
     "sigh" : {
         "text" : "Sigh.",
         "events" : [
-            { "matches" : "world.fire_started()", "next": "state.wakeup" }
+            { "matches" : "world.fire_started", "next": "state.wakeup" }
         ]
     },
     "wakeup" : {
         "text" : "Hattori, wake up! Look! Smoke coming over the rise.",
         "events" : [
-            { "matches" : "world.npc_is('hattori', 'letsgo')", "next": "state.cannon" }
+            { "matches" : "npcs.hattori.state ==  'letsgo'", "next": "state.cannon" }
         ]
     },
     "cannon" : {
         "text" : "What about the cannon?",
         "events" : [
-            { "matches" : "world.npc_is('hattori', 'attack')", "next": "state.gone" }
+            { "matches" : "npcs.hattori.state ==  'attack'", "next": "state.gone" }
         ]
     },
     "gone" : {