Empty Box can be purchased, and buy/sell prices were mildly adjusted.

4 files changed, 21 insertions, 11 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 4ae9bbc79..4b23c02c6 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -442,7 +442,7 @@ item_db: (
 	Name: "Plushroom"
 	Type: "IT_HEALING"
 	Buy: 42
-	Sell: 13
+	Sell: 9
 	Weight: 8
 	Refine: false
 	ViewSprite: 515
@@ -2509,8 +2509,8 @@ item_db: (
 	AegisName: "EmptyBox"
 	Name: "Empty Box"
 	Type: "IT_USABLE"
-	Buy: 100
-	Sell: 35
+	Buy: 25
+	Sell: 5
 	Weight: 80
 	Refine: false
 	ViewSprite: 631
@@ -2710,8 +2710,8 @@ item_db: (
 	AegisName: "FishBox"
 	Name: "Fish Box"
 	Type: "IT_ETC"
-	Buy: 1250
-	Sell: 345
+	Buy: 12500
+	Sell: 1200
 	Weight: 1250
 	Refine: false
 	ViewSprite: 713
@@ -2741,8 +2741,8 @@ item_db: (
 	AegisName: "PlushroomBox"
 	Name: "Plushroom Box"
 	Type: "IT_ETC"
-	Buy: 2
-	Sell: 1
+	Buy: 2000
+	Sell: 800
 	Weight: 720
 	Refine: false
 	ViewSprite: 716
diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index 57f83fe51..0ad147e4e 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -70,6 +70,7 @@ OnInit:
     sellitem RoastedMaggot, -1, 2;
     sellitem Arrow, -1, rand(10000,30000);
     sellitem CroconutBox, rand(2650,2950), 4;
+    sellitem EmptyBox, -1, 2;
 
     .sex = G_MALE;
     .distance = 5;
@@ -82,6 +83,7 @@ OnClock2359:
     restoreshopitem Arrow, -1, rand(10000,30000);
     restoreshopitem RoastedMaggot, -1, 2;
     restoreshopitem CroconutBox, rand(2650,3000), 4;
+    restoreshopitem EmptyBox, -1, 2;
     end;
 
 }
diff --git a/npc/003-1/shop.txt b/npc/003-1/shop.txt
index 68573beb9..e33f3b3f1 100644
--- a/npc/003-1/shop.txt
+++ b/npc/003-1/shop.txt
@@ -15,6 +15,7 @@ OnInit:
     sellitem Bread, -1, 15;
     sellitem CroconutBox, rand(2800,2900), 6;
     sellitem EmptyBottle, -1, 3; // You can buy some empty bottles here, but they're scarse
+    sellitem EmptyBox, -1, 1;
 
     .sex = G_OTHER;
     .distance = 3;
@@ -32,5 +33,6 @@ OnClock0000:
     restoreshopitem Bread, -1, 15;
     restoreshopitem CroconutBox, rand(2800,3050), 6;
     restoreshopitem EmptyBottle, -1, 3;
+    restoreshopitem EmptyBox, -1, 1;
 }
 
diff --git a/npc/items/emptybox.txt b/npc/items/emptybox.txt
index 0243cac6c..558733156 100644
--- a/npc/items/emptybox.txt
+++ b/npc/items/emptybox.txt
@@ -10,6 +10,7 @@
 OnUse:
     mesn;
     mesc l("You can fill this box with the following:");
+    mesc l("- @@ @@", 7, getitemlink(GrassCarp));
     mesc l("- @@ @@", 17, getitemlink(Croconut));
     mesc l("- @@ @@", 20, getitemlink(CommonCarp));
     mesc l("- @@ @@", 87, getitemlink(Plushroom));
@@ -17,21 +18,26 @@ OnUse:
     mesc l("Fill with what?");
     select
         l("Don't fill"),
+        rif(countitem(GrassCarp) >= 7, l("7 Grass Carp")),
         rif(countitem(Croconut) >= 17, l("17 Croconut")),
         rif(countitem(CommonCarp) >= 20, l("20 Common Carp")),
         rif(countitem(Plushroom) >= 87, l("87 Plushroom"));
     mes "";
     switch (@menu) {
         case 2:
+            delitem GrassCarp, 7;
+            getitem FishBox, 1;
+            break;
+        case 3:
             delitem Croconut, 17;
             getitem CroconutBox, 1;
             break;
-        case 3:
-            delitem CommonCarp, 17;
+        case 4:
+            delitem CommonCarp, 20;
             getitem FishBox, 1;
             break;
-        case 4:
-            delitem Plushroom, 17;
+        case 5:
+            delitem Plushroom, 87;
             getitem PlushroomBox, 1;
             break;
         default: