summaryrefslogtreecommitdiff
path: root/npc/cities/jawaii.txt
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-18 16:19:48 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-18 16:19:48 +0000
commit8c1c619777b748ee3c3603af77c693f9dee7f8c1 (patch)
treefb4d3099057d46c212c39d83773a6bd425b9abcb /npc/cities/jawaii.txt
parentd01a5d2ef2fc56e76d483cc4d14d61955f6ec36c (diff)
downloadhercules-8c1c619777b748ee3c3603af77c693f9dee7f8c1.tar.gz
hercules-8c1c619777b748ee3c3603af77c693f9dee7f8c1.tar.bz2
hercules-8c1c619777b748ee3c3603af77c693f9dee7f8c1.tar.xz
hercules-8c1c619777b748ee3c3603af77c693f9dee7f8c1.zip
Applied patch from Dani to change NPC emotion events to use the updated emotion command. (bugreport:4318)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14347 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/cities/jawaii.txt')
-rw-r--r--npc/cities/jawaii.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index a80fb4adc..5ad12b4ab 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -1237,7 +1237,7 @@ prt_in,173,13,4 script Customer#SoloHan 86,{
next;
mes "[Bachewcca]";
mes "...!";
- donpcevent "Customer#Bachewcca::OnEmote";
+ emotion e_no1,0,"Customer#Bachewcca";
next;
mes "[SoloHan]";
mes "It's doesn't really matter whether you're married";
@@ -1390,15 +1390,13 @@ prt_in,170,14,0 script Customer#Bachewcca 89,{
mes "..............";
mes "^666666*Gulp....gulp...*^000000";
mes "Grrrrr!! That hit the spot!";
- Emotion e_sob;
+ emotion e_sob;
close;
-OnEmote:
- emotion e_no1;
- end;
OnEffect1:
specialeffect 296; //EF_TALK_SCREAM
end;
+
OnEffect2:
specialeffect 291; //EF_THROWITEM
end;