> 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

1 files changed, 28 insertions, 7 deletions

diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index c07a7df7f..f9bde7a99 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,14 +11,27 @@
 //===== Additional Comments: ================================= 
 //= 1.0 Moved some merchants to a separate renewal file. [Kenpachi]
 //= 1.1 Added Dicastes merchants. [Joseph]
+//= 1.2 Moved more shops to Renewal file. [Euphy]
 //============================================================ 
 
 //=======================================================
+// Comodo
+//=======================================================
+comodo,106,213,5	shop	Tropic Fruit Dealer	724,6258:-1
+comodo,196,162,3	shop	Harive#candy	479,11513:-1,6144:-1
+
+//=======================================================
 // Einbroch
 //=======================================================
 einbroch,122,250,4	shop	Black Marketeer#ein	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 
 //=======================================================
+// El Dicastes
+//=======================================================
+dic_in01,238,107,5	shop	Peddler#dic	900,601:-1,602:-1,611:-1,610:-1
+dicastes01,207,200,6	shop	Points Merchant#dic	66,6360:-1,6361:-1,6362:-1,6363:-1
+
+//=======================================================
 // Izlude
 //=======================================================
 izlude,97,146,0	shop	Butcher#iz	54,517:-1
@@ -27,8 +40,14 @@ izlude,95,145,6	shop	Vendor from Milk Ranch#i	90,519:-1
 izlude,174,164,4	shop	Pet Groomer#iz	124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
 
 //=======================================================
+// Juno
+//=======================================================
+s_atelier,114,117,1	shop	Part-Timer#sc_yuno	92,6123:-1,6120:-1
+
+//=======================================================
 // Lighthalzen
 //=======================================================
+lighthalzen,337,240,4	shop	Trap Specialist#lhz	66,7940:-1,12341:-1
 lhz_in03,181,17,4	shop	Black Marketeer#lhz	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 s_atelier,15,65,5	shop	Part-Timer#sc_lgt	89,6123:-1,6120:-1
 
@@ -39,19 +58,21 @@ mid_camp,129,284,4	shop	Trap Specialist#mid	66,7940:-1,12341:-1
 mid_camp,184,263,4	shop	Black Marketeer#mid	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 
 //=======================================================
+// Payon
+//=======================================================
+payon,123,109,4	shop	Trap Specialist#pay	66,7940:-1,12341:-1
+
+//=======================================================
 // Prontera
 //=======================================================
+//prontera,104,88,5	shop	Stuff Gimme	880,616:-1
+prt_in,109,68,4	shop	Trap Specialist#prt	66,7940:-1,12341:-1
 prt_in,175,137,4	shop	Black Marketeer#prt	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 s_atelier,17,110,1	shop	Part-Timer#sc_prt	67,6123:-1,6120:-1
 
 //=======================================================
 // Rachel
 //=======================================================
+ra_in01,263,281,4	shop	Trap Specialist#ra	66,7940:-1,12341:-1
 ra_in01,257,266,4	shop	Black Marketeer#ra	49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
 s_atelier,137,60,3	shop	Part-Timer#sc_ra	70,6123:-1,6120:-1
-
-//=======================================================
-// Dicastes
-//=======================================================
-dic_in01,238,107,5	shop	Peddler#dic	900,601:-1,602:-1,611:-1,610:-1
-dicastes01,207,200,6	shop	Points Merchant#dic	66,6360:-1,6361:-1,6362:-1,6363:-1