summaryrefslogtreecommitdiff
path: root/npc/quests/quests_airship.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/quests/quests_airship.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/quests/quests_airship.txt')
-rw-r--r--npc/quests/quests_airship.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 51ddcf656..9445086d2 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -2924,10 +2924,6 @@ OnEnter:
enablenpc "Ferlock#lab";
initnpctimer;
end;
-
-OnEmote:
- emotion e_omg,0;
- end;
OnTimer120000:
donpcevent "Ferlock#lab::OnInit";
@@ -3052,7 +3048,7 @@ L_Input:
mes "Airship. Wait, wait...";
mes "You look familiar...";
next;
- donpcevent "Ferlock#lab::OnEmote";
+ emotion e_omg,0,"Ferlock#lab";
mes "[Ferlock]";
mes "That's right, aren't you the";
mes "one who brought me my";