[wpdev-commits] xmlscripts/scripts/skills mining.py,1.39,1.40 poisoning.py,1.7,1.8 provocation.py,1.10,1.11

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

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

Modified Files:
	mining.py poisoning.py provocation.py 
Log Message:
more crashfixes

Index: mining.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** mining.py	13 Oct 2004 19:41:03 -0000	1.39
--- mining.py	13 Oct 2004 19:47:48 -0000	1.40
***************
*** 103,107 ****
  		return True
  
! 	tool = args[0]
  
  	#Player also can't mine when riding, polymorphed and dead.
--- 103,107 ----
  		return True
  
! 	tool = wolfpack.finditem(args[0])
  
  	#Player also can't mine when riding, polymorphed and dead.

Index: provocation.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/provocation.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** provocation.py	17 Jul 2004 03:49:21 -0000	1.10
--- provocation.py	13 Oct 2004 19:47:48 -0000	1.11
***************
*** 36,45 ****
  
  	socket.clilocmessage( 0x7A74D, "", 0x3b2, 3 ) # What do you wish to incite?
! 	socket.attachtarget( "skills.provocation.response1", [instrument] )
  	return True
  
  def response1( char, args, target ):
  	socket = char.socket
! 	instrument = args[0]
  
  	if target.item:
--- 36,45 ----
  
  	socket.clilocmessage( 0x7A74D, "", 0x3b2, 3 ) # What do you wish to incite?
! 	socket.attachtarget( "skills.provocation.response1", [instrument.serial] )
  	return True
  
  def response1( char, args, target ):
  	socket = char.socket
! 	instrument = wolfpack.finditem(args[0])
  
  	if target.item:
***************
*** 68,72 ****
  		playinstrument( char, instrument, "success" )
  		socket.clilocmessage( 0xF61D5, "", 0x3b2, 3 ) # You play your music and your target becomes angered.  Whom do you wish them to attack?
! 		socket.attachtarget( "skills.provocation.response2", [target.char, tobardtarget1, instrument] )
  		return True
  
--- 68,72 ----
  		playinstrument( char, instrument, "success" )
  		socket.clilocmessage( 0xF61D5, "", 0x3b2, 3 ) # You play your music and your target becomes angered.  Whom do you wish them to attack?
! 		socket.attachtarget( "skills.provocation.response2", [target.char.serial, tobardtarget1, instrument.serial] )
  		return True
  
***************
*** 77,83 ****
  		return False
  
! 	creature1 = args[0]
  	tobardtarget1 = args[1]
! 	instrument = args[2]
  	tobardtarget2 = tobard( target.char, "provoke" )
  	minimum = int( ( ( tobardtarget1 + tobardtarget2 ) / 2.0 ) - 25.0 )
--- 77,83 ----
  		return False
  
! 	creature1 = wolfpack.findchar(args[0])
  	tobardtarget1 = args[1]
! 	instrument = wolfpack.finditem(args[2])
  	tobardtarget2 = tobard( target.char, "provoke" )
  	minimum = int( ( ( tobardtarget1 + tobardtarget2 ) / 2.0 ) - 25.0 )
***************
*** 162,166 ****
  	socket.settag( 'instrument', serial )
  	socket.clilocmessage( 0x7A753, "", 0x3b2, 3, )
! 	socket.attachtarget( "skills.provocation.response1", [target.item] )
  	return True
  
--- 162,166 ----
  	socket.settag( 'instrument', serial )
  	socket.clilocmessage( 0x7A753, "", 0x3b2, 3, )
! 	socket.attachtarget( "skills.provocation.response1", [target.item.serial] )
  	return True
  
***************
*** 185,189 ****
  		return True
  
! def tobard( char, type ):
  	socket = char.socket
  	value = skilltotal( char )
--- 185,189 ----
  		return True
  
!  char, type ):
  	socket = char.socket
  	value = skilltotal( char )

Index: poisoning.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/poisoning.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** poisoning.py	13 Oct 2004 19:41:03 -0000	1.7
--- poisoning.py	13 Oct 2004 19:47:48 -0000	1.8
***************
*** 40,44 ****
  	# assign target request
  	char.socket.clilocmessage( 502142 )
! 	char.socket.attachtarget( "skills.poisoning.selecttarget", [ potion ] )
  	return 1
  
--- 40,44 ----
  	# assign target request
  	char.socket.clilocmessage( 502142 )
! 	char.socket.attachtarget( "skills.poisoning.selecttarget", [ potion.serial ] )
  	return 1
  
***************
*** 49,53 ****
  		return
  
! 	potion = args[ 0 ]
  	if not potion:
  		return
--- 49,53 ----
  		return
  
! 	potion = wolfpack.finditem(args[ 0 ])
  	if not potion:
  		return