[wpdev-commits] xmlscripts/scripts/skills fishing.py,1.9,1.10 lumberjacking.py,1.16,1.17 mining.py,1.34,1.35

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

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

Modified Files:
	fishing.py lumberjacking.py mining.py 
Log Message:
Updates for timers.
Explosion potions _should_ be a little faster now...


Index: mining.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** mining.py	2 Sep 2004 00:07:08 -0000	1.34
--- mining.py	2 Sep 2004 00:44:29 -0000	1.35
***************
*** 170,174 ****
  		if not veingem.hastag('resource_empty'):
  			duration = random.randint(MINING_REFILLTIME[0], MINING_REFILLTIME[1])
! 			veingem.addtimer( duration, "skills.mining.respawnvein", 1 )
  			veingem.settag('resource_empty', 1)
  		return False
--- 170,174 ----
  		if not veingem.hastag('resource_empty'):
  			duration = random.randint(MINING_REFILLTIME[0], MINING_REFILLTIME[1])
! 			veingem.addtimer( duration, "skills.mining.respawnvein", [], True )
  			veingem.settag('resource_empty', 1)
  		return False
***************
*** 240,244 ****
  	if not gem.hastag('resource_empty') and resourcecount <= 1:
  		delay = random.randint(MINING_REFILLTIME[0], MINING_REFILLTIME[1])
! 		gem.addtimer( delay, "skills.mining.respawnvein", 1 )
  		gem.settag( 'resource_empty', 1 )
  
--- 240,244 ----
  	if not gem.hastag('resource_empty') and resourcecount <= 1:
  		delay = random.randint(MINING_REFILLTIME[0], MINING_REFILLTIME[1])
! 		gem.addtimer( delay, "skills.mining.respawnvein", [], True )
  		gem.settag( 'resource_empty', 1 )
  

Index: fishing.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/fishing.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** fishing.py	2 Sep 2004 00:07:08 -0000	1.9
--- fishing.py	2 Sep 2004 00:44:27 -0000	1.10
***************
*** 261,265 ****
  			resource.decay = 0
  			decaytime = random.randint( FISHING_REFILLTIME[0], FISHING_REFILLTIME[1] )
! 			resource.addtimer( decaytime, 'skills.fishing.resourceDecayTimer', True )
  			resource.update() # Send to GMs
  
--- 261,265 ----
  			resource.decay = 0
  			decaytime = random.randint( FISHING_REFILLTIME[0], FISHING_REFILLTIME[1] )
! 			resource.addtimer( decaytime, 'skills.fishing.resourceDecayTimer', [], True )
  			resource.update() # Send to GMs
  
***************
*** 284,288 ****
  		socket.clilocmessage( 0xf61fd, "", 0x3b2, 3, 0, str(itemname) ) # You pull out an item along with a monster :
  
! def resourceDecayTimer( resource, arguments ):
  	resource.delete()
  	return
--- 284,288 ----
  		socket.clilocmessage( 0xf61fd, "", 0x3b2, 3, 0, str(itemname) ) # You pull out an item along with a monster :
  
! def resourceDecayTimer( resource, args ):
  	resource.delete()
  	return

Index: lumberjacking.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** lumberjacking.py	2 Sep 2004 00:07:08 -0000	1.16
--- lumberjacking.py	2 Sep 2004 00:44:28 -0000	1.17
***************
*** 254,258 ****
  			if not resource.hastag ('resource_empty') and int( resource.gettag( 'resourcecount' ) ) == 0:
  				resource.settag( 'resource_empty', 'true' )
! 				resource.addtimer( woodrespawndelay, "skills.lumberjacking.respawnvein", True )
  		return True
  
--- 254,258 ----
  			if not resource.hastag ('resource_empty') and int( resource.gettag( 'resourcecount' ) ) == 0:
  				resource.settag( 'resource_empty', 'true' )
! 				resource.addtimer( woodrespawndelay, "skills.lumberjacking.respawnvein", [], True )
  		return True