summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.txt20
3 files changed, 22 insertions, 18 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 a76949e83..d874147b9 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 =======================================
-//= 2.3
+//= 2.3.1
//=========================================================================
//== 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;