diff options
| author | Wushin <pasekei@gmail.com> | 2015-04-29 22:31:22 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-04-29 22:31:22 -0500 |
| commit | d320ae82190b6ab84f2a047426dd9970d604c159 (patch) | |
| tree | 9dfc41c78445ef7f92203edf932f00bce832d062 /world/map/npc/002-1/sarah.txt | |
| parent | 47987560e755cf26745bd95ba73e176aa1ab24d7 (diff) | |
| parent | 4a936259b71a43076a02b8e22a3a9f1370d7da36 (diff) | |
| download | serverdata-d320ae82190b6ab84f2a047426dd9970d604c159.tar.gz serverdata-d320ae82190b6ab84f2a047426dd9970d604c159.tar.bz2 serverdata-d320ae82190b6ab84f2a047426dd9970d604c159.tar.xz serverdata-d320ae82190b6ab84f2a047426dd9970d604c159.zip | |
Merge pull request #338 from mekolat/emotion
update for new emotion builtin
Diffstat (limited to 'world/map/npc/002-1/sarah.txt')
| -rw-r--r-- | world/map/npc/002-1/sarah.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/world/map/npc/002-1/sarah.txt b/world/map/npc/002-1/sarah.txt index 83fc6558..19e5f866 100644 --- a/world/map/npc/002-1/sarah.txt +++ b/world/map/npc/002-1/sarah.txt @@ -51,14 +51,15 @@ L_Progress: mes "\"Whee!\""; next; mes "You brought me Cherry Cake! Here is your new hat, as promised.\""; - emotion EMOTE_TONGUE; getinventorylist; if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany; delitem "CherryCake", 1; getitem "SerfHat", 1; set @state, 2; callsub S_Update_Var; - goto L_Close; + close2; + emotion EMOTE_TONGUE, strcharinfo(0); + end; L_NotEnough: mes "[Sarah]"; @@ -68,8 +69,9 @@ L_NotEnough: L_Done: mes "[Sarah]"; mes "\"It was so tasty, I can't eat anything more... Thank you!\""; - emotion EMOTE_TONGUE; - goto L_Close; + close2; + emotion EMOTE_TONGUE, strcharinfo(0); + end; L_Close: set @TEMP, 0; |