summaryrefslogtreecommitdiff
path: root/world/map/npc/002-1
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2015-04-22 23:28:19 -0400
committermekolat <mekolat@users.noreply.github.com>2015-04-23 11:44:39 -0400
commit4a936259b71a43076a02b8e22a3a9f1370d7da36 (patch)
treea2ef0ca8661d51828f4296700e96218e52bd5917 /world/map/npc/002-1
parentc93710edb93f00d42119adbc332ab4152ead4341 (diff)
downloadserverdata-4a936259b71a43076a02b8e22a3a9f1370d7da36.tar.gz
serverdata-4a936259b71a43076a02b8e22a3a9f1370d7da36.tar.bz2
serverdata-4a936259b71a43076a02b8e22a3a9f1370d7da36.tar.xz
serverdata-4a936259b71a43076a02b8e22a3a9f1370d7da36.zip
update for new emotion builtin
Diffstat (limited to 'world/map/npc/002-1')
-rw-r--r--world/map/npc/002-1/sarah.txt10
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;