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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	equipment.py 
Log Message:
Fixed properties

Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** equipment.py	7 Sep 2004 20:09:52 -0000	1.36
--- equipment.py	8 Sep 2004 04:06:39 -0000	1.37
***************
*** 3,6 ****
--- 3,8 ----
  from wolfpack.utilities import *
  from wolfpack.consts import *
+ import wolfpack.weaponinfo
+ import wolfpack.armorinfo
  from wolfpack import properties
  from combat.utilities import weaponskill
***************
*** 66,85 ****
  		if object.hastag('resname'):
  			resname = str(object.gettag('resname'))
! 			if armor and properties.armorinfo.ARMOR_RESNAME_BONI.has_key(resname):
! 				resinfo = properties.armorinfo.ARMOR_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix1 = resinfo[MATERIALPREFIX]
! 			if weapon and properties.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname):
! 				resinfo = properties.weaponinfo.WEAPON_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix1 = resinfo[MATERIALPREFIX]
  		elif object.hasstrproperty( 'resname' ):
  			resname = str( object.getstrproperty( 'resname' ) )
! 			if armor and properties.armorinfo.ARMOR_RESNAME_BONI.has_key(resname):
! 				resinfo = properties.armorinfo.ARMOR_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix1 = resinfo[MATERIALPREFIX]
! 			if weapon and properties.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname):
! 				resinfo = properties.weaponinfo.WEAPON_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix1 = resinfo[MATERIALPREFIX]
--- 68,87 ----
  		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):
  					prefix1 = resinfo[MATERIALPREFIX]
! 			if weapon and wolfpack.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname):
! 				resinfo = wolfpack.weaponinfo.WEAPON_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix1 = resinfo[MATERIALPREFIX]
  		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):
  					prefix1 = resinfo[MATERIALPREFIX]
! 			if weapon and wolfpack.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname):
! 				resinfo = wolfpack.weaponinfo.WEAPON_RESNAME_BONI[resname]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix1 = resinfo[MATERIALPREFIX]
***************
*** 88,107 ****
  		if object.hastag('resname2'):
  			resname2 = str(object.gettag('resname2'))
! 			if armor and properties.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2):
! 				resinfo = properties.armorinfo.ARMOR_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix2 = resinfo[MATERIALPREFIX]
! 			if weapon and properties.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname2):
! 				resinfo = properties.weaponinfo.WEAPON_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix2 = resinfo[MATERIALPREFIX]
  		elif object.hasstrproperty( 'resname2' ):
  			resname2 = str( object.getstrproperty( 'resname2' ) )
! 			if armor and properties.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2):
! 				resinfo = properties.armorinfo.ARMOR_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix2 = resinfo[MATERIALPREFIX]
! 			if weapon and properties.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname2):
! 				resinfo = properties.weaponinfo.WEAPON_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix2 = resinfo[MATERIALPREFIX]
--- 90,109 ----
  		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):
  					prefix2 = resinfo[MATERIALPREFIX]
! 			if weapon and wolfpack.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname2):
! 				resinfo = wolfpack.weaponinfo.WEAPON_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix2 = resinfo[MATERIALPREFIX]
  		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):
  					prefix2 = resinfo[MATERIALPREFIX]
! 			if weapon and wolfpack.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname2):
! 				resinfo = wolfpack.weaponinfo.WEAPON_RESNAME_BONI[resname2]
  				if resinfo.has_key(MATERIALPREFIX):
  					prefix2 = resinfo[MATERIALPREFIX]
***************
*** 187,205 ****
  
  		# Physical Damage Distribution
! 		fire = object.getintproperty( 'dmg_fire', 0 )
! 		if object.hastag( 'dmg_fire' ):
! 			fire = int( object.gettag( 'dmg_fire' ) )
! 
! 		cold = object.getintproperty( 'dmg_cold', 0 )
! 		if object.hastag( 'dmg_cold' ):
! 			cold = int( object.gettag( 'dmg_cold' ) )
! 
! 		poison = object.getintproperty( 'dmg_poison', 0 )
! 		if object.hastag( 'dmg_poison' ):
! 			poison = int( object.gettag( 'dmg_poison' ) )
! 
! 		energy = object.getintproperty( 'dmg_energy', 0 )
! 		if object.hastag( 'dmg_energy' ):
! 			energy = int( object.gettag( 'dmg_energy' ) )
  
  		# This must always total 100
--- 189,196 ----
  
  		# Physical Damage Distribution
! 		fire = properties.fromitem(object, DAMAGE_FIRE)
! 		cold = properties.fromitem(object, DAMAGE_COLD)
! 		poison = properties.fromitem(object, DAMAGE_POISON)
! 		energy = properties.fromitem(object, DAMAGE_ENERGY)
  
  		# This must always total 100
***************
*** 232,254 ****
  			tooltip.add(1060482, "")
  
! 	physical = object.getintproperty( 'res_physical', 0 )
! 	if object.hastag( 'res_physical' ):
! 		physical = int( object.gettag( 'res_physical' ) )
! 
! 	fire = object.getintproperty( 'res_fire', 0 )
! 	if object.hastag( 'res_fire' ):
! 		fire = int( object.gettag( 'res_fire' ) )
! 
! 	cold = object.getintproperty( 'res_cold', 0 )
! 	if object.hastag( 'res_cold' ):
! 		cold = int( object.gettag( 'res_cold' ) )
! 
! 	poison = object.getintproperty( 'res_poison', 0 )
! 	if object.hastag( 'res_poison' ):
! 		poison = int( object.gettag( 'res_poison' ) )
! 
! 	energy = object.getintproperty( 'res_energy', 0 )
! 	if object.hastag( 'res_energy' ):
! 		energy = int( object.gettag( 'res_energy' ) )
  
  	if physical:
--- 223,231 ----
  			tooltip.add(1060482, "")
  
! 	physical = properties.fromitem(object, RESISTANCE_PHYSICAL)
! 	fire = properties.fromitem(object, RESISTANCE_FIRE)
! 	cold = properties.fromitem(object, RESISTANCE_COLD)
! 	poison = properties.fromitem(object, RESISTANCE_POISON)
! 	energy = properties.fromitem(object, RESISTANCE_ENERGY)
  
  	if physical: