[wpdev-commits] xmlscripts/scripts/tools pickaxe.py,1.6,1.7

[<dr...@pr...>]

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

Modified Files:
	pickaxe.py 
Log Message:
Mining now works great, all four ore types can be dug up. 12 ore types 
(silver, merkite and mythril are added ontop of OSI ones.) There is a few
bugs that I noticed when clicking mountain tiles that are of certain angles
but I think that is hard coded... I'll look into it later.


Index: pickaxe.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/tools/pickaxe.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pickaxe.py	16 Jan 2004 21:14:20 -0000	1.6
--- pickaxe.py	25 Jan 2004 01:26:14 -0000	1.7
***************
*** 17,21 ****
  def onUse( char, tool ):
  	#Already digging ?
! 	if char.hastag( 'is_mining' ) and ( char.gettag( 'is_mining' ) > servertime() ):
  		char.socket.clilocmessage( 503029, "", GRAY, NORMAL ) # You are already digging.
  		return OK
--- 17,21 ----
  def onUse( char, tool ):
  	#Already digging ?
! 	if char.hastag( 'is_mining' ) and ( int( char.gettag( 'is_mining' ) ) > servertime() ):
  		char.socket.clilocmessage( 503029, "", GRAY, NORMAL ) # You are already digging.
  		return OK
***************
*** 23,40 ****
  	# Can't mine on horses
  	if char.itemonlayer( LAYER_MOUNT ):
! 		char.socket.clilocmessage( 501864, "", RED, NORMAL ) # You can't mine while riding.
  		return OK
  	
  	# Who is tool owner ?
  	if tool.getoutmostchar() != char:
! 		char.socket.clilocmessage( 500364, "", RED, NORMAL ) # You can't use that, it belongs to someone else
  		return OK
  	
  	# Is that mining tool ?
! 	if isminingtool(tool):
! 		char.socket.clilocmessage( 503033, "", YELLOW, NORMAL ) # Where do you wish to dig?
  		char.socket.attachtarget( "skills.mining.response", [ tool ] )
  	else:
! 		char.socket.clilocmessage( 500735, "", RED, NORMAL ) # Don't play with things you don't know about. :)
  		return OK
  	
--- 23,40 ----
  	# Can't mine on horses
  	if char.itemonlayer( LAYER_MOUNT ):
! 		char.socket.clilocmessage( 501864, "", GRAY, NORMAL ) # You can't mine while riding.
  		return OK
  	
  	# Who is tool owner ?
  	if tool.getoutmostchar() != char:
! 		char.socket.clilocmessage( 500364, "", GRAY, NORMAL ) # You can't use that, it belongs to someone else
  		return OK
  	
  	# Is that mining tool ?
! 	if isminingtool( tool ):
! 		char.socket.clilocmessage( 503033, "", GRAY, NORMAL ) # Where do you wish to dig?
  		char.socket.attachtarget( "skills.mining.response", [ tool ] )
  	else:
! 		char.socket.clilocmessage( 500735, "", GRAY, NORMAL ) # Don't play with things you don't know about. :)
  		return OK