wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] wolfpack/network uosocket.cpp,1.312,1.313 uosocket.h,1.100,1.101

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

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

Modified Files:
	uosocket.cpp uosocket.h 
Log Message:
Added cansee to all important classes and updated most parts of the code where a visibility check has to be made.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.312
retrieving revision 1.313
diff -C2 -d -r1.312 -r1.313
*** uosocket.cpp	3 Feb 2004 18:13:18 -0000	1.312
--- uosocket.cpp	3 Feb 2004 20:47:34 -0000	1.313
***************
*** 1274,1284 ****
  void cUOSocket::updateChar( P_CHAR pChar )
  {
! 	if( !_player )
! 		return;
! 
! 	cUOTxUpdatePlayer updatePlayer;
! 	updatePlayer.fromChar( pChar );
! 	updatePlayer.setHighlight( pChar->notoriety( _player ) );
! 	send( &updatePlayer );
  }
  
--- 1274,1283 ----
  void cUOSocket::updateChar( P_CHAR pChar )
  {
! 	if (canSee(pChar)) {
! 		cUOTxUpdatePlayer updatePlayer;
! 		updatePlayer.fromChar( pChar );
! 		updatePlayer.setHighlight( pChar->notoriety( _player ) );
! 		send( &updatePlayer );
! 	}
  }
  
***************
*** 1286,1304 ****
  void cUOSocket::sendChar( P_CHAR pChar )
  {
! 	if( !_player || !_player->account() )
! 		return;
! 
! 	if( pChar->objectType() == enPlayer && !dynamic_cast<P_PLAYER>(pChar)->socket() && !_player->account()->isAllShow() )
! 		return;
! 
! 	if( ( pChar->isHidden() || ( pChar->isDead() && !pChar->isAtWar() ) ) && !_player->isGMorCounselor() )
! 		return;
! 	
! 	// Then completely resend it
! 	cUOTxDrawChar drawChar;
! 	drawChar.fromChar( pChar );
! 	drawChar.setHighlight( pChar->notoriety( _player ) );
! 	pChar->sendTooltip( this );
! 	send( &drawChar );
  }
  
--- 1285,1296 ----
  void cUOSocket::sendChar( P_CHAR pChar )
  {
! 	if (canSee(pChar)) {
! 		// Then completely resend it
! 		cUOTxDrawChar drawChar;
! 		drawChar.fromChar( pChar );
! 		drawChar.setHighlight( pChar->notoriety( _player ) );
! 		pChar->sendTooltip( this );
! 		send( &drawChar );
! 	}
  }
  
***************
*** 1675,1685 ****
  void cUOSocket::updatePlayer()
  {
! 	if( !_player )
! 		return;
! 
! 	cUOTxUpdatePlayer pUpdate;
! 	pUpdate.fromChar( _player );
! 	pUpdate.setHighlight( _player->notoriety( _player ) );
! 	send( &pUpdate );
  }
  
--- 1667,1676 ----
  void cUOSocket::updatePlayer()
  {
! 	if( _player ) {
! 		cUOTxUpdatePlayer pUpdate;
! 		pUpdate.fromChar(_player);
! 		pUpdate.setHighlight(_player->notoriety(_player));
! 		send(&pUpdate);
! 	}
  }
  
***************
*** 2603,2604 ****
--- 2594,2627 ----
  	Log::instance()->print( loglevel, this, message );
  }
+ 
+ bool cUOSocket::canSee(cUOSocket *socket, bool lineOfSight) {
+ 	if (!socket || !socket->player() || !_player) {
+ 		return false;
+ 	} else {
+ 		return _player->canSee(socket->player(), lineOfSight);
+ 	}
+ }
+ 
+ bool cUOSocket::canSee(P_ITEM item, bool lineOfSight) {
+ 	if (!item || !_player) {
+ 		return false;
+ 	} else {
+ 		return _player->canSeeItem(item, lineOfSight);
+ 	}
+ }
+ 
+ bool cUOSocket::canSee(P_CHAR character, bool lineOfSight) {
+ 	if (!character || !_player) {
+ 		return false;
+ 	} else {
+ 		return _player->canSeeChar(character, lineOfSight);
+ 	}
+ }
+ 
+ bool cUOSocket::canSee(cUObject *object, bool lineOfSight) {
+ 	if (!object || !_player) {
+ 		return false;
+ 	} else {
+ 		return _player->canSee(object, lineOfSight);
+ 	}
+ }

Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** uosocket.h	28 Jan 2004 02:18:14 -0000	1.100
--- uosocket.h	3 Feb 2004 20:47:34 -0000	1.101
***************
*** 223,226 ****
--- 223,231 ----
  	void log( const QString &message );
  
+ 	bool canSee(cUOSocket *socket, bool lineOfSight = false);
+ 	bool canSee(P_ITEM item, bool lineOfSight = false);
+ 	bool canSee(P_CHAR character, bool lineOfSight = false);
+ 	bool canSee(cUObject *object, bool lineOfSight = false);
+ 
  	void allowMove( Q_UINT8 sequence );
  	void denyMove( Q_UINT8 sequence );

[wpdev-commits] wolfpack basechar.cpp,1.61,1.62 basechar.h,1.43,1.44 npc.cpp,1.62,1.63 npc.h,1.33,1.34 player.cpp,1.62,1.63 player.h,1.28,1.29

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

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

Modified Files:
	basechar.cpp basechar.h npc.cpp npc.h player.cpp player.h 
Log Message:
Added cansee to all important classes and updated most parts of the code where a visibility check has to be made.

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** basechar.cpp	3 Feb 2004 18:13:06 -0000	1.61
--- basechar.cpp	3 Feb 2004 20:47:34 -0000	1.62
***************
*** 2071,2085 ****
  
  	P_CHAR pKiller = dynamic_cast<P_CHAR>(source);
- 	P_ITEM pTool = dynamic_cast<P_ITEM>(source);
  
! 	// If we were killed by some sort of tool (explosion potions)
! 	// the owner is responsible for the murder
! 	if (pTool && pTool->owner()) {
! 		pKiller = pTool->owner();
  	}
  
  	// Only trigger the reputation system if we can find someone responsible 
  	// for the murder
! 	if (pKiller) {
  		// Only award karma and fame in unguarded areas
  		if (!pKiller->inGuardedArea()) {
--- 2071,2089 ----
  
  	P_CHAR pKiller = dynamic_cast<P_CHAR>(source);
  
! 	// Were we killed by some sort of item?
! 	if (source && !pKiller) {
! 		P_ITEM pTool = dynamic_cast<P_ITEM>(source);
! 
! 		// If we were killed by some sort of tool (explosion potions)
! 		// the owner is responsible for the murder
! 		if (pTool && pTool->owner()) {
! 			pKiller = pTool->owner();
! 		}
  	}
  
  	// Only trigger the reputation system if we can find someone responsible 
  	// for the murder
! 	if (pKiller && pKiller == this) {
  		// Only award karma and fame in unguarded areas
  		if (!pKiller->inGuardedArea()) {
***************
*** 2114,2135 ****
  	// Fame is reduced by 10% upon death
  	fame_ *= 0.90;
- 	
  
  	// Create the corpse
  	cCorpse *corpse = 0;
- 	bool summoned = false;
- 
  	P_ITEM backpack = getBackpack();
  	P_NPC npc = dynamic_cast<P_NPC>(this);
  	P_PLAYER player = dynamic_cast<P_PLAYER>(this);
  
  	if (player) {
  		player->unmount();
  	}
! 
! 	if (npc && npc->summoned()) {
! 		summoned = true;
! 	}
! 
  	cCharBaseDef *basedef = BaseDefManager::instance()->getCharBaseDef(bodyID_);
  
--- 2118,2134 ----
  	// Fame is reduced by 10% upon death
  	fame_ *= 0.90;
  
  	// Create the corpse
  	cCorpse *corpse = 0;
  	P_ITEM backpack = getBackpack();
  	P_NPC npc = dynamic_cast<P_NPC>(this);
  	P_PLAYER player = dynamic_cast<P_PLAYER>(this);
  
+ 	bool summoned = npc && npc->summoned();
+ 
  	if (player) {
  		player->unmount();
  	}
! 	
  	cCharBaseDef *basedef = BaseDefManager::instance()->getCharBaseDef(bodyID_);
  
***************
*** 2215,2228 ****
  	}
  
! 	// Create Loot
  	if (npc && !npc->lootList().isEmpty()) {
! 		
  	}
  
  	// Summoned monsters simply disappear
! 	if (summoned) {
! 		// Display a nice smoke puff where we disappear
  
! 		onDeath(source, corpse);
  		cCharStuff::DeleteChar(this);
  		return true;
--- 2214,2242 ----
  	}
  
! 	// Create Loot for NPcs
  	if (npc && !npc->lootList().isEmpty()) {
! 		QStringList lootlist = DefManager->getList(npc->lootList());
! 
! 		QStringList::const_iterator it;
! 		for (it = lootlist.begin(); it != lootlist.end(); ++it) {
! 			P_ITEM loot = cItem::createFromScript(*it);
! 
! 			if (loot) {
! 				if (corpse) {
! 					corpse->addItem(loot);
! 				} else {
! 					loot->moveTo(pos_);
! 					loot->update();
! 				}
! 			}
! 		}
  	}
  
  	// Summoned monsters simply disappear
! 	if (summoned) {		
! 		soundEffect(0x1fe);
! 		pos_.effect(0x3735, 10, 30);
  
! 		onDeath(source, 0);
  		cCharStuff::DeleteChar(this);
  		return true;
***************
*** 2242,2249 ****
  	
  	for( cUOSocket *mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() ) {
! 		if (mSock->player() && mSock->player()->inRange( this, mSock->player()->visualRange())) {			
! 			mSock->send(&dAction);
! 			
  			if (mSock->player() != this) {
  				mSock->send(&rObject);
  			}
--- 2256,2262 ----
  	
  	for( cUOSocket *mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() ) {
! 		if (mSock->player() && mSock->player()->inRange( this, mSock->player()->visualRange())) {
  			if (mSock->player() != this) {
+ 				mSock->send(&dAction);
  				mSock->send(&rObject);
  			}
***************
*** 2276,2277 ****
--- 2289,2358 ----
  	return true;
  }
+ 
+ bool cBaseChar::canSee(cUObject *object, bool lineOfSight) {
+ 	P_ITEM item = dynamic_cast<P_ITEM>(object);
+ 
+ 	if (item) {
+ 		return canSee(item, lineOfSight);
+ 	}
+ 
+ 	P_CHAR character = dynamic_cast<P_CHAR>(object);
+ 
+ 	if (character) {
+ 		return canSee(character, lineOfSight);
+ 	}
+ 
+ 	return false;
+ }
+ 
+ bool cBaseChar::canSeeChar(P_CHAR character, bool lineOfSight) {
+ 	if (!character || character->free) {
+ 		return false;
+ 	}
+ 
+ 	if (character->isInvisible() || character->isHidden()) {
+ 		return false;
+ 	}
+ 
+ 	if (character->isDead()) {
+ 		// Only NPCs with spiritspeak >= 1000 can see dead people
+ 		// or if the AI overrides it
+ 		if (!character->isAtWar() && skillValue(SPIRITSPEAK) < 1000) {
+ 			return false;
+ 		}
+ 	}
+ 
+ 	// Check distance
+ 	if (pos_.distance(character->pos()) > VISRANGE) {
+ 		return false;
+ 	}
+ 
+ 	return true;
+ }
+ 
+ bool cBaseChar::canSeeItem(P_ITEM item, bool lineOfSight) {
+ 	if (!item) {
+ 		return false;
+ 	}
+ 
+ 	if (item->visible() == 2) {
+ 		return false;
+ 	} else if (item->visible() == 1 && item->owner() != this) {
+ 		return false;
+ 	}
+ 
+ 	// Check for container
+ 	if (item->container()) {
+ 		return canSee(item->container(), lineOfSight);
+ 	} else {
+ 		if (pos_.distance(item->pos()) > VISRANGE) {
+ 			return false;
+ 		}
+ 
+ 		if (lineOfSight && !pos_.lineOfSight(item->pos())) {
+ 			return false;
+ 		}
+ 	}
+ 
+ 	return true;
+ }

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** basechar.h	3 Feb 2004 18:13:17 -0000	1.43
--- basechar.h	3 Feb 2004 20:47:34 -0000	1.44
***************
*** 103,106 ****
--- 103,110 ----
  	virtual uchar notoriety( P_CHAR pChar ) = 0; // Gets the notoriety towards another char
  
+ 	bool canSee(cUObject *object, bool lineOfSight = false);
+ 	virtual bool canSeeChar(P_CHAR character, bool lineOfSight = false);
+ 	virtual bool canSeeItem(P_ITEM item, bool lineOfSight = false);
+ 
  	/*!
  		Kills the character.

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** npc.cpp	3 Feb 2004 18:13:17 -0000	1.62
--- npc.cpp	3 Feb 2004 20:47:34 -0000	1.63
***************
*** 239,256 ****
  void cNPC::update( bool excludeself )
  {
! 	cUOTxUpdatePlayer* updatePlayer = new cUOTxUpdatePlayer();
! 	updatePlayer->fromChar( this );
! 
! 	for( cUOSocket *mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
! 	{
! 		P_PLAYER pChar = mSock->player();
  
! 		if( pChar && pChar->socket() && pChar->inRange( this, pChar->visualRange() ) )
! 		{
! 			updatePlayer->setHighlight( notoriety( pChar ) );
! 			mSock->send( new cUOTxUpdatePlayer( *updatePlayer ) );
  		}
  	}
- 	delete updatePlayer;
  }
  
--- 239,251 ----
  void cNPC::update( bool excludeself )
  {
! 	cUOTxUpdatePlayer update;
! 	update.fromChar(this);
  
! 	for (cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next()) {
! 		if (socket->canSee(this)) {
! 			update.setHighlight(notoriety(socket->player()));
! 			socket->send(&update);
  		}
  	}
  }
  
***************
*** 262,298 ****
  		return;
  
! 	cUOTxRemoveObject rObject;
! 	rObject.setSerial( serial() );
  
  	cUOTxDrawChar drawChar;
! 	drawChar.fromChar( this );
! 
! 	cUOSocket *mSock;
! 
! 	for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
! 	{
! 		P_PLAYER pChar = mSock->player();
! 
! 		if( !pChar )
! 			continue;
! 
! 		if( pChar->dist( this ) > pChar->visualRange() )
! 			continue;
! 
! 		if( clean )
! 			mSock->send( &rObject );
! 
! 		// We are hidden (or dead and not visible)
! 		if( ( isHidden() || ( isDead() && !isAtWar() ) ) && !pChar->isGMorCounselor() )
! 			continue;
! 
! 		drawChar.setHighlight( notoriety( pChar ) );
! 
! 		sendTooltip( mSock );
! 		mSock->send( &drawChar );
  
! 		for( ItemContainer::const_iterator it = content_.begin(); it != content_.end(); ++it )
! 		{
! 			it.data()->sendTooltip( mSock );
  		}
  	}
--- 257,277 ----
  		return;
  
! 	cUOTxRemoveObject remove;
! 	remove.setSerial(serial_);
  
  	cUOTxDrawChar drawChar;
! 	drawChar.fromChar(this);
  
! 	for (cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next()) {
! 		if (socket->canSee(this)) {
! 			drawChar.setHighlight(notoriety(socket->player()));
! 			sendTooltip(socket);
! 			socket->send(&drawChar);
! 			
! 			for (ItemContainer::const_iterator it = content_.begin(); it != content_.end(); ++it) {
! 				it.data()->sendTooltip(socket);
! 			}
! 		} else if (clean) {
! 			socket->send(&remove);
  		}
  	}
***************
*** 429,433 ****
  		if( isHuman() )
  		{
! 			if( karma_ > 0 )
  				result = 0x01;
  			else
--- 408,412 ----
  		if( isHuman() )
  		{
! 			if( karma_ >= 0 )
  				result = 0x01;
  			else
***************
*** 438,445 ****
  		else
  		{
! 			if( karma_ >= 0 )
! 				return 0x03;
! 			else
! 				return 0x01;
  		}
  	}
--- 417,421 ----
  		else
  		{
! 			return 3;
  		}
  	}
***************
*** 842,846 ****
  	else SET_INT_PROPERTY( "npcmovetime", nextMoveTime_ )
  	else if (name == "summoned") {
! 		setSummoned(value.toInt() != 0);
  	} else if( name == "wandertype" )
  	{
--- 818,823 ----
  	else SET_INT_PROPERTY( "npcmovetime", nextMoveTime_ )
  	else if (name == "summoned") {
! 		setSummoned(value.toInt() == 1);
! 		return 0;
  	} else if( name == "wandertype" )
  	{

Index: npc.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** npc.h	3 Feb 2004 18:13:17 -0000	1.33
--- npc.h	3 Feb 2004 20:47:34 -0000	1.34
***************
*** 606,612 ****
  inline void cNPC::setSummoned(bool data) {
  	if (data) {
- 		additionalFlags_ &= ~0x01;
- 	} else {
  		additionalFlags_ |= 0x01;
  	}
  	changed_ = true;
--- 606,612 ----
  inline void cNPC::setSummoned(bool data) {
  	if (data) {
  		additionalFlags_ |= 0x01;
+ 	} else {		
+ 		additionalFlags_ &= ~0x01;
  	}
  	changed_ = true;

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** player.cpp	3 Feb 2004 18:13:17 -0000	1.62
--- player.cpp	3 Feb 2004 20:47:34 -0000	1.63
***************
*** 187,213 ****
  
  // Update flags etc.
! void cPlayer::update( bool excludeself )
! {
! 	cUOTxUpdatePlayer* updatePlayer = new cUOTxUpdatePlayer();
! 	updatePlayer->fromChar( this );
! 
! 	for( cUOSocket *mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
! 	{
! 		P_PLAYER pChar = mSock->player();
  
! 		if( pChar && pChar->socket() && pChar->inRange( this, pChar->visualRange() ) )
! 		{
! 			updatePlayer->setHighlight( notoriety( pChar ) );
! 			mSock->send( new cUOTxUpdatePlayer( *updatePlayer ) );
  		}
  	}
  
! 	delete updatePlayer;
! 
! 	if( !excludeself && socket_ )
! 	{
! 		cUOTxDrawPlayer drawPlayer;
! 		drawPlayer.fromChar( this );
! 		socket_->send( &drawPlayer );
  	}
  }
--- 187,203 ----
  
  // Update flags etc.
! void cPlayer::update(bool excludeself) {
! 	cUOTxUpdatePlayer update;
! 	update.fromChar(this);
  
! 	for (cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next()) {
! 		if (socket != socket_ && socket->canSee(this)) {
! 			update.setHighlight(notoriety(socket->player()));
! 			socket->send(&update);
  		}
  	}
  
! 	if (!excludeself && socket_) {
! 		socket_->updatePlayer();
  	}
  }
***************
*** 216,267 ****
  void cPlayer::resend( bool clean, bool excludeself )
  {
! 	if( socket_ && !excludeself )
  		socket_->resendPlayer();
  
! 	cUOTxRemoveObject rObject;
! 	rObject.setSerial( serial() );
  
  	cUOTxDrawChar drawChar;
! 	drawChar.fromChar( this );
! 
! 	cUOSocket *mSock;
  
! 	for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
! 	{
  		// Don't send such a packet to ourself
! 		if( mSock == socket_ )
! 		{
! 			sendTooltip( mSock );
! 			continue;
! 		}
! 
! 		P_PLAYER pChar = mSock->player();
! 
! 		if( !pChar || !pChar->account() )
! 			continue;
! 
! 		if( pChar->dist( this ) > pChar->visualRange() )
! 			continue;
! 
! 		if( clean )
! 			mSock->send( &rObject );
! 
! 		// We are logged out and the object can't see us.
! 		if( !socket_  && !pChar->account()->isAllShow() )
! 			continue;
! 
! 		// We are hidden (or dead and not visible)
! 		if( ( isHidden() || ( isDead() && !isAtWar() ) ) && !pChar->isGMorCounselor() )
! 			continue;
! 
! 		drawChar.setHighlight( notoriety( pChar ) );
! 
! 		sendTooltip( mSock );
! 		mSock->send( &drawChar );
! 
! 		// Send equipment of other players as well
! 		for( ItemContainer::const_iterator it = content_.begin(); it != content_.end(); ++it )
! 		{
! 			it.data()->sendTooltip( mSock );
  		}
  	}
--- 206,236 ----
  void cPlayer::resend( bool clean, bool excludeself )
  {
! 	if (socket_ && !excludeself) {
  		socket_->resendPlayer();
+ 	}
  
! 	cUOTxRemoveObject remove;
! 	remove.setSerial(serial());
  
  	cUOTxDrawChar drawChar;
! 	drawChar.fromChar(this);
  
! 	for (cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next()) {
  		// Don't send such a packet to ourself
! 		if (socket == socket_) {
! 			sendTooltip(socket);
! 		} else {
! 			if (socket->canSee(this)) {
! 				drawChar.setHighlight(notoriety(socket->player()));
! 				socket->send(&drawChar);
! 				sendTooltip(socket);
! 	            
! 				// Send equipment tooltips to other players as well
! 				for (ItemContainer::const_iterator it = content_.begin(); it != content_.end(); ++it) {
! 					it.data()->sendTooltip(socket);
! 				}
! 			} else if (clean) {
! 				socket->send(&remove);
! 			}
  		}
  	}
***************
*** 1454,1455 ****
--- 1423,1507 ----
  	log( LOG_NOTICE, string );
  }
+ 
+ bool cPlayer::canSeeChar(P_CHAR character, bool lineOfSight) {
+ 	if (!character || character->free) {
+ 		return false;
+ 	}
+ 
+ 	// Check distance
+ 	if (pos_.distance(character->pos()) > visualRange()) {
+ 		return false;
+ 	}
+ 
+ 	// By default we are mor privileged than our target if we are a gm
+ 	bool privileged = isGM();
+ 
+ 	P_PLAYER player = dynamic_cast<P_PLAYER>(character);
+ 	if (player) {
+ 		// Disconnected players are invisible unless allShow is active for the current account
+ 		if (!player->socket() && (!account_ || !account_->isAllShow())) {
+ 			return false;
+ 		}
+ 
+ 		// Determine if we are more privileged than the target
+ 		if (player->account()) {
+ 			if (!account_ || player->account()->rank() > account_->rank()) {
+ 				privileged = false;
+ 			}
+ 		}
+ 	}
+ 
+ 	// Hidden and invisible characters are invisible unless we are more privileged than them
+ 	if (character->isInvisible() || character->isHidden()) {
+ 		if (!privileged) {
+ 			return false;
+ 		}
+ 	}
+ 
+ 	// Dead characters are invisible unless we have more than 100.0% spirit speak 
+ 	// or are privileged...
+ 	if (character->isDead()) {
+ 		// Only NPCs with spiritspeak >= 1000 can see dead people
+ 		// or if the AI overrides it
+ 		if (!character->isAtWar() && skillValue(SPIRITSPEAK) < 1000) {
+ 			if (!privileged) {
+ 				return false;
+ 			}
+ 		}
+ 	}
+ 
+ 	return true;
+ }
+ 
+ bool cPlayer::canSeeItem(P_ITEM item, bool lineOfSight) {
+ 	if (!item) {
+ 		return false;
+ 	}
+ 
+ 	if (item->visible() == 2) {
+ 		if (!isGM()) {
+ 			return false;
+ 		}
+ 	} else if (item->visible() == 1 && item->owner() != this) {
+ 		if (!isGM()) {
+ 			return false;
+ 		}
+ 	}
+ 
+ 	// Check for container
+ 	if (item->container()) {
+ 		return cBaseChar::canSee(item->container(), lineOfSight);
+ 	} else {
+ 		if (pos_.distance(item->pos()) > VISRANGE) {
+ 				return false;
+ 		}
+ 
+ 		if (lineOfSight && !pos_.lineOfSight(item->pos())) {
+ 			if (!isGM()) {
+ 				return false;
+ 			}
+ 		}
+ 	}
+ 
+ 	return true;
+ }

Index: player.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** player.h	3 Feb 2004 18:13:17 -0000	1.28
--- player.h	3 Feb 2004 20:47:34 -0000	1.29
***************
*** 169,172 ****
--- 169,174 ----
  	void addPet( P_NPC pPet, bool noOwnerChange = false );	
  	void removePet( P_NPC pPet, bool noOwnerChange = false );
+ 	bool canSeeChar(P_CHAR character, bool lineOfSight = false);
+ 	bool canSeeItem(P_ITEM item, bool lineOfSight = false);
  
  private:

[wpdev-commits] wolfpack/python char.cpp,1.121,1.122

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

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

Modified Files:
	char.cpp 
Log Message:
Added cansee to all important classes and updated most parts of the code where a visibility check has to be made.

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** char.cpp	3 Feb 2004 18:13:18 -0000	1.121
--- char.cpp	3 Feb 2004 20:47:34 -0000	1.122
***************
*** 1593,1648 ****
  	unsigned int touch = 1;
  
! 	if( !PyArg_ParseTuple( args, "O|i:char.cansee( [char,item,pos], [touch] )", &object, &touch ) )
  		return 0;
  
! 	Coord_cl &pos = Coord_cl::null;
  
  	// Item
! 	if( checkWpItem( object ) )
! 	{
! 		P_ITEM pItem = getWpItem( object );
! 
! 		// Invisibility Check
! 		if( ( ( pItem->visible() == 1 && pItem->owner() != self->pChar ) || pItem->visible() == 2 ) )
! 		{
! 			P_PLAYER pPlayer = dynamic_cast< P_PLAYER >( self->pChar );
! 			if( !pPlayer || !pPlayer->isGM() )
! 				return PyFalse;
! 		}
! 
! 		pos = pItem->pos();
! 	}
  
  	// Char
! 	else if( checkWpChar( object ) )
! 	{
! 		P_CHAR pChar = getWpChar( object );
! 
! 		if( pChar->isHidden() || pChar->isInvisible() )
! 		{
! 			P_PLAYER pPlayer = dynamic_cast< P_PLAYER >( self->pChar );
! 			if( !pPlayer || !pPlayer->isGM() )
! 				return PyFalse;
! 		}
! 
! 		pos = pChar->pos();
! 	}
! 
! 	// Position
! 	else if( checkWpCoord( object ) )
! 	{
! 		pos = getWpCoord( object );
! 	}
! 	else
! 	{
! 		PyErr_SetString( PyExc_RuntimeError, "Incompatible Object for char.cansee()." );
! 		return 0;
  	}
  
- 	if( pos == Coord_cl::null )
- 		return PyFalse;
- 
- 	bool result = self->pChar->pos().lineOfSight( pos, touch != 0 );
- 
  	return result ? PyTrue : PyFalse;
  }
--- 1593,1610 ----
  	unsigned int touch = 1;
  
! 	if( !PyArg_ParseTuple( args, "O|i:char.cansee( [char,item,pos], [lineofsight] )", &object, &touch ) )
  		return 0;
  
! 	bool result = false;
  
  	// Item
! 	if (checkWpItem(object)) {
! 		result = self->pChar->canSee(getWpItem(object), touch != 0);
  
  	// Char
! 	} else if (checkWpChar(object)) {
! 		result = self->pChar->canSee(getWpChar(object), touch != 0);
  	}
  
  	return result ? PyTrue : PyFalse;
  }
***************
*** 1729,1735 ****
  	{ "disturb",		(getattrofunc)wpChar_disturb,			METH_VARARGS, "Disturbs whatever this character is doing right now." },
  	{ "canreach",		(getattrofunc)wpChar_canreach,			METH_VARARGS, "Checks if this character can reach a certain object." },
  	{ "notoriety",		(getattrofunc)wpChar_notoriety,			METH_VARARGS, "Returns the notoriety of a character toward another character." },
  	{ "canpickup",		(getattrofunc)wpChar_canpickup,			METH_VARARGS, NULL },
- 	{ "cansee",			(getattrofunc)wpChar_cansee,			METH_VARARGS, NULL },
  	{ "lightning",		(getattrofunc)wpChar_lightning,			METH_VARARGS, NULL },
  	{ "additem",		(getattrofunc)wpChar_additem,			METH_VARARGS, "Creating item on specified layer."},
--- 1691,1697 ----
  	{ "disturb",		(getattrofunc)wpChar_disturb,			METH_VARARGS, "Disturbs whatever this character is doing right now." },
  	{ "canreach",		(getattrofunc)wpChar_canreach,			METH_VARARGS, "Checks if this character can reach a certain object." },
+ 	{ "cansee",			(getattrofunc)wpChar_cansee,			METH_VARARGS, "Checks if the character can see a specific object." },
  	{ "notoriety",		(getattrofunc)wpChar_notoriety,			METH_VARARGS, "Returns the notoriety of a character toward another character." },
  	{ "canpickup",		(getattrofunc)wpChar_canpickup,			METH_VARARGS, NULL },
  	{ "lightning",		(getattrofunc)wpChar_lightning,			METH_VARARGS, NULL },
  	{ "additem",		(getattrofunc)wpChar_additem,			METH_VARARGS, "Creating item on specified layer."},

[wpdev-commits] xmlscripts/scripts tooltip.py,1.13,1.14

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

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

Modified Files:
	tooltip.py 
Log Message:
Fixed invisibility of items and rewrote cItem::update

Index: tooltip.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/tooltip.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tooltip.py	22 Jan 2004 03:51:22 -0000	1.13
--- tooltip.py	3 Feb 2004 21:47:38 -0000	1.14
***************
*** 16,67 ****
  
  def onShowTooltip( sender, target, tooltip ):  
  
! 	if target.isitem():
! 		name = target.getname()
!             
! 		if isarmor ( target ):
! 			armor( target, tooltip )
! 	
! 		elif ishat( target ):
! 			hat( target, tooltip )
! 	
! 		elif isshield( target ):
! 			shield( target, tooltip )
! 	         
! 		elif isweapon( target ):
! 			weapon( target, tooltip )
! 	                 
! 		else:
! 			if target.name == '#' or target.name == '':
! 				if target.amount > 1:
! 					tooltip.add( 1050045, " \t#" + str( 0xF9060 + target.id ) + "\t`s: " + str( target.amount ) )
! 				else:			
! 					tooltip.add( 0xF9060 + target.id, '' )
! 				
! 			else:
! 				if target.amount > 1:
! 					tooltip.add( 1050045, " \t" + name + "\t: " + str( target.amount ) )
! 				else:
! 					tooltip.add( 1050045, " \t" + name + "\t " )
! 	
! 			modifiers( target, tooltip )
  
! 			# If the character is a gm and the targetted item has a lock, display the lock id
! 			if sender.gm and 'lock' in target.events:
! 				lock = 'None'
          
! 				if target.hastag('lock'):
! 					lock = str(target.gettag('lock'))
          
! 				tooltip.add(1050045, " \t" + "Lock: " + lock + "\t ")
! 		
! 			if isspellbook( target ):
! 				tooltip.add( 1042886, str( target.spellscount() ) )
! 	else:
! 		name = target.name
! 		tooltip.add( 1050045, " \t" + name + "\t " )
  
! 	tooltip.send( sender )
! 	return 1
  
  def armor( target, tooltip ):
--- 16,69 ----
  
  def onShowTooltip( sender, target, tooltip ):  
+   if target.isitem():
+     name = target.getname()
  
!     if isarmor ( target ):
!     	armor( target, tooltip )
!     
!     elif ishat( target ):
!     	hat( target, tooltip )
!     
!     elif isshield( target ):
!     	shield( target, tooltip )
!            
!     elif isweapon( target ):
!     	weapon( target, tooltip )
!                    
!     else:
!       if target.name == '#' or target.name == '':
!       	if target.amount > 1:
!       		tooltip.add( 1050045, " \t#" + str( 0xF9060 + target.id ) + "\t`s: " + str( target.amount ) )
!       	else:			
!       		tooltip.add( 0xF9060 + target.id, '' )
!       	
!       else:
!       	if target.amount > 1:
!       		tooltip.add( 1050045, " \t" + name + "\t: " + str( target.amount ) )
!       	else:
!       		tooltip.add( 1050045, " \t" + name + "\t " )
  
!       if target.visible == 0 and sender.gm:
!           tooltip.add(3000507, "")
!       
!       modifiers( target, tooltip )
!       
!       # If the character is a gm and the targetted item has a lock, display the lock id
!       if sender.gm and 'lock' in target.events:
!       	lock = 'None'
          
!       	if target.hastag('lock'):
!       		lock = str(target.gettag('lock'))
          
!       	tooltip.add(1050045, " \t" + "Lock: " + lock + "\t ")
!       
!       if isspellbook( target ):
!       	tooltip.add( 1042886, str( target.spellscount() ) )
!   else:
!     name = target.name
!     tooltip.add( 1050045, " \t" + name + "\t " )
  
!   tooltip.send( sender )
!   return 1
  
  def armor( target, tooltip ):

[wpdev-commits] wolfpack items.cpp,1.371,1.372 player.cpp,1.63,1.64

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

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

Modified Files:
	items.cpp player.cpp 
Log Message:
Fixed invisibility of items and rewrote cItem::update

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.371
retrieving revision 1.372
diff -C2 -d -r1.371 -r1.372
*** items.cpp	3 Feb 2004 20:09:31 -0000	1.371
--- items.cpp	3 Feb 2004 21:23:00 -0000	1.372
***************
*** 1441,1534 ****
  
  // This either sends a ground-item or a backpack item
! void cItem::update( cUOSocket *mSock )
  {
! 	if( free )
! 	{
! 		removeFromView( false );
  		return;
  	}
  
  	// Items on Ground
! 	if( isInWorld() )
! 	{
  		// we change the packet during iteration, so we have to
  		// recompress it
! 		cUOTxSendItem* sendItem = new cUOTxSendItem();
! 		sendItem->setSerial( serial() );
! 		sendItem->setId( id() );
! 		sendItem->setAmount( amount() );
! 		sendItem->setColor( color() );
! 		sendItem->setCoord( pos() );
! 		sendItem->setDirection( direction() );
! 
! 		if( mSock )
! 		{
! 			P_PLAYER pChar = mSock->player();
! 
! 			// Only send to sockets in range
! 			if( !pChar || !pChar->account() || ( pChar->dist( this ) > pChar->visualRange() ) )
! 				return;
! 
! 			// Completely invisible
! 			if( ( visible_ == 2 ) && !pChar->isGM() )
! 				return;
! 
! 			// Visible to owners and GMs only
! 			else if( ( visible_ == 1 ) && !pChar->Owns( this ) && !pChar->isGM() )
! 				return;
! 
! 			if( isAllMovable() )
! 				sendItem->setFlags( 0x20 );
! 
! 			else if( pChar->account()->isAllMove() )
! 				sendItem->setFlags( 0x20 );
! 
! 			else if( isOwnerMovable() && pChar->Owns( this ) )
! 				sendItem->setFlags( 0x20 );
! 
! 			if( ( visible() > 0 ) && !pChar->Owns( this ) )
! 				sendItem->setFlags( sendItem->flags() | 0x80 );
! 
! 			// TODO: Insert code for view-multi-as-icon & view-lightsource-as-candle
  
! 			mSock->send( sendItem );
! 			sendTooltip( mSock );
! 		}
! 		else
! 		{
! 			for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
! 			{
! 				P_PLAYER pChar = mSock->player();
  
! 				// Only send to sockets in range
! 				if( !pChar || !pChar->account() || ( pChar->dist( this ) > pChar->visualRange() ) )
! 					continue;
  
! 				// Completely invisible
! 				if( ( visible() == 2 ) && !pChar->isGM() )
! 					continue;
  
! 				// Visible to owners and GMs only
! 				else if( ( visible() == 1 ) && !pChar->Owns( this ) && !pChar->isGM() )
! 					continue;
  
! 				cUOTxSendItem sockSendItem( *sendItem );
  
! 				if( isAllMovable() )
! 					sockSendItem.setFlags( 0x20 );
! 				else if( pChar->account()->isAllMove() )
! 					sockSendItem.setFlags( 0x20 );
! 				else if( ( isOwnerMovable() || isLockedDown() ) && pChar->Owns( this ) )
! 					sockSendItem.setFlags( 0x20 );
  
! 				if( ( visible() > 0 ) && !pChar->Owns( this ) )
! 					sockSendItem.setFlags( sockSendItem.flags() | 0x80 );
  
! 				// TODO: Insert code for view-multi-as-icon & view-lightsource-as-candle
  
! 				mSock->send( &sockSendItem );
! 				sendTooltip( mSock );
! 			}
! 			delete sendItem;
  		}
  	}
--- 1441,1510 ----
  
  // This either sends a ground-item or a backpack item
! void cItem::update(cUOSocket *singlesocket)
  {
! 	if (free) {
  		return;
  	}
  
  	// Items on Ground
! 	if (!container_) {
  		// we change the packet during iteration, so we have to
  		// recompress it
! 		cUOTxSendItem sendItem;
! 		sendItem.setSerial(serial_);
! 		sendItem.setId(id_);
! 		sendItem.setAmount(amount_);
! 		sendItem.setColor(color_);
! 		sendItem.setCoord(pos_);
! 		sendItem.setDirection(dir_);
  
! 		// Send to one person only
! 		if (!singlesocket) {
! 			for (cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next()) {
! 				if (socket->canSee(this)) {
! 					P_PLAYER player = socket->player();
! 					unsigned char flags = 0;
! 					cUOTxSendItem packetCopy(sendItem);
  
! 					// Always Movable Flag
! 					if (isAllMovable()) {
! 						flags |= 0x20;
! 					} else if (player->account()->isAllMove()) {
! 						flags |= 0x20;
! 					} else if (isOwnerMovable() && player->Owns(this)) {
! 						flags |= 0x20;
! 					}
  
! 					if (visible_ != 0) {
! 						flags |= 0x80;
! 					}
  
! 					packetCopy.setFlags(flags);
  
! 					socket->send(&packetCopy);
! 					sendTooltip(socket);
! 				}
! 			}
! 		} else if (singlesocket && singlesocket->canSee(this)) {
! 			P_PLAYER player = singlesocket->player();
! 			unsigned char flags = 0;
  
! 			// Always Movable Flag
! 			if (isAllMovable()) {
! 				flags |= 0x20;
! 			} else if (player->account()->isAllMove()) {
! 				flags |= 0x20;
! 			} else if (isOwnerMovable() && player->Owns(this)) {
! 				flags |= 0x20;
! 			}
  
! 			if (visible_ != 0) {
! 				flags |= 0x80;
! 			}
  
! 			sendItem.setFlags(flags);
  
! 			singlesocket->send(&sendItem);
! 			sendTooltip(singlesocket);
  		}
  	}
***************
*** 1537,1582 ****
  	{
  		cUOTxCharEquipment equipItem;
! 		equipItem.fromItem( this );
! 		P_CHAR pOwner = dynamic_cast<P_CHAR>( container_ );
! 
! 		if( !pOwner )
! 			return;
! 
! 		for( cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next() )
! 		{
! 			P_PLAYER pChar = socket->player();
! 
! 			// Only send to sockets in range
! 			if( !pChar || !pChar->inRange( pOwner, pChar->visualRange() ) )
! 				continue;
  
! 			socket->send( &equipItem );
! 			sendTooltip( socket );
  		}
! 	}
  	// items in containers
! 	else if( container_ && container_->isItem() )
! 	{
  		cUOTxAddContainerItem contItem;
! 		contItem.fromItem( this );
! 
! 		P_ITEM iCont = getOutmostItem();
! 		cUObject *oCont = iCont;
! 
! 		if( iCont && iCont->container() && iCont->container()->isChar() )
! 			oCont = dynamic_cast<P_CHAR>( iCont->container() );
! 
! 		if( !oCont )
! 			return;
! 
! 		for( cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next() )
! 		{
! 			P_PLAYER pChar = socket->player();
! 
! 			if( !pChar || ( pChar->dist( oCont ) > pChar->visualRange() ) )
! 				continue;
  
! 			socket->send( &contItem );
! 			sendTooltip( socket );
  		}
  	}
--- 1513,1545 ----
  	{
  		cUOTxCharEquipment equipItem;
! 		equipItem.fromItem(this);
  
! 		if (singlesocket) {
! 			singlesocket->send(&equipItem);
! 			sendTooltip(singlesocket);
! 		} else {
! 			for (cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next()) {
! 				if (socket->canSee(this)) {
! 					socket->send(&equipItem);
! 					sendTooltip(socket);
! 				}
! 			}
  		}
! 	
  	// items in containers
! 	} else if (container_ && container_->isItem()) {
  		cUOTxAddContainerItem contItem;
! 		contItem.fromItem(this);
  
! 		if (singlesocket) {
! 			singlesocket->send(&contItem);
! 			sendTooltip(singlesocket);
! 		} else {
! 			for (cUOSocket *socket = cNetwork::instance()->first(); socket; socket = cNetwork::instance()->next()) {
! 				if (socket->canSee(this)) {
! 					socket->send(&contItem);
! 					sendTooltip(socket);
! 				}
! 			}
  		}
  	}

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** player.cpp	3 Feb 2004 20:47:34 -0000	1.63
--- player.cpp	3 Feb 2004 21:23:00 -0000	1.64
***************
*** 1491,1495 ****
  	// Check for container
  	if (item->container()) {
! 		return cBaseChar::canSee(item->container(), lineOfSight);
  	} else {
  		if (pos_.distance(item->pos()) > VISRANGE) {
--- 1491,1502 ----
  	// Check for container
  	if (item->container()) {
! 		P_ITEM container = dynamic_cast<P_ITEM>(item->container());
! 
! 		if (container) {
! 			return canSeeItem(container, lineOfSight);
! 		} else {
! 			P_CHAR character = dynamic_cast<P_CHAR>(item->container());
! 			return canSeeChar(character, lineOfSight);
! 		}		
  	} else {
  		if (pos_.distance(item->pos()) > VISRANGE) {

[wpdev-commits] xmlscripts/scripts/skills carpentry.py,1.3,1.4

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

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

Modified Files:
	carpentry.py 
Log Message:
Naddel Fix

Index: carpentry.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/carpentry.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** carpentry.py	22 Apr 2003 09:28:41 -0000	1.3
--- carpentry.py	3 Feb 2004 00:10:43 -0000	1.4
***************
*** 309,313 ****
  	# interpret the skill/resource data
  	item_name = char.gettag( 'skills' )
! 	if not skills.haskey( item_name ):
  		return
  	use_skills = skills[ item_name ][ 0 ].keys()
--- 309,313 ----
  	# interpret the skill/resource data
  	item_name = char.gettag( 'skills' )
! 	if not skills.has_key( item_name ):
  		return
  	use_skills = skills[ item_name ][ 0 ].keys()

[wpdev-commits] xmlscripts/definitions/npcs/humans/vendors alchemist.xml,1.1,1.2 architect.xml,1.1,1.2 armorer.xml,1.1,1.2 artist.xml,1.1,1.2 baker.xml,1.1,1.2 barber.xml,1.2,1.3 blacksmith.xml,1.1,1.2 bowyer.xml,1.1,1.2 butcher.xml,1.1,1.2 carpenter.xml,1.1,1.2 cobbler.xml,1.1,1.2 cook.xml,1.1,1.2 fishermen.xml,1.1,1.2 healer.xml,1.1,1.2 herbalist.xml,1.1,1.2 innkeeper.xml,1.1,1.2 jeweler.xml,1.1,1.2 leatherworker.xml,1.1,1.2 mage.xml,1.1,1.2 provisioner.xml,1.1,1.2 shipwright.xml,1.1,1.2 spinner.xml,1.1,1.2 stablemaster.xml,1.1,1.2 tailor.xml,1.1,1.2 tanner.xml,1.1,1.2 tavernkeeper.xml,1.1,1.2 tinker.xml,1.1,1.2 veterinarian.xml,1.1,1.2 weaponsmith.xml,1.1,1.2 weaver.xml,1.1,1.2

[<thi...@us...>]

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

Modified Files:
	alchemist.xml architect.xml armorer.xml artist.xml baker.xml 
	barber.xml blacksmith.xml bowyer.xml butcher.xml carpenter.xml 
	cobbler.xml cook.xml fishermen.xml healer.xml herbalist.xml 
	innkeeper.xml jeweler.xml leatherworker.xml mage.xml 
	provisioner.xml shipwright.xml spinner.xml stablemaster.xml 
	tailor.xml tanner.xml tavernkeeper.xml tinker.xml 
	veterinarian.xml weaponsmith.xml weaver.xml 
Log Message:
Made all vendors inherit from a base definition ( easier to bind menus and events

Index: alchemist.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/alchemist.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** alchemist.xml	31 Jan 2004 22:48:45 -0000	1.1
--- alchemist.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A alchemist vendor -->
  	<npc id="alchemist_male">
! 		<inherit>base_male</inherit>
  		<title>the Alchemist</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A alchemist vendor -->
  	<npc id="alchemist_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Alchemist</title>
  		<shopkeeper>
  			<restockable>
***************
*** 253,263 ****
  		</shopkeeper>
  		<category>Vendors\Alchemist (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="alchemist_female">
! 		<inherit>base_female</inherit>
  		<title>the Alchemist</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 252,260 ----
  		</shopkeeper>
  		<category>Vendors\Alchemist (Male)</category>
  	</npc>
  	
  	<npc id="alchemist_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Alchemist</title>
  		<shopkeeper>
  			<restockable>
***************
*** 499,504 ****
  		</shopkeeper>
  		<category>Vendors\Alchemist (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 496,500 ----
  		</shopkeeper>
  		<category>Vendors\Alchemist (Female)</category>
  	</npc>
  
! </definitions>

Index: architect.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/architect.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** architect.xml	31 Jan 2004 22:48:45 -0000	1.1
--- architect.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,34 ****
  	<!-- A architect vendor -->
  	<npc id="architect_male">
! 		<inherit>base_male</inherit>
  		<title>the Architect</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Architect (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="architect_female">
! 		<inherit>base_female</inherit>
  		<title>the Architect</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Architect (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,30 ----
  	<!-- A architect vendor -->
  	<npc id="architect_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Architect</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Architect (Male)</category>
  	</npc>
  	
  	<npc id="architect_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Architect</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Architect (Female)</category>
  	</npc>
  
! </definitions>

Index: armorer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/armorer.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** armorer.xml	31 Jan 2004 22:48:45 -0000	1.1
--- armorer.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A armorer vendor -->
  	<npc id="armorer_male">
! 		<inherit>base_male</inherit>
  		<title>the Armorer</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A armorer vendor -->
  	<npc id="armorer_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Armorer</title>
  		<shopkeeper>
  			<restockable>
***************
*** 109,119 ****
  		</shopkeeper>
  		<category>Vendors\Armorer (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="armorer_female">
! 		<inherit>base_female</inherit>
  		<title>the Armorer</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 108,116 ----
  		</shopkeeper>
  		<category>Vendors\Armorer (Male)</category>
  	</npc>
  	
  	<npc id="armorer_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Armorer</title>
  		<shopkeeper>
  			<restockable>
***************
*** 211,216 ****
  		</shopkeeper>
  		<category>Vendors\Armorer (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 208,212 ----
  		</shopkeeper>
  		<category>Vendors\Armorer (Female)</category>
  	</npc>
  
! </definitions>

Index: artist.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/artist.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** artist.xml	31 Jan 2004 22:48:45 -0000	1.1
--- artist.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,28 ****
  	<!-- A artist -->
  	<npc id="artist_male">
! 		<inherit>base_male</inherit>
  		<title>the Artist</title>
- 		<ai>Human_Vendor</ai>
  		<category>Vendors\Artist (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="artist_female">
! 		<inherit>base_female</inherit>
  		<title>the Artist</title>
- 		<ai>Human_Vendor</ai>
  		<category>Vendors\Artist (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,24 ----
  	<!-- A artist -->
  	<npc id="artist_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Artist</title>
  		<category>Vendors\Artist (Male)</category>
  	</npc>
  	
  	<npc id="artist_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Artist</title>
  		<category>Vendors\Artist (Female)</category>
  	</npc>
  
! </definitions>

Index: baker.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/baker.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** baker.xml	31 Jan 2004 22:48:45 -0000	1.1
--- baker.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A baker vendor -->
  	<npc id="baker_male">
! 		<inherit>base_male</inherit>
  		<title>the Baker</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A baker vendor -->
  	<npc id="baker_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Baker</title>
  		<shopkeeper>
  			<restockable>
***************
*** 69,79 ****
  		</shopkeeper>
  		<category>Vendors\Baker (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="baker_female">
! 		<inherit>base_female</inherit>
  		<title>the Baker</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 68,76 ----
  		</shopkeeper>
  		<category>Vendors\Baker (Male)</category>
  	</npc>
  	
  	<npc id="baker_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Baker</title>
  		<shopkeeper>
  			<restockable>
***************
*** 131,136 ****
  		</shopkeeper>
  		<category>Vendors\Baker (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 128,132 ----
  		</shopkeeper>
  		<category>Vendors\Baker (Female)</category>
  	</npc>
  
! </definitions>

Index: barber.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/barber.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** barber.xml	1 Feb 2004 23:29:09 -0000	1.2
--- barber.xml	2 Feb 2004 19:20:25 -0000	1.3
***************
*** 24,26 ****
  		<invulnerable />
  	</npc>
! </definitions>
\ No newline at end of file
--- 24,26 ----
  		<invulnerable />
  	</npc>
! </definitions>

Index: blacksmith.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/blacksmith.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** blacksmith.xml	31 Jan 2004 22:48:45 -0000	1.1
--- blacksmith.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A blacksmith vendor -->
  	<npc id="blacksmith_male">
! 		<inherit>base_male</inherit>
  		<title>the Blacksmith</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A blacksmith vendor -->
  	<npc id="blacksmith_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Blacksmith</title>
  		<shopkeeper>
  			<restockable>
***************
*** 145,155 ****
  		</shopkeeper>
  		<category>Vendors\blacksmith (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="blacksmith_female">
! 		<inherit>base_female</inherit>
  		<title>the Blacksmith</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 144,152 ----
  		</shopkeeper>
  		<category>Vendors\blacksmith (Male)</category>
  	</npc>
  	
  	<npc id="blacksmith_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Blacksmith</title>
  		<shopkeeper>
  			<restockable>
***************
*** 283,288 ****
  		</shopkeeper>
  		<category>Vendors\Blacksmith (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 280,284 ----
  		</shopkeeper>
  		<category>Vendors\Blacksmith (Female)</category>
  	</npc>
  
! </definitions>

Index: bowyer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/bowyer.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bowyer.xml	31 Jan 2004 22:48:45 -0000	1.1
--- bowyer.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A bowyer vendor -->
  	<npc id="bowyer_male">
! 		<inherit>base_male</inherit>
  		<title>the Bowyer</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A bowyer vendor -->
  	<npc id="bowyer_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Bowyer</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,31 ****
  		</shopkeeper>
  		<category>Vendors\Bowyer (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="bowyer_female">
! 		<inherit>base_female</inherit>
  		<title>the Bowyer</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,28 ----
  		</shopkeeper>
  		<category>Vendors\Bowyer (Male)</category>
  	</npc>
  	
  	<npc id="bowyer_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Bowyer</title>
  		<shopkeeper>
  			<restockable>
***************
*** 35,40 ****
  		</shopkeeper>
  		<category>Vendors\Bowyer (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 32,36 ----
  		</shopkeeper>
  		<category>Vendors\Bowyer (Female)</category>
  	</npc>
  
! </definitions>

Index: butcher.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/butcher.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** butcher.xml	31 Jan 2004 22:48:45 -0000	1.1
--- butcher.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,34 ****
  	<!-- A butcher vendor -->
  	<npc id="butcher_male">
! 		<inherit>base_male</inherit>
  		<title>the butcher</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Butcher (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="butcher_female">
! 		<inherit>base_female</inherit>
  		<title>the butcher</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Butcher (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,30 ----
  	<!-- A butcher vendor -->
  	<npc id="butcher_male">
! 		<inherit>vendor_male</inherit>
  		<title>the butcher</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Butcher (Male)</category>
  	</npc>
  	
  	<npc id="butcher_female">
! 		<inherit>vendor_female</inherit>
  		<title>the butcher</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Butcher (Female)</category>
  	</npc>
  
! </definitions>

Index: carpenter.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/carpenter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** carpenter.xml	31 Jan 2004 22:48:45 -0000	1.1
--- carpenter.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,34 ****
  	<!-- A carpenter vendor -->
  	<npc id="carpenter_male">
! 		<inherit>base_male</inherit>
  		<title>the Carpenter</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Carpenter (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="carpenter_female">
! 		<inherit>base_female</inherit>
  		<title>the Carpenter</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Carpenter (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,30 ----
  	<!-- A carpenter vendor -->
  	<npc id="carpenter_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Carpenter</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Carpenter (Male)</category>
  	</npc>
  	
  	<npc id="carpenter_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Carpenter</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Carpenter (Female)</category>
  	</npc>
  
! </definitions>

Index: cobbler.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/cobbler.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cobbler.xml	31 Jan 2004 22:48:45 -0000	1.1
--- cobbler.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A cobbler vendor -->
  	<npc id="cobbler_male">
! 		<inherit>base_male</inherit>
  		<title>the Cobbler</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A cobbler vendor -->
  	<npc id="cobbler_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Cobbler</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,31 ****
  		</shopkeeper>
  		<category>Vendors\Cobbler (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="cobbler_female">
! 		<inherit>base_female</inherit>
  		<title>the Cobbler</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,28 ----
  		</shopkeeper>
  		<category>Vendors\Cobbler (Male)</category>
  	</npc>
  	
  	<npc id="cobbler_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Cobbler</title>
  		<shopkeeper>
  			<restockable>
***************
*** 35,40 ****
  		</shopkeeper>
  		<category>Vendors\Cobbler (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 32,36 ----
  		</shopkeeper>
  		<category>Vendors\Cobbler (Female)</category>
  	</npc>
  
! </definitions>

Index: cook.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/cook.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cook.xml	31 Jan 2004 22:48:45 -0000	1.1
--- cook.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,34 ****
  	<!-- A cook vendor -->
  	<npc id="cook_male">
! 		<inherit>base_male</inherit>
  		<title>the Cook</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Cook (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="cook_female">
! 		<inherit>base_female</inherit>
  		<title>the Cook</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Cook (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,30 ----
  	<!-- A cook vendor -->
  	<npc id="cook_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Cook</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Cook (Male)</category>
  	</npc>
  	
  	<npc id="cook_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Cook</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Cook (Female)</category>
  	</npc>
  
! </definitions>

Index: fishermen.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/fishermen.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fishermen.xml	31 Jan 2004 22:48:45 -0000	1.1
--- fishermen.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A fisherman vendor -->
  	<npc id="fisherman_male">
! 		<inherit>base_male</inherit>
  		<title>the Fisherman</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A fisherman vendor -->
  	<npc id="fisherman_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Fisherman</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,32 ****
  		</shopkeeper>
  		<category>Vendors\Fisherman (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<!-- A fisherlady vendor -->
  	<npc id="fisherlady_female">
! 		<inherit>base_female</inherit>
  		<title>the Fisherlady</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,29 ----
  		</shopkeeper>
  		<category>Vendors\Fisherman (Male)</category>
  	</npc>
  	
  	<!-- A fisherlady vendor -->
  	<npc id="fisherlady_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Fisherlady</title>
  		<shopkeeper>
  			<restockable>
***************
*** 36,41 ****
  		</shopkeeper>
  		<category>Vendors\Fisherlady (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 33,37 ----
  		</shopkeeper>
  		<category>Vendors\Fisherlady (Female)</category>
  	</npc>
  
! </definitions>

Index: healer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/healer.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** healer.xml	31 Jan 2004 22:48:45 -0000	1.1
--- healer.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,18 ****
  	<!-- A Healer vendor -->
  	<npc id="healer_male">
! 		<inherit>base_male</inherit>
  		<bindmenu>healer_menu</bindmenu>
  		<title>the Healer</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,17 ----
  	<!-- A Healer vendor -->
  	<npc id="healer_male">
! 		<inherit>vendor_male</inherit>
  		<bindmenu>healer_menu</bindmenu>
  		<title>the Healer</title>
  		<shopkeeper>
  			<restockable>
***************
*** 50,61 ****
  		</shopkeeper>
  		<category>Vendors\Healer (Male)</category>
- 		<invulnerable />
  		<events>npc.healer</events>
  	</npc>
  	
  	<npc id="healer_female">
! 		<inherit>base_female</inherit>
  		<title>the Healer</title>
- 		<ai>Human_Vendor</ai>
  		<bindmenu>healer_menu</bindmenu>
  		<shopkeeper>
--- 49,58 ----
  		</shopkeeper>
  		<category>Vendors\Healer (Male)</category>
  		<events>npc.healer</events>
  	</npc>
  	
  	<npc id="healer_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Healer</title>
  		<bindmenu>healer_menu</bindmenu>
  		<shopkeeper>
***************
*** 94,100 ****
  		</shopkeeper>
  		<category>Vendors\Healer (Female)</category>
- 		<invulnerable />
  		<events>npc.healer</events>
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 91,96 ----
  		</shopkeeper>
  		<category>Vendors\Healer (Female)</category>
  		<events>npc.healer</events>
  	</npc>
  
! </definitions>

Index: herbalist.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/herbalist.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** herbalist.xml	31 Jan 2004 22:48:45 -0000	1.1
--- herbalist.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A herbalist vendor -->
  	<npc id="herbalist_male">
! 		<inherit>base_male</inherit>
  		<title>the Herbalist</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A herbalist vendor -->
  	<npc id="herbalist_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Herbalist</title>
  		<shopkeeper>
  			<restockable>
***************
*** 53,63 ****
  		</shopkeeper>
  		<category>Vendors\Herbalist (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="herbalist_female">
! 		<inherit>base_female</inherit>
  		<title>the Herbalist</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 52,60 ----
  		</shopkeeper>
  		<category>Vendors\Herbalist (Male)</category>
  	</npc>
  	
  	<npc id="herbalist_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Herbalist</title>
  		<shopkeeper>
  			<restockable>
***************
*** 99,104 ****
  		</shopkeeper>
  		<category>Vendors\Herbalist (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 96,100 ----
  		</shopkeeper>
  		<category>Vendors\Herbalist (Female)</category>
  	</npc>
  
! </definitions>

Index: innkeeper.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/innkeeper.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** innkeeper.xml	31 Jan 2004 22:48:45 -0000	1.1
--- innkeeper.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A innkeeper vendor -->
  	<npc id="innkeeper_male">
! 		<inherit>base_male</inherit>
  		<title>the Innkeeper</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A innkeeper vendor -->
  	<npc id="innkeeper_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Innkeeper</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,31 ****
  		</shopkeeper>
  		<category>Vendors\Innkeeper (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="innkeeper_female">
! 		<inherit>base_female</inherit>
  		<title>the Innkeeper</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,28 ----
  		</shopkeeper>
  		<category>Vendors\Innkeeper (Male)</category>
  	</npc>
  	
  	<npc id="innkeeper_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Innkeeper</title>
  		<shopkeeper>
  			<restockable>
***************
*** 35,40 ****
  		</shopkeeper>
  		<category>Vendors\Innkeeper (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 32,36 ----
  		</shopkeeper>
  		<category>Vendors\Innkeeper (Female)</category>
  	</npc>
  
! </definitions>

Index: jeweler.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/jeweler.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jeweler.xml	31 Jan 2004 22:48:45 -0000	1.1
--- jeweler.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A jeweler vendor -->
  	<npc id="jeweler_male">
! 		<inherit>base_male</inherit>
  		<title>the Jeweler</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A jeweler vendor -->
  	<npc id="jeweler_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Jeweler</title>
  		<shopkeeper>
  			<restockable>
***************
*** 181,191 ****
  		</shopkeeper>
  		<category>Vendors\Jeweler (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="jeweler_female">
! 		<inherit>base_female</inherit>
  		<title>the Jeweler</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 180,188 ----
  		</shopkeeper>
  		<category>Vendors\Jeweler (Male)</category>
  	</npc>
  	
  	<npc id="jeweler_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Jeweler</title>
  		<shopkeeper>
  			<restockable>
***************
*** 355,360 ****
  		</shopkeeper>
  		<category>Vendors\Jeweler (Femele)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 352,356 ----
  		</shopkeeper>
  		<category>Vendors\Jeweler (Femele)</category>
  	</npc>
  
! </definitions>

Index: leatherworker.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/leatherworker.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** leatherworker.xml	31 Jan 2004 22:48:45 -0000	1.1
--- leatherworker.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A leatherworker vendor -->
  	<npc id="leatherworker_male">
! 		<inherit>base_male</inherit>
  		<title>the Leatherworker</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A leatherworker vendor -->
  	<npc id="leatherworker_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Leatherworker</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,31 ****
  		</shopkeeper>
  		<category>Vendors\Leatherworker (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="leatherworker_female">
! 		<inherit>base_female</inherit>
  		<title>the Leatherworker</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,28 ----
  		</shopkeeper>
  		<category>Vendors\Leatherworker (Male)</category>
  	</npc>
  	
  	<npc id="leatherworker_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Leatherworker</title>
  		<shopkeeper>
  			<restockable>
***************
*** 35,40 ****
  		</shopkeeper>
  		<category>Vendors\Leatherworker (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 32,36 ----
  		</shopkeeper>
  		<category>Vendors\Leatherworker (Female)</category>
  	</npc>
  
! </definitions>

Index: mage.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/mage.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mage.xml	31 Jan 2004 22:48:45 -0000	1.1
--- mage.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A mage vendor -->
  	<npc id="mage_male">
! 		<inherit>base_male</inherit>
  		<title>the Mage</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A mage vendor -->
  	<npc id="mage_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Mage</title>
  		<shopkeeper>
  			<restockable>
***************
*** 125,135 ****
  		</shopkeeper>
  		<category>Vendors\Mage (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="mage_female">
! 		<inherit>base_female</inherit>
  		<title>the Mage</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 124,132 ----
  		</shopkeeper>
  		<category>Vendors\Mage (Male)</category>
  	</npc>
  	
  	<npc id="mage_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Mage</title>
  		<shopkeeper>
  			<restockable>
***************
*** 243,248 ****
  		</shopkeeper>
  		<category>Vendors\Mage (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 240,244 ----
  		</shopkeeper>
  		<category>Vendors\Mage (Female)</category>
  	</npc>
  
! </definitions>

Index: provisioner.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/provisioner.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** provisioner.xml	31 Jan 2004 22:48:45 -0000	1.1
--- provisioner.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,34 ****
  	<!-- A provisioner vendor -->
  	<npc id="provisioner_male">
! 		<inherit>base_male</inherit>
  		<title>the Provisioner</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Provisioner (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="provisioner_female">
! 		<inherit>base_female</inherit>
  		<title>the Provisioner</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Provisioner (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,30 ----
  	<!-- A provisioner vendor -->
  	<npc id="provisioner_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Provisioner</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Provisioner (Male)</category>
  	</npc>
  	
  	<npc id="provisioner_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Provisioner</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Provisioner (Female)</category>
  	</npc>
  
! </definitions>

Index: shipwright.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/shipwright.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shipwright.xml	31 Jan 2004 22:48:45 -0000	1.1
--- shipwright.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A shipwright vendor -->
  	<npc id="shipwright_male">
! 		<inherit>base_male</inherit>
  		<title>the Shipwright</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A shipwright vendor -->
  	<npc id="shipwright_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Shipwright</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,31 ****
  		</shopkeeper>
  		<category>Vendors\Shipwright (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="shipwright_female">
! 		<inherit>base_female</inherit>
  		<title>the Shipwright</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,28 ----
  		</shopkeeper>
  		<category>Vendors\Shipwright (Male)</category>
  	</npc>
  	
  	<npc id="shipwright_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Shipwright</title>
  		<shopkeeper>
  			<restockable>
***************
*** 35,40 ****
  		</shopkeeper>
  		<category>Vendors\Shipwright (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 32,36 ----
  		</shopkeeper>
  		<category>Vendors\Shipwright (Female)</category>
  	</npc>
  
! </definitions>

Index: spinner.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/spinner.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spinner.xml	31 Jan 2004 22:48:45 -0000	1.1
--- spinner.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A spinner vendor -->
  	<npc id="spinner_male">
! 		<inherit>base_male</inherit>
  		<title>the Spinner</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A spinner vendor -->
  	<npc id="spinner_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Spinner</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,31 ****
  		</shopkeeper>
  		<category>Vendors\Spinner (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="spinner_female">
! 		<inherit>base_female</inherit>
  		<title>the Spinner</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,28 ----
  		</shopkeeper>
  		<category>Vendors\Spinner (Male)</category>
  	</npc>
  	
  	<npc id="spinner_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Spinner</title>
  		<shopkeeper>
  			<restockable>
***************
*** 35,40 ****
  		</shopkeeper>
  		<category>Vendors\Spinner (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 32,36 ----
  		</shopkeeper>
  		<category>Vendors\Spinner (Female)</category>
  	</npc>
  
! </definitions>

Index: stablemaster.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/stablemaster.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stablemaster.xml	31 Jan 2004 22:48:45 -0000	1.1
--- stablemaster.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- Stablemaster (no real vendor) -->
  	<npc id="stablemaster_male">
! 		<inherit>base_male</inherit>
  		<title>the Stablemaster</title>
- 		<ai>Human_Stablemaster</ai>
  		<fencing>
  			<random min="150" max="380"/>
--- 11,16 ----
  	<!-- Stablemaster (no real vendor) -->
  	<npc id="stablemaster_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Stablemaster</title>
  		<fencing>
  			<random min="150" max="380"/>
***************
*** 36,46 ****
  		</tactics>
  		<category>Vendors\Stablemaster (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="stablemaster_female">
! 		<inherit>base_female</inherit>
  		<title>the Stablemaster</title>
- 		<ai>Human_Stablemaster</ai>
  		<fencing>
  			<random min="150" max="380"/>
--- 35,43 ----
  		</tactics>
  		<category>Vendors\Stablemaster (Male)</category>
  	</npc>
  	
  	<npc id="stablemaster_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Stablemaster</title>
  		<fencing>
  			<random min="150" max="380"/>
***************
*** 65,70 ****
  		</tactics>
  		<category>Vendors\Stablemaster (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 62,66 ----
  		</tactics>
  		<category>Vendors\Stablemaster (Female)</category>
  	</npc>
  
! </definitions>

Index: tailor.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tailor.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tailor.xml	31 Jan 2004 22:48:45 -0000	1.1
--- tailor.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A Tailor vendor -->
  	<npc id="tailor_male">
! 		<inherit>base_male</inherit>
  		<title>the Tailor</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A Tailor vendor -->
  	<npc id="tailor_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Tailor</title>
  		<shopkeeper>
  			<restockable>
***************
*** 34,44 ****
  		</shopkeeper>
  		<category>Vendors\Tailor (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="tailor_female">
! 		<inherit>base_female</inherit>
  		<title>the Tailor</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 33,41 ----
  		</shopkeeper>
  		<category>Vendors\Tailor (Male)</category>
  	</npc>
  	
  	<npc id="tailor_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Tailor</title>
  		<shopkeeper>
  			<restockable>
***************
*** 61,66 ****
  		</shopkeeper>
  		<category>Vendors\Tailor (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 58,62 ----
  		</shopkeeper>
  		<category>Vendors\Tailor (Female)</category>
  	</npc>
  
! </definitions>

Index: tanner.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tanner.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tanner.xml	31 Jan 2004 22:48:45 -0000	1.1
--- tanner.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A tanner vendor -->
  	<npc id="tanner_male">
! 		<inherit>base_male</inherit>
  		<title>the Tanner</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A tanner vendor -->
  	<npc id="tanner_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Tanner</title>
  		<shopkeeper>
  			<restockable>
***************
*** 29,39 ****
  		</shopkeeper>
  		<category>Vendors\Tanner (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="tanner_female">
! 		<inherit>base_female</inherit>
  		<title>the Tanner</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 28,36 ----
  		</shopkeeper>
  		<category>Vendors\Tanner (Male)</category>
  	</npc>
  	
  	<npc id="tanner_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Tanner</title>
  		<shopkeeper>
  			<restockable>
***************
*** 51,56 ****
  		</shopkeeper>
  		<category>Vendors\Tanner (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 48,52 ----
  		</shopkeeper>
  		<category>Vendors\Tanner (Female)</category>
  	</npc>
  
! </definitions>

Index: tavernkeeper.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tavernkeeper.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tavernkeeper.xml	31 Jan 2004 22:48:45 -0000	1.1
--- tavernkeeper.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A tavernkeeper vendor -->
  	<npc id="tavernkeeper_male">
! 		<inherit>base_male</inherit>
  		<title>the Tavernkeeper</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A tavernkeeper vendor -->
  	<npc id="tavernkeeper_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Tavernkeeper</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,31 ****
  		</shopkeeper>
  		<category>Vendors\Tavernkeeper (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="tavernkeeper_female">
! 		<inherit>base_female</inherit>
  		<title>the Tavernkeeper</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,28 ----
  		</shopkeeper>
  		<category>Vendors\Tavernkeeper (Male)</category>
  	</npc>
  	
  	<npc id="tavernkeeper_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Tavernkeeper</title>
  		<shopkeeper>
  			<restockable>
***************
*** 35,40 ****
  		</shopkeeper>
  		<category>Vendors\Tavernkeeper (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 32,36 ----
  		</shopkeeper>
  		<category>Vendors\Tavernkeeper (Female)</category>
  	</npc>
  
! </definitions>

Index: tinker.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tinker.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tinker.xml	31 Jan 2004 22:48:45 -0000	1.1
--- tinker.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,35 ****
  	<!-- A tinker vendor -->
  	<npc id="tinker_male">
! 		<inherit>base_male</inherit>
  		<title>the Tinker</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Tinker (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<!-- A tinker vendor -->
  	<npc id="tinker_female">
! 		<inherit>base_female</inherit>
  		<title>the Tinker</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Tinker (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,31 ----
  	<!-- A tinker vendor -->
  	<npc id="tinker_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Tinker</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Tinker (Male)</category>
  	</npc>
  	
  	<!-- A tinker vendor -->
  	<npc id="tinker_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Tinker</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Tinker (Female)</category>
  	</npc>
  
! </definitions>

Index: veterinarian.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/veterinarian.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** veterinarian.xml	31 Jan 2004 22:48:45 -0000	1.1
--- veterinarian.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,28 ****
  	<!-- A veterinarian -->
  	<npc id="veterinarian_male">
! 		<inherit>base_male</inherit>
  		<title>the Veterinarian</title>
- 		<ai>Human_Vendor</ai>
  		<category>Vendors\Veterinarian (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="veterinarian_female">
! 		<inherit>base_female</inherit>
  		<title>the Veterinarian</title>
- 		<ai>Human_Vendor</ai>
  		<category>Vendors\Veterinarian (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,24 ----
  	<!-- A veterinarian -->
  	<npc id="veterinarian_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Veterinarian</title>
  		<category>Vendors\Veterinarian (Male)</category>
  	</npc>
  	
  	<npc id="veterinarian_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Veterinarian</title>
  		<category>Vendors\Veterinarian (Female)</category>
  	</npc>
  
! </definitions>

Index: weaponsmith.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/weaponsmith.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** weaponsmith.xml	31 Jan 2004 22:48:45 -0000	1.1
--- weaponsmith.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,17 ****
  	<!-- A weaponsmith vendor -->
  	<npc id="weaponsmith_male">
! 		<inherit>base_male</inherit>
  		<title>the Weaponsmith</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 11,16 ----
  	<!-- A weaponsmith vendor -->
  	<npc id="weaponsmith_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Weaponsmith</title>
  		<shopkeeper>
  			<restockable>
***************
*** 21,31 ****
  		</shopkeeper>
  		<category>Vendors\Weaponsmith (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="weaponsmith_female">
! 		<inherit>base_female</inherit>
  		<title>the Weaponsmith</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable>
--- 20,28 ----
  		</shopkeeper>
  		<category>Vendors\Weaponsmith (Male)</category>
  	</npc>
  	
  	<npc id="weaponsmith_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Weaponsmith</title>
  		<shopkeeper>
  			<restockable>
***************
*** 35,40 ****
  		</shopkeeper>
  		<category>Vendors\Weaponsmith (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 32,36 ----
  		</shopkeeper>
  		<category>Vendors\Weaponsmith (Female)</category>
  	</npc>
  
! </definitions>

Index: weaver.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/weaver.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** weaver.xml	31 Jan 2004 22:48:45 -0000	1.1
--- weaver.xml	2 Feb 2004 19:20:25 -0000	1.2
***************
*** 11,34 ****
  	<!-- A weaver vendor -->
  	<npc id="weaver_male">
! 		<inherit>base_male</inherit>
  		<title>the Weaver</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Weaver (Male)</category>
- 		<invulnerable />
  	</npc>
  	
  	<npc id="weaver_female">
! 		<inherit>base_female</inherit>
  		<title>the Weaver</title>
- 		<ai>Human_Vendor</ai>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Weaver (Female)</category>
- 		<invulnerable />
  	</npc>
  
! </definitions>
\ No newline at end of file
--- 11,30 ----
  	<!-- A weaver vendor -->
  	<npc id="weaver_male">
! 		<inherit>vendor_male</inherit>
  		<title>the Weaver</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Weaver (Male)</category>
  	</npc>
  	
  	<npc id="weaver_female">
! 		<inherit>vendor_female</inherit>
  		<title>the Weaver</title>
  		<shopkeeper>
  			<restockable/>
  		</shopkeeper>
  		<category>Vendors\Weaver (Female)</category>
  	</npc>
  
! </definitions>

[wpdev-commits] xmlscripts/definitions/npcs/humans civilists.xml,1.9,1.10

[<thi...@us...>]

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

Modified Files:
	civilists.xml 
Log Message:
Made all vendors inherit from a base definition ( easier to bind menus and events

Index: civilists.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/civilists.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** civilists.xml	2 Feb 2004 04:54:01 -0000	1.9
--- civilists.xml	2 Feb 2004 19:20:25 -0000	1.10
***************
*** 68,71 ****
  		<karma>500</karma>
  		<title>the Pirate</title>
! 	</npc>	
! </definitions>
\ No newline at end of file
--- 68,84 ----
  		<karma>500</karma>
  		<title>the Pirate</title>
! 	</npc>
! 	<!-- Vendor -->
! 	<npc id="vendor_male">
! 		<inherit>base_male</inherit>
! 		<ai>Human_Vendor</ai>
! 		<bindmenu>train_menu</bindmenu>
! 		<invulnerable />
! 	</npc>
! 	<npc id="vendor_female">
! 		<inherit>base_male</inherit>
! 		<ai>Human_Vendor</ai>
! 		<bindmenu>train_menu</bindmenu>
! 		<invulnerable />
! 	</npc>
! </definitions>

[wpdev-commits] xmlscripts/definitions creatures.xml,1.1,1.2

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

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

Modified Files:
	creatures.xml 
Log Message:
New flag for corpseless creatures.

Index: creatures.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/creatures.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** creatures.xml	2 Sep 2003 02:08:27 -0000	1.1
--- creatures.xml	2 Feb 2004 17:03:25 -0000	1.2
***************
*** 12,17 ****
  			
  		FLAGS:
! 			Bit 1: Creature can Fly
! 			Bit 2: Anti-Blink (Creature is Missing Animation #4)
  			
  		SHRINK:
--- 12,18 ----
  			
  		FLAGS:
! 			0x01: Creature can Fly
! 			0x02: Anti-Blink (Creature is Missing Animation #4)
!       0x04: Creature has no corpse
  			
  		SHRINK:
***************
*** 38,45 ****
  	<charbase id="0xb" basesound="0x183" shrink="0x20fd" />
  	<charbase id="0xc" basesound="0x16a" shrink="0x20d6" flags="0x1" />
! 	<charbase id="0xd" basesound="0x107" shrink="0x20ed" />
! 	<charbase id="0xe" basesound="0x10c" shrink="0x20d7" />
! 	<charbase id="0xf" basesound="0x111" shrink="0x20f3" />
! 	<charbase id="0x10" basesound="0x116" shrink="0x210b" /> 
  	<charbase id="0x11" basesound="0x1b0" shrink="0x20e0" /> 
  	<charbase id="0x12" basesound="0x16f" shrink="0x20d8" /> 
--- 39,46 ----
  	<charbase id="0xb" basesound="0x183" shrink="0x20fd" />
  	<charbase id="0xc" basesound="0x16a" shrink="0x20d6" flags="0x1" />
! 	<charbase id="0xd" basesound="0x107" shrink="0x20ed" flags="0x04"/>
! 	<charbase id="0xe" basesound="0x10c" shrink="0x20d7"/>
! 	<charbase id="0xf" basesound="0x111" shrink="0x20f3" flags="0x04"/>
! 	<charbase id="0x10" basesound="0x116" shrink="0x210b" flags="0x04"/> 
  	<charbase id="0x11" basesound="0x1b0" shrink="0x20e0" /> 
  	<charbase id="0x12" basesound="0x16f" shrink="0x20d8" /> 
***************
*** 243,248 ****
  	<charbase id="0x192" basesound="0x0" shrink="0x25f0" />
  	<charbase id="0x193" basesound="0x0" shrink="0x25f1" />
! 	<charbase id="0x23d" basesound="0x107" />
! 	<charbase id="0x23e" basesound="0x200" soundmode="4" />
  	<charbase id="0x2f0" basesound="0x10c" shrink="0x25b1" />
  	<charbase id="0x2f1" basesound="0x174" shrink="0x258d" flags="0x1" />
--- 244,249 ----
  	<charbase id="0x192" basesound="0x0" shrink="0x25f0" />
  	<charbase id="0x193" basesound="0x0" shrink="0x25f1" />
! 	<charbase id="0x23d" basesound="0x107" flags="0x04"/>
! 	<charbase id="0x23e" basesound="0x200" soundmode="4" flags="0x04"/>
  	<charbase id="0x2f0" basesound="0x10c" shrink="0x25b1" />
  	<charbase id="0x2f1" basesound="0x174" shrink="0x258d" flags="0x1" />

[wpdev-commits] wolfpack corpse.cpp,1.39,1.40

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

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

Modified Files:
	corpse.cpp 
Log Message:
Corpse colors / underwear fix.

Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** corpse.cpp	30 Jan 2004 23:28:34 -0000	1.39
--- corpse.cpp	2 Feb 2004 13:47:15 -0000	1.40
***************
*** 184,188 ****
  	sendItem.setCoord( pos() );
  	sendItem.setDirection( direction() );
! 	sendItem.setColor( color() );
  
  	if( mSock )
--- 184,188 ----
  	sendItem.setCoord( pos() );
  	sendItem.setDirection( direction() );
! 	sendItem.setColor( color() | 0x8000 );
  
  	if( mSock )

[wpdev-commits] wolfpack configure,1.6,1.7 console_unix.cpp,1.13,1.14

[<thi...@pr...>]

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

Modified Files:
	configure console_unix.cpp 
Log Message:
Ops

Index: configure
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure	28 Jan 2004 20:08:41 -0000	1.6
--- configure	2 Feb 2004 05:26:32 -0000	1.7
***************
*** 83,88 ****
  
  for py_libpath in \
! 		/usr/lib/[Pp]ython*/libpython*.a \
! 		/usr/lib/[Pp]ython*/config/libpython*.a \
  		;
  do
--- 83,89 ----
  
  for py_libpath in \
! 		/usr/lib/libpython*.so \
! 		/usr/lib/[Pp]ython*/libpython*.so \
! 		/usr/lib/[Pp]ython*/config/libpython*.so \
  		;
  do

Index: console_unix.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_unix.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** console_unix.cpp	2 Feb 2004 05:22:59 -0000	1.13
--- console_unix.cpp	2 Feb 2004 05:26:32 -0000	1.14
***************
*** 42,45 ****
--- 42,46 ----
  #include "console.h"
  #include "globals.h"
+ #include "wolfpack.h"
  
  using namespace std;
***************
*** 79,84 ****
  void signal_handler(int signal)
  {
- 	cCharIterator iter;
- 
  	switch (signal)
  	{
--- 80,83 ----

[wpdev-commits] wolfpack console_unix.cpp,1.12,1.13 wolfpack.cpp,1.484,1.485

[<thi...@pr...>]

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

Modified Files:
	console_unix.cpp wolfpack.cpp 
Log Message:
clean-ups

Index: console_unix.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_unix.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** console_unix.cpp	31 Jan 2004 18:42:02 -0000	1.12
--- console_unix.cpp	2 Feb 2004 05:22:59 -0000	1.13
***************
*** 4,9 ****
  //	UO Server Emulation Program
  //
! //	Copyright 1997, 98 by Marcus Rating (Cironian)
! //  Copyright 2001-2003 by holders identified in authors.txt
  //	This program is free software; you can redistribute it and/or modify
  //	it under the terms of the GNU General Public License as published by
--- 4,8 ----
  //	UO Server Emulation Program
  //
! //  Copyright 2001-2004 by holders identified in authors.txt
  //	This program is free software; you can redistribute it and/or modify
  //	it under the terms of the GNU General Public License as published by
***************
*** 35,38 ****
--- 34,38 ----
  #include <unistd.h>
  #include <termios.h>
+ #include <signal.h>
  
  // Qt Includes
***************
*** 77,80 ****
--- 77,97 ----
  }
  
+ void signal_handler(int signal)
+ {
+ 	cCharIterator iter;
+ 
+ 	switch (signal)
+ 	{
+ 	case SIGHUP:	queueAction( RELOAD_SCRIPTS );		break;
+ 	case SIGUSR1:	queueAction( RELOAD_ACCOUNTS );		break;
+ 	case SIGUSR2:	queueAction( SAVE_WORLD );			break;
+ 	case SIGTERM:
+ 		keeprun = 0 ;
+ 		break;
+ 	default:
+ 		break;
+ 	}
+ }
+ 
  class cConsoleThread : public QThread
  {
***************
*** 85,88 ****
--- 102,111 ----
  		{
  			setNonBlockingIo();
+ 			
+ 			signal( SIGHUP,  &signal_handler ); // Reload Scripts
+ 			signal( SIGUSR1, &signal_handler ); // Save World
+ 			signal( SIGUSR2, &signal_handler ); // Reload Accounts
+ 			signal( SIGTERM, &signal_handler ); // Terminate Server
+ 			signal( SIGPIPE, SIG_IGN );			// Ignore SIGPIPE
  
  			while( serverState < SHUTDOWN )

Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.484
retrieving revision 1.485
diff -C2 -d -r1.484 -r1.485
*** wolfpack.cpp	1 Feb 2004 22:02:15 -0000	1.484
--- wolfpack.cpp	2 Feb 2004 05:22:59 -0000	1.485
***************
*** 77,137 ****
  using namespace std;
  
- //================================================================================
- //
- // signal handlers
- #if defined( Q_OS_UNIX )
- 
- #include <signal.h>
- 
- void signal_handler(int signal)
- {
- 	cCharIterator iter;
- 
- 	switch (signal)
- 	{
- 	case SIGHUP:
- 		{
-                 SrvParams->reload();
-                 cNetwork::instance()->reload();
- 
- 				QStringList oldAISections = DefManager->getSections( WPDT_AI );
- 				DefManager->reload(); //Reload Definitions
- 				AIFactory::instance()->checkScriptAI( oldAISections, DefManager->getSections( WPDT_AI ) );
- 
- 				Accounts::instance()->reload();
-                 SpawnRegions::instance()->reload();
-                 AllTerritories::instance()->reload();
-                 Resources::instance()->reload();
-                 MakeMenus::instance()->reload();
-                 ScriptManager::instance()->reload();
- 				ContextMenus::instance()->reload();
- 				Skills->reload();
- 
- 				// Update the Regions
- 				for( P_CHAR pChar = iter.first(); pChar; pChar = iter.next() )
- 				{
- 					cTerritory *region = AllTerritories::instance()->region( pChar->pos().x, pChar->pos().y, pChar->pos().map );
- 					pChar->setRegion( region );
- 				}
- 		}
- 		break ;
- 		
- 	case SIGUSR1:
- 		Accounts::instance()->reload();
- 		break ;
- 	case SIGUSR2:
- 		World::instance()->save();
- 		SrvParams->flush();
- 		break ;
- 	case SIGTERM:
- 		keeprun = 0 ;
- 		break;
- 	default:
- 		break;
- 	}
- }
- 	
- #endif
- 
  static bool parseParameter( const QString &param )
  {
--- 77,80 ----
***************
*** 278,290 ****
  	QTranslator translator( 0 ); // must be valid thru app life.
  
- 	// Unix Signal Handling
- #if defined( Q_OS_UNIX )	
- 	signal( SIGHUP,  &signal_handler ); // Reload Scripts
- 	signal( SIGUSR1, &signal_handler ); // Save World
- 	signal( SIGUSR2, &signal_handler ); // Reload Accounts
- 	signal( SIGTERM, &signal_handler ); // Terminate Server
- 	signal( SIGPIPE, SIG_IGN );			// Ignore SIGPIPE
- #endif
- 
  	serverState = STARTUP;
  
--- 221,224 ----
***************
*** 315,331 ****
  
  	// Startup Translator
! 	try
  	{
! 		QString languageFile = SrvParams->getString( "General", "Language File", "", true );
! 		if ( !languageFile.isEmpty() )
  		{
! 			translator.load( languageFile, "." );
! 			qApp->installTranslator( &translator );
  		}
! 	}
! 	catch( ... )
! 	{
! 		Console::instance()->log( LOG_ERROR, "Couldn't load translator.\n" );
! 		return 1;
  	}
  
--- 249,261 ----
  
  	// Startup Translator
! 	QString languageFile = SrvParams->getString( "General", "Language File", "", true );
! 	if ( !languageFile.isEmpty() )
  	{
! 		if ( !translator.load( languageFile, "." ) )
  		{
! 			Console::instance()->log( LOG_ERROR, "Couldn't load translator.\n" );
! 			return 1;
  		}
! 		qApp->installTranslator( &translator );
  	}
  

[wpdev-commits] xmlscripts/scripts paperdollmenu.py,NONE,1.1

[<thi...@pr...>]

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

Added Files:
	paperdollmenu.py 
Log Message:
Implemented:

- Paperdoll context menu entry
- Random <saycolor>

--- NEW FILE: paperdollmenu.py ---
#################################################################
#   )      (\_     # WOLFPACK 13.0.0 Scripts                    #
#  ((    _/{  "-;  # Created by: Correa                         #
#   )).-' {{ ;'`   # Revised by:                                #
#  ( (  ;._ \\ ctr # Last Modification:                         #
#################################################################


def onContextEntry( char, target, tag  ):

    if( tag == 1 ):
        if ( char.socket ):
            char.socket.sendpaperdoll( target )
    return 1

[wpdev-commits] wolfpack basechar.cpp,1.59,1.60 wolf.dsp,1.246,1.247

[<thi...@pr...>]

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

Modified Files:
	basechar.cpp wolf.dsp 
Log Message:
Implemented:

- Paperdoll context menu entry
- Random <saycolor>

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** basechar.cpp	31 Jan 2004 23:55:08 -0000	1.59
--- basechar.cpp	2 Feb 2004 04:54:02 -0000	1.60
***************
*** 1021,1028 ****
  	if( TagName == "bindmenu" )
  	{
  		if( !Tag->getAttribute( "id" ).isNull() )
! 			this->setBindmenu(Tag->getAttribute( "id" ));
  		else
! 			setBindmenu(Value);
  	}
  
--- 1021,1029 ----
  	if( TagName == "bindmenu" )
  	{
+ 		QString bindmenu = this->bindmenu();
  		if( !Tag->getAttribute( "id" ).isNull() )
! 			this->setBindmenu( bindmenu.isEmpty() ? Tag->getAttribute( "id" ) : bindmenu + "," + Tag->getAttribute( "id" ) );
  		else
! 			setBindmenu( bindmenu.isEmpty() ? Value : bindmenu + "," + Value );
  	}
  
***************
*** 1211,1215 ****
  		}
  	}
! 
  	else
  	{
--- 1212,1223 ----
  		}
  	}
! 	// <saycolor>color</saycolor>
! 	else if ( TagName == "saycolor" )
! 	{	
! 		bool ok;
! 		ushort color = Value.toUShort(&ok);
! 		if ( ok )
! 			this->setSaycolor( color );
! 	}
  	else
  	{

Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.246
retrieving revision 1.247
diff -C2 -d -r1.246 -r1.247
*** wolf.dsp	29 Jan 2004 07:30:40 -0000	1.246
--- wolf.dsp	2 Feb 2004 04:54:02 -0000	1.247
***************
*** 77,81 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt323.lib shell32.lib /nologo /version:12.9 /subsystem:windows /incremental:no /map /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept /fixed:no
  # SUBTRACT LINK32 /pdb:none
  
--- 77,81 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt330.lib shell32.lib /nologo /version:12.9 /subsystem:windows /incremental:no /map /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept /fixed:no
  # SUBTRACT LINK32 /pdb:none
  

[wpdev-commits] wolfpack/python objectcache.h,1.6,1.7 socket.cpp,1.47,1.48

[<thi...@pr...>]

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

Modified Files:
	objectcache.h socket.cpp 
Log Message:
Implemented:

- Paperdoll context menu entry
- Random <saycolor>

Index: objectcache.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/objectcache.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** objectcache.h	20 Jul 2003 01:43:28 -0000	1.6
--- objectcache.h	2 Feb 2004 04:54:02 -0000	1.7
***************
*** 4,8 ****
  //	UO Server Emulation Program
  //
! //  Copyright 2001-2003 by holders identified in authors.txt
  //	This program is free software; you can redistribute it and/or modify
  //	it under the terms of the GNU General Public License as published by
--- 4,8 ----
  //	UO Server Emulation Program
  //
! //  Copyright 2001-2004 by holders identified in authors.txt
  //	This program is free software; you can redistribute it and/or modify
  //	it under the terms of the GNU General Public License as published by

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** socket.cpp	22 Dec 2003 11:01:55 -0000	1.47
--- socket.cpp	2 Feb 2004 04:54:02 -0000	1.48
***************
*** 535,538 ****
--- 535,557 ----
  }
  
+ static PyObject* wpSocket_sendpaperdoll( wpSocket* self, PyObject* args )
+ {
+ 	if( !self->pSock )
+ 		return PyFalse;
+ 	
+ 	if( !checkArgChar( 0 ) )
+ 	{
+ 		PyErr_BadArgument();
+ 		return 0;
+ 	}
+ 
+ 	if( !getArgChar( 0 ) )
+ 		return PyFalse;
+ 
+ 	self->pSock->sendPaperdoll( getArgChar( 0 ) );
+ 
+ 	return PyTrue;
+ }
+ 
  /*!
  	Returns the custom tag passed
***************
*** 680,683 ****
--- 699,703 ----
  	{ "sendcontainer",		(getattrofunc)wpSocket_sendcontainer,  METH_VARARGS, "Sends a container to the socket." },
  	{ "sendpacket",			(getattrofunc)wpSocket_sendpacket,		METH_VARARGS, "Sends a packet to this socket." },
+ 	{ "sendpaperdoll",		(getattrofunc)wpSocket_sendpaperdoll,	METH_VARARGS,	"Sends a char's paperdool to this socket."	},
  	{ "gettag",				(getattrofunc)wpSocket_gettag,	METH_VARARGS,	"Gets a tag from a socket." },
  	{ "settag",				(getattrofunc)wpSocket_settag,	METH_VARARGS,	"Sets a tag to a socket." },

[wpdev-commits] xmlscripts/scripts/wolfpack/commands skill.py,1.2,1.3

[<thi...@pr...>]

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

Modified Files:
	skill.py 
Log Message:
Implemented:

- Paperdoll context menu entry
- Random <saycolor>

Index: skill.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands/skill.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** skill.py	25 Jan 2004 03:47:59 -0000	1.2
--- skill.py	2 Feb 2004 04:54:02 -0000	1.3
***************
*** 55,70 ****
  
  	# Is target not your own char ?
! 	if not char == target.char:
! 		socket.clilocmessage( 1005213, "", YELLOW, NORMAL ) # You can't do that
! 		return OK
  
  	# check for rank
! 	if target.char.rank >= char.rank and not char == target.char:
! 		socket.sysmessage( "You are not very skilled, are you?" )
! 		return OK
  
  	( skill, value ) = args
  
! 	char.skill[ skillnamesids[ skill ] ] = value
  
  	return OK		
--- 55,72 ----
  
  	# Is target not your own char ?
! 	#if not char == target.char:
!         #    if target.char.rank >= char.rank:
! 	#	socket.clilocmessage( 1005213, "", YELLOW, NORMAL ) # You can't do that
! 	#	return OK
  
  	# check for rank
! 	#if target.char.rank >= char.rank and not char == target.char:
! 	#	socket.sysmessage( "You are not very skilled, are you?" )
! 	#	return OK
! 	
  
  	( skill, value ) = args
  
! 	target.char.skill[ skillnamesids[ skill ] ] = value
  
  	return OK		

[wpdev-commits] xmlscripts/definitions/npcs/humans civilists.xml,1.8,1.9

[<thi...@pr...>]

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

Modified Files:
	civilists.xml 
Log Message:
Implemented:

- Paperdoll context menu entry
- Random <saycolor>

Index: civilists.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/civilists.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** civilists.xml	24 Nov 2003 03:15:33 -0000	1.8
--- civilists.xml	2 Feb 2004 04:54:01 -0000	1.9
***************
*** 12,17 ****
--- 12,19 ----
  		<id>0x190</id>
  		<ai></ai>
+ 		<bindmenu>paperdoll_menu</bindmenu>
  		<name><random list="NAMES_MALE" /></name>
  		<skin><random list="SKINS_HUMAN" /></skin>
+ 		<saycolor><random min="2" max="1000" /></saycolor>
  		<wandertype>1</wandertype>
  		<direction><random min="0" max="7" /></direction> <!-- Facing a random direction -->
***************
*** 35,41 ****
  		<id>0x191</id>
  		<ai></ai>
  		<name><random list="NAMES_FEMALE" /></name>
  		<skin><random list="SKINS_HUMAN" /></skin>
!                 <wandertype>1</wandertype>
  		<direction><random min="0" max="7" /></direction> <!-- Facing a random direction -->
   
--- 37,45 ----
  		<id>0x191</id>
  		<ai></ai>
+ 		<bindmenu>paperdoll_menu</bindmenu>
  		<name><random list="NAMES_FEMALE" /></name>
  		<skin><random list="SKINS_HUMAN" /></skin>
! 		<saycolor><random min="2" max="1000" /></saycolor>
!         <wandertype>1</wandertype>
  		<direction><random min="0" max="7" /></direction> <!-- Facing a random direction -->
   

[wpdev-commits] xmlscripts/definitions/menus contextmenu.xml,1.10,1.11

[<thi...@pr...>]

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

Modified Files:
	contextmenu.xml 
Log Message:
Implemented:

- Paperdoll context menu entry
- Random <saycolor>

Index: contextmenu.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/menus/contextmenu.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** contextmenu.xml	2 Feb 2004 03:49:30 -0000	1.10
--- contextmenu.xml	2 Feb 2004 04:54:01 -0000	1.11
***************
*** 66,69 ****
--- 66,74 ----
  	</contextmenu>
  
+ 	<contextmenu id="paperdoll_menu">
+ 		<events>paperdollmenu</events>
+ 		<option tag="1" msgid="6123"/>
+ 	</contextmenu>
+ 
  	<contextmenu id="healer_menu">
  		<option tag="1" msgid="0489"/>

[wpdev-commits] xmlscripts definitions.xml,1.61,1.62

[<thi...@pr...>]

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

Modified Files:
	definitions.xml 
Log Message:
Implemented:

- Paperdoll context menu entry
- Random <saycolor>

Index: definitions.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** definitions.xml	22 Jan 2004 04:31:51 -0000	1.61
--- definitions.xml	2 Feb 2004 04:54:01 -0000	1.62
***************
*** 54,62 ****
  	<!--<include file="definitions/spawnregions/spawntest.xml" />-->
  	<!--<include file="definitions/spawnregions/graveyards.xml" />-->
! 	<!--<include file="definitions/spawnregions/shops.xml" />-->
  	<include file="definitions/spawnregions/britain_fel.xml" />
  	<include file="definitions/spawnregions/britain_tram.xml" />
  	<include file="definitions/spawnregions/bucden_fel.xml" />
! 	<include file="definitions/spawnregions/bucden_tram.xml" />
  
  	<!-- Items -->
--- 54,62 ----
  	<!--<include file="definitions/spawnregions/spawntest.xml" />-->
  	<!--<include file="definitions/spawnregions/graveyards.xml" />-->
! 	<!--<include file="definitions/spawnregions/shops.xml" />
  	<include file="definitions/spawnregions/britain_fel.xml" />
  	<include file="definitions/spawnregions/britain_tram.xml" />
  	<include file="definitions/spawnregions/bucden_fel.xml" />
! 	<include file="definitions/spawnregions/bucden_tram.xml" />-->
  
  	<!-- Items -->

[wpdev-commits] xmlscripts/definitions scripts.xml,1.78,1.79

[<thi...@pr...>]

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

Modified Files:
	scripts.xml 
Log Message:
Implemented:

- Paperdoll context menu entry
- Random <saycolor>

Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** scripts.xml	2 Feb 2004 03:48:59 -0000	1.78
--- scripts.xml	2 Feb 2004 04:54:01 -0000	1.79
***************
*** 37,42 ****
  	<script>ore</script>
  
!   <!-- Deeds -->
!   <script>deeds.hairstyle</script>
  
  	<!-- Commands -->
--- 37,42 ----
  	<script>ore</script>
  
! 	<!-- Deeds -->
! 	<script>deeds.hairstyle</script>
  
  	<!-- Commands -->
***************
*** 97,100 ****
--- 97,101 ----
  	<script>bankermenu</script>
  	<script>trainmenu</script>
+ 	<script>paperdollmenu</script>
  
  	<!-- Speech Scripts -->

[wpdev-commits] xmlscripts/definitions/menus contextmenu.xml,1.9,1.10

[<thi...@pr...>]

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

Modified Files:
	contextmenu.xml 
Log Message:
should be working good now.

Index: contextmenu.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/menus/contextmenu.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** contextmenu.xml	28 Jan 2004 02:21:53 -0000	1.9
--- contextmenu.xml	2 Feb 2004 03:49:30 -0000	1.10
***************
*** 9,38 ****
  	<contextmenu id="train_menu">
  		<events>trainmenu</events>
! 		<option tag="1"  msgid="6000" checkvisible="true" checkenabled="true" />
! 		<option tag="2"  msgid="6001" checkvisible="true" checkenabled="true" />
! 		<option tag="3"  msgid="6002" checkvisible="true" checkenabled="true" />
! 		<option tag="4"  msgid="6003" checkvisible="true" checkenabled="true" />
! 		<option tag="5"  msgid="6004" checkvisible="true" checkenabled="true" />
! 		<option tag="6"  msgid="6005" checkvisible="true" checkenabled="true" />
! 		<option tag="7"  msgid="6006" checkvisible="true" checkenabled="true" />
! 		<option tag="8"  msgid="6007" checkvisible="true" checkenabled="true" />
! 		<option tag="9"  msgid="6008" checkvisible="true" checkenabled="true" />
! 		<option tag="10" msgid="6009" checkvisible="true" checkenabled="true" />
! 		<option tag="11" msgid="6010" checkvisible="true" checkenabled="true" />
! 		<option tag="12" msgid="6011" checkvisible="true" checkenabled="true" />
! 		<option tag="13" msgid="6012" checkvisible="true" checkenabled="true" />
! 		<option tag="14" msgid="6013" checkvisible="true" checkenabled="true" />
! 		<option tag="15" msgid="6014" checkvisible="true" checkenabled="true" />
! 		<option tag="16" msgid="6015" checkvisible="true" checkenabled="true" />
! 		<option tag="17" msgid="6016" checkvisible="true" checkenabled="true" />
! 		<option tag="18" msgid="6017" checkvisible="true" checkenabled="true" />
! 		<option tag="19" msgid="6018" checkvisible="true" checkenabled="true" />
! 		<option tag="20" msgid="6019" checkvisible="true" checkenabled="true" />
! 		<option tag="21" msgid="6020" checkvisible="true" checkenabled="true" />
! 		<option tag="22" msgid="6021" checkvisible="true" checkenabled="true" />
! 		<option tag="23" msgid="6022" checkvisible="true" checkenabled="true" />
! 		<option tag="24" msgid="6023" checkvisible="true" checkenabled="true" />
! 		<option tag="25" msgid="6024" checkvisible="true" checkenabled="true" />
! 		<option tag="26" msgid="6025" checkvisible="true" checkenabled="true" />
  	</contextmenu>
  
--- 9,61 ----
  	<contextmenu id="train_menu">
  		<events>trainmenu</events>
! 		<option tag="1"  msgid="6000" checkvisible="true" checkenabled="true" /> <!-- Alchemy -->
! 		<option tag="2"  msgid="6001" checkvisible="true" checkenabled="true" /> <!-- Anatomy -->
! 		<option tag="3"  msgid="6002" checkvisible="true" checkenabled="true" /> <!-- AnimalLore -->
! 		<option tag="4"  msgid="6003" checkvisible="true" checkenabled="true" /> <!-- ItemID -->
! 		<option tag="5"  msgid="6004" checkvisible="true" checkenabled="true" /> <!-- ArmsLore -->
! 		<option tag="6"  msgid="6005" checkvisible="true" checkenabled="true" /> <!-- Parry -->
! 		<option tag="7"  msgid="6006" checkvisible="true" checkenabled="true" /> <!-- Begging -->
! 		<option tag="8"  msgid="6007" checkvisible="true" checkenabled="true" /> <!-- Blacksmith -->
! 		<option tag="9"  msgid="6008" checkvisible="true" checkenabled="true" /> <!-- Fletching -->
! 		<option tag="10" msgid="6009" checkvisible="true" checkenabled="true" /> <!-- Peacemaking -->
! 		<option tag="11" msgid="6010" checkvisible="true" checkenabled="true" /> <!-- Camping -->
! 		<option tag="12" msgid="6011" checkvisible="true" checkenabled="true" /> <!-- Carpentery -->
! 		<option tag="13" msgid="6012" checkvisible="true" checkenabled="true" /> <!-- Cartography -->
! 		<option tag="14" msgid="6013" checkvisible="true" checkenabled="true" /> <!-- Cooking -->
! 		<option tag="15" msgid="6014" checkvisible="true" checkenabled="true" /> <!-- Detect Hidden -->
! 		<option tag="16" msgid="6015" checkvisible="true" checkenabled="true" /> <!-- Discordance -->
! 		<option tag="17" msgid="6016" checkvisible="true" checkenabled="true" /> <!-- Evaluate Int -->
! 		<option tag="18" msgid="6017" checkvisible="true" checkenabled="true" /> <!-- Healing -->
! 		<option tag="19" msgid="6018" checkvisible="true" checkenabled="true" /> <!-- Fishing -->
! 		<option tag="20" msgid="6019" checkvisible="true" checkenabled="true" /> <!-- Forensics -->
! 		<option tag="21" msgid="6020" checkvisible="true" checkenabled="true" /> <!-- Hearding -->
! 		<option tag="22" msgid="6021" checkvisible="true" checkenabled="true" /> <!-- Hiding -->
! 		<option tag="23" msgid="6022" checkvisible="true" checkenabled="true" /> <!-- Provocation -->
! 		<option tag="24" msgid="6023" checkvisible="true" checkenabled="true" /> <!-- Inscribe -->
! 		<option tag="25" msgid="6024" checkvisible="true" checkenabled="true" /> <!-- Lockpicking -->
! 		<option tag="26" msgid="6025" checkvisible="true" checkenabled="true" /> <!-- Magery -->
! 		<option tag="27" msgid="6026" checkvisible="true" checkenabled="true" /> <!-- Magic Resist -->
! 		<option tag="28" msgid="6027" checkvisible="true" checkenabled="true" /> <!-- Tactics -->
! 		<option tag="29" msgid="6028" checkvisible="true" checkenabled="true" /> <!-- Snooping -->
! 		<option tag="30" msgid="6029" checkvisible="true" checkenabled="true" /> <!-- Musicianship -->
! 		<option tag="31" msgid="6030" checkvisible="true" checkenabled="true" /> <!-- Poisoning -->
! 		<option tag="32" msgid="6031" checkvisible="true" checkenabled="true" /> <!-- Archery -->
! 		<option tag="33" msgid="6032" checkvisible="true" checkenabled="true" /> <!-- Spirit Speak -->
! 		<option tag="34" msgid="6033" checkvisible="true" checkenabled="true" /> <!-- Stealing -->
! 		<option tag="35" msgid="6034" checkvisible="true" checkenabled="true" /> <!-- Tailoring -->
! 		<option tag="36" msgid="6035" checkvisible="true" checkenabled="true" /> <!-- Animal Taming -->
! 		<option tag="37" msgid="6036" checkvisible="true" checkenabled="true" /> <!-- Taste ID -->
! 		<option tag="38" msgid="6037" checkvisible="true" checkenabled="true" /> <!-- Tinkering -->
! 		<option tag="39" msgid="6038" checkvisible="true" checkenabled="true" /> <!-- Tracking -->
! 		<option tag="40" msgid="6039" checkvisible="true" checkenabled="true" /> <!-- Veterinary -->
! 		<option tag="41" msgid="6040" checkvisible="true" checkenabled="true" /> <!-- Swordsmanship -->
! 		<option tag="42" msgid="6041" checkvisible="true" checkenabled="true" /> <!-- Macing -->
! 		<option tag="43" msgid="6042" checkvisible="true" checkenabled="true" /> <!-- Fencing -->
! 		<option tag="44" msgid="6043" checkvisible="true" checkenabled="true" /> <!-- Wrestling -->
! 		<option tag="45" msgid="6044" checkvisible="true" checkenabled="true" /> <!-- Lumberjacking -->
! 		<option tag="46" msgid="6045" checkvisible="true" checkenabled="true" /> <!-- Mining -->
! 		<option tag="47" msgid="6046" checkvisible="true" checkenabled="true" /> <!-- Meditation -->
! 		<option tag="48" msgid="6047" checkvisible="true" checkenabled="true" /> <!-- Stealth -->
! 		<option tag="49" msgid="6048" checkvisible="true" checkenabled="true" /> <!-- Remove Trap -->
  	</contextmenu>
  

[wpdev-commits] xmlscripts/definitions scripts.xml,1.77,1.78

[<thi...@pr...>]

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

Modified Files:
	scripts.xml 
Log Message:
should be working good now.

Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** scripts.xml	1 Feb 2004 23:33:11 -0000	1.77
--- scripts.xml	2 Feb 2004 03:48:59 -0000	1.78
***************
*** 96,99 ****
--- 96,100 ----
  	<script>daggermenu</script>
  	<script>bankermenu</script>
+ 	<script>trainmenu</script>
  
  	<!-- Speech Scripts -->

[wpdev-commits] xmlscripts/scripts/skills __init__.py,1.10,1.11

[<thi...@pr...>]

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

Modified Files:
	__init__.py 
Log Message:
little optimization

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** __init__.py	26 Jan 2004 21:00:41 -0000	1.10
--- __init__.py	2 Feb 2004 03:48:00 -0000	1.11
***************
*** 171,176 ****
  def totalskills( char ):
  	total = 0
  	for i in range( 0, ALLSKILLS ):
! 		total += char.skill[ i ]
  	return total
  
--- 171,177 ----
  def totalskills( char ):
  	total = 0
+ 	charSkill = char.skill
  	for i in range( 0, ALLSKILLS ):
! 		total += charSkill[ i ]
  	return total
  

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

[<thi...@pr...>]

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

Modified Files:
	trainmenu.py 
Log Message:
should be working good now.

Index: trainmenu.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/trainmenu.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** trainmenu.py	28 Jan 2004 02:21:34 -0000	1.1
--- trainmenu.py	2 Feb 2004 03:46:27 -0000	1.2
***************
*** 7,16 ****
  
  
! #
! # This is just a sample implementation, still needs to be filled in properly
! #
  
  def onContextMenuCheckVisible( char, target, tag ):
!     if ( target.skill[tag] >= 300 ):
          return 1 # visible
      else:
--- 7,19 ----
  
  
! import wolfpack.settings
! import skills
! from wolfpack.consts import *
! 
! MAX_TEACHING = 300
! MIN_TEACHING = 20
  
  def onContextMenuCheckVisible( char, target, tag ):
!     if ( target.skill[ tag - 1 ] >= 300 ):
          return 1 # visible
      else:
***************
*** 18,24 ****
  
  def onContextMenuCheckEnabled( char, target, tag ):
!     if ( char.skill[tag] >= 300 ):
          return 0 # disabled
      else: 
          return 1 #enabled
      
--- 21,104 ----
  
  def onContextMenuCheckEnabled( char, target, tag ):
!     skill = tag - 1
!     if ( skill == STEALTH and char.skill[ HIDING ] < 800 ):
!         return 0 # disabled
!     if ( skill == REMOVETRAPS and ( char.skill[ LOCKPICKING ] < 500 or char.skill[ DETECTINGHIDDEN ] < 500 ) ):
!         return 0 # disabled
!     if ( char.skill[ skill ] >= MAX_TEACHING ):
          return 0 # disabled
      else: 
          return 1 #enabled
      
+ def onContextEntry( char, target, tag  ):
+ 
+     skill = tag - 1
+     if ( char.isdead() or skill < 0 ):
+         return 1
+ 
+     baseToSet = target.skill[ skill ] / ( 1000 / MAX_TEACHING )
+     if ( baseToSet > MAX_TEACHING ):
+         baseToSet = MAX_TEACHING
+     elif ( baseToSet < MIN_TEACHING ):
+         target.say( str( baseToSet ) )
+         return 1
+     pointsToLearn = baseToSet - char.skill[ skill ]
+     if ( pointsToLearn < 0 ): # Player knows more than me
+         return 1
+ 
+     target.say( 1019077, "", " " + str( pointsToLearn*10 ), 0 ) # I will teach thee all I know, if paid the amount in full.  The price is:
+     target.say( 1043108 ) #For less I shall teach thee less.
+     char.settag("npctrainer", str( target.serial ) )
+     char.settag("trainningskill", str( skill ) )
+     return 1
+ 
+ def onDropOnChar( char, item ):
+ 
+     if ( item.id != 0xeed ):
+         return 0 # not what we expected :(
+ 
+     dropper = item.container
+     if ( dropper.gettag("npctrainer") == str( char.serial ) and dropper.hastag("trainningskill") ):
+         skill = int( dropper.gettag("trainningskill") )
+         dropper.deltag("npctrainer")
+         dropper.deltag("trainningskill")
+         amount = item.amount / 10
+ 
+         if ( amount > MAX_TEACHING ):
+             amount = MAX_TEACHING
+ 
+         # check for skill cap
+         cap = wolfpack.settings.getNumber("General", "SkillCap", 700) * 10
+ 
+         sum = skills.totalskills( dropper )
+ 
+         if ( sum >= cap ):
+             return 0
+         
+         baseToSet = char.skill[ skill ] / ( 1000 / MAX_TEACHING )
+         if ( baseToSet > MAX_TEACHING ):
+             baseToSet = MAX_TEACHING
+         elif ( baseToSet < MIN_TEACHING ):
+             char.say( str( baseToSet ) )
+             return 0
+ 
+         if ( baseToSet + sum > cap ):
+             baseToSet = cap - sum
+ 
+         pointsToLearn = baseToSet - dropper.skill[ skill ]
+         if ( pointsToLearn < 0 ): # Player knows more than me
+             return 0
+ 
+         if ( amount > pointsToLearn ):
+             amount = pointsToLearn
+             item.amount = item.amount - amount * 10
+         else:
+             item.delete()
+ 
+         dropper.skill[skill] = dropper.skill[skill] + amount
+         
+         char.say( 501539 ) # Let me show thee something of how this is done.
+         return 1
+     return 0
+ 
+     

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

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

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

Modified Files:
	hairstyle.py 
Log Message:
Fixed a problem.

Index: hairstyle.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/hairstyle.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** hairstyle.py	2 Feb 2004 00:23:07 -0000	1.5
--- hairstyle.py	2 Feb 2004 02:11:37 -0000	1.6
***************
*** 56,60 ****
  
  def onUse(char, deed):
!   if char.id != 0x190 or char.id != 0x191:
      char.socket.clilocmessage(1042298)
      return 1
--- 56,60 ----
  
  def onUse(char, deed):
!   if char.id != 0x190 and char.id != 0x191:
      char.socket.clilocmessage(1042298)
      return 1