[wpdev-commits] xmlscripts/definitions/items/equipment drinks.xml,NONE,1.1 food.xml,1.12,1.13 index.xml,1.2,1.3

[Richard M. <dr...@us...>]

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

Modified Files:
	food.xml index.xml 
Added Files:
	drinks.xml 
Log Message:
Cleanups...
And a very long overdue Food/Drink Split/Cleanup


Index: index.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.xml	13 May 2004 07:02:48 -0000	1.2
--- index.xml	17 Jul 2004 03:29:59 -0000	1.3
***************
*** 14,17 ****
--- 14,18 ----
  	<include file="definitions/items/equipment/containers.xml"/>
  	<include file="definitions/items/equipment/currency.xml"/>
+ 	<include file="definitions/items/equipment/drinks.xml" />
  	<include file="definitions/items/equipment/food.xml"/>
  	<include file="definitions/items/equipment/hair.xml"/>

Index: food.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/food.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** food.xml	11 Jul 2004 23:58:26 -0000	1.12
--- food.xml	17 Jul 2004 03:29:59 -0000	1.13
***************
*** 29,73 ****
  <definitions>
  
- 	<!-- Used as a base for all drinks -->
- 	<item id="drinks_base">
- 		<type>105</type>
- 		<weight>0.5</weight>
- 	</item>
- 
  	<!-- Stew -->
  	<item id="970">
[...2059 lines suppressed...]
! 		<buyprice>13</buyprice>
! 		<sellprice>6</sellprice>
! 		<weight>2</weight>
! 	</item>
! 
! 	<item id="1f9e">
! 		<inherit id="drinks_base" />
! 		<category>Equipment\Drinks\Pitcher of Water 4</category>
! 		<id>0x1f9e</id>
! 		<buyprice>13</buyprice>
! 		<sellprice>6</sellprice>
! 		<weight>2</weight>
  	</item>
  
--- 944,948 ----
  	<item id="1eb0">
  		<id>0x1eb0</id>
! 		<category>Equipment\Food\Misc\Burned Food</category>
  	</item>
  

--- NEW FILE: drinks.xml ---
<!--
=================================================================
|   )      (\_     | WOLFPACK 13.0.0 Scripts
|  ((    _/{  "-;  | Created by: Dreoth
|   )).-' {{ ;'`   | Revised by:
|  ( (  ;._ \\ ctr | Last Modification: Split from food.xml
=================================================================
-->

<definitions>

	<!-- Jugs of Cider (3) -->
	<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>

	<!-- Bottle of Liquor -->
	<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>

	<!-- Bottle of Ale -->
	<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>

	<!-- Bucket of Water -->
	<item id="ffa">
		<id>0xffa</id>
		<type>105</type>
		<weight>1.5</weight>
		<category>Equipment\Drinks\Bucket of Water</category>
	</item>

	<item id="1f7d">
		<id>0x1f7d</id>
		<weight>0.2</weight>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Cider 1</category>
	</item>

	<item id="1f7e" inherit="1f7d">
		<id>0x1f7e</id>
		<category>Equipment\Drinks\Glass of Cider 2</category>
	</item>

	<item id="1f7f" inherit="1f7d">
		<id>0x1f7f</id>
		<category>Equipment\Drinks\Glass of Cider 3</category>
	</item>

	<item id="1f80" inherit="1f7d">
		<id>0x1f80</id>
		<category>Equipment\Drinks\Glass of Cider 4</category>
	</item>

	<item id="1f85">
		<id>0x1f85</id>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Liquor 1</category>
	</item>

	<item id="1f86" inherit="1f85">
		<id>0x1f86</id>
		<category>Equipment\Drinks\Glass of Liquor 2</category>
	</item>

	<item id="1f87" inherit="1f85">
		<id>0x1f87</id>
		<category>Equipment\Drinks\Glass of Liquor 3</category>
	</item>

	<item id="1f88" inherit="1f85">
		<id>0x1f88</id>
		<category>Equipment\Drinks\Glass of Liquor 4</category>
	</item>

	<item id="1f89">
		<id>0x1f89</id>
		<weight>0.1</weight>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Milk 1</category>
	</item>

	<item id="1f8a" inherit="1f89">
		<id>0x1f8a</id>
		<category>Equipment\Drinks\Glass of Milk 2</category>
	</item>

	<item id="1f8b" inherit="1f89">
		<id>0x1f8b</id>
		<category>Equipment\Drinks\Glass of Milk 3</category>
	</item>

	<item id="1f8c" inherit="1f89">
		<id>0x1f8c</id>
		<category>Equipment\Drinks\Glass of Milk 4</category>
	</item>

	<item id="1f8d">
		<id>0x1f8d</id>
		<weight>0.1</weight>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Wine 1</category>
	</item>

	<item id="1f8e" inherit="1f8d">
		<id>0x1f8e</id>
		<category>Equipment\Drinks\Glass of Wine 2</category>
	</item>

	<item id="1f8f" inherit="1f8d">
		<id>0x1f8f</id>
		<category>Equipment\Drinks\Glass of Wine 3</category>
	</item>

	<item id="1f90" inherit="1f8d">
		<id>0x1f90</id>
		<category>Equipment\Drinks\Glass of Wine 4</category>
	</item>

	<item id="1f91">
		<id>0x1f91</id>
		<weight>0.1</weight>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Water 1</category>
	</item>

	<item id="1f92" inherit="1f91">
		<id>0x1f92</id>
		<category>Equipment\Drinks\Glass of Water 2</category>
	</item>

	<item id="1f93" inherit="1f91">
		<id>0x1f93</id>
		<category>Equipment\Drinks\Glass of Water 3</category>
	</item>

	<item id="1f94" inherit="1f91">
		<id>0x1f94</id>
		<category>Equipment\Drinks\Glass of Water 4</category>
	</item>

	<item id="1f95">
		<id>0x1f95</id>
		<buyprice>13</buyprice>
		<sellprice>6</sellprice>
		<weight>2</weight>
		<type>105</type>
		<category>Equipment\Drinks\Pitcher of Ale 1</category>
	</item>

	<item id="1f96" inherit="1f95">
		<id>0x1f96</id>
		<category>Equipment\Drinks\Pitcher of Ale 2</category>
	</item>

	<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>

	<item id="1f98" inherit="1f97">
		<id>0x1f98</id>
		<category>Equipment\Drinks\Pitcher of Cider 2</category>
	</item>

	<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>

	<item id="1f9a" inherit="1f99">
		<id>0x1f9a</id>
		<category>Equipment\Drinks\Pitcher of Liquor 2</category>
	</item>

	<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>

	<item id="1f9c" inherit="1f9b">
		<id>0x1f9c</id>
		<category>Equipment\Drinks\Pitcher of Wine 2</category>
	</item>

	<!-- Pitcher of Water 1 -->
	<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>

	<!-- Pitcher of Water 2 -->
	<item id="ff9" inherit="ff8">
		<id>0xff9</id>
		<category>Equipment\Food\Pitcher of Water 2</category>
	</item>

	<!-- Pitcher of Water 3 -->
	<item id="1f9d" inherit="ff8">
		<id>0x1f9d</id>
		<category>Equipment\Drinks\Pitcher of Water 3</category>
	</item>

	<!-- Pitcher of Water 4 -->
	<item id="1f9e" inherit="ff8">
		<id>0x1f9e</id>
		<category>Equipment\Drinks\Pitcher of Water 4</category>
	</item>

</definitions>