> Pre-Renewal fixes, major credits to Deep Forest for his detailed reports:

* Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041).
* Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042).
* Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 52 insertions, 6 deletions

diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt
new file mode 100644
index 000000000..a0a417510
--- /dev/null
+++ b/npc/re/cities/alberta.txt
@@ -0,0 +1,42 @@
+//===== rAthena Script =======================================
+//= Alberta Town Renewal
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= Alberta town NPCs.
+//===== Additional Comments: =================================
+//= 1.0 First Version.
+//============================================================
+
+// cities/amatsu.txt
+//============================================================
+alberta,246,74,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	709
+
+// cities/ayothaya.txt
+//============================================================
+alberta,246,29,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	843
+
+// cities/gonryun.txt
+//============================================================
+alberta,246,62,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	776
+
+// cities/louyang.txt
+//============================================================
+alberta,246,40,3	duplicate(Girl_louyang)	Girl#0lou	815
+
+// cities/moscovia.txt
+//============================================================
+alberta,246,51,4	duplicate(PR_Officer_moscovia)	Moscovia P.R. Officer#1	960
+
+// quests/quests_alberta.txt
+//============================================================
+alberta,244,118,4	duplicate(Sailor_alberta)	Sailor#tur	709
+alberta,246,114,4	duplicate(Turtle_Scholar_alberta)	Turtle Island Scholar	121
+
+// quests/skills/merchant_skills.txt
+//============================================================
+alberta,232,103,6	duplicate(Gershaun_alberta)	Gershaun	57
diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt
index d005a72f3..389c5863f 100644
--- a/npc/re/cities/brasilis.txt
+++ b/npc/re/cities/brasilis.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -13,8 +13,10 @@
 //= 1.0 First version. Transportation and Basic NPCs.
 //= 1.1 Fixed Zeny not being removed for payment. [Kisuka]
 //= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
+//= 1.3 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //============================================================ 
 
+/* Pre-Renewal coordinates: alberta,247,115,3 */
 alberta,246,82,3	script	Crewman#bra2	100,{
 	mes "[Crewman]";
 	mes "Hey, have you heard of a place called Brasilis?";
@@ -55,7 +57,10 @@ brasilis,316,57,3	script	Crewman#bra1	100,{
 		mes "[Crewman]";
 		mes "I sure do miss home.";
 		close2;
-		warp "alberta",243,82;
+		if (checkre(0))
+			warp "alberta",243,82;
+		else
+			warp "alberta",244,115;
 		end;
 	case 2:
 		mes "[Crewman]";
diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt
index 9419d8486..e5b3d1df0 100644
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -7,10 +7,9 @@
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= Izlude Town Renewal NPC's
+//= Izlude town NPCs.
 //===== Additional Comments: ================================= 
-//= 1.0 First Version. Still missing many new NPC's and
-//= their dialogues. [Masao]
+//= 1.0 First Version. Still missing many new NPCs and their dialogues. [Masao]
 //= 1.1 Added bullet NPC duplicates. [Euphy]
 //============================================================
 
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index 04744d1ee..49263d22d 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= Jawaii Town Npcs
+//= Jawaii town NPCs.
 //===== Additional Comments: =================================
 //= 1.0 First Version. Renewal coordinates by Masao.
 //============================================================