summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-09-20 07:20:19 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-09-20 07:20:19 +0000
commitb793bb7e9eb87a9dddfb1f78c3ae0d795bdb14f8 (patch)
treeef1d9f4f3e3b04bda60bd68fc25178f785ed8284 /npc
parent0d5c334c08846eedabacdabb4d4de04c90ec6b76 (diff)
downloadhercules-b793bb7e9eb87a9dddfb1f78c3ae0d795bdb14f8.tar.gz
hercules-b793bb7e9eb87a9dddfb1f78c3ae0d795bdb14f8.tar.bz2
hercules-b793bb7e9eb87a9dddfb1f78c3ae0d795bdb14f8.tar.xz
hercules-b793bb7e9eb87a9dddfb1f78c3ae0d795bdb14f8.zip
- Updated strnpcinfo documentation, following r14929.
- Fixed some script typos. (bugreport:5047, bugreport:5049, bugreport:5056) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14960 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/jobs/2-2/sage.txt3
-rw-r--r--npc/quests/first_class/tu_archer.txt2
-rw-r--r--npc/quests/quests_hugel.txt18
3 files changed, 12 insertions, 11 deletions
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 6320e60d9..e1c601fe9 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -2680,7 +2680,8 @@ OnInit:
OnEnable:
enablenpc "Arena#2";
- disablenpc "Arena#1::OnReset";
+ donpcevent "Arena#1::OnReset";
+ disablenpc "Arena#1";
set .MyMobs,24;
monster "job_sage",111,102,"Numerical Value",1063,1,"Arena#2::OnMyMobDead";
monster "job_sage",111,102,"Physics",1063,1,"Arena#2::OnMyMobDead";
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index e443f99c1..bb1a9f8c6 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -1904,7 +1904,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_hugel.txt b/npc/quests/quests_hugel.txt
index 617623db2..13be33cc3 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;