[wpdev-commits] xmlscripts/scripts/magic circle5.py,1.21,1.22 circle8.py,1.14,1.15

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

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

Modified Files:
	circle5.py circle8.py 
Log Message:
Bugfixes.

Index: circle8.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle8.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** circle8.py	7 Sep 2004 00:31:05 -0000	1.14
--- circle8.py	9 Sep 2004 17:28:11 -0000	1.15
***************
*** 115,119 ****
  
  		# Lowest controlslots we see is 2, Earth Elemental
! 		if char.player and char.controlslots + 2 > 5:
  			char.socket.clilocmessage(1049645)
  			return
--- 115,119 ----
  
  		# Lowest controlslots we see is 2, Earth Elemental
! 		if char.player and char.controlslots + 2 > char.maxcontrolslots:
  			char.socket.clilocmessage(1049645)
  			return
***************
*** 124,135 ****
  		creature = wolfpack.addnpc(self.elementid, target)
  		# If the creature is out of our control, delete it.
! 		if char.player and char.controlslots + creature.controlslots > 5:
  			creature.delete()
  			char.socket.clilocmessage(1049645)
  		else:
! 			creature.addscript('speech.pets')
  			creature.owner = char
  			creature.summontime = wolfpack.time.currenttime() + 120000
! 			creature.summoned = 1
  			creature.soundeffect(0x217)
  
--- 124,136 ----
  		creature = wolfpack.addnpc(self.elementid, target)
  		# If the creature is out of our control, delete it.
! 		if char.player and char.controlslots + creature.controlslots > char.maxcontrolslots:
  			creature.delete()
  			char.socket.clilocmessage(1049645)
  		else:
! 			creature.addscript('speech.pets') # This only adds if it has the event anyway
  			creature.owner = char
+ 			creature.tamed = True
  			creature.summontime = wolfpack.time.currenttime() + 120000
! 			creature.summoned = True
  			creature.soundeffect(0x217)
  

Index: circle5.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** circle5.py	7 Sep 2004 20:09:52 -0000	1.21
--- circle5.py	9 Sep 2004 17:28:11 -0000	1.22
***************
*** 324,328 ****
  
  	def cast(self, char, mode, args=[], target=None, item=None):
! 		if char.player and char.controlslots + 1 > 5:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
--- 324,328 ----
  
  	def cast(self, char, mode, args=[], target=None, item=None):
! 		if char.player and char.controlslots + 1 > char.maxcontrolslots:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
***************
*** 333,337 ****
  		char.turnto(target)
  
! 		if char.player and char.controlslots + 1 > 5:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
--- 333,337 ----
  		char.turnto(target)
  
! 		if char.player and char.controlslots + 1 > char.maxcontrolslots:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
***************
*** 352,364 ****
  		creature = wolfpack.addnpc(npcid, target)
  		# If the creature is out of our control, delete it.
! 		if creature.controlslots + char.controlslots > 5:
  			creature.delete()
  			char.socket.clilocmessage(1049645)
  		else:
! 			creature.tamed = 1
! 			creature.addscript('speech.pets')
  			creature.owner = char
  			creature.summontime = wolfpack.time.servertime() + int(char.skill[MAGERY] * 400)
! 			creature.summoned = 1
  			creature.ai = "Animal_Domestic"
  			creature.soundeffect(0x215)
--- 352,364 ----
  		creature = wolfpack.addnpc(npcid, target)
  		# If the creature is out of our control, delete it.
! 		if creature.controlslots + char.controlslots > char.maxcontrolslots:
  			creature.delete()
  			char.socket.clilocmessage(1049645)
  		else:
! 			creature.tamed = True
! 			creature.addscript('speech.pets') # This only adds if NPC doesnt have it anyway
  			creature.owner = char
  			creature.summontime = wolfpack.time.servertime() + int(char.skill[MAGERY] * 400)
! 			creature.summoned = True
  			creature.ai = "Animal_Domestic"
  			creature.soundeffect(0x215)