[wpdev-commits] xmlscripts/definitions/npcs/humans/vendors carpenter.xml,1.7,1.8

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12511/npcs/humans/vendors

Modified Files:
	carpenter.xml 
Log Message:
carpenter movable fix.

Index: carpenter.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/carpenter.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** carpenter.xml	3 Oct 2004 13:57:15 -0000	1.7
--- carpenter.xml	16 Oct 2004 11:37:10 -0000	1.8
***************
*** 9,19 ****
  <definitions>
  
! 	<!-- A carpenter vendor -->
! 	<npc id="carpenter_male">
! 		<inherit>vendor_male</inherit>
! 		<title context="Vendor Male Titles">the Carpenter</title>
! 		<equipped>
! 			<item id="153b" /> <!-- Half Apron -->
! 		</equipped>
  		<shopkeeper>
  			<restockable>
--- 9,13 ----
  <definitions>
  
! 	<npc id="carpenter_inventory">
  		<shopkeeper>
  			<restockable>
***************
*** 76,79 ****
--- 70,83 ----
  			</sellable>
  		</shopkeeper>
+ 	</npc>
+ 
+ 	<!-- A carpenter vendor -->
+ 	<npc id="carpenter_male">
+ 		<inherit>vendor_male</inherit>
+ 		<title context="Vendor Male Titles">the Carpenter</title>
+ 		<equipped>
+ 			<item id="153b" /> <!-- Half Apron -->
+ 		</equipped>
+ 		<inherit id="carpenter_inventory" />
  		<carpentry><random min="850" max="1000" /></carpentry>
  		<lumberjacking><random min="600" max="830" /></lumberjacking>
***************
*** 87,150 ****
  			<item id="153b" /> <!-- Half Apron -->
  		</equipped>
! 		<shopkeeper>
! 			<restockable>
! 				<item id="e7d"><amount>20</amount></item>
! 				<item id="e7e"><amount>20</amount></item>
! 				<item id="e3e"><amount>20</amount></item>
! 				<item id="e3c"><amount>20</amount></item>
! 				<item id="e43"><amount>20</amount></item>
! 				<item id="b7d"><amount>20</amount></item>
! 				<item id="b34"><amount>20</amount></item>
! 				<item id="b7c"><amount>20</amount></item>
! 				<item id="b33"><amount>20</amount></item>
! 				<item id="b2f"><amount>20</amount></item>
! 				<item id="a2a"><amount>20</amount></item>
! 				<item id="b5e"><amount>20</amount></item>
! 				<item id="b4e"><amount>20</amount></item>
! 				<item id="b52"><amount>20</amount></item>
! 				<item id="b56"><amount>20</amount></item>
! 				<item id="b5a"><amount>20</amount></item>
! 				<item id="b2c"><amount>20</amount></item>
! 				<item id="1034"><amount>20</amount></item>
! 				<item id="10e7"><amount>20</amount></item>
! 				<item id="1032"><amount>20</amount></item>
! 				<item id="10e4"><amount>20</amount></item>
! 				<item id="10e5"><amount>20</amount></item>
! 				<item id="102a"><amount>20</amount></item>
! 				<item id="10e6"><amount>20</amount></item>
! 				<item id="1030"><amount>20</amount></item>
! 				<item id="102c"><amount>20</amount></item>
! 				<item id="1028"><amount>20</amount></item>
! 			</restockable>
! 			<sellable>
! 				<item id="e7d" />
! 				<item id="e7e" />
! 				<item id="e3e" />
! 				<item id="e3c" />
! 				<item id="e43" />
! 				<item id="b7d" />
! 				<item id="b34" />
! 				<item id="b7c" />
! 				<item id="b33" />
! 				<item id="b2f" />
! 				<item id="a2a" />
! 				<item id="b5e" />
! 				<item id="b4e" />
! 				<item id="b52" />
! 				<item id="b56" />
! 				<item id="b5a" />
! 				<item id="b2c" />
! 				<item id="1034" />
! 				<item id="10e7" />
! 				<item id="1032" />
! 				<item id="10e4" />
! 				<item id="10e5" />
! 				<item id="102a" />
! 				<item id="10e6" />
! 				<item id="1030" />
! 				<item id="102c" />
! 				<item id="1028" />
! 			</sellable>
! 		</shopkeeper>
  		<carpentry><random min="850" max="1000" /></carpentry>
  		<lumberjacking><random min="600" max="830" /></lumberjacking>
--- 91,95 ----
  			<item id="153b" /> <!-- Half Apron -->
  		</equipped>
! 		<inherit id="carpenter_inventory" />
  		<carpentry><random min="850" max="1000" /></carpentry>
  		<lumberjacking><random min="600" max="830" /></lumberjacking>