# HG changeset patch
# User Simon Cross <hodgestar@gmail.com>
# Date 1302293341 -7200
# Node ID 74c875f7b1f51c89e3688034365c260ec8d632e7
# Parent  e22b0e4d52aef1b8be6ecdd40e8a83612533b1d3
Fill in remaining missions and make remaining npc state machines pass basic sanity tests.

diff -r e22b0e4d52ae -r 74c875f7b1f5 data/game.json
--- a/data/game.json	Fri Apr 08 22:04:05 2011 +0200
+++ b/data/game.json	Fri Apr 08 22:09:01 2011 +0200
@@ -13,7 +13,11 @@
         "fish_in_room": false,
         "kumikos_kimono_torn": false,
         "kumiko_disgraced": false,
-        "masks_destroyed": false
+        "masks_destroyed": false,
+        "fire_started_on_road": false,
+        "cannon_destroyed": false,
+        "final_battle_lost": false,
+        "final_battle_won": false
     },
     "items": {
         "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
diff -r e22b0e4d52ae -r 74c875f7b1f5 data/npcs/ichiro.json
--- a/data/npcs/ichiro.json	Fri Apr 08 22:04:05 2011 +0200
+++ b/data/npcs/ichiro.json	Fri Apr 08 22:09:01 2011 +0200
@@ -26,7 +26,7 @@
     "sigh" : {
         "text" : "Sigh.",
         "events" : [
-            { "matches" : "world.fire_started", "next": "state.wakeup" }
+            { "matches" : "world.missions.fire_started_on_road", "next": "state.wakeup" }
         ]
     },
     "wakeup" : {
diff -r e22b0e4d52ae -r 74c875f7b1f5 data/npcs/kitsune.json
--- a/data/npcs/kitsune.json	Fri Apr 08 22:04:05 2011 +0200
+++ b/data/npcs/kitsune.json	Fri Apr 08 22:09:01 2011 +0200
@@ -25,8 +25,8 @@
     },
     "battle" : {
         "events" : [
-            { "matches" : "world.battle_lost", "next": "state.lost" },
-            { "matches" : "world.battle_won", "next": "state.won" }
+            { "matches" : "world.missions.final_battle_lost", "next": "state.lost" },
+            { "matches" : "world.missions.final_battle_won", "next": "state.won" }
         ]
     },
     "haiku1" : {
diff -r e22b0e4d52ae -r 74c875f7b1f5 data/npcs/sasuke.json
--- a/data/npcs/sasuke.json	Fri Apr 08 22:04:05 2011 +0200
+++ b/data/npcs/sasuke.json	Fri Apr 08 22:09:01 2011 +0200
@@ -5,7 +5,7 @@
     },
     "napping" : {
         "events" : [
-            { "matches" : "world.cannon_destroyed", "next": "state.huh" }
+            { "matches" : "world.missions.cannon_destroyed", "next": "state.huh" }
         ]
     },
     "huh" : {