From d24c00ac556a924dd79f674db88a8cb812d74640 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Tue, 22 Jun 2010 22:09:11 +0000 Subject: * Added support for NPC names in the 'specialeffect' script command, go go copy/paste! * Updated several NPCs to use the updated specialeffect command, updated more NPCs to use the updated emotion command. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14353 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/cooking_quest.txt | 68 ++++++++++---------------------------------- 1 file changed, 15 insertions(+), 53 deletions(-) (limited to 'npc/quests/cooking_quest.txt') diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index c36e282e1..2f9b95e07 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -138,7 +138,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ switch(select("......?:She is my sister:Actually, I don't know her.")) { case 1: cutin "nyuang_3",2; - donpcevent "Child with Cat#cook::onDelight"; + emotion e_ho,0,"Child with Cat#cook"; mes "[The kid with a cat]"; mes "Nyahahaha,"; mes "Nyahahaha~"; @@ -153,7 +153,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ break; case 2: cutin "nyuang_1",2; - donpcevent "Child with Cat#cook::OnWhat"; + emotion e_what,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "...Nya?"; mes "...Meow?"; @@ -168,7 +168,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ break; case 3: cutin "nyuang_2",2; - donpcevent "Child with Cat#cook::OnPif"; + emotion e_pif,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "Nyahahaha,"; mes "Nyahahaha~"; @@ -828,7 +828,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ next; switch(select("What's your name, kid?:Do you want to eat something?:Here, kitty~:Get out!")) { case 1: - donpcevent "Child with Cat#cook::OnOkay"; + emotion e_ok,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "Nyaaa~"; mes "nyaaa~"; @@ -842,7 +842,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ goto L_End; case 2: cutin "nyuang_2",2; - donpcevent "Child with Cat#cook::OnPif"; + emotion e_pif,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "Nyaaaa~"; mes "(Purrrrrr~)"; @@ -858,7 +858,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ goto L_End; case 3: cutin "nyuang_3",2; - donpcevent "Child with Cat#cook::OnHeh"; + emotion e_heh,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "Nyahahaha~"; mes "Nyhhahaha~"; @@ -870,13 +870,13 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ mes "...Then I don't need you to be here."; goto L_End; case 4: - donpcevent "Child with Cat#cook::OnDot"; + emotion e_dots,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "..."; mes "(Meow?)"; next; cutin "nyuang_4",2; - donpcevent "Child with Cat#cook::OnAngry"; + emotion e_an,0,"Child with Cat#cook"; specialeffect2 EF_HIT2; percentheal -10,0; mes "[Child with Cat]"; @@ -913,14 +913,14 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ mes "or shed on any of the food!"; next; cutin "nyuang_4",2; - donpcevent "Child with Cat#cook::OnAngry"; + emotion e_an,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "Grrrrrrr!"; mes "RRRRreow!"; next; donpcevent "Wickebine#cook::OnEnable"; emotion e_omg; - donpcevent "Child with Cat#cook::OnDelight"; + emotion e_ho,0,"Child with Cat#cook"; next; cutin "job_black_hucke01",1; mes "[Wickebine]"; @@ -948,7 +948,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ mes "bothering Charles, Nyuyang?"; next; cutin "nyuang_3",2; - donpcevent "Child with Cat#cook::OnHeh"; + emotion e_heh,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "Nyuuuunyuuu~"; mes "nyuuuunyuuu~"; @@ -984,7 +984,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ mes "So do not worry, Madam~"; next; cutin "job_black_hucke01",1; - donpcevent "Wickebine#cook::OnWhat"; + emotion e_what,0,"Wickebine#cook"; mes "[Wickebine]"; mes "Are you sure, Charles?"; mes "I know how serious you"; @@ -1001,18 +1001,18 @@ prt_castle,43,30,3 script Charles Orleans#cook 878,{ mes "Well then, take care~"; next; cutin "nyuang_3",2; - donpcevent "Child with Cat#cook::OnHeh"; + emotion e_heh,0,"Child with Cat#cook"; mes "[Child with Cat]"; mes "Nyahahaha~"; mes "Nyahahaha~"; mes "(Meow, meow~)"; next; cutin "job_black_hucke02",255; - donpcevent "Wickebine#cook::OnDelight"; + emotion e_ho,0,"Wickebine#cook"; donpcevent "Wickebine#cook::OnDisable"; next; emotion e_dots; - donpcevent "Child with Cat#cook::OnDot"; + emotion e_dots,0,"Child with Cat#cook"; mes "[Charles Orleans]"; mes "......"; next; @@ -2191,35 +2191,6 @@ prt_castle,45,28,3 script Child with Cat#cook 877,{ close2; cutin "nyuang_1",255; end; - -OnDelight: - emotion e_ho; - end; - -OnWhat: - emotion e_what; - end; - -OnPif: - emotion e_pif; - end; - -OnOkay: - emotion e_ok; - end; - -OnHeh: - emotion e_heh; - end; - -OnDot: - emotion e_dots; - end; - -OnAngry: - emotion e_an; - end; - } prt_castle,44,30,5 script Wickebine#cook 725,{ @@ -2237,15 +2208,6 @@ OnEnable: OnDisable: disablenpc "Wickebine#cook"; end; - -OnDelight: - emotion e_ho; - end; - -OnWhat: - emotion e_what; - end; - } payon,209,127,3 script Servant 88,{ -- cgit v1.2.3-60-g2f50