wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] wolfpack world.cpp,1.53,1.54

[<dar...@pr...>]

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

Modified Files:
	world.cpp 
Log Message:
Small fix for postprocessing again.

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** world.cpp	25 Jan 2004 18:48:54 -0000	1.53
--- world.cpp	25 Jan 2004 18:58:31 -0000	1.54
***************
*** 514,523 ****
  	Console::instance()->PrepareProgress( "Postprocessing" );
  
! 	P_ITEM pi;	
  	QPtrList< cItem > deleteItems;
  
! 	cItemIterator iter;
! 	for( pi = iter.first(); pi; pi = iter.next() )
  	{
  		SERIAL contserial = reinterpret_cast<SERIAL>(pi->container());
  
--- 514,524 ----
  	Console::instance()->PrepareProgress( "Postprocessing" );
  
! 	// It's not possible to use cItemIterator during postprocessing because it skips lingering items
! 	ItemMap::iterator iter;
  	QPtrList< cItem > deleteItems;
  
! 	for( iter = p->items.begin(); iter != p->items.end(); ++iter )
  	{
+ 		P_ITEM pi = iter->second;
  		SERIAL contserial = reinterpret_cast<SERIAL>(pi->container());
  
***************
*** 533,536 ****
--- 534,540 ----
  			}
  		} else {
+ 			// Flag the container value as valid
+ 			pi->free = false;
+ 
  			// 1. Handle the Container Value
  			if (isItemSerial(contserial)) {

[wpdev-commits] wolfpack basechar.cpp,1.50,1.51 basechar.h,1.38,1.39 uobject.cpp,1.123,1.124 uobject.h,1.78,1.79

[<dar...@pr...>]

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

Modified Files:
	basechar.cpp basechar.h uobject.cpp uobject.h 
Log Message:
Final fixes for postprocessing and implementation of a resend tooltip functionality.

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** basechar.cpp	28 Nov 2003 05:31:18 -0000	1.50
--- basechar.cpp	25 Jan 2004 20:24:25 -0000	1.51
***************
*** 2059,2060 ****
--- 2059,2061 ----
  	return result;
  }
+ 

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** basechar.h	23 Sep 2003 12:40:18 -0000	1.38
--- basechar.h	25 Jan 2004 20:24:26 -0000	1.39
***************
*** 108,116 ****
  	virtual void log( const QString &string ) = 0;
  	unsigned int damage( eDamageType type, unsigned int amount, cUObject *source = 0 );
! 
  	// other public methods
  	// Simple Property setting and getting for script engines.
! 	virtual stError *setProperty( const QString &name, const cVariant &value );
! 	virtual stError *getProperty( const QString &name, cVariant &value ) const;
  	void updateHealth( void );
  	void action( uchar id ); // Do an action
--- 108,116 ----
  	virtual void log( const QString &string ) = 0;
  	unsigned int damage( eDamageType type, unsigned int amount, cUObject *source = 0 );
! 	
  	// other public methods
  	// Simple Property setting and getting for script engines.
! 	stError *setProperty( const QString &name, const cVariant &value );
! 	stError *getProperty( const QString &name, cVariant &value ) const;	
  	void updateHealth( void );
  	void action( uchar id ); // Do an action

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** uobject.cpp	25 Jan 2004 01:07:49 -0000	1.123
--- uobject.cpp	25 Jan 2004 20:24:26 -0000	1.124
***************
*** 474,483 ****
  
  // Checks if the specified object is in range
! bool cUObject::inRange( const cUObject *object, UINT32 range ) const
  {
  	if( !object ) 
  		return false;
  
! 	return ( pos_.distance( object->pos_ ) <= range );
  }
  
--- 474,500 ----
  
  // Checks if the specified object is in range
! bool cUObject::inRange( cUObject *object, UINT32 range ) const
  {
  	if( !object ) 
  		return false;
  
! 	Coord_cl pos = object->pos_;
! 
! 	if (object->isItem()) {
! 		P_ITEM pItem = dynamic_cast<P_ITEM>(object);
! 
! 		if (pItem) {
! 			P_ITEM pCont = pItem->getOutmostItem();
! 			P_CHAR pEquipped = pItem->getOutmostChar();
! 
! 			if (pEquipped) {
! 				pos = pEquipped->pos();
! 			} else if (pCont) {
! 				pos = pCont->pos();
! 			}
! 		}
! 	}
! 
! 	return pos_.distance(pos) <= range;
  }
  
***************
*** 716,719 ****
--- 733,757 ----
  }
  
+ void cUObject::resendTooltip() {
+ 	tooltip_ = World::instance()->getUnusedTooltip(); 
+ 	setTooltip(tooltip_);
+ 
+ 	cUOTxAttachTooltip tooltip;
+ 
+ 	tooltip.setId( tooltip_ );
+ 	tooltip.setSerial( serial() );
+ 
+ 	cUOTxAttachTooltip attach;
+ 	attach.setId(tooltip_);
+ 	attach.setSerial(serial_);
+ 
+ 	for (cUOSocket *s = cNetwork::instance()->first(); s; s = cNetwork::instance()->next()) {
+ 		if (s->player() && s->player()->inRange(this, s->player()->visualRange())) {
+ 			s->addTooltip(tooltip_);
+ 			s->send(&attach);
+ 		}
+ 	}
+ }
+ 
  /****************************
   * 

Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** uobject.h	6 Jan 2004 22:30:06 -0000	1.78
--- uobject.h	25 Jan 2004 20:24:26 -0000	1.79
***************
*** 123,127 ****
  	bool del();
  
! 	bool inRange( const cUObject *object, UINT32 range ) const;
  	void removeFromView( bool clean = true );
  
--- 123,127 ----
  	bool del();
  
! 	bool inRange( cUObject *object, UINT32 range ) const;
  	void removeFromView( bool clean = true );
  
***************
*** 172,175 ****
--- 172,176 ----
  	virtual stError *getProperty( const QString &name, cVariant &value ) const;
  	virtual void flagUnchanged() { changed_ = false; }
+ 	void resendTooltip();
  
  	char direction( cUObject* ) const;

[wpdev-commits] wolfpack items.cpp,1.363,1.364 wolfpack.cpp,1.480,1.481 world.cpp,1.52,1.53

[<dar...@pr...>]

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

Modified Files:
	items.cpp wolfpack.cpp world.cpp 
Log Message:
Fixed a postprocessing bug.

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.363
retrieving revision 1.364
diff -C2 -d -r1.363 -r1.364
*** items.cpp	8 Jan 2004 08:33:38 -0000	1.363
--- items.cpp	25 Jan 2004 18:48:15 -0000	1.364
***************
*** 1626,1644 ****
  // This subtracts the weight of the top-container
  // And then readds the new weight
! void cItem::setTotalweight( INT32 data )
  {
  	//if( data < 0 )
  		// FixWeight!
! 
! 	if ( container_ )
! 	{
! 		if( container_->isChar() )
  		{
  			P_CHAR pChar = dynamic_cast<P_CHAR>( container_ );
  			if( pChar && ( ( layer_ < 0x1A ) || ( layer_ == 0x1E ) ) )
  				pChar->setWeight( pChar->weight() - totalweight_ );
! 		}
! 		else if( container_->isItem() )
! 		{
  			P_ITEM pItem = dynamic_cast<P_ITEM>( container_ );
  			if( pItem )
--- 1626,1644 ----
  // This subtracts the weight of the top-container
  // And then readds the new weight
! void cItem::setTotalweight( int data )
  {
  	//if( data < 0 )
  		// FixWeight!
! 	
! 	// Completely ignore the container if the free flag is set
! 	// this flag is abused during the load phase of the server
! 	// to flag items with yet unprocessed container values
! 	if (!free && container_) {
! 		if(container_->isChar())
  		{
  			P_CHAR pChar = dynamic_cast<P_CHAR>( container_ );
  			if( pChar && ( ( layer_ < 0x1A ) || ( layer_ == 0x1E ) ) )
  				pChar->setWeight( pChar->weight() - totalweight_ );
! 		} else if(container_->isItem()) {
  			P_ITEM pItem = dynamic_cast<P_ITEM>( container_ );
  			if( pItem )
***************
*** 1651,1667 ****
  	totalweight_ = data;
  
! 	if ( container_ )
! 	{
! 		if( container_->isChar() )
! 		{
  			P_CHAR pChar = dynamic_cast<P_CHAR>( container_ );
  			if( pChar && ( ( layer_ < 0x1A ) || ( layer_ == 0x1E ) ) )
  				pChar->setWeight( pChar->weight() + totalweight_ );
! 		}
! 		else if( container_->isItem() )
! 		{
  			P_ITEM pItem = dynamic_cast<P_ITEM>( container_ );
! 			if( pItem )
! 				pItem->setTotalweight( pItem->totalweight() + totalweight_ );
  		}
  	}
--- 1651,1667 ----
  	totalweight_ = data;
  
! 	// Completely ignore the container if the free flag is set
! 	// this flag is abused during the load phase of the server
! 	// to flag items with yet unprocessed container values
! 	if (!free && container_) {
! 		if (container_->isChar()) {
  			P_CHAR pChar = dynamic_cast<P_CHAR>( container_ );
  			if( pChar && ( ( layer_ < 0x1A ) || ( layer_ == 0x1E ) ) )
  				pChar->setWeight( pChar->weight() + totalweight_ );
! 		} else if (container_->isItem()) {
  			P_ITEM pItem = dynamic_cast<P_ITEM>( container_ );
! 			if(pItem) {
! 				pItem->setTotalweight( pItem->totalweight() + totalweight_);
! 			}
  		}
  	}
***************
*** 1828,1834 ****
  	SERIAL containerSerial = atoi( result[offset++] );
  
! 	if( containerSerial != INVALID_SERIAL ) // if it's invalid, we won't set.
  		container_ = reinterpret_cast<cUObject*>(containerSerial);
! 	
  	// ugly optimization ends here.
  	
--- 1828,1836 ----
  	SERIAL containerSerial = atoi( result[offset++] );
  
! 	if (containerSerial != INVALID_SERIAL) {
  		container_ = reinterpret_cast<cUObject*>(containerSerial);
! 		free = true; // Abuse free for lingering items
! 	}
! 
  	// ugly optimization ends here.
  	

Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.480
retrieving revision 1.481
diff -C2 -d -r1.480 -r1.481
*** wolfpack.cpp	22 Jan 2004 04:48:12 -0000	1.480
--- wolfpack.cpp	25 Jan 2004 18:48:33 -0000	1.481
***************
*** 469,475 ****
--- 469,478 ----
  	}
  
+ #if !defined(_DEBUG)
  	try
  	{
+ #endif
  		World::instance()->load();
+ #if !defined(_DEBUG)
  	}
  	catch( QString &error )
***************
*** 483,486 ****
--- 486,490 ----
  		return 1;
  	}
+ #endif
  
  	Console::instance()->PrepareProgress( "Initializing Multis" );

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** world.cpp	26 Nov 2003 03:53:53 -0000	1.52
--- world.cpp	25 Jan 2004 18:48:54 -0000	1.53
***************
*** 522,574 ****
  		SERIAL contserial = reinterpret_cast<SERIAL>(pi->container());
  
! 		// 1. Handle the Container Value
! 		if( isItemSerial( contserial ) )
! 		{
! 			P_ITEM pCont = FindItemBySerial( contserial );
! 
! 			if( pCont )
! 			{
! 				pCont->addItem( pi, false, isCharSerial( reinterpret_cast<SERIAL>( pCont->container() ) )?false:true, true );
! 			}
! 			else
! 			{
! 				// Queue this item up for deletion
  				deleteItems.append( pi );
! 				continue; // Skip further processing
  			}
! 		}
! 		else if( isCharSerial( contserial ) )
! 		{
! 			P_CHAR pCont = FindCharBySerial( contserial );
  
! 			if( pCont )
! 			{
! 				// NoRemove is important. 
! 				// It is faster *and* it prevents onEquip from being fired
! 				pCont->addItem( (cBaseChar::enLayer)pi->layer(), pi, true, true );
! 			}
! 			else
! 			{
! 				deleteItems.append( pi );
! 				continue; // Skip further processing
  			}
! 		}
! 		else // Add to Map Regions
! 		{
! 			int max_x = Map->mapTileWidth(pi->pos().map) * 8;
! 			int max_y = Map->mapTileHeight(pi->pos().map) * 8;
! 			if ( pi->pos().x > max_x || pi->pos().y > max_y ) 
! 			{
! 				// these are invalid locations, delete them!
! 				deleteItems.append( pi );
  			}
- 			else
- 				MapObjects::instance()->add(pi);
- //			continue;
  		}
  
  		// If this item has a multiserial then add it to the multi
! 		if( isItemSerial( pi->multis() ) )
! 		{
  			cMulti *pMulti = dynamic_cast< cMulti* >( FindItemBySerial( pi->multis() ) );
  
--- 522,561 ----
  		SERIAL contserial = reinterpret_cast<SERIAL>(pi->container());
  
! 		// We used free for uncontained items
! 		if (!pi->free) {
! 			int max_x = Map->mapTileWidth(pi->pos().map) * 8;
! 			int max_y = Map->mapTileHeight(pi->pos().map) * 8;
! 			if (pi->pos().x > max_x || pi->pos().y > max_y) {
  				deleteItems.append( pi );
! 				continue;
! 			} else {
! 				MapObjects::instance()->add(pi);
  			}
! 		} else {
! 			// 1. Handle the Container Value
! 			if (isItemSerial(contserial)) {
! 				P_ITEM pCont = FindItemBySerial(contserial);
  
! 				if (pCont) {
! 					pCont->addItem(pi, false, true, true);
! 				} else {
! 					deleteItems.append(pi); // Queue this item up for deletion
! 					continue; // Skip further processing
! 				}
  			}
! 			else if (isCharSerial(contserial)) {
! 				P_CHAR pCont = FindCharBySerial( contserial );
! 
! 				if (pCont) {
! 					pCont->addItem((cBaseChar::enLayer) pi->layer(), pi, true, true);
! 				} else {
! 					deleteItems.append(pi);
! 					continue;
! 				}
  			}
  		}
  
  		// If this item has a multiserial then add it to the multi
! 		if (isItemSerial(pi->multis())) {
  			cMulti *pMulti = dynamic_cast< cMulti* >( FindItemBySerial( pi->multis() ) );
  

[wpdev-commits] xmlscripts/definitions/items/weaponry/swordsmanship pickaxe.xml,1.3,1.4

[<dr...@pr...>]

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

Modified Files:
	pickaxe.xml 
Log Message:
Mining now works great, all four ore types can be dug up. 12 ore types 
(silver, merkite and mythril are added ontop of OSI ones.) There is a few
bugs that I noticed when clicking mountain tiles that are of certain angles
but I think that is hard coded... I'll look into it later.


Index: pickaxe.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/pickaxe.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pickaxe.xml	16 Jan 2004 21:14:20 -0000	1.3
--- pickaxe.xml	25 Jan 2004 01:26:00 -0000	1.4
***************
*** 19,23 ****
  		<events>equipment,tools.pickaxe</events>
  		<category>Weapons\Swords\Pickaxe (N/S)</category>
! 		<category>Professions\Miner\Pickaxe (N/S)</category>
  	</item>
  
--- 19,23 ----
  		<events>equipment,tools.pickaxe</events>
  		<category>Weapons\Swords\Pickaxe (N/S)</category>
! 		<category>Professions\Miner\Tools\Pickaxe (N/S)</category>
  	</item>
  
***************
*** 26,30 ****
  		<id>0xe85</id>
  		<category>Weapons\Swords\Pickaxe (E/W)</category>
! 		<category>Professions\Miner\Pickaxe (E/W)</category>
  	</item>
  
--- 26,30 ----
  		<id>0xe85</id>
  		<category>Weapons\Swords\Pickaxe (E/W)</category>
! 		<category>Professions\Miner\Tools\Pickaxe (E/W)</category>
  	</item>
  

[wpdev-commits] wolfpack wolfpack.vcproj,1.6,1.7

[<dar...@pr...>]

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

Modified Files:
	wolfpack.vcproj 
Log Message:
compile fixes

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wolfpack.vcproj	22 Jan 2004 22:34:41 -0000	1.6
--- wolfpack.vcproj	24 Jan 2004 22:35:28 -0000	1.7
***************
*** 140,158 ****
  			</File>
  			<File
- 				RelativePath=".\ai.cpp">
- 			</File>
- 			<File
- 				RelativePath=".\ai.h">
- 			</File>
- 			<File
- 				RelativePath=".\ai_animals.cpp">
- 			</File>
- 			<File
- 				RelativePath=".\ai_humans.cpp">
- 			</File>
- 			<File
- 				RelativePath=".\ai_monsters.cpp">
- 			</File>
- 			<File
  				RelativePath=".\basechar.cpp">
  			</File>
--- 140,143 ----
***************
*** 765,768 ****
--- 750,772 ----
  			</File>
  		</Filter>
+ 		<Filter
+ 			Name="AI"
+ 			Filter="">
+ 			<File
+ 				RelativePath=".\ai\ai.cpp">
+ 			</File>
+ 			<File
+ 				RelativePath=".\ai\ai.h">
+ 			</File>
+ 			<File
+ 				RelativePath=".\ai\ai_animals.cpp">
+ 			</File>
+ 			<File
+ 				RelativePath=".\ai\ai_humans.cpp">
+ 			</File>
+ 			<File
+ 				RelativePath=".\ai\ai_monsters.cpp">
+ 			</File>
+ 		</Filter>
  	</Files>
  	<Globals>

[wpdev-commits] wolfpack/python char.cpp,1.114,1.115 item.cpp,1.79,1.80

[<dar...@pr...>]

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

Modified Files:
	char.cpp item.cpp 
Log Message:
Final fixes for postprocessing and implementation of a resend tooltip functionality.

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** char.cpp	25 Jan 2004 00:51:35 -0000	1.114
--- char.cpp	25 Jan 2004 20:24:26 -0000	1.115
***************
*** 1611,1614 ****
--- 1611,1623 ----
  }
  
+ static PyObject* wpChar_resendtooltip( wpChar *self, PyObject *args )
+ {
+ 	if( self->pChar->free )
+ 		return PyFalse;
+ 
+ 	self->pChar->resendTooltip();
+ 	return PyTrue;
+ }
+ 
  static PyObject* wpChar_additem( wpChar *self, PyObject *args )
  {
***************
*** 1649,1652 ****
--- 1658,1662 ----
  	{ "damage",			(getattrofunc)wpChar_damage,			METH_VARARGS, "This damages the current character." },
      { "update",			(getattrofunc)wpChar_update,			METH_VARARGS, "Resends the char to all clients in range." },
+ 	{ "resendtooltip",	(getattrofunc)wpChar_resendtooltip,		METH_VARARGS, "Resends the tooltip for this character." },
  	{ "updateflags",	(getattrofunc)wpChar_updateflags,		METH_VARARGS, "Resends the character if flags have changed (take care, this might look like a move)." },
  	{ "removefromview", (getattrofunc)wpChar_removefromview,	METH_VARARGS, "Removes the char from all surrounding clients." },

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** item.cpp	25 Jan 2004 00:51:39 -0000	1.79
--- item.cpp	25 Jan 2004 20:24:26 -0000	1.80
***************
*** 639,642 ****
--- 639,651 ----
  }
  
+ static PyObject* wpItem_resendtooltip( wpItem *self, PyObject *args )
+ {
+ 	if (!self->pItem->free) {
+ 		self->pItem->resendTooltip();
+ 	}
+ 
+ 	return PyTrue;
+ }
+ 
  static PyMethodDef wpItemMethods[] = 
  {
***************
*** 657,660 ****
--- 666,670 ----
  	{ "multi",				(getattrofunc)wpItem_multi,	METH_VARARGS, 0 },
  	{ "lightning",			(getattrofunc)wpItem_lightning, METH_VARARGS, 0 },
+ 	{ "resendtooltip",		(getattrofunc)wpItem_resendtooltip, METH_VARARGS, 0 },
  
  	// Effects

[wpdev-commits] xmlscripts/scripts key.py,1.1,1.2

[<dar...@pr...>]

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

Modified Files:
	key.py 
Log Message:
Did key copying...

Index: key.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/key.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** key.py	22 Jan 2004 03:51:22 -0000	1.1
--- key.py	24 Jan 2004 22:33:25 -0000	1.2
***************
*** 2,13 ****
  # TODO: implementation of renaming and unlocking/locking etc.
  
  import wolfpack
  import wolfpack.gumps
  
  def onLoad():
    pass
  
  def onUse(char, key):
!   char.message('A shiny key!')
    return 1
  
--- 2,62 ----
  # TODO: implementation of renaming and unlocking/locking etc.
  
+ from wolfpack.consts import *
  import wolfpack
  import wolfpack.gumps
+ import random
  
  def onLoad():
    pass
  
+ def lock_response(char, args, target):
+   return
+ 
+ def copy_response(char, args, target):
+   if len(args) != 1:
+     return    
+ 
+   key = wolfpack.finditem(args[0])
+   if not key or not char.canreach(key,5):
+     char.socket.clilocmessage(501661)
+     return
+ 
+   # Check if the targetted item is a key
+   if not target.item or not 'key' in target.item.events:
+     char.socket.clilocmessage(501679)
+     return
+  
+   # Also a blank key?
+   if not target.item.hastag('lock'):
+     char.socket.clilocmessage(501675)
+     return
+ 
+   # Check if the player can reach the item
+   if not char.canreach(target.item,5):
+     char.socket.clilocmessage(501661)
+     return
+ 
+   # Tinkering check (15%-30%, 25% chance of loosing the key on failure)
+   if char.checkskill(TINKERING, 150, 300):
+     key.settag('lock',target.item.gettag('lock'))
+     char.socket.clilocmessage(501676)    
+   else:
+     char.socket.clilocmessage(501677)
+ 
+     # 25% chance of destroying the blank key
+     if random.randint(1,4) == 1:
+       char.socket.clilocmessage(501678)
+       key.remove()
+ 
  def onUse(char, key):
!   # Does this key open a lock?
!   if not key.hastag('lock'):
!     # The key is blank so we wan't to make a copy of it
!     char.socket.clilocmessage(501663)
!     char.socket.attachtarget('key.copy_response',[key.serial])
!   else:
!     char.socket.clilocmessage(501662)
!     char.socket.attachtarget('key.lock_response',[key.serial])
! 
    return 1
  
***************
*** 17,26 ****
    # Add the lock id for gms
    if char.gm:
-     lock = 'None'
- 
      if item.hastag('lock'):
        lock = str(item.gettag('lock'))
! 
!     tooltip.add(1050045, " \t" + "Lock: " + lock + "\t ")
  
    tooltip.send(char)
--- 66,74 ----
    # Add the lock id for gms
    if char.gm:
      if item.hastag('lock'):
        lock = str(item.gettag('lock'))
!       tooltip.add(1050045, " \t" + "Lock: " + lock + "\t ")
!     else:
!       tooltip.add(1050045, " \tThis key is blank\t ")
  
    tooltip.send(char)

[wpdev-commits] xmlscripts/scripts/wolfpack consts.py,1.35,1.36 utilities.py,1.23,1.24

[<dr...@pr...>]

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

Modified Files:
	consts.py utilities.py 
Log Message:
Mining now works great, all four ore types can be dug up. 12 ore types 
(silver, merkite and mythril are added ontop of OSI ones.) There is a few
bugs that I noticed when clicking mountain tiles that are of certain angles
but I think that is hard coded... I'll look into it later.


Index: consts.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** consts.py	25 Nov 2003 06:17:50 -0000	1.35
--- consts.py	25 Jan 2004 01:26:16 -0000	1.36
***************
*** 9,13 ****
  
  # Which port should the remote admin run on
! REMOTEADMIN_PORT = 2594
  
  # Spell Settings
--- 9,13 ----
  
  # Which port should the remote admin run on
! REMOTEADMIN_PORT = 2600
  
  # Spell Settings
***************
*** 19,24 ****
  # Potions
  POTION_LESSERHEAL_RANGE = [ 1, 16 ]
! POTION_HEAL_RANGE = [ 1, 16 ]
! POTION_GREATERHEAL_RANGE = [ 1, 16 ]
  
  # Fishing Settings
--- 19,24 ----
  # Potions
  POTION_LESSERHEAL_RANGE = [ 1, 16 ]
! POTION_HEAL_RANGE = [ 3, 19 ]
! POTION_GREATERHEAL_RANGE = [ 5, 25 ]
  
  # Fishing Settings
***************
*** 37,41 ****
  
  # Mining Settings
! MINING_MAX_DISTANCE = 2
  
  
--- 37,41 ----
  
  # Mining Settings
! MINING_MAX_DISTANCE = 3
  
  
***************
*** 106,119 ****
  	'stealth', 'removetraps', 'necromancy', 'focus', 'chivalry' ]
  
! skillnamesids = { 'alchemy' : ALCHEMY, 'anatomy' : ANATOMY, 'animallore' : ANIMALLORE, 'itemid' : ITEMID, 'armslore' : ARMSLORE, 'parrying' : PARRYING,
! 	'begging' : BEGGING, 'blacksmithing' : BLACKSMITHING, 'bowcraft' : BOWCRAFT, 'peacemaking' : PEACEMAKING, 'camping' : CAMPING, 'carpentry' : CARPENTRY,
! 	'cartography' : CARTOGRAPHY, 'cooking' : COOKING, 'detectinghidden' : DETECTINGHIDDEN, 'enticement' : ENTICEMENT, 'evaluatingintel' : EVALUATINGINTEL,
! 	'healing' : HEALING, 'fishing' : FISHING, 'forensics' : FORENSICS, 'herding' : HERDING, 'hiding' : HIDING, 'provocation' : PROVOCATION,
! 	'inscription' : INSCRIPTION, 'lockpicking' : LOCKPICKING, 'magery' : MAGERY, 'magicresistance' : MAGICRESISTANCE, 'tactics' : TACTICS, 'snooping' : SNOOPING,
! 	'musicianship' : MUSICIANSHIP, 'poisoning' : POISONING, 'archery' : ARCHERY, 'spiritspeak' : SPIRITSPEAK, 'stealing' : STEALING, 'tailoring' : TAILORING,
! 	'taming' : TAMING, 'tasteid' : TASTEID, 'tinkering' : TINKERING, 'tracking' : TRACKING, 'veterinary' : VETERINARY, 'swordsmanship' : SWORDSMANSHIP,
! 	'macefighting' : MACEFIGHTING, 'fencing' : FENCING, 'wrestling' : WRESTLING, 'lumberjacking' : LUMBERJACKING, 'mining' : MINING, 'meditation' : MEDITATION,
! 	'stealth' : STEALTH, 'removetraps' : REMOVETRAPS, 'necromancy' : NECROMANCY, 'focus' : FOCUS, 'chivalry' : CHIVALRY }
! 
  
  statnames = [ 'str', 'int', 'dex' ]
--- 106,164 ----
  	'stealth', 'removetraps', 'necromancy', 'focus', 'chivalry' ]
  
! skillnamesids = \
! { 
! 	'alchemy' : ALCHEMY, 
! 	'anatomy' : ANATOMY, 
! 	'animallore' : ANIMALLORE, 
! 	'itemid' : ITEMID, 
! 	'armslore' : ARMSLORE, 
! 	'parrying' : PARRYING,
! 	'begging' : BEGGING, 
! 	'blacksmithing' : BLACKSMITHING, 
! 	'bowcraft' : BOWCRAFT, 
! 	'peacemaking' : PEACEMAKING, 
! 	'camping' : CAMPING, 
! 	'carpentry' : CARPENTRY,
! 	'cartography' : CARTOGRAPHY, 
! 	'cooking' : COOKING, 
! 	'detectinghidden' : DETECTINGHIDDEN, 
! 	'enticement' : ENTICEMENT, 
! 	'evaluatingintel' : EVALUATINGINTEL,
! 	'healing' : HEALING, 
! 	'fishing' : FISHING, 
! 	'forensics' : FORENSICS, 
! 	'herding' : HERDING, 
! 	'hiding' : HIDING, 
! 	'provocation' : PROVOCATION,
! 	'inscription' : INSCRIPTION, 
! 	'lockpicking' : LOCKPICKING, 
! 	'magery' : MAGERY, 
! 	'magicresistance' : MAGICRESISTANCE, 
! 	'tactics' : TACTICS, 
! 	'snooping' : SNOOPING,
! 	'musicianship' : MUSICIANSHIP, 
! 	'poisoning' : POISONING, 
! 	'archery' : ARCHERY, 
! 	'spiritspeak' : SPIRITSPEAK, 
! 	'stealing' : STEALING, 
! 	'tailoring' : TAILORING,
! 	'taming' : TAMING, 
! 	'tasteid' : TASTEID, 
! 	'tinkering' : TINKERING, 
! 	'tracking' : TRACKING, 
! 	'veterinary' : VETERINARY, 
! 	'swordsmanship' : SWORDSMANSHIP,
! 	'macefighting' : MACEFIGHTING, 
! 	'fencing' : FENCING, 
! 	'wrestling' : WRESTLING, 
! 	'lumberjacking' : LUMBERJACKING, 
! 	'mining' : MINING, 
! 	'meditation' : MEDITATION,
! 	'stealth' : STEALTH, 
! 	'removetraps' : REMOVETRAPS, 
! 	'necromancy' : NECROMANCY, 
! 	'focus' : FOCUS, 
! 	'chivalry' : CHIVALRY 
! }
  
  statnames = [ 'str', 'int', 'dex' ]
***************
*** 127,131 ****
  STRENGTH = 5
  
- 
  #Requirements
  MANACOST = 0
--- 172,175 ----
***************
*** 141,145 ****
  HITCHANCE = 5
  LOWERATTACK = 6
! LOWERDEFENCE = 7	   
  #... here we need to add every spell also
  
--- 185,189 ----
  HITCHANCE = 5
  LOWERATTACK = 6
! LOWERDEFENCE = 7
  #... here we need to add every spell also
  
***************
*** 154,167 ****
  
  #Advanced properties ID's
! REGEN = 1	
! BONUS = 2	
  DAMAGE = 3
! ENH = 4	
! HIT = 5	
! REQ = 6	
  RESIST = 7
  REFLECT = 8
  
- 
  # Constants for char.sound
  SND_STARTATTACK = 0
--- 198,210 ----
  
  #Advanced properties ID's
! REGEN = 1
! BONUS = 2
  DAMAGE = 3
! ENH = 4
! HIT = 5
! REQ = 6
  RESIST = 7
  REFLECT = 8
  
  # Constants for char.sound
  SND_STARTATTACK = 0
***************
*** 335,348 ****
  OOPS = 0
  
! 
! # Harvest table items
  REQSKILL = 0
  MINSKILL = 1
  MAXSKILL = 2
  SUCCESSCLILOC = 3
! RESOURCEID = 4
! COLORID = 5
! MUTATECHANCE = 6
! FALLBACKCHANCE = 7 
  
  #SKILLS GROW LOCKS
--- 378,388 ----
  OOPS = 0
  
! # Mining Harvest Table Items
  REQSKILL = 0
  MINSKILL = 1
  MAXSKILL = 2
  SUCCESSCLILOC = 3
! COLORID = 4
! RESOURCENAME = 5
  
  #SKILLS GROW LOCKS
***************
*** 352,356 ****
  
  #Stat gain delay = 15 minutes ( 900 seconds )
! STATGAINDELAY = 900 
  
  RELOAD_SCRIPTS = 0
--- 392,396 ----
  
  #Stat gain delay = 15 minutes ( 900 seconds )
! STATGAINDELAY = 900
  
  RELOAD_SCRIPTS = 0

Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** utilities.py	12 Jan 2004 05:02:59 -0000	1.23
--- utilities.py	25 Jan 2004 01:26:17 -0000	1.24
***************
*** 120,123 ****
--- 120,129 ----
  		return int( value.replace( "0x", "" ), 16 )
  
+ def evenorodd( value ):
+ 	if value % 2 == 0:
+ 		return "even"
+ 	else:
+ 		return "odd"
+ 
  def itemsmatch( a, b ):
  	return a.type == b.type and a.id == b.id and a.color == b.color and a.events == b.events

[wpdev-commits] xmlscripts/scripts ore.py,1.1,1.2

[<dr...@pr...>]

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

Modified Files:
	ore.py 
Log Message:
Mining now works great, all four ore types can be dug up. 12 ore types 
(silver, merkite and mythril are added ontop of OSI ones.) There is a few
bugs that I noticed when clicking mountain tiles that are of certain angles
but I think that is hard coded... I'll look into it later.


Index: ore.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ore.py	22 Jan 2004 05:48:18 -0000	1.1
--- ore.py	25 Jan 2004 01:26:00 -0000	1.2
***************
*** 1,9 ****
  
! # I'll work on this later, this will be for smelting ore into ingots.
! # This will need to be mining skill based, same ratio as mining
! # for success. - Dreoth
  
  import wolfpack
  
  def onUse( char, ore ):
! 	char.socket.sysmessage( 'Smelt Test' )
\ No newline at end of file
--- 1,314 ----
  
! # Fear the wrath of the miners!
! # ~ Dreoth
  
+ from wolfpack.consts import *
+ import whrandom
  import wolfpack
+ import skills
+ from wolfpack.time import *
+ from wolfpack.utilities import *
+ from random import randrange
+ 
+ # 0x19b7, 0x19b8, 0x19ba give 1 ingot.
+ # 0x19b9 gives 2 ingots.
+ oreids = [ 0x19b7, 0x19b8, 0x19ba, 0x19b9 ]
+ 
+ forgeids = [ 0xfb1, 0x197a, 0x197b, 0x197c, 0x197d, 0x197e, 0x197f, 0x1980, 
+ 				0x1981, 0x1982, 0x1983, 0x1984, 0x1985, 0x1986, 0x1987, 0x1988,
+ 				0x1989, 0x198a, 0x198b, 0x198c, 0x198d, 0x198e, 0x198f, 0x1990,
+ 				0x1991, 0x1992, 0x1993, 0x1994, 0x1995, 0x1996, 0x1997, 0x1998, 
+ 				0x1999, 0x199a, 0x199b, 0x199c, 0x199d, 0x199e, 0x199f, 0x19a0,
+ 				0x19a1, 0x19a2, 0x19a3, 0x19a4, 0x19a5, 0x19a6, 0x19a7, 0x19a8, 
+ 				0x19a9 ]
+ 
+ # Name, reqSkill, minSkill, maxSkill, color, item name
+ ingottable = \
+ {
+ 	'iron':			[ 0, 0, 1000, 0x0, 'iron ingot' ],
+ 	'dullcopper':	[ 650, 250, 1050, 0x973, 'dull copper ingot' ],
+ 	'shadowiron':	[ 700, 300, 1100, 0x966, 'shadow iron ingot' ], 
+ 	'copper':		[ 750, 350, 1150, 0x96d, 'copper ingot' ],
+ 	'bronze':		[ 800, 400, 1200, 0x972, 'bronze ingot' ],
+ 	'gold':			[ 850, 450, 1250, 0x8a5, 'gold ingot' ],
+ 	'silver':			[ 875, 475, 1275, 0x430, 'silver ingot' ],
+ 	'agapite':		[ 900, 500, 1300, 0x979, 'agapite ingot' ],
+ 	'verite':			[ 950, 550, 1350, 0x89f, 'verite ingot' ],
+ 	'valorite':		[ 990, 590, 1390, 0x8ab, 'valorite ingot' ],
+ 	'merkite':		[ 995, 600, 1400, 0x8b0, 'merkite ingot' ],
+ 	'mythril':		[ 995, 600, 1400, 0x84c, 'mythril ingot' ]
+ }
+ 
+ REQSKILL = 0
+ MINSKILL = 1
+ MAXSKILL = 2
+ COLORID = 3
+ NAME = 4
  
  def onUse( char, ore ):
! 	if ore.id in oreids:
! 		if ore.getoutmostchar() != char:
! 			if char.pos.distance( ore.pos ) > 2:
! 				char.socket.clilocmessage( 0x7A258 ) # You can't reach...
! 				return OK
! 			else:
! 				if not ore.hastag( 'resname' ):
! 					char.socket.sysmessage( "This ore is not of workable quality...", GRAY )
! 					return OK
! 				else:
! 					char.socket.sysmessage( "Where do you want to smelt the ore?", GRAY )
! 					char.socket.attachtarget( "ore.response", [ ore.serial ] )
! 					return OK
! 		else:
! 			if not ore.hastag( 'resname' ):
! 				char.socket.sysmessage( "This ore is not of workable quality...", GRAY )
! 				return OK
! 			else:
! 				char.socket.sysmessage( "Where do you want to smelt the ore?", GRAY )
! 				char.socket.attachtarget( "ore.response", [ ore.serial ] )
! 				return OK
! 
! def response( char, args, target ):
! 	direction = char.directionto( target.pos )
! 	if not char.direction == direction:
! 		char.direction = direction
! 		char.update()
! 		
! 	item = wolfpack.finditem( args[0] )
! 	
! 	if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4):
! 		char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
! 		return OK
! 		
! 	if abs( char.pos.z - target.pos.z ) > 5:
! 		char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
! 		return OK
! 
! 	if not item.hastag( 'resname' ):
! 		return OOPS
! 	else:
! 		resname = item.gettag( 'resname' )
! 
! 	targetitem = wolfpack.finditem( target.item.serial )
! 
! 	# We go onto creating ingots here.
! 	if target.item.id in forgeids:
! 		if item.id in oreids:
! 			if char.pos.distance( target.pos ) > 3:
! 				char.socket.clilocmessage( 0x7A258 ) # You can't reach...
! 				return OK
! 			else:
! 				dosmelt( char, [ item, targetitem, resname ] )
! 				return OK
! 
! 	# This is for merging the ore piles
! 	elif target.item.id in oreids:
! 		if targetitem.serial == item.serial:
! 			char.socket.sysmessage( "You can not combine a pile of ore with itself...", GRAY )
! 			return OOPS
! 		if not targetitem.hastag('resname'):
! 			char.socket.sysmessage( "That ore is not of workable quality...", GRAY )
! 			return OOPS
! 		# Largest Ore Pile
! 		if item.id == oreids[3] and item.color == targetitem.color and item.gettag('resname') == targetitem.gettag('resname'):
! 			if targetitem.getoutmostchar() != char:
! 				if char.pos.distance( target.pos ) > 2:
! 					char.socket.clilocmessage( 0x7A258 ) # You can't reach...
! 					return OK
! 				else:
! 					# Merge the ore piles
! 					if targetitem.id == oreids[2] or targetitem.id == oreids[1]:
! 						targetitem.amount += ( item.amount * 2 )
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 					elif targetitem.id == oreids[0]:
! 						targetitem.amount += ( item.amount * 4 )
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 					elif targetitem.id == item.id:
! 						targetitem.amount += item.amount
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 					return OK
! 			else:
! 				# Merge the ore piles
! 				if targetitem.id == oreids[2] or targetitem.id == oreids[1]:
! 					targetitem.amount += ( item.amount * 2 )
! 					targetitem.update()
! 					item.delete()
! 					char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 				elif targetitem.id == oreids[0]:
! 					targetitem.amount += ( item.amount * 4 )
! 					targetitem.update()
! 					item.delete()
! 					char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 				elif targetitem.id == item.id:
! 						targetitem.amount += item.amount
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 				return OK
! 		
! 		# Second Largest Ore
! 		elif item.id == oreids[2] and item.color == targetitem.color and item.gettag('resname') == targetitem.gettag('resname'):
! 			if targetitem.getoutmostchar() != char:
! 				if char.pos.distance( target.pos ) > 2:
! 					char.socket.clilocmessage( 0x7A258 ) # You can't reach...
! 					return OK
! 				else:
! 					# Merge the ore piles
! 					if targetitem.id == oreids[2] or targetitem.id == oreids[1] or targetitem.id == oreids[0]:
! 						targetitem.amount += item.amount
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 					elif targetitem.id == oreids[0]:
! 						targetitem.amount += ( item.amount * 2 )
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 					elif targetitem.id == oreids[3]:
! 						char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY )
! 					return OK
! 			else:
! 				# Merge the ore piles
! 				if targetitem.id == oreids[2] or targetitem.id == oreids[1]:
! 					targetitem.amount += item.amount
! 					targetitem.update()
! 					item.delete()
! 					char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 				elif targetitem.id == oreids[0]:
! 					targetitem.amount += ( item.amount * 2 )
! 					targetitem.update()
! 					item.delete()
! 					char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 				elif targetitem.id == oreids[3]:
! 						char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY )
! 				return OK
! 		
! 		# Second Smallest
! 		elif item.id == oreids[1] and item.color == targetitem.color and item.gettag('resname') == targetitem.gettag('resname'):
! 			if targetitem.getoutmostchar() != char:
! 				if char.pos.distance( target.pos ) > 2:
! 					char.socket.clilocmessage( 0x7A258 ) # You can't reach...
! 					return OK
! 				else:
! 					# Merge the ore piles
! 					if targetitem.id == oreids[1]:
! 						targetitem.amount += item.amount
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 					elif targetitem.id == oreids[0]:
! 						targetitem.amount += ( item.amount * 2 )
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 					elif targetitem.id == oreids[2] or targetitem.id == oreids[3]:
! 						char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY )
! 					return OK
! 			else:
! 				# Merge the ore piles
! 				if targetitem.id == oreids[1]:
! 					targetitem.amount += item.amount
! 					targetitem.update()
! 					item.delete()
! 					char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 				elif targetitem.id == oreids[0]:
! 					targetitem.amount += ( item.amount * 2 )
! 					targetitem.update()
! 					item.delete()
! 					char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 				elif targetitem.id == oreids[2] or targetitem.id == oreids[3]:
! 						char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY )
! 				return OK
! 		
! 		# Smallest
! 		elif item.id == oreids[0] and item.color == targetitem.color and item.gettag('resname') == targetitem.gettag('resname'):
! 			if targetitem.getoutmostchar() != char:
! 				if char.pos.distance( target.pos ) > 2:
! 					char.socket.clilocmessage( 0x7A258 ) # You can't reach...
! 					return OK
! 				else:
! 					# Merge the ore piles
! 					if targetitem.id == oreids[1] or targetitem.id == oreids[2] or targetitem.id == oreids[3]:
! 						char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY )
! 					elif targetitem.id == oreids[0]:
! 						targetitem.amount += item.amount
! 						targetitem.update()
! 						item.delete()
! 						char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 					return OK
! 			else:
! 				# Merge the ore piles
! 				if targetitem.id == oreids[1] or targetitem.id == oreids[2] or targetitem.id == oreids[3]:
! 					char.socket.sysmessage( "You can not create a larger pile from a small pile of ore.", GRAY )
! 				elif targetitem.id == oreids[0]:
! 					targetitem.amount += item.amount
! 					targetitem.update()
! 					item.delete()
! 					char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY )
! 				return OK
! 
! def dosmelt ( char, args ):
! 	ore = args[0]
! 	forge = args[1]
! 	resname = args[2]
! 	ingotdef = "1bf2"
! 	success = 0
! 	reqskill = ingottable[ resname ][ REQSKILL ]
! 	
! 	if ore.amount >= 1 and char.skill[ MINING ] >= reqskill:
! 		skills.checkskill( char, forge, MINING, 0 )
! 		if ore.id == oreids[3]:
! 			amount = ( ore.amount * 2 )
! 			successsmelt( char, ingottable, resname, amount, ingotdef )
! 			ore.delete()
! 		elif ore.id == oreids[2] or ore.id == oreids[1]:
! 			amount = ore.amount
! 			successsmelt( char, ingottable, resname, amount, ingotdef )
! 			ore.delete()
! 		elif ore.id == oreids[0]:
! 			if evenorodd( ore.amount ) == "even":
! 				amount = ( ore.amount / 2 )
! 				successsmelt( char, ingottable, resname, amount, ingotdef )
! 				ore.delete()
! 			elif evenorodd( ore.amount ) == "odd" and ore.amount > 1:
! 				amount = ( ( ore.amount - 1 ) / 2 )
! 				successsmelt( char, ingottable, resname, amount, ingotdef )
! 				ore.amount = 1
! 				ore.update()
! 			elif ore.amount == 1:
! 				char.socket.sysmessage( "You require more ore to produce any ingots.", GRAY )
! 		success = 1
! 		
! 	if success == 0:
! 		char.socket.sysmessage( "You smelt the ore but fail to produce any ingots.", GRAY )
! 		ore.amount -= ( ore.amount / 2 )
! 		ore.update()
! 	
! 	return OK
! 
! def successsmelt( char, table, resname, amount, ingotdef ):
! 	socket = char.socket
! 	backpack = char.getbackpack()
! 	if not backpack:
! 		return OOPS
! 	resourceitem = wolfpack.additem( ingotdef )
! 	resourceitem.decay = 1
! 	resourceitem.name = str( table[ resname ][ NAME ] )
! 	resourceitem.color = table[ resname ][ COLORID ]
! 	resourceitem.amount = amount
! 	resourceitem.settag( 'resname', str( resname ) ) # Used when smelting
! 	message = "You smelt the ore and place some " + table[ resname ][ NAME] + "s into your backpack."
! 	
! 	if not wolfpack.utilities.tocontainer( resourceitem, char.getbackpack() ):
! 		resourceitem.update()
! 
! 	socket.sysmessage( message, GRAY )
! 	char.soundeffect(  0x2a )
! 	
! 	return OK

[wpdev-commits] xmlscripts/definitions/items/armory/helmets bascinet.xml,1.3,1.4 close_helmet.xml,1.3,1.4 helmet.xml,1.3,1.4 nose_helm.xml,1.3,1.4

[<dr...@pr...>]

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

Modified Files:
	bascinet.xml close_helmet.xml helmet.xml nose_helm.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: bascinet.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/bascinet.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bascinet.xml	29 Dec 2003 12:09:11 -0000	1.3
--- bascinet.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="2" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>12</smelt>

Index: close_helmet.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/close_helmet.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** close_helmet.xml	29 Dec 2003 12:09:11 -0000	1.3
--- close_helmet.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="3" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>12</smelt>

Index: helmet.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/helmet.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** helmet.xml	29 Dec 2003 12:09:11 -0000	1.3
--- helmet.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>12</smelt>

Index: nose_helm.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/nose_helm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nose_helm.xml	29 Dec 2003 12:09:11 -0000	1.3
--- nose_helm.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="4" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>12</smelt>

[wpdev-commits] xmlscripts/definitions/items/armory/colored/helmets mythril.xml,NONE,1.1 silver.xml,NONE,1.1

[<dr...@pr...>]

Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/helmets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24376/helmets

Added Files:
	mythril.xml silver.xml 
Log Message:
Armor for silver/merkite/mythril.


--- NEW FILE: mythril.xml ---
<!--
=================================================================
|   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
|  ((    _/{  "-;  | Created by: Kosh	                        |
|   )).-' {{ ;'`   | Revised by: Viper, Dreoth                   |
|  ( (  ;._ \\ ctr | Last Modification: Split, both IDs     |
=================================================================
-->
<definitions>

	<!-- helmets -->
	<!-- bascinet helmet -->
	<item id="mythril_helmets_bascinet">
		<inherit id="140d" />
		<mythril_armor />
		<category>Armor\Mythril\Helmets\Bascinet (N/S)</category>
	</item>

	<item id="mythril_helmets_bascinet_2">
		<inherit id="140c" />
		<mythril_armor />
		<category>Armor\Mythril\Helmets\Bascinet (E/W)</category>
	</item>

	<!-- nose helmet -->
	<item id="mythril_helmets_nose">
		<inherit id="140f" />
		<mythril_armor />
		<category>Armor\Mythril\Helmets\Nose (N/S)</category>
	</item>

	<item id="mythril_helmets_nose_2">
		<inherit id="140e" />
		<mythril_armor />
		<category>Armor\Mythril\Helmets\Nose (E/W)</category>
	</item>

	<!-- normal helmet -->
	<item id="mythril_helmets_helmet">
		<inherit id="140b" />
		<mythril_armor />
		<category>Armor\Mythril\Helmets\Helmet (N/S)</category>
	</item>

	<item id="mythril_helmets_helmet_2">
		<inherit id="140a" />
		<mythril_armor />
		<category>Armor\Mythril\Helmets\Helmet (E/W)</category>
	</item>

	<!-- close helmet -->
	<item id="mythril_helmets_close">
		<inherit id="1409" />
		<mythril_armor />
		<category>Armor\Mythril\Helmets\Close Helm (N/S)</category>
	</item>

	<item id="mythril_helmets_close_2">
		<inherit id="1408" />
		<mythril_armor />
		<category>Armor\Mythril\Helmets\Close Helm (E/W)</category>
	</item>

</definitions>

--- NEW FILE: silver.xml ---
<!--
=================================================================
|   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
|  ((    _/{  "-;  | Created by: Kosh	                        |
|   )).-' {{ ;'`   | Revised by: Viper, Dreoth                   |
|  ( (  ;._ \\ ctr | Last Modification: Split, both IDs     |
=================================================================
-->
<definitions>

	<!-- helmets -->
	<!-- bascinet helmet -->
	<item id="silver_helmets_bascinet">
		<inherit id="140d" />
		<silver_armor />
		<category>Armor\Silver\Helmets\Bascinet (N/S)</category>
	</item>

	<item id="silver_helmets_bascinet_2">
		<inherit id="140c" />
		<silver_armor />
		<category>Armor\Silver\Helmets\Bascinet (E/W)</category>
	</item>

	<!-- nose helmet -->
	<item id="silver_helmets_nose">
		<inherit id="140f" />
		<silver_armor />
		<category>Armor\Silver\Helmets\Nose (N/S)</category>
	</item>

	<item id="silver_helmets_nose_2">
		<inherit id="140e" />
		<silver_armor />
		<category>Armor\Silver\Helmets\Nose (E/W)</category>
	</item>

	<!-- normal helmet -->
	<item id="silver_helmets_helmet">
		<inherit id="140b" />
		<silver_armor />
		<category>Armor\Silver\Helmets\Helmet (N/S)</category>
	</item>

	<item id="silver_helmets_helmet_2">
		<inherit id="140a" />
		<silver_armor />
		<category>Armor\Silver\Helmets\Helmet (E/W)</category>
	</item>

	<!-- close helmet -->
	<item id="silver_helmets_close">
		<inherit id="1409" />
		<silver_armor />
		<category>Armor\Silver\Helmets\Close Helm (N/S)</category>
	</item>

	<item id="silver_helmets_close_2">
		<inherit id="1408" />
		<silver_armor />
		<category>Armor\Silver\Helmets\Close Helm (E/W)</category>
	</item>

</definitions>

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

[<dr...@pr...>]

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

Modified Files:
	mining.py 
Log Message:
Slight tweak for mining.
Updates for potions.
The following potions work now:
  Greater Heal, Heal, and Lesser Heal
  Agility and Greater Agility
  Strength and Greater Strength


Index: mining.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mining.py	25 Jan 2004 01:26:05 -0000	1.8
--- mining.py	26 Jan 2004 03:23:40 -0000	1.9
***************
*** 43,47 ****
  
  def mining( char, pos, tool ):
! 	char.addtimer( 1300, "skills.mining.domining", [ oresound, tool, pos ] )
  	char.settag( 'is_mining', str( servertime() + miningdelay ) )
  	char.turnto( pos )
--- 43,47 ----
  
  def mining( char, pos, tool ):
! 	wolfpack.addtimer( 1300, "skills.mining.domining", [ char, oresound, tool, pos ] )
  	char.settag( 'is_mining', str( servertime() + miningdelay ) )
  	char.turnto( pos )
***************
*** 140,147 ****
  
  #Sound effect
! def domining( char, args ):
! 	char.soundeffect( args[0] )
! 	tool = args[1]
! 	pos = args[2]
  	socket = char.socket
  
--- 140,148 ----
  
  #Sound effect
! def domining( time, args ):
! 	char = args[0]
! 	char.soundeffect( args[1] )
! 	tool = args[2]
! 	pos = args[3]
  	socket = char.socket
  

[wpdev-commits] xmlscripts/scripts potions.py,1.6,1.7

[<dr...@pr...>]

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

Modified Files:
	potions.py 
Log Message:
Slight tweak for mining.
Updates for potions.
The following potions work now:
  Greater Heal, Heal, and Lesser Heal
  Agility and Greater Agility
  Strength and Greater Strength


Index: potions.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** potions.py	28 Aug 2003 20:47:57 -0000	1.6
--- potions.py	26 Jan 2004 03:23:39 -0000	1.7
***************
*** 1,61 ****
! 
! import wolfpack.time
  from random import randint
  from wolfpack.consts import *
  
! # POTIONS SCRIPT
! # This script in general has all functions for potions
! # more1 defines the type of the potion
! # more2 the strength
  
  # You have to have one hand free for using a potion
  # This is not valid for explosion potions
! def canUsePotion( char ):
  	firsthand = char.itemonlayer( 1 )
  	secondhand = char.itemonlayer( 2 )
  
  	if not firsthand and not secondhand:
! 		return 1
  
  	if firsthand and not secondhand and not firsthand.twohanded:
! 		return 1
  	
  	if not firsthand and secondhand and not secondhand.twohanded:
! 		return 1
  
  	char.socket.cilocmessage( 0x7A99C ) # You must have a free hand to drink a potion.
! 	return 0
! 
! # 10 Seconds Timeout
! def checkPotionTimer( char ):
! 	socket = char.socket
! 
! 	if not socket:
! 		return 0
! 
! 	if not socket.hastag( "heal_timer" ):
! 		socket.settag( "heal_timer", wolfpack.time.servertime() + 10000 )
! 		return 1
! 
! 	# Compare 
! 	elapsed = int( socket.gettag( "heal_timer" ) )
! 	if elapsed > wolfpack.time.servertime():
! 		char.clilocmessage( 0x7A20B ) # You must wait 10 seconds before using another healing potion.
! 		return 0
! 
! 	socket.settag( "heal_timer", wolfpack.time.servertime() + 10000 )
! 	return 1
  
  # Display the drink action
  def drinkAnim( char ):
! 	char.action( 0x21 )
! 	char.soundeffect( 0x50 )
! 	
  # Consume the potion
! def consumePotion( potion ):
  	if potion.amount == 1:
  		potion.delete()
  	else:
  		potion.amount -= 1
  
  # Nightsight potion
--- 1,158 ----
! import wolfpack
  from random import randint
+ from wolfpack.time import *
  from wolfpack.consts import *
+ from wolfpack.utilities import *
  
! HEAL_POT_DELAY = 10000 # 10 Seconds
! AGILITY_TIME = 120000  # 2 minutes
! STRENGTH_TIME = 120000  # 2 minutes
! INTELLIGENCE_TIME = 120000 # 2 minutes
! 
! # potion [ return_bottle, aggressive, target ]
! potions = \
! {
! 	'nightsight':				[ 1, 0, 0 ],
! 	'lesser_heal':				[ 1, 0, 0 ],
! 	'heal':						[ 1, 0, 0 ],
! 	'greater_heal':			[ 1, 0, 0 ],
! 	'lesser_cure':				[ 1, 0, 0 ],
! 	'cure':						[ 1, 0, 0 ],
! 	'greater_cure':			[ 1, 0, 0 ],
! 	'agility':						[ 1, 0, 0 ],
! 	'greater_agility':			[ 1, 0, 0 ],
! 	'strength':					[ 1, 0, 0 ],
! 	'greater_strength':		[ 1, 0, 0 ],
! 	'lesser_explosion':		[ 0, 1, 1 ],
! 	'explosion':				[ 0, 1, 1 ],
! 	'greater_explosion':	[ 0, 1, 1 ],
! 	'lesser_poison':			[ 1, 0, 0 ],
! 	'poison':					[ 1, 0, 0 ],
! 	'greater_poison':		[ 1, 0, 0 ],
! 	'deadly_poison':			[ 1, 0, 0 ]
! }
! 
! POT_RETURN_BOTTLE = 0
! POT_AGGRESSIVE = 1
! POT_TARGET = 2
! 
! # Use the potion
! def onUse( char, item ):
! 	# Potions need to be on your body to use them, or in arms reach.
! 	if item.getoutmostchar() != char:
! 		char.message( "This potion is out of your reach..." )
! 		return OK
! 
! 	if not item.hastag( 'potiontype' ):
! 		return OOPS
! 	else:
! 		potiontype = item.gettag( 'potiontype' )
! 		potioncheck( char, item, potiontype )
! 
! 	return OK
! 
! # Check what kind of potion we use, drink or throw
! def potioncheck( char, item, potiontype ):
! 	socket = char.socket
! 	
! 	# Lets get the type of potion
! 	if not potiontype:
! 		return OOPS
! 	
! 	# Do we throw this thing?
! 	if potions[ potiontype ][ POT_TARGET ] == TRUE:
! 		# Explosion Potion
! 		if potiontype == 'lesser_explosion' or potiontype == 'explosion' or potiontype == 'greater_explosion':
! 			socket.sysmessage( 'Please select a target...', RED )
! 		
! 		# Not Known
! 		else:
! 			socket.sysmessage( 'What am I throwing!?', RED )
! 	
! 	# We just drink this potion...
! 	else:
! 		# Heal Potions
! 		if potiontype == 'lesser_heal' or potiontype == 'heal' or potiontype == 'greater_heal':
! 			if canUsePotion( char, item ):
! 				if char.hitpoints >= char.maxhitpoints:
! 					socket.sysmessage( 'You are already at full health!' )
! 				else:
! 					healPotion( char, item, potiontype )
! 		
! 		# Cure Potions
! 		elif potiontype == 'lesser_cure' or potiontype == 'cure' or potiontype == 'greater_cure':
! 			if canUsePotion( char, item ):
! 				socket.sysmessage( 'Drinking a cure potion.' )
! 		
! 		# Agility Potions
! 		elif potiontype == 'agility' or potiontype == 'greater_agility':
! 			if canUsePotion( char, item ):
! 				if not char.hastag( 'agility_effect' ):
! 					agilityPotion( char, item, potiontype )
! 				else:
! 					char.socket.sysmessage( 'You are already under a similar effect!', GRAY )
! 		
! 		# Strength Potions
! 		elif potiontype == 'strength' or potiontype == 'greater_strength':
! 			if canUsePotion( char, item ):
! 				if not char.hastag( 'strength_effect' ):
! 					strengthPotion( char, item, potiontype )
! 				else:
! 					char.socket.sysmessage( 'You are already under a similar effect!', GRAY )
! 		
! 		# Poison Potions
! 		elif potiontype == 'lesser_poison' or potiontype == 'poison' or potiontype == 'greater_poison' or potiontype == 'deadly_poison':
! 			if canUsePotion( char, item ):
! 				poisonPotion( char, item, potiontype )
! 				#socket.sysmessage( 'Drinking a poison potion.' )
! 		
! 		# Nightsight Potions
! 		elif potiontype == 'nightsight':
! 			if canUsePotion( char, item ):
! 				nightsightPotion( char, potion )
! 		
! 		# Not Known
! 		else:
! 			socket.sysmessage( 'Unknown potion...' )
! 			return OOPS
! 
! 	return OK
  
  # You have to have one hand free for using a potion
  # This is not valid for explosion potions
! def canUsePotion( char, item ):
  	firsthand = char.itemonlayer( 1 )
  	secondhand = char.itemonlayer( 2 )
  
  	if not firsthand and not secondhand:
! 		return OK
  
  	if firsthand and not secondhand and not firsthand.twohanded:
! 		return OK
  	
  	if not firsthand and secondhand and not secondhand.twohanded:
! 		return OK
  
  	char.socket.cilocmessage( 0x7A99C ) # You must have a free hand to drink a potion.
! 	return OOPS
  
  # Display the drink action
  def drinkAnim( char ):
! 	char.action( ANIM_FIDGET3 )
! 	char.soundeffect( SOUND_DRINK1 )
! 
  # Consume the potion
! def consumePotion( char, potion, givebottle ):
! 	
  	if potion.amount == 1:
  		potion.delete()
  	else:
  		potion.amount -= 1
+ 		potion.update()
+ 
+ 	if givebottle == TRUE: # Lets add an empty bottle!
+ 		bottle = wolfpack.additem( 'f0e' ) # Empty Bottle Definition
+ 		if not wolfpack.utilities.tocontainer( bottle, char.getbackpack() ):
+ 			bottle.update()
  
  # Nightsight potion
***************
*** 63,181 ****
  	char.message( "This potion will help you to see in the dark" )
  
! # Heal potions
! def healPotion( char, potion ):
! 	if not canUsePotion( char ) or not checkPotionTimer( char ):
! 		return
  
  	amount = 0
! 	pType = int( potion.gettag( "type" ) )
! 	
  	# Lesser Heal
! 	if pType == 1:
  		amount = randint( POTION_LESSERHEAL_RANGE[0], POTION_LESSERHEAL_RANGE[1] )
  
  	# Heal
! 	elif pType == 2:
  		amount = randint( POTION_HEAL_RANGE[0], POTION_HEAL_RANGE[1] )
  
  	# Greater Heal
! 	elif pType == 3:
  		amount = randint( POTION_GREATERHEAL_RANGE[0], POTION_GREATERHEAL_RANGE[1] )
  
! 	char.health = min( char.health + amount, char.strength ) # We don't heal over our maximum health
  
  	# Resend Health
  	char.updatehealth()
  
  	drinkAnim( char )
! 	consumePotion( potion )
! 
! # Poison Potions
! def poisonPotion( char, potion ):
! 	char.socket.sysmessage( "You better don't drink that." )
! 
! # Agility Potion
! def agilityPotion( char, potion ):
! 	if not canUsePotion( char ):
! 		return
  
! 	amount = 0
! 	pType = int( potion.gettag( "type" ) )
  	
! 	# Agility
! 	if pType == 9:
! #		amount = randint( POTION_LESSERHEAL_RANGE[0], POTION_LESSERHEAL_RANGE[1] )
! 		pass
  
! 	# Greater Agility
! 	elif pType == 10:
! 		pass
! #		amount = randint( POTION_HEAL_RANGE[0], POTION_HEAL_RANGE[1] )
  
! #	char.health = min( char.health + amount, char.strength ) # We don't heal over our maximum health
! 	# Resend Stamina
! 	#char.updatestamina()
! 	# NOTE: TEMPEFFECT!	
  
! 	drinkAnim( char )
! 	consumePotion( potion )
  
! # Strength Potion
! def strengthPotion( char, potion ):
! 	if not canUsePotion( char ):
! 		return
  
! 	amount = 0
! 	pType = int( potion.gettag( "type" ) )
  	
! 	# Strength
! 	if pType == 11:
! 		pass
! #		amount = randint( POTION_LESSERHEAL_RANGE[0], POTION_LESSERHEAL_RANGE[1] )
! 
! 	# Greater Strength
! 	elif pType == 12:
! 		pass
! #		amount = randint( POTION_HEAL_RANGE[0], POTION_HEAL_RANGE[1] )
! 
! #	char.health = min( char.health + amount, char.strength ) # We don't heal over our maximum health
! 	# Resend Health
! 	#char.updatestamina()
! 	# NOTE: TEMPEFFECT!	
  
  	drinkAnim( char )
! 	consumePotion( potion )
! 
! potions = {
! 	1: nightsightPotion,
! 
! 	2: healPotion, 		# Lesser Heal
! 	3: healPotion, 		# Heal
! 	4: healPotion, 		# Greater Heal
! 
! 	5: poisonPotion, 	# Lesser Poison
! 	6: poisonPotion, 	# Poison
! 	7: poisonPotion,	# Greater Poison
! 	8: poisonPotion, 	# Deadly Poison
  
! 	9: agilityPotion,	# Agility
! 	10: agilityPotion,	# Greater Agility
  
! 	11: strengthPotion,  # Strength
! 	12: strengthPotion  # Greater Strength
! }
  
! def onUse( char, item ):
! 	# Potions need to be on your body to use them.
! 	if item.getoutmostchar() != char:
! 		char.message( "This potion needs to be in your belongings to use it." )
! 		return 1
  
! 	if not potions.has_key( int( item.gettag( "type" ) ) ):
! 		return 0
  	
! 	potions[ pType ]( char, item )
! 	return 1
  
  # INVIS POTION
  # ID: 0x7A9A3 (0)
--- 160,326 ----
  	char.message( "This potion will help you to see in the dark" )
  
! # 10 Second Delay
! def checkHealTimer( char ):
! 	
! 	if not char.hastag( "heal_timer" ):
! 		char.settag( "heal_timer", wolfpack.time.servertime() + HEAL_POT_DELAY )
! 		return OK
! 
! 	# Compare 
! 	elapsed = int( char.gettag( "heal_timer" ) )
! 	if elapsed > wolfpack.time.servertime():
! 		char.clilocmessage( 0x7A20B ) # You must wait 10 seconds before using another healing potion.
! 		return OOPS
! 	else:
! 		char.settag( "heal_timer", wolfpack.time.servertime() + HEAL_POT_DELAY )
! 
! 	return OK
! 
! # Heal Potions
! def healPotion( char, potion, healtype ):
! 	if not canUsePotion( char, potion ) or not checkHealTimer( char ):
! 		return OOPS
  
  	amount = 0
! 
  	# Lesser Heal
! 	if healtype == "lesser_heal":
  		amount = randint( POTION_LESSERHEAL_RANGE[0], POTION_LESSERHEAL_RANGE[1] )
  
  	# Heal
! 	elif healtype == "heal":
  		amount = randint( POTION_HEAL_RANGE[0], POTION_HEAL_RANGE[1] )
  
  	# Greater Heal
! 	elif healtype == "greater_heal":
  		amount = randint( POTION_GREATERHEAL_RANGE[0], POTION_GREATERHEAL_RANGE[1] )
  
! 	char.hitpoints = min( char.hitpoints + amount, char.maxhitpoints ) # We don't heal over our maximum health
  
  	# Resend Health
  	char.updatehealth()
+ 	char.socket.sysmessage( 'You healed ' + str( amount ) + ' hitpoints.', GRAY )
  
  	drinkAnim( char )
! 	consumePotion( char, potion, potions[ healtype ][ POT_RETURN_BOTTLE ] )
! 	
! 	return OK
  
! # Dexterity Effect Timer
! def effectdextimer( time, args ):
! 	char = args[0]
! 	effecttype = args[1]
! 	bonus = args[2]
  	
! 	if effecttype == 'agility' or effecttype == 'greater_agility':
! 		if not char.hastag( 'agility_effect' ):
! 			return OOPS
! 		char.dexterity = char.dexterity - bonus
! 		char.maxstamina = char.maxstamina - bonus
! 		char.deltag( 'agility_effect' )
! 		char.updatestamina()
! 		char.updatestats()
! 	return OK
  
! # Strength Effect Timer
! def effectstrtimer( time, args ):
! 	char = args[0]
! 	effecttype = args[1]
! 	bonus = args[2]
! 	
! 	if effecttype == 'strength' or effecttype == 'greater_strength':
! 		if not char.hastag( 'strength_effect' ):
! 			return OOPS
! 		char.strength = char.strength - bonus
! 		char.maxhitpoints = char.maxhitpoints - bonus
! 		char.deltag( 'strength_effect' )
! 		char.updatehealth()
! 		char.updatestats()
! 	return OK
  
! # Intelligence Effect Timer
! def effectinttimer( time, args ):
! 	char = args[0]
! 	effecttype = args[1]
! 	bonus = args[2]
! 	if effecttype == 'intelligence' or effecttype == 'greater_intelligence':
! 		if not char.hastag( 'intelligence_effect' ):
! 			return OOPS
! 		char.intelligence = char.intelligence - bonus
! 		char.maxmana = char.maxmana - bonus
! 		char.deltag( 'intelligence_effect' )
! 		char.updatemana()
! 		char.updatestats()
! 	return OK
  
! # Agility Potion
! def agilityPotion( char, potion, agilitytype ):
! 	if not canUsePotion( char, potion ):
! 		return OOPS
  
! 	bonus = 0
  
! 	# Agility
! 	if agilitytype == 'agility':
! 		bonus = 10
  	
! 	# Greater Agility
! 	elif agilitytype == 'greater_agility':
! 		bonus = 20
! 	
! 	else:
! 		return OOPS
! 		
! 	char.dexterity = char.dexterity + bonus
! 	char.maxstamina = char.maxstamina + bonus
! 	wolfpack.addtimer( AGILITY_TIME, "potions.effectdextimer", [ char, agilitytype, bonus ] )
! 	char.settag( 'agility_effect', 'true' )
! 	char.updatestamina()
! 	char.updatestats()
  
  	drinkAnim( char )
! 	char.effect( 0x375a, 10, 15 )
! 	char.soundeffect( SOUND_AGILITY_UP )
! 	consumePotion( char, potion, potions[ agilitytype ][ POT_RETURN_BOTTLE ] )
! 	
! 	return OK
  
! # Strength Potion
! def strengthPotion( char, potion, strengthtype ):
! 	if not canUsePotion( char, potion ):
! 		return OOPS
  
! 	bonus = 0
  
! 	# Agility
! 	if strengthtype == 'strength':
! 		bonus = 10
! 	
! 	# Greater Agility
! 	elif strengthtype == 'greater_strength':
! 		bonus = 20
! 	
! 	else:
! 		return OOPS
! 		
! 	char.strength = char.strength + bonus
! 	char.maxhitpoints = char.maxhitpoints + bonus
! 	wolfpack.addtimer( STRENGTH_TIME, "potions.effectstrtimer", [ char, strengthtype, bonus ] )
! 	char.settag( 'strength_effect', 'true' )
! 	char.updatehealth()
! 	char.updatestats()
  
! 	drinkAnim( char )
! 	char.effect( 0x375a, 10, 15 )
! 	char.soundeffect( SOUND_STRENGTH_UP )
! 	consumePotion( char, potion, potions[ strengthtype ][ POT_RETURN_BOTTLE ] )
  	
! 	return OK
  
+ # Poison Potions
+ def poisonPotion( char, potion, poisontype ):
+ 	char.socket.sysmessage( "You shouldn't drink that..." )
+ 	return OK
+ 	
  # INVIS POTION
  # ID: 0x7A9A3 (0)

[wpdev-commits] xmlscripts/definitions/items/weaponry/archery bow.xml,1.1,1.2 composite_bow.xml,1.1,1.2 crossbow.xml,1.1,1.2 heavy_crossbow.xml,1.1,1.2 repeating_crossbow.xml,1.1,1.2

[<dr...@pr...>]

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

Modified Files:
	bow.xml composite_bow.xml crossbow.xml heavy_crossbow.xml 
	repeating_crossbow.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: bow.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/bow.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bow.xml	27 Dec 2003 15:26:59 -0000	1.1
--- bow.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="30" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1006</type>

Index: composite_bow.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/composite_bow.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** composite_bow.xml	27 Dec 2003 15:26:59 -0000	1.1
--- composite_bow.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 17,20 ****
--- 17,21 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="45" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1006</type>

Index: crossbow.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/crossbow.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** crossbow.xml	27 Dec 2003 15:26:59 -0000	1.1
--- crossbow.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 17,20 ****
--- 17,21 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="35" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1007</type>

Index: heavy_crossbow.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/heavy_crossbow.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** heavy_crossbow.xml	27 Dec 2003 15:26:59 -0000	1.1
--- heavy_crossbow.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 17,20 ****
--- 17,21 ----
  		<weight>9.0</weight>
  		<tag name="req_str" value="80" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1007</type>

Index: repeating_crossbow.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/repeating_crossbow.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** repeating_crossbow.xml	27 Dec 2003 15:26:59 -0000	1.1
--- repeating_crossbow.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 17,20 ****
--- 17,21 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="30" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1007</type>

[wpdev-commits] xmlscripts/definitions/items/armory/chain chain_coif.xml,1.3,1.4 chain_leggings.xml,1.3,1.4 chain_tunic.xml,1.3,1.4

[<dr...@pr...>]

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

Modified Files:
	chain_coif.xml chain_leggings.xml chain_tunic.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: chain_coif.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_coif.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** chain_coif.xml	29 Dec 2003 12:09:11 -0000	1.3
--- chain_coif.xml	26 Jan 2004 07:02:25 -0000	1.4
***************
*** 36,39 ****
--- 36,40 ----
  		<tag name="res_poison" value="1" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>8</smelt>

Index: chain_leggings.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_leggings.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** chain_leggings.xml	29 Dec 2003 12:09:11 -0000	1.3
--- chain_leggings.xml	26 Jan 2004 07:02:25 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="1" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>14</smelt>

Index: chain_tunic.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_tunic.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** chain_tunic.xml	29 Dec 2003 12:09:11 -0000	1.3
--- chain_tunic.xml	26 Jan 2004 07:02:25 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="1" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>14</smelt>

[wpdev-commits] xmlscripts/scripts/skills mining.py,1.9,1.10

[<dr...@pr...>]

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

Modified Files:
	mining.py 
Log Message:
Fixed a small error in the respawn


Index: mining.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mining.py	26 Jan 2004 03:23:40 -0000	1.9
--- mining.py	26 Jan 2004 06:02:24 -0000	1.10
***************
*** 254,258 ****
  def respawnvein( time, args ):
  	vein = args[0]
! 	if vein.hastag ('resource_empty') and int( gem.gettag( 'resourcecount' ) ) == 0:
  		vein.settag( 'resourcecount', str( randrange( 10, 34 ) ) )
  		vein.deltag('resource_empty')
--- 254,258 ----
  def respawnvein( time, args ):
  	vein = args[0]
! 	if vein.hastag ('resource_empty') and int( vein.gettag( 'resourcecount' ) ) == 0:
  		vein.settag( 'resourcecount', str( randrange( 10, 34 ) ) )
  		vein.deltag('resource_empty')

[wpdev-commits] xmlscripts/definitions/items/weaponry/fencing dagger.xml,1.2,1.3 double_bladed_staff.xml,1.2,1.3 kryss.xml,1.2,1.3 lance.xml,1.3,1.4 pike.xml,1.2,1.3 pitchfork.xml,1.3,1.4 short_spear.xml,1.3,1.4 spear.xml,1.3,1.4 war_fork.xml,1.3,1.4

[<dr...@pr...>]

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

Modified Files:
	dagger.xml double_bladed_staff.xml kryss.xml lance.xml 
	pike.xml pitchfork.xml short_spear.xml spear.xml war_fork.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: dagger.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/dagger.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dagger.xml	12 Jan 2004 05:00:49 -0000	1.2
--- dagger.xml	26 Jan 2004 07:02:29 -0000	1.3
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>1.0</weight>
  		<tag name="req_str" value="10" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment,weapons.blades</events>
  		<type>1005</type>

Index: double_bladed_staff.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/double_bladed_staff.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** double_bladed_staff.xml	12 Jan 2004 05:00:49 -0000	1.2
--- double_bladed_staff.xml	26 Jan 2004 07:02:29 -0000	1.3
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="50" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment,weapons.blades</events>
  		<type>1005</type>

Index: kryss.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/kryss.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kryss.xml	12 Jan 2004 05:00:49 -0000	1.2
--- kryss.xml	26 Jan 2004 07:02:29 -0000	1.3
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>1.0</weight>
  		<tag name="req_str" value="10" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment,weapons.blades</events>
  		<type>1005</type>

Index: lance.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/lance.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lance.xml	14 Jan 2004 13:07:33 -0000	1.3
--- lance.xml	26 Jan 2004 07:02:29 -0000	1.4
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>12.0</weight>
  		<tag name="req_str" value="95" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1005</type>

Index: pike.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pike.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pike.xml	12 Jan 2004 05:00:49 -0000	1.2
--- pike.xml	26 Jan 2004 07:02:29 -0000	1.3
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>10.0</weight>
  		<tag name="req_str" value="50" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment,weapons.blades</events>
  		<type>1005</type>

Index: pitchfork.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pitchfork.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pitchfork.xml	14 Jan 2004 13:07:33 -0000	1.3
--- pitchfork.xml	26 Jan 2004 07:02:29 -0000	1.4
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>10.0</weight>
  		<tag name="req_str" value="50" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1005</type>

Index: short_spear.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/short_spear.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** short_spear.xml	14 Jan 2004 13:07:33 -0000	1.3
--- short_spear.xml	26 Jan 2004 07:02:29 -0000	1.4
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>4.0</weight>
  		<tag name="req_str" value="40" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1005</type>

Index: spear.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/spear.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spear.xml	14 Jan 2004 13:07:33 -0000	1.3
--- spear.xml	26 Jan 2004 07:02:29 -0000	1.4
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="50" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1005</type>

Index: war_fork.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/war_fork.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** war_fork.xml	14 Jan 2004 13:07:33 -0000	1.3
--- war_fork.xml	26 Jan 2004 07:02:29 -0000	1.4
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>1.0</weight>
  		<tag name="req_str" value="35" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1005</type>

[wpdev-commits] xmlscripts/definitions/items/armory/bone bone_armor.xml,1.3,1.4 bone_arms.xml,1.3,1.4 bone_gloves.xml,1.3,1.4 bone_helm.xml,1.3,1.4 bone_leggings.xml,1.3,1.4

[<dr...@pr...>]

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

Modified Files:
	bone_armor.xml bone_arms.xml bone_gloves.xml bone_helm.xml 
	bone_leggings.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: bone_armor.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_armor.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bone_armor.xml	29 Dec 2003 12:09:10 -0000	1.3
--- bone_armor.xml	26 Jan 2004 07:02:25 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="2" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>6</weight>

Index: bone_arms.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_arms.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bone_arms.xml	29 Dec 2003 12:09:10 -0000	1.3
--- bone_arms.xml	26 Jan 2004 07:02:25 -0000	1.4
***************
*** 27,30 ****
--- 27,31 ----
  		<tag name="res_poison" value="2" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<events>equipment</events>
  		<category>Armor\Bone\Bone Arms (N/S)</category>

Index: bone_gloves.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_gloves.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bone_gloves.xml	29 Dec 2003 12:09:10 -0000	1.3
--- bone_gloves.xml	26 Jan 2004 07:02:25 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="2" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>2</weight>

Index: bone_helm.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_helm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bone_helm.xml	29 Dec 2003 12:09:10 -0000	1.3
--- bone_helm.xml	26 Jan 2004 07:02:25 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="2" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>3.0</weight>

Index: bone_leggings.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_leggings.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bone_leggings.xml	29 Dec 2003 12:09:10 -0000	1.3
--- bone_leggings.xml	26 Jan 2004 07:02:25 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="2" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>3</weight>

[wpdev-commits] xmlscripts/definitions/items/armory/plate female_plate_armor.xml,1.3,1.4 plate_helm.xml,1.3,1.4 platemail.xml,1.3,1.4 platemail_arms.xml,1.3,1.4 platemail_gloves.xml,1.3,1.4 platemail_gorget.xml,1.3,1.4 platemail_legs.xml,1.3,1.4

[<dr...@pr...>]

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

Modified Files:
	female_plate_armor.xml plate_helm.xml platemail.xml 
	platemail_arms.xml platemail_gloves.xml platemail_gorget.xml 
	platemail_legs.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: female_plate_armor.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/plate/female_plate_armor.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** female_plate_armor.xml	29 Dec 2003 12:09:12 -0000	1.3
--- female_plate_armor.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>16</smelt>

Index: plate_helm.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/plate/plate_helm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plate_helm.xml	29 Dec 2003 12:09:12 -0000	1.3
--- plate_helm.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>12</smelt>

Index: platemail.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/plate/platemail.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** platemail.xml	29 Dec 2003 12:09:12 -0000	1.3
--- platemail.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>20</smelt>

Index: platemail_arms.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/plate/platemail_arms.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** platemail_arms.xml	29 Dec 2003 12:09:12 -0000	1.3
--- platemail_arms.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>14</smelt>

Index: platemail_gloves.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/plate/platemail_gloves.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** platemail_gloves.xml	29 Dec 2003 12:09:12 -0000	1.3
--- platemail_gloves.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>9</smelt>

Index: platemail_gorget.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/plate/platemail_gorget.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** platemail_gorget.xml	29 Dec 2003 12:09:12 -0000	1.3
--- platemail_gorget.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>8</smelt>

Index: platemail_legs.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/plate/platemail_legs.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** platemail_legs.xml	29 Dec 2003 12:09:12 -0000	1.3
--- platemail_legs.xml	26 Jan 2004 07:02:26 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="2" type="int" />
+ 		<tag name="resname" value="iron" />
  		<restock>10</restock>
  		<smelt>16</smelt>

[wpdev-commits] xmlscripts/scripts ore.py,1.5,1.6

[<dr...@pr...>]

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

Modified Files:
	ore.py 
Log Message:
Fixed two slight problems I found... 22 hours without sleep = extra bugs :D
Now everything seems to work fine...


Index: ore.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ore.py	26 Jan 2004 22:25:21 -0000	1.5
--- ore.py	26 Jan 2004 22:44:13 -0000	1.6
***************
*** 92,95 ****
--- 92,98 ----
  		resname = item.gettag( 'resname' )
  
+ 	if target.char:
+ 		return OOPS
+ 		
  	targetitem = wolfpack.finditem( target.item.serial )
  
***************
*** 300,305 ****
  					ore.update()
  				elif ore.amount == 1:
! 					successsmelt( char, ingottable, resname, amount, ingotdef )
! 					ore.delete()
  			success = 1
  		
--- 303,311 ----
  					ore.update()
  				elif ore.amount == 1:
! 					# There is not enough metal-bearing ore in this pile to make an ingot.
! 					char.socket.clilocmessage( 501987, '', GRAY ) 
! 					return OOPS
! 					
! 
  			success = 1
  		

[wpdev-commits] xmlscripts/scripts/skills mining.py,1.12,1.13

[<dr...@pr...>]

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

Modified Files:
	mining.py 
Log Message:
mmmmmm cliloc messages


Index: mining.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mining.py	26 Jan 2004 21:00:47 -0000	1.12
--- mining.py	26 Jan 2004 22:25:21 -0000	1.13
***************
*** 258,262 ****
  
  	if resname == 'silver' or resname == 'merkite' or resname == 'mythril':
! 		socket.sysmessage( "You dig some " + table[ resname ][ RESOURCENAME ]  + " and put it in your backpack.", GRAY )
  	else:
  		# You dig some %s and put it in your backpack.
--- 258,263 ----
  
  	if resname == 'silver' or resname == 'merkite' or resname == 'mythril':
! 		#You dig some ore and put it in your backpack.
! 		socket.clilocmessage( 503044, "", GRAY )
  	else:
  		# You dig some %s and put it in your backpack.

[wpdev-commits] xmlscripts/scripts equipment.py,1.4,1.5 ore.py,1.4,1.5 scissors.py,1.6,1.7 wool.py,1.4,1.5 yarn.py,1.5,1.6

[<dr...@pr...>]

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

Modified Files:
	equipment.py ore.py scissors.py wool.py yarn.py 
Log Message:
mmmmmm cliloc messages


Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** equipment.py	26 Jan 2004 06:23:08 -0000	1.4
--- equipment.py	26 Jan 2004 22:25:21 -0000	1.5
***************
*** 7,30 ****
  	if item.hastag( 'req_str' ) and wearer.strength < int( item.gettag( 'req_str' ) ):
  		if player != wearer:
! 			player.message( 'This person can\'t wear that item, seems not strong enough.' )
  			return 1
  		else:
! 			player.message( 'You cannot wear that item, you seem not strong enough.' )
  			return 1
  			
  	if item.hastag( 'req_dex' ) and wearer.dexterity < int( item.gettag( 'req_dex' ) ):
  		if player != wearer:
! 			player.message( 'This person can\'t wear that item, seems not agile enough.' )
  			return 1
  		else:
! 			player.message( 'You cannot wear that item, you seem not agile enough.' )
  			return 1
  
  	if item.hastag( 'req_int' ) and wearer.intelligence < int( item.gettag( 'req_int' ) ):
  		if player != wearer:
! 			player.message( 'This person can\'t wear that item, seems not smart enough.' )
  			return 1
  		else:
! 			player.message( 'You cannot wear that item, you seem not smart enough.' )
  			return 1
  			
--- 7,32 ----
  	if item.hastag( 'req_str' ) and wearer.strength < int( item.gettag( 'req_str' ) ):
  		if player != wearer:
! 			player.socket.sysmessage( 'This person can\'t wear that item, seems not strong enough.' )
  			return 1
  		else:
! 			# You are not strong enough to equip that.
! 			player.socket.clilocmessage( 500213, '', GRAY )
  			return 1
  			
  	if item.hastag( 'req_dex' ) and wearer.dexterity < int( item.gettag( 'req_dex' ) ):
  		if player != wearer:
! 			player.socket.sysmessage( 'This person can\'t wear that item, seems not agile enough.' )
  			return 1
  		else:
! 			# You do not have enough dexterity to equip this item.
! 			player.socket.clilocmessage( 502077, '', GRAY )
  			return 1
  
  	if item.hastag( 'req_int' ) and wearer.intelligence < int( item.gettag( 'req_int' ) ):
  		if player != wearer:
! 			player.socket.sysmessage( 'This person can\'t wear that item, seems not smart enough.' )
  			return 1
  		else:
! 			player.socket.sysmessage( 'You are not ingellgent enough to equip this item.' )
  			return 1
  			

Index: ore.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ore.py	26 Jan 2004 21:00:40 -0000	1.4
--- ore.py	26 Jan 2004 22:25:21 -0000	1.5
***************
*** 58,62 ****
  				else:
  					# Where do you want to smelt the ore?
! 					char.socket.clilocmessage( 501971, '', GRAY, NORMAL )
  					char.socket.attachtarget( "ore.response", [ ore.serial ] )
  					return OK
--- 58,62 ----
  				else:
  					# Where do you want to smelt the ore?
! 					char.socket.clilocmessage( 501971, '', GRAY )
  					char.socket.attachtarget( "ore.response", [ ore.serial ] )
  					return OK
***************
*** 67,71 ****
  			else:
  				# Where do you want to smelt the ore?
! 				char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) 
  				char.socket.attachtarget( "ore.response", [ ore.serial ] )
  				return OK
--- 67,71 ----
  			else:
  				# Where do you want to smelt the ore?
! 				char.socket.clilocmessage( 501971, '', GRAY ) 
  				char.socket.attachtarget( "ore.response", [ ore.serial ] )
  				return OK
***************
*** 125,129 ****
  						item.delete()
  						# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 						char.socket.clilocmessage( 501971, '', GRAY, NORMAL )
  					elif targetitem.id == oreids[0]:
  						targetitem.amount += ( item.amount * 4 )
--- 125,129 ----
  						item.delete()
  						# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 						char.socket.clilocmessage( 501971, '', GRAY )
  					elif targetitem.id == oreids[0]:
  						targetitem.amount += ( item.amount * 4 )
***************
*** 131,135 ****
  						item.delete()
  						# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 						char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) 
  					elif targetitem.id == item.id:
  						targetitem.amount += item.amount
--- 131,135 ----
  						item.delete()
  						# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 						char.socket.clilocmessage( 501971, '', GRAY ) 
  					elif targetitem.id == item.id:
  						targetitem.amount += item.amount
***************
*** 137,141 ****
  						item.delete()
  						# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 						char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) 
  					return OK
  			else:
--- 137,141 ----
  						item.delete()
  						# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 						char.socket.clilocmessage( 501971, '', GRAY ) 
  					return OK
  			else:
***************
*** 146,150 ****
  					item.delete()
  					# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 					char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) 
  				elif targetitem.id == oreids[0]:
  					targetitem.amount += ( item.amount * 4 )
--- 146,150 ----
  					item.delete()
  					# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 					char.socket.clilocmessage( 501971, '', GRAY ) 
  				elif targetitem.id == oreids[0]:
  					targetitem.amount += ( item.amount * 4 )
***************
*** 152,156 ****
  					item.delete()
  					# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 					char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) 
  				elif targetitem.id == item.id:
  					targetitem.amount += item.amount
--- 152,156 ----
  					item.delete()
  					# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 					char.socket.clilocmessage( 501971, '', GRAY ) 
  				elif targetitem.id == item.id:
  					targetitem.amount += item.amount
***************
*** 158,162 ****
  					item.delete()
  					# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 					char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) 
  				return OK
  		
--- 158,162 ----
  					item.delete()
  					# Select the forge on which to smelt the ore, or another pile of ore with which to combine it.
! 					char.socket.clilocmessage( 501971, '', GRAY ) 
  				return OK
  		

Index: scissors.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/scissors.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** scissors.py	14 Jan 2004 01:30:22 -0000	1.6
--- scissors.py	26 Jan 2004 22:25:21 -0000	1.7
***************
*** 30,37 ****
  	# Needs to be on ourself
  	if item.getoutmostchar() != char:
! 		char.socket.clilocmessage( 0x7A258 ) # You can't reach...
  		return 1
  
! 	char.socket.clilocmessage( 0x7AAA2 ) # What do you want to use this scissors on?
  	char.socket.attachtarget( "scissors.response", [ item.serial ] )
  	return 1
--- 30,37 ----
  	# Needs to be on ourself
  	if item.getoutmostchar() != char:
! 		char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that.
  		return 1
  
! 	char.socket.clilocmessage( 502434 ) # What do you want to use this scissors on?
  	char.socket.attachtarget( "scissors.response", [ item.serial ] )
  	return 1
***************
*** 45,62 ****
  
  	if not item: 
! 		char.socket.clilocmessage( 0x7A258 ) # You can't reach...
  		return
  	
  	if not ( item.getoutmostchar() == char):
! 		char.socket.clilocmessage( 0x7AAA5 ) # You can't reach...
  		return 
  
  	# Check target (only item targets valid)
  	if not target.item:
! 		char.socket.clilocmessage( 0x7AAA8, "", 0x3b2, 3, char ) # Scissors can not be used on that to produce anything
  		return
      
  	if not target.item.getoutmostchar() == char:
! 		char.socket.clilocmessage( 0x7A4FC )
  		return 
  
--- 45,62 ----
  
  	if not item: 
! 		char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that.
  		return
  	
  	if not ( item.getoutmostchar() == char):
! 		char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that.
  		return 
  
  	# Check target (only item targets valid)
  	if not target.item:
! 		char.socket.clilocmessage( 502440, "", GRAY ) # Scissors can not be used on that to produce anything
  		return
      
  	if not target.item.getoutmostchar() == char:
! 		char.socket.clilocmessage( 502440 ) # Scissors cannot be used on that to produce anything.
  		return 
  
***************
*** 209,212 ****
  			
  	else:
! 		char.socket.clilocmessage( 0x7AAA8, "", 0x3b2, 3, char ) # Scissors can not be used on that to produce anything
  		return
--- 209,212 ----
  			
  	else:
! 		char.socket.clilocmessage( 502440, "", GRAY ) # Scissors can not be used on that to produce anything
  		return

Index: wool.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wool.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wool.py	14 Jan 2004 01:30:22 -0000	1.4
--- wool.py	26 Jan 2004 22:25:21 -0000	1.5
***************
*** 17,24 ****
  	# Needs to be on ourself
  	if item.getoutmostchar() != char:
! 		char.socket.clilocmessage( 0x7A258 ) # You can't reach...
  		return OK
  
! 	char.socket.clilocmessage( 0x7AB7F ) # What spinning wheel do you wish to spin this on?
  	char.socket.attachtarget( "wool.response", [ item.serial ] )
  	return OK
--- 17,24 ----
  	# Needs to be on ourself
  	if item.getoutmostchar() != char:
! 		char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that.
  		return OK
  
! 	char.socket.clilocmessage( 502655 ) # What spinning wheel do you wish to spin this on?
  	char.socket.attachtarget( "wool.response", [ item.serial ] )
  	return OK
***************
*** 34,47 ****
  	
  	if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4):
! 		char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
  		return OK
  		
  	if abs( char.pos.z - target.pos.z ) > 5:
! 		char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
  		return OK
  	
  	# Check target (only item targets valid)
  	if not target.item:
! 		char.socket.clilocmessage( 0x7AB82 ) # Use that on a spinning wheel.
  		return OK
  	
--- 34,47 ----
  	
  	if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4):
! 		char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that.
  		return OK
  		
  	if abs( char.pos.z - target.pos.z ) > 5:
! 		char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that.
  		return OK
  	
  	# Check target (only item targets valid)
  	if not target.item:
! 		char.socket.clilocmessage( 502658, '', GRAY ) # Use that on a spinning wheel.
  		return OK
  	
***************
*** 73,81 ****
  	
  	elif target.item.id in animids:
! 		char.socket.sysmessage( 'This spinning wheel is currently in use.' )
  		return OK
  	
  	else:
! 		char.socket.clilocmessage( 0x7AB82 ) # Use that on a spinning wheel.
  		return OK
  
--- 73,83 ----
  	
  	elif target.item.id in animids:
! 		# That spinning wheel is being used.
! 		char.socket.clilocmessage( 502656, '', GRAY )
  		return OK
  	
  	else:
! 		# Use that on a spinning wheel.
! 		char.socket.clilocmessage( 502658, '', GRAY ) 
  		return OK
  
***************
*** 107,110 ****
  	if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ):
  		item_new.update()
! 	char.socket.sysmessage( 'You put the yarn into your backpack.' )
  	return OK
\ No newline at end of file
--- 109,118 ----
  	if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ):
  		item_new.update()
! 	
! 	if item_new.amount > 1:
! 		# You put the balls of yarn in your backpack.
! 		char.socket.clilocmessage( 1010576, '', GRAY )
! 	else:
! 		# You put a ball of yarn in your backpack.
! 		char.socket.clilocmessage( 1010574, '', GRAY )
  	return OK
\ No newline at end of file

Index: yarn.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/yarn.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** yarn.py	14 Jan 2004 01:30:22 -0000	1.5
--- yarn.py	26 Jan 2004 22:25:21 -0000	1.6
***************
*** 15,22 ****
  	# Needs to be on ourself
  	if item.getoutmostchar() != char:
! 		char.socket.clilocmessage( 0x7A258 ) # You can't reach...
  		return 1
  
! 	char.socket.clilocmessage( 0x7A28E ) # Select a loom to use that on.
  	char.socket.attachtarget( "yarn.response", [ item.serial ] )
  	return 1
--- 15,22 ----
  	# Needs to be on ourself
  	if item.getoutmostchar() != char:
! 		char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that.
  		return 1
  
! 	char.socket.clilocmessage( 500366, '', GRAY ) # Select a loom to use that on.
  	char.socket.attachtarget( "yarn.response", [ item.serial ] )
  	return 1
***************
*** 31,44 ****
  	
  	if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4):
! 		char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
  		return 1
  		
  	if abs( char.pos.z - target.pos.z ) > 5:
! 		char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
  		return 1
  	
  	# Check target (only item targets valid)
  	if not target.item:
! 		char.socket.clilocmessage( 0x7A28F ) # Try using that on a loom.
  		return 1
  	
--- 31,44 ----
  	
  	if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4):
! 		char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that.
  		return 1
  		
  	if abs( char.pos.z - target.pos.z ) > 5:
! 		char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that.
  		return 1
  	
  	# Check target (only item targets valid)
  	if not target.item:
! 		char.socket.clilocmessage( 500367, '', GRAY ) # Try using that on a loom.
  		return 1
  	
***************
*** 62,72 ****
  		if amount < 5:
  			if amount == 1:
! 				char.socket.sysmessage( 'You have just started the bolt of cloth.' )
  			elif amount == 2:
! 				char.socket.sysmessage( 'The bolt of cloth could use quite a bit more.' )
  			elif amount == 3:
! 				char.socket.sysmessage( 'The bolt of cloth could use a bit more.' )
  			elif amount == 4:
! 				char.socket.sysmessage( 'The bolt of cloth is almost finished.' )
  			target.item.settag( 'amount', str(amount) )
  		
--- 62,76 ----
  		if amount < 5:
  			if amount == 1:
! 				#The bolt of cloth has just been started.
! 				char.socket.clilocmessage( 1010001, '', GRAY )
  			elif amount == 2:
! 				#The bolt of cloth needs quite a bit more.
! 				char.socket.clilocmessage( 1010002, '', GRAY )
  			elif amount == 3:
! 				#The bolt of cloth needs a little more.
! 				char.socket.clilocmessage( 1010003, '', GRAY )
  			elif amount == 4:
! 				#The bolt of cloth is almost finished.
! 				char.socket.clilocmessage( 1010004, '', GRAY )
  			target.item.settag( 'amount', str(amount) )
  		
***************
*** 77,79 ****
  			if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ):
  				item_new.update()
! 			char.socket.clilocmessage( 0x7A290 ) # You create some cloth and put it in your backpack.
--- 81,83 ----
  			if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ):
  				item_new.update()
! 			char.socket.clilocmessage( 500368, '', GRAY ) # You create some cloth and put it in your backpack.

[wpdev-commits] xmlscripts/scripts keyring.py,1.1,1.2

[<dar...@pr...>]

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

Modified Files:
	keyring.py 
Log Message:
Finished keyrings.

Index: keyring.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/keyring.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** keyring.py	26 Jan 2004 03:45:19 -0000	1.1
--- keyring.py	26 Jan 2004 22:21:19 -0000	1.2
***************
*** 1,3 ****
--- 1,5 ----
  
+ import wolfpack
+ 
  def onDropOnItem(keyring, key):
    if 'keyring' not in keyring.events or 'key' not in key.events:
***************
*** 38,41 ****
    return 1
  
! def onUse(char, item):
!   return 1
\ No newline at end of file
--- 40,99 ----
    return 1
  
! def lock_response(char, args, target):
!   if len(args) != 1:
!     return    
! 
!   keyring = wolfpack.finditem(args[0])
!   if not keyring or not char.canreach(keyring,5):
!     char.socket.clilocmessage(500312)
!     return
! 
!   # Check for an item target.
!   if not target.item or not char.canreach(target.item, 5):
!     char.socket.clilocmessage(501666)
!     return
! 
!   # Targetted the keyring itself??
!   if target.item == keyring:
!     # Put all rings into the backpack of the user
!     backpack = char.getbackpack()
! 
!     for key in keyring.content:
!       backpack.additem(key, 1, 1, 0)
!       key.update()
!     
!     keyring.id = 0x1011
!     keyring.update()
!   
!     char.socket.clilocmessage(501685)
!     return
! 
!   if not 'lock' in target.item.events or not target.item.hastag('lock'):
!     char.socket.clilocmessage(501666)
!     return
! 
!   target_lock = str(target.item.gettag('lock'))
! 
!   # Search for a valid key
!   keys = keyring.content
! 
!   for key in keys:
!     if key.hastag('lock') and 'key' in key.events:
!       key_lock = str(key.gettag('lock'))
! 
!       if key_lock == target_lock:
!         if target.item.hastag('locked') and int(target.item.gettag('locked')) == 1:
!           target.item.deltag('locked')
!         else:
!           target.item.settag('locked',1)
!         char.soundeffect(0x241)
!         return
! 
!   char.socket.clilocmessage(501668)
! 
! # The behaviour is similar to keys
! def onUse(char, keyring):
!   # Does this key open a lock?
!   char.socket.clilocmessage(501680)
!   char.socket.attachtarget('keyring.lock_response',[keyring.serial])
!   return 1

[wpdev-commits] xmlscripts/definitions/items/armory/studded studded_armor.xml,1.3,1.4 studded_bustier.xml,1.3,1.4 studded_gloves.xml,1.3,1.4 studded_gorget.xml,1.3,1.4 studded_leggings.xml,1.3,1.4 studded_sleeves.xml,1.3,1.4 studded_tunic.xml,1.3,1.4

[<dr...@pr...>]

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

Modified Files:
	studded_armor.xml studded_bustier.xml studded_gloves.xml 
	studded_gorget.xml studded_leggings.xml studded_sleeves.xml 
	studded_tunic.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: studded_armor.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/studded/studded_armor.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** studded_armor.xml	29 Dec 2003 12:09:13 -0000	1.3
--- studded_armor.xml	26 Jan 2004 07:02:28 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>6.0</weight>

Index: studded_bustier.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/studded/studded_bustier.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** studded_bustier.xml	29 Dec 2003 12:09:13 -0000	1.3
--- studded_bustier.xml	26 Jan 2004 07:02:28 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>1.0</weight>

Index: studded_gloves.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/studded/studded_gloves.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** studded_gloves.xml	29 Dec 2003 12:09:13 -0000	1.3
--- studded_gloves.xml	26 Jan 2004 07:02:28 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>1.0</weight>

Index: studded_gorget.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/studded/studded_gorget.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** studded_gorget.xml	29 Dec 2003 12:09:13 -0000	1.3
--- studded_gorget.xml	26 Jan 2004 07:02:28 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>1.0</weight>

Index: studded_leggings.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/studded/studded_leggings.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** studded_leggings.xml	29 Dec 2003 12:09:13 -0000	1.3
--- studded_leggings.xml	26 Jan 2004 07:02:28 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>3.0</weight>

Index: studded_sleeves.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/studded/studded_sleeves.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** studded_sleeves.xml	29 Dec 2003 12:09:13 -0000	1.3
--- studded_sleeves.xml	26 Jan 2004 07:02:28 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>4.0</weight>

Index: studded_tunic.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/studded/studded_tunic.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** studded_tunic.xml	29 Dec 2003 12:09:13 -0000	1.3
--- studded_tunic.xml	26 Jan 2004 07:02:28 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  		<tag name="res_poison" value="3" type="int" />
  		<tag name="res_energy" value="4" type="int" />
+ 		<tag name="resname" value="leather" />
  		<restock>10</restock>
  		<weight>5.0</weight>

[wpdev-commits] xmlscripts/definitions/items/weaponry/macefighting black_staff.xml,1.1,1.2 club.xml,1.1,1.2 gnarled_staff.xml,1.1,1.2 hammer_pick.xml,1.1,1.2 mace.xml,1.1,1.2 maul.xml,1.1,1.2 quarter_staff.xml,1.1,1.2 scepter.xml,1.1,1.2 shepherds_crook.xml,1.1,1.2 war_axe.xml,1.2,1.3 war_hammer.xml,1.1,1.2 war_mace.xml,1.1,1.2

[<dr...@pr...>]

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

Modified Files:
	black_staff.xml club.xml gnarled_staff.xml hammer_pick.xml 
	mace.xml maul.xml quarter_staff.xml scepter.xml 
	shepherds_crook.xml war_axe.xml war_hammer.xml war_mace.xml 
Log Message:
I added resname tags to weapons/armor. This will be useful for smelting
weapons and armor, and even cutting armor that gives leather. AoS has the
four leather types. Also, wooden objects have 'plainwood' in case later
there happens to be multiple wood types or something...


Index: black_staff.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/black_staff.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** black_staff.xml	27 Dec 2003 15:26:59 -0000	1.1
--- black_staff.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  		<weight>6.0</weight>
  		<tag name="req_str" value="35" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1003</type>

Index: club.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/club.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** club.xml	27 Dec 2003 15:26:59 -0000	1.1
--- club.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>14.0</weight>
  		<tag name="req_str" value="40" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1004</type>

Index: gnarled_staff.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/gnarled_staff.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gnarled_staff.xml	27 Dec 2003 15:26:59 -0000	1.1
--- gnarled_staff.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  		<weight>3.0</weight>
  		<tag name="req_str" value="20" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1003</type>

Index: hammer_pick.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/hammer_pick.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hammer_pick.xml	27 Dec 2003 15:26:59 -0000	1.1
--- hammer_pick.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>9.0</weight>
  		<tag name="req_str" value="45" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1004</type>

Index: mace.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/mace.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mace.xml	27 Dec 2003 15:26:59 -0000	1.1
--- mace.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>14.0</weight>
  		<tag name="req_str" value="45" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1004</type>

Index: maul.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/maul.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** maul.xml	27 Dec 2003 15:26:59 -0000	1.1
--- maul.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>14.0</weight>
  		<tag name="req_str" value="45" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1004</type>

Index: quarter_staff.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/quarter_staff.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** quarter_staff.xml	27 Dec 2003 15:26:59 -0000	1.1
--- quarter_staff.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  		<weight>4.0</weight>
  		<tag name="req_str" value="30" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1003</type>

Index: scepter.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/scepter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scepter.xml	27 Dec 2003 15:26:59 -0000	1.1
--- scepter.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="40" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1004</type>

Index: shepherds_crook.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/shepherds_crook.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shepherds_crook.xml	27 Dec 2003 15:26:59 -0000	1.1
--- shepherds_crook.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  		<weight>2.0</weight>
  		<tag name="req_str" value="20" type="int" />
+ 		<tag name="resname" value="plainwood" />
  		<events>equipment</events>
  		<type>1003</type>

Index: war_axe.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/war_axe.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** war_axe.xml	14 Jan 2004 13:07:33 -0000	1.2
--- war_axe.xml	26 Jan 2004 07:02:29 -0000	1.3
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>3.0</weight>
  		<tag name="req_str" value="35" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment,weapons.blades</events>
  		<type>1004</type>

Index: war_hammer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/war_hammer.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** war_hammer.xml	27 Dec 2003 15:26:59 -0000	1.1
--- war_hammer.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>10.0</weight>
  		<tag name="req_str" value="95" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1004</type>

Index: war_mace.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/war_mace.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** war_mace.xml	27 Dec 2003 15:26:59 -0000	1.1
--- war_mace.xml	26 Jan 2004 07:02:29 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  		<weight>17.0</weight>
  		<tag name="req_str" value="80" type="int" />
+ 		<tag name="resname" value="iron" />
  		<events>equipment</events>
  		<type>1004</type>