[wpdev-commits] xmlscripts/scripts/magic __init__.py,1.8,1.9 firefield.py,1.4,1.5 poisonfield.py,1.3,1.4 polymorph.py,1.3,1.4 rune.py,1.5,1.6 runebook.py,1.5,1.6 spell.py,1.9,1.10 spellbook.py,1.6,1.7 trap.py,1.4,1.5 utilities.py,1.7,1.8

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

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

Modified Files:
	__init__.py firefield.py poisonfield.py polymorph.py rune.py 
	runebook.py spell.py spellbook.py trap.py utilities.py 
Log Message:
import cleanups


Index: rune.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/rune.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rune.py	15 Jul 2004 01:50:41 -0000	1.5
--- rune.py	19 Jul 2004 21:07:36 -0000	1.6
***************
*** 8,13 ****
  #===============================================================#
  
- from wolfpack.gumps import cGump
  import wolfpack
  
  # This function returns 1 if the tested
--- 8,13 ----
  #===============================================================#
  
  import wolfpack
+ from wolfpack.gumps import cGump
  
  # This function returns 1 if the tested

Index: runebook.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/runebook.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** runebook.py	15 Jul 2004 20:31:14 -0000	1.5
--- runebook.py	19 Jul 2004 21:07:36 -0000	1.6
***************
*** 6,11 ****
  #################################################################
  
- from wolfpack.gumps import cGump
  import wolfpack
  from magic.rune import isrune
  from magic.utilities import fizzle
--- 6,11 ----
  #################################################################
  
  import wolfpack
+ from wolfpack.gumps import cGump
  from magic.rune import isrune
  from magic.utilities import fizzle

Index: polymorph.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/polymorph.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** polymorph.py	26 May 2004 13:07:23 -0000	1.3
--- polymorph.py	19 Jul 2004 21:07:36 -0000	1.4
***************
*** 1,6 ****
  
- from wolfpack import console
- from wolfpack.consts import *
  import wolfpack
  from system.makemenus import MakeAction, MakeMenu, findmenu
  from magic import castSpell
--- 1,5 ----
  
  import wolfpack
+ from wolfpack import console
  from system.makemenus import MakeAction, MakeMenu, findmenu
  from magic import castSpell

Index: spell.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** spell.py	20 May 2004 06:32:29 -0000	1.9
--- spell.py	19 Jul 2004 21:07:36 -0000	1.10
***************
*** 1,9 ****
  
  import magic
- from wolfpack.consts import *
- from magic.utilities import *
- import wolfpack.console
  import random
  from wolfpack import properties
  
  # Recursive Function for counting reagents
--- 1,10 ----
  
  import magic
  import random
+ import wolfpack.console
  from wolfpack import properties
+ from magic.utilities import *
+ from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \
+ 	MAGERY, ANIM_CASTDIRECTED, SPELLDAMAGEBONUS, LOG_WARNING \
  
  # Recursive Function for counting reagents

Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/utilities.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** utilities.py	26 May 2004 13:07:23 -0000	1.7
--- utilities.py	19 Jul 2004 21:07:36 -0000	1.8
***************
*** 3,7 ****
  from wolfpack.utilities import *
  from wolfpack import properties
! from wolfpack.consts import *
  
  TARGET_CHAR = 1
--- 3,7 ----
  from wolfpack.utilities import *
  from wolfpack import properties
! from wolfpack.consts import EVALUATINGINTEL, MAGICRESISTANCE \
  
  TARGET_CHAR = 1

Index: firefield.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/firefield.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** firefield.py	26 May 2004 13:07:23 -0000	1.4
--- firefield.py	19 Jul 2004 21:07:36 -0000	1.5
***************
*** 1,5 ****
  
  import wolfpack
- from wolfpack.consts import *
  from wolfpack.utilities import energydamage
  
--- 1,4 ----

Index: trap.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/trap.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** trap.py	26 May 2004 13:07:23 -0000	1.4
--- trap.py	19 Jul 2004 21:07:36 -0000	1.5
***************
*** 6,10 ****
  
  import wolfpack
- from wolfpack.consts import *
  from wolfpack.utilities import energydamage
  
--- 6,9 ----

Index: spellbook.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spellbook.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** spellbook.py	26 May 2004 13:07:23 -0000	1.6
--- spellbook.py	19 Jul 2004 21:07:36 -0000	1.7
***************
*** 28,33 ****
  """
  
- from math import floor,ceil
  import wolfpack
  
  def commandAddSpell( socket, command, arguments ):
--- 28,33 ----
  """
  
  import wolfpack
+ from math import floor,ceil
  
  def commandAddSpell( socket, command, arguments ):

Index: poisonfield.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/poisonfield.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** poisonfield.py	26 May 2004 13:07:23 -0000	1.3
--- poisonfield.py	19 Jul 2004 21:07:36 -0000	1.4
***************
*** 1,5 ****
  
  import wolfpack
- from wolfpack.consts import *
  from wolfpack.utilities import energydamage
  from system import poison
--- 1,4 ----

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** __init__.py	26 May 2004 13:07:22 -0000	1.8
--- __init__.py	19 Jul 2004 21:07:35 -0000	1.9
***************
*** 8,18 ****
  #===============================================================#
  
! from wolfpack.consts import *
  from magic.utilities import *
  from magic.spell import *
  from wolfpack import console
  
- import wolfpack
- 
  # Spell Registry
  spells = {}
--- 8,17 ----
  #===============================================================#
  
! import wolfpack
! from wolfpack.consts import LOG_ERROR, EVENT_CASTSPELL
  from magic.utilities import *
  from magic.spell import *
  from wolfpack import console
  
  # Spell Registry
  spells = {}