[wpdev-commits] xmlscripts/scripts/commands fix.py,1.3,1.4 go.py,1.9,1.10 skillinfo.py,1.5,1.6

[Richard M. <dr...@us...>]

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

Modified Files:
	fix.py go.py skillinfo.py 
Log Message:
Tweaks


Index: fix.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/fix.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fix.py	9 Jul 2004 10:36:57 -0000	1.3
--- fix.py	11 Jul 2004 21:07:13 -0000	1.4
***************
*** 22,28 ****
  
  def commandFix( socket, cmd, args ):
  	socket.sysmessage( "Resending the world, please wait." )
! 	socket.player.update()
! 	socket.player.resendtooltip()
  	socket.sysmessage( "Resend complete." )
  	return True
--- 22,30 ----
  
  def commandFix( socket, cmd, args ):
+ 	char = socket.player
  	socket.sysmessage( "Resending the world, please wait." )
! 	socket.resendplayer()
! 	char.update()
! 	#socket.resendworld()
  	socket.sysmessage( "Resend complete." )
  	return True

Index: go.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/go.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** go.py	9 Jul 2004 21:08:36 -0000	1.9
--- go.py	11 Jul 2004 21:07:13 -0000	1.10
***************
*** 64,68 ****
  		object = target.item
  	elif target.char:
! 		if target.char.rank >= player.rank and player != target.char:
  			player.socket.sysmessage("You've burnt your fingers!")
  			return
--- 64,68 ----
  		object = target.item
  	elif target.char:
! 		if target.char.rank > player.rank and player != target.char:
  			player.socket.sysmessage("You've burnt your fingers!")
  			return

Index: skillinfo.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/skillinfo.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** skillinfo.py	9 Jul 2004 21:08:36 -0000	1.5
--- skillinfo.py	11 Jul 2004 21:07:13 -0000	1.6
***************
*** 7,11 ****
  import wolfpack.gumps
  from wolfpack.utilities import tobackpack
! from wolfpack.consts import ALLSKILLS, SKILLNAMES, LOG_MESSAGE
  from math import ceil, floor
  from commands.info import iteminfo
--- 7,11 ----
  import wolfpack.gumps
  from wolfpack.utilities import tobackpack
! from wolfpack.consts import ALLSKILLS, SKILLNAMES, LOG_MESSAGE, skillnamesids
  from math import ceil, floor
  from commands.info import iteminfo
***************
*** 21,28 ****
  
  	if not target:
! 		return
  
  	# Iterate trough all skills and see what changed
! 	for skill in range(0, ALLSKILLS):
  		try:
  			newvalue = int(floor(float(response.text[0x1000 | skill]) * 10))
--- 21,28 ----
  
  	if not target:
! 		return False
  
  	# Iterate trough all skills and see what changed
! 	for skill in range( 0, ALLSKILLS ):
  		try:
  			newvalue = int(floor(float(response.text[0x1000 | skill]) * 10))
***************
*** 30,34 ****
  		except:
  			player.socket.sysmessage('You have entered invalid values for %s.' % SKILLNAMES[skill])
! 			return
  
  		oldvalue = target.skill[skill]
--- 30,34 ----
  		except:
  			player.socket.sysmessage('You have entered invalid values for %s.' % SKILLNAMES[skill])
! 			return False
  
  		oldvalue = target.skill[skill]