[wpdev-commits] xmlscripts/scripts/system spawns.py,1.10,1.11

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

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

Modified Files:
	spawns.py 
Log Message:


Index: spawns.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/spawns.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** spawns.py	17 Oct 2004 23:35:48 -0000	1.10
--- spawns.py	3 Nov 2004 16:49:02 -0000	1.11
***************
*** 61,80 ****
  	
  			# This is a minimum/maximum spawn interval in minutes
! 			mininterval = 1
! 			maxinterval = 1
! 			if item.hastag('interval'):
! 				interval = item.gettag('interval')
! 				if ',' in interval:
! 					(mininterval, maxinterval) = interval.split(',', 1)
! 					try:
! 						mininterval = max(1, int(mininterval))
! 						maxinterval = max(1, int(maxinterval))
! 						if maxinterval < mininterval:
! 							temp = mininterval
! 							mininterval = maxinterval
! 							maxinterval = temp
! 					except:
! 						mininterval = 1
! 						maxinterval = 1
  	
  			# Currently / Maximimum spawned by this gem
--- 61,77 ----
  	
  			# This is a minimum/maximum spawn interval in minutes
! 			mininterval = 5
! 			if item.hastag('mininterval'):
! 				try:
! 					mininterval = int(item.gettag('mininterval'))
! 				except:
! 					mininterval = 10
! 					
! 			maxinterval = mininterval
! 			if item.hastag('maxinterval'):
! 				try:
! 					maxinterval = int(item.gettag('maxinterval'))
! 				except:
! 					maxinterval = 10
  	
  			# Currently / Maximimum spawned by this gem
***************
*** 109,113 ****
  			# If we didn't have a spawntime set yet.
  			if nextspawn == 0 and current < maximum:
! 				item.settag('nextspawn', currenttime + random.randint(mininterval, maxinterval) * 60 * 1000)
  				continue
  	
--- 106,112 ----
  			# If we didn't have a spawntime set yet.
  			if nextspawn == 0 and current < maximum:
! 				delay = random.randint(mininterval, maxinterval) * 60 * 1000
! 				item.settag('nextspawn', currenttime + delay)
! 				console.log(LOG_MESSAGE, "Set spawntime for spawngem 0x%x to %u miliseconds in the future.\n" % (item.serial, delay))
  				continue