[wpdev-commits] xmlscripts/scripts equipment.py,1.34,1.35 potionkeg.py,1.14,1.15

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

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

Modified Files:
	equipment.py potionkeg.py 
Log Message:
Resurrection fix + fame/karma for monsters.
Fix for potion kegs and equipment.

Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** equipment.py	6 Sep 2004 17:36:22 -0000	1.34
--- equipment.py	7 Sep 2004 00:31:03 -0000	1.35
***************
*** 148,155 ****
  
  		# Special weapon range
! 		if object.hasintproperty( 'range' ) or object.hastag( 'range' ):
! 			weaponrange = int( object.getintproperty( 'range' ), 12 )
  			if object.hastag( 'range' ):
  				weaponrange = int( object.gettag( 'range' ) )
  			if weaponrange > 1:
  				tooltip.add( 1061169, str(weaponrange) )
--- 148,156 ----
  
  		# Special weapon range
! 		if object.hasintproperty( 'range' ) or object.hastag( 'range' ):			
  			if object.hastag( 'range' ):
  				weaponrange = int( object.gettag( 'range' ) )
+ 			else:
+ 				weaponrange = int( object.getintproperty( 'range', 12 ) )
  			if weaponrange > 1:
  				tooltip.add( 1061169, str(weaponrange) )

Index: potionkeg.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/potionkeg.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** potionkeg.py	6 Sep 2004 22:30:21 -0000	1.14
--- potionkeg.py	7 Sep 2004 00:31:03 -0000	1.15
***************
*** 33,37 ****
  		return True
  
! 	if potionkeg.id in [ int(0x1ad6), int(0x1ad7), int(0x1940) ]:
  		if potionkeg.hastag( 'potiontype' ):
  			if potion.gettag( 'potiontype' ) == potionkeg.gettag( 'potiontype' ):
--- 33,37 ----
  		return True
  
! 	if potionkeg.id in [0x1ad6, 0x1ad7, 0x1940]:
  		if potionkeg.hastag( 'potiontype' ):
  			if potion.gettag( 'potiontype' ) == potionkeg.gettag( 'potiontype' ):