[wpdev-commits] xmlscripts/scripts/magic nightsight.py,1.5,1.6 spell.py,1.15,1.16 utilities.py,1.11,1.12

[Jorge P. <ke...@us...>]

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

Modified Files:
	nightsight.py spell.py utilities.py 
Log Message:
Fixed some indentation errors.

Index: nightsight.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/nightsight.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nightsight.py	24 Aug 2004 17:18:26 -0000	1.5
--- nightsight.py	24 Aug 2004 21:31:33 -0000	1.6
***************
*** 14,18 ****
  	player.lightbonus = max(0, player.lightbonus - bonus)
  
!    player.removeevent('magic.nightsight')
  	player.deltag('nightsight')
  	player.deltag('nightsight_start')
--- 14,18 ----
  	player.lightbonus = max(0, player.lightbonus - bonus)
  
! 	player.removeevent('magic.nightsight')
  	player.deltag('nightsight')
  	player.deltag('nightsight_start')

Index: spell.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** spell.py	24 Aug 2004 17:18:26 -0000	1.15
--- spell.py	24 Aug 2004 21:31:33 -0000	1.16
***************
*** 20,23 ****
--- 20,24 ----
  	return items
  
+ 
  # Recursive Function for removing reagents
  def consumeReagents(item, items):
***************
*** 31,47 ****
  				item.update()
  				del items[key]
- 
  			return items # Reagents normally dont have content
  
  	for subitem in item.content:
  		items = consumeReagents(subitem, items)
- 
  	return items
  
  def callback(char, args):
!    char.removeevent('magic')
  	
  	# target
! 	if args[3] and type(args[3]) == int:
  		target = wolfpack.findobject(args[3])
  		
--- 32,47 ----
  				item.update()
  				del items[key]
  			return items # Reagents normally dont have content
  
  	for subitem in item.content:
  		items = consumeReagents(subitem, items)
  	return items
  
+ 
  def callback(char, args):
! 	char.removeevent('magic')
  	
  	# target
! 	if args[3] and type(args[3]) is int:
  		target = wolfpack.findobject(args[3])
  		
***************
*** 54,58 ****
  	
  	# item
! 	if args[4] and type(args[4]) == int:
  		item = wolfpack.findobject(args[4])
  		
--- 54,58 ----
  	
  	# item
! 	if args[4] and (type(args[4]) is int):
  		item = wolfpack.findobject(args[4])
  		

Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/utilities.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** utilities.py	24 Aug 2004 17:18:26 -0000	1.11
--- utilities.py	24 Aug 2004 21:31:33 -0000	1.12
***************
*** 50,56 ****
  #
  def fizzle(char):
! 	char.dispel(char, 1, "cast_delay")
  
!    char.removeevent('magic')
  
  	if char.socket:
--- 50,56 ----
  #
  def fizzle(char):
! 	char.dispel(char, 1, 'cast_delay')
  
! 	char.removeevent('magic')
  
  	if char.socket: