[wpdev-commits] xmlscripts/scripts potions.py,1.40,1.41

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

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

Modified Files:
	potions.py 
Log Message:
Error Fix + Explosion Potion Keg Fix


Index: potions.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** potions.py	12 Jul 2004 21:06:29 -0000	1.40
--- potions.py	13 Jul 2004 06:35:36 -0000	1.41
***************
*** 66,70 ****
  		potiontype = item.gettag( 'potiontype' )
  		# Make sure it's in the index
! 		if not potiontype in potions:
  			return False
  
--- 66,70 ----
  		potiontype = item.gettag( 'potiontype' )
  		# Make sure it's in the index
! 		if not potiontype in POTIONS:
  			return False
  
***************
*** 253,256 ****
--- 253,257 ----
  				# Potion Kegs
  				elif (chainbomb.hastag('kegfill') and chainbomb.hastag('potiontype')) and ( chainbomb.gettag('potiontype') in [11, 12, 13] and chainbomb.gettag('kegfill') >= 1 ):
+ 					chainbomb.settag('exploding', 'true')
  					wolfpack.addtimer(randint(1000, 2250), "potions.potioncountdown", [char.serial, chainbomb.serial, 11, chainbomb.gettag('kegfill') ] )
  					chainbomb = chainregion.next
***************
*** 286,289 ****
--- 287,291 ----
  					chainbomb = chainregion.next
  				elif ( chainbomb.hastag('kegfill') and chainbomb.hastag('potiontype') ) and ( chainbomb.gettag('potiontype') in [11, 12, 13] and chainbomb.gettag('kegfill') >= 1 ):
+ 					chainbomb.settag('exploding', 'true')
  					wolfpack.addtimer(randint(1000, 2250), "potions.potioncountdown", [char.serial, chainbomb.serial, 11, chainbomb.gettag('kegfill') ] )
  					chainbomb = chainregion.next
***************
*** 325,329 ****
  		target.effect(0x3709, 10, 30)
  	target.effect( explosions[randint(0,2)], 20, 10)
! 	energydamage(target, char, damage, fire=100)
  	return
  
--- 327,331 ----
  		target.effect(0x3709, 10, 30)
  	target.effect( explosions[randint(0,2)], 20, 10)
! 	energydamage(target, char, damage, fire=100 )
  	return