[wpdev-commits] xmlscripts/scripts/skills blacksmithing.py,1.25,1.26 poisoning.py,1.5,1.6

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

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

Modified Files:
	blacksmithing.py poisoning.py 
Log Message:
bugfixes

Index: poisoning.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/poisoning.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** poisoning.py	25 Aug 2004 17:03:06 -0000	1.5
--- poisoning.py	13 Oct 2004 19:11:13 -0000	1.6
***************
*** 34,38 ****
  	# check if the targetted item is a poison potion
  	potion = target.item
! 	if ( not potion.hastag( 'potiontype' ) ) or ( potion.gettag( 'potiontype' ) < 14  and potion.gettag( 'potiontype' ) > 17 ):
  		char.socket.clilocmessage( 502139 )
  		return
--- 34,38 ----
  	# check if the targetted item is a poison potion
  	potion = target.item
! 	if ( not potion or not potion.hastag( 'potiontype' ) ) or ( potion.gettag( 'potiontype' ) < 14  and potion.gettag( 'potiontype' ) > 17 ):
  		char.socket.clilocmessage( 502139 )
  		return

Index: blacksmithing.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/blacksmithing.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** blacksmithing.py	13 Oct 2004 18:45:42 -0000	1.25
--- blacksmithing.py	13 Oct 2004 19:11:13 -0000	1.26
***************
*** 313,317 ****
  			if item.maxhealth <= weaken:
  				player.socket.clilocmessage(500424)
! 				player.log("Tries to repair item %s (0x%x) and destroys it.\n" % (item.baseid, item.serial))
  				item.delete()
  			elif player.checkskill(BLACKSMITHING, 0, 1000):
--- 313,317 ----
  			if item.maxhealth <= weaken:
  				player.socket.clilocmessage(500424)
! 				player.log(LOG_MESSAGE, "Tries to repair item %s (0x%x) and destroys it.\n" % (item.baseid, item.serial))
  				item.delete()
  			elif player.checkskill(BLACKSMITHING, 0, 1000):
***************
*** 320,324 ****
  				item.health = item.maxhealth				
  				item.resendtooltip()
! 				player.log("Repairs item %s (0x%x) and weakens it by %u points.\n" % (item.baseid, item.serial, weaken))
  			else:
  				player.socket.clilocmessage(1044280)
--- 320,324 ----
  				item.health = item.maxhealth				
  				item.resendtooltip()
! 				player.log(LOG_MESSAGE, "Repairs item %s (0x%x) and weakens it by %u points.\n" % (item.baseid, item.serial, weaken))
  			else:
  				player.socket.clilocmessage(1044280)
***************
*** 326,330 ****
  				item.health = max(0, item.health - weaken)
  				item.resendtooltip()
! 				player.log("Fails to repair item %s (0x%x) and weakens it by %u points.\n" % (item.baseid, item.serial, weaken))
  
  			# Warn the user if we'll break the item next time
--- 326,330 ----
  				item.health = max(0, item.health - weaken)
  				item.resendtooltip()
! 				player.log(LOG_MESSAGE, "Fails to repair item %s (0x%x) and weakens it by %u points.\n" % (item.baseid, item.serial, weaken))
  
  			# Warn the user if we'll break the item next time