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

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

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

Modified Files:
	circle5.py circle8.py 
Log Message:
Summons away


Index: circle8.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle8.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** circle8.py	2 Aug 2004 22:25:59 -0000	1.11
--- circle8.py	9 Aug 2004 18:51:38 -0000	1.12
***************
*** 109,118 ****
  		self.reagents = {REAGENT_BLOODMOSS: 1, REAGENT_MANDRAKE: 1, REAGENT_SPIDERSILK: 1}
  		self.casttime = 6000
- 		self.controlslots = 3
  
  	def target(self, char, mode, targettype, target, args, item):
  		char.turnto(target)
  
! 		if char.player and char.controlslots + self.controlslots > 5:
  			char.socket.clilocmessage(1049645)
  			return
--- 109,118 ----
  		self.reagents = {REAGENT_BLOODMOSS: 1, REAGENT_MANDRAKE: 1, REAGENT_SPIDERSILK: 1}
  		self.casttime = 6000
  
  	def target(self, char, mode, targettype, target, args, item):
  		char.turnto(target)
  
! 		# Lowest controlslots we see is 2, Earth Elemental
! 		if char.player and char.controlslots + 2 > 5:
  			char.socket.clilocmessage(1049645)
  			return
***************
*** 122,131 ****
  
  		creature = wolfpack.addnpc(self.elementid, target)
! 		creature.controlslots = self.controlslots
! 		creature.addevent('speech.pets')
! 		creature.owner = char
! 		creature.summontime = wolfpack.time.currenttime() + 120000
! 		creature.summoned = 1
! 		creature.soundeffect(0x217)
  
  class SummonAirElement(SummonElementBase):
--- 122,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.addevent('speech.pets')
! 			creature.owner = char
! 			creature.summontime = wolfpack.time.currenttime() + 120000
! 			creature.summoned = 1
! 			creature.soundeffect(0x217)
  
  class SummonAirElement(SummonElementBase):
***************
*** 165,167 ****
  		self.elementid = 'summoned_daemon'
  		self.casttime = 6000
- 		self.controlslots = 5
--- 169,170 ----

Index: circle5.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** circle5.py	9 Aug 2004 18:23:21 -0000	1.13
--- circle5.py	9 Aug 2004 18:51:38 -0000	1.14
***************
*** 349,352 ****
--- 349,353 ----
  
  		creature = wolfpack.addnpc(npcid, target)
+ 		# If the creature is out of our control, delete it.
  		if creature.controlslots + char.controlslots > 5:
  			creature.delete()