Converted some dealers to new trader format.

3 files changed, 624 insertions, 58 deletions

diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index d303f35b4..e18498015 100644
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -3,20 +3,74 @@
 //===== By: ==================================================
 //= Daegaladh
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Description: =========================================
 //= Pre-renewal-specific town shop NPCs.
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Moved Izlude shops to pre-re/re paths. [Streusel]
+//= 1.2 Converted to trader format. [Frost]
 //============================================================
 
 //=======================================================
 // Izlude
 //=======================================================
-izlude,105,99,0	shop	Butcher#iz	1_M_JOBGUIDER,517:-1
-izlude,94,98,4	shop	Fruit Gardener#iz	1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1
-izlude,105,92,7	shop	Vendor from Milk Ranch#i	4_F_01,519:-1
-izlude,164,138,4	shop	Pet Groomer#iz	4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,115,61,0	shop	Tool Dealer#iz	1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,121,64,3	shop	Trading Merchant#iz	4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+izlude,105,99,0	trader	Butcher#iz	1_M_JOBGUIDER,{
+OnInit:
+	sellitem Meat;
+}
+
+izlude,94,98,4	trader	Fruit Gardener#iz	1_M_INNKEEPER,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+}
+
+izlude,105,92,7	trader	Vendor from Milk Ranch#i	4_F_01,{
+OnInit:
+	sellitem Milk;
+}
+
+izlude,164,138,4	trader	Pet Groomer#iz	4_F_TELEPORTER,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Mojji;
+	sellitem Vital_Flower_;
+	sellitem Flame_Gemstone;
+	sellitem Bun_;
+}
+
+izlude_in,115,61,0	trader	Tool Dealer#iz	1_M_01,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem Arrow;
+}
+
+izlude_in,121,64,3	trader	Trading Merchant#iz	4_M_HUMERCHANT,{
+OnInit:
+	sellitem Bullet;
+	sellitem Silver_Bullet;
+	sellitem Shell_Of_Blood;
+	sellitem Branch;
+	sellitem Crimson_Bolt;
+	sellitem The_Cyclone;
+	sellitem Rolling_Stone;
+	sellitem Black_Rose;
+	sellitem Long_Barrel;
+	sellitem Jungle_Carbine;
+	sellitem Thunder_P;
+}
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index c90f89a5a..86fcb9e14 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Hercules Dev Team
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Description: =========================================
 //= Renewal-specific town shop NPCs.
 //===== Additional Comments: =================================
@@ -15,113 +15,444 @@
 //= 1.5 Added Dewata merchants. [Lemongrass]
 //= 1.6 Added Mora and Port Malaya merchants.
 //= 1.7 Added Izlude duplicates. [Euphy]
+//= 1.8 Converted to trader format. [Frost]
 //============================================================
 
 //=======================================================
 // Comodo
 //=======================================================
-comodo,106,213,5	shop	Tropic Fruit Dealer	4_F_07,6258:-1
-comodo,196,162,3	shop	Harive#candy	4_M_MINSTREL,11513:-1,6144:-1
+comodo,106,213,5	trader	Tropic Fruit Dealer	4_F_07,{
+OnInit:
+	sellitem Comodo_Tropic_Fruit;
+}
+
+comodo,196,162,3	trader	Harive#candy	4_M_MINSTREL,{
+OnInit:
+	sellitem Protect_Neck_Candy;
+	sellitem Heartbroken_Tears;
+}
 
 //=======================================================
 // Dewata
 //=======================================================
-dewata,218,164,4	shop	Weapon Dealer	4_M_DEWMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-dewata,182,164,6	shop	Tool Dealer	4_M_DEWMAN,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1,713:-1
-dewata,145,267,6	shop	Fruit Gardener	4_M_DEWOLDWOMAN,512:-1,513:-1,515:-1,516:-1,535:-1
-dewata,158,182,6	shop	Armor Dealer	4_M_DEWMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+dewata,218,164,4	trader	Weapon Dealer	4_M_DEWMAN,{
+OnInit:
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+}
+
+dewata,182,164,6	trader	Tool Dealer	4_M_DEWMAN,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Arrow;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem One_Eyed_Glass;
+	sellitem Empty_Bottle;
+}
+
+dewata,145,267,6	trader	Fruit Gardener	4_M_DEWOLDWOMAN,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+	sellitem Pumpkin;
+}
+
+dewata,158,182,6	trader	Armor Dealer	4_M_DEWMAN,{
+OnInit:
+	sellitem Bandana;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+	sellitem Wooden_Mail;
+	sellitem Belt;
+}
 
 //=======================================================
 // Einbroch
 //=======================================================
-einbroch,122,250,4	shop	Black Marketeer#ein	1_M_03,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
+einbroch,122,250,4	trader	Black Marketeer#ein	1_M_03,{
+OnInit:
+	sellitem Flame_Thrower;
+	sellitem Accelerator;
+	sellitem Hovering_Booster;
+	sellitem Suicidal_Device;
+	sellitem Shape_Shifter;
+	sellitem Cooling_Device;
+	sellitem Mag_Field_Generator;
+	sellitem Barrier_Builder;
+	sellitem Repair_Kit;
+	sellitem Cannon_Ball;
+	sellitem Holy_Cannon_Ball;
+	sellitem Dark_Cannon_Ball;
+	sellitem Soul_Cannon_Ball;
+	sellitem Iron_Cannon_Ball;
+	sellitem RepairA;
+	sellitem RepairB;
+	sellitem RepairC;
+	sellitem Vulcan_Bullet;
+	sellitem Magic_Gear_Fuel;
+	sellitem Liquid_Condensed_Bullet;
+	sellitem Monkey_Wrench;
+	sellitem Camouflage_Generator;
+}
 
 //=======================================================
 // El Dicastes
 //=======================================================
-dic_in01,238,107,5	shop	Peddler#dic	4_M_HUMERCHANT,601:-1,602:-1,611:-1,610:-1
-dicastes01,207,200,6	shop	Points Merchant#dic	1_F_01,6360:-1,6361:-1,6362:-1,6363:-1
+dic_in01,238,107,5	trader	Peddler#dic	4_M_HUMERCHANT,{
+OnInit:
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Spectacles;
+	sellitem Leaf_Of_Yggdrasil;
+}
+
+dicastes01,207,200,6	trader	Points Merchant#dic	1_F_01,{
+OnInit:
+	sellitem Scarlet_Pts;
+	sellitem Indigo_Pts;
+	sellitem Yellow_Wish_Pts;
+	sellitem Lime_Green_Pts;
+}
 
 //=======================================================
 // Izlude
 //=======================================================
-izlude,124,165,4	shop	Fruit Gardener#iz	1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1
+izlude,124,165,4	trader	Fruit Gardener#iz	1_M_INNKEEPER,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+}
+
 izlude_a,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_a	1_M_INNKEEPER
 izlude_b,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_b	1_M_INNKEEPER
 izlude_c,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_c	1_M_INNKEEPER
 izlude_d,124,165,4	duplicate(Fruit Gardener#iz)	Fruit Gardener#iz_d	1_M_INNKEEPER
-izlude,160,186,0	shop	Butcher#iz	1_M_JOBGUIDER,517:-1
+
+izlude,160,186,0	trader	Butcher#iz	1_M_JOBGUIDER,{
+OnInit:
+	sellitem Meat;
+}
+
 izlude_a,160,186,0	duplicate(Butcher#iz)	Butcher#iz_a	1_M_JOBGUIDER
 izlude_b,160,186,0	duplicate(Butcher#iz)	Butcher#iz_b	1_M_JOBGUIDER
 izlude_c,160,186,0	duplicate(Butcher#iz)	Butcher#iz_c	1_M_JOBGUIDER
 izlude_d,160,186,0	duplicate(Butcher#iz)	Butcher#iz_d	1_M_JOBGUIDER
-izlude,128,158,7	shop	Vendor from Milk Ranch#i	4_F_01,519:-1
+
+izlude,128,158,7	trader	Vendor from Milk Ranch#i	4_F_01,{
+OnInit:
+	sellitem Milk;
+}
+
 izlude_a,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#a	4_F_01
 izlude_b,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#b	4_F_01
 izlude_c,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#c	4_F_01
 izlude_d,128,158,7	duplicate(Vendor from Milk Ranch#i)	Vendor from Milk Ranch#d	4_F_01
-izlude_in,72,98,3	shop	Pet Groomer#iz	4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,57,110,0	shop	Tool Dealer#iz	1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,72,102,3	shop	Trading Merchant#iz	4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+
+izlude_in,72,98,3	trader	Pet Groomer#iz	4_F_TELEPORTER,{
+OnInit:
+	sellitem Pet_Food;
+	sellitem Pet_Incubator;
+	sellitem Backpack;
+	sellitem Rocker_Glasses;
+	sellitem Mojji;
+	sellitem Vital_Flower_;
+	sellitem Flame_Gemstone;
+	sellitem Bun_;
+}
+
+izlude_in,57,110,0	trader	Tool Dealer#iz	1_M_01,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Green_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem Arrow;
+}
+
+izlude_in,72,102,3	trader	Trading Merchant#iz	4_M_HUMERCHANT,{
+OnInit:
+	sellitem Bullet;
+	sellitem Silver_Bullet;
+	sellitem Shell_Of_Blood;
+	sellitem Branch;
+	sellitem Crimson_Bolt;
+	sellitem The_Cyclone;
+	sellitem Rolling_Stone;
+	sellitem Black_Rose;
+	sellitem Long_Barrel;
+	sellitem Jungle_Carbine;
+	sellitem Thunder_P;
+}
 
 //=======================================================
 // Juno
 //=======================================================
-s_atelier,114,117,1	shop	Part-Timer#sc_yuno	4_F_03,6123:-1,6120:-1
+s_atelier,114,117,1	trader	Part-Timer#sc_yuno	4_F_03,{
+OnInit:
+	sellitem Surface_Paint;
+	sellitem Face_Paint;
+}
 
 //=======================================================
 // Lighthalzen
 //=======================================================
-lighthalzen,337,240,4	shop	Trap Specialist#lhz	1_F_01,7940:-1,12341:-1
-lhz_in03,181,17,4	shop	Black Marketeer#lhz	1_M_03,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	4_M_ORIENT02,6123:-1,6120:-1
+lighthalzen,337,240,4	trader	Trap Specialist#lhz	1_F_01,{
+OnInit:
+	sellitem Special_Alloy_Trap;
+	sellitem Special_Alloy_Trap_Box;
+}
+
+lhz_in03,181,17,4	trader	Black Marketeer#lhz	1_M_03,{
+OnInit:
+	sellitem Flame_Thrower;
+	sellitem Accelerator;
+	sellitem Hovering_Booster;
+	sellitem Suicidal_Device;
+	sellitem Shape_Shifter;
+	sellitem Cooling_Device;
+	sellitem Mag_Field_Generator;
+	sellitem Barrier_Builder;
+	sellitem Repair_Kit;
+	sellitem Cannon_Ball;
+	sellitem Holy_Cannon_Ball;
+	sellitem Dark_Cannon_Ball;
+	sellitem Soul_Cannon_Ball;
+	sellitem Iron_Cannon_Ball;
+	sellitem RepairA;
+	sellitem RepairB;
+	sellitem RepairC;
+	sellitem Vulcan_Bullet;
+	sellitem Magic_Gear_Fuel;
+	sellitem Liquid_Condensed_Bullet;
+	sellitem Monkey_Wrench;
+	sellitem Camouflage_Generator;
+}
+
+s_atelier,15,65,5	trader	Part-Timer#sc_lgt	4_M_ORIENT02,{
+OnInit:
+	sellitem Surface_Paint;
+	sellitem Face_Paint;
+}
 
 //=======================================================
 // Malangdo
 //=======================================================
-malangdo,232,163,5	shop	Tool Dealer Myo	4_CAT_ADV2,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
+malangdo,232,163,5	trader	Tool Dealer Myo	4_CAT_ADV2,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Arrow;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem Empty_Bottle;
+}
 
 //=======================================================
 // Mora
 //=======================================================
-mora,100,118,4	shop	Tool Dealer#mora	4_M_RAFLE_OLD,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1
-mora,138,110,4	shop	Mora Chef	4_F_RAFLE_PK,11519:-1
+mora,100,118,4	trader	Tool Dealer#mora	4_M_RAFLE_OLD,{
+OnInit:
+	sellitem Red_Raffle_Sap;
+	sellitem Yellow_Raffle_Sap;
+	sellitem White_Raffle_Sap;
+	sellitem Wing_Of_Butterfly;
+	sellitem Wing_Of_Fly;
+	sellitem Spectacles;
+	sellitem Arrow_Of_Elf;
+	sellitem Hunting_Arrow;
+}
+
+mora,138,110,4	trader	Mora Chef	4_F_RAFLE_PK,{
+OnInit:
+	sellitem Beef_Toast;
+}
 
 //=======================================================
 // Mid Camp
 //=======================================================
-mid_camp,129,284,4	shop	Trap Specialist#mid	1_F_01,7940:-1,12341:-1
-mid_camp,184,263,4	shop	Black Marketeer#mid	1_M_03,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
+mid_camp,129,284,4	trader	Trap Specialist#mid	1_F_01,{
+OnInit:
+	sellitem Special_Alloy_Trap;
+	sellitem Special_Alloy_Trap_Box;
+}
+
+mid_camp,184,263,4	trader	Black Marketeer#mid	1_M_03,{
+OnInit:
+	sellitem Flame_Thrower;
+	sellitem Accelerator;
+	sellitem Hovering_Booster;
+	sellitem Suicidal_Device;
+	sellitem Shape_Shifter;
+	sellitem Cooling_Device;
+	sellitem Mag_Field_Generator;
+	sellitem Barrier_Builder;
+	sellitem Repair_Kit;
+	sellitem Cannon_Ball;
+	sellitem Holy_Cannon_Ball;
+	sellitem Dark_Cannon_Ball;
+	sellitem Soul_Cannon_Ball;
+	sellitem Iron_Cannon_Ball;
+	sellitem RepairA;
+	sellitem RepairB;
+	sellitem RepairC;
+	sellitem Vulcan_Bullet;
+	sellitem Magic_Gear_Fuel;
+	sellitem Liquid_Condensed_Bullet;
+	sellitem Monkey_Wrench;
+	sellitem Camouflage_Generator;
+}
 
 //=======================================================
 // Payon
 //=======================================================
-payon,123,109,4	shop	Trap Specialist#pay	1_F_01,7940:-1,12341:-1
+payon,123,109,4	trader	Trap Specialist#pay	1_F_01,{
+OnInit:
+	sellitem Special_Alloy_Trap;
+	sellitem Special_Alloy_Trap_Box;
+}
 
 //=======================================================
 // Port Malaya
 //=======================================================
-ma_in01,73,22,3	shop	Weapon Dealer#ma	4_M_DEWMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ma_in01,22,23,3	shop	Tool Dealer#ma	4_M_DEWMAN,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
-malaya,150,261,3	shop	Fruit Gardener#ma	4_M_DEWOLDWOMAN,512:-1,513:-1,515:-1,516:-1,535:-1
-ma_in01,67,13,5	shop	Armor Dealer#ma	4_M_DEWMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+ma_in01,73,22,3	trader	Weapon Dealer#ma	4_M_DEWMAN,{
+OnInit:
+	sellitem Main_Gauche;
+	sellitem Stiletto;
+	sellitem Blade;
+	sellitem Ring_Pommel_Saber;
+	sellitem Katana;
+	sellitem Bastard_Sword;
+	sellitem Pike;
+	sellitem Partizan;
+	sellitem Hammer;
+	sellitem Chain;
+}
+
+ma_in01,22,23,3	trader	Tool Dealer#ma	4_M_DEWMAN,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Arrow;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem White_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem One_Eyed_Glass;
+}
+
+malaya,150,261,3	trader	Fruit Gardener#ma	4_M_DEWOLDWOMAN,{
+OnInit:
+	sellitem Apple;
+	sellitem Banana;
+	sellitem Carrot;
+	sellitem Sweet_Potato;
+	sellitem Pumpkin;
+}
+
+ma_in01,67,13,5	trader	Armor Dealer#ma	4_M_DEWMAN,{
+OnInit:
+	sellitem Bandana;
+	sellitem Sandals;
+	sellitem Shoes;
+	sellitem Hood;
+	sellitem Muffler;
+	sellitem Guard;
+	sellitem Buckler;
+	sellitem Adventure_Suit;
+	sellitem Silk_Robe;
+	sellitem Silver_Robe;
+	sellitem Wooden_Mail;
+	sellitem Belt;
+}
 
 //=======================================================
 // Prontera
 //=======================================================
-//prontera,104,88,5	shop	Stuff Gimme	4_M_MASKMAN,616:-1
-prt_in,109,68,4	shop	Trap Specialist#prt	1_F_01,7940:-1,12341:-1
-prt_in,175,137,4	shop	Black Marketeer#prt	1_M_03,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	1_F_02,6123:-1,6120:-1
+/*
+prontera,104,88,5	trader	Stuff Gimme	4_M_MASKMAN,{
+OnInit:
+	sellitem Old_Card_Album;
+}
+*/
 
-//=======================================================
-// Rachel
-//=======================================================
-ra_in01,263,281,4	shop	Trap Specialist#ra	1_F_01,7940:-1,12341:-1
-ra_in01,257,266,4	shop	Black Marketeer#ra	1_M_03,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	1_F_GYPSY,6123:-1,6120:-1
+prt_in,109,68,4	trader	Trap Specialist#prt	1_F_01,{
+OnInit:
+	sellitem Special_Alloy_Trap;
+	sellitem Special_Alloy_Trap_Box;
+}
+
+prt_in,175,137,4	trader	Black Marketeer#prt	1_M_03,{
+OnInit:
+	sellitem Flame_Thrower;
+	sellitem Accelerator;
+	sellitem Hovering_Booster;
+	sellitem Suicidal_Device;
+	sellitem Shape_Shifter;
+	sellitem Cooling_Device;
+	sellitem Mag_Field_Generator;
+	sellitem Barrier_Builder;
+	sellitem Repair_Kit;
+	sellitem Cannon_Ball;
+	sellitem Holy_Cannon_Ball;
+	sellitem Dark_Cannon_Ball;
+	sellitem Soul_Cannon_Ball;
+	sellitem Iron_Cannon_Ball;
+	sellitem RepairA;
+	sellitem RepairB;
+	sellitem RepairC;
+	sellitem Vulcan_Bullet;
+	sellitem Magic_Gear_Fuel;
+	sellitem Liquid_Condensed_Bullet;
+	sellitem Monkey_Wrench;
+	sellitem Camouflage_Generator;
+}
+
+s_atelier,17,110,1	trader	Part-Timer#sc_prt	1_F_02,{
+OnInit:
+	sellitem Surface_Paint;
+	sellitem Face_Paint;
+}
 
-// Ninja Shops
 prontera,178,244,3	trader	Amatsu Trader#nin	4_M_01,{
 OnInit:
 	sellitem Shuriken;
@@ -141,3 +472,45 @@ OnInit:
 	sellitem Charm_Wind;
 	sellitem Charm_Earth;
 }
+
+//=======================================================
+// Rachel
+//=======================================================
+ra_in01,263,281,4	trader	Trap Specialist#ra	1_F_01,{
+OnInit:
+	sellitem Special_Alloy_Trap;
+	sellitem Special_Alloy_Trap_Box;
+}
+
+ra_in01,257,266,4	trader	Black Marketeer#ra	1_M_03,{
+OnInit:
+	sellitem Flame_Thrower;
+	sellitem Accelerator;
+	sellitem Hovering_Booster;
+	sellitem Suicidal_Device;
+	sellitem Shape_Shifter;
+	sellitem Cooling_Device;
+	sellitem Mag_Field_Generator;
+	sellitem Barrier_Builder;
+	sellitem Repair_Kit;
+	sellitem Cannon_Ball;
+	sellitem Holy_Cannon_Ball;
+	sellitem Dark_Cannon_Ball;
+	sellitem Soul_Cannon_Ball;
+	sellitem Iron_Cannon_Ball;
+	sellitem RepairA;
+	sellitem RepairB;
+	sellitem RepairC;
+	sellitem Vulcan_Bullet;
+	sellitem Magic_Gear_Fuel;
+	sellitem Liquid_Condensed_Bullet;
+	sellitem Monkey_Wrench;
+	sellitem Camouflage_Generator;
+}
+
+s_atelier,137,60,3	trader	Part-Timer#sc_ra	1_F_GYPSY,{
+OnInit:
+	sellitem Surface_Paint;
+	sellitem Face_Paint;
+}
+
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 4f65498ea..45dc608ac 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= -SkittleNugget-
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Description: =========================================
 //= Eden scripts custom to iRO (disabled by default).
 //= You may need iRO's data.grf to view some of the items.
@@ -11,6 +11,7 @@
 //= 1.0 First version.
 //= 1.1 Edited and added more NPCs, lots of placeholders. [Euphy]
 //= 1.2 Added Mail Annex Station scripts, commented out. [Euphy]
+//= 1.3 Converted Kafra Cash Shop NPC's and Mail Annex Tool Dealer to trader format. [Frost]
 //============================================================
 
 // Acolyte Warper (part of other/acolyte_warp.txt)
@@ -603,7 +604,6 @@ L_Exchange:
 	return;
 }
 
-
 // Kafra Stacker
 //============================================================
 moc_para01,41,169,2	script	Kafra Stacker#eden	4_M_ALCHE_B,{
@@ -674,12 +674,132 @@ moc_para01,38,162,2	script	Code the Redeemer#Give1	4_M_YOUNGKNIGHT,{
 //============================================================
 /* Due to the irregularity of iRO's databases, some of these sprites may not display properly. */
 
-moc_para01,32,171,6	cashshop	Kafra Headgears#eden1	4_F_KAFRA3,14024:500,14098:150,17081:300,14097:500,14094:1000,14017:400,14099:300
-moc_para01,35,174,2	cashshop	Kafra Dye Shop#dyes2	4_F_KAFRA4,6287:150
-moc_para01,37,170,2	cashshop	Kafra Consumables#eden3	4_F_KAFRA6,13810:5,14167:400,16556:100,14111:75,14075:25,16419:30,14107:70,14104:50,14112:25,14082:30,14091:60,14088:30,14085:60,14169:40,14170:40,14172:40,14173:40,14171:40,14174:40,14159:100,14160:100,14161:100,14162:100,14163:100:14164:100,16420:1500
-moc_para01,32,174,2	cashshop	Kafra Rental Items#eden	4_F_KAFRA7,16683:150,16682:50,14126:250,14125:250,16430:250,14137:250,14127:250,14118:250,14119:250,14132:250,16425:250,14124:250,14133:250,14130:250,16424:250,14136:250,14122:250,16426:250,14135:250,14134:250,14138:250,16428:250,16431:250,14139:250,14131:250,16429:250,16427:250
-moc_para01,37,172,2	cashshop	Kafra Costume#eden5	4_F_KAFRA8,16974:300,16972:600,16973:150,16975:150,16977:150,17014:150,17015:150
-moc_para01,35,168,1	cashshop	Kafra Utility Shop#eden	4_F_KAFRA5,16677:25,13990:400,16396:100,16394:100,17106:500,6241:10,6240:10,6225:15,6226:15,14002:5,6294:500,7776:50,7619:30,7620:30,12208:40,14156:400,12210:40,14158:400,14042:50,14044:50,14046:50,14048:50,14114:50,14166:40,16418:500,16381:400,14165:100,14157:100,14178:100
+moc_para01,32,171,6	trader	Kafra Headgears#eden1	4_F_KAFRA3,{
+OnInit:
+	tradertype(NST_CASH);
+	sellitem F_Robo_Eye_Box,500;
+	sellitem F_Pecopeco_Hairband_Box,150;
+	sellitem Yggdrasil_Crown_Box,300;
+	sellitem F_Chick_Hat_Box,500;
+	sellitem F_Flying_Angel_Box,1000;
+	sellitem F_All_In_One_Ring_Box,400;
+	sellitem F_Red_Glasses_Box,300;
+}
+
+moc_para01,35,174,2	trader	Kafra Dye Shop#dyes2	4_F_KAFRA4,{
+OnInit:
+	tradertype(NST_CASH);
+	sellitem F_Clothing_Dye_Coupon,150;
+}
+
+moc_para01,37,170,2	trader	Kafra Consumables#eden3	4_F_KAFRA6,{
+OnInit:
+	tradertype(NST_CASH);
+	sellitem Blue_Potion_Box,5;
+	sellitem F_Neuralizer_Box,400;
+	sellitem FPr_Reset_Stone_Box,100;
+	sellitem F_Abrasive_Box10,75;
+	sellitem F_G_O_I_Box10,25;
+	sellitem Greed_Scroll_Box_30,30;
+	sellitem F_M_Life_Potion_Box,70;
+	sellitem F_S_Life_Potion_Box,50;
+	sellitem F_Regeneration_Box5,25;
+	sellitem FS_Def_Potion_Box10,30;
+	sellitem FB_Mdef_Potion_Box10,60;
+	sellitem FS_Mdef_Potion_Box10,30;
+	sellitem FB_Def_Potion_Box10,60;
+	sellitem F_Blessing_10_Scroll_Box,40;
+	sellitem F_Inc_Agi_10_Scroll_Box,40;
+	sellitem F_Assumptio_5_Scroll_Box,40;
+	sellitem F_Wind_Walk_10_Scroll_Box,40;
+	sellitem F_Aspersio_5_Scroll_Box,40;
+	sellitem F_Adrenaline_Scroll_Box,40;
+	sellitem F_Str_Dish_Box,100;
+	sellitem F_Agi_Dish_Box,100;
+	sellitem F_Int_Dish_Box,100;
+	sellitem F_Dex_Dish_Box,100;
+	sellitem F_Luk_Dish_Box,100;
+	sellitem F_Vit_Dish_Box,100;
+	sellitem Adventurer_Pack,1500;
+}
+
+moc_para01,32,174,2	trader	Kafra Rental Items#eden	4_F_KAFRA7,{
+OnInit:
+	tradertype(NST_CASH);
+	sellitem B_Halter_Box_30Days,150;
+	sellitem Boarding_Halter_Box,50;
+	sellitem F_Apple_Of_Archer_Box,250;
+	sellitem F_Asura_Box,250;
+	sellitem Rudra_Bow_Box,250;
+	sellitem F_Brooch_Box,250;
+	sellitem F_Bunny_Band_Box,250;
+	sellitem F_Combat_Knife_Box,250;
+	sellitem F_Counter_Dagger_Box,250;
+	sellitem F_Critical_Ring_Box,250;
+	sellitem Cutlus_Box,250;
+	sellitem F_Diary_Of_Great_Sage,250;
+	sellitem F_Earring_Box,250;
+	sellitem F_Elven_Ears_Box,250;
+	sellitem Executioner_Box_,250;
+	sellitem F_Glove_Box,250;
+	sellitem F_Right_Epsilon_Box,250;
+	sellitem Moonlight_Dagger_Box,250;
+	sellitem F_Necklace_Box,250;
+	sellitem F_Ring_Box,250;
+	sellitem F_Rosary_Box,250;
+	sellitem Solar_Sword_Box_,250;
+	sellitem Pole_Axe_Box_,250;
+	sellitem F_Safety_Ring_Box,250;
+	sellitem F_Steel_Flower_Box,250;
+	sellitem Tomahawk_Box_,250;
+	sellitem Wrench_Box,250;
+}
+
+moc_para01,37,172,2	trader	Kafra Costume#eden5	4_F_KAFRA8,{
+OnInit:
+	tradertype(NST_CASH);
+	sellitem Comin_Actor_Box,300;
+	sellitem Weather_Report_Box,600;
+	sellitem Yellow_Hat_Box,150;
+	sellitem Singing_Bird_Box,150;
+	sellitem Red_Minicrown_Box,150;
+	sellitem Butterfly_ear_Box,150;
+	sellitem Stuckhead_Screw_Box,150;
+}
+
+moc_para01,35,168,1	trader	Kafra Utility Shop#eden	4_F_KAFRA5,{
+OnInit:
+	tradertype(NST_CASH);
+	sellitem Universal_Catalog_Gold_Box10,25;
+	sellitem Job_Manual50_Box,400;
+	sellitem HD_Elu_Box10,100;
+	sellitem HD_Ori_Box10,100;
+	sellitem Max_Weight_Up_10Box,500;
+	sellitem HD_Elunium,10;
+	sellitem HD_Oridecon,10;
+	sellitem HD_Carnium,15;
+	sellitem HD_Bradium,15;
+	sellitem Adv_Siege_Supply_Box,5;
+	sellitem F_Marriage_Covenant,500;
+	sellitem Max_Weight_Up_Scroll,50;
+	sellitem Enriched_Elunium,30;
+	sellitem Enriched_Oridecon,30;
+	sellitem Battle_Manual,40;
+	sellitem F_Battle_Manual_Box,400;
+	sellitem Bubble_Gum,40;
+	sellitem F_Bubble_Gum_Box,400;
+	sellitem F_WOB_Rune_Box10,50;
+	sellitem F_WOB_Schwaltz_Box10,50;
+	sellitem F_WOB_Rachel_Box10,50;
+	sellitem F_WOB_Local_Box10,50;
+	sellitem F_Dun_Tele_Scroll_Box10,50;
+	sellitem F_Giant_Fly_Wing_Box,40;
+	sellitem Giant_Fly_Wing_Box_500,500;
+	sellitem WoE_Teleport_Scroll_100_Box,400;
+	sellitem F_Kafra_Card_Box,100;
+	sellitem F_Insurance_Package,100;
+	sellitem F_Token_Of_Siegfried_Box,100;
+}
 
 // Duplicate NPCs
 //============================================================
@@ -829,6 +949,25 @@ auction_03,152,42,4	script	Kafra Employee#annex	4_F_KAFRA1,{
 	}
 }
 
-auction_03,145,47,2	shop	Tool Dealer#annex	4_M_01,611:-1,501:-1,502:-1,503:-1,506:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,1065:-1,911:-1,910:-1,717:-1,1092:-1,1093:-1,713:400
-
+auction_03,145,47,2	trader	Tool Dealer#annex	4_M_01,{
+OnInit:
+	sellitem Spectacles;
+	sellitem Red_Potion;
+	sellitem Orange_Potion;
+	sellitem Yellow_Potion;
+	sellitem Green_Potion;
+	sellitem White_Potion;
+	sellitem Center_Potion;
+	sellitem Awakening_Potion;
+	sellitem Berserk_Potion;
+	sellitem Wing_Of_Fly;
+	sellitem Wing_Of_Butterfly;
+	sellitem Booby_Trap;
+	sellitem Scell;
+	sellitem Garlet;
+	sellitem Blue_Gemstone;
+	sellitem Empty_Cylinder;
+	sellitem Empty_Potion;
+	sellitem Empty_Bottle,400;
+}
 */