summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-18 05:05:33 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-18 05:05:33 +0000
commitd01a5d2ef2fc56e76d483cc4d14d61955f6ec36c (patch)
tree8918fb31aa70524425e6ad1188a3da2bdb914d29 /npc/quests
parent26a9fb42e104800fd0e8ff4cf6a830ab3ce48ac5 (diff)
downloadhercules-d01a5d2ef2fc56e76d483cc4d14d61955f6ec36c.tar.gz
hercules-d01a5d2ef2fc56e76d483cc4d14d61955f6ec36c.tar.bz2
hercules-d01a5d2ef2fc56e76d483cc4d14d61955f6ec36c.tar.xz
hercules-d01a5d2ef2fc56e76d483cc4d14d61955f6ec36c.zip
- Fixed some emotions triggering on the wrong npc. (bugreport:4303)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14346 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/quests_lighthalzen.txt16
1 files changed, 4 insertions, 12 deletions
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index f97b24a86..fa86b1170 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -3999,7 +3999,7 @@ OnTouch:
mes "you've finally agreed";
mes "to join us. Welcome!";
next;
- donpcevent "#Varmunt::OnEmote";
+ emotion e_swt;
mes "[Varmunt]";
mes "Well, I don't know if I agree";
mes "with this company's policies,";
@@ -4007,7 +4007,7 @@ OnTouch:
mes "seems to be an opportunity that";
mes "comes once in a lifetime, so...";
next;
- donpcevent "#Rekenber::OnEmote";
+ emotion e_ok,0,"#Rekenber";
mes "[??]";
mes "To be honest, this project";
mes "can only be a success with";
@@ -4127,10 +4127,6 @@ OnTouch:
}
warp "lhz_in01",206,129;
end;
-
-OnEmote:
- emotion e_swt;
- end;
}
lhz_que01,29,24,3 script #Rekenber 754,{
@@ -4144,7 +4140,7 @@ OnTouch:
mes "you've finally agreed";
mes "to join us. Welcome!";
next;
- donpcevent "#Varmunt::OnEmote";
+ emotion e_swt,0,"#Varmunt";
mes "[Varmunt]";
mes "Well, I don't know if I agree";
mes "with this company's policies,";
@@ -4152,7 +4148,7 @@ OnTouch:
mes "seems to be an opportunity that";
mes "comes once in a lifetime, so...";
next;
- donpcevent "#Rekenber::OnEmote";
+ emotion e_ok;
mes "[??]";
mes "To be honest, this project";
mes "can only be a success with";
@@ -4272,10 +4268,6 @@ OnTouch:
}
warp "lhz_in01",206,129;
end;
-
-OnEmote:
- emotion e_ok;
- end;
}
lhz_in01,282,166,0 script #kiz10 -1,3,3,{