[wpdev-commits] xmlscripts/scripts/skills animaltaming.py,1.17,1.18

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

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

Modified Files:
	animaltaming.py 
Log Message:
Bugfixes.

Index: animaltaming.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/animaltaming.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** animaltaming.py	25 Aug 2004 17:03:05 -0000	1.17
--- animaltaming.py	9 Sep 2004 17:28:11 -0000	1.18
***************
*** 75,78 ****
--- 75,83 ----
  		return
  
+ 	# Too Many Followers
+ 	if len(char.followers) + totame.controlslots > char.maxcontrolslots:
+ 		socket.clilocmessage( 1049611, "", 0x3b2, 3, totame )
+ 		return
+ 
  	# already tamed
  	if totame.tamed:
***************
*** 170,184 ****
  		if success:
  			removetags( totame )
  			# set owner
! 			totame.tamed = 1
  			totame.owner = char
! 			# increase follower control slot - will be added
! 			# set tamed number
  			num_tamed = 1
  			if totame.hastag( 'num_tamed' ):
  				num_tamed = totame.gettag( 'num_tamed' ) + 1
  			totame.settag( 'num_tamed', num_tamed )
  			# remove "Tame" context menu
! 			totame.addscript('speech.pets')
  
  			# success msg : 502799
--- 175,196 ----
  		if success:
  			removetags( totame )
+ 
+ 			# Too Many Followers
+ 			if len(char.followers) + totame.controlslots > char.maxcontrolslots:
+ 				socket.clilocmessage( 1049611, "", 0x3b2, 3, totame )
+ 				return
+ 
  			# set owner
! 			totame.tamed = True
  			totame.owner = char
! 
! 			# A creature can only be tamed a few times
  			num_tamed = 1
  			if totame.hastag( 'num_tamed' ):
  				num_tamed = totame.gettag( 'num_tamed' ) + 1
  			totame.settag( 'num_tamed', num_tamed )
+ 			
  			# remove "Tame" context menu
! 			totame.addscript('speech.pets') # Only adds if it doesnt exist yet.
  
  			# success msg : 502799