summaryrefslogtreecommitdiff
path: root/world/map/npc/002-2
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-04-29 22:31:22 -0500
committerWushin <pasekei@gmail.com>2015-04-29 22:31:22 -0500
commitd320ae82190b6ab84f2a047426dd9970d604c159 (patch)
tree9dfc41c78445ef7f92203edf932f00bce832d062 /world/map/npc/002-2
parent47987560e755cf26745bd95ba73e176aa1ab24d7 (diff)
parent4a936259b71a43076a02b8e22a3a9f1370d7da36 (diff)
downloadserverdata-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-2')
-rw-r--r--world/map/npc/002-2/bleacher.txt2
-rw-r--r--world/map/npc/002-2/hetchel.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/002-2/bleacher.txt b/world/map/npc/002-2/bleacher.txt
index 21f0efd1..3935fe24 100644
--- a/world/map/npc/002-2/bleacher.txt
+++ b/world/map/npc/002-2/bleacher.txt
@@ -127,6 +127,6 @@ L_Close:
mes "[Candide]";
mes "\"Come again.\"";
close2;
- emotion EMOTE_GRIN;
+ emotion EMOTE_GRIN, strcharinfo(0);
end;
}
diff --git a/world/map/npc/002-2/hetchel.txt b/world/map/npc/002-2/hetchel.txt
index 15fc61f9..f6910149 100644
--- a/world/map/npc/002-2/hetchel.txt
+++ b/world/map/npc/002-2/hetchel.txt
@@ -330,7 +330,7 @@ L_Next1:
mes "";
mes "\"Thank you, I hope the sheets will fit your needs.";
mes "Please greet Lora for me when you see her.\"";
- emotion EMOTE_HAPPY;
+ emotion EMOTE_HAPPY, strcharinfo(0);
goto L_Close;
L_sheet_missing_cocoons: