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

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

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

Modified Files:
	equipment.py 
Log Message:
I'm so sorry for flooding y'alls inboxes...
But here is the property adjustment change for weapons/armor. :)
Now on to NPCs!


Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** equipment.py	3 Sep 2004 01:31:04 -0000	1.32
--- equipment.py	5 Sep 2004 21:02:54 -0000	1.33
***************
*** 128,151 ****
  
  		# Special weapon range
! 		if object.hastag('range'):
! 			weaponrange = int(object.gettag('range'))
  			if weaponrange > 1:
! 				tooltip.add(1061169, str(weaponrange))
  
  		# Max-Mindamage
! 		mindamage = properties.fromitem(object, MINDAMAGE)
! 		maxdamage = properties.fromitem(object, MAXDAMAGE)
! 		tooltip.add(1061168, "%u\t%u" % (mindamage, maxdamage))
  
  		# Speed
! 		speed = properties.fromitem(object, SPEED)
  		tooltip.add(1061167, str(speed))
  
  		# 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)
  		physical = 100 - (fire + cold + poison + energy)
  
  		if physical:
--- 128,178 ----
  
  		# Special weapon range
! 		if object.hasintproperty( 'range' ) or object.hastag( 'range' ):
! 			weaponrange = int( object.getintproperty( 'range' ), 12 )
! 			if object.hastag( 'range' ):
! 				weaponrange = int( object.gettag( 'range' ) )
  			if weaponrange > 1:
! 				tooltip.add( 1061169, str(weaponrange) )
  
  		# Max-Mindamage
! 		mindamage = object.getintproperty( 'mindamage', 1 )
! 		if object.hastag( 'mindamage' ):
! 			mindamage = int( object.gettag( 'mindamage' ) )
! 		maxdamage = object.getintproperty( 'maxdamage', 2 )
! 		if object.hastag( 'maxdamage' ):
! 			mindamage = int( object.gettag( 'maxdamage' ) )
! 		tooltip.add( 1061168, "%u\t%u" % ( mindamage, maxdamage ) )
  
  		# Speed
! 		speed = object.getintproperty( 'speed', 10 )
! 		if object.hastag( 'speed' ):
! 			speed = int( object.gettag( 'speed' ) )
  		tooltip.add(1061167, str(speed))
  
  		# 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
  		physical = 100 - (fire + cold + poison + energy)
+ 		if (physical + fire + cold + poison + energy) != 100:
+ 			physical = 100
+ 			fire = 0
+ 			cold = 0
+ 			poison = 0
+ 			energy = 0
  
  		if physical:
***************
*** 163,167 ****
  		if energy:
  			tooltip.add(1060407, str(energy))
! 			
  		# Spell Channeling
  		spellchanneling = properties.fromitem(object, SPELLCHANNELING)
--- 190,194 ----
  		if energy:
  			tooltip.add(1060407, str(energy))
! 
  		# Spell Channeling
  		spellchanneling = properties.fromitem(object, SPELLCHANNELING)
***************
*** 169,177 ****
  			tooltip.add(1060482, "")
  
! 	fire = properties.fromitem(object, RESISTANCE_FIRE)
! 	cold = properties.fromitem(object, RESISTANCE_COLD)
! 	poison = properties.fromitem(object, RESISTANCE_POISON)
! 	energy = properties.fromitem(object, RESISTANCE_ENERGY)
! 	physical = properties.fromitem(object, RESISTANCE_PHYSICAL)
  
  	if physical:
--- 196,218 ----
  			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:
***************
*** 197,201 ****
  	lower /= 100.0
  
! 	req_str = properties.fromitem(object, REQSTR)
  	if lower:
  		req_str = int(ceil(req_str) * (1.0 - lower))
--- 238,246 ----
  	lower /= 100.0
  
! 	# Tag will override.
! 	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))
***************
*** 209,221 ****
  	lower = properties.fromitem(item, LOWERREQS) / 100.0
  
! 	req_str = properties.fromitem(item, REQSTR)
  	if lower:
  		req_str = int(ceil(req_str) * (1.0 - lower))
  
! 	req_dex = properties.fromitem(item, REQDEX)
  	if lower:
  		req_dex = int(ceil(req_dex) * (1.0 - lower))
  
! 	req_int = properties.fromitem(item, REQINT)
  	if lower:
  		req_int = int(ceil(req_int) * (1.0 - lower))
--- 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))