[wpdev-commits] xmlscripts/scripts/magic circle8.py,1.8,1.9 necromancy.py,1.3,1.4 necrospells.py,1.2,1.3 nightsight.py,1.2,1.3 paralyzefield.py,1.2,1.3

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

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

Modified Files:
	circle8.py necromancy.py necrospells.py nightsight.py 
	paralyzefield.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: nightsight.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/nightsight.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nightsight.py	26 May 2004 13:07:23 -0000	1.2
--- nightsight.py	16 Jul 2004 07:09:27 -0000	1.3
***************
*** 1,4 ****
  
! from wolfpack import time
  
  #
--- 1,4 ----
  
! import wolfpack
  
  #

Index: paralyzefield.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/paralyzefield.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** paralyzefield.py	26 May 2004 13:07:23 -0000	1.2
--- paralyzefield.py	16 Jul 2004 07:09:27 -0000	1.3
***************
*** 1,5 ****
  
  import wolfpack
! from wolfpack.consts import *
  
  #
--- 1,5 ----
  
  import wolfpack
! from wolfpack.consts import MAGICRESISTANCE
  
  #

Index: necromancy.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/necromancy.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** necromancy.py	26 May 2004 13:07:23 -0000	1.3
--- necromancy.py	16 Jul 2004 07:09:27 -0000	1.4
***************
*** 13,19 ****
  
  class NecroSpell(Spell):
!     def __init__(self):
!         Spell.__init__(self, 0)
!         self.skill = NECROMANCY
!         self.damageskill = SPIRITSPEAK
!         self.mana = 0
--- 13,19 ----
  
  class NecroSpell(Spell):
! 	def __init__(self):
! 		Spell.__init__(self, 0)
! 		self.skill = NECROMANCY
! 		self.damageskill = SPIRITSPEAK
! 		self.mana = 0

Index: circle8.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle8.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** circle8.py	8 Jun 2004 20:05:19 -0000	1.8
--- circle8.py	16 Jul 2004 07:09:27 -0000	1.9
***************
*** 74,78 ****
  
  		ev = wolfpack.addnpc('summoned_energy_vortex', target)
! 		ev.summontime = wolfpack.time.servertime() + 120000
  		ev.summoned = 1
  		ev.soundeffect(0x212)
--- 74,78 ----
  
  		ev = wolfpack.addnpc('summoned_energy_vortex', target)
! 		ev.summontime = wolfpack.time.currenttime() + 120000
  		ev.summoned = 1
  		ev.soundeffect(0x212)
***************
*** 125,129 ****
  		creature.addevent('speech.pets')
  		creature.owner = char
! 		creature.summontime = wolfpack.time.servertime() + 120000
  		creature.summoned = 1
  		creature.soundeffect(0x217)
--- 125,129 ----
  		creature.addevent('speech.pets')
  		creature.owner = char
! 		creature.summontime = wolfpack.time.currenttime() + 120000
  		creature.summoned = 1
  		creature.soundeffect(0x217)

Index: necrospells.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/necrospells.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** necrospells.py	11 May 2004 15:18:55 -0000	1.2
--- necrospells.py	16 Jul 2004 07:09:27 -0000	1.3
***************
*** 48,52 ****
          #animate.controlslots = 1
          #animate.owner = char
!         #animate.summontime = wolfpack.time.servertime() + 120000
          #animate.summoned = 1
          #item.remove()
\ No newline at end of file
--- 48,52 ----
          #animate.controlslots = 1
          #animate.owner = char
!         #animate.summontime = wolfpack.time.currenttime() + 120000
          #animate.summoned = 1
          #item.remove()
\ No newline at end of file