[wpdev-commits] xmlscripts/scripts/skills __init__.py,1.18,1.19 lumberjacking.py,1.21,1.22 mining.py,1.38,1.39 poisoning.py,1.6,1.7

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

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

Modified Files:
	__init__.py lumberjacking.py mining.py poisoning.py 
Log Message:
Crash Fixes

Index: mining.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** mining.py	2 Oct 2004 10:04:35 -0000	1.38
--- mining.py	13 Oct 2004 19:41:03 -0000	1.39
***************
*** 45,49 ****
  
  def mining( char, pos, tool ):
! 	char.addtimer( 1300, "skills.mining.domining", [ tool, pos ] )
  	char.socket.settag( 'is_mining', ( wolfpack.time.currenttime() + miningdelay ) )
  	char.turnto( pos )
--- 45,49 ----
  
  def mining( char, pos, tool ):
! 	char.addtimer( 1300, "skills.mining.domining", [ tool.serial, pos ] )
  	char.socket.settag( 'is_mining', ( wolfpack.time.currenttime() + miningdelay ) )
  	char.turnto( pos )
***************
*** 139,143 ****
  def domining(char, args):
  	char.soundeffect( SOUND_MINING )
! 	tool = args[0]
  	pos = args[1]
  	socket = char.socket
--- 139,143 ----
  def domining(char, args):
  	char.soundeffect( SOUND_MINING )
! 	tool = wolfpack.finditem(args[0])
  	pos = args[1]
  	socket = char.socket

Index: poisoning.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/poisoning.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** poisoning.py	13 Oct 2004 19:11:13 -0000	1.6
--- poisoning.py	13 Oct 2004 19:41:03 -0000	1.7
***************
*** 73,82 ****
  	char.soundeffect( 0x4F )
  	# apply poison to the item
! 	char.addtimer( POISONING_DELAY, "skills.poisoning.poisonit", [ potion, target.item ] )
  	return 1
  
  def poisonit( char, args ):
! 	potion = args[ 0 ]
! 	item = args[ 1 ]
  	if not potion or not item:
  		return
--- 73,82 ----
  	char.soundeffect( 0x4F )
  	# apply poison to the item
! 	char.addtimer( POISONING_DELAY, "skills.poisoning.poisonit", [ potion.serial, target.item.serial ] )
  	return 1
  
  def poisonit( char, args ):
! 	potion = wolfpack.finditem(args[ 0 ])
! 	item = wolfpack.finditem(args[ 1 ])
  	if not potion or not item:
  		return

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** __init__.py	17 Jul 2004 07:24:00 -0000	1.18
--- __init__.py	13 Oct 2004 19:41:03 -0000	1.19
***************
*** 100,104 ****
  
  def cleartag( self, args ):
! 	char = args[0]
  	tagname = args[1]
  	self.deltag( tagname )
--- 100,104 ----
  
  def cleartag( self, args ):
! 	char = wolfpack.findchar(args[0])
  	tagname = args[1]
  	self.deltag( tagname )
***************
*** 116,120 ****
  			return False
  		else:
! 			object.addtimer( ANTIMACRODELAY, "skills.cleartag", [char, tagname] )
  			return False
  	else:
--- 116,120 ----
  			return False
  		else:
! 			object.addtimer( ANTIMACRODELAY, "skills.cleartag", [char.serial, tagname] )
  			return False
  	else:

Index: lumberjacking.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** lumberjacking.py	2 Oct 2004 10:04:35 -0000	1.21
--- lumberjacking.py	13 Oct 2004 19:41:03 -0000	1.22
***************
*** 144,148 ****
  	char.addtimer( 2000, "skills.lumberjacking.chop_tree", [pos] )
  	char.addtimer( 3500, "skills.lumberjacking.chop_tree", [pos] )
! 	char.addtimer( 4000, "skills.lumberjacking.successlumberjacking", [pos, resource, amount, tool, resname, woodtable ] )
  	return
  
--- 144,148 ----
  	char.addtimer( 2000, "skills.lumberjacking.chop_tree", [pos] )
  	char.addtimer( 3500, "skills.lumberjacking.chop_tree", [pos] )
! 	char.addtimer( 4000, "skills.lumberjacking.successlumberjacking", [pos, resource.serial, amount, tool.serial, resname, woodtable ] )
  	return
  
***************
*** 176,182 ****
  	socket = char.socket
  	pos = args[0] # Target POS
! 	resource = args[1]
  	amount = args[2]
! 	tool = args[3]
  	resname = args[4]
  	table = args[5]
--- 176,182 ----
  	socket = char.socket
  	pos = args[0] # Target POS
! 	resource = wolfpack.finditem(args[1])
  	amount = args[2]
! 	tool = wolfpack.finditem(args[3])
  	resname = args[4]
  	table = args[5]