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

2 files changed, 5 insertions, 14 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;
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index a6da88fd0..72c946509 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -27,13 +27,6 @@
 comodo,170,137,7	script	La Ed#um	84,{
 	end;
 
-OnEmoteHmm:
-	emotion e_hmm;
-	end;
-
-OnEmoteGG:
-	emotion e_gg;
-	end;
 }
 
 comodo,171,137,1	script	Haith#um	92,{
@@ -61,7 +54,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	mes "would tell us about such a";
 	mes "great treasure so easily?";
 	emotion e_hmm;
-	donpcevent "La Ed#um::OnEmoteHmm";
+	emotion e_hmm,0,"La Ed#um";
 	next;
 	select("Hm? What treasure?");
 	mes "[La Ed]";
@@ -82,7 +75,7 @@ comodo,171,137,1	script	Haith#um	92,{
 	mes "[La Ed, Haith]";
 	mes "If you pay us 1,000 zeny, we will tell you!";
 	emotion e_gg;
-	donpcevent "La Ed#um::OnEmoteGG";
+	emotion e_gg,0,"La Ed#um";
 	next;
 	if (select("Pay 1,000 zeny:Refuse to pay") == 1) {
 		if (Zeny > 999) {