[wpdev-commits] xmlscripts/scripts/system makemenus.py,1.23,1.24 trading.py,1.3,1.4

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

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

Modified Files:
	makemenus.py trading.py 
Log Message:
New documentation and a long overdue wolfpack.consts cleanup

Index: makemenus.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/makemenus.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** makemenus.py	18 May 2004 03:58:17 -0000	1.23
--- makemenus.py	2 Jul 2004 13:40:46 -0000	1.24
***************
*** 354,358 ****
  		skillshtml = ''
  		for (skill, values) in self.skills.items():
! 			skillshtml += '%s: %.1f%%<br>' % (skillnames[skill].capitalize(), max(0, values[0] / 10.0))
  		return skillshtml
  
--- 354,358 ----
  		skillshtml = ''
  		for (skill, values) in self.skills.items():
! 			skillshtml += '%s: %.1f%%<br>' % (SKILLNAMES[skill].capitalize(), max(0, values[0] / 10.0))
  		return skillshtml
  

Index: trading.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/trading.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** trading.py	26 May 2004 13:07:26 -0000	1.3
--- trading.py	2 Jul 2004 13:40:46 -0000	1.4
***************
*** 21,25 ****
  		closetrade( player, partner, box1, box2 )
  
! 	return OK
  
  def onTradeAdd( player, item ):
--- 21,25 ----
  		closetrade( player, partner, box1, box2 )
  
! 	return True
  
  def onTradeAdd( player, item ):
***************
*** 34,43 ****
  	#Refuse trading with someone who dragging something ( tag )
  
! 	return OK
  
  def onTradeRemove( player, item ):
  	#not implemented yet in code
  
! 	return OK
  
  def onTradeStart( player1, player2, firstitem ):
--- 34,43 ----
  	#Refuse trading with someone who dragging something ( tag )
  
! 	return True
  
  def onTradeRemove( player, item ):
  	#not implemented yet in code
  
! 	return True
  
  def onTradeStart( player1, player2, firstitem ):
***************
*** 63,67 ****
  
  	if not box1 or not box2:
! 		return OOPS
  
  	#onLogout event should be executed for tradewindow disposing
--- 63,67 ----
  
  	if not box1 or not box2:
! 		return False
  
  	#onLogout event should be executed for tradewindow disposing
***************
*** 94,98 ****
  	firstitem.update()
  
! 	return OK
  
  def onTrade( player, type, buttonstate, itemserial ):
--- 94,98 ----
  	firstitem.update()
  
! 	return True
  
  def onTrade( player, type, buttonstate, itemserial ):
***************
*** 109,115 ****
  		partner = wolfpack.findchar( player.gettag( 'partner' ) )
  		if not partner:
! 			return OOPS
  	else:
! 		return OOPS
  
  	#Get tradecontainers
--- 109,115 ----
  		partner = wolfpack.findchar( player.gettag( 'partner' ) )
  		if not partner:
! 			return False
  	else:
! 		return False
  
  	#Get tradecontainers
***************
*** 129,133 ****
  
  
! 	return OK
  
  def closetrade( player, partner, box1, box2 ):
--- 129,133 ----
  
  
! 	return True
  
  def closetrade( player, partner, box1, box2 ):
***************
*** 150,154 ****
  		box2.delete()
  
! 	return OK
  
  def pressbutton( player, partner, box1, box2 ):
--- 150,154 ----
  		box2.delete()
  
! 	return True
  
  def pressbutton( player, partner, box1, box2 ):
***************
*** 162,166 ****
  	if player.distanceto( partner ) > 2:
  		closetrade( player, partner, box1, box2 )
! 		return OK
  
  	if button1 == 1 and button2 == 1:
--- 162,166 ----
  	if player.distanceto( partner ) > 2:
  		closetrade( player, partner, box1, box2 )
! 		return True
  
  	if button1 == 1 and button2 == 1:
***************
*** 171,175 ****
  		closetrade( player, partner, box1, box2 )
  
! 	return OK
  
  def sendtradepacket( socket, action, partnerserial, box1serial, box2serial, playername ):
--- 171,175 ----
  		closetrade( player, partner, box1, box2 )
  
! 	return True
  
  def sendtradepacket( socket, action, partnerserial, box1serial, box2serial, playername ):
***************
*** 191,195 ****
  	trade.send( socket )
  
! 	return OK
  
  def sendclosetrade( socket, boxserial ):
--- 191,195 ----
  	trade.send( socket )
  
! 	return True
  
  def sendclosetrade( socket, boxserial ):
***************
*** 202,204 ****
  	trade.setint( 4, boxserial )
  	trade.send( socket )
! 	return OK
--- 202,204 ----
  	trade.setint( 4, boxserial )
  	trade.send( socket )
! 	return True