wpdev-commits Mailing List for Wolfpack Emu (Page 90)

Brought to you by: rip, thiagocorrea

wpdev-commits — Wolfpack CVS commit info

You can subscribe to this list here.

2003	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (14)	_Aug (121)	_Sep (256)	_Oct (59)	_Nov (73)	_Dec (120)
2004	_Jan (259)	_Feb (381)	_Mar (501)	_Apr (355)	_May (427)	_Jun (270)	_Jul (394)	_Aug (412)	_Sep (724)	_Oct (578)	_Nov (65)	_Dec

Flat | Threaded

<< < 1 .. 88 89 90 91 92 .. 201 > >> (Page 90 of 201)

[wpdev-commits] xmlscripts/scripts moongate.py,1.10,1.11

From: Ki H. P. <kh...@us...> - 2004-06-20 13:31:19

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

Modified Files:
	moongate.py 
Log Message:
'travel for GM


Index: moongate.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/moongate.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** moongate.py	26 May 2004 13:07:20 -0000	1.10
--- moongate.py	20 Jun 2004 13:31:09 -0000	1.11
***************
*** 187,194 ****
  		return 1
  	item = args[0]
! 	if not item:
  		char.socket.sysmessage( "script error 2. contact GM." )
  		return 1
! 	if( char.distanceto( item ) > 3):
  		char.socket.sysmessage( "You are too far away to use it." )
  		return 1
--- 187,194 ----
  		return 1
  	item = args[0]
! 	if not item and not char.gm :
  		char.socket.sysmessage( "script error 2. contact GM." )
  		return 1
! 	if not char.gm and ( char.distanceto( item ) > 3):
  		char.socket.sysmessage( "You are too far away to use it." )
  		return 1

[wpdev-commits] wolfpack/python pycoord.cpp,1.13,1.14

From: Thiago A C. <thi...@us...> - 2004-06-19 07:38:02

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

Modified Files:
	pycoord.cpp 
Log Message:
no message

Index: pycoord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/pycoord.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pycoord.cpp	2 Jun 2004 19:13:14 -0000	1.13
--- pycoord.cpp	19 Jun 2004 07:37:53 -0000	1.14
***************
*** 98,101 ****
--- 98,113 ----
  }
  
+ static PyObject* wpCoord_lineofsight( wpCoord* self, PyObject* args )
+ {
+ 	Coord_cl pos;
+ 	ushort targetheight;
+ 	char touch = 0;
+ 	if ( !PyArg_ParseTuple( args, "O&i|b:coord.lineofsight(coord, targetheight, [touch=0])", &PyConvertCoord, &pos, &targetheight, &touch ) )
+ 		return 0;
+ 	if ( self->coord.lineOfSight( pos, targetheight, touch ) )
+ 		return Py_True;
+     return Py_False;
+ }
+ 
  static PyMethodDef wpCoordMethods[] =
  {
***************
*** 103,106 ****
--- 115,119 ----
  	{ "direction", ( getattrofunc ) wpCoord_direction, METH_VARARGS, NULL },
  	{ "validspawnspot",	( getattrofunc ) wpCoord_validspawnspot, METH_VARARGS, NULL },
+ 	{ "lineofsight", ( getattrofunc ) wpCoord_lineofsight, METH_VARARGS, NULL },
  	{ 0, 0, 0, 0 }
  };

[wpdev-commits] xmlscripts/scripts/commands testlos.py,NONE,1.1 add.py,1.5,1.6 decoration.py,1.2,1.3 go.py,1.6,1.7

From: Thiago A C. <thi...@us...> - 2004-06-19 07:38:02

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

Modified Files:
	add.py decoration.py go.py 
Added Files:
	testlos.py 
Log Message:
no message

Index: decoration.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/decoration.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** decoration.py	26 May 2004 13:07:21 -0000	1.2
--- decoration.py	19 Jun 2004 07:37:53 -0000	1.3
***************
*** 8,14 ****
  """
  	\command decoration
! 	\description Places decoration read from a xml file.
! 	\notes The decoration will be read from a XML file called
! 	'data\decoration.1.xml'.
  """
  
--- 8,15 ----
  """
  	\command decoration
! 	\description Places decoration read from a xml template found
! 	in wolfpack's data folder.
! 	\notes The decoration will be read from a XML files called
! 	'data\decoration.?.xml, where ? is the map number'.
  """
  
***************
*** 73,77 ****
      handler = DecorationHandler()
      parser.setContentHandler(handler)
!     parser.parse("data/decoration.1.xml")
  
  def onLoad():
--- 74,85 ----
      handler = DecorationHandler()
      parser.setContentHandler(handler)
!     if wolfpack.hasmap(0):
!         parser.parse("data/decoration.0.xml")
!     if wolfpack.hasmap(1):
!         parser.parse("data/decoration.1.xml")
!     if wolfpack.hasmap(2):
!         parser.parse("data/decoration.2.xml")
!     if wolfpack.hasmap(3):
!         parser.parse("data/decoration.2.xml")
  
  def onLoad():

Index: add.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/add.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** add.py	16 May 2004 22:04:17 -0000	1.5
--- add.py	19 Jun 2004 07:37:53 -0000	1.6
***************
*** 70,74 ****
  	global generated
  	if not generated:
! 		socket.sysmessage('Generating add menu...')
  		generateAddMenu()
  		generated = 1
--- 70,75 ----
  	global generated
  	if not generated:
! 		socket.sysmessage('Generating add menu.')
! 		socket.sysmessage('Please wait...')
  		generateAddMenu()
  		generated = 1
***************
*** 166,170 ****
  		additem.description = 'Definition: ' + definition
  
! 	for (id, menu) in submenus.items():
  		menu.sort()
  
--- 167,171 ----
  		additem.description = 'Definition: ' + definition
  
! 	for menu in submenus.values():
  		menu.sort()
  
***************
*** 211,215 ****
  		addnpc.description = 'Definition: ' + definition
  
! 	for (id, menu) in submenus.items():
  		menu.sort()
  
--- 212,216 ----
  		addnpc.description = 'Definition: ' + definition
  
! 	for menu in submenus.values():
  		menu.sort()
  

Index: go.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/go.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** go.py	16 May 2004 22:04:17 -0000	1.6
--- go.py	19 Jun 2004 07:37:53 -0000	1.7
***************
*** 32,35 ****
--- 32,37 ----
  from system.makemenus import MakeMenu, MakeAction, findmenu
  
+ generated = 0
+ 
  def sendresponse2(player, arguments, target):
  	if target.item:
***************
*** 128,131 ****
--- 130,140 ----
  
  	if len(arguments) == 0:
+         	global generated
+         	if not generated:
+         		socket.sysmessage('Generating go menu.')
+         		socket.sysmessage('Please wait...')
+         		generateGoMenu()
+         		generated = 1
+             
  		menu = findmenu('GOMENU')
  		if menu:
***************
*** 239,246 ****
  			GoAction(submenus['\\'.join(categories) + '\\'], description, pos)
  
- 	gomenu.sort()
  	for menu in submenus.values():
  		menu.sort()
  
  #
  # Kommando registrieren.
--- 248,256 ----
  			GoAction(submenus['\\'.join(categories) + '\\'], description, pos)
  
  	for menu in submenus.values():
  		menu.sort()
  
+ 	gomenu.sort()
+ 
  #
  # Kommando registrieren.

--- NEW FILE: testlos.py ---
#===============================================================#
#   )      (\_     | WOLFPACK 13.0.0 Scripts                    #
#  ((    _/{  "-;  | Created by: Correa                         #
#   )).-' {{ ;'`   | Revised by:                                #
#  ( (  ;._ \\ ctr | Last Modification: Created                 #
#===============================================================#

"""
	\command decoration
	\description Places decoration read from a xml file.
	\notes The decoration will be read from a XML file called
	'data\decoration.1.xml'.
"""


import wolfpack
from wolfpack import *
from wolfpack.consts import *


def testlos( socket, command, arguments ):
    wolfpack.console.log( LOG_MESSAGE, "Message" )

def onLoad():
	wolfpack.registercommand( "testlos", testlos )

[wpdev-commits] xmlscripts/definitions scripts.xml,1.132,1.133

From: Thiago A C. <thi...@us...> - 2004-06-19 07:38:01

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

Modified Files:
	scripts.xml 
Log Message:
no message

Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** scripts.xml	15 Jun 2004 19:29:59 -0000	1.132
--- scripts.xml	19 Jun 2004 07:37:52 -0000	1.133
***************
*** 101,104 ****
--- 101,105 ----
  	<script>commands.stat</script>
  	<script>commands.tags</script>
+ 	<script>commands.testlos</script>
  	<script>commands.tile</script>
  	<script>commands.travel</script>

[wpdev-commits] wolfpack/network encryption.h,1.2,1.3

From: Thiago A C. <thi...@us...> - 2004-06-19 02:07:01

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

Modified Files:
	encryption.h 
Log Message:
fixed but with item.moveto() [python]
a great deal of clean ups.

Index: encryption.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/encryption.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** encryption.h	2 Jun 2004 15:04:09 -0000	1.2
--- encryption.h	19 Jun 2004 02:06:51 -0000	1.3
***************
*** 71,74 ****
--- 71,75 ----
  {
  public:
+ 	virtual ~cClientEncryption() {}
  	virtual void serverEncrypt( char* buffer, unsigned int length ) = 0;
  	virtual void clientDecrypt( char* buffer, unsigned int length ) = 0;

[wpdev-commits] wolfpack/muls multiscache.cpp,1.2,1.3 multiscache.h,1.2,1.3

From: Thiago A C. <thi...@us...> - 2004-06-19 02:07:01

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

Modified Files:
	multiscache.cpp multiscache.h 
Log Message:
fixed but with item.moveto() [python]
a great deal of clean ups.

Index: multiscache.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/multiscache.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** multiscache.cpp	2 Jun 2004 15:04:09 -0000	1.2
--- multiscache.cpp	19 Jun 2004 02:06:51 -0000	1.3
***************
*** 43,47 ****
  }
  
! void MultiDefinition::setItems( QValueVector<multiItem_st> items )
  {
  	// try to sort
--- 43,47 ----
  }
  
! void MultiDefinition::setItems( const QValueVector<multiItem_st>& items )
  {
  	// try to sort

Index: multiscache.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/multiscache.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** multiscache.h	2 Jun 2004 15:04:09 -0000	1.2
--- multiscache.h	19 Jun 2004 02:06:51 -0000	1.3
***************
*** 52,56 ****
  	MultiDefinition();
  
! 	void setItems( QValueVector<multiItem_st> items );
  	bool inMulti( short x, short y );
  	signed char multiHeight( short x, short y, short z ) const;
--- 52,56 ----
  	MultiDefinition();
  
! 	void setItems( const QValueVector<multiItem_st>& items );
  	bool inMulti( short x, short y );
  	signed char multiHeight( short x, short y, short z ) const;

[wpdev-commits] wolfpack basechar.cpp,1.118,1.119 basechar.h,1.71,1.72 basics.h,1.22,1.23 customtags.cpp,1.47,1.48 customtags.h,1.29,1.30 dbdriver.cpp,1.35,1.36 factory.h,1.7,1.8 npc.cpp,1.96,1.97 npc.h,1.50,1.51 pagesystem.h,1.18,1.19 singleton.h,1.10,1.11 timers.cpp,1.3,1.4 timers.h,1.3,1.4 walking.cpp,1.127,1.128

From: Thiago A C. <thi...@us...> - 2004-06-19 02:07:01

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

Modified Files:
	basechar.cpp basechar.h basics.h customtags.cpp customtags.h 
	dbdriver.cpp factory.h npc.cpp npc.h pagesystem.h singleton.h 
	timers.cpp timers.h walking.cpp 
Log Message:
fixed but with item.moveto() [python]
a great deal of clean ups.

Index: basics.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basics.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** basics.h	2 Jun 2004 15:04:03 -0000	1.22
--- basics.h	19 Jun 2004 02:06:51 -0000	1.23
***************
*** 36,76 ****
  
  // Forward definitions
- 
  class Coord_cl;
  class QString;
  
- //////////////////////////////////////////////////////////////////////
- // name: LongFromCharPtr, ShortFromCharPtr
- // history: init by Duke, 10.9.2000
- // purpose: calculates a long int from 4 subsequent bytes pointed to by 'p',
- //		assuming 'normal' byte order (NOT intel style)
- //		intended to replace calcserial() as follows
- //			serial=calcserial(buffer[s][7],buffer[s][8],buffer[s][9],buffer[s][10]);
- //			serial=LongFromCharPtr(buffer[s]+7);
- 
- inline long LongFromCharPtr( const unsigned char* p )
- {
- 	return ( *p << 24 ) | ( *( p + 1 ) << 16 ) | ( *( p + 2 ) << 8 ) | *( p + 3 );
- }
- inline SI16 ShortFromCharPtr( const unsigned char* p )
- {
- 	return static_cast<SI16>( ( *p << 8 ) | *( p + 1 ) );
- }
- 
- //////////////////////////////////////////////////////////////////////
- // Name: LongToCharPtr, ShortToCharPtr
- // Purpose: stores a long int into 4 subsequent bytes pointed to by 'p',
- //		assuming 'normal' byte order (NOT intel style)
- // History: init Duke, 13.8.2000
- inline void LongToCharPtr( const unsigned long i, unsigned char* p )
- {
- 	*p = static_cast<UI08>( i >> 24 ); *( p + 1 ) = static_cast<UI08>( i >> 16 ); *( p + 2 ) = static_cast<UI08>( i >> 8 ); *( p + 3 ) = static_cast<UI08>( i );
- }
- 
- inline void ShortToCharPtr( const unsigned short i, unsigned char* p )
- {
- 	*p = static_cast<UI08>( i >> 8 ); *( p + 1 ) = static_cast<UI08>( i );	// no %256 for 2nd byte, truncation will occur anyway
- }
- 
  // sereg : roll dices d&d style
  int rollDice( const QString& dicePattern );
--- 36,42 ----

Index: customtags.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** customtags.h	10 Jun 2004 00:27:12 -0000	1.29
--- customtags.h	19 Jun 2004 02:06:51 -0000	1.30
***************
*** 73,77 ****
  	cVariant( cBaseChar* );
  	cVariant( cItem* );
! 	cVariant( Coord_cl );
  	cVariant( double );
  	cVariant( long int );
--- 73,77 ----
  	cVariant( cBaseChar* );
  	cVariant( cItem* );
! 	cVariant( const Coord_cl& );
  	cVariant( double );
  	cVariant( long int );

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** basechar.cpp	10 Jun 2004 00:27:12 -0000	1.118
--- basechar.cpp	19 Jun 2004 02:06:50 -0000	1.119
***************
*** 3228,3231 ****
--- 3228,3236 ----
  }
  
+ bool cBaseChar::isInnocent()
+ {
+ 	return !isMurderer() && !isCriminal();
+ }
+ 
  void cBaseChar::refreshMaximumValues()
  {
***************
*** 3256,3260 ****
  }
  
! bool cBaseChar::lineOfSight( Coord_cl target, bool touch )
  {
  	Coord_cl eyes = pos_ + Coord_cl( 0, 0, 15 );
--- 3261,3265 ----
  }
  
! bool cBaseChar::lineOfSight( const Coord_cl& target, bool touch )
  {
  	Coord_cl eyes = pos_ + Coord_cl( 0, 0, 15 );

Index: timers.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timers.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** timers.h	2 Jun 2004 15:04:07 -0000	1.3
--- timers.h	19 Jun 2004 02:06:51 -0000	1.4
***************
*** 73,86 ****
  	 * Provided for subclasses to save additional information.
  	*/
! 	void saveFloat( unsigned int id, QString key, double value );
! 	void saveInt( unsigned int id, QString key, int value );
! 	void saveString( unsigned int id, QString key, const QString& value );
! 	void saveChar( unsigned int id, QString key, P_CHAR character );
! 	void saveItem( unsigned int id, QString key, P_ITEM item );
! 	bool loadFloat( unsigned int id, QString key, double& value );
! 	bool loadInt( unsigned int id, QString key, int& value );
! 	bool loadString( unsigned int id, QString key, QString& value );
! 	bool loadChar( unsigned int id, QString key, P_CHAR& character );
! 	bool loadItem( unsigned int id, QString key, P_ITEM& item );
  
  public:
--- 73,86 ----
  	 * Provided for subclasses to save additional information.
  	*/
! 	void saveFloat( unsigned int id, const QString& key, double value );
! 	void saveInt( unsigned int id, const QString& key, int value );
! 	void saveString( unsigned int id, const QString& key, const QString& value );
! 	void saveChar( unsigned int id, const QString& key, P_CHAR character );
! 	void saveItem( unsigned int id, const QString& key, P_ITEM item );
! 	bool loadFloat( unsigned int id, const QString& key, double& value );
! 	bool loadInt( unsigned int id, const QString& key, int& value );
! 	bool loadString( unsigned int id, const QString& key, QString& value );
! 	bool loadChar( unsigned int id, const QString& key, P_CHAR& character );
! 	bool loadItem( unsigned int id, const QString& key, P_ITEM& item );
  
  public:
***************
*** 102,113 ****
  	}
  
! 	bool operator<( const cTimer& a ) const
  	{
- 		return expiretime < a.expiretime;
  	}
  
! 	virtual ~cTimer()
  	{
  	}
  	void setExpiretime_s( int seconds );
  	void setExpiretime_ms( float milliseconds );
--- 102,114 ----
  	}
  
! 	virtual ~cTimer()
  	{
  	}
  
! 	bool operator<( const cTimer& a ) const
  	{
+ 		return expiretime < a.expiretime;
  	}
+ 
  	void setExpiretime_s( int seconds );
  	void setExpiretime_ms( float milliseconds );

Index: timers.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timers.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** timers.cpp	2 Jun 2004 15:04:07 -0000	1.3
--- timers.cpp	19 Jun 2004 02:06:51 -0000	1.4
***************
*** 87,91 ****
  	Save a float to the effects_properties table.
   */
! void cTimer::saveFloat( unsigned int id, QString key, double value )
  {
  	PersistentBroker::instance()->executeQuery( QString( "REPLACE INTO effects_properties VALUES(%1,'%2','%3','%4');" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ).arg( "float" ).arg( value ) );
--- 87,91 ----
  	Save a float to the effects_properties table.
   */
! void cTimer::saveFloat( unsigned int id, const QString& key, double value )
  {
  	PersistentBroker::instance()->executeQuery( QString( "REPLACE INTO effects_properties VALUES(%1,'%2','%3','%4');" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ).arg( "float" ).arg( value ) );
***************
*** 95,99 ****
  	Save an integer to the effects_properties table.
   */
! void cTimer::saveInt( unsigned int id, QString key, int value )
  {
  	PersistentBroker::instance()->executeQuery( QString( "REPLACE INTO effects_properties VALUES(%1,'%2','%3','%4');" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ).arg( "int" ).arg( value ) );
--- 95,99 ----
  	Save an integer to the effects_properties table.
   */
! void cTimer::saveInt( unsigned int id, const QString& key, int value )
  {
  	PersistentBroker::instance()->executeQuery( QString( "REPLACE INTO effects_properties VALUES(%1,'%2','%3','%4');" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ).arg( "int" ).arg( value ) );
***************
*** 103,112 ****
  	Save a string to the effects_properties table.
   */
! void cTimer::saveString( unsigned int id, QString key, const QString& value )
  {
  	PersistentBroker::instance()->executeQuery( QString( "REPLACE INTO effects_properties VALUES(%1,'%2','%3','%4');" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ).arg( "string" ).arg( PersistentBroker::instance()->quoteString( value.utf8() ) ) );
  }
  
! void cTimer::saveChar( unsigned int id, QString key, P_CHAR character )
  {
  	unsigned int value = character->serial();
--- 103,112 ----
  	Save a string to the effects_properties table.
   */
! void cTimer::saveString( unsigned int id, const QString& key, const QString& value )
  {
  	PersistentBroker::instance()->executeQuery( QString( "REPLACE INTO effects_properties VALUES(%1,'%2','%3','%4');" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ).arg( "string" ).arg( PersistentBroker::instance()->quoteString( value.utf8() ) ) );
  }
  
! void cTimer::saveChar( unsigned int id, const QString& key, P_CHAR character )
  {
  	unsigned int value = character->serial();
***************
*** 114,118 ****
  }
  
! void cTimer::saveItem( unsigned int id, QString key, P_ITEM item )
  {
  	unsigned int value = item->serial();
--- 114,118 ----
  }
  
! void cTimer::saveItem( unsigned int id, const QString& key, P_ITEM item )
  {
  	unsigned int value = item->serial();
***************
*** 120,124 ****
  }
  
! bool cTimer::loadChar( unsigned int id, QString key, P_CHAR& character )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'char'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
--- 120,124 ----
  }
  
! bool cTimer::loadChar( unsigned int id, const QString& key, P_CHAR& character )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'char'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
***************
*** 136,140 ****
  }
  
! bool cTimer::loadItem( unsigned int id, QString key, P_ITEM& item )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'item'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
--- 136,140 ----
  }
  
! bool cTimer::loadItem( unsigned int id, const QString& key, P_ITEM& item )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'item'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
***************
*** 155,159 ****
  	Load a float from the effects_properties table.
   */
! bool cTimer::loadFloat( unsigned int id, QString key, double& value )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'float'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
--- 155,159 ----
  	Load a float from the effects_properties table.
   */
! bool cTimer::loadFloat( unsigned int id, const QString& key, double& value )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'float'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
***************
*** 175,179 ****
  	Load an integer from the effects_properties table.
   */
! bool cTimer::loadInt( unsigned int id, QString key, int& value )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'int'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
--- 175,179 ----
  	Load an integer from the effects_properties table.
   */
! bool cTimer::loadInt( unsigned int id, const QString& key, int& value )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'int'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
***************
*** 195,199 ****
  	Load a string from the effects_properties table.
   */
! bool cTimer::loadString( unsigned int id, QString key, QString& value )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'string'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );
--- 195,199 ----
  	Load a string from the effects_properties table.
   */
! bool cTimer::loadString( unsigned int id, const QString& key, QString& value )
  {
  	cDBResult result = PersistentBroker::instance()->query( QString( "SELECT value FROM effects_properties WHERE id = '%1' AND keyname = '%2' AND type = 'string'" ).arg( id ).arg( PersistentBroker::instance()->quoteString( key ) ) );

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** walking.cpp	15 Jun 2004 02:44:45 -0000	1.127
--- walking.cpp	19 Jun 2004 02:06:51 -0000	1.128
***************
*** 112,116 ****
  	bool walkable;
  
! 	stBlockItem() : walkable( false ), height( 0 ), z( -128 )
  	{
  	}
--- 112,116 ----
  	bool walkable;
  
! 	stBlockItem() : z( -128 ), height( 0 ), walkable( false )
  	{
  	}

Index: singleton.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/singleton.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** singleton.h	2 Jun 2004 15:04:06 -0000	1.10
--- singleton.h	19 Jun 2004 02:06:51 -0000	1.11
***************
*** 71,74 ****
--- 71,76 ----
  	// Protection
  	SingletonHolder();
+ 	SingletonHolder(SingletonHolder&);
+ 	SingletonHolder& operator=(SingletonHolder&);
  
  	// Data

Index: pagesystem.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pagesystem.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pagesystem.h	2 Jun 2004 15:04:06 -0000	1.18
--- pagesystem.h	19 Jun 2004 02:06:51 -0000	1.19
***************
*** 52,56 ****
  	UINT32 pagecateg_;
  public:
! 	cPage( SERIAL charserial, WPPAGE_TYPE pagetype, QString content, Coord_cl pagepos )
  	{
  		charserial_ = charserial;
--- 52,56 ----
  	UINT32 pagecateg_;
  public:
! 	cPage( SERIAL charserial, WPPAGE_TYPE pagetype, const QString& content, const Coord_cl& pagepos )
  	{
  		charserial_ = charserial;

Index: factory.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/factory.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** factory.h	2 Jun 2004 15:04:05 -0000	1.7
--- factory.h	19 Jun 2004 02:06:51 -0000	1.8
***************
*** 40,43 ****
--- 40,44 ----
  {
  public:
+ 	virtual ~Factory() {}
  	bool registerType( const keyType& id, productCreator creator )
  	{

Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** customtags.cpp	10 Jun 2004 00:27:12 -0000	1.47
--- customtags.cpp	19 Jun 2004 02:06:51 -0000	1.48
***************
*** 160,164 ****
    Constructs a new variant with a Coord_cl value, \a val.
  */
! cVariant::cVariant( Coord_cl val )
  {
  	typ = Coord;
--- 160,164 ----
    Constructs a new variant with a Coord_cl value, \a val.
  */
! cVariant::cVariant( const Coord_cl& val )
  {
  	typ = Coord;

Index: npc.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** npc.h	3 Jun 2004 14:42:59 -0000	1.50
--- npc.h	19 Jun 2004 02:06:51 -0000	1.51
***************
*** 97,101 ****
  	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
  	void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
! 	virtual UINT8 notoriety( P_CHAR pChar = NULL );
  	virtual void showName( cUOSocket* socket );
  	virtual void soundEffect( UI16 soundId, bool hearAll = true );
--- 97,101 ----
  	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
  	void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
! 	virtual UINT8 notoriety( P_CHAR pChar = 0 );
  	virtual void showName( cUOSocket* socket );
  	virtual void soundEffect( UI16 soundId, bool hearAll = true );
***************
*** 447,455 ****
  }
  
- inline bool cNPC::isInnocent()
- {
- 	return notoriety() == 1;
- }
- 
  inline bool cNPC::summoned() const
  {
--- 447,450 ----

Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** dbdriver.cpp	15 Jun 2004 02:44:43 -0000	1.35
--- dbdriver.cpp	19 Jun 2004 02:06:51 -0000	1.36
***************
*** 75,78 ****
--- 75,79 ----
  {
  }
+ 
  QString cDBDriver::error()
  {

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** basechar.h	10 Jun 2004 00:27:12 -0000	1.71
--- basechar.h	19 Jun 2004 02:06:51 -0000	1.72
***************
*** 134,138 ****
  	virtual void moveTo( const Coord_cl& pos, bool noremove = false );
  	bool lineOfSight( P_ITEM item, bool touch = false );
! 	bool lineOfSight( Coord_cl position, bool touch = false );
  	bool lineOfSight( P_CHAR character, bool touch = false );
  
--- 134,138 ----
  	virtual void moveTo( const Coord_cl& pos, bool noremove = false );
  	bool lineOfSight( P_ITEM item, bool touch = false );
! 	bool lineOfSight( const Coord_cl& position, bool touch = false );
  	bool lineOfSight( P_CHAR character, bool touch = false );
  
***************
*** 277,281 ****
  	unsigned int getSkillSum() const;
  	void Init( bool ser = true );
! 	bool isSameAs( P_CHAR pc );
  	bool inGuardedArea();
  	void emote( const QString& emote, UI16 color = 0xFFFF );
--- 277,281 ----
  	unsigned int getSkillSum() const;
  	void Init( bool ser = true );
! 	bool isSameAs( P_CHAR pc ) const;
  	bool inGuardedArea();
  	void emote( const QString& emote, UI16 color = 0xFFFF );
***************
*** 1497,1506 ****
  }
  
! inline bool cBaseChar::isInnocent()
! {
! 	return !isMurderer() && !isCriminal();
! }
! 
! inline bool cBaseChar::isSameAs( P_CHAR pc )
  {
  	return ( pc && pc->serial() == serial() );
--- 1497,1501 ----
  }
  
! inline bool cBaseChar::isSameAs( P_CHAR pc ) const
  {
  	return ( pc && pc->serial() == serial() );

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** npc.cpp	15 Jun 2004 02:44:44 -0000	1.96
--- npc.cpp	19 Jun 2004 02:06:51 -0000	1.97
***************
*** 181,184 ****
--- 181,189 ----
  }
  
+ bool cNPC::isInnocent()
+ {
+ 	return notoriety() == 1;
+ }
+ 
  void cNPC::setOwner( P_PLAYER data, bool nochecks )
  {
***************
*** 932,936 ****
  {
  public:
! 	pathnode_cl( UI16 x_, UI16 y_, SI08 z_, UI16 step_, float cost_ ) : prev( NULL ), x( x_ ), y( y_ ), z( z_ ), step( step_ ), cost( cost_ )
  	{
  	}
--- 937,941 ----
  {
  public:
! 	pathnode_cl( UI16 x_, UI16 y_, SI08 z_, UI16 step_, float cost_ ) : x( x_ ), y( y_ ), z( z_ ), step( step_ ), cost( cost_ ), prev( 0 )
  	{
  	}

[wpdev-commits] wolfpack/python engine.cpp,1.30,1.31 engine.h,1.17,1.18 item.cpp,1.113,1.114

From: Thiago A C. <thi...@us...> - 2004-06-19 02:07:01

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

Modified Files:
	engine.cpp engine.h item.cpp 
Log Message:
fixed but with item.moveto() [python]
a great deal of clean ups.

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** item.cpp	15 Jun 2004 02:44:46 -0000	1.113
--- item.cpp	19 Jun 2004 02:06:52 -0000	1.114
***************
*** 165,169 ****
  	// Gather parameters
  	Coord_cl pos = self->pItem->pos();
! 	char noRemove = 0;
  
  	if ( PyTuple_Size( args ) == 1 )
--- 165,169 ----
  	// Gather parameters
  	Coord_cl pos = self->pItem->pos();
! 	uchar noRemove = 0;
  
  	if ( PyTuple_Size( args ) == 1 )
***************
*** 178,185 ****
  	else
  	{
! 		if ( !PyArg_ParseTuple( args, "HH|bBB:item.moveto(x, y, [z], [map])", &pos.x, &pos.y, &pos.z, &pos.map, &noRemove ) )
  		{
  			return 0;
  		}
  		self->pItem->moveTo( pos, noRemove ? true : false );
  	}
--- 178,187 ----
  	else
  	{
! 		int z = 0;
! 		if ( !PyArg_ParseTuple( args, "HH|iBB:item.moveto(x, y, [z], [map])", &pos.x, &pos.y, &z, &pos.map, &noRemove ) )
  		{
  			return 0;
  		}
+ 		pos.z = (signed char)z;
  		self->pItem->moveTo( pos, noRemove ? true : false );
  	}

Index: engine.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/engine.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** engine.h	14 Jun 2004 22:32:25 -0000	1.17
--- engine.h	19 Jun 2004 02:06:52 -0000	1.18
***************
*** 78,82 ****
  void stopPython();
  void startPython( int argc, char* argv[] );
! void reportPythonError( QString moduleName = QString::null );
  
  #endif // __PYTHON_ENGINE_H__
--- 78,82 ----
  void stopPython();
  void startPython( int argc, char* argv[] );
! void reportPythonError( const QString& moduleName = QString::null );
  
  #endif // __PYTHON_ENGINE_H__

Index: engine.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/engine.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** engine.cpp	2 Jun 2004 19:13:13 -0000	1.30
--- engine.cpp	19 Jun 2004 02:06:51 -0000	1.31
***************
*** 161,165 ****
  }
  
! void reportPythonError( QString moduleName )
  {
  	// Print the Error
--- 161,165 ----
  }
  
! void reportPythonError( const QString& moduleName )
  {
  	// Print the Error

[wpdev-commits] xmlscripts/documentation FAQ.html,1.2,1.3

From: Richard M. <dr...@us...> - 2004-06-18 22:45:56

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

Modified Files:
	FAQ.html 
Log Message:
Updated


Index: FAQ.html
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/FAQ.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FAQ.html	18 Jun 2004 22:05:42 -0000	1.2
--- FAQ.html	18 Jun 2004 22:45:47 -0000	1.3
***************
*** 151,155 ****
  				<li><a href="#03">What are the system hardware requirements?</a></li>
  				<li><a href="#04">What needs to be installed to use Wolfpack?</a></li>
! 				<li><a href="#05">How do I compile Wolfpack under Windows?</a></li>
  				<li><a href="#06">How do I compile Wolfpack under Linux?</a></li>
  				<li><a href="#07">How do I compile Wolfpack under BSD?</a></li>
--- 151,160 ----
  				<li><a href="#03">What are the system hardware requirements?</a></li>
  				<li><a href="#04">What needs to be installed to use Wolfpack?</a></li>
! 				<li><a href="#05">How do I compile Wolfpack under Windows?</a><br />
! 					<ul>
! 						<li><a href="#05a">Using MSVC.</a></li>
! 						<li><a href="#05b">Using Cygwin/MinGW</a></li>
! 					</ul>
! 				</li>
  				<li><a href="#06">How do I compile Wolfpack under Linux?</a></li>
  				<li><a href="#07">How do I compile Wolfpack under BSD?</a></li>
***************
*** 221,225 ****
  				</li>
  				<!-- Answer 04 -->
! 				<li><a name="04" class="question">What needs to be installed to use Wolfpack?</a>
  					<div class="answer">
  						There are two things you should install and run Wolfpack 13.x.x.<br />
--- 226,230 ----
  				</li>
  				<!-- Answer 04 -->
! 				<li><a name="04" class="question">What needs to be installed to use Wolfpack?</a><br />
  					<div class="answer">
  						There are two things you should install and run Wolfpack 13.x.x.<br />
***************
*** 238,247 ****
  				</li>
  				<!-- Answer 05 -->
! 				<li><a name="05" class="question">How do I compile Wolfpack under Windows?</a>
! 					<div class="answer">
! 					</div>
  				</li>
  				<!-- Answer 06 -->
! 				<li><a name="06" class="question">How do I compile Wolfpack under Linux?</a>
  					<div class="answer">
  						First you need the latest QT-3.3.x release for your linux distribution.<br />
--- 243,276 ----
  				</li>
  				<!-- Answer 05 -->
! 				<li><a name="05" class="question">How do I compile Wolfpack under Windows?</a><br />
! 					<ul>
! 						<li><a name="05a" class="question">Using MSVC.</a><br />
! 							<div class="answer">
! 								This guide covers compiling Wolfpack using MSVC.<br />
! 								<br />
! 								Compile Requirements:<br />
! 								<ul>
! 									<li><a href="http://python.org/2.3.4/">The Latest Python-2.3 Release</a>.</li>
! 									<li><a href="http://msdn.microsoft.com/visualc/downloads/updates/default.aspx">Service pack 5 for MSVC6</a>.</li>
! 									<li><a href="http://sourceforge.net/project/showfiles.php?group_id=38114&#038;package_id=62543">Windows QT Library</a>.</li>
! 								</ul>
! 								<br />
! 								Optional Compile Requirements:<br />
! 								<ul>
! 									<li><a href="http://www.mysql.org/">MySQL Database</a>.</li>
! 								</ul>
! 								<br />
! 								Currently Incomplete.
! 							</div>
! 						</li>
! 						<li><a name="05b" class="question">Using Cygwin/MinGW.</a><br />
! 							<div class="answer">
! 								Currently Incomplete.
! 							</div>
! 						</li>
! 					</ul>
  				</li>
  				<!-- Answer 06 -->
! 				<li><a name="06" class="question">How do I compile Wolfpack under Linux?</a><br />
  					<div class="answer">
  						First you need the latest QT-3.3.x release for your linux distribution.<br />
***************
*** 276,280 ****
  				</li>
  				<!-- Answer 07 -->
! 				<li><a name="07" class="question">How do I compile Wolfpack under BSD?</a>
  					<div class="answer">
  						Compiling Instructions:<br />
--- 305,309 ----
  				</li>
  				<!-- Answer 07 -->
! 				<li><a name="07" class="question">How do I compile Wolfpack under BSD?</a><br />
  					<div class="answer">
  						Compiling Instructions:<br />
***************
*** 295,299 ****
  				</li>
  				<!-- Answer 08 -->
! 				<li><a name="08" class="question">Can I use the world files for previous Wolfpack versions?</a>
  					<div class="answer">
  						The simple answer for this is <span style="font-weight:bold;">no</span>.<br />
--- 324,328 ----
  				</li>
  				<!-- Answer 08 -->
! 				<li><a name="08" class="question">Can I use the world files for previous Wolfpack versions?</a><br />
  					<div class="answer">
  						The simple answer for this is <span style="font-weight:bold;">no</span>.<br />
***************
*** 314,318 ****
  				</li>
  				<!-- Answer 09 -->
! 				<li><a name="09" class="question">Where can I find documentation?</a>
  					<div class="answer">
  						You can find Wolfpack documentation at: <a href="http://www.wpdev.org/docs/">http://www.wpdev.org/docs/</a><br />
--- 343,347 ----
  				</li>
  				<!-- Answer 09 -->
! 				<li><a name="09" class="question">Where can I find documentation?</a><br />
  					<div class="answer">
  						You can find Wolfpack documentation at: <a href="http://www.wpdev.org/docs/">http://www.wpdev.org/docs/</a><br />
***************
*** 321,325 ****
  				</li>
  				<!-- Answer 10 -->
! 				<li><a name="10" class="question">Help! I get unicode errors with my python scripts!</a>
  					<div class="answer">
  						This problem is mostly common with Linux/BSD. Python-2.3 on many distributions comes compiled
--- 350,354 ----
  				</li>
  				<!-- Answer 10 -->
! 				<li><a name="10" class="question">Help! I get unicode errors with my python scripts!</a><br />
  					<div class="answer">
  						This problem is mostly common with Linux/BSD. Python-2.3 on many distributions comes compiled
***************
*** 352,356 ****
  				</li>
  				<!-- Answer 11 -->
! 				<li><a  name="11" class="question">I found a bug! What can I do?</a>
  					<div class="answer">
  						Before anything, we recommend that you check the bug tracker to see if it has already been reported.<br />
--- 381,385 ----
  				</li>
  				<!-- Answer 11 -->
! 				<li><a  name="11" class="question">I found a bug! What can I do?</a><br />
  					<div class="answer">
  						Before anything, we recommend that you check the bug tracker to see if it has already been reported.<br />
***************
*** 364,368 ****
  				</li>
  				<!-- Answer 12 -->
! 				<li><a  name="12" class="question">I wrote some scripts that were missing! What can I do with it?</a>
  					<div class="answer">
  					First of all, we are trying to conform to an OSI like world. So please check that your creation(s) are along
--- 393,397 ----
  				</li>
  				<!-- Answer 12 -->
! 				<li><a  name="12" class="question">I wrote some scripts that were missing! What can I do with it?</a><br />
  					<div class="answer">
  					First of all, we are trying to conform to an OSI like world. So please check that your creation(s) are along
***************
*** 379,383 ****
  				</li>
  				<!-- Answer 13 -->
! 				<li><a  name="13" class="question">Where can I find the latest CVS Snapshots?</a>
  					<div class="answer">
  						You can find the latest CVS snapshots at:
--- 408,412 ----
  				</li>
  				<!-- Answer 13 -->
! 				<li><a  name="13" class="question">Where can I find the latest CVS Snapshots?</a><br />
  					<div class="answer">
  						You can find the latest CVS snapshots at:

[wpdev-commits] xmlscripts/documentation ChangeLog.wolfpack,1.1,1.2

From: Richard M. <dr...@us...> - 2004-06-18 22:13:17

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

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Tweak


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/ChangeLog.wolfpack,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChangeLog.wolfpack	18 Jun 2004 22:05:42 -0000	1.1
--- ChangeLog.wolfpack	18 Jun 2004 22:13:08 -0000	1.2
***************
*** 49,53 ****
  			- Script system.debugging created to set different debugging options.
  	* Misc. Changes:
! 		- FAQ.html added in the xmlscripts package.
  	* Known Issues, Bugs, and Missing Features.
  		- Spawn regions are incomplete.
--- 49,54 ----
  			- Script system.debugging created to set different debugging options.
  	* Misc. Changes:
! 		- FAQ.html included in the documentaiton.
! 		- ChangeLog.wolfpack included in the documentaiton.
  	* Known Issues, Bugs, and Missing Features.
  		- Spawn regions are incomplete.

[wpdev-commits] xmlscripts/documentation ChangeLog.wolfpack,NONE,1.1 FAQ.html,1.1,1.2

From: Richard M. <dr...@us...> - 2004-06-18 22:05:51

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

Modified Files:
	FAQ.html 
Added Files:
	ChangeLog.wolfpack 
Log Message:
Small Cleanups
Figured we could add a changelog file.


Index: FAQ.html
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/FAQ.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FAQ.html	18 Jun 2004 21:50:02 -0000	1.1
--- FAQ.html	18 Jun 2004 22:05:42 -0000	1.2
***************
*** 180,183 ****
--- 180,188 ----
  							<li>Client Encryption Support</li>
  						</ul>
+ 						<br />
+ 						For a more verbose changelog:
+ 						<ul>
+ 							<li><a href="http://www.wpdev.org/docs/ChangeLog.wolfpack">http://www.wpdev.org/docs/ChangeLog.wolfpack</a></li>
+ 						</ul>
  					</div>
  				</li>
***************
*** 253,257 ****
  							<li>MySQL Packages: libmysqlclient-dev libmysqlclient12 mysql-client mysql-common mysql-server</li>
  						</ul>
! 						<br /><br />
  						Compiling Instructions:<br />
  						<div class="bash">
--- 258,262 ----
  							<li>MySQL Packages: libmysqlclient-dev libmysqlclient12 mysql-client mysql-common mysql-server</li>
  						</ul>
! 						<br />
  						Compiling Instructions:<br />
  						<div class="bash">
***************
*** 268,303 ****
  							# Grab a snack while it compiles.
  						</div>
- 						<br /><br />
- 						<span style="font-weight:bold;">Python Warning</span><br />
- 						Python-2.3 on many distributions comes compiled using UCS4 for Unicode. Wolfpack currently requires
- 						that Python-2.3 be compiled with UCS2 for Unicode. If this is the case, you will need to download and
- 						manually compile Python-2.3 and add the --enable-unicode=ucs2 --enable-shared to the ./configure arguments. After this you can install this Python-2.3 to your /usr/local/ directory or anywhere else.
- 						Please be sure to put this new python path in the Wolfpack configure arguments!<br />
- 						<br /><br />
- 						Python Fix / Compiling Instructions:<br />
- 						<div class="bash">
- 							# Compiling/Installing Python-2.3.x
- 							tar xvjf Python-2.3.4.tar.bz2 -C ./<br />
- 							cd python_source_dir/<br />
- 							# Please note the --enable-shared and --enable-unicode=ucs2<br />
- 							./configure --prefix=/usr/local --enable-unicode=ucs2 --enable-shared<br />
- 							make<br />
- 							su root<br />
- 							make install<br />
- 							exit<br />
- 							<br />
- 							# Compiling Wolfpack 13.x.x
- 							tar xvfj wolfpack.tar.bz2 -C ./<br />
- 							cd wolfpack_source_dir/<br />
- 							chmod +x configure<br />
- 							./configure --help<br />
- 							# Please read the options and use those that apply to you.<br />
- 							# Running configure should auto detect most options. <br />
- 							./configure --enable-debug --enable-mysql<br />
- 							# At this point you can edit Makefile and add optional CFLAGS<br />
- 							# I personally add -march=athlon -03<br />
- 							make<br />
- 							# Grab a snack while it compiles.
- 						</div>
  					</div>
  				</li>
--- 273,276 ----
***************
*** 319,323 ****
  							# Grab a snack while it compiles.
  						</div>
- 						<br /><br />
  					</div>
  				</li>
--- 292,295 ----
***************
*** 358,361 ****
--- 330,347 ----
  						in the Wolfpack configure arguments!<br />
  						<br />
+ 						Python Fix / Compiling Instructions:<br />
+ 						<div class="bash">
+ 							# Compiling/Installing Python-2.3.x
+ 							tar xvjf Python-2.3.4.tar.bz2 -C ./<br />
+ 							cd python_source_dir/<br />
+ 							# Please note the --enable-shared and --enable-unicode=ucs2<br />
+ 							./configure --prefix=/usr/local --enable-unicode=ucs2 --enable-shared<br />
+ 							make<br />
+ 							su root<br />
+ 							make install<br />
+ 							exit<br />
+ 						</div>
+ 						<br />
+ 						At this point you need to recompile Wolfpack.<br />
  						For information reguarding compiling, please check out:<br />
  						<ul>

--- NEW FILE: ChangeLog.wolfpack ---
Wolfpack 13.0.0 ChangeLog

Wolfpack 12.9.7 Beta (CVS)
	* Core Changes:
		* Region/Spawn Region Updates:
			- Fixed bugs that caused segfaults.
			- Added wandering controls to keep spawns in their regions.
		* Database Changes:
			- NPC baseids are now saved.
			- Spawnregions save spawned NPCs.
			- Multi tables removed, being redone.
			- Item.type and other properties are no longer saved, uses base definitions.
			- Removed the `spawnregion` field from the `items`,`npcs` database tables.
		* Code Changes:
			- Major cleanups and structure changes, much cleaner and more sane.
			- Numerous compile warning cleanups.
			- Support for Client 4.0.3a.
			- Support for 6th character slot.
	* Definition Changes:
		* Item Updates:
			- Colored platemail baseid mapping. This was overlooked and should fix armor bugs.
			- Added the new artwork/items from client 4.0.3a.
		* NPC Updates:
			- Several AoS NPCs added. Most NPCs should be added now.
			- Some NPCs such as orcs and lizardmen can now pull their id and skin from a list.
			- Lootlist improvements.
			- Stat adjustments. ( UO Stratics Data )
			- Fame/Karma adjustments. ( UO Stratics Data )
			- Basic loot list implimentation, most monsters should drop some gold/gems.
		* Region/Spawn Region Updates:
			- Template structure added for regions.
			- Template structure added for spawn regions.
			- Updated town spawns for felucca and trammel towns.
		* Misc. Updates:
			- Organized scripts.xml to be easier to read/check for missing scripts.
	* Python Script Changes:
		* Commands:
			- import/export now saves/imports the baseid and map values with WSC and TXT.
			- info updated, supports NPC properties a bit better.
			- freeze command added, toggles the frozen value.
			- dye updated to modify character skins. 'dye 0x0 will replace the skin with char.orgskin.
		* Loot System:
			- Index for loot lists in system.loot and system.lootlists.
		* Magic:
			- Updated summoned monsters, balance fix.
			- Spell casting delay adjustments.
		* System:
			- SQLite database optimization added.
			- Script system.debugging created to set different debugging options.
	* Misc. Changes:
		- FAQ.html added in the xmlscripts package.
	* Known Issues, Bugs, and Missing Features.
		- Spawn regions are incomplete.
		- Town/World regions are incomplete.
		- Teleport Scripts are incomplete.
		- Possible that a few monsters are missing.
		- Reloading python too many times crashes the server.
		- There are still some memory leaks.

Wolfpack 12.9.6 Beta
	* Numerous crash fixes.
		- Python memory improvements.
		- NPC related crash fixes.
		- Worldsave error improvements.
	* Skill Fixes and Improvements
		- Alchemy added/redone.
		- Fixes for Carpentry, Blacksmithing, Tailoring, Tinkering, Bowcraft
		- Improvement and fixes with Item Identification, Spirit Speak,
			Evaluating Intelligence, Taste Identification, Animal Taming,
			Hiding, Stealth, Snooping.
		- Lumberjacking fixes.
		- Mining fixes.
		- Healing with bandages fixes for bloody bandages.
	* Command fixes
		- Travel fixes.
		- Add fixes.
	* Definitions cleanup
		- Reorganized the definitions to be cleaner and easier to manage with updates.
		- Note: ./definitions.xml moved to ./definitions/index.xml
	* Item Improvements and Fixes
		- Various price fixes.
		- Definition fixes.
		- Explosion potions can trigger chain explosions.
		- All potions should work.
		- Potion kegs work for pouring potions from a full keg..
		- Food now works.
		- Multis were recoded.
	* NPC Improvements and Fixes
		- Tinkered Golems name fix.
		- Blacksmith male vendor fix.
		- Frenzied ostard is no longer invulnerable.
		- swamp_dragon_2 no longer has the wrong inherit definition.
		- Fixes to prevent creatures from being invisible.
		- Pet feeding is now possible.
		- NPC AI Speed adjustments.
		- Fixed a bug with vendor displayed prices.
	* Python Engine Improvements
		- item.say() and item.effect() added.
		- Double-clicking weapons should auto-equip if possible.
		- Makemenus now support a configurable delay.
	* Spell Improvements
		- The 8th circle magic has been implemented
		- Line of Sight fixes.
	* Known bugs:
		- Necromancy/Paladin spells do not function, still in the works.
		- Non-functioning skills: Snooping, Inscription, Cartography, Animal Lore,
			Arms Lore, Enticement.
		- Reload (python) memory leak.
		- Line of Sight blocks even if it shouldn't.
		- The "Open Door" macro doesn't work.
		- Drinks do not function, including alcohol.
		- Creature AI is getting stuck on objects.
		- Trading crashes the client.
		- Deeded objects don't work.
		- Potion kegs can not be refilled.
		- Explosion potions can detonate other potions through walls/objects.

Wolfpack 12.9.5 Beta
	* Misc. Updates
		- Many misc. updates
		- Several new commands (Documentation here: http://www.wpdev.org/docs/)
	* Python Engine
		- Rewrote spell circles 1 to 7 including AoS support.
		- Rewrote most of the makemenus using a python-based class system and populated them.
		- Centralized most of the ore information and made it easier for shards to override the ores without changing the core scripts.
		- Several fixes to the tooltip system.
		- Added new events (Documentation here: http://www.wpdev.org/docs/)
		- Several new library functions. (No documentation yet but efforts to document have been started)
		- Added several new AoS magic properties to the combat system.
		- Added AoS style regeneration of health, stamina and mana.
		- Fixes to mining and other parts of the resource skill system.
		- Poison has been implemented (no onhit poisoning yet)
		- A script to export sphere 55i saves to a compatible wolfpack output is now in the CVS. (Works quite well but isn't finished yet)
		- Added shrunk figurines for NPCs like Sphere has. Used to convert stablemasters and shrinked NPCs from Sphere.
		- Food is now edible again. (But not feedable yet)
		- Added a "shrine" script for resurrection upon collision.
		- Fixed context menus and speech for bankers.
		- Support for Guilds (No Wars/Alliances yet)
		- Party System
		- NPCs should now be able to train players.
		- Spawngem system. (Similar to sphere's but with a gump for GMs on doubleclick): "system.spawns"
		- Statlocks are now accesible via python and work.
		- Stat and Skillgain has been rewritten in Python.
	* Definitions
		- General definition updates and corrections.
	* Server Core
		- Several core fixes regarding the "update player" network protocol and problems that arose from it.
		- Included a scaled night/day system with real dawn and sunset.
		- Finally made the ingame time progress.
		- Fixed several issues with NPC Ai and NPCs not attacking players.
		- Fixed an issue with corpses where equipment information wasn't stored correctly.
		- Raising from corpse should now be possible (if the player is standing on the corpse, he gets raised with all of his old equipment which is still on the corpse and a "stand up" animation is played). Much like sphere.
		- New "Monster_Berserk" AI for Blade Spirits.
		- New line of sight code from Varan Dar (not perfect yet)
		- New changes to the Windows GUI
		- Players no longer should see other logged out characters. Visibility to other players got a major rewrite and should function a lot better now.
		- Made sure that the bankbox can now be used.
		- Support for UOGateway Status requests.
		- Small console output changes (linux + windows).
		- Fixes for Python Unicode support (foreign languages are now better supported)
		- Regions support has been improved. It's not required to have a single topregion anymore and region changes are processed whenever the character position is changed automatically.
		- The .tags command is now declared deprecated except for the ".tags info" subcommand. Please use the python versions now: .deltag, .settag, .gettag.
		- If wolfpack is daemonized on Linux it won't try to read from stdin anymore.
		- SQLite has been updated.
		- Fixed a drag and drop problem (bouncing).
		- NPC kills no longer crash the server

[wpdev-commits] xmlscripts/documentation FAQ.html,NONE,1.1

From: Richard M. <dr...@us...> - 2004-06-18 21:50:13

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

Added Files:
	FAQ.html 
Log Message:
Moved/Restyled


--- NEW FILE: FAQ.html ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
		<title>Wolfpack 13.0.0 F.A.Q.</title>
		<base href="./" />
		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
		<style type="text/css">
		<!--
		body {
			background-color: #ffffff;
			font-family: "Trebuchet MS", Arial, Helvetica;
			font-size: 12px;
			font-style: normal;
			font-weight: normal;
			font-variant: normal;
			text-transform: none;
			color: #000000;
			text-align: left;
			margin-left: 0px;
			margin-top: 0px;
			margin-right: 0px;
			margin-bottom: 0px;
			text-decoration: none;
		}
		a:link, a:visited {
			color: #0000FF;
			text-decoration: none;
		}
		a:hover {
			text-decoration: underline;
		}
		a:active {
			text-decoration: none;
		}
		img {
			border: 0px;
			border-color: none;
		}
		div {
			text-decoration: none;
			font-style: none;
			font-weight: normal;
		}
		div.header {
			width: 100%;
			background-color: #004b2c;
			height: 87px;
			text-align: left;
		}
		div.header2 {
			background-color: #999999;
			width: 100%;
			height: 3px;
			text-align: left;
		}
		div.navbar {
			width: 783px;
			text-align: left;
			height: 60px;
		}
		table.navigation {
			border: none;
			margin: 0px;
			padding: 0px;
			text-align: left;
			width: 783px;
			height: 60px;
			vertical-align: top;
		}
		td.navigation1, td.navigation2, td.navigation3 {
			color: #000000;
			text-align: left;
			vertical-align: top;
		}
		td.navigation1 {
			height: 20px;
			width: 783px;
			vertical-align: top;
		}
		td.navigation2 {
			height: 19px;
			width: 634px;
		}
		td.navigation3 {
			height: 19px;
			width: 149px;
			text-align: center;
		}
		div.toc, div.faq {
			text-align: left;
			margin-left: 1em;
			font-size: 16px;
			font-weight: bold;
		}
		div.faq {
			margin-bottom: 3em;
		}
		hr {
			border-color: #e3f3a8;
			border-style: thin inset;
			width: 750px;
			margin-left: 1em;
			margin-top: 0.75em;
			margin-bottom: 0.75em;
			float: left;
		}
		ul.toc {
			list-style-type: decimal-leading-zero;
			font-weight: normal;
		}
		ul.faq {
			font-weight: normal;
			list-style-type: decimal-leading-zero;
		}
		a.question {
			text-decoration: underline;
			color: #002F1B;
			font-weight: bold;
		}
		div.answer {
			margin-left: 1em;
			margin-bottom: 1em;
			margin-top: 0.5em;
			color: #000000;
			text-decoration: normal;
		}
		div.bash {
			margin-left: 1em;
			margin-bottom: 0.25em;
			margin-top: 0.25em;
			font-size: 10pt;
			font-family: Fixed, Arial;
		}
		-->
		</style>
	</head>
	<body>
		<div class="header"><img src="top_logo.jpg" style="width:586px;height:87px;" alt="" /></div>
		<div class="header2"><img src="spacer.gif" style="width:1px;height:3px;" alt="" /></div>
		<br />
		<!-- QUESTIONS -->
		<div class="toc">
			<span style="font-size:18px;font-style:italic;color:#002F1B;">Wolfpack 13.x.x</span><br />
			Frequently Asked Questions<br />
			<br />
			Table of Contents
			<ul class="toc">
				<li><a href="#01">What is new in Wolfpack 13.x.x?</a></li>
				<li><a href="#02">What platforms are supported?</a></li>
				<li><a href="#03">What are the system hardware requirements?</a></li>
				<li><a href="#04">What needs to be installed to use Wolfpack?</a></li>
				<li><a href="#05">How do I compile Wolfpack under Windows?</a></li>
				<li><a href="#06">How do I compile Wolfpack under Linux?</a></li>
				<li><a href="#07">How do I compile Wolfpack under BSD?</a></li>
				<li><a href="#08">Can I use the world files for previous Wolfpack versions?</a></li>
				<li><a href="#09">Where can I find documentation?</a></li>
				<li><a href="#10">Help! I get unicode errors with my python scripts!</a></li>
				<li><a href="#11">I found a bug! What can I do?</a></li>
				<li><a href="#12">I wrote some scripts that were missing! What can I do with it?</a></li>
				<li><a href="#13">Where can I find the latest CVS Snapshots?</a></li>
			</ul>
		</div>
		<br /><hr /><br />
		<!-- ANSWERS -->
		<div class="faq">
			<br />
			Answers<br />
			<ul class="faq">
				<!-- Answer 01 -->
				<li><a name="01" class="question">What is new in Wolfpack 13.x.x?</a>
					<div class="answer">
						There are many new things in Wolfpack 13.x.x<br />
						A small list of what's new:<br />
						<ul>
							<li>A new database world save format, <a href="http://www.sqlite.org/">SQLite</a> and <a href="http://www.mysql.org/">MySQL</a>.</li>
							<li>A new scripting engine powered by <a href="http://www.python.org/">Python 2.3</a>.</li>
							<li>A new XML data storage to replace the old SCP system.</li>
							<li>Latest client support for versions such as Age of Shadows.</li>
							<li>Client Encryption Support</li>
						</ul>
					</div>
				</li>
				<!-- Answer 02 -->
				<li><a name="02" class="question">What platforms are supported?</a>
					<div class="answer">
						Confirmed supported platforms include:<br />
						<ul>
							<li>Windows</li>
							<li>Linux</li>
							<li>BSD</li>
						</ul>
					</div>
				</li>
				<!-- Answer 03 -->
				<li><a name="03" class="question">What are the system hardware requirements?</a>
					<div class="answer">
						While this remains currently untested, here are some recommendations.<br />
						<br />
						Minimum:<br />
						<ul>
							<li>128 MB of RAM.</li>
							<li>A processor of at least 400mhz.</li>
							<li>At least 250 MB of free hard drive space.</li>
						</ul>
						<br />
						Recommended:<br />
						<ul>
							<li>256 MB of RAM or greater.</li>
							<li>A processor of at least 800mhz.</li>
							<li>At least 500 MB of free hard drive space.</li>
						</ul>
						<br />
						Naturally, the better your hardware the better your server's performance will be.
					</div>
				</li>
				<!-- Answer 04 -->
				<li><a name="04" class="question">What needs to be installed to use Wolfpack?</a>
					<div class="answer">
						There are two things you should install and run Wolfpack 13.x.x.<br />
						<br />
						For Windows:<br />
						<ul>
							<li><a href="http://python.org/2.3.4/">The Latest Python-2.3 Release</a>.</li>
						</ul>
						<br />
						For Linux/BSD:<br />
						<ul>
							<li><a href="http://www.trolltech.com/download/qt/x11.html">The Latest QT-3.3 Release</a>.</li>
							<li><a href="http://python.org/2.3.4/">The Latest Python-2.3 Release</a>.</li>
						</ul>
					</div>
				</li>
				<!-- Answer 05 -->
				<li><a name="05" class="question">How do I compile Wolfpack under Windows?</a>
					<div class="answer">
					</div>
				</li>
				<!-- Answer 06 -->
				<li><a name="06" class="question">How do I compile Wolfpack under Linux?</a>
					<div class="answer">
						First you need the latest QT-3.3.x release for your linux distribution.<br />
						You will also need the dev package for this version of QT.<br />
						Note: Most distributions use libqt3-mt and libqt3-mt-dev for package names.<br />
						<br />
						Distribution Notes<br /><br />
						Debian:<br />
						<ul>
							<li>Recommended that you use Debian Unstable for latest packages.</li>
							<li>QT3 Packages: libqt3c102-mt libqt3-mt-dev libqt3-headers qt3-dev-tools</li>
							<li>Python Packages: python2.3 python2.3-dev</li>
							<li>Recommended Packages: python2.3-mysqldb python2.3-sqlite python2.3-xml libsqlite0 libsqlite0-dev sqlite sqlite-doc</li>
							<li>MySQL Packages: libmysqlclient-dev libmysqlclient12 mysql-client mysql-common mysql-server</li>
						</ul>
						<br /><br />
						Compiling Instructions:<br />
						<div class="bash">
							tar xvfj wolfpack.tar.bz2 -C ./<br />
							cd wolfpack_source_dir/<br />
							chmod +x configure<br />
							./configure --help<br />
							# Please read the options and use those that apply to you.<br />
							# Running configure should auto detect most options. <br />
							./configure --enable-debug --enable-mysql<br />
							# At this point you can edit Makefile and add optional CFLAGS<br />
							# I personally add -march=athlon -03<br />
							make<br />
							# Grab a snack while it compiles.
						</div>
						<br /><br />
						<span style="font-weight:bold;">Python Warning</span><br />
						Python-2.3 on many distributions comes compiled using UCS4 for Unicode. Wolfpack currently requires
						that Python-2.3 be compiled with UCS2 for Unicode. If this is the case, you will need to download and
						manually compile Python-2.3 and add the --enable-unicode=ucs2 --enable-shared to the ./configure arguments. After this you can install this Python-2.3 to your /usr/local/ directory or anywhere else.
						Please be sure to put this new python path in the Wolfpack configure arguments!<br />
						<br /><br />
						Python Fix / Compiling Instructions:<br />
						<div class="bash">
							# Compiling/Installing Python-2.3.x
							tar xvjf Python-2.3.4.tar.bz2 -C ./<br />
							cd python_source_dir/<br />
							# Please note the --enable-shared and --enable-unicode=ucs2<br />
							./configure --prefix=/usr/local --enable-unicode=ucs2 --enable-shared<br />
							make<br />
							su root<br />
							make install<br />
							exit<br />
							<br />
							# Compiling Wolfpack 13.x.x
							tar xvfj wolfpack.tar.bz2 -C ./<br />
							cd wolfpack_source_dir/<br />
							chmod +x configure<br />
							./configure --help<br />
							# Please read the options and use those that apply to you.<br />
							# Running configure should auto detect most options. <br />
							./configure --enable-debug --enable-mysql<br />
							# At this point you can edit Makefile and add optional CFLAGS<br />
							# I personally add -march=athlon -03<br />
							make<br />
							# Grab a snack while it compiles.
						</div>
					</div>
				</li>
				<!-- Answer 07 -->
				<li><a name="07" class="question">How do I compile Wolfpack under BSD?</a>
					<div class="answer">
						Compiling Instructions:<br />
						<div class="bash">
							tar xvfj wolfpack.tar.bz2 -C ./<br />
							cd wolfpack_source_dir/<br />
							chmod +x configure<br />
							./configure --help<br />
							# Please read the options and use those that apply to you.<br />
							# Running configure should auto detect most options. <br />
							./configure --enable-debug --enable-mysql<br />
							# At this point you can edit Makefile and add optional CFLAGS<br />
							# I, Dreoth, personally add -march=athlon -03<br />
							make<br />
							# Grab a snack while it compiles.
						</div>
						<br /><br />
					</div>
				</li>
				<!-- Answer 08 -->
				<li><a name="08" class="question">Can I use the world files for previous Wolfpack versions?</a>
					<div class="answer">
						The simple answer for this is <span style="font-weight:bold;">no</span>.<br />
						<ul>
						<li>Wolfpack 13.x.x no longer uses or supports the old WSC save system. This has been replaced with
						a database save system.</li>
						<li>Wolfpack 13.x.x will use spawn scripts for filling in NPCs and there are commands available
						for adding missing world objects.</li>
						</ul>
						<br />
						However, if you do wish to try and use it there is an
						<a href="http://www.wpdev.org/docs/command.php?name=IMPORT">import</a>
						command which supports WSC/TXT/Sphere save formats. Please note this will NOT import NPCs!<br />
						It is recommended that you look into using the
						<a href="http://www.wpdev.org/docs/command.php?name=DECORATION">decoration</a>
						command as an alternative to using import.
					</div>
				</li>
				<!-- Answer 09 -->
				<li><a name="09" class="question">Where can I find documentation?</a>
					<div class="answer">
						You can find Wolfpack documentation at: <a href="http://www.wpdev.org/docs/">http://www.wpdev.org/docs/</a><br />
						You can find Python documentation at: <a href="http://python.org/doc/2.3.4/">http://python.org/doc/2.3.4/</a>
					</div>
				</li>
				<!-- Answer 10 -->
				<li><a name="10" class="question">Help! I get unicode errors with my python scripts!</a>
					<div class="answer">
						This problem is mostly common with Linux/BSD. Python-2.3 on many distributions comes compiled
						using UCS4 for Unicode. Wolfpack currently requires that Python-2.3 be compiled with UCS2 for
						Unicode. If this is the case, you will need to download and manually compile Python-2.3 and add the
						`--enable-unicode=ucs2 --enable-shared` to the ./configure arguments. After this you can install this
						Python-2.3 to your /usr/local/ directory or anywhere else. Please be sure to put this new python path
						in the Wolfpack configure arguments!<br />
						<br />
						For information reguarding compiling, please check out:<br />
						<ul>
							<li><a href="#06">Linux Compile Guide</a></li>
							<li><a href="#07">BSD Compile Guide</a></li>
						</ul>
					</div>
				</li>
				<!-- Answer 11 -->
				<li><a  name="11" class="question">I found a bug! What can I do?</a>
					<div class="answer">
						Before anything, we recommend that you check the bug tracker to see if it has already been reported.<br />
						If you find a new bug there are a few things you can do:<br />
						<ul>
							<li>You can report the bug at: <a href="http://bugs.wpdev.org/">http://bugs.wpdev.org/</a></li>
							<li>You can contact a developer by Email/IRC/IM</li>
							<li>You can check the sourceforge mailing lists.</li>
						</ul>
					</div>
				</li>
				<!-- Answer 12 -->
				<li><a  name="12" class="question">I wrote some scripts that were missing! What can I do with it?</a>
					<div class="answer">
					First of all, we are trying to conform to an OSI like world. So please check that your creation(s) are along
					those requirements.<br />
					If so, then there are a few things you can do:<br />
						<ul>
							<li>You can contact a developer by Email/IRC/IM</li>
							<li>You can check the sourceforge mailing lists.</li>
						</ul>
						<br />
						We try our best to give credit where it is due. If we receive contributions from non developers we
						will generally include comments about the author. :)
					</div>
				</li>
				<!-- Answer 13 -->
				<li><a  name="13" class="question">Where can I find the latest CVS Snapshots?</a>
					<div class="answer">
						You can find the latest CVS snapshots at:
						<a href="http://wpdev.sourceforge.net/snapshots/">http://wpdev.sourceforge.net/snapshots/</a>
					</div>
				</li>
			</ul>
		</div>
	</body>
</html>

[wpdev-commits] xmlscripts FAQ.html,1.2,NONE

From: Richard M. <dr...@us...> - 2004-06-18 21:49:42

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

Removed Files:
	FAQ.html 
Log Message:
Moved into documentation


--- FAQ.html DELETED ---

[wpdev-commits] xmlscripts FAQ.html,1.1,1.2

From: Richard M. <dr...@us...> - 2004-06-17 18:44:23

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

Modified Files:
	FAQ.html 
Log Message:
Updated the FAQ a bit.


Index: FAQ.html
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/FAQ.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FAQ.html	17 Jun 2004 02:19:50 -0000	1.1
--- FAQ.html	17 Jun 2004 18:44:02 -0000	1.2
***************
*** 23,29 ****
--- 23,31 ----
  		a:link, a:visited {
  			color: #dae9a1;
+ 			text-decoration: none;
  		}
  		a:hover {
  			color: #e3f3a8;
+ 			text-decoration: underline;
  		}
  		img {
***************
*** 112,115 ****
--- 114,124 ----
  			text-decoration: normal;
  		}
+ 		div.bash {
+ 			margin-left: 1em;
+ 			margin-bottom: 0.25em;
+ 			margin-top: 0.25em;
+ 			font-size: 10pt;
+ 			font-family: Fixed, Arial;
+ 		}
  		-->
  		</style>
***************
*** 129,132 ****
--- 138,142 ----
  		</div>
  		<br />
+ 		<!-- QUESTIONS -->
  		<div class="toc">
  			<span style="font-size:18px;font-style:italic">Wolfpack 13.0.0</span><br />
***************
*** 144,156 ****
  				<li><a href="#08">Can I use the world files for previous Wolfpack versions?</a></li>
  				<li><a href="#09">Where can I find documentation?</a></li>
  			</ul>
  		</div>
! 		<br />
! 		<hr />
! 		<br />
  		<div class="faq">
  			<br />
  			Answers<br />
  			<ul class="faq">
  				<li><a name="01" class="question">What is new in Wolfpack 13.x.x?</a>
  					<div class="answer">
--- 154,170 ----
  				<li><a href="#08">Can I use the world files for previous Wolfpack versions?</a></li>
  				<li><a href="#09">Where can I find documentation?</a></li>
+ 				<li><a href="#10">Help! I get unicode errors with my python scripts!</a></li>
+ 				<li><a href="#11">I found a bug! What can I do?</a></li>
+ 				<li><a href="#12">I wrote some scripts that were missing! What can I do with it?</a></li>
+ 				<li><a href="#13">Where can I find the latest CVS Snapshots?</a></li>
  			</ul>
  		</div>
! 		<br /><hr /><br />
! 		<!-- ANSWERS -->
  		<div class="faq">
  			<br />
  			Answers<br />
  			<ul class="faq">
+ 				<!-- Answer 01 -->
  				<li><a name="01" class="question">What is new in Wolfpack 13.x.x?</a>
  					<div class="answer">
***************
*** 166,169 ****
--- 180,184 ----
  					</div>
  				</li>
+ 				<!-- Answer 02 -->
  				<li><a name="02" class="question">What platforms are supported?</a>
  					<div class="answer">
***************
*** 176,179 ****
--- 191,195 ----
  					</div>
  				</li>
+ 				<!-- Answer 03 -->
  				<li><a name="03" class="question">What are the system hardware requirements?</a>
  					<div class="answer">
***************
*** 197,200 ****
--- 213,217 ----
  					</div>
  				</li>
+ 				<!-- Answer 04 -->
  				<li><a name="04" class="question">What needs to be installed to use Wolfpack?</a>
  					<div class="answer">
***************
*** 213,228 ****
--- 230,324 ----
  					</div>
  				</li>
+ 				<!-- Answer 05 -->
  				<li><a name="05" class="question">How do I compile Wolfpack under Windows?</a>
  					<div class="answer">
  					</div>
  				</li>
+ 				<!-- Answer 06 -->
  				<li><a name="06" class="question">How do I compile Wolfpack under Linux?</a>
  					<div class="answer">
+ 						First you need the latest QT-3.3.x release for your linux distribution.<br />
+ 						You will also need the dev package for this version of QT.<br />
+ 						Note: Most distributions use libqt3-mt and libqt3-mt-dev for package names.<br />
+ 						<br />
+ 						Distribution Notes<br /><br />
+ 						Debian:<br />
+ 						<ul>
+ 							<li>Recommended that you use Debian Unstable for latest packages.</li>
+ 							<li>QT3 Packages: libqt3c102-mt libqt3-mt-dev libqt3-headers qt3-dev-tools</li>
+ 							<li>Python Packages: python2.3 python2.3-dev</li>
+ 							<li>Recommended Packages: python2.3-mysqldb python2.3-sqlite python2.3-xml libsqlite0 libsqlite0-dev sqlite sqlite-doc</li>
+ 							<li>MySQL Packages: libmysqlclient-dev libmysqlclient12 mysql-client mysql-common mysql-server</li>
+ 						</ul>
+ 						<br /><br />
+ 						Compiling Instructions:<br />
+ 						<div class="bash">
+ 							tar xvfj wolfpack.tar.bz2 -C ./<br />
+ 							cd wolfpack_source_dir/<br />
+ 							chmod +x configure<br />
+ 							./configure --help<br />
+ 							# Please read the options and use those that apply to you.<br />
+ 							# Running configure should auto detect most options. <br />
+ 							./configure --enable-debug --enable-mysql<br />
+ 							# At this point you can edit Makefile and add optional CFLAGS<br />
+ 							# I personally add -march=athlon -03<br />
+ 							make<br />
+ 							# Grab a snack while it compiles.
+ 						</div>
+ 						<br /><br />
+ 						<span style="font-weight:bold;">Python Warning</span><br />
+ 						Python-2.3 on many distributions comes compiled using UCS4 for Unicode. Wolfpack currently requires
+ 						that Python-2.3 be compiled with UCS2 for Unicode. If this is the case, you will need to download and
+ 						manually compile Python-2.3 and add the --enable-unicode=ucs2 --enable-shared to the ./configure arguments. After this you can install this Python-2.3 to your /usr/local/ directory or anywhere else.
+ 						Please be sure to put this new python path in the Wolfpack configure arguments!<br />
+ 						<br /><br />
+ 						Python Fix / Compiling Instructions:<br />
+ 						<div class="bash">
+ 							# Compiling/Installing Python-2.3.x
+ 							tar xvjf Python-2.3.4.tar.bz2 -C ./<br />
+ 							cd python_source_dir/<br />
+ 							# Please note the --enable-shared and --enable-unicode=ucs2<br />
+ 							./configure --prefix=/usr/local --enable-unicode=ucs2 --enable-shared<br />
+ 							make<br />
+ 							su root<br />
+ 							make install<br />
+ 							exit<br />
+ 							<br />
+ 							# Compiling Wolfpack 13.x.x
+ 							tar xvfj wolfpack.tar.bz2 -C ./<br />
+ 							cd wolfpack_source_dir/<br />
+ 							chmod +x configure<br />
+ 							./configure --help<br />
+ 							# Please read the options and use those that apply to you.<br />
+ 							# Running configure should auto detect most options. <br />
+ 							./configure --enable-debug --enable-mysql<br />
+ 							# At this point you can edit Makefile and add optional CFLAGS<br />
+ 							# I personally add -march=athlon -03<br />
+ 							make<br />
+ 							# Grab a snack while it compiles.
+ 						</div>
  					</div>
  				</li>
+ 				<!-- Answer 07 -->
  				<li><a name="07" class="question">How do I compile Wolfpack under BSD?</a>
  					<div class="answer">
+ 						Compiling Instructions:<br />
+ 						<div class="bash">
+ 							tar xvfj wolfpack.tar.bz2 -C ./<br />
+ 							cd wolfpack_source_dir/<br />
+ 							chmod +x configure<br />
+ 							./configure --help<br />
+ 							# Please read the options and use those that apply to you.<br />
+ 							# Running configure should auto detect most options. <br />
+ 							./configure --enable-debug --enable-mysql<br />
+ 							# At this point you can edit Makefile and add optional CFLAGS<br />
+ 							# I, Dreoth, personally add -march=athlon -03<br />
+ 							make<br />
+ 							# Grab a snack while it compiles.
+ 						</div>
+ 						<br /><br />
  					</div>
  				</li>
+ 				<!-- Answer 08 -->
  				<li><a name="08" class="question">Can I use the world files for previous Wolfpack versions?</a>
  					<div class="answer">
***************
*** 243,246 ****
--- 339,343 ----
  					</div>
  				</li>
+ 				<!-- Answer 09 -->
  				<li><a name="09" class="question">Where can I find documentation?</a>
  					<div class="answer">
***************
*** 249,252 ****
--- 346,400 ----
  					</div>
  				</li>
+ 				<!-- Answer 10 -->
+ 				<li><a name="10" class="question">Help! I get unicode errors with my python scripts!</a>
+ 					<div class="answer">
+ 						This problem is mostly common with Linux/BSD. Python-2.3 on many distributions comes compiled
+ 						using UCS4 for Unicode. Wolfpack currently requires that Python-2.3 be compiled with UCS2 for
+ 						Unicode. If this is the case, you will need to download and manually compile Python-2.3 and add the
+ 						`--enable-unicode=ucs2 --enable-shared` to the ./configure arguments. After this you can install this
+ 						Python-2.3 to your /usr/local/ directory or anywhere else. Please be sure to put this new python path
+ 						in the Wolfpack configure arguments!<br />
+ 						<br />
+ 						For information reguarding compiling, please check out:<br />
+ 						<ul>
+ 							<li><a href="#06">Linux Compile Guide</a></li>
+ 							<li><a href="#07">BSD Compile Guide</a></li>
+ 						</ul>
+ 					</div>
+ 				</li>
+ 				<!-- Answer 11 -->
+ 				<li><a  name="11" class="question">I found a bug! What can I do?</a>
+ 					<div class="answer">
+ 						Before anything, we recommend that you check the bug tracker to see if it has already been reported.<br />
+ 						If you find a new bug there are a few things you can do:<br />
+ 						<ul>
+ 							<li>You can report the bug at: <a href="http://bugs.wpdev.org/">http://bugs.wpdev.org/</a></li>
+ 							<li>You can contact a developer by Email/IRC/IM</li>
+ 							<li>You can check the sourceforge mailing lists.</li>
+ 						</ul>
+ 					</div>
+ 				</li>
+ 				<!-- Answer 12 -->
+ 				<li><a  name="12" class="question">I wrote some scripts that were missing! What can I do with it?</a>
+ 					<div class="answer">
+ 					First of all, we are trying to conform to an OSI like world. So please check that your creation(s) are along
+ 					those requirements.<br />
+ 					If so, then there are a few things you can do:<br />
+ 						<ul>
+ 							<li>You can contact a developer by Email/IRC/IM</li>
+ 							<li>You can check the sourceforge mailing lists.</li>
+ 						</ul>
+ 						<br />
+ 						We try our best to give credit where it is due. If we receive contributions from non developers we
+ 						will generally include comments about the author. :)
+ 					</div>
+ 				</li>
+ 				<!-- Answer 13 -->
+ 				<li><a  name="13" class="question">Where can I find the latest CVS Snapshots?</a>
+ 					<div class="answer">
+ 						You can find the latest CVS snapshots at:
+ 						<a href="http://wpdev.sourceforge.net/snapshots/">http://wpdev.sourceforge.net/snapshots/</a>
+ 					</div>
+ 				</li>
  			</ul>
  		</div>

[wpdev-commits] xmlscripts FAQ.html,NONE,1.1

From: Richard M. <dr...@us...> - 2004-06-17 02:19:58

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

Added Files:
	FAQ.html 
Log Message:
Created a F.A.Q. page that should be useful to people.


--- NEW FILE: FAQ.html ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
		<title>Wolfpack 13.0.0 F.A.Q.</title>
		<base href="./" />
		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
		<style type="text/css">
		<!--
		body {
			background-color: #004025;
			font-family: Arial, Helvetica, sans-serif;
			font-size: 12px;
			font-style: normal;
			font-weight: normal;
			font-variant: normal;
			text-transform: none;
			color: #ffffff;
			text-align: left;
			margin: 0px;
			text-decoration: none;
		}
		a:link, a:visited {
			color: #dae9a1;
		}
		a:hover {
			color: #e3f3a8;
		}
		img {
			border: 0px;
			border-color: none;
		}
		div {
			text-decoration: none;
			font-style: none;
			font-weight: normal;
		}
		div.header {
			width: 586px;
			height: 87px;
			width: 100%;
			text-align: left;
		}
		div.navbar {
			background-image: url("web/top_bg.png");
			width: 783px;
			text-align: left;
			height: 60px;
		}
		table.navigation {
			border: none;
			margin: 0px;
			padding: 0px;
			text-align: left;
			width: 783px;
			height: 60px;
			vertical-align: top;
		}
		td.navigation1, td.navigation2, td.navigation3 {
			color: #000000;
			text-align: left;
			vertical-align: top;
		}
		td.navigation1 {
			height: 20px;
			width: 783px;
			vertical-align: top;
		}
		td.navigation2 {
			height: 19px;
			width: 634px;
		}
		td.navigation3 {
			height: 19px;
			width: 149px;
			text-align: center;
		}
		div.toc, div.faq {
			text-align: left;
			margin-left: 1em;
			font-size: 16px;
			font-weight: bold;
		}
		div.faq {
			margin-bottom: 3em;
		}
		hr {
			border-color: #e3f3a8;
			border-style: thin inset;
			width: 750px;
			margin-left: 1em;
			margin-top: 0.75em;
			margin-bottom: 0.75em;
			float: left;
		}
		ul.toc {
			list-style-type: decimal-leading-zero;
			font-weight: normal;
		}
		ul.faq {
			font-weight: normal;
			list-style-type: decimal-leading-zero;
		}
		a.question {
			text-decoration: underline;
		}
		div.answer {
			margin-left: 1em;
			margin-bottom: 1em;
			margin-top: 0.5em;
			color: #ffffff;
			text-decoration: normal;
		}
		-->
		</style>
	</head>
	<body>
		<div class="header"><img src="web/top_logo.jpg" style="width:586px;height:87px;" alt="" /></div>
		<div class="navbar">
			<table class="navigation">
				<tr>
					<td class="navigation1" colspan="2">&#160;Wolfpack 13.0.0 Frequently Asked Questions</td>
				</tr>
				<tr>
					<td class="navigation2"></td>
					<td class="navigation3"></td>
				</tr>
			</table>
		</div>
		<br />
		<div class="toc">
			<span style="font-size:18px;font-style:italic">Wolfpack 13.0.0</span><br />
			Frequently Asked Questions<br />
			<br />
			Table of Contents
			<ul class="toc">
				<li><a href="#01">What is new in Wolfpack 13.x.x?</a></li>
				<li><a href="#02">What platforms are supported?</a></li>
				<li><a href="#03">What are the system hardware requirements?</a></li>
				<li><a href="#04">What needs to be installed to use Wolfpack?</a></li>
				<li><a href="#05">How do I compile Wolfpack under Windows?</a></li>
				<li><a href="#06">How do I compile Wolfpack under Linux?</a></li>
				<li><a href="#07">How do I compile Wolfpack under BSD?</a></li>
				<li><a href="#08">Can I use the world files for previous Wolfpack versions?</a></li>
				<li><a href="#09">Where can I find documentation?</a></li>
			</ul>
		</div>
		<br />
		<hr />
		<br />
		<div class="faq">
			<br />
			Answers<br />
			<ul class="faq">
				<li><a name="01" class="question">What is new in Wolfpack 13.x.x?</a>
					<div class="answer">
						There are many new things in Wolfpack 13.x.x<br />
						A small list of what's new:<br />
						<ul>
							<li>A new database world save format, <a href="http://www.sqlite.org/">SQLite</a> and <a href="http://www.mysql.org/">MySQL</a>.</li>
							<li>A new scripting engine powered by <a href="http://www.python.org/">Python 2.3</a>.</li>
							<li>A new XML data storage to replace the old SCP system.</li>
							<li>Latest client support for versions such as Age of Shadows.</li>
							<li>Client Encryption Support</li>
						</ul>
					</div>
				</li>
				<li><a name="02" class="question">What platforms are supported?</a>
					<div class="answer">
						Confirmed supported platforms include:<br />
						<ul>
							<li>Windows</li>
							<li>Linux</li>
							<li>BSD</li>
						</ul>
					</div>
				</li>
				<li><a name="03" class="question">What are the system hardware requirements?</a>
					<div class="answer">
						While this remains currently untested, here are some recommendations.<br />
						<br />
						Minimum:<br />
						<ul>
							<li>128 MB of RAM.</li>
							<li>A processor of at least 400mhz.</li>
							<li>At least 250 MB of free hard drive space.</li>
						</ul>
						<br />
						Recommended:<br />
						<ul>
							<li>256 MB of RAM or greater.</li>
							<li>A processor of at least 800mhz.</li>
							<li>At least 500 MB of free hard drive space.</li>
						</ul>
						<br />
						Naturally, the better your hardware the better your server's performance will be.
					</div>
				</li>
				<li><a name="04" class="question">What needs to be installed to use Wolfpack?</a>
					<div class="answer">
						There are two things you should install and run Wolfpack 13.x.x.<br />
						<br />
						For Windows:<br />
						<ul>
							<li><a href="http://python.org/2.3.4/">The Latest Python-2.3 Release</a>.</li>
						</ul>
						<br />
						For Linux/BSD:<br />
						<ul>
							<li><a href="http://www.trolltech.com/download/qt/x11.html">The Latest QT-3.3 Release</a>.</li>
							<li><a href="http://python.org/2.3.4/">The Latest Python-2.3 Release</a>.</li>
						</ul>
					</div>
				</li>
				<li><a name="05" class="question">How do I compile Wolfpack under Windows?</a>
					<div class="answer">
					</div>
				</li>
				<li><a name="06" class="question">How do I compile Wolfpack under Linux?</a>
					<div class="answer">
					</div>
				</li>
				<li><a name="07" class="question">How do I compile Wolfpack under BSD?</a>
					<div class="answer">
					</div>
				</li>
				<li><a name="08" class="question">Can I use the world files for previous Wolfpack versions?</a>
					<div class="answer">
						The simple answer for this is <span style="font-weight:bold;">no</span>.<br />
						<ul>
						<li>Wolfpack 13.x.x no longer uses or supports the old WSC save system. This has been replaced with
						a database save system.</li>
						<li>Wolfpack 13.x.x will use spawn scripts for filling in NPCs and there are commands available
						for adding missing world objects.</li>
						</ul>
						<br />
						However, if you do wish to try and use it there is an
						<a href="http://www.wpdev.org/docs/command.php?name=IMPORT">import</a>
						command which supports WSC/TXT/Sphere save formats. Please note this will NOT import NPCs!<br />
						It is recommended that you look into using the
						<a href="http://www.wpdev.org/docs/command.php?name=DECORATION">decoration</a>
						command as an alternative to using import.
					</div>
				</li>
				<li><a name="09" class="question">Where can I find documentation?</a>
					<div class="answer">
						You can find Wolfpack documentation at: <a href="http://www.wpdev.org/docs/">http://www.wpdev.org/docs/</a><br />
						You can find Python documentation at: <a href="http://python.org/doc/2.3.4/">http://python.org/doc/2.3.4/</a>
					</div>
				</li>
			</ul>
		</div>
	</body>
</html>

[wpdev-commits] xmlscripts/scripts/system debugging.py,NONE,1.1 skillgain.py,1.5,1.6 spawns.py,1.3,1.4 webadmin.py,1.4,1.5

From: Richard M. <dr...@us...> - 2004-06-16 20:18:52

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

Modified Files:
	skillgain.py spawns.py webadmin.py 
Added Files:
	debugging.py 
Log Message:
Added a debugging file for setting debug options.


Index: webadmin.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/webadmin.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** webadmin.py	26 May 2004 18:49:27 -0000	1.4
--- webadmin.py	16 Jun 2004 20:18:43 -0000	1.5
***************
*** 22,25 ****
--- 22,27 ----
  import wolfpack.console
  
+ WEBADMIN_LOGGING = 1
+ 
  # Just override handle_error for nicer error handling
  class Webserver( HTTPServer ):
***************
*** 108,112 ****
  			path = os.path.join(path, word)
  
! 		if bad_uri:
  			self.log_error("Detected bad request URI '%s', translated to '%s'" % (uri, path,))
  
--- 110,114 ----
  			path = os.path.join(path, word)
  
! 		if bad_uri and WEBADMIN_LOGGING == 1:
  			self.log_error("Detected bad request URI '%s', translated to '%s'" % (uri, path,))
  
***************
*** 140,144 ****
  		if not ispy:
  			self.send_error(403, "CGI script is not a Python script (%s)" % `scriptname`)
! 			return		
  
  		# Reference: http://hoohoo.ncsa.uiuc.edu/cgi/env.html
--- 142,146 ----
  		if not ispy:
  			self.send_error(403, "CGI script is not a Python script (%s)" % `scriptname`)
! 			return
  
  		# Reference: http://hoohoo.ncsa.uiuc.edu/cgi/env.html
***************
*** 205,210 ****
  					sys.argv.append(decoded_query)
  				sys.stdout = self.wfile
! 				sys.stdin = self.rfile			
! 				execfile(scriptfile, {"__name__": "__main__"})			
  				sys.stdout.flush()
  			finally:
--- 207,212 ----
  					sys.argv.append(decoded_query)
  				sys.stdout = self.wfile
! 				sys.stdin = self.rfile
! 				execfile(scriptfile, {"__name__": "__main__"})
  				sys.stdout.flush()
  			finally:
***************
*** 214,222 ****
  				sys.stdout = save_stdout
  				sys.stderr = save_stderr
! 				raise		
  		except SystemExit, sts:
! 			self.log_error("CGI script exit status %s", str(sts))
  		else:
! 			self.log_message("CGI script exited OK")
  
  	def log_message( self, format, *args ):
--- 216,226 ----
  				sys.stdout = save_stdout
  				sys.stderr = save_stderr
! 				raise
  		except SystemExit, sts:
! 			if WEBADMIN_LOGGING == 1:
! 				self.log_error("CGI script exit status %s", str(sts))
  		else:
! 			if WEBADMIN_LOGGING == 1:
! 				self.log_message("CGI script exited OK")
  
  	def log_message( self, format, *args ):

Index: spawns.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/spawns.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spawns.py	26 May 2004 13:07:26 -0000	1.3
--- spawns.py	16 Jun 2004 20:18:43 -0000	1.4
***************
*** 6,9 ****
--- 6,10 ----
  import time
  import random
+ from system.debugging import DEBUG_SPAWNS
  
  #
***************
*** 68,72 ****
        self.unprocessed = self.unprocessed[100:]
  
!       #console.log(LOG_MESSAGE, "Found %u spawn items." % len(process))
  
        # Process the designated partition
--- 69,74 ----
        self.unprocessed = self.unprocessed[100:]
  
!       if DEBUG_SPAWNS == 1:
!         console.log(LOG_MESSAGE, "Found %u spawn items." % len(process))
  
        # Process the designated partition
***************
*** 82,86 ****
  
          if not valid:
!           #console.log(LOG_WARNING, "Invalid spawn item: 0x%x.\n" % item.serial)
            pass
          else:
--- 84,89 ----
  
          if not valid:
!           if DEBUG_SPAWNS == 1:
!             console.log(LOG_WARNING, "Invalid spawn item: 0x%x.\n" % item.serial)
            pass
          else:
***************
*** 155,160 ****
              item.deltag('nextspawn')
  
!           #console.log(LOG_MESSAGE, "Valid Spawnpoint: %x, Cur/Max: %u/%u, Def: %s, Type: %u, Interval: %u,%u, Time: %d/%d" % \
!           #  (item.serial, current, maximum, spawndef, spawntype, mininterval, maxinterval, nextspawn, currenttime))
  
        self.processed += process
--- 158,164 ----
              item.deltag('nextspawn')
  
!           if DEBUG_SPAWNS == 1:
!             console.log(LOG_MESSAGE, "Valid Spawnpoint: %x, Cur/Max: %u/%u, Def: %s, Type: %u, Interval: %u,%u, Time: %d/%d" % \
!               (item.serial, current, maximum, spawndef, spawntype, mininterval, maxinterval, nextspawn, currenttime))
  
        self.processed += process

--- NEW FILE: debugging.py ---
#
# This is a list of debugging settings.
# False = 0
# True = 1

DEBUG_COMBAT_INFO = 0

DEBUG_SPAWNS = 0

DEBUG_STATS = 0
DEBUG_SKILLS = 0


Index: skillgain.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/skillgain.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** skillgain.py	26 May 2004 13:07:26 -0000	1.5
--- skillgain.py	16 Jun 2004 20:18:43 -0000	1.6
***************
*** 5,8 ****
--- 5,9 ----
  from random import random, randint, choice
  from wolfpack import settings
+ from system.debugging import DEBUG_STATS, DEBUG_SKILLS
  
  #
***************
*** 59,69 ****
            char.maxhitpoints -= 1
          char.updatehealth()
!         char.log(LOG_TRACE, 'Character [%x] lost one point of strength [%u].\n' % (char.serial, char.strength))
        elif lower == 1:
          char.dexterity -= 1
!         char.log(LOG_TRACE, 'Character [%x] lost one point of dexterity [%u].\n' % (char.serial, char.dexterity))
        elif lower == 2:
          char.intelligence -= 1
!         char.log(LOG_TRACE, 'Character [%x] lost one point of intelligence [%u].\n' % (char.serial, char.intelligence))
        totalstats -= 1
        resendstats = 1
--- 60,73 ----
            char.maxhitpoints -= 1
          char.updatehealth()
!         if DEBUG_STATS == 1:
!           char.log(LOG_TRACE, 'Character [%x] lost one point of strength [%u].\n' % (char.serial, char.strength))
        elif lower == 1:
          char.dexterity -= 1
!         if DEBUG_STATS == 1:
!           char.log(LOG_TRACE, 'Character [%x] lost one point of dexterity [%u].\n' % (char.serial, char.dexterity))
        elif lower == 2:
          char.intelligence -= 1
!         if DEBUG_STATS == 1:
!           char.log(LOG_TRACE, 'Character [%x] lost one point of intelligence [%u].\n' % (char.serial, char.intelligence))
        totalstats -= 1
        resendstats = 1
***************
*** 78,88 ****
        if char.npc:
          char.maxhitpoints += 1
!       char.log(LOG_TRACE, 'Character [%x] gained one point of strength [%u].\n' % (char.serial, char.strength))
      elif stat == 1:
        char.dexterity += 1
!       char.log(LOG_TRACE, 'Character [%x] gained one point of dexterity [%u].\n' % (char.serial, char.dexterity))
      elif stat == 2:
        char.intelligence += 1
!       char.log(LOG_TRACE, 'Character [%x] gained one point of intelligence [%u].\n' % (char.serial, char.intelligence))
      resendstats = 1
  
--- 82,95 ----
        if char.npc:
          char.maxhitpoints += 1
!       if DEBUG_STATS == 1:
!         char.log(LOG_TRACE, 'Character [%x] gained one point of strength [%u].\n' % (char.serial, char.strength))
      elif stat == 1:
        char.dexterity += 1
!       if DEBUG_STATS == 1:
!         char.log(LOG_TRACE, 'Character [%x] gained one point of dexterity [%u].\n' % (char.serial, char.dexterity))
      elif stat == 2:
        char.intelligence += 1
!       if DEBUG_STATS == 1:
!         char.log(LOG_TRACE, 'Character [%x] gained one point of intelligence [%u].\n' % (char.serial, char.intelligence))
      resendstats = 1
  
***************
*** 117,121 ****
            totalskill -= points
  
!           char.log(LOG_TRACE, 'Character [%x] lost %0.01f%% of %s [%02.01f%%].\n' % (char.serial, points, SKILLS[i][SKILL_NAME], char.skill[i] / 10.0))
  
            if char.socket:
--- 124,129 ----
            totalskill -= points
  
!           if DEBUG_SKILLS == 1:
!             char.log(LOG_TRACE, 'Character [%x] lost %0.01f%% of %s [%02.01f%%].\n' % (char.serial, points, SKILLS[i][SKILL_NAME], char.skill[i] / 10.0))
  
            if char.socket:
***************
*** 129,133 ****
        char.skill[skill] += int(points * 10)
        totalskill += points
!       char.log(LOG_TRACE, 'Character [%x] gained %0.01f%% of %s [%02.01f%%].\n' % (char.serial, points, info[SKILL_NAME], char.skill[skill] / 10.0))
  
        if char.socket:
--- 137,142 ----
        char.skill[skill] += int(points * 10)
        totalskill += points
!       if DEBUG_SKILLS == 1:
!         char.log(LOG_TRACE, 'Character [%x] gained %0.01f%% of %s [%02.01f%%].\n' % (char.serial, points, info[SKILL_NAME], char.skill[skill] / 10.0))
  
        if char.socket:

[wpdev-commits] xmlscripts/scripts/combat __init__.py,1.11,1.12 aos.py,1.13,1.14

From: Richard M. <dr...@us...> - 2004-06-16 20:18:52

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

Modified Files:
	__init__.py aos.py 
Log Message:
Added a debugging file for setting debug options.


Index: aos.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/aos.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** aos.py	26 May 2004 13:07:20 -0000	1.13
--- aos.py	16 Jun 2004 20:18:43 -0000	1.14
***************
*** 7,12 ****
  import random
  from math import floor, ceil
! 
! DEBUG = 0 # Turn off to turn off debug messages
  
  #
--- 7,11 ----
  import random
  from math import floor, ceil
! from system.debugging import DEBUG_COMBAT_INFO
  
  #
***************
*** 182,188 ****
  		energy = 0
  		if weapon:
! 			char.log(LOG_WARNING, "Character is using broken weapon (0x%x) with wrong damage types.\n" % weapon.serial)
  		else:
! 			char.log(LOG_WARNING, "NPC (0x%x) has wrong damage types.\n" % char.serial)
  
  	physical = 100 - (fire + cold + poison + energy)
--- 181,189 ----
  		energy = 0
  		if weapon:
! 			if DEBUG_COMBAT_INFO == 1:
! 				char.log(LOG_WARNING, "Character is using broken weapon (0x%x) with wrong damage types.\n" % weapon.serial)
  		else:
! 			if DEBUG_COMBAT_INFO == 1:
! 				char.log(LOG_WARNING, "NPC (0x%x) has wrong damage types.\n" % char.serial)
  
  	physical = 100 - (fire + cold + poison + energy)

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/__init__.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** __init__.py	23 Apr 2004 19:12:36 -0000	1.11
--- __init__.py	16 Jun 2004 20:18:43 -0000	1.12
***************
*** 4,9 ****
  import combat.aos
  from wolfpack import properties
! 
! DEBUG = 0
  
  #
--- 4,8 ----
  import combat.aos
  from wolfpack import properties
! from system.debugging import DEBUG_COMBAT_INFO
  
  #
***************
*** 35,39 ****
  		defender.fight(attacker)
  
! 	if DEBUG:
  		attacker.log(LOG_PYTHON, "Swing from 0x%x at 0x%x\n" % (defender.serial, attacker.serial))
  
--- 34,38 ----
  		defender.fight(attacker)
  
! 	if DEBUG_COMBAT_INFO == 1:
  		attacker.log(LOG_PYTHON, "Swing from 0x%x at 0x%x\n" % (defender.serial, attacker.serial))

[wpdev-commits] xmlscripts/scripts/system mysql_optimize_db.py,1.5,1.6

From: Richard M. <dr...@us...> - 2004-06-16 19:29:44

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

Modified Files:
	mysql_optimize_db.py 
Log Message:


Index: mysql_optimize_db.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/mysql_optimize_db.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mysql_optimize_db.py	14 Jun 2004 17:59:17 -0000	1.5
--- mysql_optimize_db.py	16 Jun 2004 19:29:35 -0000	1.6
***************
*** 45,48 ****
--- 45,52 ----
  		wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [] )
  		wolfpack.registercommand( "optimizedb", cmdoptimizedb )
+ 	return
+ 
+ def onUnload():
+ 	return
  
  def cmdoptimizedb( socket, command, arguments ):
***************
*** 51,55 ****
  		optimize_db()
  		socket.sysmessage( "Done!", GRAY )
! 		return
  
  def timer( timer, args ):
--- 55,59 ----
  		optimize_db()
  		socket.sysmessage( "Done!", GRAY )
! 	return
  
  def timer( timer, args ):
***************
*** 58,67 ****
  		optimize_db()
  		wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [] )
! 		return
  
  def optimize_db():
  	if accountsdriver == mysql or worlddriver == mysql:
  		try:
- 			# What are we optimizing
  			if accountsdriver == mysql and worlddriver == mysql:
  				log( LOG_MESSAGE, "MySQL: Optimizing accounts and world databases..." )
--- 62,71 ----
  		optimize_db()
  		wolfpack.addtimer( time, "system.mysql_optimize_db.timer", [] )
! 	return
  
  def optimize_db():
+ 	# MySQL
  	if accountsdriver == mysql or worlddriver == mysql:
  		try:
  			if accountsdriver == mysql and worlddriver == mysql:
  				log( LOG_MESSAGE, "MySQL: Optimizing accounts and world databases..." )
***************
*** 84,87 ****
--- 88,92 ----
  		except:
  			log( LOG_MESSAGE, " MySQL: Performing world/accounts optimize failed." )
+ 	# SQLite
  	if accountsdriver == sqlite or worlddriver == sqlite:
  		try:
***************
*** 107,109 ****
  			log( LOG_MESSAGE, "SQLite: Performing world/accounts optimize failed." )
  	return
- 
--- 112,113 ----

[wpdev-commits] xmlscripts/definitions/spawnregions/trammel britain_graveyard.xml,NONE,1.1 britain.xml,1.1,1.2 buccaneers_den.xml,1.1,1.2 index.xml,1.1,1.2 jhelom.xml,1.1,1.2 minoc.xml,1.1,1.2 nujelm.xml,1.1,1.2 ocllo.xml,1.1,1.2 trinsic.xml,1.1,1.2 vesper.xml,1.1,1.2

From: Richard M. <dr...@us...> - 2004-06-16 19:27:33

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

Modified Files:
	britain.xml buccaneers_den.xml index.xml jhelom.xml minoc.xml 
	nujelm.xml ocllo.xml trinsic.xml vesper.xml 
Added Files:
	britain_graveyard.xml 
Log Message:
Branched out the information and cleaned up the region ids a bit.


Index: vesper.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/vesper.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vesper.xml	29 May 2004 23:48:56 -0000	1.1
--- vesper.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,23 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="trammel_vesper_bank">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2881" x2="2886" y1="675" y2="678" map="1" />
+ 	</spawnregion>
+ 
  </definitions>

Index: trinsic.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/trinsic.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** trinsic.xml	29 May 2004 23:48:56 -0000	1.1
--- trinsic.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,59 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="trammel_trinsic_bank_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1811" x2="1816" y1="2820" y2="2823" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_trinsic_bank_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1813" x2="1815" y1="2825" y2="2826" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_trinsic_bank_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1884" x2="1886" y1="2689" y2="2693" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_trinsic_bank_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1893" x2="1895" y1="2689" y2="2692" map="1" />
+ 	</spawnregion>
+ 
  </definitions>

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

	<spawnregion id="trammel_britain_graveyard">
		<maxnpcamount>5</maxnpcamount>
		<mintime>10</mintime>
		<maxtime>30</maxtime>
		<npcs>
			<npc mult="3">headless</npc>
			<npc mult="1">skeleton</npc>
			<npc mult="1">lich</npc>
		</npcs>
		<npcspercycle>1</npcspercycle>
		<rectangle x1="1337" x2="1374" y1="1493" y2="1509" map="1" />
	</spawnregion>

</definitions>

Index: jhelom.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/jhelom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jhelom.xml	29 May 2004 23:48:56 -0000	1.1
--- jhelom.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,59 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="trammel_jhelom_bank_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1409" x2="1414" y1="3697" y2="3702" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_jhelom_bank_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1417" x2="1419" y1="3697" y2="3702" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_jhelom_bank_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1409" x2="1414" y1="3713" y2="3718" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_jhelom_bank_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1418" x2="1421" y1="3713" y2="3717" map="1" />
+ 	</spawnregion>
+ 
  </definitions>

Index: ocllo.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/ocllo.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ocllo.xml	29 May 2004 23:48:56 -0000	1.1
--- ocllo.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,23 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="trammel_ocllo_bank">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="3689" x2="3694" y1="2510" y2="2518" map="1" />
+ 	</spawnregion>
+ 
  </definitions>

Index: buccaneers_den.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/buccaneers_den.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buccaneers_den.xml	29 May 2004 23:48:56 -0000	1.1
--- buccaneers_den.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,121 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="trammel_buccaneers_den_bank">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2729" x2="2733" y1="2185" y2="2189" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_leatherworker">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>leatherworker_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2705" x2="2710" y1="2177" y2="2182" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_healer">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>healer_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2705" x2="2709" y1="2144" y2="2148" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_innkeeper">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>innkeeper_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2713" x2="2718" y1="2097" y2="2102" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_blacksmith">
+ 	<maxnpcamount>1</maxnpcamount>
+ 	<mintime>0</mintime>
+ 	<maxtime>1</maxtime>
+ 	<npcs>
+ 	<npc>blacksmith_male</npc>
+ 	</npcs>
+ 	<npcspercycle>1</npcspercycle>
+ 	<rectangle x1="2633" x2="2638" y1="2081" y2="2085" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_carpenter">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>carpenter_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2624" x2="2629" y1="2097" y2="2102" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_pirate_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>pirate_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2656" x2="2662" y1="2197" y2="2202" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_pirate_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>pirate_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2656" x2="2662" y1="2185" y2="2191" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_tavernkeeper">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>tavernkeeper_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2682" x2="2686" y1="2242" y2="2244" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_buccaneers_den_provisioner">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>provisioner_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2731" x2="2735" y1="2251" y2="2254" map="1" />
+ 	</spawnregion>
+ 
  </definitions>

Index: minoc.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/minoc.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** minoc.xml	29 May 2004 23:48:56 -0000	1.1
--- minoc.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,47 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="trammel_minoc_bank_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2497" x2="2501" y1="545" y2="549" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_minoc_bank_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2504" x2="2510" y1="545" y2="552" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_minoc_bank_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2497" x2="2501" y1="553" y2="558" map="1" />
+ 	</spawnregion>
+ 
  </definitions>

Index: britain.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/britain.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** britain.xml	29 May 2004 23:48:56 -0000	1.1
--- britain.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,598 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="trammel_britain_bank_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1425" x2="1428" y1="1687" y2="1690" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_bank_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1434" x2="1440" y1="1683" y2="1687" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_bank_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1425" x2="1428" y1="1677" y2="1679" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_bank_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1648" x2="1653" y1="1601" y2="1614" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_blacksmith_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>blacksmith_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1417" x2="1420" y1="1544" y2="1550" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_weaponsmith_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>weaponsmith_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1422" x2="1426" y1="1547" y2="1550" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_weaponsmith_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>weaponsmith_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1576" x2="1580" y1="1561" y2="1566" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_bard_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>bard_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1436" x2="1445" y1="1550" y2="1563" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_mage_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>mage_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1486" x2="1491" y1="1547" y2="1550" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_mage2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>mage_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1569" x2="1574" y1="1703" y2="1714" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_mage_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>mage_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1594" x2="1598" y1="1648" y2="1654" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_herbalist_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>herbalist_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1491" x2="1496" y1="1548" y2="1554" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_veterinarian_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>veterinarian_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1508" x2="1514" y1="1565" y2="1574" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_stablemaster_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>stablemaster_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1509" x2="1526" y1="1546" y2="1550" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_stablemaster_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>stablemaster_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1289" x2="1298" y1="1757" y2="1771" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1510" x2="1516" y1="1611" y2="1616" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>female_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1409" x2="1414" y1="1714" y2="1718" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1616" x2="1622" y1="1762" y2="1766" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>female_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1422" x2="1442" y1="1695" y2="1698" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_5">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1504" x2="1515" y1="1673" y2="1677" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_6">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>female_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1580" x2="1487" y1="1623" y2="1636" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_7">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1484" x2="1501" y1="1573" y2="1578" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_8">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>female_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1472" x2="1490" y1="1525" y2="1535" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_guard_9">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1422" x2="1432" y1="1561" y2="1572" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_healer_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>healer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1470" x2="1477" y1="1608" y2="1614" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_armorer_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>armorer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1480" x2="1484" y1="1583" y2="1589" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_armorer_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>armorer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1445" x2="1450" y1="1646" y2="1651" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_armorer_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>armorer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1340" x2="1345" y1="1731" y2="1735" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_armorer_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>armorer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1632" x2="1634" y1="1689" y2="1691" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_bowyer_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>bowyer_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1469" x2="1477" y1="1576" y2="1582" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_baker_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>baker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1449" x2="1454" y1="1609" y2="1618" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_leatherworker_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>leatherworker_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1429" x2="1434" y1="1609" y2="1614" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_carpenter_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>carpenter_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1429" x2="1432" y1="1593" y2="1598" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_architect_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>architect_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1434" x2="1438" y1="1593" y2="1598" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_artist_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>artist_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1443" x2="1453" y1="1660" y2="1668" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_jeweler_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>jeweler_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1417" x2="1423" y1="1576" y2="1582" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_jeweler_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>jeweler_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1451" x2="1456" y1="1679" y2="1688" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_jeweler_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>jeweler_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1648" x2="1653" y1="1641" y2="1643" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_tinker_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>tinker_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1422" x2="1429" y1="1648" y2="1663" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_butcher_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>butcher_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1449" x2="1454" y1="1721" y2="1726" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_cobbler_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>cobbler_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1465" x2="1468" y1="1665" y2="1670" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_provisioner_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>provisioner_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1465" x2="1470" y1="1672" y2="1674" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_provisioner_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>provisioner_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1604" x2="1606" y1="1712" y2="1715" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_fisherlady_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>fisherlady_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1481" x2="1486" y1="1669" y2="1674" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_alchemist_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>alchemist_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1497" x2="1502" y1="1657" y2="1663" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_tailor_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>tailor_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1467" x2="1471" y1="1684" y2="1689" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_tailor_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>tailor_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1547" x2="1552" y1="1657" y2="1662" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_spinner_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>spinner_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1471" x2="1476" y1="1686" y2="1688" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_cook_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>cook_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1610" x2="1612" y1="1584" y2="1586" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_cook_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>cook_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1487" x2="1491" y1="1687" y2="1690" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_shipwright_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>shipwright_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1413" x2="1419" y1="1746" y2="1755" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_shipwright_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>shipwright_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1472" x2="1478" y1="1737" y2="1749" map="1" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="trammel_britain_innkeeper_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>innkeeper_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1593" x2="1596" y1="1585" y2="1586" map="1" />
+ 	</spawnregion>
+ 
  </definitions>

Index: nujelm.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/nujelm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nujelm.xml	29 May 2004 23:48:56 -0000	1.1
--- nujelm.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,23 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="trammel_nujelm_bank">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="3762" x2="3765" y1="1313" y2="1316" map="1" />
+ 	</spawnregion>
+ 
  </definitions>

Index: index.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.xml	29 May 2004 23:48:56 -0000	1.1
--- index.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 28,31 ****
--- 28,32 ----
  	<include file="definitions/spawnregions/trammel/yew.xml" />
  	<!-- Dungeon Spawns -->
+ 	<include file="definitions/spawnregions/trammel/britain_graveyard.xml" />
  	<include file="definitions/spawnregions/trammel/britain_passage.xml" />
  	<include file="definitions/spawnregions/trammel/covetous.xml" />

[wpdev-commits] xmlscripts/definitions/spawnregions/felucca britain_graveyard.xml,NONE,1.1 britain.xml,1.1,1.2 buccaneers_den.xml,1.1,1.2 index.xml,1.1,1.2 jhelom.xml,1.1,1.2 minoc.xml,1.1,1.2 nujelm.xml,1.1,1.2 ocllo.xml,1.1,1.2 trinsic.xml,1.1,1.2 vesper.xml,1.1,1.2

From: Richard M. <dr...@us...> - 2004-06-16 19:27:33

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

Modified Files:
	britain.xml buccaneers_den.xml index.xml jhelom.xml minoc.xml 
	nujelm.xml ocllo.xml trinsic.xml vesper.xml 
Added Files:
	britain_graveyard.xml 
Log Message:
Branched out the information and cleaned up the region ids a bit.


Index: vesper.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/vesper.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vesper.xml	29 May 2004 23:48:55 -0000	1.1
--- vesper.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,23 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="felucca_vesper_bank">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2881" x2="2886" y1="675" y2="678" map="0" />
+ 	</spawnregion>
+ 
  </definitions>

Index: trinsic.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/trinsic.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** trinsic.xml	29 May 2004 23:48:55 -0000	1.1
--- trinsic.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,59 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="felucca_trinsic_bank_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1811" x2="1816" y1="2820" y2="2823" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_trinsic_bank_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1813" x2="1815" y1="2825" y2="2826" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_trinsic_bank_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1884" x2="1886" y1="2689" y2="2693" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_trinsic_bank_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1893" x2="1895" y1="2689" y2="2692" map="0" />
+ 	</spawnregion>
+ 
  </definitions>

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

	<spawnregion id="felucca_britain_graveyard">
		<maxnpcamount>5</maxnpcamount>
		<mintime>10</mintime>
		<maxtime>30</maxtime>
		<npcs>
			<npc mult="3">headless</npc>
			<npc mult="1">skeleton</npc>
			<npc mult="1">lich</npc>
		</npcs>
		<npcspercycle>1</npcspercycle>
		<rectangle x1="1337" x2="1374" y1="1493" y2="1509" map="0" />
	</spawnregion>

</definitions>

Index: jhelom.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/jhelom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jhelom.xml	29 May 2004 23:48:55 -0000	1.1
--- jhelom.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,59 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="felucca_jhelom_bank_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1409" x2="1414" y1="3697" y2="3702" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_jhelom_bank_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1417" x2="1419" y1="3697" y2="3702" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_jhelom_bank_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1409" x2="1414" y1="3713" y2="3718" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_jhelom_bank_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1418" x2="1421" y1="3713" y2="3717" map="0" />
+ 	</spawnregion>
+ 
  </definitions>

Index: ocllo.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/ocllo.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ocllo.xml	29 May 2004 23:48:55 -0000	1.1
--- ocllo.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,23 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="felucca_ocllo_bank">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="3689" x2="3694" y1="2510" y2="2518" map="0" />
+ 	</spawnregion>
+ 
  </definitions>

Index: buccaneers_den.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/buccaneers_den.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buccaneers_den.xml	29 May 2004 23:48:55 -0000	1.1
--- buccaneers_den.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,121 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="felucca_buccaneers_den_bank">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2729" x2="2733" y1="2185" y2="2189" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_leatherworker">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>leatherworker_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2705" x2="2710" y1="2177" y2="2182" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_healer">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>healer_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2705" x2="2709" y1="2144" y2="2148" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_innkeeper">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>innkeeper_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2713" x2="2718" y1="2097" y2="2102" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_blacksmith">
+ 	<maxnpcamount>1</maxnpcamount>
+ 	<mintime>0</mintime>
+ 	<maxtime>1</maxtime>
+ 	<npcs>
+ 	<npc>blacksmith_male</npc>
+ 	</npcs>
+ 	<npcspercycle>1</npcspercycle>
+ 	<rectangle x1="2633" x2="2638" y1="2081" y2="2085" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_carpenter">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>carpenter_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2624" x2="2629" y1="2097" y2="2102" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_pirate_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>pirate_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2656" x2="2662" y1="2197" y2="2202" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_pirate_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>pirate_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2656" x2="2662" y1="2185" y2="2191" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_tavernkeeper">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>tavernkeeper_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2682" x2="2686" y1="2242" y2="2244" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_buccaneers_den_provisioner">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>provisioner_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2731" x2="2735" y1="2251" y2="2254" map="0" />
+ 	</spawnregion>
+ 
  </definitions>

Index: minoc.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/minoc.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** minoc.xml	29 May 2004 23:48:55 -0000	1.1
--- minoc.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,47 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="felucca_minoc_bank_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2497" x2="2501" y1="545" y2="549" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_minoc_bank_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2504" x2="2510" y1="545" y2="552" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_minoc_bank_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="2497" x2="2501" y1="553" y2="558" map="0" />
+ 	</spawnregion>
+ 
  </definitions>

Index: britain.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/britain.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** britain.xml	29 May 2004 23:48:55 -0000	1.1
--- britain.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,598 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="felucca_britain_bank_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1425" x2="1428" y1="1687" y2="1690" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_bank_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1434" x2="1440" y1="1683" y2="1687" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_bank_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1425" x2="1428" y1="1677" y2="1679" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_bank_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1648" x2="1653" y1="1601" y2="1614" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_blacksmith_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>blacksmith_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1417" x2="1420" y1="1544" y2="1550" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_weaponsmith_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>weaponsmith_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1422" x2="1426" y1="1547" y2="1550" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_weaponsmith_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>weaponsmith_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1576" x2="1580" y1="1561" y2="1566" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_bard_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>bard_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1436" x2="1445" y1="1550" y2="1563" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_mage_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>mage_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1486" x2="1491" y1="1547" y2="1550" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_mage2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>mage_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1569" x2="1574" y1="1703" y2="1714" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_mage_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>mage_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1594" x2="1598" y1="1648" y2="1654" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_herbalist_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>herbalist_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1491" x2="1496" y1="1548" y2="1554" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_veterinarian_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>veterinarian_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1508" x2="1514" y1="1565" y2="1574" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_stablemaster_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>stablemaster_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1509" x2="1526" y1="1546" y2="1550" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_stablemaster_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>stablemaster_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1289" x2="1298" y1="1757" y2="1771" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1510" x2="1516" y1="1611" y2="1616" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>female_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1409" x2="1414" y1="1714" y2="1718" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1616" x2="1622" y1="1762" y2="1766" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>female_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1422" x2="1442" y1="1695" y2="1698" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_5">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1504" x2="1515" y1="1673" y2="1677" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_6">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>female_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1580" x2="1487" y1="1623" y2="1636" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_7">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1484" x2="1501" y1="1573" y2="1578" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_8">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>female_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1472" x2="1490" y1="1525" y2="1535" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_guard_9">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>male_guard</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1422" x2="1432" y1="1561" y2="1572" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_healer_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>healer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1470" x2="1477" y1="1608" y2="1614" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_armorer_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>armorer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1480" x2="1484" y1="1583" y2="1589" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_armorer_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>armorer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1445" x2="1450" y1="1646" y2="1651" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_armorer_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>armorer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1340" x2="1345" y1="1731" y2="1735" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_armorer_4">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>armorer_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1632" x2="1634" y1="1689" y2="1691" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_bowyer_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>bowyer_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1469" x2="1477" y1="1576" y2="1582" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_baker_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>baker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1449" x2="1454" y1="1609" y2="1618" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_leatherworker_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>leatherworker_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1429" x2="1434" y1="1609" y2="1614" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_carpenter_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>carpenter_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1429" x2="1432" y1="1593" y2="1598" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_architect_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>architect_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1434" x2="1438" y1="1593" y2="1598" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_artist_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>artist_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1443" x2="1453" y1="1660" y2="1668" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_jeweler_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>jeweler_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1417" x2="1423" y1="1576" y2="1582" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_jeweler_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>jeweler_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1451" x2="1456" y1="1679" y2="1688" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_jeweler_3">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>jeweler_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1648" x2="1653" y1="1641" y2="1643" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_tinker_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>tinker_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1422" x2="1429" y1="1648" y2="1663" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_butcher_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>butcher_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1449" x2="1454" y1="1721" y2="1726" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_cobbler_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>cobbler_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1465" x2="1468" y1="1665" y2="1670" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_provisioner_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>provisioner_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1465" x2="1470" y1="1672" y2="1674" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_provisioner_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>provisioner_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1604" x2="1606" y1="1712" y2="1715" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_fisherlady_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>fisherlady_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1481" x2="1486" y1="1669" y2="1674" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_alchemist_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>alchemist_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1497" x2="1502" y1="1657" y2="1663" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_tailor_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>tailor_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1467" x2="1471" y1="1684" y2="1689" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_tailor_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>tailor_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1547" x2="1552" y1="1657" y2="1662" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_spinner_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>spinner_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1471" x2="1476" y1="1686" y2="1688" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_cook_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>cook_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1610" x2="1612" y1="1584" y2="1586" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_cook_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>cook_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1487" x2="1491" y1="1687" y2="1690" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_shipwright_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>shipwright_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1413" x2="1419" y1="1746" y2="1755" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_shipwright_2">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>shipwright_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1472" x2="1478" y1="1737" y2="1749" map="0" />
+ 	</spawnregion>
+ 
+ 	<spawnregion id="felucca_britain_innkeeper_1">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>innkeeper_male</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="1593" x2="1596" y1="1585" y2="1586" map="0" />
+ 	</spawnregion>
+ 
  </definitions>

Index: nujelm.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/nujelm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nujelm.xml	29 May 2004 23:48:55 -0000	1.1
--- nujelm.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 1,4 ****
! 
  <definitions>
  
  </definitions>
--- 1,23 ----
! <!--
! =================================================================
! |   )      (\_     | WOLFPACK 13.0.0 Scripts                    |
! |  ((    _/{  "-;  | Created by: Ripper                        |
! |   )).-' {{ ;'`   | Revised by: Dreoth                         |
! |  ( (  ;._ \\ ctr | Last Modification: Created                 |
! =================================================================
! -->
  <definitions>
  
+ 	<spawnregion id="felucca_nujelm_bank">
+ 		<maxnpcamount>1</maxnpcamount>
+ 		<mintime>0</mintime>
+ 		<maxtime>1</maxtime>
+ 		<npcs>
+ 			<npc>banker_male</npc>
+ 			<npc>banker_female</npc>
+ 		</npcs>
+ 		<npcspercycle>1</npcspercycle>
+ 		<rectangle x1="3762" x2="3765" y1="1313" y2="1316" map="0" />
+ 	</spawnregion>
+ 
  </definitions>

Index: index.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.xml	29 May 2004 23:48:55 -0000	1.1
--- index.xml	16 Jun 2004 19:27:20 -0000	1.2
***************
*** 28,31 ****
--- 28,32 ----
  	<include file="definitions/spawnregions/felucca/yew.xml" />
  	<!-- Dungeon Spawns -->
+ 	<include file="definitions/spawnregions/felucca/britain_graveyard.xml" />
  	<include file="definitions/spawnregions/felucca/britain_passage.xml" />
  	<include file="definitions/spawnregions/felucca/covetous.xml" />

[wpdev-commits] xmlscripts/definitions/spawnregions britain_fel.xml,1.8,NONE britain_tram.xml,1.6,NONE bucden_fel.xml,1.2,NONE bucden_tram.xml,1.2,NONE graveyards.xml,1.5,NONE shops.xml,1.3,NONE

From: Richard M. <dr...@us...> - 2004-06-16 19:27:28

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

Removed Files:
	britain_fel.xml britain_tram.xml bucden_fel.xml 
	bucden_tram.xml graveyards.xml shops.xml 
Log Message:
Branched out the information and cleaned up the region ids a bit.


--- britain_tram.xml DELETED ---

--- graveyards.xml DELETED ---

--- bucden_fel.xml DELETED ---

--- britain_fel.xml DELETED ---

--- bucden_tram.xml DELETED ---

--- shops.xml DELETED ---

[wpdev-commits] xmlscripts/definitions/npcs/monsters/daemonic horde_minion.xml,1.12,1.13

From: Richard M. <dr...@us...> - 2004-06-16 18:58:24

Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8390/monsters/daemonic

Modified Files:
	horde_minion.xml 
Log Message:
Fix for categories


Index: horde_minion.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/horde_minion.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** horde_minion.xml	5 Jun 2004 01:05:33 -0000	1.12
--- horde_minion.xml	16 Jun 2004 18:58:15 -0000	1.13
***************
*** 37,41 ****
  	<npc id="horde_minion_1" inherit="horde_minion">
  		<id>776</id>
! 		<category>Monsters\ADaemonic\Horde Minion (Small)</category>
  	</npc>
  
--- 37,41 ----
  	<npc id="horde_minion_1" inherit="horde_minion">
  		<id>776</id>
! 		<category>Monsters\Daemonic\Horde Minion (Small)</category>
  	</npc>

[wpdev-commits] xmlscripts/scripts/commands info.py,1.10,1.11

From: Richard M. <dr...@us...> - 2004-06-15 20:12:21

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

Modified Files:
	info.py 
Log Message:
Updates for info.


Index: info.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** info.py	2 Jun 2004 15:03:04 -0000	1.10
--- info.py	15 Jun 2004 20:12:09 -0000	1.11
***************
*** 355,361 ****
  		gump.addInputField( 284, 380, 200, 16, 0x834, 38, unicode( char.owner ) )
  		# 39
! 		gump.addText( 113, 400, "Spawn Region:", 0x834 )
! 		gump.addResizeGump( 280, 400, 0xBB8, 215, 20 )
! 		gump.addInputField( 284, 400, 200, 16, 0x834, 39, unicode( char.spawnregion ) )
  
  	if not char.npc:
--- 355,361 ----
  		gump.addInputField( 284, 380, 200, 16, 0x834, 38, unicode( char.owner ) )
  		# 39
! 		#gump.addText( 113, 400, "Spawn Region:", 0x834 )
! 		#gump.addResizeGump( 280, 400, 0xBB8, 215, 20 )
! 		#gump.addInputField( 284, 400, 200, 16, 0x834, 39, unicode( char.spawnregion ) )
  
  	if not char.npc:
***************
*** 422,517 ****
  	elif char.npc:
  		# 40
! 		gump.addText( 113, 160, "Carve:", 0x834 )
! 		gump.addResizeGump( 280, 160, 0xBB8, 215, 20 )
! 		gump.addInputField( 284, 160, 200, 16, 0x834, 40, char.carve)
  		# 41
! 		gump.addText( 113, 180, "Loot List:", 0x834 )
! 		gump.addResizeGump( 280, 180, 0xBB8, 215, 20 )
! 		gump.addInputField( 284, 180, 200, 16, 0x834, 41, char.lootpacks)
! 		# 45
! 		gump.addText( 113, 260, "Physical Damage:", 0x834 )
! 		gump.addResizeGump( 280, 260, 0xBB8, 215, 20 )
! 		if char.hastag('dmg_physical'):
! 			gump.addInputField( 284, 260, 200, 16, 0x834, 45, unicode( char.gettag('dmg_physical') ) )
! 		else:
! 			gump.addInputField( 284, 260, 200, 16, 0x834, 45, '' )
  		# 46
! 		gump.addText( 113, 280, "Fire Damage:", 0x834 )
! 		gump.addResizeGump( 280, 280, 0xBB8, 215, 20 )
  		if char.hastag('dmg_fire'):
! 			gump.addInputField( 284, 280, 200, 16, 0x834, 46, unicode( char.gettag('dmg_fire') ) )
  		else:
! 			gump.addInputField( 284, 280, 200, 16, 0x834, 46, '' )
  		# 47
! 		gump.addText( 113, 300, "Cold Damage:", 0x834 )
! 		gump.addResizeGump( 280, 300, 0xBB8, 215, 20 )
  		if char.hastag('dmg_cold'):
! 			gump.addInputField( 284, 300, 200, 16, 0x834, 47, unicode( char.gettag('dmg_cold') ) )
  		else:
! 			gump.addInputField( 284, 300, 200, 16, 0x834, 47, '' )
  		# 48
! 		gump.addText( 113, 320, "Poison Damage:", 0x834 )
! 		gump.addResizeGump( 280, 320, 0xBB8, 215, 20 )
  		if char.hastag('dmg_poison'):
! 			gump.addInputField( 284, 320, 200, 16, 0x834, 48, unicode( char.gettag('dmg_poison') ) )
  		else:
! 			gump.addInputField( 284, 320, 200, 16, 0x834, 48, '' )
  		# 49
! 		gump.addText( 113, 340, "Energy Damage:", 0x834 )
! 		gump.addResizeGump( 280, 340, 0xBB8, 215, 20 )
  		if char.hastag('dmg_energy'):
! 			gump.addInputField( 284, 340, 200, 16, 0x834, 49, unicode( char.gettag('dmg_energy') ) )
  		else:
! 			gump.addInputField( 284, 340, 200, 16, 0x834, 48, '' )
  		# 50
! 		gump.addText( 113, 360, "Physical Resist:", 0x834 )
! 		gump.addResizeGump( 280, 360, 0xBB8, 215, 20 )
  		if char.hastag('res_physical'):
! 			gump.addInputField( 284, 360, 200, 16, 0x834, 50, unicode( char.gettag('res_physical') ) )
  		else:
! 			gump.addInputField( 284, 360, 200, 16, 0x834, 50, '' )
  		# 51
! 		gump.addText( 113, 380, "Fire Resist:", 0x834 )
! 		gump.addResizeGump( 280, 380, 0xBB8, 215, 20 )
  		if char.hastag('res_fire'):
! 			gump.addInputField( 284, 380, 200, 16, 0x834, 51, unicode( char.gettag('res_fire') ) )
  		else:
! 			gump.addInputField( 284, 380, 200, 16, 0x834, 51, '' )
  		#52
! 		gump.addText( 113, 400, "Cold Resist:", 0x834 )
! 		gump.addResizeGump( 280, 400, 0xBB8, 215, 20 )
  		if char.hastag('res_cold'):
! 			gump.addInputField( 284, 400, 200, 16, 0x834, 52, unicode( char.gettag('res_cold') ) )
  		else:
! 			gump.addInputField( 284, 400, 200, 16, 0x834, 52, '' )
! 
! 		gump.addText( 415, 450, "Page 4 of 5", 0x834 )
! 		# next page
! 		gump.addPageButton( 390, 450, 0x0FA, 0x0FA, 5 )
! 		# prev page
! 		gump.addPageButton( 370, 450, 0x0FC, 0x0FC, 3 )
! 
! 		gump.startPage( 5 )
! 
  		#53
! 		gump.addText( 113, 160, "Poison Resist:", 0x834 )
! 		gump.addResizeGump( 280, 160, 0xBB8, 215, 20 )
  		if char.hastag('res_poison'):
! 			gump.addInputField( 284, 160, 200, 16, 0x834, 53, unicode( char.gettag('res_poison') ) )
  		else:
! 			gump.addInputField( 284, 160, 200, 16, 0x834, 53, '' )
  		# 54
! 		gump.addText( 113, 180, "Energy Resist:", 0x834 )
! 		gump.addResizeGump( 280, 180, 0xBB8, 215, 20 )
  		if char.hastag('res_energy'):
! 			gump.addInputField( 284, 180, 200, 16, 0x834, 54, unicode( char.gettag('res_energy') ) )
  		else:
! 			gump.addInputField( 284, 180, 200, 16, 0x834, 54, '' )
  
! 		gump.addText( 415, 450, "Page 5 of 5", 0x834 )
  		# next page
  		#gump.addPageButton( 390, 450, 0x0FA, 0x0FA, 6 )
  		# prev page
! 		gump.addPageButton( 370, 450, 0x0FC, 0x0FC, 4 )
  
  	gump.send( socket )
--- 422,529 ----
  	elif char.npc:
  		# 40
! 		#gump.addText( 113, 160, "Carve:", 0x834 )
! 		#gump.addResizeGump( 280, 160, 0xBB8, 215, 20 )
! 		#gump.addInputField( 284, 160, 200, 16, 0x834, 40, char.carve)
  		# 41
! 		#gump.addText( 113, 180, "Loot List:", 0x834 )
! 		#gump.addResizeGump( 280, 180, 0xBB8, 215, 20 )
! 		#gump.addInputField( 284, 180, 200, 16, 0x834, 41, char.lootpacks)
! 		# 43
! 		gump.addText( 113, 180, "Mindamage:", 0x834 )
! 		#gump.addResizeGump( 280, 180, 0xBB8, 215, 20 )
! 		gump.addText( 284, 180, unicode( char.mindamage ), 0x834 )
! 		# 44
! 		gump.addText( 113, 200, "Maxdamage:", 0x834 )
! 		#gump.addResizeGump( 280, 200, 0xBB8, 215, 20 )
! 		gump.addText( 284, 200, unicode( char.maxdamage ), 0x834 )
! 		# 45 Passed
! 		gump.addText( 113, 220, "Physical Damage:", 0x834 )
! 		#gump.addResizeGump( 280, 220, 0xBB8, 215, 20 )
! 		physicaltotal = 100
! 		if char.hastag('dmg_fire'):
! 			physicaltotal -= char.gettag('dmg_fire')
! 		if char.hastag('dmg_cold'):
! 			physicaltotal -= char.gettag('dmg_cold')
! 		if char.hastag('dmg_poison'):
! 			physicaltotal -= char.gettag('dmg_poison')
! 		if char.hastag('dmg_energy'):
! 			physicaltotal -= char.gettag('dmg_energy')
! 		gump.addText( 284, 220, unicode( physicaltotal ), 0x834 )
  		# 46
! 		gump.addText( 113, 240, "Fire Damage:", 0x834 )
! 		gump.addResizeGump( 280, 240, 0xBB8, 215, 20 )
  		if char.hastag('dmg_fire'):
! 			gump.addInputField( 284, 240, 200, 16, 0x834, 46, unicode( char.gettag('dmg_fire') ) )
  		else:
! 			gump.addInputField( 284, 240, 200, 16, 0x834, 46, '0' )
  		# 47
! 		gump.addText( 113, 260, "Cold Damage:", 0x834 )
! 		gump.addResizeGump( 280, 260, 0xBB8, 215, 20 )
  		if char.hastag('dmg_cold'):
! 			gump.addInputField( 284, 260, 200, 16, 0x834, 47, unicode( char.gettag('dmg_cold') ) )
  		else:
! 			gump.addInputField( 284, 260, 200, 16, 0x834, 47, '0' )
  		# 48
! 		gump.addText( 113, 280, "Poison Damage:", 0x834 )
! 		gump.addResizeGump( 280, 280, 0xBB8, 215, 20 )
  		if char.hastag('dmg_poison'):
! 			gump.addInputField( 284, 280, 200, 16, 0x834, 48, unicode( char.gettag('dmg_poison') ) )
  		else:
! 			gump.addInputField( 284, 280, 200, 16, 0x834, 48, '0' )
  		# 49
! 		gump.addText( 113, 300, "Energy Damage:", 0x834 )
! 		gump.addResizeGump( 280, 300, 0xBB8, 215, 20 )
  		if char.hastag('dmg_energy'):
! 			gump.addInputField( 284, 300, 200, 16, 0x834, 49, unicode( char.gettag('dmg_energy') ) )
  		else:
! 			gump.addInputField( 284, 300, 200, 16, 0x834, 49, '0' )
  		# 50
! 		gump.addText( 113, 320, "Physical Resist:", 0x834 )
! 		gump.addResizeGump( 280, 320, 0xBB8, 215, 20 )
  		if char.hastag('res_physical'):
! 			gump.addInputField( 284, 320, 200, 16, 0x834, 50, unicode( char.gettag('res_physical') ) )
  		else:
! 			gump.addInputField( 284, 320, 200, 16, 0x834, 50, '0' )
  		# 51
! 		gump.addText( 113, 340, "Fire Resist:", 0x834 )
! 		gump.addResizeGump( 280, 340, 0xBB8, 215, 20 )
  		if char.hastag('res_fire'):
! 			gump.addInputField( 284, 340, 200, 16, 0x834, 51, unicode( char.gettag('res_fire') ) )
  		else:
! 			gump.addInputField( 284, 340, 200, 16, 0x834, 51, '0' )
  		#52
! 		gump.addText( 113, 360, "Cold Resist:", 0x834 )
! 		gump.addResizeGump( 280, 360, 0xBB8, 215, 20 )
  		if char.hastag('res_cold'):
! 			gump.addInputField( 284, 360, 200, 16, 0x834, 52, unicode( char.gettag('res_cold') ) )
  		else:
! 			gump.addInputField( 284, 360, 200, 16, 0x834, 52, '0' )
  		#53
! 		gump.addText( 113, 380, "Poison Resist:", 0x834 )
! 		gump.addResizeGump( 280, 380, 0xBB8, 215, 20 )
  		if char.hastag('res_poison'):
! 			gump.addInputField( 284, 380, 200, 16, 0x834, 53, unicode( char.gettag('res_poison') ) )
  		else:
! 			gump.addInputField( 284, 380, 200, 16, 0x834, 53, '0' )
  		# 54
! 		gump.addText( 113, 400, "Energy Resist:", 0x834 )
! 		gump.addResizeGump( 280, 400, 0xBB8, 215, 20 )
  		if char.hastag('res_energy'):
! 			gump.addInputField( 284, 400, 200, 16, 0x834, 54, unicode( char.gettag('res_energy') ) )
  		else:
! 			gump.addInputField( 284, 400, 200, 16, 0x834, 54, '0' )
  
! 		gump.addText( 415, 450, "Page 4 of 4", 0x834 )
! 		# next page
! 		#gump.addPageButton( 390, 450, 0x0FA, 0x0FA, 5 )
! 		# prev page
! 		gump.addPageButton( 370, 450, 0x0FC, 0x0FC, 3 )
! 
! 		#gump.startPage( 5 )
! 		#gump.addText( 415, 450, "Page 5 of 5", 0x834 )
  		# next page
  		#gump.addPageButton( 390, 450, 0x0FA, 0x0FA, 6 )
  		# prev page
! 		#gump.addPageButton( 370, 450, 0x0FC, 0x0FC, 4 )
  
  	gump.send( socket )
***************
*** 628,638 ****
  			if not char.npc:
  				char.visrange = int( textentries[ key ] )
! 			else:
! 				char.spawnregion = ( textentries[ key ] )
  		elif key == 40:
  			if not char.npc:
  				char.lightbonus = int( textentries[ key ] )
! 			else:
! 				char.carve = ( textentries[ key ] )
  		elif key == 41:
  			if not char.npc:
--- 640,650 ----
  			if not char.npc:
  				char.visrange = int( textentries[ key ] )
! 			#else:
! 			#	char.spawnregion = ( textentries[ key ] )
  		elif key == 40:
  			if not char.npc:
  				char.lightbonus = int( textentries[ key ] )
! 			#else:
! 			#	char.carve = ( textentries[ key ] )
  		elif key == 41:
  			if not char.npc:
***************
*** 652,661 ****
  				else:
  					char.settag( 'notoriety', int( textentries[ key ] ) )
! 			elif char.npc:
! 				if (textentries[ key ]) == '':
! 					if char.hastag( 'mindamage' ):
! 						char.deltag( 'mindamage' )
! 				else:
! 					char.settag( 'mindamage', int( textentries[ key ] ) )
  		elif key == 44:
  			if not char.npc:
--- 664,670 ----
  				else:
  					char.settag( 'notoriety', int( textentries[ key ] ) )
! 			#elif char.npc:
! 			#	if not textentries[ key ] == '':
! 			#		char.mindamage = int( textentries[ key ] )
  		elif key == 44:
  			if not char.npc:
***************
*** 665,712 ****
  				else:
  					char.settag( 'poisoned', int( textentries[ key ] ) )
! 			elif char.npc:
! 				if (textentries[ key ]) == '':
! 					if char.hastag( 'maxdamage' ):
! 						char.deltag( 'maxdamage' )
! 				else:
! 					char.settag( 'maxdamage', int( textentries[ key ] ) )
! 		elif key == 45:
! 			if char.npc:
! 				if (textentries[ key ]) == '':
! 					if char.hastag( 'dmg_physical' ):
! 						char.deltag( 'dmg_physical' )
! 				else:
! 					char.settag( 'dmg_physical', int( textentries[ key ] ) )
  		elif key == 46:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'dmg_fire' ):
  						char.deltag( 'dmg_fire' )
! 				else:
  					char.settag( 'dmg_fire', int( textentries[ key ] ) )
  		elif key == 47:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'dmg_cold' ):
  						char.deltag( 'dmg_cold' )
! 				else:
  					char.settag( 'dmg_cold', int( textentries[ key ] ) )
  		elif key == 48:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'dmg_poison' ):
  						char.deltag( 'dmg_poison' )
! 				else:
  					char.settag( 'dmg_poison', int( textentries[ key ] ) )
  		elif key == 49:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'dmg_energy' ):
  						char.deltag( 'dmg_energy' )
! 				else:
  					char.settag( 'dmg_energy', int( textentries[ key ] ) )
  		elif key == 50:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'res_physical' ):
  						char.deltag( 'res_physical' )
--- 674,711 ----
  				else:
  					char.settag( 'poisoned', int( textentries[ key ] ) )
! 			#elif char.npc:
! 			#	if not textentries[ key ] == '':
! 			#		char.maxdamage = int( textentries[ key ] )
  		elif key == 46:
  			if char.npc:
! 				if textentries[ key ] == '' or int(textentries[ key ]) <= 0:
  					if char.hastag( 'dmg_fire' ):
  						char.deltag( 'dmg_fire' )
! 				elif int( textentries[ key ] ) <= 100:
  					char.settag( 'dmg_fire', int( textentries[ key ] ) )
  		elif key == 47:
  			if char.npc:
! 				if textentries[ key ] == '' or int(textentries[ key ]) <= 0:
  					if char.hastag( 'dmg_cold' ):
  						char.deltag( 'dmg_cold' )
! 				elif int( textentries[ key ] ) <= 100:
  					char.settag( 'dmg_cold', int( textentries[ key ] ) )
  		elif key == 48:
  			if char.npc:
! 				if textentries[ key ] == '' or int(textentries[ key ]) <= 0:
  					if char.hastag( 'dmg_poison' ):
  						char.deltag( 'dmg_poison' )
! 				elif int( textentries[ key ] ) <= 100:
  					char.settag( 'dmg_poison', int( textentries[ key ] ) )
  		elif key == 49:
  			if char.npc:
! 				if textentries[ key ] == '' or int(textentries[ key ]) <= 0:
  					if char.hastag( 'dmg_energy' ):
  						char.deltag( 'dmg_energy' )
! 				elif int( textentries[ key ] ) <= 100:
  					char.settag( 'dmg_energy', int( textentries[ key ] ) )
  		elif key == 50:
  			if char.npc:
! 				if (textentries[ key ]) == '' or int(textentries[ key ]) == 0:
  					if char.hastag( 'res_physical' ):
  						char.deltag( 'res_physical' )
***************
*** 715,743 ****
  		elif key == 51:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'res_fire' ):
  						char.deltag( 'res_fire' )
! 				else:
  					char.settag( 'res_fire', int( textentries[ key ] ) )
  		elif key == 52:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'res_cold' ):
  						char.deltag( 'res_cold' )
! 				else:
  					char.settag( 'res_cold', int( textentries[ key ] ) )
  		elif key == 53:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'res_poison' ):
  						char.deltag( 'res_poison' )
! 				else:
  					char.settag( 'res_poison', int( textentries[ key ] ) )
  		elif key == 54:
  			if char.npc:
! 				if (textentries[ key ]) == '':
  					if char.hastag( 'res_energy' ):
  						char.deltag( 'res_energy' )
! 				else:
  					char.settag( 'res_energy', int( textentries[ key ] ) )
  
--- 714,742 ----
  		elif key == 51:
  			if char.npc:
! 				if (textentries[ key ]) == '' or int(textentries[ key ]) == 0:
  					if char.hastag( 'res_fire' ):
  						char.deltag( 'res_fire' )
! 				elif int( textentries[ key ] ) <= 100:
  					char.settag( 'res_fire', int( textentries[ key ] ) )
  		elif key == 52:
  			if char.npc:
! 				if (textentries[ key ]) == '' or int(textentries[ key ]) == 0:
  					if char.hastag( 'res_cold' ):
  						char.deltag( 'res_cold' )
! 				elif int( textentries[ key ] ) <= 100:
  					char.settag( 'res_cold', int( textentries[ key ] ) )
  		elif key == 53:
  			if char.npc:
! 				if (textentries[ key ]) == '' or int(textentries[ key ]) == 0:
  					if char.hastag( 'res_poison' ):
  						char.deltag( 'res_poison' )
! 				elif int( textentries[ key ] ) <= 100:
  					char.settag( 'res_poison', int( textentries[ key ] ) )
  		elif key == 54:
  			if char.npc:
! 				if (textentries[ key ]) == '' or int(textentries[ key ]) == 0:
  					if char.hastag( 'res_energy' ):
  						char.deltag( 'res_energy' )
! 				elif int( textentries[ key ] ) <= 100:
  					char.settag( 'res_energy', int( textentries[ key ] ) )

[wpdev-commits] xmlscripts/definitions scripts.xml,1.131,1.132

From: Richard M. <dr...@us...> - 2004-06-15 19:30:08

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

Modified Files:
	scripts.xml 
Log Message:
I organized this a bit, makes it easier to see what scripts are there and which ones are not.


Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** scripts.xml	24 May 2004 14:18:22 -0000	1.131
--- scripts.xml	15 Jun 2004 19:29:59 -0000	1.132
***************
*** 14,61 ****
  -->
  <definitions>
! 	<script>npc.healer</script>
! 	<script>training_dummy</script>
! 	<script>pickpocket_dip</script>
  	<script>archery_butte</script>
! 	<script>wall_clock</script>
! 	<script>slotmachine</script>
! 	<script>kindling</script>
! 	<script>check</script>
! 	<script>lightsource</script>
! 	<script>gate</script>
  	<script>blades</script>
! 	<script>scissors</script>
! 	<script>dyes</script>
  	<script>cooking</script>
! 	<script>wool</script>
! 	<script>yarn</script>
! 	<script>potions</script>
! 	<script>spawngem</script>
! 	<script>shrink</script>
! 	<script>environment</script>
  	<script>door</script>
! 	<script>lock</script>
! 	<script>book</script>
  	<script>equipment</script>
! 	<script>bandages</script>
! 	<script>key</script>
! 	<script>potionkeg</script>
  	<script>ingot</script>
  	<script>keyring</script>
! 	<script>ore</script>
  	<script>lockpick</script>
! 	<script>bulletinboard</script>
! 	<script>food</script>
  	<script>shrine</script>
  	<script>spiderweb</script>
! 	<script>figurine</script>
! 	<script>pickaxe</script>
  
  	<!-- Deeds -->
! 	<script>deeds.hairstyle</script>
! 	<script>deeds.commoditydeed</script>
  	<script>deeds.clothing_bless_deed</script>
  	<script>deeds.item_bless_deed</script>
! 	<script>deeds.carpentry_deed</script>
  
  	<!-- Combat -->
--- 14,66 ----
  -->
  <definitions>
! 
  	<script>archery_butte</script>
! 	<script>bandages</script>
  	<script>blades</script>
! 	<script>book</script>
! 	<script>bulletinboard</script>
! 	<script>check</script>
  	<script>cooking</script>
! 	<script>daggermenu</script>
  	<script>door</script>
! 	<script>dyes</script>
! 	<script>environment</script>
  	<script>equipment</script>
! 	<script>figurine</script>
! 	<script>food</script>
! 	<script>gate</script>
! 	<script>guillotine</script>
  	<script>ingot</script>
+ 	<script>key</script>
  	<script>keyring</script>
! 	<script>kindling</script>
! 	<script>lightsource</script>
! 	<script>lock</script>
  	<script>lockpick</script>
! 	<script>moongate</script>
! 	<script>ore</script>
! 	<script>pickaxe</script>
! 	<script>pickpocket_dip</script>
! 	<script>potionkeg</script>
! 	<script>potions</script>
! 	<script>scissors</script>
  	<script>shrine</script>
+ 	<script>shrink</script>
+ 	<script>signpost</script>
+ 	<script>slotmachine</script>
+ 	<script>spawngem</script>
  	<script>spiderweb</script>
! 	<script>training_dummy</script>
! 	<script>wall_clock</script>
! 	<script>wool</script>
! 	<script>yarn</script>
  
  	<!-- Deeds -->
! 	<script>deeds.carpentry_deed</script>
  	<script>deeds.clothing_bless_deed</script>
+ 	<script>deeds.commoditydeed</script>
+ 	<script>deeds.hairstyle</script>
  	<script>deeds.item_bless_deed</script>
! 	<script>deeds.multideed</script>
  
  	<!-- Combat -->
***************
*** 71,81 ****
  	<!-- Commands -->
  	<script>commands</script>
- 	<script>commands.effect</script>
- 	<script>commands.eval</script>
- 	<script>commands.edit</script>
- 	<script>commands.disconnect</script>
- 	<script>commands.skillinfo</script>
- 	<script>commands.tags</script>
- 	<script>commands.tile</script>
  	<script>commands.action</script>
  	<script>commands.add</script>
--- 76,79 ----
***************
*** 84,113 ****
  	<script>commands.cast</script>
  	<script>commands.decoration</script>
  	<script>commands.dupe</script>
  	<script>commands.dye</script>
  	<script>commands.export</script>
  	<script>commands.go</script>
  	<script>commands.import</script>
  	<script>commands.info</script>
  	<script>commands.invul</script>
! 	<script>commands.where</script>
! 	<script>commands.wipe</script>
  	<script>commands.skill</script>
- 	<script>commands.stat</script>
  	<script>commands.sound</script>
  	<script>commands.travel</script>
- 	<script>commands.serverinfo</script>
- 	<script>commands.restore</script>
  	<script>commands.turnitem</script>
  
  	<!-- Magic -->
  	<script>magic</script>
- 	<script>magic.spellbook</script>
- 	<script>magic.gate</script>
- 	<script>magic.nightsight</script>
- 	<script>magic.rune</script>
- 	<script>magic.runebook</script>
- 	<script>magic.scroll</script>
- 	<script>magic.spell</script>
  	<script>magic.circle1</script>
  	<script>magic.circle2</script>
--- 82,112 ----
  	<script>commands.cast</script>
  	<script>commands.decoration</script>
+ 	<script>commands.disconnect</script>
  	<script>commands.dupe</script>
  	<script>commands.dye</script>
+ 	<script>commands.edit</script>
+ 	<script>commands.effect</script>
+ 	<script>commands.eval</script>
  	<script>commands.export</script>
+ 	<script>commands.freeze</script>
  	<script>commands.go</script>
  	<script>commands.import</script>
  	<script>commands.info</script>
  	<script>commands.invul</script>
! 	<script>commands.restore</script>
! 	<script>commands.serverinfo</script>
! 	<script>commands.skillinfo</script>
  	<script>commands.skill</script>
  	<script>commands.sound</script>
+ 	<script>commands.stat</script>
+ 	<script>commands.tags</script>
+ 	<script>commands.tile</script>
  	<script>commands.travel</script>
  	<script>commands.turnitem</script>
+ 	<script>commands.where</script>
+ 	<script>commands.wipe</script>
  
  	<!-- Magic -->
  	<script>magic</script>
  	<script>magic.circle1</script>
  	<script>magic.circle2</script>
***************
*** 119,161 ****
  	<script>magic.circle8</script>
  	<script>magic.firefield</script>
! 	<script>magic.poisonfield</script>
! 	<script>magic.paralyzefield</script>
! 	<script>magic.trap</script>
! 
  	<script>magic.necromancy</script>
  	<script>magic.necrospells</script>
  	<script>magic.necrospellbook</script>
  
! 	<!-- Multis -->
! 	<script>deeds.multideed</script>
! 	<script>signpost</script>
! 
! 	<!-- Moongate -->
! 	<script>moongate</script>
  
  	<!-- Context menu scripts -->
- 	<script>daggermenu</script>
  	<script>contextmenus.bankermenu</script>
- 	<script>contextmenus.trainmenu</script>
  	<script>contextmenus.paperdollmenu</script>
- 	<script>contextmenus.vendormenu</script>
- 	<script>contextmenus.tamemenu</script>
  	<script>contextmenus.petmenu</script>
  
  	<!-- Speech Scripts -->
- 	<script>speech.pets</script>
  	<script>speech.barber</script>
  	<script>speech.banker</script>
  	<script>speech.stablemaster</script>
  
  	<!-- System Scripts -->
! 	<script>system.makemenus</script>
  	<script>system.loot</script>
! 	<script>system.mysql_optimize_db</script>
  	<script>system.mysql_backup_db</script>
  	<script>system.skillgain</script>
- 	<script>system.hardwareinfo</script>
  	<script>system.spawns</script>
- 	<script>system.poison</script>
  	<script>system.trading</script>
  	<script>system.uogstatus</script>
--- 118,161 ----
  	<script>magic.circle8</script>
  	<script>magic.firefield</script>
! 	<script>magic.gate</script>
  	<script>magic.necromancy</script>
  	<script>magic.necrospells</script>
  	<script>magic.necrospellbook</script>
+ 	<script>magic.nightsight</script>
+ 	<script>magic.paralyzefield</script>
+ 	<script>magic.poisonfield</script>
+ 	<script>magic.rune</script>
+ 	<script>magic.runebook</script>
+ 	<script>magic.scroll</script>
+ 	<script>magic.spell</script>
+ 	<script>magic.spellbook</script>
+ 	<script>magic.trap</script>
  
! 	<!-- NPC -->
! 	<script>npc.healer</script>
  
  	<!-- Context menu scripts -->
  	<script>contextmenus.bankermenu</script>
  	<script>contextmenus.paperdollmenu</script>
  	<script>contextmenus.petmenu</script>
+ 	<script>contextmenus.tamemenu</script>
+ 	<script>contextmenus.trainmenu</script>
+ 	<script>contextmenus.vendormenu</script>
  
  	<!-- Speech Scripts -->
  	<script>speech.barber</script>
  	<script>speech.banker</script>
+ 	<script>speech.pets</script>
  	<script>speech.stablemaster</script>
  
  	<!-- System Scripts -->
! 	<script>system.hardwareinfo</script>
  	<script>system.loot</script>
! 	<script>system.makemenus</script>
  	<script>system.mysql_backup_db</script>
+ 	<script>system.mysql_optimize_db</script>
+ 	<script>system.poison</script>
  	<script>system.skillgain</script>
  	<script>system.spawns</script>
  	<script>system.trading</script>
  	<script>system.uogstatus</script>
***************
*** 164,196 ****
  	<!-- Skills -->
  	<script>skills</script>
  	<script>skills.anatomy</script>
  	<script>skills.animallore</script>
- 	<script>skills.evaluatingintel</script>
- 	<script>skills.fishing</script>
- 	<script>skills.armslore</script>
  	<script>skills.animaltaming</script>
  	<script>skills.begging</script>
  	<script>skills.bowcraft</script>
- 	<script>skills.cooking</script>
- 	<script>skills.alchemy</script>
- 	<script>skills.tinkering</script>
  	<script>skills.carpentry</script>
! 	<script>skills.stealth</script>
! 	<script>skills.blacksmithing</script>
  	<script>skills.healing</script>
  	<script>skills.hiding</script>
  	<script>skills.inscription</script>
! 	<script>skills.detectinghidden</script>
  	<script>skills.musicianship</script>
  	<script>skills.peacemaking</script>
  	<script>skills.provocation</script>
- 	<script>skills.mining</script>
- 	<script>skills.lumberjacking</script>
- 	<script>skills.tailoring</script>
  	<script>skills.spiritspeak</script>
! 	<script>skills.itemid</script>
  	<script>skills.tasteid</script>
  
  	<!-- Testing Scripts -->
  	<script>testing.multibag</script>
  </definitions>
--- 164,198 ----
  	<!-- Skills -->
  	<script>skills</script>
+ 	<script>skills.alchemy</script>
  	<script>skills.anatomy</script>
  	<script>skills.animallore</script>
  	<script>skills.animaltaming</script>
+ 	<script>skills.armslore</script>
  	<script>skills.begging</script>
+ 	<script>skills.blacksmithing</script>
  	<script>skills.bowcraft</script>
  	<script>skills.carpentry</script>
! 	<script>skills.cooking</script>
! 	<script>skills.detectinghidden</script>
! 	<script>skills.evaluatingintel</script>
! 	<script>skills.fishing</script>
  	<script>skills.healing</script>
  	<script>skills.hiding</script>
  	<script>skills.inscription</script>
! 	<script>skills.itemid</script>
! 	<script>skills.lumberjacking</script>
! 	<script>skills.mining</script>
  	<script>skills.musicianship</script>
  	<script>skills.peacemaking</script>
  	<script>skills.provocation</script>
  	<script>skills.spiritspeak</script>
! 	<script>skills.stealth</script>
! 	<script>skills.tailoring</script>
  	<script>skills.tasteid</script>
+ 	<script>skills.tinkering</script>
+ 	<script>skills.tracking</script>
  
  	<!-- Testing Scripts -->
  	<script>testing.multibag</script>
+ 
  </definitions>

[wpdev-commits] xmlscripts/scripts/commands freeze.py,NONE,1.1 dye.py,1.2,1.3

From: Richard M. <dr...@us...> - 2004-06-15 19:29:09

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

Modified Files:
	dye.py 
Added Files:
	freeze.py 
Log Message:
Updated dye to work on character skins.
'dye 0 or 'dye 0x0 will reset the player to char.orgskin :)
Also, added a freeze command, this just toggles the frozen value.


--- NEW FILE: freeze.py ---
#===============================================================#
#   )      (\_     | WOLFPACK 13.0.0 Scripts
#  ((    _/{  "-;  | Created by: Dreoth
#   )).-' {{ ;'`   | Revised by:
#  ( (  ;._ \\ ctr | Last Modification: Created
#===============================================================#
# .dye Command
#===============================================================#

"""
	\command freeze
	\description Toggles the frozen value of the target.
	\usage - <code>freeze</code>
"""

import wolfpack
from wolfpack.utilities import *

def freeze( socket, command, arguments ):
	try:
		socket.attachtarget( "commands.freeze.response", [arguments] )
	except:
		socket.sysmessage( 'Usage: freeze' )

def response( char, args, target ):
	if target.char:
		if target.char.frozen == 0:
			target.char.frozen = 1
		elif target.char.frozen == 1:
			target.char.frozen = 0
	else:
		char.socket.sysmessage( 'That was not a valid object.', GRAY )

def onLoad():
	wolfpack.registercommand( "freeze", freeze )

Index: dye.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/dye.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dye.py	26 May 2004 13:07:21 -0000	1.2
--- dye.py	15 Jun 2004 19:28:59 -0000	1.3
***************
*** 10,14 ****
  """
  	\command dye
! 	\description Changes the color of the targetted item.
  	\usage - <code>dye color</code>
  	The color can either be passed as a decimal number or in the standard hexadecimal notation.
--- 10,14 ----
  """
  	\command dye
! 	\description Changes the color of the targetted item or skin of the targetted character.
  	\usage - <code>dye color</code>
  	The color can either be passed as a decimal number or in the standard hexadecimal notation.
***************
*** 28,38 ****
  	if target.item:
  		color = args[0]
! 		paint( char.socket, target.item, [color] )
  	else:
  		char.socket.sysmessage( 'That was not a valid object.', GRAY )
! 
! def paint( socket, item, args ):
! 	item.color = hex(args[0])
! 	item.update()
  
  def onLoad():
--- 28,42 ----
  	if target.item:
  		color = args[0]
! 		target.item.color = hex(color)
! 		target.item.update()
! 	elif target.char:
! 		skin = args[0]
! 		if skin == 0:
! 			skin = target.char.orgskin
! 		target.char.skin = hex(skin)
! 		target.char.update()
  	else:
  		char.socket.sysmessage( 'That was not a valid object.', GRAY )
! 	return
  
  def onLoad():

Flat | Threaded

<< < 1 .. 88 89 90 91 92 .. 201 > >> (Page 90 of 201)

2003	Jan	Feb	Mar	Apr	May	Jun	Jul (14)	Aug (121)	Sep (256)	Oct (59)	Nov (73)	Dec (120)
2004	Jan (259)	Feb (381)	Mar (501)	Apr (355)	May (427)	Jun (270)	Jul (394)	Aug (412)	Sep (724)	Oct (578)	Nov (65)	Dec