wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] xmlscripts/scripts/commands skillinfo.py,1.6,1.7

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

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

Modified Files:
	skillinfo.py 
Log Message:
Fixed scrolls, tried to fix skillinfo...
skillinfo still hangs my client...


Index: skillinfo.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/skillinfo.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** skillinfo.py	11 Jul 2004 21:07:13 -0000	1.6
--- skillinfo.py	18 Jul 2004 01:41:47 -0000	1.7
***************
*** 7,11 ****
  import wolfpack.gumps
  from wolfpack.utilities import tobackpack
! from wolfpack.consts import ALLSKILLS, SKILLNAMES, LOG_MESSAGE, skillnamesids
  from math import ceil, floor
  from commands.info import iteminfo
--- 7,11 ----
  import wolfpack.gumps
  from wolfpack.utilities import tobackpack
! from wolfpack.consts import *
  from math import ceil, floor
  from commands.info import iteminfo
***************
*** 60,64 ****
  	dialog.addGump(30, -1, 10420, 0)
  	dialog.addResizeGump(66, 40, 9200, 405, 65)
! 	dialog.addText(108, 52, "Wolfpack Skillinfo Command", 2100)
  	dialog.addTiledGump(90, 11, 164, 17, 10250, 0)
  	dialog.addGump(474, 12, 10431, 0)
--- 60,64 ----
  	dialog.addGump(30, -1, 10420, 0)
  	dialog.addResizeGump(66, 40, 9200, 405, 65)
! 	dialog.addText(108, 52, unicode("Wolfpack Skillinfo Command"), 2100)
  	dialog.addTiledGump(90, 11, 164, 17, 10250, 0)
  	dialog.addGump(474, 12, 10431, 0)
***************
*** 78,97 ****
  	# 80 pixel diameter
  	pages = int(ceil(ALLSKILLS / 5.0))
! 
! 	for page in range(1, pages + 1):
  		dialog.startPage(page)
- 
  		if page > 1:
  			dialog.addPageButton(60, 444, 9909, 9911, page - 1)
! 			dialog.addText(88, 444, "Previous Page", 2100)
! 
  		if page < pages:
  			dialog.addPageButton(448, 444, 9903, 9905, page + 1)
! 			dialog.addText(376, 448, "Next Page", 2100)
  
  		yoffset = 0
- 
  		for i in range(0, 5):
! 			skill = (page - 1) * 5 + i
  
  			if skill >= ALLSKILLS:
--- 78,95 ----
  	# 80 pixel diameter
  	pages = int(ceil(ALLSKILLS / 5.0))
! 	page = 0
! 	while page <= pages:
! 		page += 1
  		dialog.startPage(page)
  		if page > 1:
  			dialog.addPageButton(60, 444, 9909, 9911, page - 1)
! 			dialog.addText(88, 444, unicode("Previous Page"), 2100)
  		if page < pages:
  			dialog.addPageButton(448, 444, 9903, 9905, page + 1)
! 			dialog.addText(376, 448, unicode("Next Page"), 2100)
  
  		yoffset = 0
  		for i in range(0, 5):
! 			skill = int(((page - 1) * 5) + i)
  
  			if skill >= ALLSKILLS:
***************
*** 99,114 ****
  
  			skillname = SKILLNAMES[skill]
! 			skillname = skillname[0].upper() + skillname[1:]
  
  			dialog.addResizeGump(65, 109 + yoffset, 9200, 405, 62)
! 			dialog.addText(76, 115 + yoffset, "Skill: %s (%u)" % (skillname, skill), 2100)
  			dialog.addResizeGump(123, 135 + yoffset, 9300, 63, 26)
! 			dialog.addText(76, 137 + yoffset, "Value:", 2100)
! 			dialog.addText(187, 138 + yoffset, "%", 2100)
! 			dialog.addInputField(128, 138 + yoffset, 50, 20, 2100, 0x1000 | skill, "%0.01f" % (target.char.skill[skill] / 10.0))
! 			dialog.addText(232, 138 + yoffset, "Cap:", 2100)
! 			dialog.addText(329, 139 + yoffset, "%", 2100)
  			dialog.addResizeGump(264, 135 + yoffset, 9300, 63, 26)
! 			dialog.addInputField(268, 139 + yoffset, 53, 20, 2100, 0x2000 | skill, "%0.01f" % (target.char.skillcap[skill] / 10.0))
  
  			yoffset += 65
--- 97,114 ----
  
  			skillname = SKILLNAMES[skill]
! 			skillname = str( skillname[0].upper() + skillname[1:] )
! 			skillvalue = ( target.char.skill[skill] / 10.0 )
! 			skillcapvalue = ( target.char.skillcap[skill] / 10.0 )
  
  			dialog.addResizeGump(65, 109 + yoffset, 9200, 405, 62)
! 			dialog.addText(76, 115 + yoffset, unicode( "Skill: %s (%i)" % (skillname, skill) ), 2100)
  			dialog.addResizeGump(123, 135 + yoffset, 9300, 63, 26)
! 			dialog.addText(76, 137 + yoffset, unicode( "Value:" ), 2100)
! 			dialog.addText(187, 138 + yoffset, unicode( "%" ), 2100)
! 			dialog.addInputField(128, 138 + yoffset, 50, 20, 2100, 0x1000 | skill, unicode( "%0.1f" % skillvalue ) )
! 			dialog.addText(232, 138 + yoffset, unicode( "Cap:" ), 2100)
! 			dialog.addText(329, 139 + yoffset, unicode( "%" ), 2100)
  			dialog.addResizeGump(264, 135 + yoffset, 9300, 63, 26)
! 			dialog.addInputField(268, 139 + yoffset, 53, 20, 2100, 0x2000 | skill, unicode( "%0.1f" % skillcapvalue ) )
  
  			yoffset += 65

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.27,1.28

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26860/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
This was easier than I thought.


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ChangeLog.wolfpack	17 Jul 2004 11:50:52 -0000	1.27
--- ChangeLog.wolfpack	17 Jul 2004 12:58:06 -0000	1.28
***************
*** 8,12 ****
  		- Removed commands: tags, addevent, removeevent, account,
  			resurrect, password, tele, invis, kill, fix, resend,
! 			allskills, remove, move
  		- Region Updates/Fixes.
  			Added flags: noentermessage and noguardmessage
--- 8,12 ----
  		- Removed commands: tags, addevent, removeevent, account,
  			resurrect, password, tele, invis, kill, fix, resend,
! 			allskills, remove, move, who
  		- Region Updates/Fixes.
  			Added flags: noentermessage and noguardmessage
***************
*** 32,36 ****
  		- New commands: taginfo, addevent, removeevent, account,
  			resurrect, password, tele, invis, kill, fix, resend,
! 			allskills, remove, move
  		- Fixed carving
  		- Fixed sheering of sheeps and wool regrowing
--- 32,36 ----
  		- New commands: taginfo, addevent, removeevent, account,
  			resurrect, password, tele, invis, kill, fix, resend,
! 			allskills, remove, move, who
  		- Fixed carving
  		- Fixed sheering of sheeps and wool regrowing

[wpdev-commits] wolfpack commands.cpp,1.249,1.250

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

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

Modified Files:
	commands.cpp 
Log Message:
Removed who from the core


Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.249
retrieving revision 1.250
diff -C2 -d -r1.249 -r1.250
*** commands.cpp	13 Jul 2004 22:51:07 -0000	1.249
--- commands.cpp	17 Jul 2004 12:56:51 -0000	1.250
***************
*** 448,465 ****
  
  /*
- 	\command who
- 	\description Manage connected clients.
- 	\notes The gump shown will allow you to travel to the client, send messages or bring them directly to you.
- */
- void commandWho( cUOSocket* socket, const QString& command, const QStringList& args ) throw()
- {
- 	Q_UNUSED( args );
- 	Q_UNUSED( command );
- 	// Who
- 	cWhoMenuGump* pGump = new cWhoMenuGump( 1 );
- 	socket->send( pGump );
- }
- 
- /*
  	\command pages
  	\description Manage support tickets.
--- 448,451 ----
***************
*** 943,947 ****
  	{ "STAFF", commandStaff },
  	{ "SPAWNREGION", commandSpawnRegion },
- 	{ "WHO", commandWho },
  	{ NULL, NULL }
  };
--- 929,932 ----

[wpdev-commits] xmlscripts/scripts/commands password.py,1.2,1.3 who.py,1.1,1.2

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

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

Modified Files:
	password.py who.py 
Log Message:
Tweaks to password.py
Added the documentation info to who.py


Index: who.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/who.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** who.py	17 Jul 2004 12:29:08 -0000	1.1
--- who.py	17 Jul 2004 12:56:22 -0000	1.2
***************
*** 1,3 ****
! 
  import wolfpack
  import wolfpack.sockets
--- 1,13 ----
! #===============================================================#
! #   )      (\_     | WOLFPACK 13.0.0 Scripts
! #  ((    _/{  "-;  | Created by: Dreoth
! #   )).-' {{ ;'`   | Revised by:
! #  ( (  ;._ \\ ctr | Last Modification: Ported from core
! #===============================================================#
! """
! 	\command who
! 	\description Manage connected clients.
! 	\notes The gump shown will allow you to travel to the client, send messages or bring them directly to you.
! """
  import wolfpack
  import wolfpack.sockets

Index: password.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/password.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** password.py	9 Jul 2004 21:08:36 -0000	1.2
--- password.py	17 Jul 2004 12:56:22 -0000	1.3
***************
*** 19,35 ****
  # Handles the password command
  def commandPassword( socket, cmd, args ):
  	char = socket.player
  	args = args.strip()
  	account = wolfpack.accounts.find( char.account.name )
! 	if len(args) == 0:
  		socket.sysmessage( "Usage: password <newpassword>" )
  		return False
! 	elif len( args ) > 0:
! 		password = args[0]
  		if len( password ) > 16:
  			socket.sysmessage( "Your password can have a maximum of 16 characters." )
  			return False
  		else:
! 			account.password = password
  			socket.sysmessage( "Your password has been changed." )
  			char.log( LOG_MESSAGE, "Account %s changed their password.\n" % char.serial )
--- 19,37 ----
  # Handles the password command
  def commandPassword( socket, cmd, args ):
+ 	account = None
+ 	password = None
  	char = socket.player
  	args = args.strip()
  	account = wolfpack.accounts.find( char.account.name )
! 	password = str( args )
! 	if len( password ) == 0:
  		socket.sysmessage( "Usage: password <newpassword>" )
  		return False
! 	elif len( password ) > 0:
  		if len( password ) > 16:
  			socket.sysmessage( "Your password can have a maximum of 16 characters." )
  			return False
  		else:
! 			account.password = str( password )
  			socket.sysmessage( "Your password has been changed." )
  			char.log( LOG_MESSAGE, "Account %s changed their password.\n" % char.serial )

[wpdev-commits] xmlscripts/definitions scripts.xml,1.147,1.148

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

Update of /cvsroot/wpdev/xmlscripts/definitions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23547

Modified Files:
	scripts.xml 
Log Message:
Who!


Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** scripts.xml	17 Jul 2004 07:23:18 -0000	1.147
--- scripts.xml	17 Jul 2004 12:29:31 -0000	1.148
***************
*** 118,121 ****
--- 118,122 ----
  	<script>commands.turnitem</script>
  	<script>commands.where</script>
+ 	<script>commands.who</script>
  	<script>commands.wipe</script>
  

[wpdev-commits] xmlscripts/scripts/wolfpack sockets.py,1.4,1.5

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

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

Modified Files:
	sockets.py 
Log Message:
By popular demand, we can who people and travel to and from them!


Index: sockets.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/sockets.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sockets.py	2 Jul 2004 13:40:47 -0000	1.4
--- sockets.py	17 Jul 2004 12:29:08 -0000	1.5
***************
*** 16,17 ****
--- 16,18 ----
  next = _wolfpack.sockets.next
  count = _wolfpack.sockets.count
+ 

[wpdev-commits] xmlscripts/scripts/commands who.py,NONE,1.1 info.py,1.11,1.12

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

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

Modified Files:
	info.py 
Added Files:
	who.py 
Log Message:
By popular demand, we can who people and travel to and from them!


--- NEW FILE: who.py ---

import wolfpack
import wolfpack.sockets
import wolfpack.accounts
import commands.info
import math
from wolfpack.gumps import cGump

def onLoad():
	wolfpack.registercommand( "who", cmdWho )
	return

def cmdWho( socket, command, argstring ):
	wholist = []
	worldsocketcount = wolfpack.sockets.count()
	worldsocket = wolfpack.sockets.first()
	while worldsocket:
		wholist += [ worldsocket.player.serial ]
		worldsocket = wolfpack.sockets.next()

	if len(wholist) == 0:
		return False

	gump = cGump( 0, 0, 0, 50, 50 )
	gump.addBackground( 0xE10, 380, 360 )
	gump.addCheckerTrans( 15, 15, 350, 330 );
	gump.addGump( 130, 18, 0xFA8 )
	gump.addText( 165, 20, unicode("Who Menu"), 0x530 )
	# Close Button
	gump.addButton( 30, 320, 0xFB1, 0xFB3, 0 )
	gump.addText( 70, 320, unicode("Close"), 0x834 )
	# Start The First Page
	# Notes, 10 per page
	# Pages to create, (( socketcount / 10) + 1 )
	# Player list increases by 22 pixels
	maxpages = ((worldsocketcount / 10) + 1)
	page = 0
	serialcount = 0
	while page <= maxpages:
		page += 1
		gump.startPage( page )
		gump.addText( 280, 320, unicode( "Page %i of %i" % ( page, maxpages ) ), 0x834 )
		if page < maxpages:
			gump.addPageButton( 260, 320, 0x0FA, 0x0FA, page + 1 )
		if page > 1:
			gump.addPageButton( 240, 320, 0x0FC, 0x0FC, page - 1 )
		upby = 22
		for serial in wholist:
			if not serial:
				break
			player = wolfpack.findchar( serial )
			# serialcount + 10 for callback, we will -10 there and look at wholist.
			gump.addButton( 20, 40 + upby, 0xFA5, 0xFA7, ( serialcount + 10 ) )
			gump.addText( 50, 40 + upby, unicode( "%s [%s]" % ( player.name, player.account.name ) ), 0x834 )
			gump.addText( 240, 40 + upby, unicode( "%s" % player.socket.address ), 0x834 )
			upby += 22
			serialcount += 1
			if serialcount == ((page * 10) - 1):
				break

	gump.setArgs( [ wholist ] )
	gump.setCallback( "commands.who.callbackWho" )
	gump.send( socket )
	return

def callbackWho( char, args, choice ):
	socket = char.socket
	wholist = args[0]
	if choice.button == 0:
		return False
	elif wholist[ choice.button - 10 ]:
		player = wolfpack.findchar( wholist[ choice.button - 10 ] )
		pos = player.pos
		account = player.account
		# Socket Information
		gump = cGump( 0, 0, 0, 50, 50 )
		gump.addBackground( 0xE10, 440, 340 )
		gump.addResizeGump( 195, 260, 0xBB8, 205, 20 )
		gump.addCheckerTrans( 15, 15, 410, 310 )
		gump.addGump( 160, 18, 0xFA2 )
		gump.addText( 195, 20, unicode( "Socket Menu" ), 0x530 )
		gump.addText( 70, 300, unicode("Close"), 0x834 )
		gump.addButton( 30, 300, 0xFB1, 0xFB3, 0 )
		gump.startPage( 1 )
		gump.addText( 50, 60, unicode( "Char name:" ), 0x834 )
		gump.addText( 250, 60, unicode( "%s" % player.name ), 0x834 )
		gump.addText( 50, 80, unicode( "IP:" ), 0x834 )
		gump.addText( 250, 80, unicode( "%s" % player.socket.address ), 0x834 )
		gump.addText( 50, 100, unicode( "Position:" ), 0x834 )
		gump.addText( 250, 100, unicode( "%i,%i,%i,%i" % ( pos.x, pos.y, pos.z, pos.map ) ), 0x834 )
		gump.addText( 50, 120, unicode( "Region:" ), 0x834 )
		gump.addText( 250, 120, unicode( "%s" % player.region ), 0x834 )
		gump.addText( 50, 140, unicode( "Account / ACL:" ), 0x834 )
		gump.addText( 250, 140, unicode( "%s / %s" % ( account.name, account.acl) ), 0x834 )
		# Actions
		# Go To Char
		gump.addButton( 20, 180, 0xFA5, 0xFA7, 1 )
		gump.addText( 50, 180, unicode( "Go to position" ), 0x834 )
		# Bring Char
		gump.addButton( 20, 200, 0xFA5, 0xFA7, 2 )
		gump.addText( 50, 200, unicode( "Bring char" ), 0x834 )
		# Jail Char
		gump.addButton( 20, 220, 0xFA5, 0xFA7, 3 )
		gump.addText( 50, 220, unicode( "Jail char" ), 0x834 )
		# Forgive Char
		gump.addButton( 220, 220, 0xFA5, 0xFA7, 4 )
		gump.addText( 250, 220, unicode( "Forgive char" ), 0x834 )
		# Show Char Info Gump
		gump.addButton( 220, 180, 0xFAB, 0xFAD, 5 )
		gump.addText( 250, 180, unicode( "Show char info gump" ), 0x834 )
		# Send Message
		gump.addButton( 20, 260, 0xFBD, 0xFBF, 6 )
		gump.addText( 50, 260, unicode( "Send message:" ), 0x834 )
		gump.addInputField( 200, 260, 190, 16, 0x834, 1, unicode( "<msg>" ) )
		# Disconnect
		gump.addButton( 220, 200, 0xFA5, 0xFA7, 7 )
		gump.addText( 250, 200, unicode( "Disconnect" ), 0x834 )
		# Stuff and Send
		gump.setCallback( "commands.who.callbackSocket" )
		gump.setArgs( [ player.serial ] )
		gump.send( socket )
		return True
	else:
		return False


def callbackSocket( char, args, choice ):
	socket = char.socket
	player = wolfpack.findchar( args[0] )
	textentries = choice.text
	keys = textentries.keys()
	# Cancel
	if choice.button == 0:
		return False
	# Disconnect
	elif choice.button == 7:
		player.socket.disconnect()
		return True
	# Send Message
	elif choice.button == 6:
		for key in keys:
			if key == 1:
				player.socket.sysmessage( textentries[ key ] )
				break
		return True
	# Char Info
	elif choice.button == 5:
		commands.info.charinfo( socket, player )
		return True
	# Forgive player
	elif choice.button == 4:
		socket.sysmessage( "Jailing system is not yet complete." )
		return True
	# Jail player
	elif choice.button == 3:
		socket.sysmessage( "Jailing system is not yet complete." )
		return True
	# Bring player
	elif choice.button == 2:
		if player.serial != char.serial:
			player.removefromview()
			player.moveto(char.pos)
			player.update()
			player.socket.resendworld()
		return True
	# Go to player
	elif choice.button == 1:
		if player.serial != char.serial:
			char.removefromview()
			char.moveto(player.pos)
			char.update()
			char.socket.resendworld()
		return True

	return True

Index: info.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** info.py	15 Jun 2004 20:12:09 -0000	1.11
--- info.py	17 Jul 2004 12:29:07 -0000	1.12
***************
*** 18,22 ****
  import wolfpack.gumps
  from wolfpack.consts import *
! from wolfpack.gumps import *
  from wolfpack.utilities import *
  from wolfpack import *
--- 18,22 ----
  import wolfpack.gumps
  from wolfpack.consts import *
! from wolfpack.gumps import cGump
  from wolfpack.utilities import *
  from wolfpack import *

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.26,1.27

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18976/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
oops, wasn't thinking there.


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ChangeLog.wolfpack	17 Jul 2004 11:36:50 -0000	1.26
--- ChangeLog.wolfpack	17 Jul 2004 11:50:52 -0000	1.27
***************
*** 44,48 ****
  		- New function: wolfpack.npccount()
  		- New function: wolfpack.accounts.count()
! 		- New function: wolfpack.socket.address()
  		- Export command updates.
  			Checks for doors and corpses.
--- 44,48 ----
  		- New function: wolfpack.npccount()
  		- New function: wolfpack.accounts.count()
! 		- New property: socket.address
  		- Export command updates.
  			Checks for doors and corpses.

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.25,1.26

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17553/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Dark-Storm added this :D


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ChangeLog.wolfpack	17 Jul 2004 08:34:53 -0000	1.25
--- ChangeLog.wolfpack	17 Jul 2004 11:36:50 -0000	1.26
***************
*** 44,47 ****
--- 44,48 ----
  		- New function: wolfpack.npccount()
  		- New function: wolfpack.accounts.count()
+ 		- New function: wolfpack.socket.address()
  		- Export command updates.
  			Checks for doors and corpses.

[wpdev-commits] wolfpack/python socket.cpp,1.78,1.79

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

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17241/python

Modified Files:
	socket.cpp 
Log Message:
New property: socket.address

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** socket.cpp	15 Jun 2004 02:44:46 -0000	1.78
--- socket.cpp	17 Jul 2004 11:34:36 -0000	1.79
***************
*** 831,840 ****
--- 831,849 ----
  static PyObject* wpSocket_getAttr( wpSocket* self, char* name )
  {
+ 	/*
+ 		\rproperty socket.player The <object id="CHAR">char</object> object for the player played by this socket. May be None.
+ 	*/
  	if ( !strcmp( name, "player" ) )
  		return PyGetCharObject( self->pSock->player() );
+ 	/*
+ 		\rproperty socket.screenwidth The width of the game window in pixels as sent by the client.
+ 	*/		
  	else if ( !strcmp( name, "screenwidth" ) )
  	{
  		return PyInt_FromLong( self->pSock->screenWidth() );
  	}
+ 	/*
+ 		\rproperty socket.screenheight The height of the game window in pixels as sent by the client.
+ 	*/		
  	else if ( !strcmp( name, "screenheight" ) )
  	{
***************
*** 845,854 ****
  		return PyInt_FromLong( self->pSock->walkSequence() );
  	}
  	else if ( !strcmp( name, "account" ) )
  	{
  		return PyGetAccountObject( self->pSock->account() );
  	}
! 	else
! 	{
  		return Py_FindMethod( wpSocketMethods, ( PyObject * ) self, name );
  	}
--- 854,870 ----
  		return PyInt_FromLong( self->pSock->walkSequence() );
  	}
+ 	/*
+ 		\rproperty socket.account An <object id="account">account</object> object for the account used by this socket. Should not be None.
+ 	*/		
  	else if ( !strcmp( name, "account" ) )
  	{
  		return PyGetAccountObject( self->pSock->account() );
  	}
! 	/*
! 		\rproperty socket.address A string containing the IP address this socket is connected to.
! 	*/
! 	else if (!strcmp(name, "address")) {
! 		return QString2Python(self->pSock->ip());
! 	} else {
  		return Py_FindMethod( wpSocketMethods, ( PyObject * ) self, name );
  	}

[wpdev-commits] xmlscripts/scripts/wolfpack __init__.py,1.60,1.61 accounts.py,1.7,1.8

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

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

Modified Files:
	__init__.py accounts.py 
Log Message:
Needed these links...


Index: accounts.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/accounts.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** accounts.py	2 Jul 2004 13:40:47 -0000	1.7
--- accounts.py	17 Jul 2004 09:04:49 -0000	1.8
***************
*** 9,12 ****
--- 9,13 ----
  find = _wolfpack.accounts.find
  list = _wolfpack.accounts.list
+ count = _wolfpack.accounts.count
  acls = _wolfpack.accounts.acls
  acl = _wolfpack.accounts.acl

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/__init__.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** __init__.py	16 Jul 2004 07:09:28 -0000	1.60
--- __init__.py	17 Jul 2004 09:04:48 -0000	1.61
***************
*** 24,27 ****
--- 24,29 ----
  charcount = _wolfpack.charcount
  itemcount = _wolfpack.itemcount
+ npccount = _wolfpack.npccount
+ playercount = _wolfpack.playercount
  getdefinition = _wolfpack.getdefinition
  getdefinitions = _wolfpack.getdefinitions

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.24,1.25

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28690/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Additions and sanity cleanups


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ChangeLog.wolfpack	16 Jul 2004 21:00:36 -0000	1.24
--- ChangeLog.wolfpack	17 Jul 2004 08:34:53 -0000	1.25
***************
*** 6,23 ****
  			local codepage.
  		- Floating point tags are now saved correctly.
! 		- Removed command: tags
! 		- Removed command: addevent
! 		- Removed command: removeevent
! 		- Removed command: account
! 		- Removed command: resurrect
! 		- Removed command: password
! 		- Removed command: tele
! 		- Removed command: invis
! 		- Removed command: kill
! 		- Removed command: fix
! 		- Removed command: resend
! 		- Removed command: allskills
! 		- Removed command: remove
! 		- Removed command: move
  		- Region Updates/Fixes.
  			Added flags: noentermessage and noguardmessage
--- 6,12 ----
  			local codepage.
  		- Floating point tags are now saved correctly.
! 		- Removed commands: tags, addevent, removeevent, account,
! 			resurrect, password, tele, invis, kill, fix, resend,
! 			allskills, remove, move
  		- Region Updates/Fixes.
  			Added flags: noentermessage and noguardmessage
***************
*** 25,28 ****
--- 14,19 ----
  		- Removed <gold></gold> support.
  			Item baseid 'eed' should be used instead.
+ 		- Documentation Updates
+ 		- More warning fixes
  	* Definition Changes:
  		- Fixed Sheep definitions
***************
*** 33,53 ****
  		- Changed direction to lightvalue in light objects.
  		- Cleanups to prevent add menu crashes/hangs.
  	* Python Script Changes:
- 		- New Command: taginfo
  		- New Function: wolfpack.findobject(serial)
  		- New Function: wolfpack.charbase(baseid)
! 		- New command: addevent
! 		- New command: removeevent
! 		- New command: account
! 		- New command: resurrect
! 		- New command: password
! 		- New command: tele
! 		- New command: invis
! 		- New command: kill
! 		- New command: fix
! 		- New command: resend
! 		- New command: allskills
! 		- New command: remove
! 		- New command: move
  		- Fixed carving
  		- Fixed sheering of sheeps and wool regrowing
--- 24,36 ----
  		- Changed direction to lightvalue in light objects.
  		- Cleanups to prevent add menu crashes/hangs.
+ 		- Split Food/Drinks into separate files.
+ 		- Added trashcan
+ 		- Inscription Added
  	* Python Script Changes:
  		- New Function: wolfpack.findobject(serial)
  		- New Function: wolfpack.charbase(baseid)
! 		- New commands: taginfo, addevent, removeevent, account,
! 			resurrect, password, tele, invis, kill, fix, resend,
! 			allskills, remove, move
  		- Fixed carving
  		- Fixed sheering of sheeps and wool regrowing
***************
*** 76,79 ****
--- 59,67 ----
  			Gate/Recall still not functional, charges work however.
  		- Fixed a bug with melting ore.
+ 		- New script: trashcan
+ 		- Skill Fixes:
+ 			Provocation - Thanks to Kid_Sk8
+ 			Inscription - Thanks to khpae
+ 		- Decoration Saving
  	* Misc. Changes:
  		- New Features:

[wpdev-commits] wolfpack/python item.cpp,1.114,1.115

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

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27565/python

Modified Files:
	item.cpp 
Log Message:
Documentation Updates


Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** item.cpp	19 Jun 2004 02:06:52 -0000	1.114
--- item.cpp	17 Jul 2004 08:23:27 -0000	1.115
***************
*** 735,739 ****
  {
  	Q_UNUSED(args);
! 	/*	
  	if( self->pItem->free )
  	{
--- 735,739 ----
  {
  	Q_UNUSED(args);
! 	/*
  	if( self->pItem->free )
  	{
***************
*** 741,745 ****
  		return Py_None;
  	}
! 	return PyGetMultiObject( dynamic_cast< cMulti* >( FindItemBySerial( self->pItem->multis() ) ) 
  	*/
  	Py_INCREF( Py_None );
--- 741,745 ----
  		return Py_None;
  	}
! 	return PyGetMultiObject( dynamic_cast< cMulti* >( FindItemBySerial( self->pItem->multis() ) )
  	*/
  	Py_INCREF( Py_None );
***************
*** 1151,1154 ****
--- 1151,1157 ----
  {
  	// Special Python things
+ 	/*
+ 		\rproperty item.content A list of all items inside of the container.
+ 	*/
  	if ( !strcmp( "content", name ) )
  	{
***************
*** 1159,1162 ****
--- 1162,1168 ----
  		return list;
  	}
+ 	/*
+ 		\property item.tags A list of all tag names the object currently has.
+ 	*/
  	else if ( !strcmp( "tags", name ) )
  	{
***************
*** 1175,1183 ****
  
  		return list;
- 		/*
- 				\rproperty item.objects If the item is a multi object, this is a list of objects that are within
- 				the multi. If it's not a multi, this property is None.
- 			*/
  	}
  	else if ( !strcmp( "objects", name ) )
  	{
--- 1181,1189 ----
  
  		return list;
  	}
+ 	/*
+ 		\rproperty item.objects If the item is a multi object, this is a list of objects that are within
+ 		the multi. If it's not a multi, this property is None.
+ 	*/
  	else if ( !strcmp( "objects", name ) )
  	{
***************
*** 1200,1203 ****
--- 1206,1212 ----
  		return tuple;
  	}
+ 	/*
+ 		\rproperty item.events Returns a list of all event names the object has.
+ 	*/
  	else if ( !strcmp( "events", name ) )
  	{
***************
*** 1281,1284 ****
--- 1290,1296 ----
  		}
  	}
+ 	/*
+ 		\rproperty item.container Returns the serial of the container this item is in. Returns 0 if no container.
+ 	*/
  	else if ( !strcmp( "container", name ) )
  	{

[wpdev-commits] wolfpack items.cpp,1.422,1.423

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

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

Modified Files:
	items.cpp 
Log Message:
Documentation Updates


Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.422
retrieving revision 1.423
diff -C2 -d -r1.422 -r1.423
*** items.cpp	5 Jul 2004 18:23:06 -0000	1.422
--- items.cpp	17 Jul 2004 08:23:27 -0000	1.423
***************
*** 174,178 ****
  
  /*****************************************************************************
!   cItem member functions
   *****************************************************************************/
  
--- 174,178 ----
  
  /*****************************************************************************
!  * cItem member functions
   *****************************************************************************/
  
***************
*** 249,261 ****
  }
  
! ///////////////
! // Name: ReduceAmount
! // history: by Duke, 4.06.2000
! //		added P_ITEM interface Duke, 3.10.2000
! //		made it the first member of cItem Duke, 23.12.2000
! // Purpose: reduces the given item's amount by 'amt' and deletes it if
! //		necessary and returns 0. If the request could not be fully satisfied,
! //		the remainder is returned
! //
  long cItem::reduceAmount( const short amt )
  {
--- 249,261 ----
  }
  
! /*
!  * Name: ReduceAmount
!  * History: by Duke, 4.06.2000
!  * 		added P_ITEM interface Duke, 3.10.2000
!  * 		made it the first member of cItem Duke, 23.12.2000
!  * Purpose: reduces the given item's amount by 'amt' and deletes it if
!  * 		necessary and returns 0. If the request could not be fully satisfied,
!  * 		the remainder is returned
!  */
  long cItem::reduceAmount( const short amt )
  {
***************
*** 293,308 ****
  }
  
! // author: LB purpose: returns the type of pack
! // to handle its x,y coord system corretly.
! // interpretation of the result:
! // valid x,y ranges depending on type:
! // type -1 : no pack
! // type  1 : y-range 50  .. 100
! // type  2 : y-range 30  .. 80
! // type  3 : y-range 100 .. 150
! // type  4 : y-range 40  .. 140
! // x-range 18 .. 118 for 1,2,3
! //  	   40 .. 140 for 4
! //
  short cItem::GetContGumpType()
  {
--- 293,309 ----
  }
  
! /*
!  * Author: LB purpose: returns the type of pack
!  * to handle its x,y coord system corretly.
!  * interpretation of the result:
!  * valid x,y ranges depending on type:
!  * type -1 : no pack
!  * type  1 : y-range 50  .. 100
!  * type  2 : y-range 30  .. 80
!  * type  3 : y-range 100 .. 150
!  * type  4 : y-range 40  .. 140
!  * x-range 18 .. 118 for 1,2,3
!  *  	   40 .. 140 for 4
!  */
  short cItem::GetContGumpType()
  {
***************
*** 502,512 ****
  }
  
! ///////////////////////
! // Name: DeleteAmount
! // history: DeleQuan() by Duke, 16.11.2000
! //		moved to cItem (Duke,27.3.2001)
! // Purpose: recurses through the container given by serial and deletes items of
! //		the given id and color(if given) until the given amount is reached
! //
  int cItem::DeleteAmount( int amount, unsigned short _id, unsigned short _color )
  {
--- 503,513 ----
  }
  
! /*
!  * Name: DeleteAmount
!  * History: DeleQuan() by Duke, 16.11.2000
!  * 		moved to cItem (Duke,27.3.2001)
!  * Purpose: recurses through the container given by serial and deletes items of
!  * 		the given id and color(if given) until the given amount is reached
!  */
  int cItem::DeleteAmount( int amount, unsigned short _id, unsigned short _color )
  {
***************
*** 1795,1799 ****
  	}
  	/*
! 		\rproperty container The <object id="CHAR">CHAR</object> or
  			<object id="ITEM">ITEM</object> this item is contained in. See the layer property for
  			the layer this item is equipped on if this is a character. This property may also be None.
--- 1796,1800 ----
  	}
  	/*
! 		\property container The <object id="CHAR">CHAR</object> or
  			<object id="ITEM">ITEM</object> this item is contained in. See the layer property for
  			the layer this item is equipped on if this is a character. This property may also be None.
***************
*** 2080,2086 ****
  	else
  		GET_PROPERTY( "twohanded", priv_ & 0x20 ? 1 : 0 )
! 		/*
  		\rproperty item.corpse Specifies whether this item is a corpse or not.
! 		*/
  	else
  		GET_PROPERTY( "corpse", corpse() )
--- 2081,2087 ----
  	else
  		GET_PROPERTY( "twohanded", priv_ & 0x20 ? 1 : 0 )
! 	/*
  		\rproperty item.corpse Specifies whether this item is a corpse or not.
! 	*/
  	else
  		GET_PROPERTY( "corpse", corpse() )

[wpdev-commits] xmlscripts/scripts/system macro_opendoor.py,1.3,1.4

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

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

Modified Files:
	macro_opendoor.py 
Log Message:
Cleanups
New Utility Function
Trashcans!


Index: macro_opendoor.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/macro_opendoor.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** macro_opendoor.py	14 Jul 2004 07:41:03 -0000	1.3
--- macro_opendoor.py	17 Jul 2004 07:24:00 -0000	1.4
***************
*** 1,5 ****
  
  import wolfpack
! from wolfpack.consts import *
  
  dirs = {
--- 1,5 ----
  
  import wolfpack
! from wolfpack.consts import EVENT_USE
  
  dirs = {
***************
*** 18,50 ****
  
  def openDoor( socket, packet ):
! 	if packet.size != 5 and packet.getshort(3) != 0x5800:
! 		return 0
! 
! 	if not socket.player:
! 		return False
  
! 	char = socket.player
! 	dir = char.direction
! 	doors = wolfpack.items(char.pos.x + dirs[dir][0], char.pos.y + dirs[dir][1], char.pos.map, 0)
  
! 	if not doors:
  		return False
- 
- 	opendoor = 0
- 	reach = 0
- 	for door in doors:
- 		if char.pos.z == door.pos.z:
- 			reach = 1
- 		elif char.pos.z < door.pos.z and char.pos.z >= ( door.pos.z - 5):
- 			reach = 1
- 		elif char.pos.z > door.pos.z and char.pos.z <= ( door.pos.z + 5):
- 			reach = 1
- 		if reach == 1:
- 			for event in door.events:
- 				if event == 'door':
- 					opendoor = 1
- 					break
- 		if opendoor == 1:
- 			wolfpack.callevent( event, EVENT_USE, (char, door) )
- 			break
- 	return
--- 18,49 ----
  
  def openDoor( socket, packet ):
! 	if packet.size == 5 and packet.getshort(3) == int( 0x5800 ):
! 		if not socket.player:
! 			return False
! 		char = socket.player
! 		dir = char.direction
! 		doors = wolfpack.items(char.pos.x + dirs[dir][0], char.pos.y + dirs[dir][1], char.pos.map, 0)
  
! 		if not doors:
! 			return False
  
! 		opendoor = 0
! 		reach = 0
! 		for door in doors:
! 			if char.pos.z == door.pos.z:
! 				reach = 1
! 			elif char.pos.z < door.pos.z and char.pos.z >= ( door.pos.z - 5):
! 				reach = 1
! 			elif char.pos.z > door.pos.z and char.pos.z <= ( door.pos.z + 5):
! 				reach = 1
! 			if reach == 1:
! 				for event in door.events:
! 					if event == 'door':
! 						opendoor = 1
! 						break
! 			if opendoor == 1:
! 				wolfpack.callevent( event, EVENT_USE, (char, door) )
! 				break
! 		return True
! 	else:
  		return False

[wpdev-commits] xmlscripts/scripts/wolfpack utilities.py,1.61,1.62

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

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

Modified Files:
	utilities.py 
Log Message:
Cleanups
New Utility Function
Trashcans!


Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** utilities.py	11 Jul 2004 02:47:25 -0000	1.61
--- utilities.py	17 Jul 2004 07:24:00 -0000	1.62
***************
*** 691,694 ****
--- 691,710 ----
  		return 0
  
+ """
+ 	\function wolfpack.utilities.itemsincontainer
+ 	\param serial
+ 	\return list
+ 	\description Returns a list of item serials inside the container.
+ """
+ def itemsincontainer( serial ):
+ 	container = wolfpack.finditem( serial )
+ 	itemlist = []
+ 	if container.type == 1:
+ 		for item in container.content:
+ 			itemlist += [ item.serial ]
+ 		return itemlist
+ 	else:
+ 		return itemlist
+ 
  # Class for Wrapping Chars or Items in Argument Lists
  class ObjectWrapper:

[wpdev-commits] xmlscripts/scripts/skills __init__.py,1.17,1.18 tracking.py,1.8,1.9

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

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

Modified Files:
	__init__.py tracking.py 
Log Message:
Cleanups
New Utility Function
Trashcans!


Index: tracking.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/tracking.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tracking.py	16 Jul 2004 07:09:27 -0000	1.8
--- tracking.py	17 Jul 2004 07:24:00 -0000	1.9
***************
*** 18,34 ****
  
  def tracking( char, skill ):
! 	if skill != TRACKING:
! 		return 0
  
  	if char.socket.hastag( 'skill_delay' ):
! 		if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ):
! 			char.socket.clilocmessage( 500118, "", 0x3b2, 3 )
! 			return 1
  		else:
! 			char.socket.deltag( 'skill_delay' )
  
! 	char.socket.clilocmessage( 1011350 ) # What do you wish to track?
! 	char.socket.closegump( 0x87651592 ) # What to track
! 	gump = cGump( x = 20, y = 30, callback="skills.tracking.trackWhatResponse", type=0x87651592 )
  
  	gump.startPage( 0 )
--- 18,36 ----
  
  def tracking( char, skill ):
! 	socket = char.socket
! 
! 	if skill != TRACKING or not char.socket:
! 		return False
  
  	if char.socket.hastag( 'skill_delay' ):
! 		if wolfpack.time.currenttime() < socket.gettag( 'skill_delay' ):
! 			socket.clilocmessage( 500118, "", 0x3b2, 3 )
! 			return True
  		else:
! 			socket.deltag( 'skill_delay' )
  
! 	socket.clilocmessage( 1011350 ) # What do you wish to track?
! 	socket.closegump( 0x87651592 ) # What to track
! 	gump = cGump( x=20, y=30, callback="skills.tracking.trackWhatResponse", type=0x87651592 )
  
  	gump.startPage( 0 )
***************
*** 55,64 ****
  	gump.send( char )
  
! 	char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + STEALTH_DELAY ) )
  
! 	return 1
  
  def trackWhatResponse( char, args, target ):
! 	return 1
  
  def onLoad():
--- 57,66 ----
  	gump.send( char )
  
! 	socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + STEALTH_DELAY ) )
  
! 	return True
  
  def trackWhatResponse( char, args, target ):
! 	return True
  
  def onLoad():

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** __init__.py	17 Jul 2004 03:49:21 -0000	1.17
--- __init__.py	17 Jul 2004 07:24:00 -0000	1.18
***************
*** 12,69 ****
  
  #SKILLID, STRGAIN, DEXGAIN, INTGAIN, GAINFACTOR, SKILLCAP, ANTIMACRO
! skilltable = \
! {
! ALCHEMY:					[0, 0.5, 0.5, 1, 1000, FALSE],
! ANATOMY:					[0.1, 0.1, 0.8, 1, 1000, FALSE ],
! ANIMALLORE:				[0, 0, 1, 1, 1000, FALSE ],
! ITEMID:						[0, 0, 1, 1, 1000, FALSE ],
! ARMSLORE:				[0.8, 0.1, 0.1, 1, 1000, FALSE ],
! PARRYING:				[0.75, 0.25, 0, 1, 1000, FALSE],
! BEGGING:					[0, 0, 0, 1, 1000, FALSE ],
! BLACKSMITHING:		[1, 0, 0, 1, 1000, FALSE],
! BOWCRAFT:				[0.6, 1.6, 0, 1, 1000, FALSE],
! PEACEMAKING:			[0, 0, 0, 1, 1000, FALSE ],
! CAMPING:					[2, 1.5, 1.5, 1, 1000, FALSE ],
! CARPENTRY:				[2, 0.5, 0, 1, 1000, FALSE],
! CARTOGRAPHY:			[0, 0.75, 0.75, 1, 1000, FALSE],
! COOKING:					[0, 2, 3, 1, 1000, FALSE],
! DETECTINGHIDDEN:	[0, 0.4, 0.6, 1, 1000, FALSE ],
! ENTICEMENT:				[0, 0.25, 0.25, 1, 1000, FALSE ],
! EVALUATINGINTEL:	[0, 0, 1, 1, 1000, FALSE ],
! HEALING:					[0.6, 0.6, 0.8, 1, 1000, FALSE ],
! FISHING:					[0.5, 0.5, 0, 1, 1000, FALSE ],
! FORENSICS:				[0, 0.2, 0.8, 1, 1000, FALSE ],
! HERDING:					[1.625, 0.625, 0.25, 1, 1000, FALSE ],
! HIDING:					[0, 0.8, 0.2, 1, 1000, FALSE ],
! PROVOCATION:			[0, 0.45, 0.05, 1, 1000, FALSE ],
! INSCRIPTION:			[0, 0.2, 0.8, 1, 1000, FALSE],
! LOCKPICKING:			[0, 2, 0, 1, 1000, FALSE ],
! MAGERY:		 			[0, 0, 1.5, 1, 1000, FALSE ],
! MAGICRESISTANCE:	[0.25, 0.25, 0.5, 1, 1000, FALSE ],
! TACTICS:	 				[0, 0, 0, 1, 1000, FALSE],
! SNOOPING:				[0, 2.5, 0, 1, 1000, FALSE ],
! MUSICIANSHIP:			[0, 0.8, 0.2, 1, 1000, FALSE ],
! POISONING:	 			[0, 0.4, 1.6, 1, 1000, FALSE ],
! ARCHERY:					[0.25, 0.75, 0, 1, 1000, FALSE],
! SPIRITSPEAK:			[0, 0, 1, 1, 1000, FALSE ],
! STEALING:					[0, 1, 0, 1, 1000, FALSE ],
! TAILORING:				[0.38, 1.63, 0.5, 1, 1000, FALSE],
! TAMING:	 	 			[1.4, 0.2, 0.4, 1, 1000, FALSE ],
! TASTEID:					[0.2, 0, 0.8, 1, 1000, FALSE ],
! TINKERING:				[0.5, 0.2, 0.3, 1, 1000, FALSE],
! TRACKING:				[0, 1.25, 1.25, 1, 1000, FALSE ],
! VETERINARY:				[0.8, 0.4, 0,8,	1, 1000, FALSE ],
! SWORDSMANSHIP:		[0.75, 0.25, 0, 1, 1000, FALSE],
! MACEFIGHTING:			[0.9, 0.1, 0, 1, 1000, FALSE],
! FENCING:	 				[0.45, 0.55, 0, 1, 1000, FALSE],
! WRESTLING:	 			[0.9, 0.1, 0, 1, 1000, FALSE],
! LUMBERJACKING:		[2, 0, 0, 1, 1000, FALSE ],
! MINING:	 				[2, 0, 0, 1, 1000, FALSE ],
! MEDITATION: 			[0, 0, 0, 1, 1000, FALSE ],
! STEALTH:					[0, 0, 0, 1, 1000, FALSE ],
! REMOVETRAPS:			[0, 0, 0, 1, 1000, FALSE ],
! NECROMANCY:			[0, 0, 0, 1, 1000, FALSE ],
! FOCUS:	 					[0, 0, 0, 1, 1000, FALSE],
! CHIVALRY:				[0, 0, 0, 1, 1000, FALSE ]
  }
  
--- 12,68 ----
  
  #SKILLID, STRGAIN, DEXGAIN, INTGAIN, GAINFACTOR, SKILLCAP, ANTIMACRO
! skilltable = {
! 	ALCHEMY:					[ 0, 0.5, 0.5, 1, 1000, FALSE ],
! 	ANATOMY:					[ 0.1, 0.1, 0.8, 1, 1000, FALSE ],
! 	ANIMALLORE:				[ 0, 0, 1, 1, 1000, FALSE ],
! 	ITEMID:						[ 0, 0, 1, 1, 1000, FALSE ],
! 	ARMSLORE:				[ 0.8, 0.1, 0.1, 1, 1000, FALSE ],
! 	PARRYING:				[ 0.75, 0.25, 0, 1, 1000, FALSE],
! 	BEGGING:					[ 0, 0, 0, 1, 1000, FALSE ],
! 	BLACKSMITHING:		[ 1, 0, 0, 1, 1000, FALSE],
! 	BOWCRAFT:				[ 0.6, 1.6, 0, 1, 1000, FALSE],
! 	PEACEMAKING:			[ 0, 0, 0, 1, 1000, FALSE ],
! 	CAMPING:					[ 2, 1.5, 1.5, 1, 1000, FALSE ],
! 	CARPENTRY:				[ 2, 0.5, 0, 1, 1000, FALSE],
! 	CARTOGRAPHY:			[ 0, 0.75, 0.75, 1, 1000, FALSE],
! 	COOKING:					[ 0, 2, 3, 1, 1000, FALSE],
! 	DETECTINGHIDDEN:	[ 0, 0.4, 0.6, 1, 1000, FALSE ],
! 	ENTICEMENT:				[ 0, 0.25, 0.25, 1, 1000, FALSE ],
! 	EVALUATINGINTEL:	[ 0, 0, 1, 1, 1000, FALSE ],
! 	HEALING:					[ 0.6, 0.6, 0.8, 1, 1000, FALSE ],
! 	FISHING:					[ 0.5, 0.5, 0, 1, 1000, FALSE ],
! 	FORENSICS:				[ 0, 0.2, 0.8, 1, 1000, FALSE ],
! 	HERDING:					[ 1.625, 0.625, 0.25, 1, 1000, FALSE ],
! 	HIDING:					[ 0, 0.8, 0.2, 1, 1000, FALSE ],
! 	PROVOCATION:			[ 0, 0.45, 0.05, 1, 1000, FALSE ],
! 	INSCRIPTION:			[ 0, 0.2, 0.8, 1, 1000, FALSE],
! 	LOCKPICKING:			[ 0, 2, 0, 1, 1000, FALSE ],
! 	MAGERY:		 			[ 0, 0, 1.5, 1, 1000, FALSE ],
! 	MAGICRESISTANCE:	[ 0.25, 0.25, 0.5, 1, 1000, FALSE ],
! 	TACTICS:	 				[ 0, 0, 0, 1, 1000, FALSE],
! 	SNOOPING:				[ 0, 2.5, 0, 1, 1000, FALSE ],
! 	MUSICIANSHIP:			[ 0, 0.8, 0.2, 1, 1000, FALSE ],
! 	POISONING:	 			[ 0, 0.4, 1.6, 1, 1000, FALSE ],
! 	ARCHERY:					[ 0.25, 0.75, 0, 1, 1000, FALSE],
! 	SPIRITSPEAK:			[ 0, 0, 1, 1, 1000, FALSE ],
! 	STEALING:					[ 0, 1, 0, 1, 1000, FALSE ],
! 	TAILORING:				[ 0.38, 1.63, 0.5, 1, 1000, FALSE ],
! 	TAMING:	 	 			[ 1.4, 0.2, 0.4, 1, 1000, FALSE ],
! 	TASTEID:					[ 0.2, 0, 0.8, 1, 1000, FALSE ],
! 	TINKERING:				[ 0.5, 0.2, 0.3, 1, 1000, FALSE ],
! 	TRACKING:				[ 0, 1.25, 1.25, 1, 1000, FALSE ],
! 	VETERINARY:				[ 0.8, 0.4, 0,8,	1, 1000, FALSE ],
! 	SWORDSMANSHIP:		[ 0.75, 0.25, 0, 1, 1000, FALSE ],
! 	MACEFIGHTING:			[ 0.9, 0.1, 0, 1, 1000, FALSE ],
! 	FENCING:	 				[ 0.45, 0.55, 0, 1, 1000, FALSE ],
! 	WRESTLING:	 			[ 0.9, 0.1, 0, 1, 1000, FALSE ],
! 	LUMBERJACKING:		[ 2, 0, 0, 1, 1000, FALSE ],
! 	MINING:	 				[ 2, 0, 0, 1, 1000, FALSE ],
! 	MEDITATION: 			[ 0, 0, 0, 1, 1000, FALSE ],
! 	STEALTH:					[ 0, 0, 0, 1, 1000, FALSE ],
! 	REMOVETRAPS:			[ 0, 0, 0, 1, 1000, FALSE ],
! 	NECROMANCY:			[ 0, 0, 0, 1, 1000, FALSE ],
! 	FOCUS:	 					[ 0, 0, 0, 1, 1000, FALSE],
! 	CHIVALRY:				[ 0, 0, 0, 1, 1000, FALSE ]
  }
  
***************
*** 82,88 ****
  	if skills.has_key( skill ):
  		skills[ skill ]( char, skill )
! 		return 1
  
! 	return 0
  
  #
--- 81,87 ----
  	if skills.has_key( skill ):
  		skills[ skill ]( char, skill )
! 		return True
  
! 	return False
  
  #
***************
*** 122,125 ****
  		object.settag( tagname, "1" )
  		return True
- 
- 
--- 121,122 ----

[wpdev-commits] xmlscripts/scripts trashcan.py,NONE,1.1

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

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

Added Files:
	trashcan.py 
Log Message:
Cleanups
New Utility Function
Trashcans!


--- NEW FILE: trashcan.py ---

import wolfpack
import wolfpack.time
import wolfpack.utilities

# Two minutes
delete_time = 120000

def onDropOnItem( target, item ):
	if target.baseid == 'trashcan':
		target.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) )
		wolfpack.addtimer( delete_time, "trashcan.timerPass", [ target ] )
		return False
	else:
		return False
	return False

def timerPass( timer, args ):
	trashcan = args[0]
	if trashcan.baseid != "trashcan":
		return False

	if trashcan.hastag( 'trash_timer' ) and trashcan.gettag( 'trash_timer' ) <= wolfpack.time.currenttime():
		trashlist = wolfpack.utilities.itemsincontainer( trashcan.serial )
		if len( trashlist ) == 0:
			trashcan.say( "*hungry*" )
			return False
		i = 0
		for serial in trashlist:
			trash = wolfpack.finditem( serial )
			trash.delete()
			i += 1
		trashcan.say( "Deleted %i items!" % i )
		trashcan.deltag( 'trash_timer' )
		return True
	return False

def onUse( char, item ):
	if item.type != 1 or item.baseid != 'trashcan':
		return False
	item.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) )
	wolfpack.addtimer( delete_time, "trashcan.timerPass", [ item ] )
	return False

[wpdev-commits] xmlscripts/definitions scripts.xml,1.146,1.147

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

Update of /cvsroot/wpdev/xmlscripts/definitions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19826

Modified Files:
	scripts.xml 
Log Message:
Trashcans!


Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** scripts.xml	14 Jul 2004 00:11:47 -0000	1.146
--- scripts.xml	17 Jul 2004 07:23:18 -0000	1.147
***************
*** 53,56 ****
--- 53,57 ----
  	<script>spiderweb</script>
  	<script>training_dummy</script>
+ 	<script>trashcan</script>
  	<script>wall_clock</script>
  	<script>wool</script>

[wpdev-commits] xmlscripts/scripts/skills __init__.py,1.16,1.17 provocation.py,1.9,1.10

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

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

Modified Files:
	__init__.py provocation.py 
Log Message:
More cleanups/tweaks.

Also, a fix from Kid_Sk8 that is supposed to fix provocation, though I didn't see what really changed.



Index: provocation.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/provocation.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** provocation.py	26 May 2004 13:07:25 -0000	1.9
--- provocation.py	17 Jul 2004 03:49:21 -0000	1.10
***************
*** 7,75 ****
  
  import wolfpack
! from wolfpack.consts import *
  from math import floor
- from wolfpack.utilities import *
  import skills
  
  def provocation( char, skill ):
  	# Only handle provocation
  	if skill != PROVOCATION:
! 		return
  
! 	if not char.socket.hastag( 'instrument' ):
! 		char.socket.clilocmessage( 0x7A74E, '', 0x3b2, 3 ) # What instrument shall I play music on?
! 		char.socket.attachtarget( "skills.provocation.findinstrument" )
! 		return 1
  
! 	instserial = char.socket.gettag( 'instrument' )
  	instrument = wolfpack.finditem( instserial )
  	backpack = char.getbackpack()
  
  	if not instrument or not instrument.getoutmostitem() == backpack:
! 		char.socket.clilocmessage( 0x7A74E, "", 0x3b2, 3 ) # What instrument shall I play music on?
! 		char.socket.attachtarget( "skills.provocation.findinstrument" )
! 		return 1
! 
  
! 	char.socket.clilocmessage( 0x7A74D, "", 0x3b2, 3 ) # What do you wish to incite?
! 	char.socket.attachtarget( "skills.provocation.response1", [instrument] )
! 	return 1
  
  def response1( char, args, target ):
! 
  	instrument = args[0]
  
  	if target.item:
! 		char.socket.clilocmessage( 0x7A755, "", 0x3b2, 3 ) # You can't incite that!
! 		return
  
  	if target.char:
  		if target.char.socket:
! 			char.socket.clilocmessage( 0x7A754, "", 0x3b2, 3 ) # Verbal taunts might be more effective!
! 			return
  
  		if target.char.tamed:
! 			char.socket.clilocmessage( 0x7A756, "", 0x3b2, 3 ) # They are too loyal to their master to be provoked.
! 			return
  
! 		if target.char.priv & 0x04 or target.char.dead:
! 			char.socket.clilocmessage( 0x7A755, "", 0x3b2, 3 ) # You can't incite that!
! 			return
  
  		if target.char.id == 0x191 or target.char.id == 0x190:
! 			char.socket.clilocmessage( 0x7A757, "", 0x3b2, 3, target.char )
! 			return
  
  		tobardtarget1 = tobard( target.char, "provocation" )
  
  		playinstrument( char, instrument, "success" )
! 		char.socket.clilocmessage( 0xF61D5, "", 0x3b2, 3 ) # You play your music and your target becomes angered.  Whom do you wish them to attack?
! 		char.socket.attachtarget( "skills.provocation.response2", [target.char, tobardtarget1, instrument] )
! 		return 1
  
  def response2( char, args, target ):
  
  	if not target.char:
! 		return
  
  	creature1 = args[0]
--- 7,79 ----
  
  import wolfpack
! import wolfpack.utilities
! from wolfpack.consts import PROVOCATION, MUSICIANSHIP, ALLSKILLS, MAGERY
  from math import floor
  import skills
  
  def provocation( char, skill ):
+ 	socket = char.socket
+ 
+ 	if not char.socket:
+ 		return False
  	# Only handle provocation
  	if skill != PROVOCATION:
! 		return False
  
! 	if not socket.hastag( 'instrument' ):
! 		socket.clilocmessage( 0x7A74E, '', 0x3b2, 3 ) # What instrument shall I play music on?
! 		socket.attachtarget( "skills.provocation.findinstrument" )
! 		return True
  
! 	instserial = socket.gettag( 'instrument' )
  	instrument = wolfpack.finditem( instserial )
  	backpack = char.getbackpack()
  
  	if not instrument or not instrument.getoutmostitem() == backpack:
! 		socket.clilocmessage( 0x7A74E, "", 0x3b2, 3 ) # What instrument shall I play music on?
! 		socket.attachtarget( "skills.provocation.findinstrument" )
! 		return True
  
! 	socket.clilocmessage( 0x7A74D, "", 0x3b2, 3 ) # What do you wish to incite?
! 	socket.attachtarget( "skills.provocation.response1", [instrument] )
! 	return True
  
  def response1( char, args, target ):
! 	socket = char.socket
  	instrument = args[0]
  
  	if target.item:
! 		socket.clilocmessage( 0x7A755, "", 0x3b2, 3 ) # You can't incite that!
! 		return False
  
  	if target.char:
  		if target.char.socket:
! 			socket.clilocmessage( 0x7A754, "", 0x3b2, 3 ) # Verbal taunts might be more effective!
! 			return False
  
  		if target.char.tamed:
! 			socket.clilocmessage( 0x7A756, "", 0x3b2, 3 ) # They are too loyal to their master to be provoked.
! 			return False
  
! 		if target.char.priv or target.char.dead: #if target.char.priv & 0x04 or target.char.dead:
! 			socket.clilocmessage( 0x7A755, "", 0x3b2, 3 ) # You can't incite that!
! 			return False
  
  		if target.char.id == 0x191 or target.char.id == 0x190:
! 			socket.clilocmessage( 0x7A757, "", 0x3b2, 3, target.char )
! 			return False
  
  		tobardtarget1 = tobard( target.char, "provocation" )
  
  		playinstrument( char, instrument, "success" )
! 		socket.clilocmessage( 0xF61D5, "", 0x3b2, 3 ) # You play your music and your target becomes angered.  Whom do you wish them to attack?
! 		socket.attachtarget( "skills.provocation.response2", [target.char, tobardtarget1, instrument] )
! 		return True
  
  def response2( char, args, target ):
+ 	socket = char.socket
  
  	if not target.char:
! 		return False
  
  	creature1 = args[0]
***************
*** 81,113 ****
  
  	if target.char.socket or target.char.priv & 0x04:
! 		char.socket.clilocmessage( 0xF463A, "", 0x3b2, 3 ) # You cannot perform negative acts on your target.
! 		return
  
  	if target.char == creature1:
! 		char.socket.clilocmessage( 0x7A759, "", 0x3b2, 3 ) # You can't tell someone to attack themselves!
! 		return
  
  	if target.char.owner:
! 		char.socket.clilocmessage( 0x7A756, "", 0x3b2, 3 ) # They are too loyal to their master to be provoked.
! 		return
  
  	if not char.distanceto( target.char ) <= 12 or not char.distanceto( creature1 ) <= 12:
! 		char.socket.clilocmessage( 0x100369, "", 0x3b2, 3 ) # You are too far away from one or both of the creatures for your music to have an effect.
! 		return
  
  	if not target.char.distanceto( creature1 ) < 20:
! 		char.socket.clilocmessage( 0x10036A, "", 0x3b2, 3 ) # The creatures you are trying to provoke are too far away from each other for your music to have an effect.
! 		return
  
  	# TODO : bonus for slaying items
  
  	if not char.skill[ PROVOCATION ] >= minimum:
! 		char.socket.clilocmessage( 0x100366, "", 0x3b2, 3 ) # You have no chance of provoking those creatures.
! 		return
  
  	if not char.checkskill( MUSICIANSHIP, 0, 1000 ):
  		playinstrument( char, instrument, "fail" )
! 		char.socket.clilocmessage( 0x7A75C, "", 0x3b2, 3 ) # You play rather poorly, and to no effect.
! 		return
  
  	if not char.checkskill( PROVOCATION, minimum, maximum ):
--- 85,117 ----
  
  	if target.char.socket or target.char.priv & 0x04:
! 		socket.clilocmessage( 0xF463A, "", 0x3b2, 3 ) # You cannot perform negative acts on your target.
! 		return False
  
  	if target.char == creature1:
! 		socket.clilocmessage( 0x7A759, "", 0x3b2, 3 ) # You can't tell someone to attack themselves!
! 		return False
  
  	if target.char.owner:
! 		socket.clilocmessage( 0x7A756, "", 0x3b2, 3 ) # They are too loyal to their master to be provoked.
! 		return False
  
  	if not char.distanceto( target.char ) <= 12 or not char.distanceto( creature1 ) <= 12:
! 		socket.clilocmessage( 0x100369, "", 0x3b2, 3 ) # You are too far away from one or both of the creatures for your music to have an effect.
! 		return False
  
  	if not target.char.distanceto( creature1 ) < 20:
! 		socket.clilocmessage( 0x10036A, "", 0x3b2, 3 ) # The creatures you are trying to provoke are too far away from each other for your music to have an effect.
! 		return False
  
  	# TODO : bonus for slaying items
  
  	if not char.skill[ PROVOCATION ] >= minimum:
! 		socket.clilocmessage( 0x100366, "", 0x3b2, 3 ) # You have no chance of provoking those creatures.
! 		return False
  
  	if not char.checkskill( MUSICIANSHIP, 0, 1000 ):
  		playinstrument( char, instrument, "fail" )
! 		socket.clilocmessage( 0x7A75C, "", 0x3b2, 3 ) # You play rather poorly, and to no effect.
! 		return False
  
  	if not char.checkskill( PROVOCATION, minimum, maximum ):
***************
*** 116,121 ****
  		creature1.target = char
  		creature1.update()
! 		char.socket.clilocmessage( 0x7A75F, "", 0x3b2, 3 ) # Your music fails to incite enough anger.
! 		return
  
  	playinstrument( char, instrument, "success" )
--- 120,125 ----
  		creature1.target = char
  		creature1.update()
! 		socket.clilocmessage( 0x7A75F, "", 0x3b2, 3 ) # Your music fails to incite enough anger.
! 		return False
  
  	playinstrument( char, instrument, "success" )
***************
*** 126,137 ****
  	creature1.update()
  	target.char.update()
! 	char.socket.clilocmessage( 0x7A762, "", 0x3b2, 3 ) # Your music succeeds, as you start a fight.
! 	return 1
  
  def findinstrument( char, args, target ):
  
  	if not target.item:
! 		char.socket.clilocmessage( 0x7A752, "", 0x3b2, 3 ) # That isn't a musical instrument.
! 		return
  
  	instruments = [ 0xE9C, 0xE9D, 0xE9E, 0xEB1, 0xEB2, 0xEB3, 0xEB4 ]
--- 130,145 ----
  	creature1.update()
  	target.char.update()
! 	socket.clilocmessage( 0x7A762, "", 0x3b2, 3 ) # Your music succeeds, as you start a fight.
! 	return True
  
  def findinstrument( char, args, target ):
+ 	socket = char.socket
+ 
+ 	if not char.socket:
+ 		return False
  
  	if not target.item:
! 		socket.clilocmessage( 0x7A752, "", 0x3b2, 3 ) # That isn't a musical instrument.
! 		return False
  
  	instruments = [ 0xE9C, 0xE9D, 0xE9E, 0xEB1, 0xEB2, 0xEB3, 0xEB4 ]
***************
*** 141,184 ****
  	if not target.item.getoutmostitem() == backpack:
  		if not char.canreach( target.item, 8 ):
! 			char.socket.clilocmessage( 0x7A74F, "", 0x3b2, 3 ) # You cannot see that.
! 			return
  
  		if not char.distanceto( target.item ) <= 3:
! 			char.socket.clilocmessage( 0x7A750, "", 0x3b2, 3 ) # That is too far away.
! 			return
  
  	if not target.item.id in instruments:
! 		char.socket.clilocmessage( 0x7A752, "", 0x3b2, 3 ) # That isn't a musical instrument.
! 		return
  
! 	char.socket.settag( 'instrument', serial )
! 	char.socket.clilocmessage( 0x7A753, "", 0x3b2, 3, )
! 	char.socket.attachtarget( "skills.provocation.response1", [target.item] )
  
  def playinstrument( char, item, how ):
! 
  	# Instrument ID: [ Success Sound, Fail Sound ]
  	instruments = {
! 			0xE9C:[ 0x38, 0x39 ],# Drum
! 			0xE9D:[ 0x52, 0x53 ],# Tambourine
! 			0xE9E:[ 0x52, 0x53 ],# Tambourine with tassle
! 			0xEB1:[ 0x43, 0x44 ],# Standing Harp
! 			0xEB2:[ 0x45, 0x46 ],# Harp
! 			0xEB3:[ 0x4C, 0x4D ],# Lute (N/S)
! 			0xEB4:[ 0x4C, 0x4D ] # Lute (E/S)
! 			}
  
  	if how == "success":
  		char.soundeffect( instruments[ item.id ][ 0 ] )
! 		return 1
  	else:
  		char.soundeffect( instruments[ item.id ][ 1 ] )
! 		return 1
! 
  
  def tobard( char, type ):
! 
  	value = skilltotal( char )
! 	value +=  char.health + char.stamina + char.mana
  
  	if char.skill[ MAGERY ] > 0:
--- 149,192 ----
  	if not target.item.getoutmostitem() == backpack:
  		if not char.canreach( target.item, 8 ):
! 			socket.clilocmessage( 0x7A74F, "", 0x3b2, 3 ) # You cannot see that.
! 			return False
  
  		if not char.distanceto( target.item ) <= 3:
! 			socket.clilocmessage( 0x7A750, "", 0x3b2, 3 ) # That is too far away.
! 			return False
  
  	if not target.item.id in instruments:
! 		socket.clilocmessage( 0x7A752, "", 0x3b2, 3 ) # That isn't a musical instrument.
! 		return False
  
! 	socket.settag( 'instrument', serial )
! 	socket.clilocmessage( 0x7A753, "", 0x3b2, 3, )
! 	socket.attachtarget( "skills.provocation.response1", [target.item] )
! 	return True
  
  def playinstrument( char, item, how ):
! 	socket = char.socket
  	# Instrument ID: [ Success Sound, Fail Sound ]
  	instruments = {
! 		0xE9C:[ 0x38, 0x39 ],# Drum
! 		0xE9D:[ 0x52, 0x53 ],# Tambourine
! 		0xE9E:[ 0x52, 0x53 ],# Tambourine with tassle
! 		0xEB1:[ 0x43, 0x44 ],# Standing Harp
! 		0xEB2:[ 0x45, 0x46 ],# Harp
! 		0xEB3:[ 0x4C, 0x4D ],# Lute (N/S)
! 		0xEB4:[ 0x4C, 0x4D ] # Lute (E/S)
! 	}
  
  	if how == "success":
  		char.soundeffect( instruments[ item.id ][ 0 ] )
! 		return True
  	else:
  		char.soundeffect( instruments[ item.id ][ 1 ] )
! 		return True
  
  def tobard( char, type ):
! 	socket = char.socket
  	value = skilltotal( char )
! 	value +=  ( char.hitpoints + char.stamina + char.mana )
  
  	if char.skill[ MAGERY ] > 0:

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** __init__.py	16 Jul 2004 07:09:27 -0000	1.16
--- __init__.py	17 Jul 2004 03:49:21 -0000	1.17
***************
*** 108,112 ****
  def antimacrocheck( char, skillid, object ):
  	#Get or set antimacro tag: "AM" + SERIAL = COUNT
! 	tagname = "AMC_" + str( char.serial ) + " " + str( skillid )
  	if object.hastag( tagname ):
  		count = object.gettag( tagname )
--- 108,112 ----
  def antimacrocheck( char, skillid, object ):
  	#Get or set antimacro tag: "AM" + SERIAL = COUNT
! 	tagname = "AMC_%i_%i" % ( char.serial, skillid )
  	if object.hastag( tagname ):
  		count = object.gettag( tagname )

[wpdev-commits] xmlscripts/definitions/items/vegetation plants.xml,1.11,1.12 wood.xml,1.5,1.6

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

Update of /cvsroot/wpdev/xmlscripts/definitions/items/vegetation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26795/vegetation

Modified Files:
	plants.xml wood.xml 
Log Message:
Cleanups...
And a very long overdue Food/Drink Split/Cleanup


Index: plants.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/vegetation/plants.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** plants.xml	22 Feb 2004 06:33:25 -0000	1.11
--- plants.xml	17 Jul 2004 03:30:00 -0000	1.12
***************
*** 896,900 ****
  	<!-- Growing Plants -->
  	<item id="c68">
! 		<id>0x0c68</id>
  		<nodecay />
  		<category>Vegetation\Growing\Sprouts 1</category>
--- 896,900 ----
  	<!-- Growing Plants -->
  	<item id="c68">
! 		<id>0xc68</id>
  		<nodecay />
  		<category>Vegetation\Growing\Sprouts 1</category>
***************
*** 902,906 ****
  
  	<item id="c69">
! 		<id>0x0c69</id>
  		<nodecay />
  		<category>Vegetation\Growing\Sprouts 2</category>
--- 902,906 ----
  
  	<item id="c69">
! 		<id>0xc69</id>
  		<nodecay />
  		<category>Vegetation\Growing\Sprouts 2</category>
***************
*** 908,912 ****
  
  	<item id="c6f">
! 		<id>0x0c6f</id>
  		<nodecay />
  		<category>Vegetation\Growing\Onions</category>
--- 908,912 ----
  
  	<item id="c6f">
! 		<id>0xc6f</id>
  		<nodecay />
  		<category>Vegetation\Growing\Onions</category>
***************
*** 914,918 ****
  
  	<item id="c76">
! 		<id>0x0c76</id>
  		<nodecay />
  		<category>Vegetation\Growing\Carrots</category>
--- 914,918 ----
  
  	<item id="c76">
! 		<id>0xc76</id>
  		<nodecay />
  		<category>Vegetation\Growing\Carrots</category>
***************
*** 920,924 ****
  
  	<item id="c7d">
! 		<id>0x0c7d</id>
  		<nodecay />
  		<category>Vegetation\Growing\Corn Stalk 1</category>
--- 920,924 ----
  
  	<item id="c7d">
! 		<id>0xc7d</id>
  		<nodecay />
  		<category>Vegetation\Growing\Corn Stalk 1</category>
***************
*** 926,930 ****
  
  	<item id="c7e">
! 		<id>0x0c7e</id>
  		<nodecay />
  		<category>Vegetation\Growing\Corn Stalk 2</category>
--- 926,930 ----
  
  	<item id="c7e">
! 		<id>0xc7e</id>
  		<nodecay />
  		<category>Vegetation\Growing\Corn Stalk 2</category>

Index: wood.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/vegetation/wood.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wood.xml	22 Feb 2004 06:33:25 -0000	1.5
--- wood.xml	17 Jul 2004 03:30:00 -0000	1.6
***************
*** 172,176 ****
  		<id>0x1B9B</id>
  		<nodecay />
! 		<category>Vegetation\Wood\Sticks </category>
  	</item>
  
--- 172,176 ----
  		<id>0x1B9B</id>
  		<nodecay />
! 		<category>Vegetation\Wood\Sticks</category>
  	</item>
  

[wpdev-commits] xmlscripts/definitions/items magic.xml,1.10,1.11 rocks.xml,1.5,1.6 slotmachine.xml,1.4,1.5 spawner.xml,1.4,1.5

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

Update of /cvsroot/wpdev/xmlscripts/definitions/items
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26795

Modified Files:
	magic.xml rocks.xml slotmachine.xml spawner.xml 
Log Message:
Cleanups...
And a very long overdue Food/Drink Split/Cleanup


Index: spawner.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/spawner.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spawner.xml	26 May 2004 13:45:11 -0000	1.4
--- spawner.xml	17 Jul 2004 03:29:59 -0000	1.5
***************
*** 9,13 ****
  <definitions>
  
! 	<item id="1000gold" inherit="EED">
  		<amount>1000</amount>
  	</item>
--- 9,14 ----
  <definitions>
  
! 	<item id="1000gold" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>1000</amount>
  	</item>

Index: magic.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/magic.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** magic.xml	26 May 2004 13:45:11 -0000	1.10
--- magic.xml	17 Jul 2004 03:29:59 -0000	1.11
***************
*** 20,24 ****
  	<item id="moongate">
  		<id>0xf6c</id>
!     <nodecay />
  		<events>moongate</events>
  		<category>Misc\Moongates\Blue Moongate</category>
--- 20,24 ----
  	<item id="moongate">
  		<id>0xf6c</id>
! 		<nodecay />
  		<events>moongate</events>
  		<category>Misc\Moongates\Blue Moongate</category>

Index: slotmachine.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/slotmachine.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slotmachine.xml	26 May 2004 13:45:11 -0000	1.4
--- slotmachine.xml	17 Jul 2004 03:29:59 -0000	1.5
***************
*** 19,59 ****
  
  	<!-- The Prizes -->
! 	<item id="slot_prize_1">
! 		<id>0xeed</id>
  		<amount>1</amount>
  	</item>
  
! 	<item id="slot_prize_2">
! 		<id>0xeed</id>
  		<amount>3</amount>
  	</item>
  
! 	<item id="slot_prize_3">
! 		<id>0xeed</id>
  		<amount>6</amount>
  	</item>
  
! 	<item id="slot_prize_4">
! 		<id>0xeed</id>
  		<amount>96</amount>
  	</item>
  
! 	<item id="slot_prize_5">
! 		<id>0xeed</id>
  		<amount>151</amount>
  	</item>
  
! 	<item id="slot_prize_6">
! 		<id>0xeed</id>
  		<amount>204</amount>
  	</item>
  
! 	<item id="slot_prize_7">
! 		<id>0xeed</id>
  		<amount>462</amount>
  	</item>
  
! 	<item id="slot_prize_8">
! 		<id>0xeed</id>
  		<amount>812</amount>
  	</item>
--- 19,59 ----
  
  	<!-- The Prizes -->
! 	<item id="slot_prize_1" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>1</amount>
  	</item>
  
! 	<item id="slot_prize_2" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>3</amount>
  	</item>
  
! 	<item id="slot_prize_3" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>6</amount>
  	</item>
  
! 	<item id="slot_prize_4" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>96</amount>
  	</item>
  
! 	<item id="slot_prize_5" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>151</amount>
  	</item>
  
! 	<item id="slot_prize_6" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>204</amount>
  	</item>
  
! 	<item id="slot_prize_7" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>462</amount>
  	</item>
  
! 	<item id="slot_prize_8" inherit="eed">
! 		<baseid>eed</baseid>
  		<amount>812</amount>
  	</item>

Index: rocks.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/rocks.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rocks.xml	26 May 2004 13:45:11 -0000	1.5
--- rocks.xml	17 Jul 2004 03:29:59 -0000	1.6
***************
*** 13,112 ****
  	<item id="134f" inherit="ITEM_NO_DECAY">
  		<id>0x134f</id>
! 		<category>Rocks\Boulder 1 (1/3)</category>
  	</item>
  
  	<item id="1350" inherit="ITEM_NO_DECAY">
  		<id>0x1350</id>
! 		<category>Rocks\Boulder 1 (2/3)</category>
  	</item>
  
  	<item id="1351" inherit="ITEM_NO_DECAY">
  		<id>0x1351</id>
! 		<category>Rocks\Boulder 1 (3/3)</category>
  	</item>
  
  	<item id="1352" inherit="ITEM_NO_DECAY">
  		<id>0x1352</id>
! 		<category>Rocks\Boulder 2 (1/3)</category>
  	</item>
  
  	<item id="1353" inherit="ITEM_NO_DECAY">
  		<id>0x1353</id>
! 		<category>Rocks\Boulder 2 (2/3)</category>
  	</item>
  
  	<item id="1354" inherit="ITEM_NO_DECAY">
  		<id>0x1354</id>
! 		<category>Rocks\Boulder 2 (3/3)</category>
  	</item>
  
  	<item id="1355" inherit="ITEM_NO_DECAY">
  		<id>0x1355</id>
! 		<category>Rocks\Boulder 3 (1/2)</category>
  	</item>
  
  	<item id="1356" inherit="ITEM_NO_DECAY">
  		<id>0x1356</id>
! 		<category>Rocks\Boulder 3 (2/2)</category>
  	</item>
  
  	<item id="1357" inherit="ITEM_NO_DECAY">
  		<id>0x1357</id>
! 		<category>Rocks\Boulder 4 (1/3)</category>
  	</item>
  
  	<item id="1358" inherit="ITEM_NO_DECAY">
  		<id>0x1358</id>
! 		<category>Rocks\Boulder 4 (2/3)</category>
  	</item>
  
  	<item id="1359" inherit="ITEM_NO_DECAY">
  		<id>0x1359</id>
! 		<category>Rocks\Boulder 4 (3/3)</category>
  	</item>
  
  	<item id="135a" inherit="ITEM_NO_DECAY">
  		<id>0x135a</id>
! 		<category>Rocks\Boulder 5 (1/2)</category>
  	</item>
  
  	<item id="135b" inherit="ITEM_NO_DECAY">
  		<id>0x135b</id>
! 		<category>Rocks\Boulder 5 (2/2)</category>
  	</item>
  
  	<item id="135c" inherit="ITEM_NO_DECAY">
  		<id>0x135c</id>
! 		<category>Rocks\Boulder 6 (1/3)</category>
  	</item>
  
  	<item id="135d" inherit="ITEM_NO_DECAY">
  		<id>0x135d</id>
! 		<category>Rocks\Boulder 6 (2/3)</category>
  	</item>
  
  	<item id="135e" inherit="ITEM_NO_DECAY">
  		<id>0x135e</id>
! 		<category>Rocks\Boulder 6 (3/3)</category>
  	</item>
  
  	<item id="135f" inherit="ITEM_NO_DECAY">
  		<id>0x135f</id>
! 		<category>Rocks\Boulder 7 (1/2)</category>
  	</item>
  
  	<item id="1360" inherit="ITEM_NO_DECAY">
  		<id>0x1360</id>
! 		<category>Rocks\Boulder 7 (2/2)</category>
  	</item>
  
  	<item id="1361" inherit="ITEM_NO_DECAY">
  		<id>0x1361</id>
! 		<category>Rocks\Boulder 8 (1/2)</category>
  	</item>
  
  	<item id="1362" inherit="ITEM_NO_DECAY">
  		<id>0x1362</id>
! 		<category>Rocks\Boulder 8 (2/2)</category>
  	</item>
  
--- 13,112 ----
  	<item id="134f" inherit="ITEM_NO_DECAY">
  		<id>0x134f</id>
! 		<category>Rocks\Boulders\Boulder 1 (1/3)</category>
  	</item>
  
  	<item id="1350" inherit="ITEM_NO_DECAY">
  		<id>0x1350</id>
! 		<category>Rocks\Boulders\Boulder 1 (2/3)</category>
  	</item>
  
  	<item id="1351" inherit="ITEM_NO_DECAY">
  		<id>0x1351</id>
! 		<category>Rocks\Boulders\Boulder 1 (3/3)</category>
  	</item>
  
  	<item id="1352" inherit="ITEM_NO_DECAY">
  		<id>0x1352</id>
! 		<category>Rocks\Boulders\Boulder 2 (1/3)</category>
  	</item>
  
  	<item id="1353" inherit="ITEM_NO_DECAY">
  		<id>0x1353</id>
! 		<category>Rocks\Boulders\Boulder 2 (2/3)</category>
  	</item>
  
  	<item id="1354" inherit="ITEM_NO_DECAY">
  		<id>0x1354</id>
! 		<category>Rocks\Boulders\Boulder 2 (3/3)</category>
  	</item>
  
  	<item id="1355" inherit="ITEM_NO_DECAY">
  		<id>0x1355</id>
! 		<category>Rocks\Boulders\Boulder 3 (1/2)</category>
  	</item>
  
  	<item id="1356" inherit="ITEM_NO_DECAY">
  		<id>0x1356</id>
! 		<category>Rocks\Boulders\Boulder 3 (2/2)</category>
  	</item>
  
  	<item id="1357" inherit="ITEM_NO_DECAY">
  		<id>0x1357</id>
! 		<category>Rocks\Boulders\Boulder 4 (1/3)</category>
  	</item>
  
  	<item id="1358" inherit="ITEM_NO_DECAY">
  		<id>0x1358</id>
! 		<category>Rocks\Boulders\Boulder 4 (2/3)</category>
  	</item>
  
  	<item id="1359" inherit="ITEM_NO_DECAY">
  		<id>0x1359</id>
! 		<category>Rocks\Boulders\Boulder 4 (3/3)</category>
  	</item>
  
  	<item id="135a" inherit="ITEM_NO_DECAY">
  		<id>0x135a</id>
! 		<category>Rocks\Boulders\Boulder 5 (1/2)</category>
  	</item>
  
  	<item id="135b" inherit="ITEM_NO_DECAY">
  		<id>0x135b</id>
! 		<category>Rocks\Boulders\Boulder 5 (2/2)</category>
  	</item>
  
  	<item id="135c" inherit="ITEM_NO_DECAY">
  		<id>0x135c</id>
! 		<category>Rocks\Boulders\Boulder 6 (1/3)</category>
  	</item>
  
  	<item id="135d" inherit="ITEM_NO_DECAY">
  		<id>0x135d</id>
! 		<category>Rocks\Boulders\Boulder 6 (2/3)</category>
  	</item>
  
  	<item id="135e" inherit="ITEM_NO_DECAY">
  		<id>0x135e</id>
! 		<category>Rocks\Boulders\Boulder 6 (3/3)</category>
  	</item>
  
  	<item id="135f" inherit="ITEM_NO_DECAY">
  		<id>0x135f</id>
! 		<category>Rocks\Boulders\Boulder 7 (1/2)</category>
  	</item>
  
  	<item id="1360" inherit="ITEM_NO_DECAY">
  		<id>0x1360</id>
! 		<category>Rocks\Boulders\Boulder 7 (2/2)</category>
  	</item>
  
  	<item id="1361" inherit="ITEM_NO_DECAY">
  		<id>0x1361</id>
! 		<category>Rocks\Boulders\Boulder 8 (1/2)</category>
  	</item>
  
  	<item id="1362" inherit="ITEM_NO_DECAY">
  		<id>0x1362</id>
! 		<category>Rocks\Boulders\Boulder 8 (2/2)</category>
  	</item>
  

[wpdev-commits] xmlscripts/definitions/items/professions alchemist.xml,1.14,1.15 artist.xml,1.2,1.3 baker.xml,1.3,1.4 barkeeper.xml,1.2,1.3 beekeper.xml,1.2,1.3 blacksmith.xml,1.8,1.9 cook.xml,1.2,1.3 fisher.xml,1.6,1.7 fletcher.xml,1.5,1.6 gipsy.xml,1.2,1.3 healer.xml,1.5,1.6 mage.xml,1.10,1.11 mapmaker.xml,1.4,1.5 musician.xml,1.8,1.9 stablemaster.xml,1.1,1.2 tailorer.xml,1.10,1.11 tinker.xml,1.5,1.6

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

Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26795/professions

Modified Files:
	alchemist.xml artist.xml baker.xml barkeeper.xml beekeper.xml 
	blacksmith.xml cook.xml fisher.xml fletcher.xml gipsy.xml 
	healer.xml mage.xml mapmaker.xml musician.xml stablemaster.xml 
	tailorer.xml tinker.xml 
Log Message:
Cleanups...
And a very long overdue Food/Drink Split/Cleanup


Index: gipsy.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/gipsy.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gipsy.xml	26 May 2004 13:45:30 -0000	1.2
--- gipsy.xml	17 Jul 2004 03:30:00 -0000	1.3
***************
*** 12,31 ****
  
  	<item id="e2d">
! 		<id>0x0e2d</id>
  		<category>Professions\Gipsy\Crystal Ball 1</category>
  	</item>
  
  	<item id="e2e">
! 		<id>0x0e2e</id>
  		<category>Professions\Gipsy\Crystal Ball 2</category>
  	</item>
  
  	<item id="e2f">
! 		<id>0x0e2f</id>
  		<category>Professions\Gipsy\Crystal Ball 3</category>
  	</item>
  
  	<item id="e30">
! 		<id>0x0e30</id>
  		<category>Professions\Gipsy\Crystal Ball 4</category>
  	</item>
--- 12,31 ----
  
  	<item id="e2d">
! 		<id>0xe2d</id>
  		<category>Professions\Gipsy\Crystal Ball 1</category>
  	</item>
  
  	<item id="e2e">
! 		<id>0xe2e</id>
  		<category>Professions\Gipsy\Crystal Ball 2</category>
  	</item>
  
  	<item id="e2f">
! 		<id>0xe2f</id>
  		<category>Professions\Gipsy\Crystal Ball 3</category>
  	</item>
  
  	<item id="e30">
! 		<id>0xe30</id>
  		<category>Professions\Gipsy\Crystal Ball 4</category>
  	</item>

Index: tinker.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/tinker.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tinker.xml	26 May 2004 13:45:30 -0000	1.5
--- tinker.xml	17 Jul 2004 03:30:00 -0000	1.6
***************
*** 146,150 ****
  	<item id="1eb8">
  		<id>0x1eb8</id>
! 		<category>Professions\Tinker\Toolkit 1 (W/E)</category>
  		<tag name="remaining_uses" type="int" value="35" />
  	</item>
--- 146,150 ----
  	<item id="1eb8">
  		<id>0x1eb8</id>
! 		<category>Professions\Tinker\Tools\Toolkit 1 (W/E)</category>
  		<tag name="remaining_uses" type="int" value="35" />
  	</item>
***************
*** 152,156 ****
  	<item id="1eb9">
  		<id>0x1eb9</id>
! 		<category>Professions\Tinker\Toolkit 1 (N/S)</category>
  		<tag name="remaining_uses" type="int" value="35" />
  	</item>
--- 152,156 ----
  	<item id="1eb9">
  		<id>0x1eb9</id>
! 		<category>Professions\Tinker\Tools\Toolkit 1 (N/S)</category>
  		<tag name="remaining_uses" type="int" value="35" />
  	</item>
***************
*** 158,162 ****
  	<item id="1eba">
  		<id>0x1eba</id>
! 		<category>Professions\Tinker\Toolkit 2 (W/E)</category>
  		<tag name="remaining_uses" type="int" value="35" />
  		<events>skills.tinkering</events>
--- 158,162 ----
  	<item id="1eba">
  		<id>0x1eba</id>
! 		<category>Professions\Tinker\Tools\Toolkit 2 (W/E)</category>
  		<tag name="remaining_uses" type="int" value="35" />
  		<events>skills.tinkering</events>
***************
*** 165,169 ****
  	<item id="1ebb">
  		<id>0x1ebb</id>
! 		<category>Professions\Tinker\Toolkit 2 (N/S)</category>
  		<tag name="remaining_uses" type="int" value="35" />
  		<events>skills.tinkering</events>
--- 165,169 ----
  	<item id="1ebb">
  		<id>0x1ebb</id>
! 		<category>Professions\Tinker\Tools\Toolkit 2 (N/S)</category>
  		<tag name="remaining_uses" type="int" value="35" />
  		<events>skills.tinkering</events>
***************
*** 172,176 ****
  	<item id="1ebc">
  		<id>0x1ebc</id>
! 		<category>Professions\Tinker\Tinker Tools</category>
  		<tag name="remaining_uses" type="int" value="35" />
  		<events>equipment,skills.tinkering</events>
--- 172,176 ----
  	<item id="1ebc">
  		<id>0x1ebc</id>
! 		<category>Professions\Tinker\Tools\Tinker Tools</category>
  		<tag name="remaining_uses" type="int" value="35" />
  		<events>equipment,skills.tinkering</events>

Index: mapmaker.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/mapmaker.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mapmaker.xml	12 Jul 2004 18:03:52 -0000	1.4
--- mapmaker.xml	17 Jul 2004 03:30:00 -0000	1.5
***************
*** 81,85 ****
  
  	<item id="mapmakers_pen">
! 		<id>0x0fbf</id>
  		<name>#1044167</name>
  		<category>Professions\Mapmaker\Pen &amp; Ink</category>
--- 81,85 ----
  
  	<item id="mapmakers_pen">
! 		<id>0xfbf</id>
  		<name>#1044167</name>
  		<category>Professions\Mapmaker\Pen &amp; Ink</category>
***************
*** 92,97 ****
  		<tag name="preset" value="britain" />
  		<category>Professions\Mapmaker\Maps\Britain</category>
! 	</item>	
! 	
  	<item id="map_britaintoskarabrae" inherit="14eb">
  		<name>map of Britain to Skara Brae</name>
--- 92,97 ----
  		<tag name="preset" value="britain" />
  		<category>Professions\Mapmaker\Maps\Britain</category>
! 	</item>
! 
  	<item id="map_britaintoskarabrae" inherit="14eb">
  		<name>map of Britain to Skara Brae</name>
***************
*** 100,105 ****
  		<tag name="preset" value="britaintoskarabrae" />
  		<category>Professions\Mapmaker\Maps\Britain to Skara Brae</category>
! 	</item>	
! 	
  	<item id="map_britaintotrinsic" inherit="14eb">
  		<name>map of Britain to Trinsic</name>
--- 100,105 ----
  		<tag name="preset" value="britaintoskarabrae" />
  		<category>Professions\Mapmaker\Maps\Britain to Skara Brae</category>
! 	</item>
! 
  	<item id="map_britaintotrinsic" inherit="14eb">
  		<name>map of Britain to Trinsic</name>
***************
*** 108,113 ****
  		<tag name="preset" value="britaintotrinsic" />
  		<category>Professions\Mapmaker\Maps\Britain to Trinsic</category>
! 	</item>	
! 	
  	<item id="map_bucsden" inherit="14eb">
  		<name>map of Buccaneer's Den</name>
--- 108,113 ----
  		<tag name="preset" value="britaintotrinsic" />
  		<category>Professions\Mapmaker\Maps\Britain to Trinsic</category>
! 	</item>
! 
  	<item id="map_bucsden" inherit="14eb">
  		<name>map of Buccaneer's Den</name>
***************
*** 125,129 ****
  		<category>Professions\Mapmaker\Maps\Buccaneer's Den to Magincia</category>
  	</item>
! 	
  	<item id="map_bucsdentoocllo" inherit="14eb">
  		<name>map of Buccaneer's Den to Ocllo</name>
--- 125,129 ----
  		<category>Professions\Mapmaker\Maps\Buccaneer's Den to Magincia</category>
  	</item>
! 
  	<item id="map_bucsdentoocllo" inherit="14eb">
  		<name>map of Buccaneer's Den to Ocllo</name>
***************
*** 133,137 ****
  		<category>Professions\Mapmaker\Maps\Buccaneer's Den to Ocllo</category>
  	</item>
! 	
  	<item id="map_jhelom" inherit="14eb">
  		<name>map of Jhelom</name>
--- 133,137 ----
  		<category>Professions\Mapmaker\Maps\Buccaneer's Den to Ocllo</category>
  	</item>
! 
  	<item id="map_jhelom" inherit="14eb">
  		<name>map of Jhelom</name>
***************
*** 141,145 ****
  		<category>Professions\Mapmaker\Maps\Jhelom</category>
  	</item>
! 	
  	<item id="map_magincia" inherit="14eb">
  		<name>map of Magincia</name>
--- 141,145 ----
  		<category>Professions\Mapmaker\Maps\Jhelom</category>
  	</item>
! 
  	<item id="map_magincia" inherit="14eb">
  		<name>map of Magincia</name>
***************
*** 148,152 ****
  		<tag name="preset" value="magincia" />
  		<category>Professions\Mapmaker\Maps\Magincia</category>
! 	</item>					
  
  	<item id="map_maginciatoocllo" inherit="14eb">
--- 148,152 ----
  		<tag name="preset" value="magincia" />
  		<category>Professions\Mapmaker\Maps\Magincia</category>
! 	</item>
  
  	<item id="map_maginciatoocllo" inherit="14eb">
***************
*** 157,161 ****
  		<category>Professions\Mapmaker\Maps\Magincia to Ocllo</category>
  	</item>
! 	
  	<item id="map_minoc" inherit="14eb">
  		<name>map of Minoc</name>
--- 157,161 ----
  		<category>Professions\Mapmaker\Maps\Magincia to Ocllo</category>
  	</item>
! 
  	<item id="map_minoc" inherit="14eb">
  		<name>map of Minoc</name>
***************
*** 165,169 ****
  		<category>Professions\Mapmaker\Maps\Minoc</category>
  	</item>
! 	
  	<item id="map_minoctoyew" inherit="14eb">
  		<name>map of Minoc to Yew</name>
--- 165,169 ----
  		<category>Professions\Mapmaker\Maps\Minoc</category>
  	</item>
! 
  	<item id="map_minoctoyew" inherit="14eb">
  		<name>map of Minoc to Yew</name>
***************
*** 173,177 ****
  		<category>Professions\Mapmaker\Maps\Minoc to Yew</category>
  	</item>
! 	
  	<item id="map_minoctovesper" inherit="14eb">
  		<name>map of Minoc to Vesper</name>
--- 173,177 ----
  		<category>Professions\Mapmaker\Maps\Minoc to Yew</category>
  	</item>
! 
  	<item id="map_minoctovesper" inherit="14eb">
  		<name>map of Minoc to Vesper</name>
***************
*** 181,185 ****
  		<category>Professions\Mapmaker\Maps\Minoc to Vesper</category>
  	</item>
! 	
  	<item id="map_moonglow" inherit="14eb">
  		<name>map of Moonglow</name>
--- 181,185 ----
  		<category>Professions\Mapmaker\Maps\Minoc to Vesper</category>
  	</item>
! 
  	<item id="map_moonglow" inherit="14eb">
  		<name>map of Moonglow</name>
***************
*** 189,193 ****
  		<category>Professions\Mapmaker\Maps\Moonglow</category>
  	</item>
! 	
  	<item id="map_moonglowtonujelm" inherit="14eb">
  		<name>map of Moonglow to Nujelm</name>
--- 189,193 ----
  		<category>Professions\Mapmaker\Maps\Moonglow</category>
  	</item>
! 
  	<item id="map_moonglowtonujelm" inherit="14eb">
  		<name>map of Moonglow to Nujelm</name>
***************
*** 197,201 ****
  		<category>Professions\Mapmaker\Maps\Moonglow to Nujelm</category>
  	</item>
! 	
  	<item id="map_nujelm" inherit="14eb">
  		<name>map of Nujelm</name>
--- 197,201 ----
  		<category>Professions\Mapmaker\Maps\Moonglow to Nujelm</category>
  	</item>
! 
  	<item id="map_nujelm" inherit="14eb">
  		<name>map of Nujelm</name>
***************
*** 205,209 ****
  		<category>Professions\Mapmaker\Maps\Nujelm</category>
  	</item>
! 	
  	<item id="map_nujelmtomagincia" inherit="14eb">
  		<name>map of Nujelm to Magincia</name>
--- 205,209 ----
  		<category>Professions\Mapmaker\Maps\Nujelm</category>
  	</item>
! 
  	<item id="map_nujelmtomagincia" inherit="14eb">
  		<name>map of Nujelm to Magincia</name>
***************
*** 213,217 ****
  		<category>Professions\Mapmaker\Maps\Nujelm to Magincia</category>
  	</item>
! 	
  	<item id="map_occlo" inherit="14eb">
  		<name>map of Ocllo</name>
--- 213,217 ----
  		<category>Professions\Mapmaker\Maps\Nujelm to Magincia</category>
  	</item>
! 
  	<item id="map_occlo" inherit="14eb">
  		<name>map of Ocllo</name>
***************
*** 221,225 ****
  		<category>Professions\Mapmaker\Maps\Ocllo</category>
  	</item>
! 	
  	<item id="map_serpentshold" inherit="14eb">
  		<name>map of Serpent's Hold</name>
--- 221,225 ----
  		<category>Professions\Mapmaker\Maps\Ocllo</category>
  	</item>
! 
  	<item id="map_serpentshold" inherit="14eb">
  		<name>map of Serpent's Hold</name>
***************
*** 229,233 ****
  		<category>Professions\Mapmaker\Maps\Serpent's Hold</category>
  	</item>
! 	
  	<item id="map_serpentsholdtoocllo" inherit="14eb">
  		<name>map of Serpent's Hold to Ocllo</name>
--- 229,233 ----
  		<category>Professions\Mapmaker\Maps\Serpent's Hold</category>
  	</item>
! 
  	<item id="map_serpentsholdtoocllo" inherit="14eb">
  		<name>map of Serpent's Hold to Ocllo</name>
***************
*** 237,241 ****
  		<category>Professions\Mapmaker\Maps\Serpent's Hold to Ocllo</category>
  	</item>
! 	
  	<item id="map_skarabrae" inherit="14eb">
  		<name>map of Skara Brae</name>
--- 237,241 ----
  		<category>Professions\Mapmaker\Maps\Serpent's Hold to Ocllo</category>
  	</item>
! 
  	<item id="map_skarabrae" inherit="14eb">
  		<name>map of Skara Brae</name>
***************
*** 245,249 ****
  		<category>Professions\Mapmaker\Maps\Skara Brae</category>
  	</item>
! 	
  	<item id="map_world" inherit="14eb">
  		<name>map of The World</name>
--- 245,249 ----
  		<category>Professions\Mapmaker\Maps\Skara Brae</category>
  	</item>
! 
  	<item id="map_world" inherit="14eb">
  		<name>map of The World</name>
***************
*** 253,257 ****
  		<category>Professions\Mapmaker\Maps\The World</category>
  	</item>
! 	
  	<item id="map_trinsic" inherit="14eb">
  		<name>map of Trinsic</name>
--- 253,257 ----
  		<category>Professions\Mapmaker\Maps\The World</category>
  	</item>
! 
  	<item id="map_trinsic" inherit="14eb">
  		<name>map of Trinsic</name>
***************
*** 261,265 ****
  		<category>Professions\Mapmaker\Maps\Trinsic</category>
  	</item>
! 	
  	<item id="map_trinsictobucsden" inherit="14eb">
  		<name>map of Trinsic to Buccaneer's Den</name>
--- 261,265 ----
  		<category>Professions\Mapmaker\Maps\Trinsic</category>
  	</item>
! 
  	<item id="map_trinsictobucsden" inherit="14eb">
  		<name>map of Trinsic to Buccaneer's Den</name>
***************
*** 269,273 ****
  		<category>Professions\Mapmaker\Maps\Trinsic to Buccaneer's Den</category>
  	</item>
! 	
  	<item id="map_trinsictojhelom" inherit="14eb">
  		<name>map of Trinsic to Jhelom</name>
--- 269,273 ----
  		<category>Professions\Mapmaker\Maps\Trinsic to Buccaneer's Den</category>
  	</item>
! 
  	<item id="map_trinsictojhelom" inherit="14eb">
  		<name>map of Trinsic to Jhelom</name>
***************
*** 276,281 ****
  		<tag name="preset" value="trinsictojhelom" />
  		<category>Professions\Mapmaker\Maps\Trinsic to Jhelom</category>
! 	</item>	
! 	
  	<item id="map_vesper" inherit="14eb">
  		<name>map of Vesper</name>
--- 276,281 ----
  		<tag name="preset" value="trinsictojhelom" />
  		<category>Professions\Mapmaker\Maps\Trinsic to Jhelom</category>
! 	</item>
! 
  	<item id="map_vesper" inherit="14eb">
  		<name>map of Vesper</name>
***************
*** 285,289 ****
  		<category>Professions\Mapmaker\Maps\Vesper</category>
  	</item>
! 	
  	<item id="map_vespertonujelm" inherit="14eb">
  		<name>map of Vesper to Nujelm</name>
--- 285,289 ----
  		<category>Professions\Mapmaker\Maps\Vesper</category>
  	</item>
! 
  	<item id="map_vespertonujelm" inherit="14eb">
  		<name>map of Vesper to Nujelm</name>
***************
*** 293,297 ****
  		<category>Professions\Mapmaker\Maps\Vesper to Nujelm</category>
  	</item>
! 	
  	<item id="map_yew" inherit="14eb">
  		<name>map of Yew</name>
--- 293,297 ----
  		<category>Professions\Mapmaker\Maps\Vesper to Nujelm</category>
  	</item>
! 
  	<item id="map_yew" inherit="14eb">
  		<name>map of Yew</name>
***************
*** 301,305 ****
  		<category>Professions\Mapmaker\Maps\Yew</category>
  	</item>
! 	
  	<item id="map_yewtobritain" inherit="14eb">
  		<name>map of Yew to Britain</name>
--- 301,305 ----
  		<category>Professions\Mapmaker\Maps\Yew</category>
  	</item>
! 
  	<item id="map_yewtobritain" inherit="14eb">
  		<name>map of Yew to Britain</name>
***************
*** 308,311 ****
  		<tag name="preset" value="yewtobritain" />
  		<category>Professions\Mapmaker\Maps\Yew to Britain</category>
! 	</item>	
  </definitions>
--- 308,311 ----
  		<tag name="preset" value="yewtobritain" />
  		<category>Professions\Mapmaker\Maps\Yew to Britain</category>
! 	</item>
  </definitions>

Index: barkeeper.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/barkeeper.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** barkeeper.xml	26 May 2004 13:45:30 -0000	1.2
--- barkeeper.xml	17 Jul 2004 03:30:00 -0000	1.3
***************
*** 12,106 ****
  
  	<item id="e12">
! 		<id>0x0e12</id>
  		<category>Professions\Barkeeper\Chessmen 1</category>
  	</item>
  
  	<item id="e13">
! 		<id>0x0e13</id>
  		<category>Professions\Barkeeper\Chessmen 2</category>
  	</item>
  
  	<item id="e14">
! 		<id>0x0e14</id>
  		<category>Professions\Barkeeper\Chessmen 3</category>
  	</item>
  
  	<item id="e15">
! 		<id>0x0e15</id>
  		<category>Professions\Barkeeper\Cards 1</category>
  	</item>
  
  	<item id="e16">
! 		<id>0x0e16</id>
  		<category>Professions\Barkeeper\Cards 2</category>
  	</item>
  
  	<item id="e17">
! 		<id>0x0e17</id>
  		<category>Professions\Barkeeper\Cards 3</category>
  	</item>
  
  	<item id="e18">
! 		<id>0x0e18</id>
  		<category>Professions\Barkeeper\Cards 4</category>
  	</item>
  
  	<item id="e19">
! 		<id>0x0e19</id>
  		<category>Professions\Barkeeper\Cards 5</category>
  	</item>
  
  	<item id="e1a">
! 		<id>0x0e1a</id>
  		<category>Professions\Barkeeper\Checkers 1</category>
  	</item>
  
  	<item id="e1b">
! 		<id>0x0e1b</id>
  		<category>Professions\Barkeeper\Checkers 2</category>
  	</item>
  
  	<item id="e1c">
! 		<id>0x0e1c</id>
  		<category>Professions\Barkeeper\Backgammon Board 1</category>
  	</item>
  
  	<item id="fa2">
! 		<id>0x0fa2</id>
  		<category>Professions\Barkeeper\Cards 6</category>
  	</item>
  
  	<item id="fa3">
! 		<id>0x0fa3</id>
  		<category>Professions\Barkeeper\Cards 7</category>
  	</item>
  
  	<item id="fa4">
! 		<id>0x0fa4</id>
  		<category>Professions\Barkeeper\Checkers 3</category>
  	</item>
  
  	<item id="fa5">
! 		<id>0x0fa5</id>
  		<category>Professions\Barkeeper\Checkers 4</category>
  	</item>
  
  	<item id="fa6">
! 		<id>0x0fa6</id>
  		<category>Professions\Barkeeper\Game Board</category>
  	</item>
  
  	<item id="fa7">
! 		<id>0x0fa7</id>
  		<category>Professions\Barkeeper\Dice and Cup</category>
  	</item>
  
  	<item id="fa8">
! 		<id>0x0fa8</id>
  		<category>Professions\Barkeeper\Chessmen 4</category>
  	</item>
  
  	<item id="fad">
! 		<id>0x0fad</id>
  		<category>Professions\Barkeeper\Backgammon Board 2</category>
  	</item>
--- 12,106 ----
  
  	<item id="e12">
! 		<id>0xe12</id>
  		<category>Professions\Barkeeper\Chessmen 1</category>
  	</item>
  
  	<item id="e13">
! 		<id>0xe13</id>
  		<category>Professions\Barkeeper\Chessmen 2</category>
  	</item>
  
  	<item id="e14">
! 		<id>0xe14</id>
  		<category>Professions\Barkeeper\Chessmen 3</category>
  	</item>
  
  	<item id="e15">
! 		<id>0xe15</id>
  		<category>Professions\Barkeeper\Cards 1</category>
  	</item>
  
  	<item id="e16">
! 		<id>0xe16</id>
  		<category>Professions\Barkeeper\Cards 2</category>
  	</item>
  
  	<item id="e17">
! 		<id>0xe17</id>
  		<category>Professions\Barkeeper\Cards 3</category>
  	</item>
  
  	<item id="e18">
! 		<id>0xe18</id>
  		<category>Professions\Barkeeper\Cards 4</category>
  	</item>
  
  	<item id="e19">
! 		<id>0xe19</id>
  		<category>Professions\Barkeeper\Cards 5</category>
  	</item>
  
  	<item id="e1a">
! 		<id>0xe1a</id>
  		<category>Professions\Barkeeper\Checkers 1</category>
  	</item>
  
  	<item id="e1b">
! 		<id>0xe1b</id>
  		<category>Professions\Barkeeper\Checkers 2</category>
  	</item>
  
  	<item id="e1c">
! 		<id>0xe1c</id>
  		<category>Professions\Barkeeper\Backgammon Board 1</category>
  	</item>
  
  	<item id="fa2">
! 		<id>0xfa2</id>
  		<category>Professions\Barkeeper\Cards 6</category>
  	</item>
  
  	<item id="fa3">
! 		<id>0xfa3</id>
  		<category>Professions\Barkeeper\Cards 7</category>
  	</item>
  
  	<item id="fa4">
! 		<id>0xfa4</id>
  		<category>Professions\Barkeeper\Checkers 3</category>
  	</item>
  
  	<item id="fa5">
! 		<id>0xfa5</id>
  		<category>Professions\Barkeeper\Checkers 4</category>
  	</item>
  
  	<item id="fa6">
! 		<id>0xfa6</id>
  		<category>Professions\Barkeeper\Game Board</category>
  	</item>
  
  	<item id="fa7">
! 		<id>0xfa7</id>
  		<category>Professions\Barkeeper\Dice and Cup</category>
  	</item>
  
  	<item id="fa8">
! 		<id>0xfa8</id>
  		<category>Professions\Barkeeper\Chessmen 4</category>
  	</item>
  
  	<item id="fad">
! 		<id>0xfad</id>
  		<category>Professions\Barkeeper\Backgammon Board 2</category>
  	</item>

Index: cook.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/cook.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cook.xml	26 May 2004 13:45:30 -0000	1.2
--- cook.xml	17 Jul 2004 03:30:00 -0000	1.3
***************
*** 41,43 ****
--- 41,578 ----
  	</item>
  
+ 	<!-- Tray n/s -->
+ 	<item id="991">
+ 		<id>0x991</id>
+ 		<category>Professions\Cook\Kitchen\Tray (N/S)</category>
+ 	</item>
+ 
+ 	<!-- Tray w/e -->
+ 	<item id="992" inherit="991">
+ 		<baseid>991</baseid>
+ 		<id>0x992</id>
+ 		<category>Professions\Cook\Kitchen\Tray (W/E)</category>
+ 	</item>
+ 
+ 	<!-- Cauldron n/s -->
+ 	<item id="974">
+ 		<id>0x974</id>
+ 		<category>Professions\Cook\Kitchen\Cauldron (N/S)</category>
+ 		<note>Use this in conjunction with <ref id="item:970">stew</ref></note>
+ 	</item>
+ 
+ 	<!-- Cauldron w/e -->
+ 	<item id="975" inherit="974">
+ 		<baseid>974</baseid>
+ 		<id>0x975</id>
+ 		<category>Professions\Cook\Kitchen\Cauldron (W/E)</category>
+ 	</item>
+ 
+ 	<!-- Frypan -->
+ 	<item id="97f">
+ 		<id>0x97f</id>
+ 		<category>Professions\Cook\Kitchen\Frypan 1</category>
+ 	</item>
+ 
+ 	<!-- Frypan 2 -->
+ 	<item id="9e2">
+ 		<id>0x9e2</id>
+ 		<category>Professions\Cook\Kitchen\Frypan 2</category>
+ 	</item>
+ 
+ 	<!-- Ceramic Mug 1 -->
+ 	<item id="995">
+ 		<id>0x995</id>
+ 		<category>Professions\Cook\Kitchen\Ceramic Mug 1</category>
+ 	</item>
+ 
+ 	<!-- Ceramic Mug 2 -->
+ 	<item id="996" inherit="995">
+ 		<baseid>995</baseid>
+ 		<id>0x996</id>
+ 		<category>Professions\Cook\Kitchen\Ceramic Mug 2</category>
+ 	</item>
+ 
+ 	<!-- Ceramic Mug 3 -->
+ 	<item id="997" inherit="995">
+ 		<baseid>995</baseid>
+ 		<id>0x997</id>
+ 		<category>Professions\Cook\Kitchen\Ceramic Mug 3</category>
+ 	</item>
+ 
+ 	<!-- Ceramic Mug 4 -->
+ 	<item id="9ca" inherit="995">
+ 		<baseid>995</baseid>
+ 		<id>0x9ca</id>
+ 		<category>Professions\Cook\Kitchen\Ceramic Mug 4</category>
+ 	</item>
+ 
+ 	<!-- Mug 1 -->
+ 	<item id="998">
+ 		<id>0x998</id>
+ 		<category>Professions\Cook\Kitchen\Mug 1</category>
+ 	</item>
+ 
+ 	<!-- Mug 2 -->
+ 	<item id="999" inherit="998">
+ 		<baseid>998</baseid>
+ 		<id>0x999</id>
+ 		<category>Professions\Cook\Kitchen\Mug 2</category>
+ 	</item>
+ 
+ 	<!-- Goblet 1 -->
+ 	<item id="99a">
+ 		<id>0x99a</id>
+ 		<category>Professions\Cook\Kitchen\Goblet 1</category>
+ 	</item>
+ 
+ 	<!-- Goblet 2 -->
+ 	<item id="9b3" inherit="99a">
+ 		<baseid>99a</baseid>
+ 		<id>0x9b3</id>
+ 		<category>Professions\Cook\Kitchen\Goblet 2</category>
+ 	</item>
+ 
+ 	<!-- Goblet 3 -->
+ 	<item id="9bf" inherit="99a">
+ 		<baseid>99a</baseid>
+ 		<id>0x9bf</id>
+ 		<category>Professions\Cook\Kitchen\Goblet 3</category>
+ 	</item>
+ 
+ 	<!-- Goblet 4 -->
+ 	<item id="9cb" inherit="99a">
+ 		<baseid>99a</baseid>
+ 		<id>0x9cb</id>
+ 		<category>Professions\Cook\Kitchen\Goblet 4</category>
+ 	</item>
+ 
+ 	<!-- Fork w/e -->
+ 	<item id="9a3">
+ 		<id>0x9a3</id>
+ 		<category>Professions\Cook\Kitchen\Fork (E/W)</category>
+ 	</item>
+ 
+ 	<!-- Fork n/s -->
+ 	<item id="9a4" inherit="9a3">
+ 		<baseid>9a3</baseid>
+ 		<category>Professions\Cook\Kitchen\Fork (S/N)</category>
+ 		<id>0x9a4</id>
+ 	</item>
+ 
+ 	<!-- Knife w/e -->
+ 	<item id="9a5">
+ 		<id>0x9a5</id>
+ 		<category>Professions\Cook\Kitchen\Knife (E/W)</category>
+ 	</item>
+ 
+ 	<!-- Knife n/s -->
+ 	<item id="9a6" inherit="9a5">
+ 		<baseid>9a5</baseid>
+ 		<id>0x9a6</id>
+ 		<category>Professions\Cook\Kitchen\Knife (S/N)</category>
+ 	</item>
+ 
+ 	<!-- Glass Pitcher -->
+ 	<item id="9a7">
+ 		<id>0x9a7</id>
+ 		<category>Professions\Cook\Kitchen\Glass Pitcher (empty)</category>
+ 	</item>
+ 
+ 	<!-- Eggshells -->
+ 	<item id="9b4">
+ 		<id>0x9b4</id>
+ 		<category>Professions\Cook\Kitchen\Eggshells</category>
+ 	</item>
+ 
+ 	<!-- Silverware 1 w/e -->
+ 	<item id="9bd">
+ 		<category>Professions\Cook\Kitchen\Silverware 1 (W/E)</category>
+ 		<id>0x9bd</id>
+ 	</item>
+ 
+ 	<!-- Silverware 1 n/s -->
+ 	<item id="9be" inherit="9bd">
+ 		<baseid>9bd</baseid>
+ 		<id>0x9be</id>
+ 		<category>Professions\Cook\Kitchen\Silverware 1 (N/S)</category>
+ 	</item>
+ 
+ 	<!-- Spoon w/e -->
+ 	<item id="9c2">
+ 		<id>0x9c2</id>
+ 		<category>Professions\Cook\Kitchen\Spoon (E/W)</category>
+ 	</item>
+ 
+ 	<!-- Spoon n/s -->
+ 	<item id="9c3" inherit="9c2">
+ 		<baseid>9c2</baseid>
+ 		<id>0x9c3</id>
+ 		<category>Professions\Cook\Kitchen\Spoon (S/N)</category>
+ 	</item>
+ 
+ 	<!-- Silverware 2 n/s -->
+ 	<item id="9d4">
+ 		<id>0x9d4</id>
+ 		<category>Professions\Cook\Kitchen\Silverware 2 (N/S)</category>
+ 	</item>
+ 
+ 	<!-- Silverware 2 w/e -->
+ 	<item id="9d5" inherit="9d4">
+ 		<baseid>9d4</baseid>
+ 		<id>0x9d5</id>
+ 		<category>Professions\Cook\Kitchen\Silverware 2 (W/E)</category>
+ 	</item>
+ 
+ 	<!-- Pitcher -->
+ 	<item id="9d6">
+ 		<category>Professions\Cook\Kitchen\Pitcher</category>
+ 		<id>0x9d6</id>
+ 	</item>
+ 
+ 	<!-- Plate -->
+ 	<item id="9d7">
+ 		<id>0x9d7</id>
+ 		<category>Professions\Cook\Kitchen\Plate</category>
+ 	</item>
+ 
+ 	<!-- Plate of Food 1 -->
+ 	<item id="9af">
+ 		<id>0x9af</id>
+ 		<category>Professions\Cook\Kitchen\Plate of Food 1</category>
+ 	</item>
+ 
+ 	<!-- Plate of Food 2 -->
+ 	<item id="9d8" inherit="9af">
+ 		<baseid>9af</baseid>
+ 		<id>0x9d8</id>
+ 		<category>Professions\Cook\Kitchen\Plate of Food 2</category>
+ 	</item>
+ 
+ 	<!-- Plate of Food 3 -->
+ 	<item id="9d9" inherit="9af">
+ 		<baseid>9af</baseid>
+ 		<id>0x9d9</id>
+ 		<category>Professions\Cook\Kitchen\Plate of Food 3</category>
+ 	</item>
+ 
+ 	<!-- Dirty Plate 2 -->
+ 	<item id="9da">
+ 		<id>0x9da</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Plate 2</category>
+ 	</item>
+ 
+ 	<!-- Dirty Plate 1 -->
+ 	<item id="9ae">
+ 		<id>0x9ae</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Plate 1</category>
+ 	</item>
+ 
+ 	<!-- Dirty Plate 3 -->
+ 	<item id="a19">
+ 		<id>0xa19</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Plate 3</category>
+ 	</item>
+ 
+ 	<!-- Plate of Food 4 -->
+ 	<item id="9db">
+ 		<id>0x9db</id>
+ 		<category>Professions\Cook\Kitchen\Plate of Food 4</category>
+ 	</item>
+ 
+ 	<!-- Dirty Pot 1 -->
+ 	<item id="9dc">
+ 		<id>0x9dc</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Pot 1</category>
+ 	</item>
+ 
+ 	<!-- Dirty Pot 2 -->
+ 	<item id="9dd">
+ 		<id>0x9dd</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Pot 2</category>
+ 	</item>
+ 
+ 	<!-- Dirty Pot 3 -->
+ 	<item id="9df">
+ 		<id>0x9df</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Pot 3</category>
+ 	</item>
+ 
+ 	<!-- Dirty Pot 4 -->
+ 	<item id="9e6">
+ 		<id>0x9e6</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Pot 4</category>
+ 	</item>
+ 
+ 	<!-- Dirty Pot 5 -->
+ 	<item id="9e7">
+ 		<id>0x9e7</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Pot 5</category>
+ 	</item>
+ 
+ 	<!-- Pot 1 -->
+ 	<item id="9e0">
+ 		<id>0x9e0</id>
+ 		<category>Professions\Cook\Kitchen\Pot 1</category>
+ 	</item>
+ 
+ 	<!-- Pot 2 -->
+ 	<item id="9e1">
+ 		<id>0x9e1</id>
+ 		<category>Professions\Cook\Kitchen\Pot 2</category>
+ 	</item>
+ 
+ 	<!-- Pot 3 -->
+ 	<item id="9e3">
+ 		<id>0x9e3</id>
+ 		<category>Professions\Cook\Kitchen\Pot 3</category>
+ 	</item>
+ 
+ 	<!-- Pot 4 -->
+ 	<item id="9e4">
+ 		<id>0x9e4</id>
+ 		<category>Professions\Cook\Kitchen\Pot 4</category>
+ 	</item>
+ 
+ 	<!-- Pot 5 -->
+ 	<item id="9e5">
+ 		<id>0x9e5</id>
+ 		<category>Professions\Cook\Kitchen\Pot 5</category>
+ 	</item>
+ 
+ 	<!-- Dirty Frypan -->
+ 	<item id="9de">
+ 		<id>0x9de</id>
+ 		<category>Professions\Cook\Kitchen\Dirty Frypan</category>
+ 	</item>
+ 
+ 	<!-- Dirty Pan -->
+ 	<item id="9e8">
+ 		<category>Professions\Cook\Kitchen\Dirty Pan</category>
+ 		<id>0x9e8</id>
+ 	</item>
+ 
+ 	<!-- Pan -->
+ 	<item id="9f3">
+ 		<category>Professions\Cook\Kitchen\Pan</category>
+ 		<id>0x9f3</id>
+ 	</item>
+ 
+ 	<!-- Fork n/s -->
+ 	<item id="9f4">
+ 		<category>Professions\Cook\Kitchen\Fork (N/S)</category>
+ 		<id>0x9f4</id>
+ 	</item>
+ 
+ 	<!-- Fork w/e -->
+ 	<item id="9f5">
+ 		<category>Professions\Cook\Kitchen\Fork (W/E)</category>
+ 		<id>0x9f5</id>
+ 	</item>
+ 
+ 	<!-- Knife n/s -->
+ 	<item id="9f6">
+ 		<category>Professions\Cook\Kitchen\Knife (N/S)</category>
+ 		<id>0x9f6</id>
+ 	</item>
+ 
+ 	<!-- Knife w/e -->
+ 	<item id="9f7">
+ 		<category>Professions\Cook\Kitchen\Knife (W/E)</category>
+ 		<id>0x9f7</id>
+ 	</item>
+ 
+ 	<!-- Spoon n/s -->
+ 	<item id="9f8">
+ 		<category>Professions\Cook\Kitchen\Spoon (N/S)</category>
+ 		<id>0x9f8</id>
+ 	</item>
+ 
+ 	<!-- Spoon w/e -->
+ 	<item id="9f9">
+ 		<category>Professions\Cook\Kitchen\Spoon (W/E)</category>
+ 		<id>0x9f9</id>
+ 	</item>
+ 
+ 	<!-- Bowl of Flour -->
+ 	<item id="a1e">
+ 		<category>Professions\Cook\Supplies\Bowl of Flour</category>
+ 		<id>0xa1e</id>
+ 		<buyprice>8</buyprice>
+ 		<sellprice>4</sellprice>
+ 		<weight>0.4</weight>
+ 		<events>cooking</events>
+ 	</item>
+ 
+ 	<!-- Skull Mugs -->
+ 	<item id="ffb">
+ 		<id>0xffb</id>
+ 		<category>Professions\Cook\Bar\Skull Mug 1</category>
+ 	</item>
+ 
+ 	<item id="ffc" inherit="ffb">
+ 		<id>0xffc</id>
+ 		<category>Professions\Cook\Bar\Skull Mug 2</category>
+ 	</item>
+ 
+ 	<item id="ffd" inherit="ffb">
+ 		<id>0xffd</id>
+ 		<category>Professions\Cook\Bar\Skull Mug 3</category>
+ 	</item>
+ 
+ 	<item id="ffe" inherit="ffb">
+ 		<id>0xffe</id>
+ 		<category>Professions\Cook\Bar\Skull Mug 4</category>
+ 	</item>
+ 
+ 	<!-- Pewter Mug -->
+ 	<item id="fff">
+ 		<id>0xfff</id>
+ 		<category>Professions\Cook\Bar\Pewter Mug 1</category>
+ 	</item>
+ 
+ 	<item id="1000" inherit="fff">
+ 		<id>0x1000</id>
+ 		<category>Professions\Cook\Bar\Pewter Mug 2</category>
+ 	</item>
+ 
+ 	<item id="1001" inherit="fff">
+ 		<id>0x1001</id>
+ 		<category>Professions\Cook\Bar\Pewter Mug 3</category>
+ 	</item>
+ 
+ 	<item id="1002" inherit="fff">
+ 		<id>0x1002</id>
+ 		<category>Professions\Cook\Bar\Pewter Mug 4</category>
+ 	</item>
+ 
+ 	<!-- Spittoon -->
+ 	<item id="1003">
+ 		<id>0x1003</id>
+ 		<category>Professions\Cook\Bar\Spittoon</category>
+ 	</item>
+ 
+ 	<item id="103f">
+ 		<id>0x103f</id>
+ 		<weight>0.1</weight>
+ 		<category>Professions\Cook\Supplies\Cookie Mix</category>
+ 		<events>cooking</events>
+ 	</item>
+ 
+ 	<item id="1042">
+ 		<id>0x1042</id>
+ 		<weight>0.1</weight>
+ 		<category>Professions\Cook\Supplies\Unbaked Pie</category>
+ 		<events>cooking</events>
+ 	</item>
+ 
+ 	<item id="1083">
+ 		<id>0x1083</id>
+ 		<weight>0.1</weight>
+ 		<category>Professions\Cook\Supplies\Unbaked Pizza</category>
+ 		<events>cooking</events>
+ 	</item>
+ 
+ 	<item id="15f8">
+ 		<id>0x15f8</id>
+ 		<weight>0.5</weight>
+ 		<category>Professions\Cook\Kitchen\Wooden Bowl</category>
+ 	</item>
+ 
+ 	<item id="15fd">
+ 		<id>0x15fd</id>
+ 		<category>Professions\Cook\Kitchen\Pewter Bowl</category>
+ 	</item>
+ 
+ 	<item id="1603">
+ 		<id>0x1603</id>
+ 		<category>Professions\Cook\Kitchen\Large Pewter Bowl</category>
+ 	</item>
+ 
+ 	<item id="1605">
+ 		<id>0x1605</id>
+ 		<category>Professions\Cook\Kitchen\Large Wooden Bowl</category>
+ 	</item>
+ 
+ 	<item id="1871">
+ 		<id>0x1871</id>
+ 		<category>Professions\Cook\Professions\Cook\Decoration\Beef Carcass 1 (N/S)</category>
+ 	</item>
+ 
+ 	<item id="1872">
+ 		<id>0x1872</id>
+ 		<category>Professions\Cook\Professions\Cook\Decoration\Beef Carcass 1 (W/E)</category>
+ 	</item>
+ 
+ 	<item id="1873">
+ 		<id>0x1873</id>
+ 		<category>Professions\Cook\Professions\Cook\Decoration\Beef Carcass 2 (N/S)</category>
+ 	</item>
+ 
+ 	<item id="1874">
+ 		<id>0x1874</id>
+ 		<category>Professions\Cook\Professions\Cook\Decoration\Beef Carcass 2 (W/E)</category>
+ 	</item>
+ 
+ 	<!-- Raw Leg of Lamb -->
+ 	<item id="1609">
+ 		<id>0x1609</id>
+ 		<buyprice>5</buyprice>
+ 		<sellprice>2</sellprice>
+ 		<weight>0.2</weight>
+ 		<category>Professions\Cook\Supplies\Raw Leg of Lamb</category>
+ 		<events>cooking</events>
+ 	</item>
+ 
+ 	<!-- Raw Chicken Leg -->
+ 	<item id="1607">
+ 		<id>0x1607</id>
+ 		<buyprice>2</buyprice>
+ 		<sellprice>1</sellprice>
+ 		<weight>0.1</weight>
+ 		<category>Professions\Cook\Supplies\Raw Chicken Leg</category>
+ 		<events>cooking</events>
+ 	</item>
+ 
+ 	<item id="1f81">
+ 		<category>Professions\Cook\Decoration\Kitchen\Glass 1</category>
+ 		<id>0x1f81</id>
+ 	</item>
+ 
+ 	<item id="1f82">
+ 		<id>0x1f82</id>
+ 		<category>Professions\Cook\Decoration\Kitchen\Glass 2</category>
+ 	</item>
+ 
+ 	<item id="1f83">
+ 		<id>0x1f83</id>
+ 		<category>Professions\Cook\Decoration\Kitchen\Glass 3</category>
+ 	</item>
+ 
+ 	<item id="1f84">
+ 		<id>0x1f84</id>
+ 		<category>Professions\Cook\Decoration\Kitchen\Glass 4</category>
+ 	</item>
+ 
+ 	<item id="10e8">
+ 		<id>0x10e8</id>
+ 		<category>Professions\Cook\Kitchen\Small Wooden Spoon</category>
+ 	</item>
+ 
+ 	<item id="10e9">
+ 		<id>0x10e9</id>
+ 		<category>Professions\Cook\Kitchen\Large Wooden Spoon</category>
+ 	</item>
+ 
+ 	<!-- Glass Pitcher -->
+ 	<item id="ff6">
+ 		<id>0xff6</id>
+ 		<category>Professions\Cook\Decoration\Bar\Glass Pitcher 1</category>
+ 	</item>
+ 
+ 	<item id="ff7" inherit="ff6">
+ 		<id>0xff7</id>
+ 		<category>Professions\Cook\Decoration\Bar\Glass Pitcher 2</category>
+ 	</item>
+ 
+ 
  </definitions>

Index: stablemaster.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/stablemaster.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stablemaster.xml	26 Dec 2002 00:04:35 -0000	1.1
--- stablemaster.xml	17 Jul 2004 03:30:00 -0000	1.2
***************
*** 11,50 ****
  <definitions>
  	<item id="b41">
! 		<id>0x0b41</id>
  		<category>Professions\Stablemaster\Water Trough (N/S) (1/2)</category>
  	</item>
  
  	<item id="b42">
! 		<id>0x0b42</id>
  		<category>Professions\Stablemaster\Water Trough (N/S) (2/2)</category>
  	</item>
  
  	<item id="b43">
! 		<id>0x0b43</id>
  		<category>Professions\Stablemaster\Water Trough (W/E) (1/2)</category>
  	</item>
  
  	<item id="b44">
! 		<id>0x0b44</id>
  		<category>Professions\Stablemaster\Water Trough (W/E) (2/2)</category>
  	</item>
  
  	<item id="f31">
! 		<id>0x0f31</id>
  		<category>Professions\Stablemaster\Twig (N/S)</category>
  	</item>
  
  	<item id="f32">
! 		<id>0x0f32</id>
  		<category>Professions\Stablemaster\Twig (W/E)</category>
  	</item>
  
  	<item id="f34">
! 		<id>0x0f34</id>
  		<category>Professions\Stablemaster\Hay 1</category>
  	</item>
  
  	<item id="f35">
! 		<id>0x0f35</id>
  		<category>Professions\Stablemaster\Hay 2</category>
  	</item>
--- 11,50 ----
  <definitions>
  	<item id="b41">
! 		<id>0xb41</id>
  		<category>Professions\Stablemaster\Water Trough (N/S) (1/2)</category>
  	</item>
  
  	<item id="b42">
! 		<id>0xb42</id>
  		<category>Professions\Stablemaster\Water Trough (N/S) (2/2)</category>
  	</item>
  
  	<item id="b43">
! 		<id>0xb43</id>
  		<category>Professions\Stablemaster\Water Trough (W/E) (1/2)</category>
  	</item>
  
  	<item id="b44">
! 		<id>0xb44</id>
  		<category>Professions\Stablemaster\Water Trough (W/E) (2/2)</category>
  	</item>
  
  	<item id="f31">
! 		<id>0xf31</id>
  		<category>Professions\Stablemaster\Twig (N/S)</category>
  	</item>
  
  	<item id="f32">
! 		<id>0xf32</id>
  		<category>Professions\Stablemaster\Twig (W/E)</category>
  	</item>
  
  	<item id="f34">
! 		<id>0xf34</id>
  		<category>Professions\Stablemaster\Hay 1</category>
  	</item>
  
  	<item id="f35">
! 		<id>0xf35</id>
  		<category>Professions\Stablemaster\Hay 2</category>
  	</item>
***************
*** 61,85 ****
  
  	<item id="f36">
! 		<id>0x0f36</id>
  		<category>Professions\Stablemaster\Sheaf of Hay 1</category>
  	</item>
  
  	<item id="f37">
! 		<id>0x0f37</id>
  		<category>Professions\Stablemaster\Saddle (N/S)</category>
  	</item>
  
  	<item id="f38">
! 		<id>0x0f38</id>
  		<category>Professions\Stablemaster\Saddle (W/E)</category>
  	</item>
  
  	<item id="f3b">
! 		<id>0x0f3b</id>
  		<category>Professions\Stablemaster\Horse Dung 1</category>
  	</item>
  
  	<item id="f3c">
! 		<id>0x0f3c</id>
  		<category>Professions\Stablemaster\Horse Dung 2</category>
  	</item>
--- 61,85 ----
  
  	<item id="f36">
! 		<id>0xf36</id>
  		<category>Professions\Stablemaster\Sheaf of Hay 1</category>
  	</item>
  
  	<item id="f37">
! 		<id>0xf37</id>
  		<category>Professions\Stablemaster\Saddle (N/S)</category>
  	</item>
  
  	<item id="f38">
! 		<id>0xf38</id>
  		<category>Professions\Stablemaster\Saddle (W/E)</category>
  	</item>
  
  	<item id="f3b">
! 		<id>0xf3b</id>
  		<category>Professions\Stablemaster\Horse Dung 1</category>
  	</item>
  
  	<item id="f3c">
! 		<id>0xf3c</id>
  		<category>Professions\Stablemaster\Horse Dung 2</category>
  	</item>
***************
*** 98,102 ****
  		<id>0x1370</id>
  		<category>Professions\Stablemaster\Brush 1 (W/E)</category>
! 	</item> 
  
  	<item id="1371">
--- 98,102 ----
  		<id>0x1370</id>
  		<category>Professions\Stablemaster\Brush 1 (W/E)</category>
! 	</item>
  
  	<item id="1371">

Index: mage.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/mage.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mage.xml	26 May 2004 13:45:30 -0000	1.10
--- mage.xml	17 Jul 2004 03:30:00 -0000	1.11
***************
*** 10,13 ****
--- 10,14 ----
  -->
  <definitions>
+ 
  	<item id="1f19">
  		<id>0x1f19</id>
***************
*** 846,865 ****
  	<!-- Wands -->
  	<item id="df2">
! 		<id>0x0df2</id>
  		<category>Professions\Mage\Wands\Wand 1</category>
  	</item>
  
  	<item id="df3">
! 		<id>0x0df3</id>
  		<category>Professions\Mage\Wands\Wand 2</category>
  	</item>
  
  	<item id="df4">
! 		<id>0x0df4</id>
  		<category>Professions\Mage\Wands\Wand 3</category>
  	</item>
  
  	<item id="df5">
! 		<id>0x0df5</id>
  		<category>Professions\Mage\Wands\Wand 4</category>
  	</item>
--- 847,866 ----
  	<!-- Wands -->
  	<item id="df2">
! 		<id>0xdf2</id>
  		<category>Professions\Mage\Wands\Wand 1</category>
  	</item>
  
  	<item id="df3">
! 		<id>0xdf3</id>
  		<category>Professions\Mage\Wands\Wand 2</category>
  	</item>
  
  	<item id="df4">
! 		<id>0xdf4</id>
  		<category>Professions\Mage\Wands\Wand 3</category>
  	</item>
  
  	<item id="df5">
! 		<id>0xdf5</id>
  		<category>Professions\Mage\Wands\Wand 4</category>
  	</item>
***************
*** 867,871 ****
  	<!-- Another Spellbook + Empty Scrolls -->
  	<item id="e34">
! 		<id>0x0e34</id>
  		<decay />
  		<category>Professions\Mage\Empty Scroll (W/E)</category>
--- 868,872 ----
  	<!-- Another Spellbook + Empty Scrolls -->
  	<item id="e34">
! 		<id>0xe34</id>
  		<decay />
  		<category>Professions\Mage\Empty Scroll (W/E)</category>
***************
*** 873,902 ****
  
  	<item id="e35">
! 		<id>0x0e35</id>
  		<category>Professions\Mage\Scroll 1 (W/E)</category>
  	</item>
  
  	<item id="e36">
! 		<id>0x0e36</id>
  		<category>Professions\Mage\Scroll 2 (W/E)</category>
  	</item>
  
  	<item id="e37">
! 		<id>0x0e37</id>
  		<category>Professions\Mage\Scroll 3 (W/E)</category>
  	</item>
  
  	<item id="e38">
! 		<id>0x0e38</id>
  		<category>Professions\Mage\Scroll 4 (W/E)</category>
  	</item>
  
  	<item id="e39">
! 		<id>0x0e39</id>
  		<category>Professions\Mage\Scroll 5 (W/E)</category>
  	</item>
  
  	<item id="e3a">
! 		<id>0x0e3a</id>
  		<category>Professions\Mage\Scroll 6 (W/E)</category>
  	</item>
--- 874,903 ----
  
  	<item id="e35">
! 		<id>0xe35</id>
  		<category>Professions\Mage\Scroll 1 (W/E)</category>
  	</item>
  
  	<item id="e36">
! 		<id>0xe36</id>
  		<category>Professions\Mage\Scroll 2 (W/E)</category>
  	</item>
  
  	<item id="e37">
! 		<id>0xe37</id>
  		<category>Professions\Mage\Scroll 3 (W/E)</category>
  	</item>
  
  	<item id="e38">
! 		<id>0xe38</id>
  		<category>Professions\Mage\Scroll 4 (W/E)</category>
  	</item>
  
  	<item id="e39">
! 		<id>0xe39</id>
  		<category>Professions\Mage\Scroll 5 (W/E)</category>
  	</item>
  
  	<item id="e3a">
! 		<id>0xe3a</id>
  		<category>Professions\Mage\Scroll 6 (W/E)</category>
  	</item>
***************
*** 904,943 ****
  	<item id="e3b" type="spellbook">
  		<inherit id="efa" />
! 		<id>0x0e3b</id>
  		<category>Professions\Mage\Spellbook (W/E)</category>
  	</item>
  
  	<item id="ef3">
! 		<id>0x0ef3</id>
  		<category>Professions\Mage\Empty Scroll (N/S)</category>
  	</item>
  
  	<item id="ef4">
! 		<id>0x0ef4</id>
  		<category>Professions\Mage\Scroll 1 (N/S)</category>
  	</item>
  
  	<item id="ef5">
! 		<id>0x0ef5</id>
  		<category>Professions\Mage\Scroll 2 (N/S)</category>
  	</item>
  
  	<item id="ef6">
! 		<id>0x0ef6</id>
  		<category>Professions\Mage\Scroll 3 (N/S)</category>
  	</item>
  
  	<item id="ef7">
! 		<id>0x0ef7</id>
  		<category>Professions\Mage\Scroll 4 (N/S)</category>
  	</item>
  
  	<item id="ef8">
! 		<id>0x0ef8</id>
  		<category>Professions\Mage\Scroll 5 (N/S)</category>
  	</item>
  
  	<item id="ef9">
! 		<id>0x0ef9</id>
  		<category>Professions\Mage\Scroll 6 (N/S)</category>
  	</item>
--- 905,944 ----
  	<item id="e3b" type="spellbook">
  		<inherit id="efa" />
! 		<id>0xe3b</id>
  		<category>Professions\Mage\Spellbook (W/E)</category>
  	</item>
  
  	<item id="ef3">
! 		<id>0xef3</id>
  		<category>Professions\Mage\Empty Scroll (N/S)</category>
  	</item>
  
  	<item id="ef4">
! 		<id>0xef4</id>
  		<category>Professions\Mage\Scroll 1 (N/S)</category>
  	</item>
  
  	<item id="ef5">
! 		<id>0xef5</id>
  		<category>Professions\Mage\Scroll 2 (N/S)</category>
  	</item>
  
  	<item id="ef6">
! 		<id>0xef6</id>
  		<category>Professions\Mage\Scroll 3 (N/S)</category>
  	</item>
  
  	<item id="ef7">
! 		<id>0xef7</id>
  		<category>Professions\Mage\Scroll 4 (N/S)</category>
  	</item>
  
  	<item id="ef8">
! 		<id>0xef8</id>
  		<category>Professions\Mage\Scroll 5 (N/S)</category>
  	</item>
  
  	<item id="ef9">
! 		<id>0xef9</id>
  		<category>Professions\Mage\Scroll 6 (N/S)</category>
  	</item>
***************
*** 976,980 ****
  	<item id="scribes_pen">
  		<name>#1044168</name>
! 		<id>0x0fbf</id>
  		<category>Professions\Mage\Pen &amp; Ink (N/S)</category>
  	</item>
--- 977,981 ----
  	<item id="scribes_pen">
  		<name>#1044168</name>
! 		<id>0xfbf</id>
  		<category>Professions\Mage\Pen &amp; Ink (N/S)</category>
  	</item>

Index: fisher.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/fisher.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fisher.xml	26 May 2004 13:45:30 -0000	1.6
--- fisher.xml	17 Jul 2004 03:30:00 -0000	1.7
***************
*** 12,101 ****
  
  	<item id="dc8">
! 		<id>0x0dc8</id>
  		<category>Professions\Fisher\Fishing Net 1</category>
  	</item>
  
  	<item id="dc9">
! 		<id>0x0dc9</id>
  		<category>Professions\Fisher\Fishing Net 2</category>
  	</item>
  
  	<item id="dca">
! 		<id>0x0dca</id>
  		<category>Professions\Fisher\Fishing Net 3</category>
  	</item>
  
  	<item id="dcb">
! 		<id>0x0dcb</id>
  		<category>Professions\Fisher\Fishing Weight 1</category>
  	</item>
  
  	<item id="dcc">
! 		<id>0x0dcc</id>
  		<category>Professions\Fisher\Fishing Weight 2</category>
  	</item>
  
  	<item id="dcd">
! 		<id>0x0dcd</id>
  		<category>Professions\Fisher\Fishing Weight 3</category>
  	</item>
  
  	<item id="dce">
! 		<id>0x0dce</id>
  		<category>Professions\Fisher\Fishing Weight 4</category>
  	</item>
  
  	<item id="dcf">
! 		<id>0x0dcf</id>
  		<category>Professions\Fisher\Fishing Weight 5</category>
  	</item>
  
  	<item id="dd0">
! 		<id>0x0dd0</id>
  		<category>Professions\Fisher\Fishing Net 4</category>
  	</item>
  
  	<item id="dd1">
! 		<id>0x0dd1</id>
  		<category>Professions\Fisher\Fishing Net 5</category>
  	</item>
  
  	<item id="dd2">
! 		<id>0x0dd2</id>
  		<category>Professions\Fisher\Fishing Net 6</category>
  	</item>
  
  	<item id="dd3">
! 		<id>0x0dd3</id>
  		<category>Professions\Fisher\Fishing Net 7</category>
  	</item>
  
  	<item id="dd4">
! 		<id>0x0dd4</id>
  		<category>Professions\Fisher\Fishing Net 8</category>
  	</item>
  
  	<item id="dd5">
! 		<id>0x0dd5</id>
  		<category>Professions\Fisher\Fishing Net 9</category>
  	</item>
  
  	<item id="dd6">
! 		<id>0x0dd6</id>
  		<category>Professions\Fisher\Small Fish 1</category>
  	</item>
  
  	<item id="dd7">
! 		<id>0x0dd7</id>
  		<category>Professions\Fisher\Small Fish 2</category>
  	</item>
  
  	<item id="dd8">
! 		<id>0x0dd8</id>
  		<category>Professions\Fisher\Small Fish 3</category>
  	</item>
  
  	<item id="dd9">
! 		<id>0x0dd9</id>
  		<category>Professions\Fisher\Small Fish 4</category>
  	</item>
--- 12,101 ----
  
  	<item id="dc8">
! 		<id>0xdc8</id>
  		<category>Professions\Fisher\Fishing Net 1</category>
  	</item>
  
  	<item id="dc9">
! 		<id>0xdc9</id>
  		<category>Professions\Fisher\Fishing Net 2</category>
  	</item>
  
  	<item id="dca">
! 		<id>0xdca</id>
  		<category>Professions\Fisher\Fishing Net 3</category>
  	</item>
  
  	<item id="dcb">
! 		<id>0xdcb</id>
  		<category>Professions\Fisher\Fishing Weight 1</category>
  	</item>
  
  	<item id="dcc">
! 		<id>0xdcc</id>
  		<category>Professions\Fisher\Fishing Weight 2</category>
  	</item>
  
  	<item id="dcd">
! 		<id>0xdcd</id>
  		<category>Professions\Fisher\Fishing Weight 3</category>
  	</item>
  
  	<item id="dce">
! 		<id>0xdce</id>
  		<category>Professions\Fisher\Fishing Weight 4</category>
  	</item>
  
  	<item id="dcf">
! 		<id>0xdcf</id>
  		<category>Professions\Fisher\Fishing Weight 5</category>
  	</item>
  
  	<item id="dd0">
! 		<id>0xdd0</id>
  		<category>Professions\Fisher\Fishing Net 4</category>
  	</item>
  
  	<item id="dd1">
! 		<id>0xdd1</id>
  		<category>Professions\Fisher\Fishing Net 5</category>
  	</item>
  
  	<item id="dd2">
! 		<id>0xdd2</id>
  		<category>Professions\Fisher\Fishing Net 6</category>
  	</item>
  
  	<item id="dd3">
! 		<id>0xdd3</id>
  		<category>Professions\Fisher\Fishing Net 7</category>
  	</item>
  
  	<item id="dd4">
! 		<id>0xdd4</id>
  		<category>Professions\Fisher\Fishing Net 8</category>
  	</item>
  
  	<item id="dd5">
! 		<id>0xdd5</id>
  		<category>Professions\Fisher\Fishing Net 9</category>
  	</item>
  
  	<item id="dd6">
! 		<id>0xdd6</id>
  		<category>Professions\Fisher\Small Fish 1</category>
  	</item>
  
  	<item id="dd7">
! 		<id>0xdd7</id>
  		<category>Professions\Fisher\Small Fish 2</category>
  	</item>
  
  	<item id="dd8">
! 		<id>0xdd8</id>
  		<category>Professions\Fisher\Small Fish 3</category>
  	</item>
  
  	<item id="dd9">
! 		<id>0xdd9</id>
  		<category>Professions\Fisher\Small Fish 4</category>
  	</item>
***************
*** 171,185 ****
  		<decay />
  		<value>120</value>
! 		<category>Professions\Fisher\Fishing Pole (N/S)</category>
  		<tag name="remaining_uses" type="int" value="50" />
  		<events>skills.fishing</events>
  	</item>
  
! 	<item id="dc0">
! 		<inherit id="dbf" />
  		<id>0xdc0</id>
! 		<category>Professions\Fisher\Fishing Pole (W/E)</category>
! 		<tag name="remaining_uses" type="int" value="50" />
! 		<events>skills.fishing</events>
  	</item>
  
--- 171,183 ----
  		<decay />
  		<value>120</value>
! 		<category>Professions\Fisher\Tools\Fishing Pole (N/S)</category>
  		<tag name="remaining_uses" type="int" value="50" />
  		<events>skills.fishing</events>
  	</item>
  
! 	<item id="dc0" inherit="dbf">
! 		<baseid>dbf</baseid>
  		<id>0xdc0</id>
! 		<category>Professions\Fisher\Tools\Fishing Pole (W/E)</category>
  	</item>
  

Index: tailorer.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/tailorer.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tailorer.xml	1 Apr 2004 11:33:27 -0000	1.10
--- tailorer.xml	17 Jul 2004 03:30:00 -0000	1.11
***************
*** 11,35 ****
  <definitions>
  	<item id="def">
! 		<id>0x0def</id>
  		<category>Professions\Tailorer\Resources\Raw Cotton 1</category>
  	</item>
  
  	<item id="df6">
! 		<id>0x0df6</id>
  		<category>Professions\Tailorer\Decoration\Knitting (N/S)</category>
  	</item>
  
  	<item id="df7">
! 		<id>0x0df7</id>
  		<category>Professions\Tailorer\Decoration\Knitting (W/E)</category>
  	</item>
  
  	<item id="ec6">
! 		<id>0x0ec6</id>
  		<category>Professions\Tailorer\Decoration\Dress Form (N/S)</category>
  	</item>
  
  	<item id="ec7">
! 		<id>0x0ec7</id>
  		<category>Professions\Tailorer\Decoration\Dress Form (W/E)</category>
  	</item>
--- 11,35 ----
  <definitions>
  	<item id="def">
! 		<id>0xdef</id>
  		<category>Professions\Tailorer\Resources\Raw Cotton 1</category>
  	</item>
  
  	<item id="df6">
! 		<id>0xdf6</id>
  		<category>Professions\Tailorer\Decoration\Knitting (N/S)</category>
  	</item>
  
  	<item id="df7">
! 		<id>0xdf7</id>
  		<category>Professions\Tailorer\Decoration\Knitting (W/E)</category>
  	</item>
  
  	<item id="ec6">
! 		<id>0xec6</id>
  		<category>Professions\Tailorer\Decoration\Dress Form (N/S)</category>
  	</item>
  
  	<item id="ec7">
! 		<id>0xec7</id>
  		<category>Professions\Tailorer\Decoration\Dress Form (W/E)</category>
  	</item>
***************
*** 228,232 ****
  	<!-- Raw Cotton -->
  	<item id="df9">
! 		<id>0x0df9</id>
  		<category>Professions\Tailorer\Resources\Raw Cotton 2</category>
  	</item>
--- 228,232 ----
  	<!-- Raw Cotton -->
  	<item id="df9">
! 		<id>0xdf9</id>
  		<category>Professions\Tailorer\Resources\Raw Cotton 2</category>
  	</item>
***************
*** 266,311 ****
  	<!-- Bolt of Cloth -->
  	<item id="f95">
! 		<id>0x0f95</id>
  		<category>Professions\Tailorer\Bolt of Cloth 1</category>
  	</item>
  
  	<item id="f96">
! 		<id>0x0f96</id>
  		<category>Professions\Tailorer\Bolt of Cloth 2</category>
  	</item>
  
  	<item id="f97">
! 		<id>0x0f97</id>
  		<category>Professions\Tailorer\Bolt of Cloth 3</category>
  	</item>
  
  	<item id="f98">
! 		<id>0x0f98</id>
  		<category>Professions\Tailorer\Bolt of Cloth 4</category>
  	</item>
  
  	<item id="f99">
! 		<id>0x0f99</id>
  		<category>Professions\Tailorer\Bolt of Cloth 5</category>
  	</item>
  
  	<item id="f9a">
! 		<id>0x0f9a</id>
  		<category>Professions\Tailorer\Bolt of Cloth 6</category>
  	</item>
  
  	<item id="f9b">
! 		<id>0x0f9b</id>
  		<category>Professions\Tailorer\Bolt of Cloth 7</category>
  	</item>
  
  	<item id="f9c">
! 		<id>0x0f9c</id>
  		<category>Professions\Tailorer\Bolt of Cloth 8</category>
  	</item>
  
  	<item id="f9d">
! 		<id>0x0f9d</id>
! 		<category>Professions\Tailorer\Sewing Kit</category>		
  		<tag name="remaining_uses" type="int" value="35" />
      <events>skills.tailoring,equipment</events>
--- 266,311 ----
  	<!-- Bolt of Cloth -->
  	<item id="f95">
! 		<id>0xf95</id>
  		<category>Professions\Tailorer\Bolt of Cloth 1</category>
  	</item>
  
  	<item id="f96">
! 		<id>0xf96</id>
  		<category>Professions\Tailorer\Bolt of Cloth 2</category>
  	</item>
  
  	<item id="f97">
! 		<id>0xf97</id>
  		<category>Professions\Tailorer\Bolt of Cloth 3</category>
  	</item>
  
  	<item id="f98">
! 		<id>0xf98</id>
  		<category>Professions\Tailorer\Bolt of Cloth 4</category>
  	</item>
  
  	<item id="f99">
! 		<id>0xf99</id>
  		<category>Professions\Tailorer\Bolt of Cloth 5</category>
  	</item>
  
  	<item id="f9a">
! 		<id>0xf9a</id>
  		<category>Professions\Tailorer\Bolt of Cloth 6</category>
  	</item>
  
  	<item id="f9b">
! 		<id>0xf9b</id>
  		<category>Professions\Tailorer\Bolt of Cloth 7</category>
  	</item>
  
  	<item id="f9c">
! 		<id>0xf9c</id>
  		<category>Professions\Tailorer\Bolt of Cloth 8</category>
  	</item>
  
  	<item id="f9d">
! 		<id>0xf9d</id>
! 		<category>Professions\Tailorer\Sewing Kit</category>
  		<tag name="remaining_uses" type="int" value="35" />
      <events>skills.tailoring,equipment</events>
***************
*** 313,317 ****
  
  	<item id="f9e">
! 		<id>0x0f9e</id>
  		<category>Professions\Tailorer\Scissors (N/S)</category>
  		<events>scissors</events>
--- 313,317 ----
  
  	<item id="f9e">
! 		<id>0xf9e</id>
  		<category>Professions\Tailorer\Scissors (N/S)</category>
  		<events>scissors</events>
***************
*** 320,324 ****
  	<item id="f9f">
  		<inherit id="f9e" />
! 		<id>0x0f9f</id>
  		<category>Professions\Tailorer\Scissors (W/E)</category>
  	</item>
--- 320,324 ----
  	<item id="f9f">
  		<inherit id="f9e" />
! 		<id>0xf9f</id>
  		<category>Professions\Tailorer\Scissors (W/E)</category>
  	</item>
***************
*** 337,341 ****
  
  	<item id="fa9">
! 		<id>0x0fa9</id>
  		<category>Professions\Tailorer\Dyes</category>
  		<tag name="remaining_uses" type="int" value="10" />
--- 337,341 ----
  
  	<item id="fa9">
! 		<id>0xfa9</id>
  		<category>Professions\Tailorer\Dyes</category>
  		<tag name="remaining_uses" type="int" value="10" />

Index: artist.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/artist.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** artist.xml	26 May 2004 13:45:30 -0000	1.2
--- artist.xml	17 Jul 2004 03:30:00 -0000	1.3
***************
*** 12,86 ****
  
  	<item id="f65">
! 		<id>0x0f65</id>
  		<category>Professions\Artist\Canvas 1</category>
  	</item>
  
  	<item id="f66">
! 		<id>0x0f66</id>
  		<category>Professions\Artist\Canvas 2</category>
  	</item>
  
  	<item id="f67">
! 		<id>0x0f67</id>
  		<category>Professions\Artist\Canvas 3</category>
  	</item>
  
  	<item id="f68">
! 		<id>0x0f68</id>
  		<category>Professions\Artist\Canvas 4</category>
  	</item>
  
  	<item id="f69">
! 		<id>0x0f69</id>
  		<category>Professions\Artist\Canvas 5</category>
  	</item>
  
  	<item id="f6a">
! 		<id>0x0f6a</id>
  		<category>Professions\Artist\Canvas 6</category>
  	</item>
  
  	<item id="f71">
! 		<id>0x0f71</id>
  		<category>Professions\Artist\Rack of Canvases 1</category>
  	</item>
  
  	<item id="f72">
! 		<id>0x0f72</id>
  		<category>Professions\Artist\Rack of Canvases 2</category>
  	</item>
  
  	<item id="f73">
! 		<id>0x0f73</id>
  		<category>Professions\Artist\Rack of Canvases 3</category>
  	</item>
  
  	<item id="f74">
! 		<id>0x0f74</id>
  		<category>Professions\Artist\Rack of Canvases 4</category>
  	</item>
  
  	<item id="f75">
! 		<id>0x0f75</id>
  		<category>Professions\Artist\Rack of Canvases 5</category>
  	</item>
  
  	<item id="f76">
! 		<id>0x0f76</id>
  		<category>Professions\Artist\Rack of Canvases 6</category>
  	</item>
  
  	<item id="fbf">
! 		<id>0x0fbf</id>
  		<category>Professions\Artist\Pen &amp; Ink (W/E)</category>
  	</item>
  
  	<item id="fc0">
! 		<id>0x0fc0</id>
  		<category>Professions\Artist\Pen &amp; Ink (N/S)</category>
  	</item>
  
  	<item id="fc1">
! 		<id>0x0fc1</id>
  		<category>Professions\Artist\Paints and Brush</category>
  	</item>
--- 12,86 ----
  
  	<item id="f65">
! 		<id>0xf65</id>
  		<category>Professions\Artist\Canvas 1</category>
  	</item>
  
  	<item id="f66">
! 		<id>0xf66</id>
  		<category>Professions\Artist\Canvas 2</category>
  	</item>
  
  	<item id="f67">
! 		<id>0xf67</id>
  		<category>Professions\Artist\Canvas 3</category>
  	</item>
  
  	<item id="f68">
! 		<id>0xf68</id>
  		<category>Professions\Artist\Canvas 4</category>
  	</item>
  
  	<item id="f69">
! 		<id>0xf69</id>
  		<category>Professions\Artist\Canvas 5</category>
  	</item>
  
  	<item id="f6a">
! 		<id>0xf6a</id>
  		<category>Professions\Artist\Canvas 6</category>
  	</item>
  
  	<item id="f71">
! 		<id>0xf71</id>
  		<category>Professions\Artist\Rack of Canvases 1</category>
  	</item>
  
  	<item id="f72">
! 		<id>0xf72</id>
  		<category>Professions\Artist\Rack of Canvases 2</category>
  	</item>
  
  	<item id="f73">
! 		<id>0xf73</id>
  		<category>Professions\Artist\Rack of Canvases 3</category>
  	</item>
  
  	<item id="f74">
! 		<id>0xf74</id>
  		<category>Professions\Artist\Rack of Canvases 4</category>
  	</item>
  
  	<item id="f75">
! 		<id>0xf75</id>
  		<category>Professions\Artist\Rack of Canvases 5</category>
  	</item>
  
  	<item id="f76">
! 		<id>0xf76</id>
  		<category>Professions\Artist\Rack of Canvases 6</category>
  	</item>
  
  	<item id="fbf">
! 		<id>0xfbf</id>
  		<category>Professions\Artist\Pen &amp; Ink (W/E)</category>
  	</item>
  
  	<item id="fc0">
! 		<id>0xfc0</id>
  		<category>Professions\Artist\Pen &amp; Ink (N/S)</category>
  	</item>
  
  	<item id="fc1">
! 		<id>0xfc1</id>
  		<category>Professions\Artist\Paints and Brush</category>
  	</item>

Index: alchemist.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/alchemist.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** alchemist.xml	26 May 2004 13:45:30 -0000	1.14
--- alchemist.xml	17 Jul 2004 03:29:59 -0000	1.15
***************
*** 12,31 ****
  
  	<item id="e24">
! 		<id>0x0e24</id>
  		<category>Professions\Alchemist\Empty Vials</category>
  	</item>
  
  	<item id="e25">
! 		<id>0x0e25</id>
  		<category>Professions\Alchemist\Bottle 1</category>
  	</item>
  
  	<item id="e26">
! 		<id>0x0e26</id>
  		<category>Professions\Alchemist\Bottle 2</category>
  	</item>
  
  	<item id="e27">
! 		<id>0x0e27</id>
  		<name>hair dye</name>
  		<category>Professions\Alchemist\Hair Dye 1</category>
--- 12,31 ----
  
  	<item id="e24">
! 		<id>0xe24</id>
  		<category>Professions\Alchemist\Empty Vials</category>
  	</item>
  
  	<item id="e25">
! 		<id>0xe25</id>
  		<category>Professions\Alchemist\Bottle 1</category>
  	</item>
  
  	<item id="e26">
! 		<id>0xe26</id>
  		<category>Professions\Alchemist\Bottle 2</category>
  	</item>
  
  	<item id="e27">
! 		<id>0xe27</id>
  		<name>hair dye</name>
  		<category>Professions\Alchemist\Hair Dye 1</category>
***************
*** 34,143 ****
  
  	<item id="e28">
! 		<id>0x0e28</id>
  		<category>Professions\Alchemist\Bottle 4</category>
  	</item>
  
  	<item id="e29">
! 		<id>0x0e29</id>
  		<category>Professions\Alchemist\Bottle 5</category>
  	</item>
  
  	<item id="e2a">
! 		<id>0x0e2a</id>
  		<category>Professions\Alchemist\Bottle 6</category>
  	</item>
  
  	<item id="e2b">
! 		<id>0x0e2b</id>
  		<category>Professions\Alchemist\Bottle 7</category>
  	</item>
  
  	<item id="e2c">
! 		<id>0x0e2c</id>
  		<category>Professions\Alchemist\Bottle 8</category>
  	</item>
  
  	<item id="e44">
! 		<id>0x0e44</id>
  		<category>Professions\Alchemist\Empty Jars 1</category>
  	</item>
  
  	<item id="e45">
! 		<id>0x0e45</id>
  		<category>Professions\Alchemist\Empty Jars 2</category>
  	</item>
  
  	<item id="e46">
! 		<id>0x0e46</id>
  		<category>Professions\Alchemist\Empty Jars 3</category>
  	</item>
  
  	<item id="e47">
! 		<id>0x0e47</id>
  		<category>Professions\Alchemist\Empty Jars 4</category>
  	</item>
  
  	<item id="e48">
! 		<id>0x0e48</id>
  		<category>Professions\Alchemist\Full Jars 1</category>
  	</item>
  
  	<item id="e49">
! 		<id>0x0e49</id>
  		<category>Professions\Alchemist\Full Jars 2</category>
  	</item>
  
  	<item id="e4a">
! 		<id>0x0e4a</id>
  		<category>Professions\Alchemist\Full Jars 3</category>
  	</item>
  
  	<item id="e4b">
! 		<id>0x0e4b</id>
  		<category>Professions\Alchemist\Full Jars 4</category>
  	</item>
  
  	<item id="e4c">
! 		<id>0x0e4c</id>
  		<category>Professions\Alchemist\Jars 1</category>
  	</item>
  
  	<item id="e4d">
! 		<id>0x0e4d</id>
  		<category>Professions\Alchemist\Jars 2</category>
  	</item>
  
  	<item id="e4e">
! 		<id>0x0e4e</id>
  		<category>Professions\Alchemist\Jars 3</category>
  	</item>
  
  	<item id="e4f">
! 		<id>0x0e4f</id>
  		<category>Professions\Alchemist\Jars 4</category>
  	</item>
  
  	<item id="efb">
! 		<id>0x0efb</id>
  		<category>Professions\Alchemist\Bottle 9</category>
  	</item>
  
  	<item id="efc">
! 		<id>0x0efc</id>
  		<category>Professions\Alchemist\Bottle 10</category>
  	</item>
  
  	<item id="efd">
! 		<id>0x0efd</id>
  		<category>Professions\Alchemist\Bottle 11</category>
  	</item>
  
  	<item id="efe">
! 		<id>0x0efe</id>
  		<category>Professions\Alchemist\Bottle 12</category>
  	</item>
  
  	<item id="eff">
! 		<id>0x0eff</id>
  		<name>hair dye</name>
  		<category>Professions\Alchemist\Hair Dye 2</category>
--- 34,143 ----
  
  	<item id="e28">
! 		<id>0xe28</id>
  		<category>Professions\Alchemist\Bottle 4</category>
  	</item>
  
  	<item id="e29">
! 		<id>0xe29</id>
  		<category>Professions\Alchemist\Bottle 5</category>
  	</item>
  
  	<item id="e2a">
! 		<id>...
 
[truncated message content]

[wpdev-commits] xmlscripts/definitions/items/equipment drinks.xml,NONE,1.1 food.xml,1.12,1.13 index.xml,1.2,1.3

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

Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26795/equipment

Modified Files:
	food.xml index.xml 
Added Files:
	drinks.xml 
Log Message:
Cleanups...
And a very long overdue Food/Drink Split/Cleanup


Index: index.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.xml	13 May 2004 07:02:48 -0000	1.2
--- index.xml	17 Jul 2004 03:29:59 -0000	1.3
***************
*** 14,17 ****
--- 14,18 ----
  	<include file="definitions/items/equipment/containers.xml"/>
  	<include file="definitions/items/equipment/currency.xml"/>
+ 	<include file="definitions/items/equipment/drinks.xml" />
  	<include file="definitions/items/equipment/food.xml"/>
  	<include file="definitions/items/equipment/hair.xml"/>

Index: food.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/food.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** food.xml	11 Jul 2004 23:58:26 -0000	1.12
--- food.xml	17 Jul 2004 03:29:59 -0000	1.13
***************
*** 29,73 ****
  <definitions>
  
- 	<!-- Used as a base for all drinks -->
- 	<item id="drinks_base">
- 		<type>105</type>
- 		<weight>0.5</weight>
- 	</item>
- 
  	<!-- Stew -->
  	<item id="970">
[...2059 lines suppressed...]
! 		<buyprice>13</buyprice>
! 		<sellprice>6</sellprice>
! 		<weight>2</weight>
! 	</item>
! 
! 	<item id="1f9e">
! 		<inherit id="drinks_base" />
! 		<category>Equipment\Drinks\Pitcher of Water 4</category>
! 		<id>0x1f9e</id>
! 		<buyprice>13</buyprice>
! 		<sellprice>6</sellprice>
! 		<weight>2</weight>
  	</item>
  
--- 944,948 ----
  	<item id="1eb0">
  		<id>0x1eb0</id>
! 		<category>Equipment\Food\Misc\Burned Food</category>
  	</item>
  

--- NEW FILE: drinks.xml ---
<!--
=================================================================
|   )      (\_     | WOLFPACK 13.0.0 Scripts
|  ((    _/{  "-;  | Created by: Dreoth
|   )).-' {{ ;'`   | Revised by:
|  ( (  ;._ \\ ctr | Last Modification: Split from food.xml
=================================================================
-->

<definitions>

	<!-- Jugs of Cider (3) -->
	<item id="98d">
		<id>0x98d</id>
		<type>105</type>
		<weight>0.5</weight>
		<buyprice>15</buyprice>
		<sellprice>7</sellprice>
		<category>Equipment\Drinks\Jug of Cider 3</category>
	</item>

	<!-- Jugs of Cider (2) -->
	<item id="98e" inherit="98d">
		<baseid>98d</baseid>
		<id>0x98e</id>
		<category>Equipment\Drinks\Jug of Cider 2</category>
	</item>

	<!-- Jug of Cider -->
	<item id="9c8" inherit="98d">
		<baseid>98d</baseid>
		<id>0x9c8</id>
		<category>Equipment\Drinks\Jug of Cider 1</category>
	</item>

	<!-- Bottle of Liquor -->
	<item id="99b">
		<id>0x99b</id>
		<type>105</type>
		<weight>0.5</weight>
		<buyprice>4</buyprice>
		<sellprice>4</sellprice>
		<category>Equipment\Drinks\Bottle of Liquor 1</category>
	</item>

	<!-- Bottle of Liquor (2) -->
	<item id="99c" inherit="99b">
		<baseid>99b</baseid>
		<id>0x99c</id>
		<category>Equipment\Drinks\Bottle of Liquor 2</category>
	</item>

	<!-- Bottle of Liquor (3) -->
	<item id="99d" inherit="99b">
		<baseid>99b</baseid>
		<id>0x99d</id>
		<category>Equipment\Drinks\Bottle of Liquor 3</category>
	</item>

	<!-- Bottle of Liquor (4) -->
	<item id="99e" inherit="99b">
		<baseid>99b</baseid>
		<id>0x99e</id>
		<category>Equipment\Drinks\Bottle of Liquor 4</category>
	</item>

	<!-- Bottle of Ale -->
	<item id="99f">
		<id>0x99f</id>
		<type>105</type>
		<weight>0.5</weight>
		<buyprice>8</buyprice>
		<sellprice>4</sellprice>
		<category>Equipment\Drinks\Bottle of Ale 1</category>
	</item>

	<!-- Bottles of Ale (2) -->
	<item id="9a0" inherit="99f">
		<baseid>99f</baseid>
		<id>0x9a0</id>
		<category>Equipment\Drinks\Bottle of Ale 2</category>
	</item>

	<!-- Bottles of Ale (3) -->
	<item id="9a1" inherit="99f">
		<baseid>99f</baseid>
		<id>0x9a1</id>
		<category>Equipment\Drinks\Bottle of Ale 3</category>
	</item>

	<!-- Bottles of Ale (4) -->
	<item id="9a2" inherit="99f">
		<baseid>99f</baseid>
		<id>0x9a2</id>
		<category>Equipment\Drinks\Bottle of Ale 4</category>
	</item>

	<!-- Pitcher of Milk -->
	<!-- NOTE: Needs to create an empty pitcher when drunk -->
	<item id="9ad">
		<id>0x9ad</id>
		<type>105</type>
		<weight>0.5</weight>
		<category>Equipment\Drinks\Pitcher of Milk 1</category>
	</item>

	<!-- Bottles of Wine (4) -->
	<item id="9c4">
		<id>0x9c4</id>
		<type>105</type>
		<weight>0.5</weight>
		<buyprice>8</buyprice>
		<sellprice>4</sellprice>
		<category>Equipment\Drinks\Bottle of Wine 4</category>
	</item>

	<!-- Bottles of wine (3) -->
	<item id="9c5" inherit="9c4">
		<baseid>9c4</baseid>
		<id>0x9c5</id>
		<category>Equipment\Drinks\Bottle of Wine 3</category>
	</item>

	<!-- Bottles of wine (2) -->
	<item id="9c6" inherit="9c4">
		<baseid>9c4</baseid>
		<id>0x9c6</id>
		<category>Equipment\Drinks\Bottle of Wine 2</category>
	</item>

	<!-- Bottle of wine -->
	<item id="9c7" inherit="9c4">
		<baseid>9c4</baseid>
		<id>0x9c7</id>
		<category>Equipment\Drinks\Bottle of Wine 1</category>
	</item>

	<!-- Bucket of Water -->
	<item id="ffa">
		<id>0xffa</id>
		<type>105</type>
		<weight>1.5</weight>
		<category>Equipment\Drinks\Bucket of Water</category>
	</item>

	<item id="1f7d">
		<id>0x1f7d</id>
		<weight>0.2</weight>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Cider 1</category>
	</item>

	<item id="1f7e" inherit="1f7d">
		<id>0x1f7e</id>
		<category>Equipment\Drinks\Glass of Cider 2</category>
	</item>

	<item id="1f7f" inherit="1f7d">
		<id>0x1f7f</id>
		<category>Equipment\Drinks\Glass of Cider 3</category>
	</item>

	<item id="1f80" inherit="1f7d">
		<id>0x1f80</id>
		<category>Equipment\Drinks\Glass of Cider 4</category>
	</item>

	<item id="1f85">
		<id>0x1f85</id>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Liquor 1</category>
	</item>

	<item id="1f86" inherit="1f85">
		<id>0x1f86</id>
		<category>Equipment\Drinks\Glass of Liquor 2</category>
	</item>

	<item id="1f87" inherit="1f85">
		<id>0x1f87</id>
		<category>Equipment\Drinks\Glass of Liquor 3</category>
	</item>

	<item id="1f88" inherit="1f85">
		<id>0x1f88</id>
		<category>Equipment\Drinks\Glass of Liquor 4</category>
	</item>

	<item id="1f89">
		<id>0x1f89</id>
		<weight>0.1</weight>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Milk 1</category>
	</item>

	<item id="1f8a" inherit="1f89">
		<id>0x1f8a</id>
		<category>Equipment\Drinks\Glass of Milk 2</category>
	</item>

	<item id="1f8b" inherit="1f89">
		<id>0x1f8b</id>
		<category>Equipment\Drinks\Glass of Milk 3</category>
	</item>

	<item id="1f8c" inherit="1f89">
		<id>0x1f8c</id>
		<category>Equipment\Drinks\Glass of Milk 4</category>
	</item>

	<item id="1f8d">
		<id>0x1f8d</id>
		<weight>0.1</weight>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Wine 1</category>
	</item>

	<item id="1f8e" inherit="1f8d">
		<id>0x1f8e</id>
		<category>Equipment\Drinks\Glass of Wine 2</category>
	</item>

	<item id="1f8f" inherit="1f8d">
		<id>0x1f8f</id>
		<category>Equipment\Drinks\Glass of Wine 3</category>
	</item>

	<item id="1f90" inherit="1f8d">
		<id>0x1f90</id>
		<category>Equipment\Drinks\Glass of Wine 4</category>
	</item>

	<item id="1f91">
		<id>0x1f91</id>
		<weight>0.1</weight>
		<type>105</type>
		<category>Equipment\Drinks\Glass of Water 1</category>
	</item>

	<item id="1f92" inherit="1f91">
		<id>0x1f92</id>
		<category>Equipment\Drinks\Glass of Water 2</category>
	</item>

	<item id="1f93" inherit="1f91">
		<id>0x1f93</id>
		<category>Equipment\Drinks\Glass of Water 3</category>
	</item>

	<item id="1f94" inherit="1f91">
		<id>0x1f94</id>
		<category>Equipment\Drinks\Glass of Water 4</category>
	</item>

	<item id="1f95">
		<id>0x1f95</id>
		<buyprice>13</buyprice>
		<sellprice>6</sellprice>
		<weight>2</weight>
		<type>105</type>
		<category>Equipment\Drinks\Pitcher of Ale 1</category>
	</item>

	<item id="1f96" inherit="1f95">
		<id>0x1f96</id>
		<category>Equipment\Drinks\Pitcher of Ale 2</category>
	</item>

	<item id="1f97">
		<id>0x1f97</id>
		<type>105</type>
		<buyprice>13</buyprice>
		<sellprice>6</sellprice>
		<weight>2</weight>
		<category>Equipment\Drinks\Pitcher of Cider 1</category>
	</item>

	<item id="1f98" inherit="1f97">
		<id>0x1f98</id>
		<category>Equipment\Drinks\Pitcher of Cider 2</category>
	</item>

	<item id="1f99">
		<id>0x1f99</id>
		<type>105</type>
		<buyprice>13</buyprice>
		<sellprice>6</sellprice>
		<weight>2</weight>
		<category>Equipment\Drinks\Pitcher of Liquor 1</category>
	</item>

	<item id="1f9a" inherit="1f99">
		<id>0x1f9a</id>
		<category>Equipment\Drinks\Pitcher of Liquor 2</category>
	</item>

	<item id="1f9b">
		<id>0x1f9b</id>
		<type>105</type>
		<buyprice>13</buyprice>
		<sellprice>6</sellprice>
		<weight>2</weight>
		<category>Equipment\Drinks\Pitcher of Wine 1</category>
	</item>

	<item id="1f9c" inherit="1f9b">
		<id>0x1f9c</id>
		<category>Equipment\Drinks\Pitcher of Wine 2</category>
	</item>

	<!-- Pitcher of Water 1 -->
	<item id="ff8">
		<id>0xff8</id>
		<type>105</type>
		<buyprice>13</buyprice>
		<sellprice>6</sellprice>
		<weight>2</weight>
		<category>Equipment\Food\Pitcher of Water 1</category>
	</item>

	<!-- Pitcher of Water 2 -->
	<item id="ff9" inherit="ff8">
		<id>0xff9</id>
		<category>Equipment\Food\Pitcher of Water 2</category>
	</item>

	<!-- Pitcher of Water 3 -->
	<item id="1f9d" inherit="ff8">
		<id>0x1f9d</id>
		<category>Equipment\Drinks\Pitcher of Water 3</category>
	</item>

	<!-- Pitcher of Water 4 -->
	<item id="1f9e" inherit="ff8">
		<id>0x1f9e</id>
		<category>Equipment\Drinks\Pitcher of Water 4</category>
	</item>

</definitions>

[wpdev-commits] xmlscripts/definitions/items/buildings carpets.xml,1.6,1.7

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

Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26795/buildings

Modified Files:
	carpets.xml 
Log Message:
Cleanups...
And a very long overdue Food/Drink Split/Cleanup


Index: carpets.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/carpets.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** carpets.xml	1 Jul 2004 23:51:25 -0000	1.6
--- carpets.xml	17 Jul 2004 03:29:59 -0000	1.7
***************
*** 9,17 ****
  <definitions>
  
! 	<!-- Rug - Brown -->
  	<item id="aa9">
  		<id>0xaa9</id>
  		<nodecay />
! 		<category>Decoration\Carpets\Rug - Brown\Rug 1</category>
  	</item>
  
--- 9,17 ----
[...2223 lines suppressed...]
  
--- 1044,1048 ----
  		<id>0x1dfb</id>
  		<nodecay />
! 		<category>Decoration\Carpets\Rug, Gray\Rug 13</category>
  	</item>
  
***************
*** 1050,1054 ****
  		<id>0x1dfc</id>
  		<nodecay />
! 		<category>Decoration\Carpets\Rug - Gray\Rug 14</category>
  	</item>
  
--- 1050,1054 ----
  		<id>0x1dfc</id>
  		<nodecay />
! 		<category>Decoration\Carpets\Rug, Gray\Rug 14</category>
  	</item>