[wpdev-commits] xmlscripts/scripts blades.py,1.7,1.8

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

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

Modified Files:
	blades.py 
Log Message:
Fishing fix.

Index: blades.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/blades.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** blades.py	12 Jul 2004 01:24:48 -0000	1.7
--- blades.py	14 Sep 2004 01:22:49 -0000	1.8
***************
*** 36,48 ****
  	if not item:
  		return
! 
! 	# Check reach
! 	if target.item and not char.canreach(target.item, 5):
! 		char.socket.clilocmessage(500312)
! 		return
! 	elif target.char and not char.canreach(target.char, 5):
  		char.socket.clilocmessage(500312)
  		return
! 	elif target.pos and not char.canreach(target.pos, 5):
  		char.socket.clilocmessage(500312)
  		return
--- 36,45 ----
  	if not item:
  		return
! 		
! 	if target.char and not char.canreach(target.char, 5):
  		char.socket.clilocmessage(500312)
  		return
! 		
! 	elif not target.item and not char.canreach(target.pos, 5):
  		char.socket.clilocmessage(500312)
  		return
***************
*** 52,66 ****
  	model = 0
  
! 	if target.item:
  		if target.item.id == 0x2006 and target.item.corpse:
  			carve_corpse( char, target.item )
  			return
- 		else:
- 			model = target.item.id
  
  		# For cutting fish
! 		if model in fish:
  			cut_fish(char, target.item)
  			return
  
  	# This is for sheering only
--- 49,72 ----
  	model = 0
  
! 	if target.item:	
  		if target.item.id == 0x2006 and target.item.corpse:
+ 			if not char.canreach(target.item, 5):
+ 				char.socket.clilocmessage(500312)
+ 				return
+ 
  			carve_corpse( char, target.item )
  			return
  
  		# For cutting fish
! 		elif target.item.id in fish:
! 			if target.item.getoutmostchar() != char:
! 				char.socket.clilocmessage(500312)
! 				return
! 
  			cut_fish(char, target.item)
  			return
+ 			
+ 		else:
+ 			model = target.item.id
  
  	# This is for sheering only
***************
*** 173,179 ****
  # CUT FISH
  def cut_fish( char, item ):
! 		item_new = wolfpack.additem( "97a" )
! 		item_new.amount = item.amount * 2
! 		if not utilities.tocontainer( item_new, char.getbackpack() ):
! 			item_new.update()
! 		item.delete()
--- 179,185 ----
  # CUT FISH
  def cut_fish( char, item ):
! 	item_new = wolfpack.additem( "97a" )
! 	item_new.amount = item.amount * 2
! 	if not utilities.tocontainer( item_new, char.getbackpack() ):
! 		item_new.update()
! 	item.delete()