From 9f1fb9f8ef2f066e40aa46a5305ab8a0b88fa960 Mon Sep 17 00:00:00 2001 From: Jedzkie Date: Sun, 3 Jan 2016 19:15:22 +0800 Subject: Update Prontera trader npc's to match kRO's trader npc's. --- npc/merchants/shops.txt | 63 +------------------- npc/pre-re/merchants/shops.txt | 65 ++++++++++++++++++++- npc/re/merchants/shops.txt | 129 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 193 insertions(+), 64 deletions(-) (limited to 'npc') diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index d93baa57c..54870deae 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -46,7 +46,7 @@ //================= Description =========================================== //= Town shop NPCs. //================= Current Version ======================================= -//= 3.5.1 +//= 3.5.2 //========================================================================= //== Alberta =============================================== @@ -1699,30 +1699,6 @@ OnInit: sellitem Glass_Bead; } -prontera,218,211,4 trader Pet Groomer#prt 4_M_TELEPORTER,{ -OnInit: - sellitem Pet_Food; - sellitem Pet_Incubator; - sellitem Backpack; - sellitem Rocker_Glasses; - sellitem Mojji; - sellitem Flame_Gemstone; - sellitem Vital_Flower_; - sellitem Vital_Flower; - sellitem Bun_; - sellitem Damp_Darkness; - sellitem Small_Snow_Flower; - sellitem Fresh_Plant; - sellitem Big_Cell; - sellitem Apple_Pudding; - sellitem Mystic_Stone; - sellitem Flavored_Alcohol; - sellitem Grilled_Rice_Cake; - sellitem Fish_With_Blue_Back; - sellitem Pumpkin_Pie_; - sellitem Traditional_Cookie; -} - prontera,248,153,0 trader Doll Supplier#prt 4_M_03,{ OnInit: sellitem Stuffed_Doll; @@ -1752,18 +1728,6 @@ OnInit: sellitem Chain; } -prt_fild05,290,221,2 trader Tool Dealer#prt 4_M_01,{ -OnInit: - sellitem Arrow; - sellitem Spectacles; - sellitem Red_Potion; - sellitem Orange_Potion; - sellitem Green_Potion; - sellitem Center_Potion; - sellitem Wing_Of_Fly; - sellitem Wing_Of_Butterfly; -} - prt_in,211,169,0 trader Wedding Shop Dealer#prt 1_F_LIBRARYGIRL,{ OnInit: sellitem Bunch_Of_Flowers; @@ -1773,23 +1737,6 @@ OnInit: sellitem Tuxedo; } -prt_in,126,76,0 trader Tool Dealer#prt1 1_M_INNKEEPER,{ -OnInit: - sellitem Spectacles; - sellitem Arrow; - 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 One_Eyed_Glass; -} - prt_in,172,130,0 trader Weapon Dealer#prt 1_M_JOBGUIDER,{ OnInit: sellitem Arrow; @@ -2041,14 +1988,6 @@ OnInit: } //== Cooking Addition ====================================== -prontera,156,212,1 trader Chef Assistant#prt 8_F_GIRL,{ -OnInit: - sellitem Plain_Sauce; - sellitem Red_Spice; - sellitem Pot; - sellitem Bread; -} - payon,206,119,5 trader Chef Assistant#pay 4_M_ORIENT02,{ OnInit: sellitem Hot_Sauce; diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index 20f0ee933..62ea538ba 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -31,9 +31,63 @@ //================= Description =========================================== //= Pre-renewal-specific town shop NPCs. //================= Current Version ======================================= -//= 1.2 +//= 1.3 //========================================================================= +//== Prontera ============================================== +prt_fild05,290,221,2 trader Tool Dealer#prt 4_M_01,{ +OnInit: + sellitem Arrow; + sellitem Spectacles; + sellitem Red_Potion; + sellitem Orange_Potion; + sellitem Green_Potion; + sellitem Center_Potion; + sellitem Wing_Of_Fly; + sellitem Wing_Of_Butterfly; +} + +prt_in,126,76,0 trader Tool Dealer#prt1 1_M_INNKEEPER,{ +OnInit: + sellitem Spectacles; + sellitem Arrow; + 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 One_Eyed_Glass; +} + +prontera,218,211,4 trader Pet Groomer#prt 4_M_TELEPORTER,{ +OnInit: + sellitem Pet_Food; + sellitem Pet_Incubator; + sellitem Backpack; + sellitem Rocker_Glasses; + sellitem Mojji; + sellitem Flame_Gemstone; + sellitem Vital_Flower_; + sellitem Vital_Flower; + sellitem Bun_; + sellitem Damp_Darkness; + sellitem Small_Snow_Flower; + sellitem Fresh_Plant; + sellitem Big_Cell; + sellitem Apple_Pudding; + sellitem Mystic_Stone; + sellitem Flavored_Alcohol; + sellitem Grilled_Rice_Cake; + sellitem Fish_With_Blue_Back; + sellitem Pumpkin_Pie_; + sellitem Traditional_Cookie; +} + //== Izlude ================================================ izlude,105,99,0 trader Butcher#iz 1_M_JOBGUIDER,{ OnInit: @@ -94,3 +148,12 @@ OnInit: sellitem Jungle_Carbine; sellitem Thunder_P; } + +//== Cooking Addition ====================================== +prontera,156,212,1 trader Chef Assistant#prt 8_F_GIRL,{ +OnInit: + sellitem Plain_Sauce; + sellitem Red_Spice; + sellitem Pot; + sellitem Bread; +} diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 83ae07d3e..4af1fb509 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -36,7 +36,7 @@ //================= Description =========================================== //= Renewal-specific town shop NPCs. //================= Current Version ======================================= -//= 1.9 +//= 2.0 //========================================================================= //== Comodo ================================================ @@ -410,6 +410,44 @@ OnInit: } */ +prt_in,126,76,0 trader Tool Dealer#prt1 1_M_INNKEEPER,{ +OnInit: + sellitem Spectacles; + sellitem Arrow; + sellitem Red_Potion; + sellitem Orange_Potion; + sellitem Yellow_Potion; + sellitem White_Potion; + sellitem Center_Potion; + sellitem Awakening_Potion; + sellitem Empty_Bottle; + sellitem Wing_Of_Fly; + sellitem Wing_Of_Butterfly; + sellitem Booby_Trap; +} + +prt_in,117,79,5 trader Toy Supplier#prt 4_M_PIERROT,{ +OnInit: + sellitem One_Eyed_Glass; + sellitem Sunglasses; + sellitem Spinning_Eyes; + sellitem Eye_Bandage; + sellitem Luxury_Sunglasses; + sellitem Granpa_Beard; +} + +prt_fild05,290,221,2 trader Tool Dealer#prt 4_M_01,{ +OnInit: + sellitem Arrow; + sellitem Spectacles; + sellitem Red_Potion; + sellitem Orange_Potion; + sellitem Center_Potion; + sellitem Empty_Bottle; + sellitem Wing_Of_Fly; + sellitem Wing_Of_Butterfly; +} + prt_in,109,68,4 trader Trap Specialist#prt 1_F_01,{ OnInit: sellitem Special_Alloy_Trap; @@ -471,6 +509,70 @@ OnInit: sellitem Charm_Earth; } +prontera,218,211,4 trader Pet Groomer#prt 4_M_TELEPORTER,{ +OnInit: + sellitem Pet_Food; + sellitem Pet_Incubator; + sellitem Backpack; + sellitem Rocker_Glasses; + sellitem Vital_Flower_; + sellitem Flame_Gemstone; + sellitem Bun_; + sellitem Vital_Flower; + sellitem Damp_Darkness; + sellitem Small_Snow_Flower; + sellitem Fresh_Plant; + sellitem Big_Cell; + sellitem Apple_Pudding; + sellitem Mystic_Stone; + sellitem Flavored_Alcohol; + sellitem Spirit_Liquor; + sellitem Pumpkin_Pie_; + sellitem Sunset_On_The_Rock; + sellitem Morning_Dew; + sellitem Grilled_Rice_Cake; +} + +prontera,92,209,4 trader Rebellion Weapon Vending 2_VENDING_MACHINE1,{ +OnInit: + sellitem Heaven's_Feather_and_Hell's_Fire; + sellitem Altea_and_Ares; + sellitem Color_Scope; + sellitem RAG203; + sellitem Death_Fire; + sellitem Rolling_Thunder; + sellitem Peace_Breaker; + sellitem Mini_Mei; + sellitem Tempest; + sellitem End_Of_The_Horizon; + sellitem South_Cross; +} + +prontera,96,209,4 trader Rebellion Prop Vending 2_VENDING_MACHINE1,{ +OnInit: + sellitem Slug_Ammunition_L; + sellitem Slug_Ammunition_M; + sellitem Slug_Ammunition_H; + sellitem Full_Metal_Jacket; + sellitem Projection_Landmines; + sellitem Dragon_Tail_Missile; + sellitem Special_Alloy_Trap; + sellitem Bullet; + sellitem Silver_Bullet_; + sellitem Shell_Of_Blood_; + sellitem Armor_Piercing_Bullet; + sellitem Blazing_Bullet; + sellitem Freezing_Bullet; + sellitem Lightning_Bullet; + sellitem Magic_Stone_Bullet; + sellitem Purifying_Bullet; + sellitem Incendiary_Grenade; + sellitem Lightning_Grenade; + sellitem Poison_Grenade; + sellitem Flash_Grenade; + sellitem Cyro_Grenade; +} + //== Rachel ================================================ ra_in01,263,281,4 trader Trap Specialist#ra 1_F_01,{ OnInit: @@ -509,3 +611,28 @@ OnInit: sellitem Surface_Paint; sellitem Face_Paint; } + +//== Cooking Addition ====================================== +prontera,156,212,1 trader Chef Assistant#prt 8_F_GIRL,{ +OnInit: + sellitem Combination_Kit; + sellitem Mushroom; + sellitem Pot; + sellitem Bread; + sellitem Grain; + sellitem Cooking_Oil; + sellitem Plain_Sauce; + sellitem Hot_Sauce; + sellitem Sweet_Sauce; + sellitem Red_Spice; + sellitem Yellow_Spice; + sellitem Delicious_Fish; + sellitem Outdoor_Cooking_Kits; + sellitem Indoor_Cooking_Kits; + sellitem High_end_Cooking_Kits; + sellitem Cookbook01; + sellitem Cookbook02; + sellitem Cookbook03; + sellitem Cookbook04; + sellitem Cookbook05; +} -- cgit v1.2.3-60-g2f50