Mercurial > skaapsteker

changeset 287:f512e874b2e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add monk and kumiko missions to game.json and to monk and kumiko.
author Simon Cross <hodgestar@gmail.com>
date Fri, 08 Apr 2011 21:17:30 +0200
parents 0dbb50d07764
children ddcfc159dc2a
files data/game.json data/npcs/kumiko.json data/npcs/monk.json
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/data/game.json	Fri Apr 08 20:58:12 2011 +0200
+++ b/data/game.json	Fri Apr 08 21:17:30 2011 +0200
@@ -6,7 +6,10 @@
         "max_health" : 40
     },
     "missions": {
-        "monk_tea": {}
+        "monk_tea": false,
+        "fish_in_room": false,
+        "kumikos_kimono_torn": false,
+        "kumiko_disgraced": false
     },
     "items": {
         "tealeaf": { "type": "TeaLeaf", "level": "temple", "pos": [1, 7] },
--- a/data/npcs/kumiko.json	Fri Apr 08 20:58:12 2011 +0200
+++ b/data/npcs/kumiko.json	Fri Apr 08 21:17:30 2011 +0200
@@ -12,13 +12,13 @@
     "broken" : {
         "text" : "Oh no, my beautiful vase! What will the businessman think to see it broken on the floor?",
         "events" : [
-            { "matches" : "world.fish_in_house", "next": "state.badsmell" }
+            { "matches" : "world.missions.fish_in_room", "next": "state.badsmell" }
         ]
     },
     "badsmell" : {
         "text" : "Oh my, what is that terrible smell? Rotten fish? Oh, this won’t do at all!",
         "events" : [
-            { "matches" : "world.torn_kimono", "next": "state.torn" }
+            { "matches" : "world.missions.kumikos_kimono_torn", "next": "state.torn" }
         ]
     },
     "torn" : {
@@ -64,6 +64,7 @@
         ]
     },
     "curse" : {
-        "text" : "Curse you, fox! I’ll be doomed to a peasant life forever!"
+        "text" : "Curse you, fox! I’ll be doomed to a peasant life forever!",
+        "on_exit": "world.missions.kumiko_disgraced = True"
     }
 }
--- a/data/npcs/monk.json	Fri Apr 08 20:58:12 2011 +0200
+++ b/data/npcs/monk.json	Fri Apr 08 21:17:30 2011 +0200
@@ -24,7 +24,8 @@
     },
     "got_tea" : {
         "text" : "My tea! Oh, heavenly! Such aroma, what a taste... Just what I need. Mmm...",
-        "auto_next": "state.distracted"
+        "auto_next": "state.distracted",
+        "on_exit" : "world.missions.monk_tea = True"
     },
     "distracted" : {
     }