summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/amatsu.txt14
-rw-r--r--npc/cities/ayothaya.txt10
-rw-r--r--npc/cities/gonryun.txt10
-rw-r--r--npc/cities/louyang.txt14
-rw-r--r--npc/cities/moscovia.txt10
5 files changed, 39 insertions, 19 deletions
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 08ec8748a..1458815c7 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -1,9 +1,9 @@
//===== rAthena Script =======================================
-//= Amatsu Script
+//= Amatsu Town
//===== By: ==================================================
-//= Some people & rAthena Dev Team
+//= rAthena Dev Team
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -12,11 +12,12 @@
//===== Additional Comments: =================================
//= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
//= Moved elemental stone trader to 'elemental_trader.txt'
+//= 1.4 Moved Alberta NPC to pre-re/re paths. [Euphy]
//============================================================
// Amatsu Transportation
//=====================================================
-alberta,246,74,3 script Sea Captain#ama1 709,{
+- script ::Sea_Captain_amatsu -1,{
mes "[Walter Moers]";
mes "Hey, there.";
mes "Have you ever heard that there";
@@ -136,7 +137,10 @@ amatsu,194,79,5 script Sea Captain#ama2 709,{
mes "so many things to talk about,";
mes "right? All aboard now.";
close2;
- warp "alberta",244,72;
+ if (checkre(0))
+ warp "alberta",244,72;
+ else
+ warp "alberta",243,91;
end;
}
mes "[Walter Moers]";
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 19a9df081..abba76866 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -12,11 +12,12 @@
//===== Additional Comments: =================================
//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= 1.7 Fixed character's anme bugs [Lupus]
+//= 1.8 Moved Alberta NPC to pre-re/re paths. [Euphy]
//============================================================
// Ayothaya Transportation NPC
//============================================================
-alberta,246,29,3 script Aibakthing#ayo 843,{
+- script ::Aibakthing_ayothaya -1,{
mes "[Aibakthing]";
mes "Hoo! Hah! Hoo! Hah!";
mes "Let me take you away to";
@@ -91,7 +92,10 @@ 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",238,22;
+ if (checkre(0))
+ warp "alberta",238,22;
+ else
+ warp "alberta",235,45;
end;
}
mes "[Aibakthing]";
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 937fe0413..b3e6b7dda 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= x[tsk], KarLaeda
//===== Current Version: =====================================
-//= 1.4
+//= 1.6
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -12,11 +12,12 @@
//===== Additional Comments: =================================
//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= Moved Lost Knife mini-quest to quest file.
+//= 1.6 Moved Alberta NPC to pre-re/re paths. [Euphy]
//============================================================
// Kunlun Transportation
//============================================================
-alberta,246,62,3 script Kunlun Envoy#gon 776,{
+- script ::Kunlun_Envoy_gonryun -1,{
mes "[Wa Bai Hu]";
mes "Good day~";
mes "Let me invite you all";
@@ -143,7 +144,10 @@ gon_fild01,255,79,7 script Kunlun Envoy#gon2 776,{
mes "back. Now, let me guide you";
mes "back to Alberta.";
close2;
- warp "alberta",244,60;
+ if (checkre(0))
+ warp "alberta",244,60;
+ else
+ warp "alberta",243,67;
end;
}
mes "[Wa Bai Hu]";
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index a445310b8..0fc53b045 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -8,7 +8,7 @@
//= MasterOfMuppets (2.0)
//= rAthena Dev Team
//===== Current Version: =====================================
-//= 2.9
+//= 3.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -16,11 +16,12 @@
//= Louyang Town Script
//===== Additional Comments: =================================
//= 2.9 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
+//= 3.0 Moved Alberta NPC to pre-re/re paths. [Euphy]
//============================================================
// Louyang Transportaion
//============================================================
-alberta,246,40,3 script Girl#0lou 815,{
+- script ::Girl_louyang -1,{
mes "[Girl]";
mes "La la la la~";
mes "I feel so good today~";
@@ -108,7 +109,10 @@ lou_fild01,190,100,7 script Girl#1lou 815,{
mes "see you again!";
mes "Bye bye!";
close2;
- warp "alberta",236,40;
+ if (checkre(0))
+ warp "alberta",236,40;
+ else
+ warp "alberta",235,45;
end;
}
mes "[Girl]";
@@ -331,7 +335,7 @@ louyang,84,254,0 script Exit#lou 111,{
//= 2.0 - Completely rewrote the current scripts based on iRO.
// Added the 'Shouting Quest' and the 'Medicine Quest'
//= 2.1 Optimized, made quest vars unique [Lupus]
-//= 2.1a minor fix, 2.1b Fixed Typo�s [Nexon]
+//= 2.1a minor fix, 2.1b Fixed Typos [Nexon]
//= 2.2 Fixed exploits [Lupus]
//= 2.2a Updated the color codes a little and fixed the shouting quest
//= to broadcast green text.
@@ -344,7 +348,7 @@ louyang,84,254,0 script Exit#lou 111,{
//= 2.6a Updated a few names with new item_db.txt names [Evera]
//= 2.7 Split quests to quests/quests_louyang.txt [Evera]
//= 2.7a Minor optimizations before Louyang quests [Lupus]
-//= 2.7b Moved guides to the Guides folder. 2.7� more typos [Lupus]
+//= 2.7b Moved guides to the Guides folder. 2.7 more typos [Lupus]
//= 2.8 Moved some quest-related NPCs to proper file. [SinSloth]
//= 2.9 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
//============================================================
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index bb88d641f..e05a4a755 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -11,11 +11,12 @@
//===== Additional Comments: =================================
//= 1.0 First Version. [Kisuka]
//= 1.1 Removed villagers (they are part of a quest). [Kisuka]
+//= 1.2 Moved Alberta NPC to pre-re/re paths. [Euphy]
//============================================================
// Moscovia Transportation
//============================================================
-alberta,246,51,4 script Moscovia P.R. Officer#1 960,{
+- script ::PR_Officer_moscovia -1,{
mes "[Moscovia P.R. Officer]";
mes "Moscovia! Do you know Moscovia?";
mes "the paradise spreading on the endless seas...";
@@ -108,7 +109,10 @@ 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",244,52;
+ if (checkre(0))
+ warp "alberta",244,52;
+ else
+ warp "alberta",243,67;
end;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 22:56:55 +0000