[wpdev-commits] xmlscripts/scripts/wolfpack utilities.py,1.22,1.23

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

Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv24543/wolfpack

Modified Files:
	utilities.py 
Log Message:
Fix bugs pointed out by Naddel

Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** utilities.py	25 Nov 2003 18:54:12 -0000	1.22
--- utilities.py	12 Jan 2004 05:02:59 -0000	1.23
***************
*** 30,35 ****
  
  	# Calculate the resistances
! 	chance1 = floor( defender.baseskill[ MAGICRESISTANCE ] / 5 )
! 	chance2 = floor( defender.baseskill[ MAGICRESISTANCE ] - ( mage.baseskill[ MAGERY ] / 5 + circle * 5 ) )
  
  	chance = max( [ chance1, chance2 ] ) # The higher chance is used
--- 30,35 ----
  
  	# Calculate the resistances
! 	chance1 = floor( defender.skill[ MAGICRESISTANCE ] / 5 )
! 	chance2 = floor( defender.skill[ MAGICRESISTANCE ] - ( mage.skill[ MAGERY ] / 5 + circle * 5 ) )
  
  	chance = max( [ chance1, chance2 ] ) # The higher chance is used
***************
*** 48,55 ****
  	# If your resistance is lower than your opponents evaluate intelligence, then the equation is:
  	#(1 + (Attackers_EI - Your_resistance) / 500 )
! 	if( defender.baseskill[ MAGICRESISTANCE ] > mage.baseskill[ EVALUATINGINTEL ] ):
! 		damage = damage * ( 1 + ( mage.baseskill[ EVALUATINGINTEL ] - defender.baseskill[ MAGICRESISTANCE ] ) / 200 )
  	else:
! 		damage = damage * ( 1 + ( mage.baseskill[ EVALUATINGINTEL ] - defender.baseskill[ MAGICRESISTANCE ] ) / 500 )
  
  	return damage
--- 48,55 ----
  	# If your resistance is lower than your opponents evaluate intelligence, then the equation is:
  	#(1 + (Attackers_EI - Your_resistance) / 500 )
! 	if( defender.skill[ MAGICRESISTANCE ] > mage.skill[ EVALUATINGINTEL ] ):
! 		damage = damage * ( 1 + ( mage.skill[ EVALUATINGINTEL ] - defender.skill[ MAGICRESISTANCE ] ) / 200 )
  	else:
! 		damage = damage * ( 1 + ( mage.skill[ EVALUATINGINTEL ] - defender.skill[ MAGICRESISTANCE ] ) / 500 )
  
  	return damage