Changeset 305:691278e89399


Ignore:
Timestamp:
04/08/11 21:51:20 (12 years ago)
Author:
Simon Cross <hodgestar@…>
Branch:
default
Phase:
public
Message:

Link up hattori's and ichiro's conversation.

Location:
data/npcs
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • data/npcs/hattori.json

    r193 r305  
    22    "start" : {
    33        "text" : "Ichiro, there is nothing to fear. Uesugi will light the signal fire if they come close.",
    4         "events" : [
    5             { "matches" : "npcs.ichiro.state ==  'prepared'", "next": "state.wait" }
    6         ]
     4        "auto_next" : "state.wait",
     5        "on_exit" : "switch_to('ichiro')"
    76    },
    87    "wait" : {
    98        "text" : "There’s nothing more for us to do but sit and wait. Sasuke will arrive with our cannon in a while. We can’t take on the entire Hayashi clan without it.",
    10         "events" : [
    11             { "matches" : "npcs.ichiro.state ==  'sitting'", "next": "state.relax" }
    12         ]
     9        "auto_next" : "state.relax",
     10        "on_exit" : "switch_to('ichiro')"
    1311    },
    1412    "relax" : {
    1513        "text" : "Relax! You’re with me, the most fearsome katana in the East. We’re not moving from this spot until we have to. Besides, I need to meditate.",
    16         "events" : [
    17             { "matches" : "npcs.ichiro.state ==  'but'", "next": "state.omm" }
    18         ]
     14        "auto_next" : "state.omm",
     15        "on_exit" : "switch_to('ichiro')"
    1916    },
    2017    "omm" : {
    2118        "text" : "Ommmmm...",
     19        "auto_next" : "state.omm2",
     20        "on_exit" : "switch_to('ichiro')"
     21    },
     22    "omm2" : {
     23        "text" : "Ommmmmmmmmm....",
    2224        "events" : [
    23             { "matches" : "npcs.ichiro.state ==  'wakeup'", "next": "state.letsgo" }
     25            { "matches" : "world.missions.fire_started_on_road and npcs.ichiro.state != 'sigh'", "next": "state.letsgo" }
    2426        ]
    2527    },
    2628    "letsgo" : {
    2729        "text" : "Ha- huh? Uesugi’s fire! Let’s go!",
    28         "events" : [
    29             { "matches" : "npcs.ichiro.state ==  'cannon'", "next": "state.attack" }
    30         ]
     30        "auto_next" : "state.attack",
     31        "on_exit" : "switch_to('ichiro')"
    3132    },
    3233    "attack" : {
  • data/npcs/ichiro.json

    r304 r305  
    22    "start" : {
    33        "text" : "I’m telling you, Hattori. The Hayashi clan will arrive any minute now.",
    4         "events" : [
    5             { "matches" : "world.npcs.hattori.state ==  'start'", "next": "state.prepared" }
    6         ]
     4        "auto_next" : "state.prepared",
     5        "on_exit" : "switch_to('hattori')"
    76    },
    87    "prepared" : {
    98        "text" : "It doesn’t hurt to be prepared.",
    10         "events" : [
    11             { "matches" : "npcs.hattori.state ==  'wait'", "next": "state.sitting" }
    12         ],
     9        "auto_next" : "state.sitting",
    1310        "on_exit" : "switch_to('hattori')"
    1411    },
    1512    "sitting" : {
    1613        "text" : "I just don’t like sitting out in the open like this.",
    17         "events" : [
    18             { "matches" : "npcs.hattori.state ==  'relax'", "next": "state.but" }
    19         ]
     14        "auto_next" : "state.but",
     15        "on_exit" : "switch_to('hattori')"
    2016    },
    2117    "but" : {
    2218        "text" : "But-",
    23         "events" : [
    24             { "matches" : "npcs.hattori.state ==  'omm'", "next": "state.sigh" }
    25         ]
     19        "auto_next" : "state.sigh",
     20        "on_exit": "switch_to('hattori')"
    2621    },
    2722    "sigh" : {
     
    3328    "wakeup" : {
    3429        "text" : "Hattori, wake up! Look! Smoke coming over the rise.",
    35         "events" : [
    36             { "matches" : "npcs.hattori.state ==  'letsgo'", "next": "state.cannon" }
    37         ]
     30        "auto_next" : "state.cannon",
     31        "on_exit" : "switch_to('hattori')"
    3832    },
    3933    "cannon" : {
    4034        "text" : "What about the cannon?",
    41         "events" : [
    42             { "matches" : "npcs.hattori.state ==  'attack'", "next": "state.gone" }
    43         ]
     35        "auto_next" : "state.gone",
     36        "on_exit" : "switch_to('hattori')"
    4437    },
    4538    "gone" : {
Note: See TracChangeset for help on using the changeset viewer.