wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] xmlscripts/definitions/items/equipment potions.xml,1.12,1.13

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

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

Modified Files:
	potions.xml 
Log Message:
Fixed the alchemist vendor and added sellables for tailors.

Index: potions.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/potions.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** potions.xml	27 Aug 2004 14:43:27 -0000	1.12
--- potions.xml	22 Sep 2004 06:11:00 -0000	1.13
***************
*** 107,110 ****
--- 107,112 ----
  		<tag name="potiontype" value="4" type="int" />
  		<!-- Pricing information -->
+ 		<buyprice>15</buyprice>
+ 		<sellprice>7</sellprice>
  	</item>
  
***************
*** 155,158 ****
--- 157,162 ----
  		<tag name="potiontype" value="7" type="int" />
  		<!-- Pricing information -->
+ 		<buyprice>15</buyprice>
+ 		<sellprice>7</sellprice>
  	</item>
  
***************
*** 187,190 ****
--- 191,196 ----
  		<tag name="potiontype" value="9" type="int" />
  		<!-- Pricing information -->
+ 		<buyprice>15</buyprice>
+ 		<sellprice>7</sellprice>
  	</item>
  
***************
*** 219,222 ****
--- 225,230 ----
  		<tag name="potiontype" value="11" type="int" />
  		<!-- Pricing information -->
+ 		<buyprice>21</buyprice>
+ 		<sellprice>10</sellprice>		
  	</item>
  
***************
*** 333,336 ****
--- 341,346 ----
  		<tag name="potiontype" value="18" type="int" />
  		<!-- Pricing information -->
+ 		<buyprice>15</buyprice>
+ 		<sellprice>7</sellprice>
  	</item>
  

[wpdev-commits] wolfpack ChangeLog,1.73,1.74 items.cpp,1.450,1.451 items.h,1.216,1.217 pythonscript.cpp,1.48,1.49 pythonscript.h,1.40,1.41 trade.cpp,1.12,1.13 trade.h,1.3,1.4

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29692

Modified Files:
	ChangeLog items.cpp items.h pythonscript.cpp pythonscript.h 
	trade.cpp trade.h 
Log Message:
vendor code.

Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.216
retrieving revision 1.217
diff -C2 -d -r1.216 -r1.217
*** items.h	14 Sep 2004 23:03:16 -0000	1.216
--- items.h	22 Sep 2004 05:34:47 -0000	1.217
***************
*** 315,318 ****
--- 315,319 ----
  	void toBackpack( P_CHAR pChar );
  	void showName( cUOSocket* socket );
+ 	unsigned int getSellPrice(P_CHAR vendor);
  
  	void setMagic( uchar data )

Index: trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/trade.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** trade.cpp	22 Sep 2004 04:09:31 -0000	1.12
--- trade.cpp	22 Sep 2004 05:34:47 -0000	1.13
***************
*** 320,326 ****
  				continue;
  
! 			if ( ( *it )->id() == pItem->id() && ( *it )->color() == pItem->color() &&
! 				//					(*it)->amount() >= pItem->amount() &&
! 				( *it )->scriptList() == pItem->scriptList() )
  			{
  				found = true;
--- 320,324 ----
  				continue;
  
! 			if ( ( *it )->baseid() == pItem->baseid() && ( *it )->scriptList() == pItem->scriptList() )
  			{
  				found = true;
***************
*** 337,343 ****
  
  		// now look for the item in the player's pack
! 		sContent = pPack->content();
! 		if ( find_if( sContent.begin(), sContent.end(), bind2nd( MatchItemAndSerial(), pItem->serial() ) ) == sContent.end() )
! 		{
  			socket->sysMessage( tr( "Invalid item sold." ) );
  			socket->send( &clearBuy );
--- 335,339 ----
  
  		// now look for the item in the player's pack
! 		if (pItem->container() != pPack) {
  			socket->sysMessage( tr( "Invalid item sold." ) );
  			socket->send( &clearBuy );
***************
*** 345,349 ****
  		}
  
! 		totalValue += amount * pItem->sellprice();
  
  		items.insert( make_pair( pItem->serial(), amount ) );
--- 341,353 ----
  		}
  
! 		unsigned int sellprice = pItem->getSellPrice(pVendor);
! 
! 		if (!sellprice) {
! 			socket->sysMessage( tr( "Invalid item sold." ) );
! 			socket->send( &clearBuy );
! 			return;
! 		}
! 
! 		totalValue += amount * sellprice;
  
  		items.insert( make_pair( pItem->serial(), amount ) );
***************
*** 385,520 ****
  
  	pChar->giveGold( totalValue, false );
  }
  
- P_ITEM Trade::startTrade( P_CHAR pPlayer, P_CHAR pChar )
- {
- 	/*	if( !pChar || !pChar->socket() || !pPlayer || !pPlayer->socket() )
- 			return NULL;
- 		// Create a trade-container for both players
- 		// 0x2AF8 on Layer 0x1F
- 		SERIAL box1,box2;
- 		// One for our player
- 		P_ITEM tCont = cItem::createFromScript( "2af8" );
- 		tCont->setLayer( 0x1f );
- 	//	tCont->setContSerial( pPlayer->serial() );
- 		tCont->setOwner( pPlayer );
- 		tCont->tags.set( "tradepartner", cVariant( pChar->serial() ) );
- 		tCont->update( pPlayer->socket() );
- 		tCont->update( pChar->socket() );
- 		box1 = tCont->serial();
- 		// One for the tradepartner
- 		tCont = tCont->dupe();
- 		tCont->setLayer( 0x1f );
- 	//	tCont->setContSerial( pChar->serial() );
- 		tCont->setOwner( pChar );
- 		tCont->tags.set( "tradepartner", cVariant( pPlayer->serial() ) );
- 		tCont->update( pPlayer->socket() );
- 		tCont->update( pChar->socket() );
- 		box2 = tCont->serial();
- 		// Now send the both secure trading packets
- 		cUOTxTrade trade;
- 		// To us
- 		trade.setPartner( pChar->serial() );
- 		trade.setBox1( box1 );
- 		trade.setBox2( box2 );
- 		trade.setName( pChar->name.latin1() );
- 		pPlayer->socket()->send( &trade );
- 		// To the other
- 		trade.setPartner( pPlayer->serial() );
- 		trade.setBox1( box2 );
- 		trade.setBox2( box1 );
- 		trade.setName( pPlayer->name.latin1() );
- 		pChar->socket()->send( &trade );
- 		return FindItemBySerial( box1 );*/
- 	return 0;
- }
- 
- P_ITEM Trade::tradestart( cUOSocket* s, P_CHAR pc_i )
- {
- 	/*	P_CHAR pc_currchar = currchar[s];
- 		unsigned char msg[90];
- 		P_ITEM pi_bps = pc_currchar->getBackpack();
- 		P_ITEM pi_bpi = pc_i->getBackpack();
- 		UOXSOCKET s2 = calcSocketFromChar(pc_i);
- 		if (pi_bps == NULL) //LB
- 		{
- 			sysmessage(s, "Time to buy a backpack!");
- 			sysmessage(s2, "%s doesnt have a backpack!", pc_currchar->name.latin1());
- 			return 0;
- 		}
- 		if (pi_bpi == NULL)
- 		{
- 			sysmessage(s2, "Time to buy a backpack!");
- 			sysmessage(s, "%s doesnt have a backpack!", pc_i->name.latin1());
- 			return 0;
- 		}
- 		P_ITEM pi_ps = Items->SpawnItem(s2, pc_currchar, 1, "#", 0, 0x1E, 0x5E, 0, 0, 0);
- 		if(pi_ps == NULL)
- 			return 0;
- 		pi_ps->pos = Coord_cl(26, 0, 0);
- 	//	pi_ps->setContSerial(pc_currchar->serial());
- 		pi_ps->setLayer( 0 );
- 		pi_ps->setType( 1 );
- 		pi_ps->setDye(0);
- 	//	sendbpitem(s, pi_ps);
- 	//	if (s2 != INVALID_UOXSOCKET)
- 	//		sendbpitem(s2, pi_ps);
- 		P_ITEM pi_pi = Items->SpawnItem(s2,pc_i,1,"#",0,0x1E,0x5E,0,0,0);
- 		if (pi_pi == NULL)
- 			return 0;
- 		pi_pi->pos = Coord_cl(26, 0, 0);
- 	//	pi_pi->setContSerial(pc_i->serial());
- 		pi_pi->setLayer( 0 );
- 		pi_pi->setType( 1 );
- 		pi_pi->setDye(0);
- 	//	sendbpitem(s, pi_pi);
- 	//	if (s2 != INVALID_UOXSOCKET)
- 	//		sendbpitem(s2, pi_pi);
- 		pi_pi->setMoreb1( static_cast<unsigned char>((pi_ps->serial()&0xFF000000)>>24) );
- 		pi_pi->setMoreb2( static_cast<unsigned char>((pi_ps->serial()&0x00FF0000)>>16) );
- 		pi_pi->setMoreb3( static_cast<unsigned char>((pi_ps->serial()&0x0000FF00)>>8) );
- 		pi_pi->setMoreb4( static_cast<unsigned char>((pi_ps->serial()&0x000000FF)) );
- 		pi_ps->setMore1( static_cast<unsigned char>((pi_pi->serial()&0xFF000000)>>24) );
- 		pi_ps->setMore2( static_cast<unsigned char>((pi_pi->serial()&0x00FF0000)>>16) );
- 		pi_ps->setMore3( static_cast<unsigned char>((pi_pi->serial()&0x0000FF00)>>8) );
- 		pi_ps->setMore4( static_cast<unsigned char>((pi_pi->serial()&0x000000FF)) );
- 		pi_ps->setMoreZ(0);
- 		pi_pi->setMoreZ(0);
- 		msg[0] = 0x6F; // Header Byte
- 		msg[1] = 0; // Size
- 		msg[2] = 47; // Size
- 		msg[3] = 0; // Initiate
- 		LongToCharPtr(pc_i->serial(),msg+4);
- 		LongToCharPtr(pi_ps->serial(),msg+8);
- 		LongToCharPtr(pi_pi->serial(),msg+12);
- 		msg[16]=1;
- 		strcpy((char*)&(msg[17]), pc_i->name.latin1());
- 		Xsend(s, msg, 47);
- 		if (s2 != INVALID_UOXSOCKET)
- 		{
- 			msg[0]=0x6F; // Header Byte
- 			msg[1]=0;    // Size
- 			msg[2]=47;   // Size
- 			msg[3]=0;    // Initiate
- 			LongToCharPtr(pc_currchar->serial(),msg+4);
- 			LongToCharPtr(pi_pi->serial(),msg+8);
- 			LongToCharPtr(pi_ps->serial(),msg+12);
- 			msg[16]=1;
- 			strcpy((char*)&(msg[17]), pc_currchar->name.latin1());
- 			Xsend(s2, msg, 47);
- 		} */
- 	return 0;
- }
- 
- void Trade::clearalltrades()
- {
- }
- 
- void Trade::trademsg( int s )
- {
- }
- 
- void Trade::dotrade( P_ITEM cont1, P_ITEM cont2 )
- {
- }
  }
--- 389,394 ----
  
  	pChar->giveGold( totalValue, false );
+ 	socket->sendStatWindow(); // Update Gold
  }
  
  }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** ChangeLog	22 Sep 2004 04:09:31 -0000	1.73
--- ChangeLog	22 Sep 2004 05:34:46 -0000	1.74
***************
*** 46,49 ****
--- 46,51 ----
  	- Fixed a bug with multis that would be put into themselves if moved.
  	- Fixed a crashbug related to vendors.
+ 	- Added the ability to dynamically determine the sell value of an item using the
+ 	  onGetSellPrice event.
  
  Wolfpack 12.9.10 Beta (10. September 2004)

Index: pythonscript.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** pythonscript.h	4 Sep 2004 21:20:07 -0000	1.40
--- pythonscript.h	22 Sep 2004 05:34:47 -0000	1.41
***************
*** 86,89 ****
--- 86,90 ----
  	EVENT_SPAWN,
  	EVENT_UPDATEDATABASE,
+ 	EVENT_GETSELLPRICE,
  	EVENT_COUNT,
  };

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.450
retrieving revision 1.451
diff -C2 -d -r1.450 -r1.451
*** items.cpp	19 Sep 2004 16:25:36 -0000	1.450
--- items.cpp	22 Sep 2004 05:34:46 -0000	1.451
***************
*** 2342,2343 ****
--- 2342,2387 ----
  	return pos_;
  }
+ 
+ unsigned int cItem::getSellPrice(P_CHAR pVendor) {
+ 	unsigned int sellprice = this->sellprice();
+ 	bool fromItem = false;
+ 	bool itemCanHandle = canHandleEvent(EVENT_GETSELLPRICE);
+ 	bool npcCanHandle = pVendor->canHandleEvent(EVENT_GETSELLPRICE);
+ 	PyObject *args = 0;
+ 
+ 	if (itemCanHandle || npcCanHandle) {
+ 		args = Py_BuildValue("(NN)", getPyObject(), pVendor->getPyObject());
+ 	}
+ 
+ 	if (itemCanHandle) {
+ 		PyObject *result = callEvent(EVENT_GETSELLPRICE, args);
+ 		if (result) {
+ 			if (PyInt_CheckExact(result)) {
+ 				sellprice = PyInt_AsLong(result);
+ 				fromItem = true;
+ 			} else if (PyLong_CheckExact(result)) {
+ 				sellprice = PyLong_AsLong(result);
+ 				fromItem = true;
+ 			}
+ 		}
+ 		Py_XDECREF(result);
+ 	}
+ 
+ 	if (npcCanHandle && !fromItem) {
+ 		PyObject *result = pVendor->callEvent(EVENT_GETSELLPRICE, args);
+ 		if (result) {
+ 			if (PyInt_CheckExact(result)) {
+ 				sellprice = PyInt_AsLong(result);
+ 				fromItem = true;
+ 			} else if (PyLong_CheckExact(result)) {
+ 				sellprice = PyLong_AsLong(result);
+ 				fromItem = true;
+ 			}
+ 		}
+ 		Py_XDECREF(result);
+ 	}
+ 
+ 	Py_XDECREF(args);
+ 
+ 	return sellprice;
+ }

Index: pythonscript.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** pythonscript.cpp	4 Sep 2004 21:20:07 -0000	1.48
--- pythonscript.cpp	22 Sep 2004 05:34:47 -0000	1.49
***************
*** 519,522 ****
--- 519,533 ----
  "onUpdateDatabase",
  
+ /*
+ \event onGetSellPrice
+ \param item The item being checked.
+ \param vendor The vendor buying the item. This could be None.
+ \return None if your event does not know the price. An integer
+ value otherwise.
+ \condition This event is triggered to get the sellprice for an item.
+ It's triggered for the item, then for the npc and then for the global hook.
+ */
+ "onGetSellPrice",
+ 
  0
  };

Index: trade.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/trade.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** trade.h	2 Jun 2004 15:04:07 -0000	1.3
--- trade.h	22 Sep 2004 05:34:47 -0000	1.4
***************
*** 39,51 ****
  namespace Trade
  {
- P_ITEM startTrade( P_CHAR pPlayer, P_CHAR pChar );
- 
  void buyAction( cUOSocket* socket, cUORxBuy* packet );
  void sellAction( cUOSocket* socket, cUORxSell* packet );
- 
- P_ITEM tradestart( cUOSocket* s, P_CHAR pc_i );
- void clearalltrades();
- void trademsg( int s );
- void dotrade( P_ITEM cont1, P_ITEM cont2 );
  };
  
--- 39,44 ----

[wpdev-commits] wolfpack/network uosocket.cpp,1.415,1.416

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

Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29692/network

Modified Files:
	uosocket.cpp 
Log Message:
vendor code.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.415
retrieving revision 1.416
diff -C2 -d -r1.415 -r1.416
*** uosocket.cpp	19 Sep 2004 16:25:37 -0000	1.415
--- uosocket.cpp	22 Sep 2004 05:34:47 -0000	1.416
***************
*** 2689,2695 ****
  				while ( pit != packcont.end() )
  				{
! 					if ( *pit && ( *pit )->id() == mItem->id() && ( *pit )->color() == mItem->color() && ( *pit )->baseid() == mItem->baseid() )
  					{
! 						itemContent.addItem( ( *pit )->serial(), ( *pit )->id(), ( *pit )->color(), ( *pit )->amount(), mItem->sellprice(), ( *pit )->getName() );
  						items.append( ( *pit ) );
  					}
--- 2689,2696 ----
  				while ( pit != packcont.end() )
  				{
! 					if ( *pit && ( *pit )->baseid() == mItem->baseid() && ( *pit )->scriptList() == mItem->scriptList() )
  					{
! 						unsigned int sellprice = mItem->getSellPrice(pVendor);
! 						itemContent.addItem( ( *pit )->serial(), ( *pit )->id(), ( *pit )->color(), ( *pit )->amount(), sellprice, ( *pit )->getName() );
  						items.append( ( *pit ) );
  					}

[wpdev-commits] wolfpack ChangeLog,1.72,1.73 trade.cpp,1.11,1.12

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13478

Modified Files:
	ChangeLog trade.cpp 
Log Message:
Fixed a crashbug.

Index: trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/trade.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** trade.cpp	25 Aug 2004 17:01:23 -0000	1.11
--- trade.cpp	22 Sep 2004 04:09:31 -0000	1.12
***************
*** 58,69 ****
  void Trade::buyAction( cUOSocket* socket, cUORxBuy* packet )
  {
  	P_PLAYER pChar = socket->player();
- 	P_NPC pVendor = dynamic_cast<P_NPC>( FindCharBySerial( packet->serial() ) );
  
! 	cUOTxClearBuy clearBuy;
! 	clearBuy.setSerial( pVendor->serial() );
  
! 	if ( !pChar || !pVendor || pVendor->free || pChar->free )
! 	{
  		socket->send( &clearBuy );
  		return;
--- 58,74 ----
  void Trade::buyAction( cUOSocket* socket, cUORxBuy* packet )
  {
+ 	cUOTxClearBuy clearBuy;
+ 	clearBuy.setSerial( packet->serial() );
+ 
  	P_PLAYER pChar = socket->player();
  
! 	if ( !pChar || pChar->free ) {
! 		socket->send( &clearBuy );
! 		return;
! 	}
  
! 	P_NPC pVendor = dynamic_cast<P_NPC>( FindCharBySerial( packet->serial() ) );
! 
! 	if (!pVendor || pVendor->free) {
  		socket->send( &clearBuy );
  		return;
***************
*** 247,251 ****
  
  	cUOTxClearBuy clearBuy;
! 	clearBuy.setSerial( pVendor->serial() );
  
  	if ( !pChar || !pVendor || pVendor->free || pChar->free )
--- 252,256 ----
  
  	cUOTxClearBuy clearBuy;
! 	clearBuy.setSerial( packet->serial() );
  
  	if ( !pChar || !pVendor || pVendor->free || pChar->free )

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** ChangeLog	21 Sep 2004 07:44:25 -0000	1.72
--- ChangeLog	22 Sep 2004 04:09:31 -0000	1.73
***************
*** 45,48 ****
--- 45,49 ----
  	- Fixed a base definition bug related to property not loading the base definition.
  	- Fixed a bug with multis that would be put into themselves if moved.
+ 	- Fixed a crashbug related to vendors.
  
  Wolfpack 12.9.10 Beta (10. September 2004)

[wpdev-commits] xmlscripts/scripts/system loot.py,1.18,1.19

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29070/system

Modified Files:
	loot.py 
Log Message:
lootpacks

Index: loot.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/loot.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** loot.py	21 Sep 2004 05:42:54 -0000	1.18
--- loot.py	21 Sep 2004 14:01:22 -0000	1.19
***************
*** 112,116 ****
--- 112,120 ----
  		[1.0, 'eed', '10d100+1000', 1] # 1010 - 2000
  	],
+ 	
  	# Scroll Packs
+ 	'scroll_medium': [
+ 		[1.0, SCROLLS_C4 + SCROLLS_C5 + SCROLLS_C6 + SCROLLS_C7, 1, 1] # 1 Scroll of Circle 4 - 7	
+ 	],
  
  	# Gem Packs

[wpdev-commits] xmlscripts/definitions/npcs/monsters/daemonic daemon.xml,1.16,1.17 fire_gargoyle.xml,1.13,1.14 gargoyle.xml,1.13,1.14 gargoyle_destroyer.xml,1.13,1.14 gargoyle_enforcer.xml,1.13,1.14

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29013/npcs/monsters/daemonic

Modified Files:
	daemon.xml fire_gargoyle.xml gargoyle.xml 
	gargoyle_destroyer.xml gargoyle_enforcer.xml 
Log Message:
tinkered with the lootpacks a little.

Index: gargoyle.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** gargoyle.xml	21 Sep 2004 05:27:12 -0000	1.13
--- gargoyle.xml	21 Sep 2004 14:01:06 -0000	1.14
***************
*** 36,41 ****
  		<!-- Misc. -->
  		<desc>These strange creatures are believed by many to be daemonic in nature, but in truth this is a slander. They are an Intelligent and civilized race. They have no love for humanity (nor is their mistrust unjustified) but they are honorable in their own, alien way. Their ways are mysterious, and it may be that they are too different from us to ever live in peace with humanity. If that proves to be so, somewould call it a great tragedy.</desc>
! 		<!-- Missing: Jewel, 1-7CS, MNS, Gargoyle Pickaxe, Level 1 Map -->
! 		<lootpacks>lootpack_average</lootpacks>
  		<carve>carve_gargoyle</carve>
  		<category>Monsters\Daemonic\Gargoyle</category>
--- 36,41 ----
  		<!-- Misc. -->
  		<desc>These strange creatures are believed by many to be daemonic in nature, but in truth this is a slander. They are an Intelligent and civilized race. They have no love for humanity (nor is their mistrust unjustified) but they are honorable in their own, alien way. Their ways are mysterious, and it may be that they are too different from us to ever live in peace with humanity. If that proves to be so, somewould call it a great tragedy.</desc>
! 		<!-- Missing: MNS, Gargoyle Pickaxe, Level 1 Map -->
! 		<lootpacks>lootpack_average;scroll_medium;gems;gems;gems;gems</lootpacks>
  		<carve>carve_gargoyle</carve>
  		<category>Monsters\Daemonic\Gargoyle</category>

Index: daemon.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/daemon.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** daemon.xml	21 Sep 2004 05:27:12 -0000	1.16
--- daemon.xml	21 Sep 2004 14:01:05 -0000	1.17
***************
*** 40,46 ****
  		<!-- Misc -->
  		<desc>No purer manifestation of primal evil exists than the hideous daemon, a denizen of the dark and infernal planes brought to these shores bythe most vile wizardries. Only the greatest of heroes have ever vanquished a daemon in single combat, and even a group of valiant warriors must be mighty indeed to survive an encounter with such a fiend.</desc>
! 		<!-- Missing: 1-7 scroll, level 4 map, medium necro scroll -->
  		<controlslots>5</controlslots>
! 		<lootpacks>lootpack_rich;lootpack_average</lootpacks>
  		<carve>carve_demon</carve>
  		<category>Monsters\Daemonic\Daemon (Random)</category>
--- 40,46 ----
  		<!-- Misc -->
  		<desc>No purer manifestation of primal evil exists than the hideous daemon, a denizen of the dark and infernal planes brought to these shores bythe most vile wizardries. Only the greatest of heroes have ever vanquished a daemon in single combat, and even a group of valiant warriors must be mighty indeed to survive an encounter with such a fiend.</desc>
! 		<!-- Missing: level 4 map, medium necro scroll -->
  		<controlslots>5</controlslots>
! 		<lootpacks>lootpack_rich;lootpack_average;scroll_medium;scroll_medium</lootpacks>
  		<carve>carve_demon</carve>
  		<category>Monsters\Daemonic\Daemon (Random)</category>

Index: fire_gargoyle.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/fire_gargoyle.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** fire_gargoyle.xml	21 Sep 2004 05:27:12 -0000	1.13
--- fire_gargoyle.xml	21 Sep 2004 14:01:05 -0000	1.14
***************
*** 39,44 ****
  		<tag name="res_energy" value="20,30" type="int" />
  		<!-- Misc -->
! 		<!-- Missing: Jewel, Level 1 Map -->
! 		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Daemonic\Fire Gargoyle</category>
  		
--- 39,44 ----
  		<tag name="res_energy" value="20,30" type="int" />
  		<!-- Misc -->
! 		<!-- Missing: Level 1 Map -->
! 		<lootpacks>lootpack_rich;gems</lootpacks>
  		<category>Monsters\Daemonic\Fire Gargoyle</category>
  		

Index: gargoyle_destroyer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle_destroyer.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** gargoyle_destroyer.xml	21 Sep 2004 05:27:12 -0000	1.13
--- gargoyle_destroyer.xml	21 Sep 2004 14:01:06 -0000	1.14
***************
*** 42,46 ****
  		<!-- Misc. -->
  		<!-- Missing: 1-7CS, MNS, Gargoyle Pickaxe -->
! 		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Daemonic\Gargoyle Destroyer</category>
  		
--- 42,46 ----
  		<!-- Misc. -->
  		<!-- Missing: 1-7CS, MNS, Gargoyle Pickaxe -->
! 		<lootpacks>lootpack_rich;lootpack_rich;scroll_medium;gems;gems;gems;gems</lootpacks>
  		<category>Monsters\Daemonic\Gargoyle Destroyer</category>
  		

Index: gargoyle_enforcer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle_enforcer.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** gargoyle_enforcer.xml	21 Sep 2004 05:27:12 -0000	1.13
--- gargoyle_enforcer.xml	21 Sep 2004 14:01:06 -0000	1.14
***************
*** 41,46 ****
  		<tag name="res_energy" value="15,25" type="int" />
  		<!-- Misc. -->
! 		<!-- Missing: Jewel, 1-7CS, MNS, Gargoyle Pickaxe -->
! 		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Daemonic\Gargoyle Enforcer</category>
  		
--- 41,46 ----
  		<tag name="res_energy" value="15,25" type="int" />
  		<!-- Misc. -->
! 		<!-- Missing: MNS, Gargoyle Pickaxe -->
! 		<lootpacks>lootpack_rich;scroll_medium;gems;gems;gems;gems</lootpacks>
  		<category>Monsters\Daemonic\Gargoyle Enforcer</category>
  		

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.108,1.109

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20038/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
reagent fix for alchemy.

Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** ChangeLog.wolfpack	21 Sep 2004 12:36:05 -0000	1.108
--- ChangeLog.wolfpack	21 Sep 2004 13:18:49 -0000	1.109
***************
*** 15,18 ****
--- 15,19 ----
  		- Loot fixes for daemons.
  		- Added carve information to all npcs.
+ 		- Fixed reagent requirements for cure potions.
  	* Python Script Changes:
  		- Removed weight from the info menu.

[wpdev-commits] xmlscripts/definitions/menus/crafting alchemy.xml,1.3,1.4

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

Update of /cvsroot/wpdev/xmlscripts/definitions/menus/crafting
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19995/menus/crafting

Modified Files:
	alchemy.xml 
Log Message:
reagent fix for alchemy.

Index: alchemy.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/menus/crafting/alchemy.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alchemy.xml	26 May 2004 13:45:35 -0000	1.3
--- alchemy.xml	21 Sep 2004 13:18:35 -0000	1.4
***************
*** 116,125 ****
  		<craft definition="potion_cure" name="Cure Potion">
  			<alchemy min="250" max="750" />
! 			<material id="f84" amount="1" name="Garlic" />
  			<material id="f0e" amount="1" name="Empty Bottle" />
  		</craft>
  		<craft definition="potion_greatercure" name="Greater Cure Potion">
  			<alchemy min="650" max="1150" />
! 			<material id="f84" amount="1" name="Garlic" />
  			<material id="f0e" amount="1" name="Empty Bottle" />
  		</craft>
--- 116,125 ----
  		<craft definition="potion_cure" name="Cure Potion">
  			<alchemy min="250" max="750" />
! 			<material id="f84" amount="3" name="Garlic" />
  			<material id="f0e" amount="1" name="Empty Bottle" />
  		</craft>
  		<craft definition="potion_greatercure" name="Greater Cure Potion">
  			<alchemy min="650" max="1150" />
! 			<material id="f84" amount="6" name="Garlic" />
  			<material id="f0e" amount="1" name="Empty Bottle" />
  		</craft>

[wpdev-commits] xmlscripts/scripts/commands move.py,1.2,1.3 wipe.py,1.5,1.6

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

Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11747/commands

Modified Files:
	move.py wipe.py 
Log Message:
command improvements

Index: wipe.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/wipe.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wipe.py	20 Sep 2004 04:02:11 -0000	1.5
--- wipe.py	21 Sep 2004 12:36:11 -0000	1.6
***************
*** 73,78 ****
  
  def wipeBoundingBox( socket, target1, target2 ):
  	count = 0
! 	iterator = wolfpack.itemregion( target1.pos.x, target1.pos.y, target2.pos.x, target2.pos.y, target2.pos.map )
  	item = iterator.first
  	while item:
--- 73,83 ----
  
  def wipeBoundingBox( socket, target1, target2 ):
+ 	x1 = min(target1.pos.x, target2.pos.x)
+ 	x2 = max(target1.pos.x, target2.pos.x)
+ 	y1 = min(target1.pos.y, target2.pos.y)
+ 	y2 = max(target1.pos.y, target2.pos.y)
+ 	
  	count = 0
! 	iterator = wolfpack.itemregion( x1, y1, x2, x2, target2.pos.map )
  	item = iterator.first
  	while item:

Index: move.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/move.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** move.py	28 Aug 2004 16:14:10 -0000	1.2
--- move.py	21 Sep 2004 12:36:11 -0000	1.3
***************
*** 90,112 ****
  		return True
  	elif target.char:
! 		if target.char.npc:
! 			npc = target.char
! 			pos = npc.pos
! 			if type(newmap) == int:
! 				newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap )
! 			else:
! 				newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), pos.map )
! 			npc.pos = newposition
! 			npc.update()
! 			return True
  		else:
! 			player = target.char
! 			pos = player.pos
! 			if type(newmap) == int:
! 				newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap )
! 			else:
! 				newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), pos.map )
! 			player.pos = newposition
! 			player.update()
! 			return True
  	return True
--- 90,104 ----
  		return True
  	elif target.char:
! 		char = target.char
! 		pos = char.pos
! 		if type(newmap) == int:
! 			newposition = wolfpack.coord( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap )
  		else:
! 			newposition = wolfpack.coord( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), pos.map )
! 		char.removefromview()
! 		char.moveto( newposition )
! 		char.update()
! 		if char.socket:
! 			char.socket.resendworld()
! 		return True
  	return True

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.107,1.108

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11704/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
command improvements

Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** ChangeLog.wolfpack	21 Sep 2004 08:00:13 -0000	1.107
--- ChangeLog.wolfpack	21 Sep 2004 12:36:05 -0000	1.108
***************
*** 51,54 ****
--- 51,56 ----
  		- Rewrote npc carving.
  		- Added a "static" command.
+ 		- Made .move work correctly on players again.
+ 		- Nuke also works from bottom right to top left now.
  	* Misc. Changes:
  		- Fixed configure.py for FreeBSD 5

[wpdev-commits] xmlscripts/scripts/commands add.py,1.10,1.11

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

Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24809/commands

Modified Files:
	add.py 
Log Message:
Added .static

Index: add.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/add.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** add.py	25 Aug 2004 17:03:04 -0000	1.10
--- add.py	21 Sep 2004 08:00:21 -0000	1.11
***************
*** 25,30 ****
  		player.socket.sysmessage("You can't add the multi there.")
  		return
! 
  	multi = wolfpack.addmulti(str(arguments[0]))
  	multi.moveto(target.pos)
  	multi.update()
--- 25,37 ----
  		player.socket.sysmessage("You can't add the multi there.")
  		return
! 		
  	multi = wolfpack.addmulti(str(arguments[0]))
+ 	
+ 	# If arguments[1] is true, make the item
+ 	# static
+ 	if arguments[1]:
+ 		multi.decay = False
+ 		multi.movable = 3
+ 	
  	multi.moveto(target.pos)
  	multi.update()
***************
*** 33,38 ****
  # Target response for adding an item
  #
! def additem(player, arguments, target):
  	item = wolfpack.additem(str(arguments[0]))
  	if target.item:
  		if target.item.type == 1:
--- 40,52 ----
  # Target response for adding an item
  #
! def additem(player, arguments, target):		
  	item = wolfpack.additem(str(arguments[0]))
+ 	
+ 	# If arguments[1] is true, make the item
+ 	# static
+ 	if arguments[1]:
+ 		item.decay = False
+ 		item.movable = 3
+ 	
  	if target.item:
  		if target.item.type == 1:
***************
*** 50,53 ****
--- 64,83 ----
  
  #
+ # Add an item and make it nodecay + movable 2
+ #
+ def static(socket, command, arguments):
+ 	if len(arguments) > 0:
+ 		if wolfpack.getdefinition(WPDT_ITEM, arguments):
+ 			socket.sysmessage("Where do you want to place the item '%s'?" % arguments)
+ 			socket.attachtarget("commands.add.additem", [arguments, True])
+ 		elif wolfpack.getdefinition(WPDT_MULTI, arguments):
+ 			socket.sysmessage("Where do you want to place the multi '%s'?" % arguments)
+ 			socket.attachtarget("commands.add.addmulti", [arguments, True])
+ 		else:
+ 			socket.sysmessage('No Item, NPC or Multi definition by that name found.')
+ 	else:
+ 		socket.sysmessage('Usage: static <id>')
+ 
+ #
  # Add an item or character or
  # show the addmenu.
***************
*** 57,61 ****
  		if wolfpack.getdefinition(WPDT_ITEM, arguments):
  			socket.sysmessage("Where do you want to place the item '%s'?" % arguments)
! 			socket.attachtarget("commands.add.additem", [arguments])
  		elif wolfpack.getdefinition(WPDT_NPC, arguments):
  			socket.sysmessage("Where do you want to spawn the npc '%s'?" % arguments)
--- 87,91 ----
  		if wolfpack.getdefinition(WPDT_ITEM, arguments):
  			socket.sysmessage("Where do you want to place the item '%s'?" % arguments)
! 			socket.attachtarget("commands.add.additem", [arguments, False])
  		elif wolfpack.getdefinition(WPDT_NPC, arguments):
  			socket.sysmessage("Where do you want to spawn the npc '%s'?" % arguments)
***************
*** 63,67 ****
  		elif wolfpack.getdefinition(WPDT_MULTI, arguments):
  			socket.sysmessage("Where do you want to place the multi '%s'?" % arguments)
! 			socket.attachtarget("commands.add.addmulti", [arguments])
  		else:
  			socket.sysmessage('No Item, NPC or Multi definition by that name found.')
--- 93,97 ----
  		elif wolfpack.getdefinition(WPDT_MULTI, arguments):
  			socket.sysmessage("Where do you want to place the multi '%s'?" % arguments)
! 			socket.attachtarget("commands.add.addmulti", [arguments, False])
  		else:
  			socket.sysmessage('No Item, NPC or Multi definition by that name found.')
***************
*** 219,222 ****
--- 249,253 ----
  def onLoad():
  	wolfpack.registercommand('add', add)
+ 	wolfpack.registercommand('static', static)
  	
  def onUnload():
***************
*** 226,232 ****
  """
  	\command add
! 	\description Add a npc or item and if no definition was specified, open a menu.
  	\usage - <code>add npc-id</code>
  	- <code>add item-id</code>
  	- <code>add</code>
  	If neither a npc nor an item id is passed to the add command, a menu with all
--- 257,264 ----
  """
  	\command add
! 	\description Add a npc, item or multi and if no definition was specified, open a menu.
  	\usage - <code>add npc-id</code>
  	- <code>add item-id</code>
+ 	- <code>add multi-id</code>
  	- <code>add</code>
  	If neither a npc nor an item id is passed to the add command, a menu with all
***************
*** 235,236 ****
--- 267,275 ----
  	based on the <category> tag.
  """
+ 
+ """
+ 	\command static
+ 	\description Add an item or multi and make it not decay and not movable.
+ 	\usage - <code>add item-id</code>
+ 	- <code>add multi-id</code>
+ """

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.106,1.107

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24769/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
.static

Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** ChangeLog.wolfpack	21 Sep 2004 05:26:48 -0000	1.106
--- ChangeLog.wolfpack	21 Sep 2004 08:00:13 -0000	1.107
***************
*** 50,53 ****
--- 50,54 ----
  		- Fixed bug #0000313. (Parrying bugs and misconceptions)
  		- Rewrote npc carving.
+ 		- Added a "static" command.
  	* Misc. Changes:
  		- Fixed configure.py for FreeBSD 5

[wpdev-commits] wolfpack ChangeLog,1.71,1.72 uobject.cpp,1.185,1.186

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22378

Modified Files:
	ChangeLog uobject.cpp 
Log Message:
Fixed a bug with multis.

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** uobject.cpp	16 Sep 2004 18:52:43 -0000	1.185
--- uobject.cpp	21 Sep 2004 07:44:25 -0000	1.186
***************
*** 109,113 ****
  	// Position Changed
  	cMulti* multi = cMulti::find( newpos );
! 	if ( multi_ != multi )
  	{
  		if ( multi_ )
--- 109,114 ----
  	// Position Changed
  	cMulti* multi = cMulti::find( newpos );
! 	// Don't put multis into themselves
! 	if ( multi != this && multi_ != multi )
  	{
  		if ( multi_ )

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** ChangeLog	21 Sep 2004 05:28:04 -0000	1.71
--- ChangeLog	21 Sep 2004 07:44:25 -0000	1.72
***************
*** 44,47 ****
--- 44,48 ----
  	- Added/Changed wolfpack.itembase(def), wolfpack.charbase(def)
  	- Fixed a base definition bug related to property not loading the base definition.
+ 	- Fixed a bug with multis that would be put into themselves if moved.
  
  Wolfpack 12.9.10 Beta (10. September 2004)

[wpdev-commits] xmlscripts/scripts/commands __init__.py,1.20,1.21

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

Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12912/commands

Modified Files:
	__init__.py 
Log Message:
newlos fix

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/__init__.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** __init__.py	17 Sep 2004 18:06:52 -0000	1.20
--- __init__.py	21 Sep 2004 06:44:38 -0000	1.21
***************
*** 234,238 ****
  	srcpos.z += 15
  	
! 	result = srcpos.lineofsightnew(targpos)
  	char.socket.sysmessage('RESULT: ' + str(result))
  
--- 234,238 ----
  	srcpos.z += 15
  	
! 	result = char.canreach(targpos, 20, True)
  	char.socket.sysmessage('RESULT: ' + str(result))
  

[wpdev-commits] xmlscripts/scripts/system loot.py,1.17,1.18

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4595/system

Modified Files:
	loot.py 
Log Message:
carve

Index: loot.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/loot.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** loot.py	19 Sep 2004 22:57:18 -0000	1.17
--- loot.py	21 Sep 2004 05:42:54 -0000	1.18
***************
*** 27,36 ****
  	'lootpack_poor': [
  		[1.0, 'eed', [11, 20], 1], # Gold
! 		[0.0002, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.0002, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties
  	],
  	'lootpack_meager': [
  		[1.0, 'eed', [11, 20], 1], # Gold
! 		[0.001, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.01, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 10%] 2 max properties
  		#[0.002, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties
--- 27,36 ----
  	'lootpack_poor': [
  		[1.0, 'eed', [11, 20], 1], # Gold
! 		[0.0002, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments
  		#[0.0002, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties
  	],
  	'lootpack_meager': [
  		[1.0, 'eed', [11, 20], 1], # Gold
! 		[0.001, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments
  		#[0.01, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 10%] 2 max properties
  		#[0.002, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties
***************
*** 38,42 ****
  	'lootpack_average': [
  		[1.0, 'eed', [55, 100], 1], # Gold
! 		[0.004, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.05, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 20%] 4 max properties
  		#[0.02, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 50%] 3 max properties
--- 38,42 ----
  	'lootpack_average': [
  		[1.0, 'eed', [55, 100], 1], # Gold
! 		[0.004, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments
  		#[0.05, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 20%] 4 max properties
  		#[0.02, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 50%] 3 max properties
***************
*** 45,49 ****
  	'lootpack_rich': [
  		[1.0, 'eed', [160, 250], 1], # Gold
! 		[0.01, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.2, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 40%] 4 max properties
  		#[0.1, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 60%] 5 max properties
--- 45,49 ----
  	'lootpack_rich': [
  		[1.0, 'eed', [160, 250], 1], # Gold
! 		[0.01, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments
  		#[0.2, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 40%] 4 max properties
  		#[0.1, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 60%] 5 max properties
***************
*** 52,56 ****
  	'lootpack_filthy_rich': [
  		[1.0, 'eed', [202, 400], 1], # Gold
! 		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.33, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 50%] 4 max properties
  		#[0.33, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 60%] 4 max properties
--- 52,56 ----
  	'lootpack_filthy_rich': [
  		[1.0, 'eed', [202, 400], 1], # Gold
! 		[0.02, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments
  		#[0.33, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 50%] 4 max properties
  		#[0.33, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 60%] 4 max properties
***************
*** 60,64 ****
  	'lootpack_ultra_rich': [
  		[1.0, 'eed', [505, 1000], 1], # Gold
! 		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
--- 60,64 ----
  	'lootpack_ultra_rich': [
  		[1.0, 'eed', [505, 1000], 1], # Gold
! 		[0.02, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
***************
*** 69,73 ****
  	'lootpack_super_boss': [
  		[1.0, 'eed', [505, 1000], 1], # Gold
! 		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
--- 69,73 ----
  	'lootpack_super_boss': [
  		[1.0, 'eed', [505, 1000], 1], # Gold
! 		[0.02, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties

[wpdev-commits] xmlscripts/scripts blades.py,1.8,1.9

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

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4595

Modified Files:
	blades.py 
Log Message:
carve

Index: blades.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/blades.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** blades.py	14 Sep 2004 01:22:49 -0000	1.8
--- blades.py	21 Sep 2004 05:42:54 -0000	1.9
***************
*** 9,13 ****
  
  import wolfpack
! import whrandom
  import skills.lumberjacking
  from wolfpack import utilities
--- 9,13 ----
  
  import wolfpack
! import random
  import skills.lumberjacking
  from wolfpack import utilities
***************
*** 140,172 ****
  
  	# Not carvable or already carved
! 	try:
! 		charbase = wolfpack.charbase(corpse.charbaseid)
! 		carve = charbase['carve']
! 	except:
  		char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve..
  		return
  
! 	if corpse.hastag('carved') or carve == '':
  		char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve..
  		return
  
- 	# Create all items in the carve list
- 	carve = wolfpack.list(str(carve))
- 
- 	for id in carve:
- 		amount = 1
- 		# Is amount contained in it ?
- 		if id.find( "," ) != -1:
- 			parts = id.split( "," )
- 			id = parts[0]
- 			amount = int( parts[1] )
- 
- 		item = wolfpack.additem( id )
- 		item.amount = amount
- 		if not utilities.tocontainer( item, corpse ):
- 			item.update()
- 
  	# Create Random Blood
! 	bloodid = whrandom.choice( blood )
  	blooditem = wolfpack.additem( bloodid )
  	blooditem.moveto( corpse.pos )
--- 140,167 ----
  
  	# Not carvable or already carved
! 	if corpse.hastag('carved'):
  		char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve..
  		return
+ 	
+ 	basedef = wolfpack.charbase(corpse.charbaseid)
+ 	
+ 	if not basedef:
+ 		char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve..
  
! 	feathers = basedef.getintproperty('carve_feathers', 0)
! 	wool = basedef.getintproperty('carve_wool', 0)
! 	hides = basedef.getintproperty('carve_hides', 0)
! 	hides_type = basedef.getstrproperty('carve_hides_type', 'leather')
! 	scales = basedef.getintproperty('carve_scales', 0)
! 	scales_type = basedef.getstrproperty('carve_scales_type', 'red')
! 	meat = basedef.getintproperty('carve_meat', 0)
! 	meat_type = basedef.getstrproperty('carve_meat_type', 'ribs')
! 		
! 	if feathers == 0 and wool == 0 and hides == 0 and scales == 0 and meat == 0:
  		char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve..
  		return
  
  	# Create Random Blood
! 	bloodid = random.choice( blood )
  	blooditem = wolfpack.additem( bloodid )
  	blooditem.moveto( corpse.pos )
***************
*** 174,179 ****
  	blooditem.update()
  
! 	char.socket.clilocmessage( 0x7A2F3, "", 0x3b2, 3, corpse ) # You carve away some meat which remains on the corpse
  	corpse.settag('carved', 1)
  
  # CUT FISH
--- 169,251 ----
  	blooditem.update()
  
! 	# Mark the corpse as carved
  	corpse.settag('carved', 1)
+ 	
+ 	# Feathers
+ 	if feathers != 0:
+ 		item = wolfpack.additem('1bd1')
+ 		item.amount = feathers
+ 		if not wolfpack.utilities.tocontainer(item, corpse):
+ 			item.update()
+ 			
+ 		char.socket.clilocmessage( 500479, "", 0x3b2, 3 )
+ 		
+ 	# Wool
+ 	if wool != 0:
+ 		item = wolfpack.additem('df8')
+ 		item.amount = wool
+ 		if not wolfpack.utilities.tocontainer(item, corpse):
+ 			item.update()
+ 			
+ 		char.socket.clilocmessage( 500483, "", 0x3b2, 3 )
+ 		
+ 	# Meat
+ 	if meat != 0:
+ 		if meat_type == 'bird':			
+ 			item = wolfpack.additem('9b9') # Raw Bird
+ 		elif meat_type == 'lambleg':
+ 			item = wolfpack.additem('1609') # Raw Lamb Leg
+ 		else:		
+ 			item = wolfpack.additem('9f1') # Raw Ribs
+ 			
+ 		item.amount = meat
+ 		if not wolfpack.utilities.tocontainer(item, corpse):
+ 			item.update()
+ 			
+ 		char.socket.clilocmessage( 500467, "", 0x3b2, 3 )
+ 		
+ 	# Hides
+ 	if hides != 0:
+ 		if hides_type == 'spined':
+ 			item = wolfpack.additem('spined_leather_hides')
+ 		elif hides_type == 'horned':
+ 			item = wolfpack.additem('horned_leather_hides')
+ 		elif hides_type == 'barbed':
+ 			item = wolfpack.additem('barbed_leather_hides')
+ 		else:
+ 			item = wolfpack.additem('leather_hides')
+ 			
+ 		item.amount = hides
+ 		if not wolfpack.utilities.tocontainer(item, corpse):
+ 			item.update()
+ 			
+ 		char.socket.clilocmessage( 500471, "", 0x3b2, 3 )
+ 		
+ 	# Scales
+ 	if scales != 0:
+ 		# Random scales type
+ 		if ',' in scales_type:
+ 			scales_type = random.choice(scales_type.split(','))
+ 	
+ 		items = []
+ 		if scales_type in ['blue', 'all']:
+ 			items.append(wolfpack.additem('blue_scales'))
+ 		if scales_type in ['green', 'all']:
+ 			items.append(wolfpack.additem('green_scales'))
+ 		if scales_type in ['yellow', 'all']:
+ 			items.append(wolfpack.additem('yellow_scales'))
+ 		if scales_type in ['black', 'all']:
+ 			items.append(wolfpack.additem('black_scales'))
+ 		if scales_type in ['white', 'all']:
+ 			items.append(wolfpack.additem('white_scales'))
+ 		if scales_type in ['red', 'all']:
+ 			items.append(wolfpack.additem('red_scales'))
+ 			
+ 		for item in items:
+ 			item.amount = scales
+ 			if not wolfpack.utilities.tocontainer(item, corpse):
+ 				item.update()
+ 				
+ 		char.socket.sysmessage("You cut away some scales, but they remain on the corpse.")
  
  # CUT FISH

[wpdev-commits] wolfpack/python global.cpp,1.160,1.161

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

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2651/python

Modified Files:
	global.cpp 
Log Message:
Carve

Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** global.cpp	19 Sep 2004 22:13:36 -0000	1.160
--- global.cpp	21 Sep 2004 05:28:05 -0000	1.161
***************
*** 1717,1722 ****
  
  /*
! 	\function wolfpack.charbase
! 	\param baseid A string containing the character id.
  	\return A dictionary with the following keys:<code>
  	- basesound
--- 1717,1723 ----
  
  /*
! 	\function wolfpack.bodyinfo
! 	\param bodyid The id of the character body to get the information for.
! 	This is a numeric value.
  	\return A dictionary with the following keys:<code>
  	- basesound
***************
*** 1724,1766 ****
  	- flags
  	- figurine
! 	- mindamage
! 	- maxdamage
! 	- mintaming
! 	- carve
! 	- lootpacks
! 	- bindmenu
! 	- controlslots
! 	- criticalhealth
  	</code>
! 	\description Retrieve information about a given character baseid.
  */
! static PyObject* wpCharBase( PyObject* /*self*/, PyObject* args )
  {
! 	char *baseid;
! 	if ( !PyArg_ParseTuple( args, "s:wolfpack.charbase(baseid)", &baseid ) )
  	{
  		return 0;
  	}
  
! 	cCharBaseDef *basedef = CharBaseDefs::instance()->get( baseid );
  
! 	if ( !basedef )
  	{
! 		return PyErr_Format( PyExc_RuntimeError, "An error occured while retrieving the character basedefinition %s.", baseid );
  	}
  
! 	PyObject *dict = PyDict_New();
! 	PyDict_SetItemString( dict, "basesound", PyInt_FromLong( basedef->basesound() ) );
! 	PyDict_SetItemString( dict, "soundmode", PyInt_FromLong( basedef->soundmode() ) );
! 	PyDict_SetItemString( dict, "figurine", PyInt_FromLong( basedef->figurine() ) );
! 	PyDict_SetItemString( dict, "mindamage", PyInt_FromLong( basedef->minDamage() ) );
! 	PyDict_SetItemString( dict, "maxdamage", PyInt_FromLong( basedef->maxDamage() ) );
! 	PyDict_SetItemString( dict, "mintaming", PyInt_FromLong( basedef->minTaming() ) );
! 	PyDict_SetItemString( dict, "carve", QString2Python( basedef->carve() ) );
! 	PyDict_SetItemString( dict, "lootpacks", QString2Python( basedef->lootPacks() ) );
! 	PyDict_SetItemString( dict, "bindmenu", QString2Python( basedef->bindmenu() ) );
! 	PyDict_SetItemString( dict, "controlslots", PyInt_FromLong( basedef->controlSlots() ) );
! 	PyDict_SetItemString( dict, "criticalhealth", PyInt_FromLong( basedef->criticalHealth() ) );
! 	return dict;
  }
  
--- 1725,1795 ----
  	- flags
  	- figurine
! 	- type
! 	- body
  	</code>
! 	\description Retrieve information about a given character body.
  */
! static PyObject* wpBodyInfo( PyObject* /*self*/, PyObject* args )
  {
! 	unsigned short body;
! 	if ( !PyArg_ParseTuple( args, "H:wolfpack.bodyinfo(body)", &body ) )
  	{
  		return 0;
  	}
  
! 	const stBodyInfo &info = CharBaseDefs::instance()->getBodyInfo(body);
  
! 	PyObject *dict = PyDict_New();
! 	PyDict_SetItemString( dict, "basesound", PyInt_FromLong( info.basesound ) );
! 	PyDict_SetItemString( dict, "body", PyInt_FromLong( info.body ) );
! 	PyDict_SetItemString( dict, "figurine", PyInt_FromLong( info.figurine ) );
! 	PyDict_SetItemString( dict, "flags", PyInt_FromLong( info.flags ) );
! 	PyDict_SetItemString( dict, "soundmode", PyInt_FromLong( info.soundmode ) );
! 	PyDict_SetItemString( dict, "type", PyInt_FromLong( info.type ) );
! 	return dict;
! }
! 
! /*
! 	\function wolfpack.charbase
! 	\param id The definition id.
! 	\return A <object id="basedef">basedef</object> object.
! 	\description Get a <object id="basedef">basedef</object> object for a given npc definition id.
! */
! static PyObject *wpCharBase(PyObject*, PyObject *args) {
! 	char *id;
! 	if ( !PyArg_ParseTuple( args, "s:wolfpack.charbase(id)", &id ) )
  	{
! 		return 0;
  	}
  
! 	cCharBaseDef *basedef = CharBaseDefs::instance()->get(id);
! 
! 	if (!basedef) {
! 		Py_RETURN_NONE;
! 	} else {
! 		return basedef->getPyObject();
! 	}
! }
! 
! /*
! 	\function wolfpack.itembase
! 	\param id The definition id.
! 	\return A <object id="basedef">basedef</object> object.
! 	\description Get a <object id="basedef">basedef</object> object for a given item definition id.
! */
! static PyObject *wpItemBase(PyObject*, PyObject *args) {
! 	char *id;
! 	if ( !PyArg_ParseTuple( args, "s:wolfpack.itembase(id)", &id ) )
! 	{
! 		return 0;
! 	}
! 
! 	cItemBaseDef *basedef = ItemBaseDefs::instance()->get(id);
! 
! 	if (!basedef) {
! 		Py_RETURN_NONE;
! 	} else {
! 		return basedef->getPyObject();
! 	}
  }
  
***************
*** 1768,1772 ****
--- 1797,1804 ----
  {
  { "npccount",			wpNpcCount,						METH_VARARGS, 0 },
+ { "charbase",			wpCharBase,						METH_VARARGS, 0 },
+ { "itembase",			wpItemBase,						METH_VARARGS, 0 },
  { "playercount",		wpPlayerCount,					METH_VARARGS, 0 },
+ { "bodyinfo",			wpBodyInfo,						METH_VARARGS, 0 },
  { "charbase",			wpCharBase,						METH_VARARGS, 0 },
  { "getoption",			wpGetOption,					METH_VARARGS, "Reads a string value from the database." },

[wpdev-commits] wolfpack ChangeLog,1.70,1.71 basedef.cpp,1.21,1.22 basedef.h,1.17,1.18

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2651

Modified Files:
	ChangeLog basedef.cpp basedef.h 
Log Message:
Carve

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** ChangeLog	20 Sep 2004 14:54:03 -0000	1.70
--- ChangeLog	21 Sep 2004 05:28:04 -0000	1.71
***************
*** 40,43 ****
--- 40,47 ----
  	- Console will show which unicode format was compiled in Python UCS2 or UCS4
  	- Fixed compile error on FreeBSD.
+ 	- Exposed the base definition class to python. 
+ 	- Added wolfpack.bodyinfo(id)
+ 	- Added/Changed wolfpack.itembase(def), wolfpack.charbase(def)
+ 	- Fixed a base definition bug related to property not loading the base definition.
  
  Wolfpack 12.9.10 Beta (10. September 2004)

Index: basedef.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** basedef.cpp	19 Sep 2004 23:41:00 -0000	1.21
--- basedef.cpp	21 Sep 2004 05:28:04 -0000	1.22
***************
*** 493,494 ****
--- 493,683 ----
  	}
  }
+ 
+ // Python Interface
+ const char* cBaseDef::className() const {
+ 	return "basedef";
+ }
+ 
+ bool cBaseDef::implements( const QString& name ) const {
+ 	if (name == "basedef") {
+ 		return true;
+ 	} else {
+ 		return cPythonScriptable::implements(name);
+ 	}
+ }
+ 
+ /*
+ 	\object basedef
+ 	\description This object type reprsents the base definitions of items and characters.
+ */
+ struct wpBasedef
+ {
+ 	PyObject_HEAD;
+ 	cBaseDef* basedef;
+ };
+ 
+ static PyObject* wpBasedef_getAttr( wpBasedef* self, char* name );
+ static int wpBasedef_compare( PyObject* a, PyObject* b );
+ 
+ PyTypeObject wpBasedefType =
+ {
+ PyObject_HEAD_INIT( NULL )
+ 0, 
+ "basedef", 
+ sizeof( wpBasedefType ), 
+ 0, 
+ wpDealloc, 
+ 0, 
+ ( getattrfunc ) wpBasedef_getAttr, 
+ 0, 
+ wpBasedef_compare,
+ 0,
+ };
+ 
+ /*
+ 	\method basedef.getintproperty
+ 	\description Get an integer property from this definition.
+ 	\param name The name of the property. This name is not case sensitive.
+ 	\param default The default value that is returned if this property doesnt
+ 	exist. Defaults to 0.
+ 	\return The property value or the given default value.
+ */
+ PyObject *wpBasedef_getintproperty(wpBasedef *self, PyObject *args) {
+ 	unsigned int def = 0;
+ 	PyObject *pyname;
+ 
+ 	if (!PyArg_ParseTuple(args, "O|i:basedef.getintproperty(name, def)", &pyname, &def)) {
+ 		return 0;
+ 	}
+ 
+ 	QString name = Python2QString(pyname);
+ 	return PyInt_FromLong( self->basedef->getIntProperty( name, def ) );
+ }
+ 
+ /*
+ 	\method basedef.getstrproperty
+ 	\description Get a string property from this definition.
+ 	\param name The name of the property. This name is not case sensitive.
+ 	\param default The default value that is returned if this property doesnt
+ 	exist. Defaults to an empty string.
+ 	\return The property value or the given default value.
+ */
+ static PyObject* wpBasedef_getstrproperty( wpBasedef* self, PyObject* args )
+ {
+ 	PyObject *pydef = 0;
+ 	PyObject *pyname;
+ 
+ 	if (!PyArg_ParseTuple(args, "O|O:basedef.getstrproperty(name, def)", &pyname, &pydef)) {
+ 		return 0;
+ 	}
+ 
+ 	QString name = Python2QString(pyname);
+ 	QString def = Python2QString(pydef);
+ 
+ 	return QString2Python( self->basedef->getStrProperty( name, def ) );
+ }
+ 
+ /*
+ 	\method basedef.hasstrproperty
+ 	\description Checks if this definition has a string property with the given name.
+ 	\param name The name of the property. This name is not case sensitive.
+ 	\return True if the definition has the property, False otherwise.
+ */
+ static PyObject* wpBasedef_hasstrproperty( wpBasedef* self, PyObject* args )
+ {
+ 	PyObject *pyname;
+ 
+ 	if (!PyArg_ParseTuple(args, "O:char.hasstrproperty(name)", &pyname)) {
+ 		return 0;
+ 	}
+ 
+ 	QString name = Python2QString(pyname);
+ 
+ 	if (self->basedef->hasStrProperty(name)) {
+ 		Py_RETURN_TRUE;
+ 	} else {
+ 		Py_RETURN_FALSE;
+ 	}
+ }
+ 
+ /*
+ 	\method basedef.hasintproperty
+ 	\description Checks if this definition has an integer property with the given name.
+ 	\param name The name of the property. This name is not case sensitive.
+ 	\return True if the definition has the property, False otherwise.
+ */
+ static PyObject* wpBasedef_hasintproperty( wpBasedef* self, PyObject* args )
+ {
+ 	PyObject *pyname;
+ 
+ 	if (!PyArg_ParseTuple(args, "O:basedef.hasintproperty(name)", &pyname)) {
+ 		return 0;
+ 	}
+ 
+ 	QString name = Python2QString(pyname);
+ 
+ 	if (self->basedef->hasIntProperty(name)) {
+ 		Py_RETURN_TRUE;
+ 	} else {
+ 		Py_RETURN_FALSE;
+ 	}
+ }
+ 
+ static PyMethodDef wpBasedefMethods[] = {
+ 	{"getintproperty", ( getattrofunc ) wpBasedef_getintproperty, METH_VARARGS, 0},
+ 	{"getstrproperty", ( getattrofunc ) wpBasedef_getstrproperty, METH_VARARGS, 0},
+ 	{"hasintproperty", ( getattrofunc ) wpBasedef_hasintproperty, METH_VARARGS, 0},
+ 	{"hasstrproperty", ( getattrofunc ) wpBasedef_hasstrproperty, METH_VARARGS, 0},
+ 	{0, 0, 0, 0}
+ };
+ 
+ PyObject* cBaseDef::getPyObject() {
+ 	wpBasedef * returnVal = PyObject_New( wpBasedef, &wpBasedefType );
+ 	returnVal->basedef = this;
+ 	return ( PyObject * ) returnVal;
+ }
+ 
+ static PyObject* wpBasedef_getAttr( wpBasedef* self, char* name ) {
+ 	PyObject *result = self->basedef->getProperty( name );
+ 
+ 	if (result) {
+ 		return result;
+ 	}
+ 	
+ 	return Py_FindMethod( wpBasedefMethods, (PyObject*) self, name );
+ }
+ 
+ static int wpBasedef_compare( PyObject* a, PyObject* b )
+ {
+ 	if ( a->ob_type != &wpBasedefType || b->ob_type != &wpBasedefType )
+ 		return -1;
+ 
+ 	return !( ( ( wpBasedef * ) a )->basedef == ( ( wpBasedef * ) b )->basedef );
+ }
+ 
+ PyObject* cBaseDef::getProperty( const QString& name ) {
+ 	PY_PROPERTY("id", id()) // \rproperty basedef.id The definition id of this base definition.
+ 	PY_PROPERTY("basescripts", baseScriptList()) // \rproperty basedef.basescripts The names of all basescripts assigned to this base definition.
+ 	PY_PROPERTY("bindmenu", bindmenu()) // \rproperty basedef.bindmenu The id of the context menu assigned to this base definition.
+ 	return cPythonScriptable::getProperty(name);
+ }
+ 
+ PyObject *cCharBaseDef::getProperty( const QString& name ) {
+ 	PY_PROPERTY("controlslots", controlSlots()) // \rproperty basedef.controlslots The amount of controlslots consumed by this npc.
+ 	PY_PROPERTY("criticalhealth", criticalHealth()) // \rproperty basedef.criticalhealth The percentage of health this NPC will start fleeing at.
+ 	PY_PROPERTY("mindamage", minDamage()) // \rproperty basedef.mindamage The mindamage for this npc.
+ 	PY_PROPERTY("mintaming", minTaming()) // \rproperty basedef.mintaming The minimum taming skill required for this npc.
+ 	PY_PROPERTY("lootpacks", lootPacks()) // \rproperty basedef.lootpacks The lootpacks for this npc.
+ 	return cBaseDef::getProperty(name);
+ }
+ 
+ PyObject *cItemBaseDef::getProperty( const QString& name ) {
+ 	PY_PROPERTY("decaydelay", decaydelay()) // \rproperty basedef.decaydelay The delay until this item will decay when its dropped to ground.
+ 	PY_PROPERTY("weight", weight()) // \rproperty basedef.weight The weight of this item.
+ 	PY_PROPERTY("sellprice", sellprice()) // \rproperty basedef.sellprice The sellprice of this item.
+ 	PY_PROPERTY("buyprice", buyprice()) // \rproperty basedef.buyprice The buyprice for this item.
+ 	PY_PROPERTY("type", type()) // \rproperty basedef.type The type of this item.
+ 	PY_PROPERTY("lightsource", lightsource()) // \rproperty.lightsource The lightmap id for this item.
+ 	PY_PROPERTY("watersource", isWaterSource()) // \rproperty.watersource Indicates whether this item is a source of water.
+ 	return cBaseDef::getProperty(name);
+ }

Index: basedef.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** basedef.h	14 Sep 2004 00:00:37 -0000	1.17
--- basedef.h	21 Sep 2004 05:28:04 -0000	1.18
***************
*** 31,34 ****
--- 31,35 ----
  #include "definable.h"
  #include "singleton.h"
+ #include "pythonscript.h"
  #include <qmap.h>
  #include <qptrlist.h>
***************
*** 39,43 ****
  class cPythonScript;
  
! class cBaseDef : public cDefinable {
  protected:
  	// Our id
--- 40,44 ----
  class cPythonScript;
  
! class cBaseDef : public cDefinable, public cPythonScriptable {
  protected:
  	// Our id
***************
*** 59,62 ****
--- 60,64 ----
  
  	inline unsigned int getIntProperty(const QString &name, unsigned int def = 0) {
+ 		load();
  		QMap<QString, unsigned int>::const_iterator it = intproperties.find(name);
  		if (it == intproperties.end()) {
***************
*** 68,75 ****
--- 70,79 ----
  
  	inline bool hasIntProperty(const QString &name) {
+ 		load();
  		return intproperties.contains(name);
  	}
  
  	inline const QString &getStrProperty(const QString &name, const QString &def = QString::null) {
+ 		load();
  		QMap<QString, QString>::const_iterator it = properties.find(name);
  		if (it == properties.end()) {
***************
*** 81,84 ****
--- 85,89 ----
  
  	inline bool hasStrProperty(const QString &name) {
+ 		load();
  		return properties.contains(name);
  	}
***************
*** 106,109 ****
--- 111,120 ----
  		return bindmenu_;
  	}
+ 
+ 	// Python Scriptable
+ 	const char* className() const;
+ 	PyObject* getPyObject();
+ 	bool implements(const QString& name) const;
+ 	PyObject *getProperty( const QString& name );
  };
  
***************
*** 193,196 ****
--- 204,209 ----
  		return lootPacks_;
  	}
+ 
+ 	PyObject *getProperty( const QString& name );
  };
  
***************
*** 323,326 ****
--- 336,341 ----
  		return ( flags_ & 0x01 ) != 0;
  	}
+ 
+ 	PyObject *getProperty( const QString& name );
  };
  

[wpdev-commits] xmlscripts/definitions/npcs/monsters/ophidian ophidian_apprentice_mage.xml,1.10,1.11 ophidian_avenger.xml,1.10,1.11 ophidian_enforcer.xml,1.10,1.11 ophidian_justicar.xml,1.10,1.11 ophidian_knight_errant.xml,1.10,1.11 ophidian_matriarch.xml,1.10,1.11 ophidian_shaman.xml,1.10,1.11 ophidian_warrior.xml,1.10,1.11 ophidian_zealot.xml,1.10,1.11

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2195/npcs/monsters/ophidian

Modified Files:
	ophidian_apprentice_mage.xml ophidian_avenger.xml 
	ophidian_enforcer.xml ophidian_justicar.xml 
	ophidian_knight_errant.xml ophidian_matriarch.xml 
	ophidian_shaman.xml ophidian_warrior.xml ophidian_zealot.xml 
Log Message:
Carve

Index: ophidian_zealot.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_zealot.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_zealot.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_zealot.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 41,44 ****
--- 41,46 ----
  		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Ophidians\Ophidian Zealot</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ophidian_shaman.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_shaman.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_shaman.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_shaman.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 40,43 ****
--- 40,45 ----
  		<lootpacks>lootpack_average</lootpacks>
  		<category>Monsters\Ophidians\Ophidian Shaman</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ophidian_avenger.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_avenger.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_avenger.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_avenger.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 38,41 ****
--- 38,43 ----
  		<lootpacks>lootpack_rich;lootpack_rich;gems</lootpacks>
  		<category>Monsters\Ophidians\Ophidian Avenger</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ophidian_warrior.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_warrior.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_warrior.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_warrior.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 40,43 ****
--- 40,45 ----
  		<carve>carve_ophidian_warrior_medium</carve>
  		<category>Monsters\Ophidians\Ophidian Warrior</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ophidian_matriarch.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_matriarch.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_matriarch.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_matriarch.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 42,45 ****
--- 42,47 ----
  		<carve>carve_ophidian_queen_medium</carve>
  		<category>Monsters\Ophidians\Ophidian Matriarch</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ophidian_knight_errant.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_knight_errant.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_knight_errant.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_knight_errant.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 40,43 ****
--- 40,45 ----
  		<lootpacks>lootpack_rich;lootpack_rich;gems</lootpacks>
  		<category>Monsters\Ophidians\Ophidian Knight-Errant</category>
+ 		
+ 		<intproperty name="carve_meat" value="2" />
  	</npc>
  

Index: ophidian_enforcer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_enforcer.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_enforcer.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_enforcer.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 39,42 ****
--- 39,44 ----
  		<lootpacks>lootpack_average;lootpack_meager</lootpacks>
  		<category>Monsters\Ophidians\Ophidian Enforcer</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ophidian_justicar.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_justicar.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_justicar.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_justicar.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 41,44 ****
--- 41,46 ----
  		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Ophidians\Ophidian Justicar</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ophidian_apprentice_mage.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_apprentice_mage.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ophidian_apprentice_mage.xml	7 Sep 2004 00:28:05 -0000	1.10
--- ophidian_apprentice_mage.xml	21 Sep 2004 05:27:14 -0000	1.11
***************
*** 41,44 ****
--- 41,46 ----
  		<carve>carve_ophidian_mage_medium</carve>
  		<category>Monsters\Ophidians\Ophidian Apprentice Mage</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

[wpdev-commits] xmlscripts/definitions/npcs/monsters/daemonic balron.xml,1.15,1.16 daemon.xml,1.15,1.16 fire_gargoyle.xml,1.12,1.13 gargoyle.xml,1.12,1.13 gargoyle_destroyer.xml,1.12,1.13 gargoyle_enforcer.xml,1.12,1.13 harpy.xml,1.12,1.13 hell_cat.xml,1.13,1.14 hell_cat_preditor.xml,1.12,1.13 hell_hound.xml,1.13,1.14 ice_fiend.xml,1.12,1.13 imp.xml,1.13,1.14 mongbat.xml,1.14,1.15 mongbat_strong.xml,1.13,1.14 stone_harpy.xml,1.12,1.13 succubus.xml,1.10,1.11

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2195/npcs/monsters/daemonic

Modified Files:
	balron.xml daemon.xml fire_gargoyle.xml gargoyle.xml 
	gargoyle_destroyer.xml gargoyle_enforcer.xml harpy.xml 
	hell_cat.xml hell_cat_preditor.xml hell_hound.xml 
	ice_fiend.xml imp.xml mongbat.xml mongbat_strong.xml 
	stone_harpy.xml succubus.xml 
Log Message:
Carve

Index: balron.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/balron.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** balron.xml	7 Sep 2004 00:28:03 -0000	1.15
--- balron.xml	21 Sep 2004 05:27:12 -0000	1.16
***************
*** 44,47 ****
--- 44,49 ----
  		<carve>carve_demon_with_sword</carve>
  		<category>Monsters\Daemonic\Balron</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: daemon.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/daemon.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** daemon.xml	7 Sep 2004 00:28:03 -0000	1.15
--- daemon.xml	21 Sep 2004 05:27:12 -0000	1.16
***************
*** 45,48 ****
--- 45,50 ----
  		<carve>carve_demon</carve>
  		<category>Monsters\Daemonic\Daemon (Random)</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: hell_cat.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/hell_cat.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** hell_cat.xml	10 Sep 2004 17:08:28 -0000	1.13
--- hell_cat.xml	21 Sep 2004 05:27:12 -0000	1.14
***************
*** 40,43 ****
--- 40,47 ----
  		<carve>carve_hellcat</carve>
  		<category>Monsters\Daemonic\Hellcat (Small)</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="10" />
+ 		<intproperty name="carve_hides_type" value="spined" />
  	</npc>
  

Index: hell_cat_preditor.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/hell_cat_preditor.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** hell_cat_preditor.xml	10 Sep 2004 17:08:28 -0000	1.12
--- hell_cat_preditor.xml	21 Sep 2004 05:27:12 -0000	1.13
***************
*** 38,41 ****
--- 38,45 ----
  		<lootpacks>lootpack_average</lootpacks>
  		<category>Monsters\Daemonic\Hellcat (Large)</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="10" />
+ 		<intproperty name="carve_hides_type" value="spined" />
  	</npc>
  

Index: gargoyle_enforcer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle_enforcer.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gargoyle_enforcer.xml	7 Sep 2004 00:28:03 -0000	1.12
--- gargoyle_enforcer.xml	21 Sep 2004 05:27:12 -0000	1.13
***************
*** 44,47 ****
--- 44,49 ----
  		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Daemonic\Gargoyle Enforcer</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: harpy.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/harpy.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** harpy.xml	7 Sep 2004 00:28:03 -0000	1.12
--- harpy.xml	21 Sep 2004 05:27:12 -0000	1.13
***************
*** 38,41 ****
--- 38,46 ----
  		<lootpacks>lootpack_meager;lootpack_meager</lootpacks>
  		<category>Monsters\Daemonic\Harpy</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_feathers" value="50" />
+ 		<intproperty name="carve_meat" value="4" />
+ 		<strproperty name="carve_meat_type" value="bird" />
  	</npc>
  

Index: stone_harpy.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/stone_harpy.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** stone_harpy.xml	7 Sep 2004 00:28:03 -0000	1.12
--- stone_harpy.xml	21 Sep 2004 05:27:12 -0000	1.13
***************
*** 38,41 ****
--- 38,45 ----
  		<lootpacks>lootpack_average;lootpack_average;gems</lootpacks>
  		<category>Monsters\Daemonic\Stone Harpy</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_feathers" value="50" />
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: gargoyle_destroyer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle_destroyer.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gargoyle_destroyer.xml	7 Sep 2004 00:28:03 -0000	1.12
--- gargoyle_destroyer.xml	21 Sep 2004 05:27:12 -0000	1.13
***************
*** 44,47 ****
--- 44,49 ----
  		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Daemonic\Gargoyle Destroyer</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: mongbat.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/mongbat.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mongbat.xml	10 Sep 2004 17:08:28 -0000	1.14
--- mongbat.xml	21 Sep 2004 05:27:12 -0000	1.15
***************
*** 37,40 ****
--- 37,42 ----
  		<carve>carve_mong_bat</carve>
  		<category>Monsters\Daemonic\Mongbat</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: succubus.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/succubus.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** succubus.xml	7 Sep 2004 00:28:03 -0000	1.10
--- succubus.xml	21 Sep 2004 05:27:12 -0000	1.11
***************
*** 40,43 ****
--- 40,44 ----
  		<lootpacks>lootpack_filthy_rich;lootpack_filthy_rich</lootpacks>
  		<category>Monsters\Daemonic\Succubus</category>
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ice_fiend.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/ice_fiend.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ice_fiend.xml	7 Sep 2004 00:28:03 -0000	1.12
--- ice_fiend.xml	21 Sep 2004 05:27:12 -0000	1.13
***************
*** 41,44 ****
--- 41,46 ----
  		<lootpacks>lootpack_average;lootpack_filthy_rich</lootpacks>
  		<category>Monsters\Daemonic\Ice Fiend</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: gargoyle.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gargoyle.xml	7 Sep 2004 00:28:03 -0000	1.12
--- gargoyle.xml	21 Sep 2004 05:27:12 -0000	1.13
***************
*** 40,43 ****
--- 40,45 ----
  		<carve>carve_gargoyle</carve>
  		<category>Monsters\Daemonic\Gargoyle</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: hell_hound.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/hell_hound.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** hell_hound.xml	10 Sep 2004 17:08:28 -0000	1.13
--- hell_hound.xml	21 Sep 2004 05:27:12 -0000	1.14
***************
*** 40,43 ****
--- 40,45 ----
  		<carve>carve_hell_hound</carve>
  		<category>Monsters\Daemonic\Hell Hound</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: fire_gargoyle.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/fire_gargoyle.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** fire_gargoyle.xml	7 Sep 2004 00:28:03 -0000	1.12
--- fire_gargoyle.xml	21 Sep 2004 05:27:12 -0000	1.13
***************
*** 42,45 ****
--- 42,47 ----
  		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Daemonic\Fire Gargoyle</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: imp.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/imp.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** imp.xml	10 Sep 2004 17:08:28 -0000	1.13
--- imp.xml	21 Sep 2004 05:27:12 -0000	1.14
***************
*** 46,49 ****
--- 46,54 ----
  		<carve>carve_imp</carve>
  		<category>Monsters\Daemonic\Imp</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="6" />
+ 		<strproperty name="carve_hides_type" value="spined" />
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: mongbat_strong.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/mongbat_strong.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mongbat_strong.xml	10 Sep 2004 17:08:28 -0000	1.13
--- mongbat_strong.xml	21 Sep 2004 05:27:12 -0000	1.14
***************
*** 32,35 ****
--- 32,39 ----
  		<lootpacks>lootpack_poor</lootpacks>
  		<category>Monsters\Daemonic\Mongbat (Strong)</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="6" />
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

[wpdev-commits] xmlscripts/definitions/npcs/monsters/reptiles giant_ice_serpent.xml,1.10,1.11 giant_serpent.xml,1.10,1.11 giant_toad.xml,1.13,1.14 ice_snake.xml,1.11,1.12 lava_lizard.xml,1.12,1.13 lava_serpent.xml,1.10,1.11 lava_snake.xml,1.11,1.12 silver_serpent.xml,1.12,1.13

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2195/npcs/monsters/reptiles

Modified Files:
	giant_ice_serpent.xml giant_serpent.xml giant_toad.xml 
	ice_snake.xml lava_lizard.xml lava_serpent.xml lava_snake.xml 
	silver_serpent.xml 
Log Message:
Carve

Index: giant_serpent.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/giant_serpent.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** giant_serpent.xml	7 Sep 2004 00:28:06 -0000	1.10
--- giant_serpent.xml	21 Sep 2004 05:27:15 -0000	1.11
***************
*** 43,46 ****
--- 43,51 ----
  		<carve>carve_serpent_gaint</carve>
  		<category>Monsters\Reptiles\Gaint Serpent</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="15" />
+ 		<strproperty name="carve_hides_type" value="spined" />
+ 		<intproperty name="carve_meat" value="4" />
  	</npc>
  

Index: lava_snake.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/lava_snake.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** lava_snake.xml	7 Sep 2004 00:28:06 -0000	1.11
--- lava_snake.xml	21 Sep 2004 05:27:15 -0000	1.12
***************
*** 35,38 ****
--- 35,40 ----
  		<lootpacks>lootpack_poor</lootpacks>
  		<category>Monsters\Reptiles\Lava Snake</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: giant_toad.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/giant_toad.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** giant_toad.xml	10 Sep 2004 17:08:29 -0000	1.13
--- giant_toad.xml	21 Sep 2004 05:27:15 -0000	1.14
***************
*** 38,42 ****
  		<lootpacks>lootpack_poor</lootpacks>
  		<mintaming>771</mintaming>
! 		<category>Monsters\Reptiles\giant Toad</category>
  	</npc>
  
--- 38,46 ----
  		<lootpacks>lootpack_poor</lootpacks>
  		<mintaming>771</mintaming>
! 		<category>Monsters\Reptiles\Giant Toad</category>
! 		
! 		<!-- Carve -->
! 		<intproperty name="carve_hides" value="12" />
! 		<intproperty name="carve_hides_type" value="spined" />		
  	</npc>
  

Index: lava_lizard.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/lava_lizard.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lava_lizard.xml	10 Sep 2004 17:08:29 -0000	1.12
--- lava_lizard.xml	21 Sep 2004 05:27:15 -0000	1.13
***************
*** 40,43 ****
--- 40,47 ----
  		<mintaming>807</mintaming>
  		<category>Monsters\Reptiles\lava lizard</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="12" />
+ 		<strproperty name="carve_hides_type" value="spined" />
  	</npc>
  

Index: ice_snake.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/ice_snake.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ice_snake.xml	7 Sep 2004 00:28:06 -0000	1.11
--- ice_snake.xml	21 Sep 2004 05:27:15 -0000	1.12
***************
*** 37,40 ****
--- 37,42 ----
  		<lootpacks>lootpack_meager</lootpacks>
  		<category>Monsters\Reptiles\Ice Snake</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: silver_serpent.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/silver_serpent.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** silver_serpent.xml	7 Sep 2004 00:28:06 -0000	1.12
--- silver_serpent.xml	21 Sep 2004 05:27:15 -0000	1.13
***************
*** 40,43 ****
--- 40,45 ----
  		<lootpacks>lootpack_average;gems</lootpacks>
  		<category>Monsters\Reptiles\Silver Serpent</category>
+ 		
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: giant_ice_serpent.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/giant_ice_serpent.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** giant_ice_serpent.xml	7 Sep 2004 00:28:06 -0000	1.10
--- giant_ice_serpent.xml	21 Sep 2004 05:27:15 -0000	1.11
***************
*** 40,43 ****
--- 40,48 ----
  		<lootpacks>lootpack_meager</lootpacks>
  		<category>Monsters\Reptiles\Giant Ice Serpent</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="15" />
+ 		<strproperty name="carve_hides_type" value="spined" />
+ 		<intproperty name="carve_meat" value="4" />
  	</npc>
  

Index: lava_serpent.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/lava_serpent.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** lava_serpent.xml	7 Sep 2004 00:28:06 -0000	1.10
--- lava_serpent.xml	21 Sep 2004 05:27:15 -0000	1.11
***************
*** 39,42 ****
--- 39,47 ----
  		<lootpacks>lootpack_average</lootpacks>
  		<category>Monsters\Reptiles\Lava Serpent</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="15" />
+ 		<strproperty name="carve_hides_type" value="spined" />
+ 		<intproperty name="carve_meat" value="4" />
  	</npc>
  

[wpdev-commits] xmlscripts/definitions/npcs/monsters/sea deep_sea_serpent.xml,1.10,1.11 sea_serpent.xml,1.10,1.11

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/sea
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2195/npcs/monsters/sea

Modified Files:
	deep_sea_serpent.xml sea_serpent.xml 
Log Message:
Carve

Index: sea_serpent.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/sea/sea_serpent.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sea_serpent.xml	7 Sep 2004 00:28:06 -0000	1.10
--- sea_serpent.xml	21 Sep 2004 05:27:15 -0000	1.11
***************
*** 38,41 ****
--- 38,47 ----
  		<lootpacks>lootpack_meager</lootpacks>
  		<category>Monsters\Sea Monsters\Sea Serpent</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_scales" value="8" />
+ 		<strproperty name="carve_scales_type" value="blue" />
+ 		<intproperty name="carve_hides" value="10" />
+ 		<strproperty name="carve_hides_type" value="horned" />
  	</npc>
  

Index: deep_sea_serpent.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/sea/deep_sea_serpent.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** deep_sea_serpent.xml	7 Sep 2004 00:28:06 -0000	1.10
--- deep_sea_serpent.xml	21 Sep 2004 05:27:15 -0000	1.11
***************
*** 40,43 ****
--- 40,48 ----
  		<lootpacks>lootpack_meager</lootpacks>
  		<category>Monsters\Sea Monsters\Deep Sea Serpent</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_scales" value="8" />
+ 		<strproperty name="carve_scales_type" value="blue" />
+ 		<intproperty name="carve_meat" value="1" />		
  	</npc>
  

[wpdev-commits] xmlscripts/definitions/npcs/monsters/lizardmen lizardmen.xml,1.14,1.15

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/lizardmen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2195/npcs/monsters/lizardmen

Modified Files:
	lizardmen.xml 
Log Message:
Carve

Index: lizardmen.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/lizardmen/lizardmen.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** lizardmen.xml	9 Sep 2004 03:19:38 -0000	1.14
--- lizardmen.xml	21 Sep 2004 05:27:13 -0000	1.15
***************
*** 40,43 ****
--- 40,48 ----
  		<carve>carve_lizard_man_medium</carve>
  		<category>Monsters\Lizardmen\Lizardman (Random)</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="12" />
+ 		<strproperty name="carve_hides_type" value="spined" />
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

[wpdev-commits] xmlscripts/definitions/npcs/monsters/ratmen ratman_archer.xml,1.13,1.14 ratman_mage.xml,1.13,1.14 ratmen.xml,1.15,1.16

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2195/npcs/monsters/ratmen

Modified Files:
	ratman_archer.xml ratman_mage.xml ratmen.xml 
Log Message:
Carve

Index: ratmen.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen/ratmen.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ratmen.xml	9 Sep 2004 03:19:39 -0000	1.15
--- ratmen.xml	21 Sep 2004 05:27:14 -0000	1.16
***************
*** 42,45 ****
--- 42,49 ----
  		<lootpacks>lootpack_meager</lootpacks>
  		<category>Monsters\Ratmen\Ratman (Random)</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="8" />
+ 		<strproperty name="carve_hides_type" value="spined" />
  	</npc>
  

Index: ratman_mage.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen/ratman_mage.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ratman_mage.xml	9 Sep 2004 03:19:39 -0000	1.13
--- ratman_mage.xml	21 Sep 2004 05:27:14 -0000	1.14
***************
*** 42,45 ****
--- 42,50 ----
  		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Ratmen\Ratman Mage</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="8" />
+ 		<strproperty name="carve_hides_type" value="spined" />
+ 		<intproperty name="carve_meat" value="1" />
  	</npc>
  

Index: ratman_archer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen/ratman_archer.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ratman_archer.xml	9 Sep 2004 03:19:39 -0000	1.13
--- ratman_archer.xml	21 Sep 2004 05:27:14 -0000	1.14
***************
*** 41,44 ****
--- 41,48 ----
  		<lootpacks>lootpack_rich</lootpacks>
  		<category>Monsters\Ratmen\Ratman Archer</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="8" />
+ 		<strproperty name="carve_hides_type" value="spined" />
  	</npc>
  

[wpdev-commits] xmlscripts/definitions/npcs/monsters/dragons ancient_wyrm.xml,1.11,1.12 dragon.xml,1.14,1.15 drake.xml,1.15,1.16 serpentine_dragon.xml,1.12,1.13 shadow_wyrm.xml,1.11,1.12 skeletal_dragon.xml,1.4,1.5 white_wyrm.xml,1.15,1.16 wyvern.xml,1.13,1.14

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

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2195/npcs/monsters/dragons

Modified Files:
	ancient_wyrm.xml dragon.xml drake.xml serpentine_dragon.xml 
	shadow_wyrm.xml skeletal_dragon.xml white_wyrm.xml wyvern.xml 
Log Message:
Carve

Index: serpentine_dragon.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/serpentine_dragon.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** serpentine_dragon.xml	7 Sep 2004 00:28:03 -0000	1.12
--- serpentine_dragon.xml	21 Sep 2004 05:27:13 -0000	1.13
***************
*** 41,44 ****
--- 41,51 ----
  		<lootpacks>lootpack_filthy_rich;lootpack_filthy_rich;lootpack_rich</lootpacks>
  		<category>Monsters\Dragons\Serpentine Dragon</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_scales" value="6" />
+ 		<strproperty name="carve_scales_type" value="white,black" />
+ 		<intproperty name="carve_hides" value="20" />
+ 		<strproperty name="carve_hides_type" value="barbed" />
+ 		<intproperty name="carve_meat" value="19" />
  	</npc>
  

Index: drake.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/drake.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** drake.xml	10 Sep 2004 17:08:28 -0000	1.15
--- drake.xml	21 Sep 2004 05:27:13 -0000	1.16
***************
*** 10,14 ****
  
  	<!-- a drake -->
! 	<npc id="drake" inherit="monster_base">
  		<name>drake</name>
  		<id><random list="NPCIDS_DRAKE" /></id>
--- 10,14 ----
  
  	<!-- a drake -->
! 	<npc id="drake_base" inherit="monster_base">
  		<name>drake</name>
  		<id><random list="NPCIDS_DRAKE" /></id>
***************
*** 39,57 ****
  		<lootpacks>lootpack_rich</lootpacks>
  		<mintaming>843</mintaming>
- 		<category>Monsters\Dragons\Drake (Random)</category>
  	</npc>
  
  	<!-- a drake (gray) -->
! 	<npc id="drake_gray" inherit="drake">
  		<id>60</id>
  		<category>Monsters\Dragons\Drake (Gray)</category>
! 		<carve>carve_drake_red</carve>
  	</npc>
  
  	<!-- a drake (red) -->
! 	<npc id="drake_red" inherit="drake">
  		<id>61</id>
  		<category>Monsters\Dragons\Drake (Red)</category>
! 		<carve>carve_drake_red</carve>
  	</npc>
  
--- 39,82 ----
  		<lootpacks>lootpack_rich</lootpacks>
  		<mintaming>843</mintaming>
  	</npc>
  
  	<!-- a drake (gray) -->
! 	<npc id="drake_gray" inherit="drake_base">
  		<id>60</id>
  		<category>Monsters\Dragons\Drake (Gray)</category>
! 		<baseid>drake_gray</baseid>
! 		
! 		<!-- Carve -->
! 		<intproperty name="carve_scales" value="2" />
! 		<strproperty name="carve_scales_type" value="yellow" />
! 		<intproperty name="carve_hides" value="20" />
! 		<strproperty name="carve_hides_type" value="horned" />
! 		<intproperty name="carve_meat" value="10" />
  	</npc>
  
  	<!-- a drake (red) -->
! 	<npc id="drake_red" inherit="drake_base">
  		<id>61</id>
  		<category>Monsters\Dragons\Drake (Red)</category>
! 		<baseid>drake_red</baseid>
! 		
! 		<!-- Carve -->
! 		<intproperty name="carve_scales" value="2" />
! 		<strproperty name="carve_scales_type" value="red" />
! 		<intproperty name="carve_hides" value="20" />
! 		<strproperty name="carve_hides_type" value="horned" />
! 		<intproperty name="carve_meat" value="10" />
! 	</npc>
! 	
! 	<list id="drake_ids">
! 		<item>drake_gray</item>
! 		<item>drake_red</item>
! 	</list>
! 	
! 	<!-- random dragon -->
! 	<npc id="drake">
! 		<id>61</id>		
! 		<category>Monsters\Dragons\Drake (Random)</category>
! 		<inherit><random list="drake_ids" /></inherit>
  	</npc>
  

Index: shadow_wyrm.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/shadow_wyrm.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** shadow_wyrm.xml	7 Sep 2004 00:28:03 -0000	1.11
--- shadow_wyrm.xml	21 Sep 2004 05:27:13 -0000	1.12
***************
*** 42,45 ****
--- 42,52 ----
  		<lootpacks>lootpack_filthy_rich;lootpack_filthy_rich;lootpack_filthy_rich</lootpacks>
  		<category>Monsters\Dragons\Shadow Wyrm</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_scales" value="10" />
+ 		<strproperty name="carve_scales_type" value="black" />
+ 		<intproperty name="carve_hides" value="20" />
+ 		<strproperty name="carve_hides_type" value="barbed" />
+ 		<intproperty name="carve_meat" value="19" />
  	</npc>
  

Index: ancient_wyrm.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/ancient_wyrm.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ancient_wyrm.xml	7 Sep 2004 00:28:03 -0000	1.11
--- ancient_wyrm.xml	21 Sep 2004 05:27:13 -0000	1.12
***************
*** 40,43 ****
--- 40,50 ----
  		<desc>The eldest of the Draconian race are rarely seen by any other than drake eyes. Ancient in origin, the wizened Elder is said to long for the days when the reptile was the guardian of the land now known as Britannia. Patience is not a virtue of the Elder Wyrm, and disturbing one may lead to a quick death. Death, of course, being the quickest way for these ancient ones to be rid of the intruder and get back to their studies.</desc>
  		<category>Monsters\Dragons\Ancient Wyrm</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_scales" value="12" />
+ 		<strproperty name="carve_scales_type" value="red,yellow,black,green" />
+ 		<intproperty name="carve_hides" value="40" />
+ 		<strproperty name="carve_hides_type" value="barbed" />
+ 		<intproperty name="carve_meat" value="19" />
  	</npc>
  

Index: white_wyrm.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/white_wyrm.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** white_wyrm.xml	10 Sep 2004 17:08:28 -0000	1.15
--- white_wyrm.xml	21 Sep 2004 05:27:13 -0000	1.16
***************
*** 43,46 ****
--- 43,53 ----
  		<mintaming>963</mintaming>
  		<category>Monsters\Dragons\White Wyrm (Random)</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_scales" value="9" />
+ 		<strproperty name="carve_scales_type" value="white" />
+ 		<intproperty name="carve_hides" value="20" />
+ 		<strproperty name="carve_hides_type" value="barbed" />
+ 		<intproperty name="carve_meat" value="19" />
  	</npc>
  

Index: skeletal_dragon.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/skeletal_dragon.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** skeletal_dragon.xml	7 Sep 2004 00:28:03 -0000	1.4
--- skeletal_dragon.xml	21 Sep 2004 05:27:13 -0000	1.5
***************
*** 43,46 ****
--- 43,50 ----
  		<!-- Misc. -->
  		<category>Monsters\Dragons\Skeletal Dragon</category>
+ 		
+ 		<!-- Carve -->
+ 		<intproperty name="carve_hides" value="20" />
+ 		<strproperty name="carve_hides_type" value="barbed" />
  	</npc>
  

Index: wyvern.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/wyvern.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wyvern.xml	7 Sep 2004 00:28:03 -0000	1.13
--- wyvern.xml	21 Sep 2004 05:27:13 -0000	1.14
***************
*** 40,43 ****
--- 40,47 ----
  		<lootpacks>lootpack_average;lootpack_meager</lootpacks>
  		<category>Monsters\Dragons\Wyrvern</category>
+ 		
+ 		<intproperty name="carve_hides" value="20" />
+ 		<strproperty name="carve_hides_type" value="horned" />
+ 		<intproperty name="carve_meat" value="10" />
  	</npc>
  

Index: dragon.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/dragon.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dragon.xml	10 Sep 2004 17:08:28 -0000	1.14
--- dragon.xml	21 Sep 2004 05:27:13 -0000	1.15
***************
*** 11,17 ****
  
  	<!-- a dragon, random -->
! 	<npc id="dragon" inherit="monster_base">
  		<name>dragon</name>
- 		<id><random list="NPCIDS_DRAGON" /></id>
  		<inherit id="KARMA_L5" />
  		<inherit id="FAME_L5" />
--- 11,16 ----
  
  	<!-- a dragon, random -->
! 	<npc id="dragon_base" inherit="monster_base">
  		<name>dragon</name>
  		<inherit id="KARMA_L5" />
  		<inherit id="FAME_L5" />
***************
*** 42,60 ****
  		<lootpacks>lootpack_filthy_rich;lootpack_filthy_rich</lootpacks>
  		<mintaming>939</mintaming>
- 		<category>Monsters\Dragons\Dragon (Random)</category>
  	</npc>
  
  	<!-- a dragon (gray) -->
! 	<npc id="dragon_gray" inherit="dragon">
  		<id>12</id>
  		<category>Monsters\Dragons\Dragon (Gray)</category>
! 		<carve>carve_dragon_gray</carve>
  	</npc>
  
  	<!-- a dragon (red) -->
! 	<npc id="dragon_red" inherit="dragon">
  		<id>59</id>
  		<category>Monsters\Dragons\Dragon (Red)</category>
! 		<carve>carve_dragon_red</carve>
  	</npc>
  
--- 41,84 ----
  		<lootpacks>lootpack_filthy_rich;lootpack_filthy_rich</lootpacks>
  		<mintaming>939</mintaming>
  	</npc>
  
  	<!-- a dragon (gray) -->
! 	<npc id="dragon_gray" inherit="dragon_base">
  		<id>12</id>
  		<category>Monsters\Dragons\Dragon (Gray)</category>
! 		<baseid>dragon_gray</baseid>
! 		
! 		<!-- Carve -->
! 		<intproperty name="carve_scales" value="7" />
! 		<strproperty name="carve_scales_type" value="yellow" />
! 		<intproperty name="carve_hides" value="20" />
! 		<strproperty name="carve_hides_type" value="barbed" />
! 		<intproperty name="carve_meat" value="19" />
  	</npc>
  
  	<!-- a dragon (red) -->
! 	<npc id="dragon_red" inherit="dragon_base">
  		<id>59</id>
  		<category>Monsters\Dragons\Dragon (Red)</category>
! 		<baseid>dragon_red</baseid>
! 		
! 		<!-- Carve -->
! 		<intproperty name="carve_scales" value="7" />
! 		<strproperty name="carve_scales_type" value="red" />
! 		<intproperty name="carve_hides" value="20" />
! 		<strproperty name="carve_hides_type" value="barbed" />
! 		<intproperty name="carve_meat" value="19" />
! 	</npc>
! 	
! 	<list id="dragon_ids">
! 		<item>dragon_gray</item>
! 		<item>dragon_red</item>
! 	</list>
! 	
! 	<!-- random dragon -->
! 	<npc id="dragon">
! 		<id>12</id>		
! 		<category>Monsters\Dragons\Dragon (Random)</category>
! 		<inherit><random list="dragon_ids" /></inherit>
  	</npc>