[wpdev-commits] xmlscripts/scripts equipment.py,1.43,1.44

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

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

Modified Files:
	equipment.py 
Log Message:
Fixes

Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** equipment.py	29 Sep 2004 12:33:21 -0000	1.43
--- equipment.py	29 Sep 2004 13:01:33 -0000	1.44
***************
*** 44,62 ****
  		tooltip.add(1060442, str(reflectphysical))
  		
- 	castrecovery = properties.fromitem(object, CASTRECOVERYBONUS)
- 	
- 	if castrecovery:
- 		tooltip.add(1060412, str(castrecovery))
- 		
- 	castspeed = properties.fromitem(object, CASTSPEEDBONUS)
- 	
- 	if castspeed:
- 		tooltip.add(1060413, str(castspeed))
- 	
- 	spelldamagebonus = properties.fromitem(object, SPELLDAMAGEBONUS)
- 	
- 	if spelldamagebonus:
- 		tooltip.add(1060483, str(spelldamagebonus))	
- 
  	luck = properties.fromitem(object, LUCK)
  	if luck != 0:
--- 44,47 ----
***************
*** 106,110 ****
  		tooltip.add(1060438, str(mageweapon))		
  
! 	if properties.fromitem(object, MAGEARMOR):
  		tooltip.add(1060437, "")
  		
--- 91,95 ----
  		tooltip.add(1060438, str(mageweapon))		
  
! 	if properties.fromitem(object, MAGEARMOR) and not object.allowmeditation:
  		tooltip.add(1060437, "")
  		
***************
*** 282,285 ****
--- 267,289 ----
  		if spellchanneling:
  			tooltip.add(1060482, "")
+ 	else:
+ 		spellchanneling = False
+ 	
+ 	# Those are only relevant if its not a shield/weapon or for spellchanneling items
+ 	if (not weapon and not shield) or spellchanneling:
+ 		castrecovery = properties.fromitem(object, CASTRECOVERYBONUS)
+ 		
+ 		if castrecovery:
+ 			tooltip.add(1060412, str(castrecovery))
+ 			
+ 		castspeed = properties.fromitem(object, CASTSPEEDBONUS)
+ 		
+ 		if castspeed:
+ 			tooltip.add(1060413, str(castspeed))
+ 		
+ 		spelldamagebonus = properties.fromitem(object, SPELLDAMAGEBONUS)
+ 		
+ 		if spelldamagebonus:
+ 			tooltip.add(1060483, str(spelldamagebonus))	
  
  	physical = properties.fromitem(object, RESISTANCE_PHYSICAL)