[wpdev-commits] xmlscripts/scripts/magic circle1.py,1.9,1.10 circle2.py,1.7,1.8 circle4.py,1.10,1.11 circle5.py,1.11,1.12 circle6.py,1.7,1.8 circle7.py,1.9,1.10

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

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

Modified Files:
	circle1.py circle2.py circle4.py circle5.py circle6.py 
	circle7.py 
Log Message:
Fix for magic.

Index: circle5.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** circle5.py	22 Jul 2004 17:22:06 -0000	1.11
--- circle5.py	25 Jul 2004 22:59:08 -0000	1.12
***************
*** 14,18 ****
  		self.validtarget = TARGET_GROUND
  
! 	def cast(self, char, mode, args=[]):
  		if char.player and char.controlslots >= 5:
  			char.socket.clilocmessage(1049645)
--- 14,18 ----
  		self.validtarget = TARGET_GROUND
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if char.player and char.controlslots >= 5:
  			char.socket.clilocmessage(1049645)
***************
*** 101,105 ****
  		self.mantra = 'Kal In Ex'
  
! 	def cast(self, char, mode, args=[]):
  		if char.incognito or char.polymorph:
  			char.socket.clilocmessage(1005559)
--- 101,105 ----
  		self.mantra = 'Kal In Ex'
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if char.incognito or char.polymorph:
  			char.socket.clilocmessage(1005559)
***************
*** 177,181 ****
  		self.mantra = 'In Jux Sanct'
  
! 	def cast(self, char, mode, args=[]):
  		if not self.consumerequirements(char, mode, args, target, item):
  			return
--- 177,181 ----
  		self.mantra = 'In Jux Sanct'
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if not self.consumerequirements(char, mode, args, target, item):
  			return
***************
*** 321,325 ****
  		self.validtarget = TARGET_GROUND
  
! 	def cast(self, char, mode, args=[]):
  		if char.player and char.controlslots + 2 > 5:
  			if char.socket:
--- 321,325 ----
  		self.validtarget = TARGET_GROUND
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if char.player and char.controlslots + 2 > 5:
  			if char.socket:

Index: circle1.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle1.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** circle1.py	22 Jul 2004 17:22:06 -0000	1.9
--- circle1.py	25 Jul 2004 22:59:08 -0000	1.10
***************
*** 60,64 ****
  		self.mantra = 'In Mani Ylem'
  
! 	def cast(self, char, mode, args=[]):
  		if not self.consumerequirements(char, mode, args, target, item):
  			return
--- 60,64 ----
  		self.mantra = 'In Mani Ylem'
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if not self.consumerequirements(char, mode, args, target, item):
  			return
***************
*** 167,171 ****
  		self.mantra = 'Flam Sanct'
  
! 	def cast(self, char, mode, args=[]):
  		if not self.consumerequirements(char, mode, args, target, item):
  			return
--- 167,171 ----
  		self.mantra = 'Flam Sanct'
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if not self.consumerequirements(char, mode, args, target, item):
  			return

Index: circle6.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle6.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** circle6.py	22 Jul 2004 17:22:06 -0000	1.7
--- circle6.py	25 Jul 2004 22:59:08 -0000	1.8
***************
*** 98,102 ****
  		self.validtarget = TARGET_ITEM
  
! 	def cast(self, char, mode, args=[]):
  		# No Mark Region
  		if not char.region or char.region.nomark:
--- 98,102 ----
  		self.validtarget = TARGET_ITEM
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		# No Mark Region
  		if not char.region or char.region.nomark:

Index: circle7.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** circle7.py	22 Jul 2004 17:22:06 -0000	1.9
--- circle7.py	25 Jul 2004 22:59:08 -0000	1.10
***************
*** 122,126 ****
  		self.validtarget = TARGET_ITEM
  
! 	def cast(self, char, mode, args=[]):
  		if not char.gm:
  			if char.iscriminal():
--- 122,126 ----
  		self.validtarget = TARGET_ITEM
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if not char.gm:
  			if char.iscriminal():

Index: circle4.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle4.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** circle4.py	22 Jul 2004 17:22:06 -0000	1.10
--- circle4.py	25 Jul 2004 22:59:08 -0000	1.11
***************
*** 109,113 ****
  		self.casttime = 2250
  
! 	def cast(self, char, mode, args=[]):
  		if not char.gm:
  			if char.iscriminal():
--- 109,113 ----
  		self.casttime = 2250
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if not char.gm:
  			if char.iscriminal():

Index: circle2.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle2.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** circle2.py	22 Jul 2004 17:22:06 -0000	1.7
--- circle2.py	25 Jul 2004 22:59:08 -0000	1.8
***************
*** 130,134 ****
  		self.mantra = 'Uus Sanct'
  
! 	def cast(self, char, mode, args=[]):
  		if not self.consumerequirements(char, mode, args, target, item):
  			return
--- 130,134 ----
  		self.mantra = 'Uus Sanct'
  
! 	def cast(self, char, mode, args=[], target=None, item=None):
  		if not self.consumerequirements(char, mode, args, target, item):
  			return