[wpdev-commits] xmlscripts/definitions/items/equipment drinks.xml,1.1,1.2

[Sebastian H. <dar...@us...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7456/items/equipment

Modified Files:
	drinks.xml 
Log Message:
More options for the beverage script

Index: drinks.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/drinks.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** drinks.xml	17 Jul 2004 03:29:59 -0000	1.1
--- drinks.xml	23 Jul 2004 19:42:10 -0000	1.2
***************
*** 13,35 ****
  	<item id="98d">
  		<id>0x98d</id>
! 		<type>105</type>
! 		<weight>0.5</weight>
! 		<buyprice>15</buyprice>
! 		<sellprice>7</sellprice>
! 		<category>Equipment\Drinks\Jug of Cider 3</category>
  	</item>
  
  	<!-- Jugs of Cider (2) -->
! 	<item id="98e" inherit="98d">
! 		<baseid>98d</baseid>
  		<id>0x98e</id>
! 		<category>Equipment\Drinks\Jug of Cider 2</category>
  	</item>
  
! 	<!-- Jug of Cider -->
! 	<item id="9c8" inherit="98d">
! 		<baseid>98d</baseid>
  		<id>0x9c8</id>
! 		<category>Equipment\Drinks\Jug of Cider 1</category>
  	</item>
  
--- 13,29 ----
  	<item id="98d">
  		<id>0x98d</id>
! 		<category>Equipment\Drinks\Jug of Cider (3)</category>
  	</item>
  
  	<!-- Jugs of Cider (2) -->
! 	<item id="98e">
  		<id>0x98e</id>
! 		<category>Equipment\Drinks\Jug of Cider (2)</category>
  	</item>
  
! 	<item id="9c8">
  		<id>0x9c8</id>
! 		<events>beverage</events>
! 		<weight>1.0</weight>
  	</item>
  
***************
*** 37,66 ****
  	<item id="99b">
  		<id>0x99b</id>
! 		<type>105</type>
! 		<weight>0.5</weight>
! 		<buyprice>4</buyprice>
! 		<sellprice>4</sellprice>
! 		<category>Equipment\Drinks\Bottle of Liquor 1</category>
  	</item>
  
  	<!-- Bottle of Liquor (2) -->
! 	<item id="99c" inherit="99b">
! 		<baseid>99b</baseid>
  		<id>0x99c</id>
! 		<category>Equipment\Drinks\Bottle of Liquor 2</category>
  	</item>
  
  	<!-- Bottle of Liquor (3) -->
! 	<item id="99d" inherit="99b">
! 		<baseid>99b</baseid>
  		<id>0x99d</id>
! 		<category>Equipment\Drinks\Bottle of Liquor 3</category>
  	</item>
  
  	<!-- Bottle of Liquor (4) -->
! 	<item id="99e" inherit="99b">
! 		<baseid>99b</baseid>
  		<id>0x99e</id>
! 		<category>Equipment\Drinks\Bottle of Liquor 4</category>
  	</item>
  
--- 31,54 ----
  	<item id="99b">
  		<id>0x99b</id>
! 		<events>beverage</events>
! 		<weight>1.0</weight>
  	</item>
  
  	<!-- Bottle of Liquor (2) -->
! 	<item id="99c">
  		<id>0x99c</id>
! 		<category>Equipment\Drinks\Bottle of Liquor (2)</category>
  	</item>
  
  	<!-- Bottle of Liquor (3) -->
! 	<item id="99d">
  		<id>0x99d</id>
! 		<category>Equipment\Drinks\Bottle of Liquor (3)</category>
  	</item>
  
  	<!-- Bottle of Liquor (4) -->
! 	<item id="99e">
  		<id>0x99e</id>
! 		<category>Equipment\Drinks\Bottle of Liquor (4)</category>
  	</item>
  
***************
*** 68,137 ****
  	<item id="99f">
  		<id>0x99f</id>
! 		<type>105</type>
! 		<weight>0.5</weight>
! 		<buyprice>8</buyprice>
! 		<sellprice>4</sellprice>
! 		<category>Equipment\Drinks\Bottle of Ale 1</category>
  	</item>
  
  	<!-- Bottles of Ale (2) -->
! 	<item id="9a0" inherit="99f">
! 		<baseid>99f</baseid>
  		<id>0x9a0</id>
! 		<category>Equipment\Drinks\Bottle of Ale 2</category>
  	</item>
  
  	<!-- Bottles of Ale (3) -->
! 	<item id="9a1" inherit="99f">
! 		<baseid>99f</baseid>
  		<id>0x9a1</id>
! 		<category>Equipment\Drinks\Bottle of Ale 3</category>
  	</item>
  
  	<!-- Bottles of Ale (4) -->
! 	<item id="9a2" inherit="99f">
! 		<baseid>99f</baseid>
  		<id>0x9a2</id>
! 		<category>Equipment\Drinks\Bottle of Ale 4</category>
! 	</item>
! 
! 	<!-- Pitcher of Milk -->
! 	<!-- NOTE: Needs to create an empty pitcher when drunk -->
! 	<item id="9ad">
! 		<id>0x9ad</id>
! 		<type>105</type>
! 		<weight>0.5</weight>
! 		<category>Equipment\Drinks\Pitcher of Milk 1</category>
  	</item>
! 
  	<!-- Bottles of Wine (4) -->
  	<item id="9c4">
  		<id>0x9c4</id>
! 		<type>105</type>
! 		<weight>0.5</weight>
! 		<buyprice>8</buyprice>
! 		<sellprice>4</sellprice>
! 		<category>Equipment\Drinks\Bottle of Wine 4</category>
  	</item>
  
  	<!-- Bottles of wine (3) -->
! 	<item id="9c5" inherit="9c4">
! 		<baseid>9c4</baseid>
  		<id>0x9c5</id>
! 		<category>Equipment\Drinks\Bottle of Wine 3</category>
  	</item>
  
  	<!-- Bottles of wine (2) -->
! 	<item id="9c6" inherit="9c4">
! 		<baseid>9c4</baseid>
  		<id>0x9c6</id>
! 		<category>Equipment\Drinks\Bottle of Wine 2</category>
  	</item>
  
  	<!-- Bottle of wine -->
! 	<item id="9c7" inherit="9c4">
! 		<baseid>9c4</baseid>
  		<id>0x9c7</id>
! 		<category>Equipment\Drinks\Bottle of Wine 1</category>
  	</item>
  
--- 56,162 ----
  	<item id="99f">
  		<id>0x99f</id>
! 		<events>beverage</events>
! 		<weight>1.0</weight>
  	</item>
  
  	<!-- Bottles of Ale (2) -->
! 	<item id="9a0">
  		<id>0x9a0</id>
! 		<category>Equipment\Drinks\Bottle of Ale (2)</category>
  	</item>
  
  	<!-- Bottles of Ale (3) -->
! 	<item id="9a1">
  		<id>0x9a1</id>
! 		<category>Equipment\Drinks\Bottle of Ale (3)</category>
  	</item>
  
  	<!-- Bottles of Ale (4) -->
! 	<item id="9a2">
  		<id>0x9a2</id>
! 		<category>Equipment\Drinks\Bottle of Ale (4)</category>
  	</item>
! 	
  	<!-- Bottles of Wine (4) -->
  	<item id="9c4">
  		<id>0x9c4</id>
! 		<category>Equipment\Drinks\Bottle of Wine (4)</category>
  	</item>
  
  	<!-- Bottles of wine (3) -->
! 	<item id="9c5">
  		<id>0x9c5</id>
! 		<category>Equipment\Drinks\Bottle of Wine (3)</category>
  	</item>
  
  	<!-- Bottles of wine (2) -->
! 	<item id="9c6">
  		<id>0x9c6</id>
! 		<category>Equipment\Drinks\Bottle of Wine (2)</category>
  	</item>
  
  	<!-- Bottle of wine -->
! 	<item id="9c7">
  		<id>0x9c7</id>
! 		<events>beverage</events>
! 		<weight>1.0</weight>
! 	</item>
! 	
! 	<!-- Bottles -->
! 	<item id="bottle_ale" inherit="99f">
! 		<category>Equipment\Drinks\Bottle of Ale</category>
! 		<tag name="fluid" value="ale" />
! 		<tag name="quantity" value="5" />
! 		<events>beverage</events>
! 		<weight>1.0</weight>
! 	</item>
! 	
! 	<item id="bottle_cider" inherit="99f">
! 		<category>Equipment\Drinks\Bottle of Cider</category>
! 		<tag name="fluid" value="cider" />
! 		<tag name="quantity" value="5" />
! 		<events>beverage</events>
! 		<weight>1.0</weight>
! 	</item>
! 	
! 	<item id="bottle_liquor" inherit="99b">
! 		<category>Equipment\Drinks\Bottle of Liquor</category>
! 		<tag name="fluid" value="liquor" />
! 		<tag name="quantity" value="5" />
! 		<events>beverage</events>
! 		<weight>1.0</weight>
! 	</item>
! 	
! 	<item id="bottle_milk" inherit="99b">
! 		<category>Equipment\Drinks\Bottle of Milk</category>
! 		<tag name="fluid" value="milk" />
! 		<tag name="quantity" value="5" />
! 		<events>beverage</events>
! 		<weight>1.0</weight>
! 	</item>
! 	
! 	<item id="bottle_wine" inherit="9c7">
! 		<category>Equipment\Drinks\Bottle of Wine</category>
! 		<tag name="fluid" value="wine" />
! 		<tag name="quantity" value="5" />
! 		<events>beverage</events>
! 		<weight>1.0</weight>
! 	</item>
! 	
! 	<item id="bottle_water" inherit="99b">
! 		<category>Equipment\Drinks\Bottle of Water</category>
! 		<tag name="fluid" value="water" />
! 		<tag name="quantity" value="5" />
! 		<events>beverage</events>
! 		<weight>1.0</weight>
! 	</item>
! 
! 	<!-- Pitcher of Milk -->
! 	<!-- NOTE: Needs to create an empty pitcher when drunk -->
! 	<item id="9ad">
! 		<id>0x9ad</id>
! 		<events>beverage</events>
! 		<weight>0.5</weight>
! 		<category>Equipment\Drinks\Pitcher of Milk 1</category>
  	</item>
  
***************
*** 139,143 ****
  	<item id="ffa">
  		<id>0xffa</id>
- 		<type>105</type>
  		<weight>1.5</weight>
  		<category>Equipment\Drinks\Bucket of Water</category>
--- 164,167 ----
***************
*** 146,152 ****
  	<item id="1f7d">
  		<id>0x1f7d</id>
! 		<weight>0.2</weight>
! 		<type>105</type>
  		<category>Equipment\Drinks\Glass of Cider 1</category>
  	</item>
  
--- 170,178 ----
  	<item id="1f7d">
  		<id>0x1f7d</id>
! 		<weight>1.0</weight>
! 		<events>beverage</events>
  		<category>Equipment\Drinks\Glass of Cider 1</category>
+ 		<tag name="fluid" value="cider" />
+ 		<tag name="quantity" value="5" type="int" />
  	</item>
  
***************
*** 168,173 ****
  	<item id="1f85">
  		<id>0x1f85</id>
! 		<type>105</type>
  		<category>Equipment\Drinks\Glass of Liquor 1</category>
  	</item>
  
--- 194,202 ----
  	<item id="1f85">
  		<id>0x1f85</id>
! 		<events>beverage</events>
  		<category>Equipment\Drinks\Glass of Liquor 1</category>
+ 		<weight>1.0</weight>
+ 		<tag name="fluid" value="liquor" />
+ 		<tag name="quantity" value="5" type="int" />
  	</item>
  
***************
*** 189,194 ****
  	<item id="1f89">
  		<id>0x1f89</id>
! 		<weight>0.1</weight>
! 		<type>105</type>
  		<category>Equipment\Drinks\Glass of Milk 1</category>
  	</item>
--- 218,225 ----
  	<item id="1f89">
  		<id>0x1f89</id>
! 		<weight>1.0</weight>
! 		<tag name="fluid" value="milk" />
! 		<tag name="quantity" value="5" type="int" />
! 		<events>beverage</events>
  		<category>Equipment\Drinks\Glass of Milk 1</category>
  	</item>
***************
*** 211,216 ****
  	<item id="1f8d">
  		<id>0x1f8d</id>
! 		<weight>0.1</weight>
! 		<type>105</type>
  		<category>Equipment\Drinks\Glass of Wine 1</category>
  	</item>
--- 242,249 ----
  	<item id="1f8d">
  		<id>0x1f8d</id>
! 		<weight>1.0</weight>
! 		<tag name="fluid" value="wine" />
! 		<tag name="quantity" value="5" type="int" />
! 		<events>beverage</events>
  		<category>Equipment\Drinks\Glass of Wine 1</category>
  	</item>
***************
*** 231,238 ****
  	</item>
  
  	<item id="1f91">
  		<id>0x1f91</id>
! 		<weight>0.1</weight>
! 		<type>105</type>
  		<category>Equipment\Drinks\Glass of Water 1</category>
  	</item>
--- 264,295 ----
  	</item>
  
+ 	<item id="1f81">
+ 		<category>Equipment\Drinks\Empty Glass 1</category>
+ 		<id>0x1f81</id>
+ 		<weight>1.0</weight>
+ 		<events>beverage</events>
+ 	</item>
+ 
+ 	<item id="1f82" inherit="1f81">
+ 		<id>0x1f82</id>
+ 		<category>Equipment\Drinks\Empty Glass 2</category>
+ 	</item>
+ 
+ 	<item id="1f83" inherit="1f81">
+ 		<id>0x1f83</id>
+ 		<category>Equipment\Drinks\Empty Glass 3</category>
+ 	</item>
+ 
+ 	<item id="1f84" inherit="1f81">
+ 		<id>0x1f84</id>
+ 		<category>Equipment\Drinks\Empty Glass 4</category>
+ 	</item>
+ 
  	<item id="1f91">
  		<id>0x1f91</id>
! 		<weight>1.0</weight>
! 		<tag name="fluid" value="water" />
! 		<tag name="quantity" value="5" type="int" />
! 		<events>beverage</events>
  		<category>Equipment\Drinks\Glass of Water 1</category>
  	</item>
***************
*** 257,262 ****
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>2</weight>
! 		<type>105</type>
  		<category>Equipment\Drinks\Pitcher of Ale 1</category>
  	</item>
--- 314,321 ----
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<events>beverage</events>
! 		<weight>1.0</weight>
! 		<tag name="fluid" value="ale" />
! 		<tag name="quantity" value="5" type="int" />
  		<category>Equipment\Drinks\Pitcher of Ale 1</category>
  	</item>
***************
*** 269,276 ****
  	<item id="1f97">
  		<id>0x1f97</id>
! 		<type>105</type>
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>2</weight>
  		<category>Equipment\Drinks\Pitcher of Cider 1</category>
  	</item>
--- 328,337 ----
  	<item id="1f97">
  		<id>0x1f97</id>
! 		<events>beverage</events>
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>1.0</weight>
! 		<tag name="fluid" value="cider" />
! 		<tag name="quantity" value="5" type="int" />
  		<category>Equipment\Drinks\Pitcher of Cider 1</category>
  	</item>
***************
*** 283,290 ****
  	<item id="1f99">
  		<id>0x1f99</id>
! 		<type>105</type>
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>2</weight>
  		<category>Equipment\Drinks\Pitcher of Liquor 1</category>
  	</item>
--- 344,353 ----
  	<item id="1f99">
  		<id>0x1f99</id>
! 		<events>beverage</events>
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>1.0</weight>
! 		<tag name="fluid" value="liquor" />
! 		<tag name="quantity" value="5" type="int" />
  		<category>Equipment\Drinks\Pitcher of Liquor 1</category>
  	</item>
***************
*** 297,304 ****
  	<item id="1f9b">
  		<id>0x1f9b</id>
! 		<type>105</type>
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>2</weight>
  		<category>Equipment\Drinks\Pitcher of Wine 1</category>
  	</item>
--- 360,369 ----
  	<item id="1f9b">
  		<id>0x1f9b</id>
! 		<events>beverage</events>
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>1.0</weight>
! 		<tag name="fluid" value="wine" />
! 		<tag name="quantity" value="5" type="int" />
  		<category>Equipment\Drinks\Pitcher of Wine 1</category>
  	</item>
***************
*** 312,319 ****
  	<item id="ff8">
  		<id>0xff8</id>
! 		<type>105</type>
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>2</weight>
  		<category>Equipment\Food\Pitcher of Water 1</category>
  	</item>
--- 377,386 ----
  	<item id="ff8">
  		<id>0xff8</id>
! 		<events>beverage</events>
  		<buyprice>13</buyprice>
  		<sellprice>6</sellprice>
! 		<weight>1.0</weight>
! 		<tag name="fluid" value="water" />
! 		<tag name="quantity" value="5" type="int" />
  		<category>Equipment\Food\Pitcher of Water 1</category>
  	</item>