[wpdev-commits] xmlscripts/scripts/system players.py,1.8,1.9 poison.py,1.7,1.8 trading.py,1.11,1.12

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

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

Modified Files:
	players.py poison.py trading.py 
Log Message:
Possible fix for nightsight problems.

Index: trading.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/trading.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** trading.py	8 Sep 2004 15:09:27 -0000	1.11
--- trading.py	27 Oct 2004 16:38:35 -0000	1.12
***************
*** 27,30 ****
--- 27,31 ----
  	player.deltag('trade_button')
  	player.removescript('system.trading')
+ 	return False
  
  #

Index: poison.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/poison.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** poison.py	27 Oct 2004 14:06:33 -0000	1.7
--- poison.py	27 Oct 2004 16:38:35 -0000	1.8
***************
*** 52,56 ****
  	damage = 1 + int(char.hitpoints * poison[3])
  	damage = min(poison[2], max(poison[1], damage))
! 	energydamage(char, char, damage, poison=100)
  
  	# See if we should add another timer
--- 52,56 ----
  	damage = 1 + int(char.hitpoints * poison[3])
  	damage = min(poison[2], max(poison[1], damage))
! 	energydamage(char, None, damage, poison=100)
  
  	# See if we should add another timer
***************
*** 124,127 ****
--- 124,128 ----
  
  	char.deltag('poison_strokes')
+ 	return False
  
  def poison_target(player, arguments, target):

Index: players.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/players.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** players.py	8 Oct 2004 19:59:51 -0000	1.8
--- players.py	27 Oct 2004 16:38:35 -0000	1.9
***************
*** 10,13 ****
--- 10,14 ----
  	player.update()
  	socket.resendplayer()
+ 	return False
  
  def onLogout( player ):