[wpdev-commits] xmlscripts/scripts equipment.py,1.37,1.38

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

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

Modified Files:
	equipment.py 
Log Message:
fix for shields.

Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** equipment.py	8 Sep 2004 04:06:39 -0000	1.37
--- equipment.py	13 Sep 2004 19:14:46 -0000	1.38
***************
*** 68,72 ****
  		if object.hastag('resname'):
  			resname = str(object.gettag('resname'))
! 			if armor and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname):
  				resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
--- 68,72 ----
  		if object.hastag('resname'):
  			resname = str(object.gettag('resname'))
! 			if (armor or shield) and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname):
  				resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
***************
*** 78,82 ****
  		elif object.hasstrproperty( 'resname' ):
  			resname = str( object.getstrproperty( 'resname' ) )
! 			if armor and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname):
  				resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
--- 78,82 ----
  		elif object.hasstrproperty( 'resname' ):
  			resname = str( object.getstrproperty( 'resname' ) )
! 			if (armor or shield) and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname):
  				resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
***************
*** 90,94 ****
  		if object.hastag('resname2'):
  			resname2 = str(object.gettag('resname2'))
! 			if armor and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2):
  				resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
--- 90,94 ----
  		if object.hastag('resname2'):
  			resname2 = str(object.gettag('resname2'))
! 			if (armor or shield) and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2):
  				resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
***************
*** 100,104 ****
  		elif object.hasstrproperty( 'resname2' ):
  			resname2 = str( object.getstrproperty( 'resname2' ) )
! 			if armor and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2):
  				resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
--- 100,104 ----
  		elif object.hasstrproperty( 'resname2' ):
  			resname2 = str( object.getstrproperty( 'resname2' ) )
! 			if (armor or shield) and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2):
  				resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):