[wpdev-commits] xmlscripts/scripts/combat aos.py,1.18,1.19

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

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

Modified Files:
	aos.py 
Log Message:
#0000313

Index: aos.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/aos.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** aos.py	20 Sep 2004 00:20:52 -0000	1.18
--- aos.py	20 Sep 2004 18:15:24 -0000	1.19
***************
*** 267,275 ****
  		armor.update()
  		if defender.socket:
! 					defender.socket.clilocmessage(500645)
  		armor = None
  
  	# Only players can parry using a shield or a weapon
! 	if defender.player:
  		shield = defender.itemonlayer(LAYER_LEFTHAND)
  		weapon = defender.getweapon()
--- 267,275 ----
  		armor.update()
  		if defender.socket:
! 			defender.socket.clilocmessage(500645)
  		armor = None
  
  	# Only players can parry using a shield or a weapon
! 	if defender.player or defender.skill[PARRYING] > 0:
  		shield = defender.itemonlayer(LAYER_LEFTHAND)
  		weapon = defender.getweapon()
***************
*** 293,297 ****
  		# we can't gain it using a weapon as a shield.
  		# Note: no ranged weapons
! 		elif weapon:
  			# There is a 0.15% chance to block for each skill point
  			chance = defender.skill[PARRYING] * 0.00015
--- 293,297 ----
  		# we can't gain it using a weapon as a shield.
  		# Note: no ranged weapons
! 		elif weapon and weapon.twohanded:
  			# There is a 0.15% chance to block for each skill point
  			chance = defender.skill[PARRYING] * 0.00015