From 033373a5a75599f8607107cb28b97cc6a653b0b5 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Fri, 7 Oct 2011 21:35:12 +0000 Subject: * Merged changes from trunk [14895:14966/trunk]. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14967 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/first_class/tu_archer.txt | 2 +- npc/quests/quests_amatsu.txt | 2 +- npc/quests/quests_brasilis.txt | 10 +++++----- npc/quests/quests_hugel.txt | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'npc/quests') diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index 4d2f97f07..5243cfc86 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -1876,7 +1876,7 @@ prt_castle,76,165,6 script Minister#tu 55,{ //=================================================Range NPC==================================================== prt_castle,94,150,4 script #sound_tu 139,10,10,{ OnTouch_: - if(tu_archer02 != 6) { + if(tu_archer02 == 6) { mes "[Minister]"; mes "Contact the"; mes "Prontera Church."; diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index aa7251446..a3d3a8fbf 100644 --- a/npc/quests/quests_amatsu.txt +++ b/npc/quests/quests_amatsu.txt @@ -367,7 +367,7 @@ OnInit: OnStartArena: disablenpc "Coach#ama"; - disablenpc "Am Mut::Onreset"; + donpcevent "Am Mut#ama::Onreset"; donpcevent "Dokebi#ez::Onreset"; donpcevent "Dokebi#hd::Onreset"; enablenpc "Grandma#ama1"; diff --git a/npc/quests/quests_brasilis.txt b/npc/quests/quests_brasilis.txt index 5aec32d49..417ac78d3 100644 --- a/npc/quests/quests_brasilis.txt +++ b/npc/quests/quests_brasilis.txt @@ -51,7 +51,7 @@ brasilis,297,307,5 script Angelo#br 50,{ mes "Oh, thank you. You found all of 3 puppies."; mes "Thanks a lot."; mes "I hope this is useful to you. hoho."; - getexp 50000,0; + getexp 500000,0; erasequest 9031; setquest 9032; set .@bosang,rand(1,10); @@ -1230,7 +1230,7 @@ brasilis,187,162,5 script Candy Maker 476,{ set brazil_gua,11; completequest 2200; getitem 12414,1; //Guarana_Candy - getexp 70000,10000; + getexp 700000,100000; close; } else if (brazil_gua == 11) { @@ -1923,7 +1923,7 @@ brasilis,203,286,3 script Botanist Karmen#bra 893,{ mes "The water lily must truly be a lucky flower. hahaha"; set brazil_regia,10; completequest 2207; - getexp 50000,10000; + getexp 500000,100000; close; } else { @@ -2669,7 +2669,7 @@ bra_dun02,67,205,5 script Recluse#bra 475,3,3,{ end; OnTouchNPC: - warp "bra_dun02",67,215; + unitwarp 0,"this",67,215; end; } @@ -4246,7 +4246,7 @@ bra_in01,206,188,1 script Open Manhole#todunbra 844,{ set brazil_ghost,8; //completequest 2208; completequest 60355; - getexp 90000,0; + getexp 900000,0; disablenpc "Ghost#bra_end"; close; } diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index f156de7bd..fb57b134e 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -3806,7 +3806,7 @@ hu_fild06,168,359,3 script Moks Mushrooms#Mush1 111,{ if(hg_tre > 9 && hg_tre < 15) { - mes "- You found mushrooms that is as big as your palm. -"; + mes "- You found mushrooms that are as big as your palm. -"; next; switch( select( "Gather them.","Pass." ) ) { @@ -3843,7 +3843,7 @@ hu_fild06,168,359,3 script Moks Mushrooms#Mush1 111,{ else if(hg_tre == 15) mes "Collected Moks Mushroom Solution: 5ea "; initnpctimer; - disablenpc "Moks Mushroom#Mush1"; + disablenpc "Moks Mushrooms#Mush1"; close; break; case 2: @@ -3860,7 +3860,7 @@ hu_fild06,168,359,3 script Moks Mushrooms#Mush1 111,{ } OnTimer20000: - enablenpc "Moks Mushroom#Mush1"; + enablenpc "Moks Mushrooms#Mush1"; stopnpctimer; end; @@ -3870,7 +3870,7 @@ hu_fild06,194,341,3 script Moks Mushrooms#Mush2 111,{ if(hg_tre > 9 && hg_tre < 15) { - mes "- You found mushrooms that is as big as your palm. -"; + mes "- You found mushrooms that are as big as your palm. -"; next; switch( select( "Gather them.","Pass." ) ) { @@ -3907,7 +3907,7 @@ hu_fild06,194,341,3 script Moks Mushrooms#Mush2 111,{ else if(hg_tre == 15) mes "Collected Moks Mushroom Solution: 5ea "; initnpctimer; - disablenpc "Moks Mushroom#Mush2"; + disablenpc "Moks Mushrooms#Mush2"; close; break; case 2: @@ -3924,7 +3924,7 @@ hu_fild06,194,341,3 script Moks Mushrooms#Mush2 111,{ } OnTimer20000: - enablenpc "Moks Mushroom#Mush2"; + enablenpc "Moks Mushrooms#Mush2"; stopnpctimer; end; @@ -3934,7 +3934,7 @@ hu_fild06,198,339,3 script Moks Mushrooms#Mush3 111,{ if(hg_tre > 9 && hg_tre < 15) { - mes "- You found mushrooms that is as big as your palm. -"; + mes "- You found mushrooms that are as big as your palm. -"; next; switch( select( "Gather them.","Pass." ) ) { @@ -3971,7 +3971,7 @@ hu_fild06,198,339,3 script Moks Mushrooms#Mush3 111,{ else if(hg_tre == 15) mes "Collected Moks Mushroom Solution: 5ea "; initnpctimer; - disablenpc "Moks Mushroom#Mush3"; + disablenpc "Moks Mushrooms#Mush3"; close; break; case 2: @@ -3988,7 +3988,7 @@ hu_fild06,198,339,3 script Moks Mushrooms#Mush3 111,{ } OnTimer20000: - enablenpc "Moks Mushroom#Mush3"; + enablenpc "Moks Mushrooms#Mush3"; stopnpctimer; end; -- cgit v1.2.3-60-g2f50