diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
| commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
| tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/001-1/sarah.txt | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/001-1/sarah.txt')
| -rw-r--r-- | world/map/npc/001-1/sarah.txt | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt index 3bd2a447..8a84df47 100644 --- a/world/map/npc/001-1/sarah.txt +++ b/world/map/npc/001-1/sarah.txt @@ -8,7 +8,7 @@ // If this is shown, something is wrong with the above case handling. mes "Sarah looks confused."; - close; + goto L_Close; L_Convince_Sarah_First: mes "[Sarah]"; @@ -17,7 +17,7 @@ L_Convince_Sarah_First: mes "\"The girl suddenly looks at you suspiciously.\""; next; mes "\"My mommy says not to talk to strangers!\""; - close; + goto L_Close; L_Start: set @TEMP, rand(2); @@ -40,7 +40,7 @@ L_Ask: mes "\"Can you bring me a piece of Cherry Cake? Pretty please?\""; menu "Yes.", L_Req0, - "No.", L_No; + "No.", L_Close; L_Req0: mes "[Sarah]"; @@ -52,7 +52,7 @@ L_Set: set TMW_Quest,7; mes "[Sarah]"; mes "\"Please bring it to me!\""; - close; + goto L_Close; L_Progress: if (countitem("CherryCake") < 1) goto L_NotEnough; @@ -60,31 +60,32 @@ L_Progress: mes "\"Whee!\""; next; mes "You brought me Cherry Cake! Here is your new hat, as promised.\""; - emotion 9; + emotion EMOTE_TONGUE; getinventorylist; if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany; delitem "CherryCake", 1; getitem "serfhat", 1; set TMW_Quest, 8; - close; + goto L_Close; L_NotEnough: mes "[Sarah]"; mes "\"Oh, I'm starving! Please bring me Cherry Cake!\""; - close; + goto L_Close; L_Done: mes "[Sarah]"; mes "\"It was so tasty, I can't eat anything more... Thank you!\""; - emotion 9; - close; + emotion EMOTE_TONGUE; + goto L_Close; -L_No: +L_Close: + set @TEMP, 0; close; L_TooMany: next; mes "[Sarah]"; mes "\"You don't have room for my reward. I'll wait until you do.\""; - close; + goto L_Close; } |