[wpdev-commits] xmlscripts/scripts/combat aos.py,1.15,1.16

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

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

Modified Files:
	aos.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: aos.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/aos.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** aos.py	20 Jun 2004 20:09:53 -0000	1.15
--- aos.py	5 Sep 2004 21:02:54 -0000	1.16
***************
*** 161,177 ****
  	# See if the npc has specific energy distribution values.
  	if char.npc and not weapon:
  		if char.hastag('dmg_fire'):
  			fire = int(char.gettag('dmg_fire'))
  		if char.hastag('dmg_cold'):
  			cold = int(char.gettag('dmg_cold'))
  		if char.hastag('dmg_poison'):
  			poison = int(char.gettag('dmg_poison'))
  		if char.hastag('dmg_energy'):
  			energy = int(char.gettag('dmg_energy'))
  	elif weapon:
! 		fire = properties.fromitem(weapon, DAMAGE_FIRE)
! 		cold = properties.fromitem(weapon, DAMAGE_COLD)
! 		poison = properties.fromitem(weapon, DAMAGE_POISON)
! 		energy = properties.fromitem(weapon, DAMAGE_ENERGY)
  
  	# See if the energy distribution is correct
--- 161,196 ----
  	# See if the npc has specific energy distribution values.
  	if char.npc and not weapon:
+ 		fire = char.getintproperty( 'dmg_fire', 0 )
  		if char.hastag('dmg_fire'):
  			fire = int(char.gettag('dmg_fire'))
+ 
+ 		cold = char.getintproperty( 'dmg_cold', 0 )
  		if char.hastag('dmg_cold'):
  			cold = int(char.gettag('dmg_cold'))
+ 
+ 		poison = char.getintproperty( 'dmg_poison', 0 )
  		if char.hastag('dmg_poison'):
  			poison = int(char.gettag('dmg_poison'))
+ 
+ 		energy = char.getintproperty( 'dmg_energy', 0 )
  		if char.hastag('dmg_energy'):
  			energy = int(char.gettag('dmg_energy'))
  	elif weapon:
! 		# Physical Damage Distribution
! 		fire = weapon.getintproperty( 'dmg_fire', 0 )
! 		if weapon.hastag( 'dmg_fire' ):
! 			fire = int( weapon.gettag( 'dmg_fire' ) )
! 
! 		cold = weapon.getintproperty( 'dmg_cold', 0 )
! 		if weapon.hastag( 'dmg_cold' ):
! 			cold = int( weapon.gettag( 'dmg_cold' ) )
! 
! 		poison = weapon.getintproperty( 'dmg_poison', 0 )
! 		if weapon.hastag( 'dmg_poison' ):
! 			poison = int( weapon.gettag( 'dmg_poison' ) )
! 
! 		energy = weapon.getintproperty( 'dmg_energy', 0 )
! 		if weapon.hastag( 'dmg_energy' ):
! 			energy = int( weapon.gettag( 'dmg_energy' ) )
  
  	# See if the energy distribution is correct