summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/cities/amatsu.txt4
-rw-r--r--npc/cities/ayothaya.txt4
-rw-r--r--npc/cities/brasilis.txt4
-rw-r--r--npc/cities/gonryun.txt4
-rw-r--r--npc/cities/louyang.txt4
-rw-r--r--npc/cities/moscovia.txt4
-rw-r--r--npc/guides/guides_alberta.txt12
-rw-r--r--npc/jobs/3-1/archbishop.txt11
-rw-r--r--npc/quests/quests_alberta.txt6
-rw-r--r--npc/quests/skills/merchant_skills.txt2
10 files changed, 22 insertions, 33 deletions
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 98c220a5f..08ec8748a 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -16,7 +16,7 @@
// Amatsu Transportation
//=====================================================
-alberta,245,93,3 script Sea Captain#ama1 709,{
+alberta,246,74,3 script Sea Captain#ama1 709,{
mes "[Walter Moers]";
mes "Hey, there.";
mes "Have you ever heard that there";
@@ -136,7 +136,7 @@ amatsu,194,79,5 script Sea Captain#ama2 709,{
mes "so many things to talk about,";
mes "right? All aboard now.";
close2;
- warp "alberta",243,91;
+ warp "alberta",244,72;
end;
}
mes "[Walter Moers]";
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index cf5fb8304..19a9df081 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -16,7 +16,7 @@
// Ayothaya Transportation NPC
//============================================================
-alberta,247,42,3 script Aibakthing#ayo 843,{
+alberta,246,29,3 script Aibakthing#ayo 843,{
mes "[Aibakthing]";
mes "Hoo! Hah! Hoo! Hah!";
mes "Let me take you away to";
@@ -91,7 +91,7 @@ ayothaya,152,68,1 script Aibakthing#ayo2 843,{
mes "[Aibakthing]";
mes "You will be welcome to come back whenever you please. I hope that we will see each other again sometime soon. Thank you~";
close2;
- warp "alberta",235,45;
+ warp "alberta",238,22;
end;
}
mes "[Aibakthing]";
diff --git a/npc/cities/brasilis.txt b/npc/cities/brasilis.txt
index 125fd2dd4..d005a72f3 100644
--- a/npc/cities/brasilis.txt
+++ b/npc/cities/brasilis.txt
@@ -15,7 +15,7 @@
//= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
//============================================================
-alberta,247,115,3 script Crewman#bra2 100,{
+alberta,246,82,3 script Crewman#bra2 100,{
mes "[Crewman]";
mes "Hey, have you heard of a place called Brasilis?";
mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";
@@ -55,7 +55,7 @@ brasilis,316,57,3 script Crewman#bra1 100,{
mes "[Crewman]";
mes "I sure do miss home.";
close2;
- warp "alberta",244,115;
+ warp "alberta",243,82;
end;
case 2:
mes "[Crewman]";
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 95b76f437..314513b75 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -16,7 +16,7 @@
// Kunlun Transportation
//============================================================
-alberta,245,69,3 script Kunlun Envoy#gon 776,{
+alberta,246,62,3 script Kunlun Envoy#gon 776,{
mes "[Wa Bai Hu]";
mes "Good day~";
mes "Let me invite you all";
@@ -143,7 +143,7 @@ gon_fild01,255,79,7 script Kunlun Envoy#gon2 776,{
mes "back. Now, let me guide you";
mes "back to Alberta.";
close2;
- warp "alberta",243,67;
+ warp "alberta",244,60;
end;
}
mes "[Wa Bai Hu]";
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index 16af1cb92..a445310b8 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -20,7 +20,7 @@
// Louyang Transportaion
//============================================================
-alberta,245,45,3 script Girl#0lou 815,{
+alberta,246,40,3 script Girl#0lou 815,{
mes "[Girl]";
mes "La la la la~";
mes "I feel so good today~";
@@ -108,7 +108,7 @@ lou_fild01,190,100,7 script Girl#1lou 815,{
mes "see you again!";
mes "Bye bye!";
close2;
- warp "alberta",235,45;
+ warp "alberta",236,40;
end;
}
mes "[Girl]";
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index bfc0cc633..bb88d641f 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -15,7 +15,7 @@
// Moscovia Transportation
//============================================================
-alberta,245,66,4 script Moscovia P.R. Officer#1 960,{
+alberta,246,51,4 script Moscovia P.R. Officer#1 960,{
mes "[Moscovia P.R. Officer]";
mes "Moscovia! Do you know Moscovia?";
mes "the paradise spreading on the endless seas...";
@@ -108,7 +108,7 @@ moscovia,166,53,4 script Moscovia P.R. Officer#2 960,{
mes "Please come and visit soon.";
mes "Ok then, Let's get going.";
close2;
- warp "alberta",243,67;
+ warp "alberta",244,52;
end;
}
diff --git a/npc/guides/guides_alberta.txt b/npc/guides/guides_alberta.txt
index 79eae5cd9..7420fbf00 100644
--- a/npc/guides/guides_alberta.txt
+++ b/npc/guides/guides_alberta.txt
@@ -161,7 +161,7 @@ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{
mes "if you'd like to visit ^800080Brasilis^000000,";
mes "the City of Passion.";
mes "Would you like to check any other locations?";
- viewpoint 1,246,115,14,0xDA70D6;
+ viewpoint 1,246,82,14,0xDA70D6;
next;
break;
case 3:
@@ -171,7 +171,7 @@ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{
mes "if you'd like to enjoy viewing cherry blossoms";
mes "in ^0000FFAmatsu^000000.";
mes "Would you like to check any other locations?";
- viewpoint 1,246,115,15,0x0A82FF;
+ viewpoint 1,246,74,15,0x0A82FF;
next;
break;
case 4:
@@ -180,7 +180,7 @@ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{
mes "^B9062FKunlun Envoy^000000 at the Alberta Port";
mes "if you'd like to experience the exotic atmosphere of ^B9062FKunlun^000000.";
mes "Would you like to check any other locations?";
- viewpoint 1,245,69,16,0xFF0000;
+ viewpoint 1,246,62,16,0xFF0000;
next;
break;
case 5:
@@ -191,7 +191,7 @@ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{
mes "^FF5400Moscovia^000000,";
mes "the Eden on the ocean.";
mes "Would you like to check any other locations?";
- viewpoint 1,245,66,17,0xFFB400;
+ viewpoint 1,246,51,17,0xFFB400;
next;
break;
case 6:
@@ -201,7 +201,7 @@ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{
mes "if you'd like to move to the historical city,";
mes "^7F3300Louyang^000000.";
mes "Would you like to check any other locations?";
- viewpoint 1,245,45,18,0xD2691E;
+ viewpoint 1,246,40,18,0xD2691E;
next;
break;
case 7:
@@ -212,7 +212,7 @@ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{
mes "^800080Ayothaya^000000,";
mes "the religious city.";
mes "Would you like to check any other locations?";
- viewpoint 1,245,42,19,0xDA70D6;
+ viewpoint 1,246,29,19,0xDA70D6;
next;
break;
case 8:
diff --git a/npc/jobs/3-1/archbishop.txt b/npc/jobs/3-1/archbishop.txt
index 439b3f779..6d46403b2 100644
--- a/npc/jobs/3-1/archbishop.txt
+++ b/npc/jobs/3-1/archbishop.txt
@@ -1718,17 +1718,6 @@ OnTimer60000:
stopnpctimer;
}
end;
-
-OnTimer600000:
- mapannounce "job3_arch02","Demons cry: Too boring, can no longer imagine what will happen! Friends, we went to lessons learned that could fool arrogant guy, OK?",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0 //Custom translation;
- end;
-
-OnTimer605000:
- mapannounce "job3_arch02","Valkyrie's voice: No! This can not be. I will send you back soon!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
- mapwarp "job3_arch02","job3_arch01",29,29;
- donpcevent "Valkyrie#arch::OnBc";
- stopnpctimer;
- end;
}
job3_arch02,390,388,1 script #arch_2_start 844,{
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 2a748c14d..d8d23b2ac 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -1114,7 +1114,7 @@ alberta_in,23,104,4 script Grandpa Turtle#tur 120,{
}
}
-alberta,247,122,4 script Sailor#tur 709,{
+alberta,244,118,4 script Sailor#tur 709,{
if (TURTLE || (MISC_QUEST & 65536)) {
mes "[Gotanblue]";
mes "Heh...";
@@ -1248,12 +1248,12 @@ tur_dun01,165,29,4 script Sailor#tur2 709,{
mes "I certainly hope you've found what you were looking for. Alright, I guess there's always a time for an adventurer to return home...";
next;
mes "^3355FF* Choo Choo *^000000";
- warp "alberta",241,115;
+ warp "alberta",238,112;
}
close;
}
-alberta,248,89,4 script Turtle Island Scholar 121,{
+alberta,246,114,4 script Turtle Island Scholar 121,{
mes "[Jornadan Niliria]";
mes "Every single place";
mes "has its own unique";
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 55239bbe3..e85d19aed 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -331,7 +331,7 @@ alberta,119,221,6 script Charlron 107,{
close;
}
-alberta,232,106,6 script Gershaun 57,{
+alberta,232,103,6 script Gershaun 57,{
if (BaseJob == Job_Merchant) {
if (getskilllv("MC_CARTREVOLUTION") == 1) {
mes "[Gershaun]";
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-01 11:08:11 +0000