Mercurial > skaapsteker
changeset 221:9e2949210c07
Fix merge.
author | Simon Cross <hodgestar@gmail.com> |
---|---|
date | Thu, 07 Apr 2011 01:14:42 +0200 |
parents | c83f021cc327 (current diff) 2d5dfec4cd11 (diff) |
children | 2cbeeef5867c |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/data/npcs/kitsune.json Thu Apr 07 01:07:15 2011 +0200 +++ b/data/npcs/kitsune.json Thu Apr 07 01:14:42 2011 +0200 @@ -26,7 +26,7 @@ "battle" : { "events" : [ { "matches" : "world.battle_lost", "next": "state.lost" }, - { "matches" : "world.battle_won", "next": "state.won" }, + { "matches" : "world.battle_won", "next": "state.won" } ] }, "haiku1" : { @@ -64,7 +64,7 @@ "events" : [ { "matches" : "world.haiku_wins == 1 and world.haiku_losses == 0", "next": "state.haiku_1win_0loss" }, { "matches" : "world.haiku_wins == 1 and world.haiku_losses == 1", "next": "state.haiku_1win_1loss" }, - { "matches" : "world.haiku_wins == 2", "next": "state.haiku_2wins" }, + { "matches" : "world.haiku_wins == 2", "next": "state.haiku_2wins" } ] }, "haiku_1win_0loss" : {