[wpdev-commits] xmlscripts/scripts/magic circle5.py,1.12,1.13

[Richard M. <dr...@us...>]

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

Modified Files:
	circle5.py 
Log Message:
Fix for summon creature


Index: circle5.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** circle5.py	25 Jul 2004 22:59:08 -0000	1.12
--- circle5.py	9 Aug 2004 18:23:21 -0000	1.13
***************
*** 322,326 ****
  
  	def cast(self, char, mode, args=[], target=None, item=None):
! 		if char.player and char.controlslots + 2 > 5:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
--- 322,326 ----
  
  	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)
***************
*** 331,335 ****
  		char.turnto(target)
  
! 		if char.player and char.controlslots + 2 > 5:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
--- 331,335 ----
  		char.turnto(target)
  
! 		if char.player and char.controlslots + 1 > 5:
  			if char.socket:
  				char.socket.clilocmessage(1049645)
***************
*** 344,360 ****
  			return
  
! 		npcid = random.choice(	['polar_bear', 'grizzly_bear', 'black_bear',
! 														'brown_bear', 'horse_1', 'walrus', 'great_hart',
! 														'hind', 'dog', 'boar', 'chicken', 'rabbit'] )
  
  		creature = wolfpack.addnpc(npcid, target)
! 		creature.tamed = 1
! 		creature.addevent('speech.pets')
! 		creature.controlslots = 2
! 		creature.owner = char
! 		creature.summontime = wolfpack.time.servertime() + int(char.skill[MAGERY] * 400)
! 		creature.summoned = 1
! 		creature.ai = "Animal_Domestic"
! 		creature.soundeffect(0x215)
  
  def onLoad():
--- 344,363 ----
  			return
  
! 		npcid = random.choice( ['polar_bear', 'grizzly_bear', 'black_bear',
! 				'brown_bear', 'horse_1', 'walrus', 'great_hart',
! 				'hind', 'dog', 'boar', 'chicken', 'rabbit'] )
  
  		creature = wolfpack.addnpc(npcid, target)
! 		if creature.controlslots + char.controlslots > 5:
! 			creature.delete()
! 			char.socket.clilocmessage(1049645)
! 		else:
! 			creature.tamed = 1
! 			creature.addevent('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)
  
  def onLoad():