summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorkenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-12 19:50:51 +0000
committerkenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-12 19:50:51 +0000
commit2da0b5fe1ca4605530bb7de7d2d58cdbca2a18bf (patch)
tree16d3b82bca5c78dcf5732f69f64b882f570a0d81 /npc
parent4c208c5aa6c05a338bdd531c07cc2923f5367e4b (diff)
downloadhercules-2da0b5fe1ca4605530bb7de7d2d58cdbca2a18bf.tar.gz
hercules-2da0b5fe1ca4605530bb7de7d2d58cdbca2a18bf.tar.bz2
hercules-2da0b5fe1ca4605530bb7de7d2d58cdbca2a18bf.tar.xz
hercules-2da0b5fe1ca4605530bb7de7d2d58cdbca2a18bf.zip
Fixed Garms iRO name. (bugreport:5421)
Fixed some create_arrow_db.txt comments. (Follow up r15672.) Fixed Sura job change quest. (bugreport:5431) Corrected a NPC location in quests_veins.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15679 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/jobs/3-2/sura.txt20
-rw-r--r--npc/quests/quests_veins.txt2
2 files changed, 11 insertions, 11 deletions
diff --git a/npc/jobs/3-2/sura.txt b/npc/jobs/3-2/sura.txt
index cb794a3a4..0df0b0d40 100644
--- a/npc/jobs/3-2/sura.txt
+++ b/npc/jobs/3-2/sura.txt
@@ -707,7 +707,7 @@ yuno_fild07,254,176,7 script Buddy#job_shu 483,{
next;
mes "[Buddy]";
mes "This way...";
- close;
+ close2;
warp "sword_1-1",215,244;
end;
}
@@ -767,7 +767,7 @@ OnEnable:
end;
OnReset:
- killmonster "sword2-1","Buddy#Sura_Salon::OnMyMobDead";
+ killmonster "sword_2-1","Buddy#Sura_Salon::OnMyMobDead";
end;
OnDisable:
@@ -785,15 +785,15 @@ OnMyMobDead:
end;
OnTimer3000:
- mapannounce "sword2-1","The master is now in the middle of training, and you need to wait in the living room around 5 minutes.",bc_map;
+ mapannounce "sword_2-1","The master is now in the middle of training, and you need to wait in the living room around 5 minutes.",bc_map;
end;
OnTimer4000:
- mapannounce "sword2-1","Ah! You may have hallucinations in the living room, so please be careful.",bc_map;
+ mapannounce "sword_2-1","Ah! You may have hallucinations in the living room, so please be careful.",bc_map;
end;
OnTimer5000:
- mapannounce "sword2-1","This is the policy of the master, so please don't feel unpleasant.",bc_map;
+ mapannounce "sword_2-1","This is the policy of the master, so please don't feel unpleasant.",bc_map;
end;
OnTimer33000:
@@ -819,7 +819,7 @@ OnTimer93000:
end;
OnTimer153000:
- mapannounce "sword2-1","If you're bored, may I bring you some magazines?",bc_map;
+ mapannounce "sword_2-1","If you're bored, may I bring you some magazines?",bc_map;
monster "sword_2-1",219,210,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
monster "sword_2-1",219,210,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
monster "sword_2-1",228,209,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
@@ -852,7 +852,7 @@ OnTimer273000:
end;
OnTimer300000:
- mapannounce "sword2-1","The master has arrived. Soon I'll show you into the master's room.",bc_map;
+ mapannounce "sword_2-1","The master has arrived. Soon I'll show you into the master's room.",bc_map;
end;
OnTimer303000:
@@ -864,16 +864,16 @@ OnTimer305000:
end;
OnTimer315000:
- mapannounce "sword2-1","Come on here.",bc_map;
+ mapannounce "sword_2-1","Come on here.",bc_map;
donpcevent "Buddy#job_shuaneh::OnDisable";
donpcevent "Sura_garajjom::OnEnable";
end;
OnTimer320000:
- mapannounce "sword2-1","I guess you're not ready to meet the master yet..",bc_map;
+ mapannounce "sword_2-1","I guess you're not ready to meet the master yet..",bc_map;
donpcevent "Sura_garajjom::OnDisable";
donpcevent "Drawing Room::OnEnable";
- mapwarp "sword2-1","yuno_fild07",255,178;
+ mapwarp "sword_2-1","yuno_fild07",255,178;
stopnpctimer;
end;
}
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 49d5a6818..c1044f877 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -7229,7 +7229,7 @@ thor_camp,98,213,5 script Thor Volcano Soldier#vo8 939,{
close;
}
-thor_camp,98,213,5 script Thor Volcano Soldier#vo9 939,{
+thor_camp,98,209,5 script Thor Volcano Soldier#vo9 939,{
mes "[Soldier]";
mes "Why am I always";
mes "stationed here?!";