summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/pre-re/item_db.txt2
-rw-r--r--db/re/item_db.txt2
-rw-r--r--npc/merchants/shops.txt4
-rw-r--r--sql-files/item_db.sql2
4 files changed, 5 insertions, 5 deletions
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index 624b80138..2006bb198 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -3119,7 +3119,7 @@
6091,Dark_Red_Scale,Dark Red Scale,3,200000,,10,,,,,,,,,,,,,{},{},{}
6092,Singing_Crystal_Piece,Piece Of Singing Crystal,3,0,,10,,,,,,,,,,,,,{},{},{}
6093,Egg_Of_Draco,Draco's Egg,3,0,,0,,,,,,,,,,,,,{},{},{}
-//6094,Traditional_Cookie,Traditional Sweets,3,20,,10,,,,,,,,,,,,,{},{},{}
+6094,Traditional_Cookie,Traditional Sweets,3,20,,10,,,,,,,,,,,,,{},{},{}
6095,Flavored_Alcohol,Flavored Alcohol,3,1000,,10,,,,,,,,,,,,,{},{},{}
6096,Fish_With_Blue_Back,Fish With Blue Back,3,20,,10,,,,,,,,,,,,,{},{},{}
6097,Pumpkin_Pie_,Pumpkin Pie,3,20,,10,,,,,,,,,,,,,{},{},{}
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index d2910e47d..77819f390 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -3529,7 +3529,7 @@
6091,Dark_Red_Scale,Dark Red Scale,3,200000,,10,,,,,,,,,,,,,{},{},{}
6092,Singing_Crystal_Piece,Piece Of Singing Crystal,3,0,,10,,,,,,,,,,,,,{},{},{}
6093,Egg_Of_Draco,Draco's Egg,3,0,,0,,,,,,,,,,,,,{},{},{}
-//6094,Traditional_Cookie,Traditional Sweets,3,20,,10,,,,,,,,,,,,,{},{},{}
+6094,Traditional_Cookie,Traditional Sweets,3,20,,10,,,,,,,,,,,,,{},{},{}
6095,Flavored_Alcohol,Flavored Alcohol,3,1000,,10,,,,,,,,,,,,,{},{},{}
6096,Fish_With_Blue_Back,Fish With Blue Back,3,20,,10,,,,,,,,,,,,,{},{},{}
6097,Pumpkin_Pie_,Pumpkin Pie,3,20,,10,,,,,,,,,,,,,{},{},{}
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index f26a63553..db88588cb 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -253,7 +253,7 @@ payon_in01,7,119,2 shop Armor Dealer#pay 76,2401:-1,2403:-1,2405:-1,2501:-1,2503
payon_in01,5,49,7 shop Tool Dealer#pay 88,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
payon_in02,87,34,0 shop Tool Dealer#pay2 75,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
payon,159,96,4 shop Tool Dealer#pay3 88,1750:-1,501:-1,645:-1,601:-1,602:-1
-payon,177,131,4 shop Pet Groomer#pay 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1
+payon,177,131,4 shop Pet Groomer#pay 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
payon,123,109,4 shop Trap Specialist#pay 66,7940:-1,12341:-1
//=======================================================
@@ -265,7 +265,7 @@ prontera,64,125,0 shop Butcher#prt 87,517:-1,528:-1
prontera,58,182,0 shop Flower Girl#prt 96,712:-1,744:-1
prontera,113,42,0 shop Flower Lady#prt 90,712:-1,744:-1
prontera,105,87,0 shop Gift Merchant#prt 91,734:-1,735:-1,736:-1,737:-1,746:-1
-prontera,218,211,4 shop Pet Groomer#prt 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1
+prontera,218,211,4 shop Pet Groomer#prt 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
prontera,248,153,0 shop Doll Supplier#prt 85,740:-1,741:-1,742:-1
prontera,48,58,0 shop Vegetable Gardener#prt 91,515:-1,516:-1,535:-1
//prontera,104,88,5 shop Stuff Gimme 880,616:-1
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index 8e9e4d263..65c1704a8 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -3150,7 +3150,7 @@ REPLACE INTO `item_db` VALUES (6090,'Purified_Bradium','Refined Bradium',3,1100,
REPLACE INTO `item_db` VALUES (6091,'Dark_Red_Scale','Dark Red Scale',3,200000,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (6092,'Singing_Crystal_Piece','Piece Of Singing Crystal',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (6093,'Egg_Of_Draco','Draco\'s Egg',3,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-# REPLACE INTO `item_db` VALUES (6094,'Traditional_Cookie','Traditional Sweets',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (6094,'Traditional_Cookie','Traditional Sweets',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (6095,'Flavored_Alcohol','Flavored Alcohol',3,1000,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (6096,'Fish_With_Blue_Back','Fish With Blue Back',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (6097,'Pumpkin_Pie_','Pumpkin Pie',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);