From a87e534b77bf048f0589ac88900380403f423afa Mon Sep 17 00:00:00 2001
From: ryo_saeba <ryo_saeba@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 9 Oct 2005 08:34:14 +0000
Subject: [PATCH] Use on_use_yield field instead of inventory for item
 dropping. Remove unused treasure list

git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/trunk/arch@3845 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 food/booze.arc           |  4 ++--
 food/poisonfood.arc      |  6 +++---
 food/water.arc           |  2 +-
 food/wine.arc            |  2 +-
 potion/empty_bottles.trs | 19 -------------------
 potion/vials.arc         | 14 +++++++-------
 6 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 potion/empty_bottles.trs

diff --git a/food/booze.arc b/food/booze.arc
index 83ed281d1..e85b81a6b 100644
--- a/food/booze.arc
+++ b/food/booze.arc
@@ -1,7 +1,7 @@
 Object booze
 face booze.111
 color_fg orange
-randomitems emptyboozebottle
+on_use_yield boozebottle_empty
 food 100
 nrof 1
 type 54
@@ -12,5 +12,5 @@ editable 2048
 identified 1
 name_pl boozes
 client_type 611
-slaying vial_posion:posion
+slaying vial_poison:poison
 end
diff --git a/food/poisonfood.arc b/food/poisonfood.arc
index e617a958a..1a28782c2 100644
--- a/food/poisonfood.arc
+++ b/food/poisonfood.arc
@@ -1,7 +1,7 @@
 Object poison
 name booze
 face booze.111
-randomitems emptyboozebottle
+on_use_yield boozebottle_empty
 color_fg orange
 nrof 1
 type 7
@@ -19,7 +19,7 @@ end
 Object wine_poison
 name bottle of wine
 face wine.111
-randomitems emptywinebottle
+on_use_yield winebottle_empty
 color_fg red
 food 75
 nrof 1
@@ -57,7 +57,7 @@ end
 #
 Object water_poison
 face water.111
-randomitems emptywaterbottle
+on_use_yield wbottle_empty
 color_fg blue
 food 5
 nrof 1
diff --git a/food/water.arc b/food/water.arc
index 642d9d25e..d8c2ba484 100644
--- a/food/water.arc
+++ b/food/water.arc
@@ -1,6 +1,6 @@
 Object water
 face water.111
-randomitems emptywaterbottle
+on_use_yield wbottle_empty
 color_fg blue
 food 5
 nrof 1
diff --git a/food/wine.arc b/food/wine.arc
index 7251bb6cb..1c72e42fa 100644
--- a/food/wine.arc
+++ b/food/wine.arc
@@ -1,7 +1,7 @@
 Object wine
 name bottle of wine
 face wine.111
-randomitems emptywinebottle
+on_use_yield winebottle_empty
 color_fg red
 food 75
 nrof 1
diff --git a/potion/empty_bottles.trs b/potion/empty_bottles.trs
deleted file mode 100644
index 237e7fa9d..000000000
--- a/potion/empty_bottles.trs
+++ /dev/null
@@ -1,19 +0,0 @@
-treasure emptywaterbottle
-  arch wbottle_empty
-end
-#
-treasure emptypotionbottle
-  arch potion_empty
-end
-#
-treasure emptyvialbottle
-  arch vial_empty
-end
-#
-treasure emptywinebottle
-  arch winebottle_empty
-end
-#
-treasure emptyboozebottle
-  arch boozebottle_empty
-end
diff --git a/potion/vials.arc b/potion/vials.arc
index 32b2db612..10528986f 100644
--- a/potion/vials.arc
+++ b/potion/vials.arc
@@ -10,7 +10,7 @@ material 32
 value 4
 weight 150
 editable 2048
-randomitems emptyvialbottle
+on_use_yield vial_empty
 client_type 611
 end
 
@@ -26,7 +26,7 @@ material 32
 value 4
 weight 150
 editable 2048
-randomitems emptyvialbottle
+on_use_yield vial_empty
 client_type 611
 end
 
@@ -42,7 +42,7 @@ material 32
 value 4
 weight 150
 editable 2048
-randomitems emptyvialbottle
+on_use_yield vial_empty
 client_type 611
 end
 
@@ -58,7 +58,7 @@ material 32
 value 4
 weight 150
 editable 2048
-randomitems emptyvialbottle
+on_use_yield vial_empty
 client_type 611
 end
 
@@ -74,7 +74,7 @@ material 32
 value 4
 weight 150
 editable 2048
-randomitems emptyvialbottle
+on_use_yield vial_empty
 client_type 611
 end
 
@@ -90,7 +90,7 @@ material 32
 value 4
 weight 150
 editable 2048
-randomitems emptyvialbottle
+on_use_yield vial_empty
 client_type 611
 end
 
@@ -106,6 +106,6 @@ material 32
 value 4
 weight 150
 editable 2048
-randomitems emptyvialbottle
+on_use_yield vial_empty
 client_type 611
 end