[wpdev-commits] xmlscripts/scripts equipment.py,1.33,1.34

[Richard M. <dr...@us...>]

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

Modified Files:
	equipment.py 
Log Message:
Yay, now the properties transfer to the player status!
Tags should always override.


Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** equipment.py	5 Sep 2004 21:02:54 -0000	1.33
--- equipment.py	6 Sep 2004 17:36:22 -0000	1.34
***************
*** 59,62 ****
--- 59,72 ----
  				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]
  
  		prefix2 = None
***************
*** 71,74 ****
--- 81,94 ----
  				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]
  
  		if len(object.name) == 0:
***************
*** 254,272 ****
  	lower = properties.fromitem(item, LOWERREQS) / 100.0
  
! 	req_str = object.getintproperty( 'req_strength', 0 )
! 	if object.hastag( 'req_strength' ):
! 		req_str = int( object.gettag( 'req_strength' ) )
  	if lower:
  		req_str = int(ceil(req_str) * (1.0 - lower))
  
! 	req_dex = object.getintproperty( 'req_dexterity', 0 )
! 	if object.hastag( 'req_dexterity' ):
! 		req_str = int( object.gettag( 'req_dexterity' ) )
  	if lower:
  		req_dex = int(ceil(req_dex) * (1.0 - lower))
  
! 	req_int = object.getintproperty( 'req_intelligence', 0 )
! 	if object.hastag( 'req_intelligence' ):
! 		req_str = int( object.gettag( 'req_intelligence' ) )
  	if lower:
  		req_int = int(ceil(req_int) * (1.0 - lower))
--- 274,292 ----
  	lower = properties.fromitem(item, LOWERREQS) / 100.0
  
! 	req_str = item.getintproperty( 'req_strength', 0 )
! 	if item.hastag( 'req_strength' ):
! 		req_str = int( item.gettag( 'req_strength' ) )
  	if lower:
  		req_str = int(ceil(req_str) * (1.0 - lower))
  
! 	req_dex = item.getintproperty( 'req_dexterity', 0 )
! 	if item.hastag( 'req_dexterity' ):
! 		req_dex = int( item.gettag( 'req_dexterity' ) )
  	if lower:
  		req_dex = int(ceil(req_dex) * (1.0 - lower))
  
! 	req_int = item.getintproperty( 'req_intelligence', 0 )
! 	if item.hastag( 'req_intelligence' ):
! 		req_int = int( item.gettag( 'req_intelligence' ) )
  	if lower:
  		req_int = int(ceil(req_int) * (1.0 - lower))