[wpdev-commits] xmlscripts/scripts potions.py,1.45,1.46

[spddmn <xxx...@us...>]

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

Modified Files:
	potions.py 
Log Message:
just a few fixes

Index: potions.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** potions.py	2 Sep 2004 00:44:27 -0000	1.45
--- potions.py	4 Sep 2004 18:28:44 -0000	1.46
***************
*** 16,29 ****
  POTIONS = \
  {
! 	0:		[ True, 0, 0, '#1044542', '#1041620', 'potion_nightsight' ], # nightsight
! 	1:		[ True, 0, 0, '#1044543', '#1041634', 'potion_lesserheal' ], # lesser heal
! 	2:		[ True, 0, 0, '#1044544', '#1041635', 'potion_heal' ], # heal
! 	3:		[ True, 0, 0, '#1044545', '#1041636', 'potion_greaterheal' ], # greater heal
! 	4:		[ True, 0, 0, '#1044552', '#1041621', 'potion_lessercure' ], # lesser cure
! 	5:		[ True, 0, 0, '#1044553', '#1041622', 'potion_cure' ], # cure
! 	6:		[ True, 0, 0, '#1044554', '#1041623', 'potion_greatercure' ], # greater cure
! 	7:		[ True, 0, 0, '#1044540', '#1041624', 'potion_agility' ], # agility
! 	8:		[ True, 0, 0, '#1044541', '#1041625', 'potion_greateragility' ], # greater agility
! 	9:		[ True, 0, 0, '#1044546', '#1041626', 'potion_strength' ], # strength
  	10:	[ True, 0, 0, '#1044547', '#1041627', 'potion_greaterstrength' ], # greater strength
  	11:	[ False, 1, 1, '#1044555', '#1041637', 'potion_lesserexplosion' ], # lesser explosion
--- 16,29 ----
  POTIONS = \
  {
! 	0:  [ True, 0, 0, '#1044542', '#1041620', 'potion_nightsight' ], # nightsight
! 	1:  [ True, 0, 0, '#1044543', '#1041634', 'potion_lesserheal' ], # lesser heal
! 	2:  [ True, 0, 0, '#1044544', '#1041635', 'potion_heal' ], # heal
! 	3:	[ True, 0, 0, '#1044545', '#1041636', 'potion_greaterheal' ], # greater heal
! 	4:	[ True, 0, 0, '#1044552', '#1041621', 'potion_lessercure' ], # lesser cure
! 	5:	[ True, 0, 0, '#1044553', '#1041622', 'potion_cure' ], # cure
! 	6:	[ True, 0, 0, '#1044554', '#1041623', 'potion_greatercure' ], # greater cure
! 	7:	[ True, 0, 0, '#1044540', '#1041624', 'potion_agility' ], # agility
! 	8:	[ True, 0, 0, '#1044541', '#1041625', 'potion_greateragility' ], # greater agility
! 	9:	[ True, 0, 0, '#1044546', '#1041626', 'potion_strength' ], # strength
  	10:	[ True, 0, 0, '#1044547', '#1041627', 'potion_greaterstrength' ], # greater strength
  	11:	[ False, 1, 1, '#1044555', '#1041637', 'potion_lesserexplosion' ], # lesser explosion
***************
*** 50,54 ****
  POT_DEF = 5
  
! explosions = [ 0x36b0, 0x36bd, 0x36cb]
  explodables = [ 'potion_greaterexplosion', 'potion_explosion', 'potion_lesserexplosion', 'f0d' ]
  
--- 50,54 ----
  POT_DEF = 5
  
! explosions = [ 0x36b0, 0x36bd, 0x36cb ]
  explodables = [ 'potion_greaterexplosion', 'potion_explosion', 'potion_lesserexplosion', 'f0d' ]
  
***************
*** 76,82 ****
  				# char, potion, counter value
  				if not item.hastag('exploding'):
! 					potionexplosion( [ char.serial, item.serial, 4, item.amount ] )
  					item.settag('exploding', 'true')
! 				socket.sysmessage( 'Please select a target...', RED )
  				socket.attachtarget( "potions.targetexplosionpotion", [ item ] )
  
--- 76,82 ----
  				# char, potion, counter value
  				if not item.hastag('exploding'):
! 					potionexplosion( item, [ char.serial, 4] )
  					item.settag('exploding', 'true')
! 				socket.sysmessage( 'You should throw this now!', RED )
  				socket.attachtarget( "potions.targetexplosionpotion", [ item ] )
  
***************
*** 120,123 ****
--- 120,124 ----
  		return 0
  	if target.char:
+ 		# i dont think we need some of these...
  		if target.char.invulnerable:
  			return 0
***************
*** 152,158 ****
  		return
  
! 	throwobject(char, potion, pos, 1, 3, 5)
! 	# char, potion, counter value
! 	#potionexplosion( [ char.serial, potion.serial, 4, potion.amount ] )
  	return
  
--- 153,160 ----
  		return
  
! 	#verify the potion still exists to be thrown...
! 	if potion:
! 		throwobject(char, potion, pos, 1, 3, 5)
! 
  	return
  
***************
*** 160,165 ****
  def potionexplosion( potion, args ):
  	char = wolfpack.findchar(args[0])
! 	counter = args[2]
! 	bonus = args[3]
  	if not bonus:
  		bonus = 1
--- 162,167 ----
  def potionexplosion( potion, args ):
  	char = wolfpack.findchar(args[0])
! 	counter = args[1]
! 	bonus = potion.amount
  	if not bonus:
  		bonus = 1