[wpdev-commits] xmlscripts/scripts/wolfpack __init__.py,1.59,1.60 consts.py,1.72,1.73

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

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

Modified Files:
	__init__.py consts.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/wolfpack/__init__.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** __init__.py	7 Jul 2004 13:08:20 -0000	1.59
--- __init__.py	16 Jul 2004 07:09:28 -0000	1.60
***************
*** 22,26 ****
  queueaction = _wolfpack.queueaction
  registerpackethook = _wolfpack.registerpackethook
- currenttime = _wolfpack.currenttime
  charcount = _wolfpack.charcount
  itemcount = _wolfpack.itemcount
--- 22,25 ----
***************
*** 71,75 ****
  	\param serial The serial number of the object.
  	\return An <object id="item">item</object>, <object id="char">char</object>, or None object.
! 	\description This function tries to find an item or character with the given serial and 
  	returns an object if either is found. Otherwise it returns None.
  """
--- 70,74 ----
  	\param serial The serial number of the object.
  	\return An <object id="item">item</object>, <object id="char">char</object>, or None object.
! 	\description This function tries to find an item or character with the given serial and
  	returns an object if either is found. Otherwise it returns None.
  """

Index: consts.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** consts.py	11 Jul 2004 21:07:13 -0000	1.72
--- consts.py	16 Jul 2004 07:09:28 -0000	1.73
***************
*** 305,339 ****
  # Layer Names
  LAYERNAMES = {
!   LAYER_RIGHTHAND: 'Right hand',
!   LAYER_LEFTHAND: 'Shield hand',
!   LAYER_SHOES: 'Shoes',
!   LAYER_PANTS: 'Pants',
!   LAYER_SHIRT: 'Inner Torso',
!   LAYER_HELM: 'Head',
!   LAYER_GLOVES: 'Hands',
!   LAYER_RING: 'Ring Finger',
!   LAYER_UNUSED1: 'Unused',
!   LAYER_NECK: 'Neck',
!   LAYER_HAIR: 'Hair',
!   LAYER_WAIST: 'Waist',
!   LAYER_CHEST: 'Middle Torso',
!   LAYER_BRACELET: 'Wrist',
!   LAYER_UNUSED2: 'Unused 2',
!   LAYER_BEARD: 'Beard',
!   LAYER_TORSO: 'Outer Torso',
!   LAYER_EARRINGS: 'Earrings',
!   LAYER_ARMS: 'Arms',
!   LAYER_CLOAK: 'Cloak',
!   LAYER_BACKPACK: 'Backpack',
!   LAYER_ROBE: 'Robe',
!   LAYER_SKIRT: 'Skirt',
!   LAYER_LEGS: 'Legs',
!   LAYER_MOUNT: 'Mount',
!   LAYER_NPCRESTOCK: 'NPC Restock',
!   LAYER_NPCNORESTOCK: 'NPC No Restock',
!   LAYER_NPCSELL: 'NPC Sell',
!   LAYER_BANKBOX: 'Bankbox',
!   LAYER_DRAGGING: 'Dragging',
!   LAYER_TRADING: 'Trading'
  }
  
--- 305,339 ----
  # Layer Names
  LAYERNAMES = {
! 	LAYER_RIGHTHAND: 'Right hand',
! 	LAYER_LEFTHAND: 'Shield hand',
! 	LAYER_SHOES: 'Shoes',
! 	LAYER_PANTS: 'Pants',
! 	LAYER_SHIRT: 'Inner Torso',
! 	LAYER_HELM: 'Head',
! 	LAYER_GLOVES: 'Hands',
! 	LAYER_RING: 'Ring Finger',
! 	LAYER_UNUSED1: 'Unused',
! 	LAYER_NECK: 'Neck',
! 	LAYER_HAIR: 'Hair',
! 	LAYER_WAIST: 'Waist',
! 	LAYER_CHEST: 'Middle Torso',
! 	LAYER_BRACELET: 'Wrist',
! 	LAYER_UNUSED2: 'Unused 2',
! 	LAYER_BEARD: 'Beard',
! 	LAYER_TORSO: 'Outer Torso',
! 	LAYER_EARRINGS: 'Earrings',
! 	LAYER_ARMS: 'Arms',
! 	LAYER_CLOAK: 'Cloak',
! 	LAYER_BACKPACK: 'Backpack',
! 	LAYER_ROBE: 'Robe',
! 	LAYER_SKIRT: 'Skirt',
! 	LAYER_LEGS: 'Legs',
! 	LAYER_MOUNT: 'Mount',
! 	LAYER_NPCRESTOCK: 'NPC Restock',
! 	LAYER_NPCNORESTOCK: 'NPC No Restock',
! 	LAYER_NPCSELL: 'NPC Sell',
! 	LAYER_BANKBOX: 'Bankbox',
! 	LAYER_DRAGGING: 'Dragging',
! 	LAYER_TRADING: 'Trading'
  }