summaryrefslogtreecommitdiff
path: root/npc/re/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/merchants')
-rw-r--r--npc/re/merchants/ammo_boxes.txt10
-rw-r--r--npc/re/merchants/ammo_dealer.txt10
-rw-r--r--npc/re/merchants/shops.txt239
3 files changed, 240 insertions, 19 deletions
diff --git a/npc/re/merchants/ammo_boxes.txt b/npc/re/merchants/ammo_boxes.txt
index 22f6d694b..a8a04d976 100644
--- a/npc/re/merchants/ammo_boxes.txt
+++ b/npc/re/merchants/ammo_boxes.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Euphy
//=
//= Hercules is free software: you can redistribute it and/or modify
@@ -29,12 +29,8 @@
//================= Description ===========================================
//= Turns bullets into magazines/packs.
//================= Current Version =======================================
-//= 1.1
+//= 1.2
//=========================================================================
que_ng,187,149,3 duplicate(mdk) Magazine Dealer Kenny#ng 4_M_01
-izlude,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01
-izlude_a,74,104,3 duplicate(mdk) Magazine Dealer Kenny#a 4_M_01
-izlude_b,74,104,3 duplicate(mdk) Magazine Dealer Kenny#b 4_M_01
-izlude_c,74,104,3 duplicate(mdk) Magazine Dealer Kenny#c 4_M_01
-izlude_d,74,104,3 duplicate(mdk) Magazine Dealer Kenny#d 4_M_01
+izlude_in,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01
diff --git a/npc/re/merchants/ammo_dealer.txt b/npc/re/merchants/ammo_dealer.txt
index 87d641910..6b273371d 100644
--- a/npc/re/merchants/ammo_dealer.txt
+++ b/npc/re/merchants/ammo_dealer.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Euphy
//=
//= Hercules is free software: you can redistribute it and/or modify
@@ -29,12 +29,8 @@
//================= Description ===========================================
//= Bullet trader.
//================= Current Version =======================================
-//= 1.1
+//= 1.2
//=========================================================================
que_ng,187,156,3 duplicate(bdt) Bullet Dealer Tony#ng 4_M_04
-izlude,77,104,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 //Official: (74,106) -> in the water
-izlude_a,77,104,3 duplicate(bdt) Bullet Dealer Tony#a 4_M_04
-izlude_b,77,104,3 duplicate(bdt) Bullet Dealer Tony#b 4_M_04
-izlude_c,77,104,3 duplicate(bdt) Bullet Dealer Tony#c 4_M_04
-izlude_d,77,104,3 duplicate(bdt) Bullet Dealer Tony#d 4_M_04
+izlude_in,74,106,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 773fddef8..54155e8c4 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -9,7 +9,7 @@
//= This file is part of Hercules.
//= http://herc.ws - http://github.com/HerculesWS/Hercules
//=
-//= Copyright (C) 2012-2015 Hercules Dev Team
+//= Copyright (C) 2012-2016 Hercules Dev Team
//= Copyright (C) Frost
//= Copyright (C) rAthena Dev Team
//= Copyright (C) Lemongrass
@@ -36,7 +36,7 @@
//================= Description ===========================================
//= Renewal-specific town shop NPCs.
//================= Current Version =======================================
-//= 2.1
+//= 2.4
//=========================================================================
//== Comodo ================================================
@@ -192,10 +192,22 @@ OnInit:
sellitem Pet_Incubator;
sellitem Backpack;
sellitem Rocker_Glasses;
- sellitem Mojji;
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;
}
izlude_in,57,110,0 trader Tool Dealer#iz 1_M_01,{
@@ -205,16 +217,16 @@ OnInit:
sellitem Orange_Potion;
sellitem Yellow_Potion;
sellitem White_Potion;
- sellitem Green_Potion;
sellitem Center_Potion;
sellitem Awakening_Potion;
+ sellitem Empty_Bottle;
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,{
+izlude_in,72,110,3 trader Trading Merchant#iz 4_M_HUMERCHANT,{
OnInit:
sellitem Bullet;
sellitem Silver_Bullet;
@@ -744,6 +756,166 @@ OnInit:
sellitem Flower_Ring;
}
+//== Geffen ================================================
+geffen_in,77,167,0 trader Tool Dealer#gef 1_F_03,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ 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;
+}
+
+geffen,193,152,4 trader Pet Groomer#gef 4_F_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;
+}
+
+geffen_in,171,123,4 trader Tool Dealer#gef2 1_M_WIZARD,{
+OnInit:
+ sellitem Empty_Cylinder;
+ sellitem Empty_Potion;
+ sellitem Empty_Bottle;
+}
+
+//== Alberta ===============================================
+alb2trea,87,65,5 trader Tool Dealer#alb 4_M_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Silver_Arrow;
+ sellitem Fire_Arrow;
+ sellitem Red_Potion;
+ sellitem Orange_Potion;
+ sellitem Yellow_Potion;
+ sellitem White_Potion;
+ sellitem Center_Potion;
+ sellitem Awakening_Potion;
+ sellitem Empty_Bottle;
+}
+
+alberta_in,182,97,0 trader Tool Dealer#alb2 1_F_MERCHANT_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ 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;
+}
+
+alberta_in,176,81,3 trader Trading Merchant#alb 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;
+}
+
+//== Payon =================================================
+payon,159,96,4 trader Tool Dealer#pay3 4_M_ORIENT01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Red_Potion;
+ sellitem Center_Potion;
+ sellitem Empty_Bottle;
+ sellitem Wing_Of_Fly;
+ sellitem Wing_Of_Butterfly;
+}
+
+payon_in01,5,49,7 trader Tool Dealer#pay 4_M_ORIENT01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Spectacles;
+ 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;
+}
+
+payon,177,131,4 trader Pet Groomer#pay 4_F_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;
+}
+
+payon_in02,87,34,0 trader Tool Dealer#pay2 1_F_ORIENT_01,{
+OnInit:
+ sellitem Arrow;
+ sellitem Silver_Arrow;
+ sellitem Spectacles;
+ 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;
+}
+
//== Rachel ================================================
ra_in01,263,281,4 trader Trap Specialist#ra 1_F_01,{
OnInit:
@@ -826,3 +998,60 @@ OnInit:
sellitem Indoor_Cooking_Kits;
sellitem High_end_Cooking_Kits;
}
+
+geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{
+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;
+}
+
+alberta,167,135,5 trader Chef Assistant#alb 4_M_05,{
+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;
+}
+
+payon,206,119,5 trader Chef Assistant#pay 4_M_ORIENT02,{
+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;
+}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 17:17:03 +0000