Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed some emotions triggering on the wrong npc. (bugreport:4303)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14346 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2010-06-18 05:05:33 +00:00
parent 68f73aad02
commit 7dcad16f3c
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
npc/cities/lighthalzen.txt
View File

@ -235,7 +235,7 @@ lighthalzen,66,94,3 script Elmer Keays#li_03 866,{
mes "precious sight to these"; mes "precious sight to these";
mes "old eyes, my dear. I'm"; mes "old eyes, my dear. I'm";
mes "really lucky to be with you."; mes "really lucky to be with you.";
emotion e_kis; emotion e_kis,0,"Margie Keays#li_02";
emotion e_kis2; emotion e_kis2;
close; close;
} }
@ -948,13 +948,13 @@ lighthalzen,123,212,4 script Merpi#zen2 700,{
} }
} }
lighthalzen,296,239,3 script Berru#lhz_01::childlhz 706,{ lighthalzen,296,239,3 script Berru#lhz_01 706,{
switch(rand(1,3)) { switch(rand(1,3)) {
case 1: case 1:
mes "[Berru]"; mes "[Berru]";
mes "Daddy...! Waaaaah~!"; mes "Daddy...! Waaaaah~!";
mes "I wanna see my Daddy!"; mes "I wanna see my Daddy!";
emotion e_sob; emotion e_sob,0,"Berru#lhz_01";
next; next;
mes "[Pilia]"; mes "[Pilia]";
mes "Berru, I don't "; mes "Berru, I don't ";
@ -968,7 +968,7 @@ lighthalzen,296,239,3 script Berru#lhz_01::childlhz 706,{
mes "home! He said he'll"; mes "home! He said he'll";
mes "bring us candy tonight!"; mes "bring us candy tonight!";
mes "You go sleep first, Pilia!"; mes "You go sleep first, Pilia!";
emotion e_ag; emotion e_ag,0,"Berru#lhz_01";
next; next;
mes "[Pilia]"; mes "[Pilia]";
mes "^333333*Sigh...*^000000"; mes "^333333*Sigh...*^000000";
@ -976,7 +976,7 @@ lighthalzen,296,239,3 script Berru#lhz_01::childlhz 706,{
mes "He said he found a"; mes "He said he found a";
mes "good job, but we haven't"; mes "good job, but we haven't";
mes "heard from him since then..."; mes "heard from him since then...";
emotion e_dots; emotion e_dots,0,"Pilia#lhz_01";
close; close;
case 2: case 2:
mes "[Pilia]"; mes "[Pilia]";
@ -984,7 +984,7 @@ lighthalzen,296,239,3 script Berru#lhz_01::childlhz 706,{
mes "so long? I hope Daddy"; mes "so long? I hope Daddy";
mes "comes back home soon."; mes "comes back home soon.";
mes "Come on, Berru, don't cry."; mes "Come on, Berru, don't cry.";
emotion e_dots; emotion e_dots,0,"Pilia#lhz_01";
next; next;
mes "[Berru]"; mes "[Berru]";
mes "^333333*Sob...*^000000"; mes "^333333*Sob...*^000000";
@ -1002,7 +1002,7 @@ lighthalzen,296,239,3 script Berru#lhz_01::childlhz 706,{
mes "but my little brother"; mes "but my little brother";
mes "just won't stop crying."; mes "just won't stop crying.";
mes "I'm sorry if we're loud..."; mes "I'm sorry if we're loud...";
emotion e_what; emotion e_what,0,"Pilia#lhz_01";
next; next;
mes "[Pilia]"; mes "[Pilia]";
mes "Our daddy goes to work"; mes "Our daddy goes to work";
@ -1017,12 +1017,12 @@ lighthalzen,296,239,3 script Berru#lhz_01::childlhz 706,{
mes "misses him a lot. I don't"; mes "misses him a lot. I don't";
mes "know how to make him"; mes "know how to make him";
mes "stop crying! What do I do?"; mes "stop crying! What do I do?";
emotion e_swt2; emotion e_swt2,0,"Pilia#lhz_01";
close; close;
} }
} }
lighthalzen,297,239,3 duplicate(childlhz) Pilia#lhz_01 818 lighthalzen,297,239,3 duplicate(Berru#lhz_01) Pilia#lhz_01 818
lighthalzen,312,233,3 script Beggar#lhz_02 777,3,1,{ lighthalzen,312,233,3 script Beggar#lhz_02 777,3,1,{
end; end;
@ -2480,7 +2480,7 @@ lighthalzen,162,304,7 script Rekenber Guard Drew#li 868,{
mes "even got the glasses chick"; mes "even got the glasses chick";
mes "to wear 'em too? That's the"; mes "to wear 'em too? That's the";
mes "best news I've heard all day!"; mes "best news I've heard all day!";
emotion e_omg; emotion e_omg,0,"Rekenber Guard Tan#li";
next; next;
mes "[Rekenber Guard Drew]"; mes "[Rekenber Guard Drew]";
mes "Okay man, you know these"; mes "Okay man, you know these";

16
npc/quests/quests_lighthalzen.txt
View File

@ -3999,7 +3999,7 @@ OnTouch:
mes "you've finally agreed"; mes "you've finally agreed";
mes "to join us. Welcome!"; mes "to join us. Welcome!";
next; next;
donpcevent "#Varmunt::OnEmote"; emotion e_swt;
mes "[Varmunt]"; mes "[Varmunt]";
mes "Well, I don't know if I agree"; mes "Well, I don't know if I agree";
mes "with this company's policies,"; mes "with this company's policies,";
@ -4007,7 +4007,7 @@ OnTouch:
mes "seems to be an opportunity that"; mes "seems to be an opportunity that";
mes "comes once in a lifetime, so..."; mes "comes once in a lifetime, so...";
next; next;
donpcevent "#Rekenber::OnEmote"; emotion e_ok,0,"#Rekenber";
mes "[??]"; mes "[??]";
mes "To be honest, this project"; mes "To be honest, this project";
mes "can only be a success with"; mes "can only be a success with";
@ -4127,10 +4127,6 @@ OnTouch:
} }
warp "lhz_in01",206,129; warp "lhz_in01",206,129;
end; end;
OnEmote:
emotion e_swt;
end;
} }
lhz_que01,29,24,3 script #Rekenber 754,{ lhz_que01,29,24,3 script #Rekenber 754,{
@ -4144,7 +4140,7 @@ OnTouch:
mes "you've finally agreed"; mes "you've finally agreed";
mes "to join us. Welcome!"; mes "to join us. Welcome!";
next; next;
donpcevent "#Varmunt::OnEmote"; emotion e_swt,0,"#Varmunt";
mes "[Varmunt]"; mes "[Varmunt]";
mes "Well, I don't know if I agree"; mes "Well, I don't know if I agree";
mes "with this company's policies,"; mes "with this company's policies,";
@ -4152,7 +4148,7 @@ OnTouch:
mes "seems to be an opportunity that"; mes "seems to be an opportunity that";
mes "comes once in a lifetime, so..."; mes "comes once in a lifetime, so...";
next; next;
donpcevent "#Rekenber::OnEmote"; emotion e_ok;
mes "[??]"; mes "[??]";
mes "To be honest, this project"; mes "To be honest, this project";
mes "can only be a success with"; mes "can only be a success with";
@ -4272,10 +4268,6 @@ OnTouch:
} }
warp "lhz_in01",206,129; warp "lhz_in01",206,129;
end; end;
OnEmote:
emotion e_ok;
end;
} }
lhz_in01,282,166,0 script #kiz10 -1,3,3,{ lhz_in01,282,166,0 script #kiz10 -1,3,3,{