summaryrefslogtreecommitdiff
path: root/npc/quests/quests_nameless.txt
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-12-26 06:58:19 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-12-26 06:58:19 +0000
commit9f1d3bfdee9721bd564a5d888e01b17fc545c919 (patch)
treeb6e2d1ff5f3982cab7b2c8679f85340fb0c76955 /npc/quests/quests_nameless.txt
parentd85724ac4159d28c8269b52afdc6fa560326c2ec (diff)
downloadhercules-9f1d3bfdee9721bd564a5d888e01b17fc545c919.tar.gz
hercules-9f1d3bfdee9721bd564a5d888e01b17fc545c919.tar.bz2
hercules-9f1d3bfdee9721bd564a5d888e01b17fc545c919.tar.xz
hercules-9f1d3bfdee9721bd564a5d888e01b17fc545c919.zip
Happy boxing day, eAthena! Here have a massive update.
* Implemented the first round of episode 12.1 change which include: - Many Morroc NPCs have been moved to Morroc Ruins. - The addition of new of NPCs to the ruins of Morroc. - Several warp points leading around Morroc altered. - The implementation of the continental Guard Quest. - The removal of the 'Dandelion's Request" quest. - This update contains several changes, as Morroc and several fields no longer exist in one sense of the word. AS such, many NPCs have been moved, there may be quests that no longer function because of NPCs on inaccessable maps. * Commented out maps no longer accessable with 12.1 in maps_athena.conf * Updated mob_skill_db episode 12.1 skills to official. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13415 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/quests/quests_nameless.txt')
-rw-r--r--npc/quests/quests_nameless.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 30de9076e..eeb41e4d5 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -2124,7 +2124,7 @@ ra_temple,168,54,3 script Sippie#ss 917,{
// Peace to the Arunafeltz
//============================================================
-morocc,167,106,3 script Foreign Merchant#aru1 880,5,5,{
+moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
if (aru_vol == 27) {
if (aru_em == 0) {
emotion e_dots;
@@ -2311,7 +2311,7 @@ OnTouch:
end;
}
-morocc,159,142,0 script #ForeignMerchant1 -1,3,3,{
+moc_ruins,86,149,0 script #ForeignMerchant1 -1,3,3,{
OnTouch:
if (aru_em == 4) {
set aru_em,5;
@@ -2319,7 +2319,7 @@ OnTouch:
end;
}
-morocc,147,151,0 script #ForeignMerchant2 -1,3,3,{
+moc_ruins,88,136,0 script #ForeignMerchant2 -1,3,3,{
OnTouch:
if (aru_em == 1) {
set aru_em,2;
@@ -2337,7 +2337,7 @@ OnTouch:
end;
}
-morocc,160,160,0 script #ForeignMerchant3 -1,3,3,{
+moc_ruins,106,133,0 script #ForeignMerchant3 -1,3,3,{
OnTouch:
if (aru_em == 2) {
set aru_em,3;
@@ -2345,7 +2345,7 @@ OnTouch:
end;
}
-morocc,151,5,0 script #ForeignMerchant4 -1,3,3,{
+moc_ruins,115,147,0 script #ForeignMerchant4 -1,3,3,{
OnTouch:
if (aru_em == 3) {
set aru_em,4;
@@ -2353,7 +2353,7 @@ OnTouch:
end;
}
-morocc,140,160,7 script Foreign Merchant#aru2 929,{
+moc_ruins,101,133,7 script Foreign Merchant#aru2 929,{
if ((aru_em > 1) && (aru_em < 7)) {
mes "["+ strcharinfo(0) +"]";
mes "Excuse me, but I heard";
@@ -8102,6 +8102,7 @@ OnTouch:
end;
}
+//Incorrect position.
moc_ruins,78,167,3 script Suspicious Man#2 99,2,2,{
if ((zdan_edq == 9) && ($@zdan == 0)) {
set $@zdan,1;