[wpdev-commits] xmlscripts/scripts/combat __init__.py,1.12,1.13

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

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

Modified Files:
	__init__.py 
Log Message:
More import cleanups...
Removed wolfpack.currentime() and moved it to wolfpack.time.currenttime() / wolfpack.time.servertime()
It seems to belong here more than it would in wolfpack.currenttime()

Scripts updated to support this.


Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/__init__.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** __init__.py	16 Jun 2004 20:18:43 -0000	1.12
--- __init__.py	16 Jul 2004 07:09:26 -0000	1.13
***************
*** 1,4 ****
--- 1,5 ----
  
  import wolfpack
+ import wolfpack.time
  from wolfpack.consts import *
  import combat.aos
***************
*** 44,48 ****
  			if weapon and (weapon.type == 1007 or weapon.type == 1006):
  				# We have to be standing for >= 1000 ms, otherwise try again later
! 				if attacker.lastmovement + 1000 > wolfpack.currenttime():
  					attacker.nextswing = attacker.lastmovement + 1000
  					return
--- 45,49 ----
  			if weapon and (weapon.type == 1007 or weapon.type == 1006):
  				# We have to be standing for >= 1000 ms, otherwise try again later
! 				if attacker.lastmovement + 1000 > wolfpack.time.currenttime():
  					attacker.nextswing = attacker.lastmovement + 1000
  					return