[wpdev-commits] xmlscripts/definitions/npcs/humans civilists.xml,1.7,1.8 guards.xml,1.7,1.8 vendors.xml,1.26,1.27

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans
In directory sc8-pr-cvs1:/tmp/cvs-serv22506/npcs/humans

Modified Files:
	civilists.xml guards.xml vendors.xml 
Log Message:
Fixed a bug player and npc equipment not being sent and fixed a bug with saving the baseid property. Also improved handling of several tags in the definitions. It's not <item inherit anylonger but <item id

Index: civilists.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/civilists.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** civilists.xml	28 Sep 2003 19:07:06 -0000	1.7
--- civilists.xml	24 Nov 2003 03:15:33 -0000	1.8
***************
*** 19,27 ****
  		<!-- The Equipment of a standard human -->
  		<equipped>
! 			<item inherit="e75" /> <!-- Backpack -->
! 			<item inheritlist="HAIR" /> <!-- Random Hair -->
! 			<item inheritlist="SHIRTS" /> <!-- Random Shirts -->
! 			<item inheritlist="PANTS" /> <!-- Random Pants -->
! 			<item inheritlist="SHOES" /> <!-- Random Shoes -->
  		</equipped>
  
--- 19,27 ----
  		<!-- The Equipment of a standard human -->
  		<equipped>
! 			<item id="e75" /> <!-- Backpack -->
! 			<item list="HAIR" /> <!-- Random Hair -->
! 			<item list="SHIRTS" /> <!-- Random Shirts -->
! 			<item list="PANTS" /> <!-- Random Pants -->
! 			<item list="SHOES" /> <!-- Random Shoes -->
  		</equipped>
  
***************
*** 42,50 ****
  		<!-- The Equipment of a standard human -->
  		<equipped>
! 			<item inherit="e75" /> 			<!-- Backpack -->
! 			<item inheritlist="HAIR_FEMALE" /> 	<!-- Random Hair -->
! 			<item inheritlist="DRESS" /> 		<!-- Random Dress`s -->
! 			<item inheritlist="PANTS" /> 		<!-- Random Pants -->
! 			<item inheritlist="SHOES" /> 		<!-- Random Shoes -->
  		</equipped>
  
--- 42,50 ----
  		<!-- The Equipment of a standard human -->
  		<equipped>
! 			<item id="e75" /> 			<!-- Backpack -->
! 			<item list="HAIR_FEMALE" /> 	<!-- Random Hair -->
! 			<item list="DRESS" /> 		<!-- Random Dress`s -->
! 			<item list="PANTS" /> 		<!-- Random Pants -->
! 			<item list="SHOES" /> 		<!-- Random Shoes -->
  		</equipped>
  

Index: guards.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/guards.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** guards.xml	27 Sep 2003 12:30:29 -0000	1.7
--- guards.xml	24 Nov 2003 03:15:33 -0000	1.8
***************
*** 56,65 ****
  		
  		<equipped>
! 		        <item inheritlist="HAIR" />
! 		        <item inherit="e75" /> <!-- Backpack -->
! 			<item inherit="143f" /> <!-- Halberd -->
! 			<item inherit="1f7b" /> <!-- Doublet -->
! 			<item inherit="1410" /> <!-- Plate Arms -->
! 			<item inherit="1411" /> <!-- Plate Legs -->
  		</equipped>
  	</npc>
--- 56,65 ----
  		
  		<equipped>
! 		        <item list="HAIR" />
! 		        <item id="e75" /> <!-- Backpack -->
! 			<item id="143f" /> <!-- Halberd -->
! 			<item id="1f7b" /> <!-- Doublet -->
! 			<item id="1410" /> <!-- Plate Arms -->
! 			<item id="1411" /> <!-- Plate Legs -->
  		</equipped>
  	</npc>
***************
*** 89,96 ****
  		
  		<equipped>
! 		        <item inheritlist="HAIR_FEMALE" />
! 		        <item inherit="e75" /> <!-- Backpack -->
! 			<item inherit="143f" /> <!-- Halberd -->
! 			<item inherit="1c04" /> <!-- Female Plate -->
  		</equipped>
  	</npc>
--- 89,96 ----
  		
  		<equipped>
! 		        <item list="HAIR_FEMALE" />
! 		        <item id="e75" /> <!-- Backpack -->
! 			<item id="143f" /> <!-- Halberd -->
! 			<item id="1c04" /> <!-- Female Plate -->
  		</equipped>
  	</npc>

Index: vendors.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** vendors.xml	1 Oct 2003 09:18:01 -0000	1.26
--- vendors.xml	24 Nov 2003 03:15:33 -0000	1.27
***************
*** 17,22 ****
  		<ai>Human_Vendor</ai>
  		<equipped>
! 			<item inherit="1515" /> <!-- Cloak -->
! 			<item inherit="1541" /> <!-- Sash -->
  		</equipped>
  		<category>Vendors\Banker (Male)</category>
--- 17,22 ----
  		<ai>Human_Vendor</ai>
  		<equipped>
! 			<item id="1515" /> <!-- Cloak -->
[...3638 lines suppressed...]
  					<amount>50</amount>
  				</item>
! 				<item id="f8c">
  					<amount>50</amount>
  				</item>
! 				<item id="f8d">
  					<amount>50</amount>
  				</item>
  			</restockable>
  			<sellable>
! 				<item id="f7a"/>
! 				<item id="f7b"/>
! 				<item id="f84"/>
! 				<item id="f85"/>
! 				<item id="f86"/>
! 				<item id="f88"/>
! 				<item id="f8c"/>
! 				<item id="f8d"/>
  			</sellable>
  		</shopkeeper>