[wpdev-commits] xmlscripts/scripts/magic spell.py,1.24,1.25

[Sebastian H. <dar...@us...>]

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

Modified Files:
	spell.py 
Log Message:
fixes

Index: spell.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** spell.py	13 Sep 2004 15:44:43 -0000	1.24
--- spell.py	14 Sep 2004 00:10:52 -0000	1.25
***************
*** 6,10 ****
  from magic.utilities import *
  from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \
! 	MAGERY, ANIM_CASTDIRECTED, SPELLDAMAGEBONUS, LOG_WARNING, SPELLCHANNELING
  import time
  
--- 6,11 ----
  from magic.utilities import *
  from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \
! 	MAGERY, ANIM_CASTDIRECTED, SPELLDAMAGEBONUS, LOG_WARNING, SPELLCHANNELING, \
! 	BODY_HUMAN
  import time
  
***************
*** 141,146 ****
  
  		# Precasting
! 		char.addscript('magic')		
! 		char.action(self.castaction)
  		
  		if item:
--- 142,150 ----
  
  		# Precasting
! 		char.addscript('magic')
! 		
! 		# Show the cast action
! 		if char.bodytype == BODY_HUMAN:
! 			char.action(self.castaction)
  		
  		if item:
***************
*** 231,235 ****
  	def checkrequirements(self, char, mode, args=[], target=None, item=None):
  		if char.dead:
! 			return 0
  
  		if mode == MODE_BOOK:
--- 235,242 ----
  	def checkrequirements(self, char, mode, args=[], target=None, item=None):
  		if char.dead:
! 			return False
! 			
! 		if char.gm:
! 			return True
  
  		if mode == MODE_BOOK:
***************
*** 275,278 ****
--- 282,288 ----
  
  	def consumerequirements(self, char, mode, args=[], target=None, item=None):
+ 		if char.gm:
+ 			return True
+ 		
  		# Check Basic Requirements before proceeding (Includes Death of Caster etc.)
  		if not self.checkrequirements(char, mode, args, target, item):