diff data/npcs/maneki.json @ 297:2844edb6c1cc

Hook up maneki, kaneda2 and the fishmonger who were hiding in limbo (i.e. not in game.json).
author Simon Cross <hodgestar@gmail.com>
date Fri, 08 Apr 2011 22:36:03 +0200
parents e27c45d38605
children e1436dacca69
line wrap: on
line diff
--- a/data/npcs/maneki.json	Fri Apr 08 22:29:49 2011 +0200
+++ b/data/npcs/maneki.json	Fri Apr 08 22:36:03 2011 +0200
@@ -1,10 +1,10 @@
 {
     "start" : {
         "text" : "Greetings, fox. Ah, but you are no ordinary fox, are you?",
-        "events" : [
-            { "matches" : "I am a kitsune.", "next": "state.thoughtasmuch" },
-            { "matches" : "I’m perfectly normal.", "next": "state.sure" },
-            { "matches" : "You’re not even a real cat!", "next": "state.unkind" }
+        "choices" : [
+            { "text" : "I am a kitsune.", "next": "state.thoughtasmuch" },
+            { "text" : "I’m perfectly normal.", "next": "state.sure" },
+            { "text" : "You’re not even a real cat!", "next": "state.unkind" }
         ]
     },
     "thoughtasmuch" : {
@@ -25,7 +25,7 @@
     },
     "waiting" : {
         "events" : [
-            { "matches" : "world.got_salmon", "next": "state.goodjob" }
+            { "matches" : "world.fox.item == 'salmon'", "next": "state.goodjob" }
         ]
     },
     "goodjob" : {