Mercurial > skaapsteker

changeset 294:74c875f7b1f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fill in remaining missions and make remaining npc state machines pass basic sanity tests.
author Simon Cross <hodgestar@gmail.com>
date Fri, 08 Apr 2011 22:09:01 +0200
parents e22b0e4d52ae
children b5ce2c7f4c60
files data/game.json data/npcs/ichiro.json data/npcs/kitsune.json data/npcs/sasuke.json
diffstat 4 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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] },
--- 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" : {
--- 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" : {
--- 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" : {