[wpdev-commits] xmlscripts/scripts/skills armslore.py,1.13,1.14 itemid.py,1.12,1.13

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

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

Modified Files:
	armslore.py itemid.py 
Log Message:
0000296

Index: itemid.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/itemid.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** itemid.py	16 Jul 2004 07:09:27 -0000	1.12
--- itemid.py	14 Sep 2004 03:29:55 -0000	1.13
***************
*** 30,41 ****
  def response(char, args, target):
  	socket = char.socket
- 
  	socket.settag('skill_delay', int( wolfpack.time.currenttime() + ITEMID_DELAY ) )
  
  	# Identify an item and send the buy and sellprice.
  	if target.item:
! 		if not char.canreach(target.item, 4):
! 			socket.clilocmessage(500344)
! 			return
  
  		if not char.checkskill(ITEMID, 0, 1000):
--- 30,45 ----
  def response(char, args, target):
  	socket = char.socket
  	socket.settag('skill_delay', int( wolfpack.time.currenttime() + ITEMID_DELAY ) )
  
  	# Identify an item and send the buy and sellprice.
  	if target.item:
! 		item = target.item
! 		if not item.getoutmostchar() == char:
! 			top = item.getoutmostitem()
! 			if top.container and top.container.ischar():
! 				top = top.container
! 			if not char.canreach(top, 4):
! 				char.socket.clilocmessage( 0x7A27F, "", 0x3b2, 3 )
! 				return False
  
  		if not char.checkskill(ITEMID, 0, 1000):
***************
*** 66,70 ****
  			return
  
! 		char.showname(socket)
  
  	else:
--- 70,74 ----
  			return
  
! 		target.char.showname(socket)
  
  	else:

Index: armslore.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/armslore.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** armslore.py	16 Jul 2004 07:09:27 -0000	1.13
--- armslore.py	14 Sep 2004 03:29:55 -0000	1.14
***************
*** 41,52 ****
  	if item:
  		if not item.getoutmostchar() == char:
! 			if not char.canreach( item, 4 ):
  				char.socket.clilocmessage( 0x7A27F, "", 0x3b2, 3 )
  				return False
  
- 			if not char.distanceto( item ) < 5:
- 				char.socket.clilocmessage( 0x7A27E, "", 0x3b2, 3 )
- 				return False
- 
  		if isweapon( item ) or isarmor( item ) or isshield( item ):
  			char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + ARMSLORE_DELAY ) )
--- 41,51 ----
  	if item:
  		if not item.getoutmostchar() == char:
! 			top = item.getoutmostitem()
! 			if top.container and top.container.ischar():
! 				top = top.container
! 			if not char.canreach(top, 4):
  				char.socket.clilocmessage( 0x7A27F, "", 0x3b2, 3 )
  				return False
  
  		if isweapon( item ) or isarmor( item ) or isshield( item ):
  			char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + ARMSLORE_DELAY ) )