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

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 .. 170 171 172 173 174 .. 201 > >> (Page 172 of 201)

[wpdev-commits] wolfpack accounts.cpp,1.72,1.73 accounts.h,1.32,1.33 commands.cpp,1.211,1.212 console_win.cpp,1.22,1.23

From: <dar...@us...> - 2004-01-21 22:14:10

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv31597

Modified Files:
	accounts.cpp accounts.h commands.cpp console_win.cpp 
Log Message:
Fixes for Accounts and the Server Thread (which did nothing for me)

Index: accounts.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** accounts.cpp	9 Jan 2004 19:35:22 -0000	1.72
--- accounts.cpp	21 Jan 2004 22:14:07 -0000	1.73
***************
*** 475,476 ****
--- 475,484 ----
  }
  
+ void cAccounts::clearAcls() {
+ 	iterator it = accounts.begin();
+ 
+ 	while (it != accounts.end()) {
+ 		it.data()->acl_ = 0;
+ 		++it;
+ 	}
+ }

Index: accounts.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** accounts.h	12 Sep 2003 15:39:55 -0000	1.32
--- accounts.h	21 Jan 2004 22:14:07 -0000	1.33
***************
*** 142,145 ****
--- 142,146 ----
  	void reload();
  	void clear();
+ 	void clearAcls();
  
  	typedef QMap<QString, cAccount*>::const_iterator const_iterator;

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.211
retrieving revision 1.212
diff -C2 -d -r1.211 -r1.212
*** commands.cpp	11 Jan 2004 04:54:07 -0000	1.211
--- commands.cpp	21 Jan 2004 22:14:07 -0000	1.212
***************
*** 141,145 ****
  	{
  		Console::instance()->ChangeColor( WPC_RED );
! 		Console::instance()->send( tr("WARNING: No ACLs for players, counselors, gms and admins defined!\n") );
  		Console::instance()->ChangeColor( WPC_NORMAL );
  		return;
--- 141,145 ----
  	{
  		Console::instance()->ChangeColor( WPC_RED );
! 		Console::instance()->send("WARNING: No ACLs for players, counselors, gms and admins defined!\n");
  		Console::instance()->ChangeColor( WPC_NORMAL );
  		return;
***************
*** 193,196 ****
--- 193,199 ----
  		_acls.insert( ACLname, acl );	
  	}
+ 
+ 	// Renew the ACL pointer for all loaded accounts
+ 	Accounts::instance()->clearAcls();
  }
  

Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** console_win.cpp	21 Jan 2004 05:03:37 -0000	1.22
--- console_win.cpp	21 Jan 2004 22:14:07 -0000	1.23
***************
*** 446,452 ****
  
  	// Try to load riched20.dll
! 	HMODULE hRiched = LoadLibrary( "riched20.dll" );
  
! 	if( hRiched == 0 )
  	{
  		MessageBox( 0, "The riched20.dll library could not be found on your system.\nPlease install Microsoft Internet Explorer 4.0 or later.", "Missing DLL", MB_OK|MB_ICONERROR );
--- 446,452 ----
  
  	// Try to load riched20.dll
! 	HMODULE hRiched = LoadLibrary("riched20.dll");
  
! 	if (!hRiched)
  	{
  		MessageBox( 0, "The riched20.dll library could not be found on your system.\nPlease install Microsoft Internet Explorer 4.0 or later.", "Missing DLL", MB_OK|MB_ICONERROR );
***************
*** 468,474 ****
  	wpClass.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW;
  	
! 	if( !RegisterClass( &wpClass ) )
  	{
! 		MessageBox( 0, "Couldn't register Window Class.", "Window Class", MB_OK|MB_ICONERROR );
  		return 1;
  	}
--- 468,474 ----
  	wpClass.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW;
  	
! 	if (!RegisterClass(&wpClass))
  	{
! 		MessageBox(0, "Couldn't register Window Class.", "Window Class", MB_OK|MB_ICONERROR);
  		return 1;
  	}
***************
*** 487,491 ****
  	ShowWindow( mainWindow, SW_NORMAL );
  
! 	cServerThread serverThread( lpCmdLine );
  
  	MSG msg;
--- 487,492 ----
  	ShowWindow( mainWindow, SW_NORMAL );
  
! 	cServerThread serverThread(lpCmdLine);
! 	serverThread.start();
  
  	MSG msg;

[wpdev-commits] xmlscripts/scripts webadmin.py,1.15,1.16

From: <dar...@us...> - 2004-01-21 22:06:16

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv29385

Modified Files:
	webadmin.py 
Log Message:


Index: webadmin.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/webadmin.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** webadmin.py	21 Jan 2004 21:38:17 -0000	1.15
--- webadmin.py	21 Jan 2004 22:06:09 -0000	1.16
***************
*** 285,289 ****
  	if thread:
  		thread.cancel()
! 		time.sleep(30) # This is needed to allow the thread to sync (Remember => global interpreter lock)
  		thread.join() # Join with the thread
  
--- 285,289 ----
  	if thread:
  		thread.cancel()
! 		time.sleep(0.3) # This is needed to allow the thread to sync (Remember => global interpreter lock)
  		thread.join() # Join with the thread

[wpdev-commits] xmlscripts/scripts webadmin.py,1.14,1.15

From: <dar...@us...> - 2004-01-21 21:38:20

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv21370

Modified Files:
	webadmin.py 
Log Message:


Index: webadmin.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/webadmin.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** webadmin.py	6 Jan 2004 13:09:12 -0000	1.14
--- webadmin.py	21 Jan 2004 21:38:17 -0000	1.15
***************
*** 231,286 ****
  
  class WebserverThread(Thread):
!     def __init__( self, port=REMOTEADMIN_PORT ):
! 	Thread.__init__( self )
! 	self.port = port
! 	self.stopped = Event()
! 	self.httpd = None
! 
!     def cancel( self ):
!       self.stopped.set()
!       self.httpd.server_close()
! 
!     def run( self ):
!       # Wait with binding the webserver for 5 Seconds
!       server_address = ( '', self.port )
! 
!       # Starting up
!       if not wolfpack.isreloading():
!             wolfpack.console.send( "Remote Admin running on port %u\n" % self.port )
  
!       try:
!             filepath = os.path.normpath( os.path.abspath( 'web/' ) )
!             self.httpd = Webserver( ( '', self.port ), filepath )
!       except:
!             traceback.print_exc()
!             return
  
!       while 1:
!             self.httpd.handle_request()
!             self.stopped.wait( 0.05 )
!             
!             if self.stopped.isSet():
!                   break
  
!       wolfpack.console.send( "Shutting down the Remote Admin.\n" )
  
  thread = None
  
  def onServerStart():
! 	web.sessions.clear_sessions()
! 
! 	global thread
! 	thread = WebserverThread( REMOTEADMIN_PORT )
! 	thread.start()
  
  def onLoad():
! 	# Not on ServerStart
! 	if not wolfpack.isstarting():
! 		web.sessions.clear_sessions()
  
! 		# Start the Thread
! 		global thread
! 		thread = WebserverThread( REMOTEADMIN_PORT )
! 		thread.start()
  
  def onUnload():
--- 231,282 ----
  
  class WebserverThread(Thread):
!   def __init__( self, port=REMOTEADMIN_PORT ):
!     Thread.__init__( self )
!     self.port = port
!     self.stopped = Event()
!     self.httpd = None
  
!   def cancel( self ):
!     self.stopped.set()
  
!   def run( self ):
!     # Wait with binding the webserver for 5 Seconds
!     server_address = ('', self.port)
!     
!     # Starting up
!     if not wolfpack.isreloading():
!       wolfpack.console.send("Remote Admin running on port %u\n" % self.port)
!     
!     try:
!       filepath = os.path.normpath(os.path.abspath('web/'))
!       self.httpd = Webserver(('', self.port), filepath)
!     except:
!       traceback.print_exc()
!       return
!     
!     while not self.stopped.isSet():
!       self.httpd.handle_request()
!       self.stopped.wait(0.05)
  
!     wolfpack.console.send("Shutting down the Remote Admin.\n")
  
  thread = None
  
  def onServerStart():
!   web.sessions.clear_sessions()
!   
!   global thread
!   thread = WebserverThread(REMOTEADMIN_PORT)
!   thread.start()
  
  def onLoad():
!   # Not on ServerStart
!   if not wolfpack.isstarting():
!     web.sessions.clear_sessions()
  
!     # Start the Thread
!     global thread
!     thread = WebserverThread( REMOTEADMIN_PORT )
!     thread.start()
  
  def onUnload():
***************
*** 289,293 ****
  	if thread:
  		thread.cancel()
! 		time.sleep( 1 )	# This is needed to allow the thread to sync (Remember => global interpreter lock)
  		thread.join() # Join with the thread
  
--- 285,289 ----
  	if thread:
  		thread.cancel()
! 		time.sleep(30) # This is needed to allow the thread to sync (Remember => global interpreter lock)
  		thread.join() # Join with the thread

[wpdev-commits] wolfpack wolfpack.cpp,1.478,1.479

From: <thi...@us...> - 2004-01-21 05:05:44

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv25587

Modified Files:
	wolfpack.cpp 
Log Message:
Fix copyright info

Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.478
retrieving revision 1.479
diff -C2 -d -r1.478 -r1.479
*** wolfpack.cpp	7 Jan 2004 03:09:09 -0000	1.478
--- wolfpack.cpp	21 Jan 2004 05:05:41 -0000	1.479
***************
*** 4,9 ****
  //	UO Server Emulation Program
  //
! //	Copyright 1997, 98 by Marcus Rating (Cironian)
! //      Copyright 2001-2003 by holders identified in authors.txt
  //	This program is free software; you can redistribute it and/or modify
  //	it under the terms of the GNU General Public License as published by
--- 4,8 ----
  //	UO Server Emulation Program
  //
! //  Copyright 2001-2004 by holders identified in authors.txt
  //	This program is free software; you can redistribute it and/or modify
  //	it under the terms of the GNU General Public License as published by
***************
*** 292,297 ****
  	Console::instance()->setAttributes( false, false, false, 0xAF, 0xAF, 0xAF, 0, FONT_FIXEDWIDTH );
  
! 	Console::instance()->send( "Copyright (C) 1997, 98 Marcus Rating (Cironian)\n");
! 	Console::instance()->send( "Copyright (C) 2000-2003 Wolfpack Development Team\n");
  	Console::instance()->send( "Wolfpack Homepage: http://www.wpdev.org/\n");
  	Console::instance()->send( "By using this software you agree to the license accompanying this release.\n");
--- 291,295 ----
  	Console::instance()->setAttributes( false, false, false, 0xAF, 0xAF, 0xAF, 0, FONT_FIXEDWIDTH );
  
! 	Console::instance()->send( "Copyright (C) 2000-2004 Wolfpack Development Team\n");
  	Console::instance()->send( "Wolfpack Homepage: http://www.wpdev.org/\n");
  	Console::instance()->send( "By using this software you agree to the license accompanying this release.\n");

[wpdev-commits] wolfpack console_win.cpp,1.21,1.22

From: <thi...@us...> - 2004-01-21 05:03:39

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv25174

Modified Files:
	console_win.cpp 
Log Message:
fixed thread priority and did a small naming change.

Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** console_win.cpp	20 Jan 2004 02:06:00 -0000	1.21
--- console_win.cpp	21 Jan 2004 05:03:37 -0000	1.22
***************
*** 362,366 ****
  }
  
! class cGuiThread : public QThread
  {
  	LPSTR cmdLine;
--- 362,366 ----
  }
  
! class cServerThread : public QThread
  {
  	LPSTR cmdLine;
***************
*** 369,373 ****
  public:
  
! 	cGuiThread( LPSTR lpCmdLine ) : cmdLine( lpCmdLine ) {}
  
  	int returnValue() { return returnValue_; }
--- 369,373 ----
  public:
  
! 	cServerThread( LPSTR lpCmdLine ) : cmdLine( lpCmdLine ) {}
  
  	int returnValue() { return returnValue_; }
***************
*** 487,492 ****
  	ShowWindow( mainWindow, SW_NORMAL );
  
! 	cGuiThread guiThread( lpCmdLine );
! 	guiThread.start( QThread::LowPriority );
  
  	MSG msg;
--- 487,491 ----
  	ShowWindow( mainWindow, SW_NORMAL );
  
! 	cServerThread serverThread( lpCmdLine );
  
  	MSG msg;
***************
*** 528,534 ****
  	keeprun = 0; // We quit, so let's quit the server too
  
! 	guiThread.wait();
  	
! 	return guiThread.returnValue();
  }
  
--- 527,533 ----
  	keeprun = 0; // We quit, so let's quit the server too
  
! 	serverThread.wait();
  	
! 	return serverThread.returnValue();
  }

[wpdev-commits] xmlscripts/definitions/items/buildings chairs.xml,1.8,1.9

From: <as...@us...> - 2004-01-21 04:05:01

Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings
In directory sc8-pr-cvs1:/tmp/cvs-serv15428/buildings

Modified Files:
	chairs.xml 
Log Message:
splitted up to avoid hang on some systems


Index: chairs.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/chairs.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** chairs.xml	27 Sep 2003 19:49:13 -0000	1.8
--- chairs.xml	21 Jan 2004 04:04:57 -0000	1.9
***************
*** 13,22 ****
  	<item id="459">
  		<id>0x0459</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench 1 (N/S)</category>
  	</item>
  
  	<item id="45a">
  		<id>0x045a</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench 1 (W/E)</category>
  	</item>
  
--- 13,22 ----
  	<item id="459">
  		<id>0x0459</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench\Marble Bench 1 (N/S)</category>
  	</item>
  
  	<item id="45a">
  		<id>0x045a</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench\Marble Bench 1 (W/E)</category>
  	</item>
  
***************
*** 24,33 ****
  	<item id="45b">
  		<id>0x045b</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 1 (N/S)</category>
  	</item>
  
  	<item id="45c">
  		<id>0x045c</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 1 (W/E)</category>
  	</item>
  
--- 24,33 ----
  	<item id="45b">
  		<id>0x045b</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 1 (N/S)</category>
  	</item>
  
  	<item id="45c">
  		<id>0x045c</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 1 (W/E)</category>
  	</item>
  
***************
*** 35,44 ****
  	<item id="a2a">
  		<id>0x0a2a</id> <nodecay />
! 		<category>Decoration\Chairs\Stool 1</category>
  	</item>
  
  	<item id="a2b">
  		<id>0x0a2b</id> <nodecay />
! 		<category>Decoration\Chairs\Stool 2</category>
  	</item>
  
--- 35,44 ----
  	<item id="a2a">
  		<id>0x0a2a</id> <nodecay />
! 		<category>Decoration\Chairs\Stool\Stool 1</category>
  	</item>
  
  	<item id="a2b">
  		<id>0x0a2b</id> <nodecay />
! 		<category>Decoration\Chairs\Stool\Stool 2</category>
  	</item>
  
***************
*** 46,55 ****
  	<item id="b2c">
  		<id>0x0b2c</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench 1 (W/E)</category>
  	</item>
  
  	<item id="b2d">
  		<id>0x0b2d</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench 1 (N/S)</category>
  	</item>
  
--- 46,55 ----
  	<item id="b2c">
  		<id>0x0b2c</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench\Wooden Bench 1 (W/E)</category>
  	</item>
  
  	<item id="b2d">
  		<id>0x0b2d</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench\Wooden Bench 1 (N/S)</category>
  	</item>
  
***************
*** 57,233 ****
  	<item id="b2e">
  		<id>0x0b2e</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair 1</category>
  	</item>
  
  	<item id="b2f">
  		<id>0x0b2f</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair 2</category>
  	</item>
  
  	<item id="b30">
  		<id>0x0b30</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair 3</category>
  	</item>
  
  	<item id="b31">
  		<id>0x0b31</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair 4</category>
  	</item>
  
! 	<!-- Throne -->
  	<item id="b32">
  		<id>0x0b32</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Throne 1</category>
  	</item>
  
  	<item id="b33">
  		<id>0x0b33</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Throne 2</category>
  	</item>
  
! 	<!-- Wooden Chairs -->
  	<item id="b4e">
  		<id>0x0b4e</id> <nodecay />
! 		<category>Decoration\Chairs\Fancy Wooden Chair 1</category>
  	</item>
  
  	<item id="b4f">
  		<id>0x0b4f</id> <nodecay />
! 		<category>Decoration\Chairs\Fancy Wooden Chair 2</category>
  	</item>
  
  	<item id="b50">
  		<id>0x0b50</id> <nodecay />
! 		<category>Decoration\Chairs\Fancy Wooden Chair 3</category>
  	</item>
  
  	<item id="b51">
  		<id>0x0b51</id> <nodecay />
! 		<category>Decoration\Chairs\Fancy Wooden Chair 4</category>
  	</item>
  
  	<item id="b52">
  		<id>0x0b52</id> <nodecay />
! 		<category>Decoration\Chairs\Simple Wooden Chair 1</category>
  	</item>
  
  	<item id="b53">
  		<id>0x0b53</id> <nodecay />
! 		<category>Decoration\Chairs\Simple Wooden Chair 2</category>
  	</item>
  
  	<item id="b54">
  		<id>0x0b54</id> <nodecay />
! 		<category>Decoration\Chairs\Simple Wooden Chair 3</category>
  	</item>
  
  	<item id="b55">
  		<id>0x0b55</id> <nodecay />
! 		<category>Decoration\Chairs\Simple Wooden Chair 4</category>
  	</item>
  
  	<item id="b56">
  		<id>0x0b56</id> <nodecay />
! 		<category>Decoration\Chairs\Plain Wooden Chair 1</category>
  	</item>
  
  	<item id="b57">
  		<id>0x0b57</id> <nodecay />
! 		<category>Decoration\Chairs\Plain Wooden Chair 2</category>
  	</item>
  
  	<item id="b58">
  		<id>0x0b58</id> <nodecay />
! 		<category>Decoration\Chairs\Plain Wooden Chair 3</category>
  	</item>
  
  	<item id="b59">
  		<id>0x0b59</id> <nodecay />
! 		<category>Decoration\Chairs\Plain Wooden Chair 4</category>
  	</item>
  
  	<item id="b5a">
  		<id>0x0b5a</id> <nodecay />
! 		<category>Decoration\Chairs\Rustic Wooden Chair 1</category>
  	</item>
  
  	<item id="b5b">
  		<id>0x0b5b</id> <nodecay />
! 		<category>Decoration\Chairs\Rustic Wooden Chair 2</category>
  	</item>
  
  	<item id="b5c">
  		<id>0x0b5c</id> <nodecay />
! 		<category>Decoration\Chairs\Rustic Wooden Chair 3</category>
  	</item>
  
  	<item id="b5d">
  		<id>0x0b5d</id> <nodecay />
! 		<category>Decoration\Chairs\Rustic Wooden Chair 4</category>
  	</item>
  
  	<item id="b5e">
  		<id>0x0b5e</id> <nodecay />
! 		<category>Decoration\Chairs\Foot Stool</category>
  	</item>
  
  	<item id="b5f">
  		<id>0x0b5f</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench 2 (W/E) (1/3)</category>
  	</item>
  
  	<item id="b60">
  		<id>0x0b60</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench 2 (W/E) (2/3)</category>
  	</item>
  
  	<item id="b61">
  		<id>0x0b61</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench 2 (W/E) (3/3)</category>
  	</item>
  
  	<item id="b62">
  		<id>0x0b62</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 2 (W/E) (1/3)</category>
  	</item>
  
  	<item id="b63">
  		<id>0x0b63</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 2 (W/E) (2/3)</category>
  	</item>
  
  	<item id="b64">
  		<id>0x0b64</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 2 (W/E) (3/3)</category>
  	</item>
  
  	<item id="b65">
  		<id>0x0b65</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench 2 (N/S) (1/3)</category>
  	</item>
  
  	<item id="b66">
  		<id>0x0b66</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench 2 (N/S) (2/3)</category>
  	</item>
  
  	<item id="b67">
  		<id>0x0b67</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench 2 (N/S) (3/3)</category>
  	</item>
  
  	<item id="b68">
  		<id>0x0b68</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 2 (N/S) (1/3)</category>
  	</item>
  
  	<item id="b69">
  		<id>0x0b69</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 2 (N/S) (2/3)</category>
  	</item>
  
  	<item id="b6a">
  		<id>0x0b6a</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 2 (N/S) (3/3)</category>
  	</item>
  
--- 57,238 ----
  	<item id="b2e">
  		<id>0x0b2e</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Wooden Chair 1</category>
  	</item>
  
  	<item id="b2f">
  		<id>0x0b2f</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Wooden Chair 2</category>
  	</item>
  
  	<item id="b30">
  		<id>0x0b30</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Wooden Chair 3</category>
  	</item>
  
  	<item id="b31">
  		<id>0x0b31</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Wooden Chair 4</category>
  	</item>
  
! 	<!-- Wooden Throne -->
  	<item id="b32">
  		<id>0x0b32</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Throne\Wooden Throne 1</category>
  	</item>
  
  	<item id="b33">
  		<id>0x0b33</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Throne\Wooden Throne 2</category>
  	</item>
  
! 	<!-- Wooden Chair -->
  	<item id="b4e">
  		<id>0x0b4e</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 1</category>
  	</item>
  
  	<item id="b4f">
  		<id>0x0b4f</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 2</category>
  	</item>
  
  	<item id="b50">
  		<id>0x0b50</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 3</category>
  	</item>
  
  	<item id="b51">
  		<id>0x0b51</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 4</category>
  	</item>
  
  	<item id="b52">
  		<id>0x0b52</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 1</category>
  	</item>
  
  	<item id="b53">
  		<id>0x0b53</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 2</category>
  	</item>
  
  	<item id="b54">
  		<id>0x0b54</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 3</category>
  	</item>
  
  	<item id="b55">
  		<id>0x0b55</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 4</category>
  	</item>
  
  	<item id="b56">
  		<id>0x0b56</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 1</category>
  	</item>
  
  	<item id="b57">
  		<id>0x0b57</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 2</category>
  	</item>
  
  	<item id="b58">
  		<id>0x0b58</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 3</category>
  	</item>
  
  	<item id="b59">
  		<id>0x0b59</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 4</category>
  	</item>
  
  	<item id="b5a">
  		<id>0x0b5a</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 1</category>
  	</item>
  
  	<item id="b5b">
  		<id>0x0b5b</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 2</category>
  	</item>
  
  	<item id="b5c">
  		<id>0x0b5c</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 3</category>
  	</item>
  
  	<item id="b5d">
  		<id>0x0b5d</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 4</category>
  	</item>
  
+ 	<!-- misc -->
  	<item id="b5e">
  		<id>0x0b5e</id> <nodecay />
! 		<category>Decoration\Chairs\Misc\Foot Stool</category>
  	</item>
  
+ 	<!-- Wooden Bench -->
  	<item id="b5f">
  		<id>0x0b5f</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (1/3)</category>
  	</item>
  
  	<item id="b60">
  		<id>0x0b60</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (2/3)</category>
  	</item>
  
  	<item id="b61">
  		<id>0x0b61</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (W/E) (3/3)</category>
  	</item>
  
+ 	<!-- Sandstone Bench -->
  	<item id="b62">
  		<id>0x0b62</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (1/3)</category>
  	</item>
  
  	<item id="b63">
  		<id>0x0b63</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (2/3)</category>
  	</item>
  
  	<item id="b64">
  		<id>0x0b64</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (W/E) (3/3)</category>
  	</item>
  
+ 	<!-- Wooden Bench -->
  	<item id="b65">
  		<id>0x0b65</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (1/3)</category>
  	</item>
  
  	<item id="b66">
  		<id>0x0b66</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (2/3)</category>
  	</item>
  
  	<item id="b67">
  		<id>0x0b67</id> <nodecay />
! 		<category>Decoration\Chairs\Wooden Bench\Wooden Bench 2 (N/S) (3/3)</category>
  	</item>
  
+ 	<!-- Sandstone Bench -->
  	<item id="b68">
  		<id>0x0b68</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (1/3)</category>
  	</item>
  
  	<item id="b69">
  		<id>0x0b69</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (2/3)</category>
  	</item>
  
  	<item id="b6a">
  		<id>0x0b6a</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 2 (N/S) (3/3)</category>
  	</item>
  
***************
*** 235,254 ****
  	<item id="b91">
  		<id>0x0b91</id> <nodecay />
! 		<category>Decoration\Chairs\Bench (N/S) (1/2)</category>
  	</item>
  
  	<item id="b92">
  		<id>0x0b92</id> <nodecay />
! 		<category>Decoration\Chairs\Bench (N/S) (2/2)</category>
  	</item>
  
  	<item id="b93">
  		<id>0x0b93</id> <nodecay />
! 		<category>Decoration\Chairs\Bench (W/E) (1/2)</category>
  	</item>
  
  	<item id="b94">
  		<id>0x0b94</id> <nodecay />
! 		<category>Decoration\Chairs\Bench (N/S) (2/2)</category>
  	</item>
  
--- 240,259 ----
  	<item id="b91">
  		<id>0x0b91</id> <nodecay />
! 		<category>Decoration\Chairs\Wall Bench\Bench (N/S) (1/2)</category>
  	</item>
  
  	<item id="b92">
  		<id>0x0b92</id> <nodecay />
! 		<category>Decoration\Chairs\Wall Bench\Bench (N/S) (2/2)</category>
  	</item>
  
  	<item id="b93">
  		<id>0x0b93</id> <nodecay />
! 		<category>Decoration\Chairs\Wall Bench\Bench (W/E) (1/2)</category>
  	</item>
  
  	<item id="b94">
  		<id>0x0b94</id> <nodecay />
! 		<category>Decoration\Chairs\Wall Bench\Bench (N/S) (2/2)</category>
  	</item>
  
***************
*** 256,271 ****
  	<item id="1049">
  		<id>0x1049</id> <nodecay />
! 		<category>Decoration\Chairs\Loom Bench (W/E)</category>
  	</item>
  
  	<item id="104a">
  		<id>0x104a</id> <nodecay />
! 		<category>Decoration\Chairs\Loom Bench (N/S)</category>
  	</item>
  
! 	<!-- Bamboo Stool -->
  	<item id="11fc">
  		<id>0x11fc</id> <nodecay />
! 		<category>Decoration\Chairs\Bamboo Stool</category>
  	</item>
  
--- 261,276 ----
  	<item id="1049">
  		<id>0x1049</id> <nodecay />
! 		<category>Decoration\Chairs\Loom Bench\Loom Bench (W/E)</category>
  	</item>
  
  	<item id="104a">
  		<id>0x104a</id> <nodecay />
! 		<category>Decoration\Chairs\Loom Bench\Loom Bench (N/S)</category>
  	</item>
  
! 	<!-- misc -->
  	<item id="11fc">
  		<id>0x11fc</id> <nodecay />
! 		<category>Decoration\Chairs\Misc\Bamboo Stool</category>
  	</item>
  
***************
*** 273,287 ****
  	<item id="1207">
  		<id>0x1207</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench 1 (W/E) (1/3)</category>
  	</item>
  
  	<item id="1208">
  		<id>0x1208</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench 1 (W/E) (2/3)</category>
  	</item>
  
  	<item id="1209">
  		<id>0x1209</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench 1 (W/E) (3/3)</category>
  	</item>
  
--- 278,292 ----
  	<item id="1207">
  		<id>0x1207</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench\Stone Bench 1 (W/E) (1/3)</category>
  	</item>
  
  	<item id="1208">
  		<id>0x1208</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench\Stone Bench 1 (W/E) (2/3)</category>
  	</item>
  
  	<item id="1209">
  		<id>0x1209</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench\Stone Bench 1 (W/E) (3/3)</category>
  	</item>
  
***************
*** 289,389 ****
  	<item id="1218">
  		<id>0x1218</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne 1</category>
  	</item>
  
  	<item id="1219">
  		<id>0x1219</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne 2</category>
  	</item>
  
  	<item id="121a">
  		<id>0x121a</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne 3</category>
  	</item>
  
  	<item id="121b">
  		<id>0x121b</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne 4</category>
  	</item>
  
  	<item id="1526">
  		<id>0x1526</id> <nodecay />
! 		<category>Decoration\Chairs\Lord British Throne (1/2)</category>
  	</item>
  
  	<item id="1527">
  		<id>0x1527</id> <nodecay />
! 		<category>Decoration\Chairs\Lord British Throne (2/2)</category>
  	</item>
  
  	<item id="1dc7">
  		<id>0x1dc7</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 3 (N/S) (1/3)</category>
  	</item>
  
  	<item id="1dc8">
  		<id>0x1dc8</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 3 (N/S) (3/3)</category>
  	</item>
  
  	<item id="1dc9">
  		<id>0x1dc9</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 3 (N/S) (2/3)</category>
  	</item>
  
  	<item id="1dca">
  		<id>0x1dca</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 3 (W/E) (1/3)</category>
  	</item>
  
  	<item id="1dcb">
  		<id>0x1dcb</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 3 (W/E) (3/3)</category>
  	</item>
  
  	<item id="1dcc">
  		<id>0x1dcc</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench 3 (W/E) (2/3)</category>
  	</item>
  
  	<item id="1dcd">
  		<id>0x1dcd</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench 2 (N/S) (1/3)</category>
  	</item>
  
  	<item id="1dce">
  		<id>0x1dce</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench 2 (N/S) (3/3)</category>
  	</item>
  
  	<item id="1dcf">
  		<id>0x1dcf</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench 2 (N/S) (2/3)</category>
  	</item>
  
  	<item id="1dd0">
  		<id>0x1dd0</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench 2 (W/E) (1/3)</category>
  	</item>
  
  	<item id="1dd1">
  		<id>0x1dd1</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench 2 (W/E) (3/3)</category>
  	</item>
  
  	<item id="1dd2">
  		<id>0x1dd2</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench 2 (W/E) (2/3)</category>
  	</item>
  
! 	<!-- Stone Bench 2 -->
  	<item id="3dff">
  		<id>0x3dff</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench 2 (N/S)</category>
  	</item>
  
  	<item id="3e00">
  		<id>0x3e00</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench 2 (W/E)</category>
  	</item>
  </definitions>
--- 294,396 ----
  	<item id="1218">
  		<id>0x1218</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne\Stone Throne 1</category>
  	</item>
  
  	<item id="1219">
  		<id>0x1219</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne\Stone Throne 2</category>
  	</item>
  
  	<item id="121a">
  		<id>0x121a</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne\Stone Throne 3</category>
  	</item>
  
  	<item id="121b">
  		<id>0x121b</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne\Stone Throne 4</category>
  	</item>
  
  	<item id="1526">
  		<id>0x1526</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne\Lord British Throne (1/2)</category>
  	</item>
  
  	<item id="1527">
  		<id>0x1527</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Throne\Lord British Throne (2/2)</category>
  	</item>
  
+ 	<!-- Sandstone Bench -->
  	<item id="1dc7">
  		<id>0x1dc7</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 3 (N/S) (1/3)</category>
  	</item>
  
  	<item id="1dc8">
  		<id>0x1dc8</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 3 (N/S) (3/3)</category>
  	</item>
  
  	<item id="1dc9">
  		<id>0x1dc9</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 3 (N/S) (2/3)</category>
  	</item>
  
  	<item id="1dca">
  		<id>0x1dca</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 3 (W/E) (1/3)</category>
  	</item>
  
  	<item id="1dcb">
  		<id>0x1dcb</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 3 (W/E) (3/3)</category>
  	</item>
  
  	<item id="1dcc">
  		<id>0x1dcc</id> <nodecay />
! 		<category>Decoration\Chairs\Sandstone Bench\Sandstone Bench 3 (W/E) (2/3)</category>
  	</item>
  
+ 	<!-- Marble Bench -->
  	<item id="1dcd">
  		<id>0x1dcd</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench\Marble Bench 2 (N/S) (1/3)</category>
  	</item>
  
  	<item id="1dce">
  		<id>0x1dce</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench\Marble Bench 2 (N/S) (3/3)</category>
  	</item>
  
  	<item id="1dcf">
  		<id>0x1dcf</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench\Marble Bench 2 (N/S) (2/3)</category>
  	</item>
  
  	<item id="1dd0">
  		<id>0x1dd0</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench\Marble Bench 2 (W/E) (1/3)</category>
  	</item>
  
  	<item id="1dd1">
  		<id>0x1dd1</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench\Marble Bench 2 (W/E) (3/3)</category>
  	</item>
  
  	<item id="1dd2">
  		<id>0x1dd2</id> <nodecay />
! 		<category>Decoration\Chairs\Marble Bench\Marble Bench 2 (W/E) (2/3)</category>
  	</item>
  
! 	<!-- Stone Bench -->
  	<item id="3dff">
  		<id>0x3dff</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench\Stone Bench 2 (N/S)</category>
  	</item>
  
  	<item id="3e00">
  		<id>0x3e00</id> <nodecay />
! 		<category>Decoration\Chairs\Stone Bench\Stone Bench 2 (W/E)</category>
  	</item>
  </definitions>

[wpdev-commits] wolfpack console_win.cpp,1.20,1.21

From: <thi...@us...> - 2004-01-20 02:06:03

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv2943

Modified Files:
	console_win.cpp 
Log Message:
Changed GUI thread to low priority

Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** console_win.cpp	8 Jan 2004 08:33:38 -0000	1.20
--- console_win.cpp	20 Jan 2004 02:06:00 -0000	1.21
***************
*** 488,492 ****
  
  	cGuiThread guiThread( lpCmdLine );
! 	guiThread.start();
  
  	MSG msg;
--- 488,492 ----
  
  	cGuiThread guiThread( lpCmdLine );
! 	guiThread.start( QThread::LowPriority );
  
  	MSG msg;

[wpdev-commits] xmlscripts/definitions/items/vegetation plants.xml,1.9,1.10 trees.xml,1.5,1.6

From: <as...@us...> - 2004-01-20 00:53:46

Update of /cvsroot/wpdev/xmlscripts/definitions/items/vegetation
In directory sc8-pr-cvs1:/tmp/cvs-serv22864

Modified Files:
	plants.xml trees.xml 
Log Message:
splitted up (caused hangs on some systems)


Index: plants.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/vegetation/plants.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** plants.xml	3 Oct 2003 17:42:54 -0000	1.9
--- plants.xml	20 Jan 2004 00:53:43 -0000	1.10
***************
*** 186,193 ****
          </item>
  
!         <!-- Plants -->
          <item id="c4f">
                  <id>0xC4F</id> <nodecay />
!                 <category>Vegetation\Plants\Cotton 1</category>
                  <events>environment</events>
          </item>
--- 186,193 ----
          </item>
[...1208 lines suppressed...]
+         <item id="cc7">
+                 <id>0xCC7</id> <nodecay />
+                 <category>Vegetation\Plants\Misc\Weed</category>
+         </item>
+ 
+         <item id="cc8">
+                 <id>0xCC8</id> <nodecay />
+                 <category>Vegetation\Plants\Misc\Juniper Bush</category>
+         </item>
+ 
+         <item id="d04">
+                 <id>0xD04</id> <nodecay />
+                 <category>Vegetation\Plants\Misc\Water Plants</category>
+         </item>
+ 
+         <item id="d05">
+                 <id>0xD05</id> <nodecay />
+                 <category>Vegetation\Plants\Misc\Reeds</category>
+         </item>
  </definitions>

Index: trees.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/vegetation/trees.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** trees.xml	3 Oct 2003 17:42:54 -0000	1.5
--- trees.xml	20 Jan 2004 00:53:43 -0000	1.6
***************
*** 51,828 ****
          </item>
  
!         <!-- Trees -->
          <item id="1b1f">
                  <id>0x1B1F</id> <nodecay />
!                 <category>Vegetation\Trees\Leaves 1</category>
          </item>
  
          <item id="1b20">
                  <id>0x1B20</id> <nodecay />
[...1789 lines suppressed...]
!         <item id="d44">
!                 <id>0xD44</id> <nodecay />
!                 <category>Vegetation\Trees\Misc\Tree 1 (4/4)</category>
!         </item>
! 
!         <item id="d84">
!                 <id>0xD84</id> <nodecay />
!                 <category>Vegetation\Trees\Misc\Tree 2 (1/3)</category>
!         </item>
! 
!         <item id="d85">
!                 <id>0xD85</id> <nodecay />
!                 <category>Vegetation\Trees\Misc\Tree 2 (2/3)</category>
!         </item>
! 
!         <item id="d86">
!                 <id>0xD86</id> <nodecay />
!                 <category>Vegetation\Trees\Misc\Tree 2 (3/3)</category>
          </item>
  </definitions>

[wpdev-commits] wolfpack/python global.cpp,1.97,1.98

From: <as...@us...> - 2004-01-20 00:52:19

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv22611/python

Modified Files:
	global.cpp 
Log Message:
'info on undefined items will not crash the server anymore


Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** global.cpp	13 Oct 2003 00:11:47 -0000	1.97
--- global.cpp	20 Jan 2004 00:52:12 -0000	1.98
***************
*** 707,729 ****
  
  	PyObject *dict = PyDict_New();
! 	PyDict_SetItemString( dict, "name", PyString_FromString( tile.name ) );
! 	PyDict_SetItemString( dict, "height", PyInt_FromLong( tile.height ) );
! 	PyDict_SetItemString( dict, "weight", PyInt_FromLong( tile.weight ) );
! 	PyDict_SetItemString( dict, "layer", PyInt_FromLong( tile.layer ) );
! 	PyDict_SetItemString( dict, "animation", PyInt_FromLong( tile.animation ) );
! 	PyDict_SetItemString( dict, "quantity", PyInt_FromLong( tile.quantity ) );
! 	PyDict_SetItemString( dict, "unknown1", PyInt_FromLong( tile.unknown1 ) );
! 	PyDict_SetItemString( dict, "unknown2", PyInt_FromLong( tile.unknown2 ) );
! 	PyDict_SetItemString( dict, "unknown3", PyInt_FromLong( tile.unknown3 ) );
! 	PyDict_SetItemString( dict, "unknown4", PyInt_FromLong( tile.unknown4 ) );
! 	PyDict_SetItemString( dict, "unknown5", PyInt_FromLong( tile.unknown5 ) );
! 	PyDict_SetItemString( dict, "flag1", PyInt_FromLong( tile.flag1 ) );
! 	PyDict_SetItemString( dict, "flag2", PyInt_FromLong( tile.flag2 ) );
! 	PyDict_SetItemString( dict, "flag3", PyInt_FromLong( tile.flag3 ) );
! 	PyDict_SetItemString( dict, "flag4", PyInt_FromLong( tile.flag4 ) );
! 	PyDict_SetItemString( dict, "wet", PyInt_FromLong( tile.isWet() ) );
! 	PyDict_SetItemString( dict, "blocking", PyInt_FromLong( tile.isBlocking() ) );
! 	PyDict_SetItemString( dict, "floor", PyInt_FromLong( tile.isRoofOrFloorTile() ) );
! 	PyDict_SetItemString( dict, "flagnames", PyString_FromString( getFlagNames( tile ).join(",") ) );
  	
  	return dict;
--- 707,742 ----
  
  	PyObject *dict = PyDict_New();
! 
! 	// test if item is defined
! 	if( !strlen( tile.name ) )
! 	{
! 		PyDict_SetItemString( dict, "name", PyString_FromString( "unknown" ) );
! 		PyDict_SetItemString( dict, "flag1", PyInt_FromLong( 0 ) );
! 		PyDict_SetItemString( dict, "flag2", PyInt_FromLong( 0 ) );
! 		PyDict_SetItemString( dict, "flag3", PyInt_FromLong( 0 ) );
! 		PyDict_SetItemString( dict, "flag4", PyInt_FromLong( 0 ) );
! 	}
! 	else
! 	{
! 		PyDict_SetItemString( dict, "name", PyString_FromString( tile.name ) );
! 		PyDict_SetItemString( dict, "height", PyInt_FromLong( tile.height ) );
! 		PyDict_SetItemString( dict, "weight", PyInt_FromLong( tile.weight ) );
! 		PyDict_SetItemString( dict, "layer", PyInt_FromLong( tile.layer ) );
! 		PyDict_SetItemString( dict, "animation", PyInt_FromLong( tile.animation ) );
! 		PyDict_SetItemString( dict, "quantity", PyInt_FromLong( tile.quantity ) );
! 		PyDict_SetItemString( dict, "unknown1", PyInt_FromLong( tile.unknown1 ) );
! 		PyDict_SetItemString( dict, "unknown2", PyInt_FromLong( tile.unknown2 ) );
! 		PyDict_SetItemString( dict, "unknown3", PyInt_FromLong( tile.unknown3 ) );
! 		PyDict_SetItemString( dict, "unknown4", PyInt_FromLong( tile.unknown4 ) );
! 		PyDict_SetItemString( dict, "unknown5", PyInt_FromLong( tile.unknown5 ) );
! 		PyDict_SetItemString( dict, "flag1", PyInt_FromLong( tile.flag1 ) );
! 		PyDict_SetItemString( dict, "flag2", PyInt_FromLong( tile.flag2 ) );
! 		PyDict_SetItemString( dict, "flag3", PyInt_FromLong( tile.flag3 ) );
! 		PyDict_SetItemString( dict, "flag4", PyInt_FromLong( tile.flag4 ) );
! 		PyDict_SetItemString( dict, "wet", PyInt_FromLong( tile.isWet() ) );
! 		PyDict_SetItemString( dict, "blocking", PyInt_FromLong( tile.isBlocking() ) );
! 		PyDict_SetItemString( dict, "floor", PyInt_FromLong( tile.isRoofOrFloorTile() ) );
! 		PyDict_SetItemString( dict, "flagnames", PyString_FromString( getFlagNames( tile ).join(",") ) );
! 	}
  	
  	return dict;

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

From: <dr...@us...> - 2004-01-19 18:23:35

Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic
In directory sc8-pr-cvs1:/tmp/cvs-serv8845/magic

Modified Files:
	utilities.py 
Log Message:
Added the other reagents to the list.
Should make it easier for people who want to customize their spells.


Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/utilities.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utilities.py	8 Oct 2003 01:35:48 -0000	1.4
--- utilities.py	19 Jan 2004 18:23:32 -0000	1.5
***************
*** 8,11 ****
--- 8,12 ----
  TARGET_IGNORE = 4
  
+ # Common Reagents
  REAGENT_BLACKPEARL = 0xf7a
  REAGENT_BLOODMOSS = 0xf7b
***************
*** 16,19 ****
--- 17,39 ----
  REAGENT_SULFURASH = 0xf8c
  REAGENT_SPIDERSILK = 0xf8d
+ # Rarea Reagents
+ REAGENT_BATWING = 0xf78
+ REAGENT_BLACKMOOR = 0xf79
+ REAGENT_BLOODSPAWN = 0xf7c
+ REAGENT_DAEMONBLOOD = 0xf7d
+ REAGENT_BONE = 0xf7e
+ REAGENT_BRIMSTONE = 0xf7f
+ REAGENT_DAEMONBONE = 0xf8
+ REAGENT_FERTILEDIRT = 0xf81
+ REAGENT_DRAGONSBLOOD = 0xf82
+ REAGENT_EXECUTIONERSCAP = 0xf83
+ REAGENT_EYEOFNEWT = 0xf87
+ REAGENT_OBSIDIAN = 0xf89
+ REAGENT_PIGIRON = 0xf8a
+ REAGENT_PUMICE = 0xf8b
+ REAGENT_NOXCRYSTAL = 0xf8e
+ REAGENT_GRAVEDUST = 0xf8f
+ REAGENT_DEADWOOD = 0xf9
+ REAGENT_WYRMSHEART = 0xf91
  
  MODE_BOOK = 0

[wpdev-commits] xmlscripts/definitions/items/equipment reagents.xml,1.3,1.4

From: <dr...@us...> - 2004-01-19 18:22:23

Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment
In directory sc8-pr-cvs1:/tmp/cvs-serv8645/items/equipment

Added Files:
	reagents.xml 
Log Message:
Updates to reagents and stuff.

[wpdev-commits] xmlscripts/definitions/items/professions alchemist.xml,1.7,1.8

From: <dr...@us...> - 2004-01-19 18:22:23

Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions
In directory sc8-pr-cvs1:/tmp/cvs-serv8645/items/professions

Modified Files:
	alchemist.xml 
Log Message:
Updates to reagents and stuff.


Index: alchemist.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/alchemist.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** alchemist.xml	8 Jan 2004 17:59:48 -0000	1.7
--- alchemist.xml	19 Jan 2004 18:22:19 -0000	1.8
***************
*** 548,696 ****
  	</item>
  
- 	<!-- Reagents -->
- 	<item id="f78">
- 		<id>0x0f78</id>
- 		<category>Professions\Alchemist\Reagents\Batwing</category>
- 	</item>
- 
- 	<item id="f79">
- 		<id>0x0f79</id>
- 		<category>Professions\Alchemist\Reagents\Blackmoor</category>
- 	</item>
- 
- 	<item id="f7a">
- 		<id>0x0f7a</id>
- 		<buyprice>5</buyprice>
- 		<sellprice>3</sellprice>
- 		<category>Professions\Alchemist\Reagents\Black Pearl</category>
- 	</item>
- 
- 	<item id="f7b">
- 		<id>0x0f7b</id>
- 		<buyprice>5</buyprice>
- 		<sellprice>3</sellprice>
- 		<category>Professions\Alchemist\Reagents\Blood Moss</category>
- 	</item>
- 
- 	<item id="f7c">
- 		<id>0x0f7c</id>
- 		<category>Professions\Alchemist\Reagents\Bloodspawn</category>
- 	</item>
- 
- 	<item id="f7d">
- 		<id>0x0f7d</id>
- 		<category>Professions\Alchemist\Reagents\Vial of Blood</category>
- 	</item>
- 
- 	<item id="f7e">
- 		<id>0x0f7e</id>
- 		<category>Professions\Alchemist\Reagents\Bone</category>
- 	</item>
- 
- 	<item id="f7f">
- 		<id>0x0f7f</id>
- 		<category>Professions\Alchemist\Reagents\Brimstone</category>
- 	</item>
- 
- 	<item id="f80">
- 		<id>0x0f80</id>
- 		<category>Professions\Alchemist\Reagents\Daemon Bone</category>
- 	</item>
- 
- 	<item id="f81">
- 		<id>0x0f81</id>
- 		<category>Professions\Alchemist\Reagents\Fertile Dirt</category>
- 	</item>
- 
- 	<item id="f82">
- 		<id>0x0f82</id>
- 		<category>Professions\Alchemist\Reagents\Dragon's Blood</category>
- 	</item>
- 
- 	<item id="f83">
- 		<id>0x0f83</id>
- 		<category>Professions\Alchemist\Reagents\Executioners cap</category>
- 	</item>
- 
- 	<item id="f84">
- 		<id>0x0f84</id>
- 		<buyprice>3</buyprice>
- 		<sellprice>2</sellprice>
- 		<category>Professions\Alchemist\Reagents\Garlic</category>
- 	</item>
- 
- 	<item id="f85">
- 		<id>0x0f85</id>
- 		<buyprice>3</buyprice>
- 		<sellprice>2</sellprice>
- 		<category>Professions\Alchemist\Reagents\Ginseng</category>
- 	</item>
- 
- 	<item id="f86">
- 		<id>0x0f86</id>
- 		<buyprice>3</buyprice>
- 		<sellprice>2</sellprice>
- 		<category>Professions\Alchemist\Reagents\Mandrake Root</category>
- 	</item>
- 
- 	<item id="f87">
- 		<id>0x0f87</id>
- 		<category>Professions\Alchemist\Reagents\Eyes of Newt</category>
- 	</item>
- 
- 	<item id="f88">
- 		<id>0x0f88</id>
- 		<buyprice>3</buyprice>
- 		<sellprice>2</sellprice>
- 		<category>Professions\Alchemist\Reagents\Nightshade</category>
- 	</item>
- 
- 	<item id="f89">
- 		<id>0x0f89</id>
- 		<category>Professions\Alchemist\Reagents\Obsidian</category>
- 	</item>
- 
- 	<item id="f8a">
- 		<id>0x0f8a</id>
- 		<category>Professions\Alchemist\Reagents\Pig Iron</category>
- 	</item>
- 
- 	<item id="f8b">
- 		<id>0x0f8b</id>
- 		<category>Professions\Alchemist\Reagents\Pumice</category>
- 	</item>
- 
- 	<item id="f8c">
- 		<id>0x0f8c</id>
- 		<buyprice>3</buyprice>
- 		<sellprice>2</sellprice>
- 		<category>Professions\Alchemist\Reagents\Sulfurous Ash</category>
- 	</item>
- 
- 	<item id="f8d">
- 		<id>0x0f8d</id>
- 		<buyprice>3</buyprice>
- 		<sellprice>2</sellprice>
- 		<category>Professions\Alchemist\Reagents\Spider's Silk</category>
- 	</item>
- 
- 	<item id="f8e">
- 		<id>0x0f8e</id>
- 		<category>Professions\Alchemist\Reagents\Serpent's Scale</category>
- 	</item>
- 
- 	<item id="f8f">
- 		<id>0x0f8f</id>
- 		<category>Professions\Alchemist\Reagents\Volcanic Ash</category>
- 	</item>
- 
- 	<item id="f90">
- 		<id>0x0f90</id>
- 		<category>Professions\Alchemist\Reagents\Dead Wood</category>
- 	</item>
- 
- 	<item id="f91">
- 		<id>0x0f91</id>
- 		<category>Professions\Alchemist\Reagents\Wyrm's Heart</category>
- 	</item>
  </definitions>
--- 548,550 ----

[wpdev-commits] xmlscripts/scripts/skills __init__.py,1.7,1.8 mining.py,1.6,1.7

From: <dr...@us...> - 2004-01-16 21:14:23

Update of /cvsroot/wpdev/xmlscripts/scripts/skills
In directory sc8-pr-cvs1:/tmp/cvs-serv6444/scripts/skills

Modified Files:
	__init__.py mining.py 
Log Message:
Skills should now work, I disabled the anti macro stuff for now, because that is what was breaking it...
Mining now works too.


Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** __init__.py	15 Nov 2003 20:55:13 -0000	1.7
--- __init__.py	16 Jan 2004 21:14:20 -0000	1.8
***************
*** 16,71 ****
  {
  
! ALCHEMY: 	 [0,	0.5,	0.5,	1,	1000,	FALSE],
! ANATOMY: 	 [0.15,	0.15,	0.7,	1,	1000,	TRUE ],
! ANIMALLORE: 	 [0,	0,	1,	1,	1000,	TRUE ], 
! ITEMID: 	 [0,	0,	1,	1,	1000,	TRUE ],
! ARMSLORE: 	 [0.75,	0.15,	0.1,	1,	1000,	TRUE ],
! PARRYING: 	 [0.75,	0.25,	0,	1,	1000,	FALSE],
! BEGGING: 	 [0,	0,	0,	1,	1000,	TRUE ],
! BLACKSMITHING:	 [1,	0,	0,	1,	1000,	FALSE],
! BOWCRAFT: 	 [0.6,	1.6,	0,	1,	1000,	FALSE],
! PEACEMAKING: 	 [0,	0,	0,	1,	1000,	TRUE ],
! CAMPING: 	 [2,	1.5,	1.5,	1,	1000,	TRUE ],
! CARPENTRY: 	 [2,	0.5,	0,	1,	1000,	FALSE],
! CARTOGRAPHY: 	 [0,	0.75,	0.75,	1,	1000,	FALSE],
! COOKING: 	 [0,	2,	3,	1,	1000,	FALSE],
! DETECTINGHIDDEN: [0,	0.4,	0.6,	1,	1000,	TRUE ],
! ENTICEMENT: 	 [0,	0.25,	0.25,	1,	1000,	TRUE ],
! EVALUATINGINTEL: [0,	0,	1,	1,	1000,	TRUE ],
! HEALING: 	 [0.6,	0.6,	0.8,	1,	1000,	TRUE ],
! FISHING: 	 [0.5,	0.5,	0,	1,	1000,	TRUE ],
! FORENSICS: 	 [0,	0.2,	0.8,	1,	1000,	TRUE ],
! HERDING: 	 [1.625,0.625,	0.25,	1,	1000,	TRUE ],
! HIDING:	 	 [0,	0.8,	0.2,	1,	1000,	TRUE ],
! PROVOCATION: 	 [0,	0.45,	0.05,	1,	1000,	TRUE ],
! INSCRIPTION: 	 [0,	0.2,	0.8,	1,	1000,	FALSE],
! LOCKPICKING: 	 [0,	2,	0,	1,	1000,	TRUE ],
! MAGERY:		 [0,	0,	1.5,	1,	1000,	TRUE ],
! MAGICRESISTANCE: [0.25,	0.25,	0.5,	1,	1000,	TRUE ],
! TACTICS: 	 [0,	0,	0,	1,	1000,	FALSE],
! SNOOPING: 	 [0,	2.5,	0,	1,	1000,	TRUE ],
! MUSICIANSHIP: 	 [0,	0.8,	0.2,	1,	1000,	TRUE ],
! POISONING: 	 [0,	0.4,	1.6,	1,	1000,	TRUE ],
! ARCHERY: 	 [0.25,	0.75,	0,	1,	1000,	FALSE],
! SPIRITSPEAK: 	 [0,	0,	1,	1,	1000,	TRUE ],
! STEALING: 	 [0,	1,	0,	1,	1000,	TRUE ],
! TAILORING: 	 [0.38,	1.63,	0.5,	1,	1000,	FALSE],
! TAMING:	 	 [1.4,	0.2,	0.4,	1,	1000,	TRUE ],
! TASTEID: 	 [0.2,	0,	0.8,	1,	1000,	TRUE ],
! TINKERING: 	 [0.5,	0.2,	0.3,	1,	1000,	FALSE],
! TRACKING: 	 [0,	1.25,	1.25,	1,	1000,	TRUE ],
! VETERINARY: 	 [0.8,	0.4,	0,8,	1,	1000,	TRUE ],
! SWORDSMANSHIP:   [0.75,	0.25,	0,	1,	1000,	FALSE],
! MACEFIGHTING: 	 [0.9,	0.1,	0,	1,	1000,	FALSE],
! FENCING: 	 [0.45,	0.55,	0,	1,	1000,	FALSE],
! WRESTLING: 	 [0.9,	0.1,	0,	1,	1000,	FALSE],
! LUMBERJACKING:   [2,	0,	0,	1,	1000,	TRUE ],
! MINING: 	 [2,	0,	0,	1,	1000,	TRUE ],
! MEDITATION: 	 [0,	0,	0,	1,	1000,	TRUE ],
! STEALTH: 	 [0,	0,	0,	1,	1000,	TRUE ],
! REMOVETRAPS: 	 [0,	0,	0,	1,	1000,	TRUE ],
! NECROMANCY: 	 [0,	0,	0,	1,	1000,	TRUE ],
! FOCUS: 	 	 [0,	0,	0,	1,	1000,	FALSE],
! CHIVALRY: 	 [0,	0,	0,	1,	1000,	TRUE ]                
  }
  
--- 16,71 ----
  {
  
! ALCHEMY:					[0, 0.5, 0.5, 1, 1000, FALSE],
! ANATOMY:					[0.15, 0.15, 0.7, 1, 1000, FALSE ],
! ANIMALLORE:				[0, 0, 1, 1, 1000, FALSE ], 
! ITEMID:						[0, 0, 1, 1, 1000, FALSE ],
! ARMSLORE:				[0.75, 0.15, 0.1, 1, 1000, FALSE ],
! PARRYING:				[0.75, 0.25, 0, 1, 1000, FALSE],
! BEGGING:					[0, 0, 0, 1, 1000, FALSE ],
! BLACKSMITHING:		[1, 0, 0, 1, 1000, FALSE],
! BOWCRAFT:				[0.6, 1.6, 0, 1, 1000, FALSE],
! PEACEMAKING:			[0, 0, 0, 1, 1000, FALSE ],
! CAMPING:					[2, 1.5, 1.5, 1, 1000, FALSE ],
! CARPENTRY:				[2, 0.5, 0, 1, 1000, FALSE],
! CARTOGRAPHY:			[0, 0.75, 0.75, 1, 1000, FALSE],
! COOKING:					[0, 2, 3, 1, 1000, FALSE],
! DETECTINGHIDDEN:	[0, 0.4, 0.6, 1, 1000, FALSE ],
! ENTICEMENT:				[0, 0.25, 0.25, 1, 1000, FALSE ],
! EVALUATINGINTEL:	[0, 0, 1, 1, 1000, FALSE ],
! HEALING:					[0.6, 0.6, 0.8, 1, 1000, FALSE ],
! FISHING:					[0.5, 0.5, 0, 1, 1000, FALSE ],
! FORENSICS:				[0, 0.2, 0.8, 1, 1000, FALSE ],
! HERDING:					[1.625, 0.625, 0.25, 1, 1000, FALSE ],
! HIDING:					[0, 0.8, 0.2, 1, 1000, FALSE ],
! PROVOCATION:			[0, 0.45, 0.05, 1, 1000, FALSE ],
! INSCRIPTION:			[0, 0.2, 0.8, 1, 1000, FALSE],
! LOCKPICKING:			[0, 2, 0, 1, 1000, FALSE ],
! MAGERY:		 			[0, 0, 1.5, 1, 1000, FALSE ],
! MAGICRESISTANCE:	[0.25, 0.25, 0.5, 1, 1000, FALSE ],
! TACTICS:	 				[0, 0, 0, 1, 1000, FALSE],
! SNOOPING:				[0, 2.5, 0, 1, 1000, FALSE ],
! MUSICIANSHIP:			[0, 0.8, 0.2, 1, 1000, FALSE ],
! POISONING:	 			[0, 0.4, 1.6, 1, 1000, FALSE ],
! ARCHERY:					[0.25, 0.75, 0, 1, 1000, FALSE],
! SPIRITSPEAK:			[0, 0, 1, 1, 1000, FALSE ],
! STEALING:					[0, 1, 0, 1, 1000, FALSE ],
! TAILORING:				[0.38, 1.63, 0.5, 1, 1000, FALSE],
! TAMING:	 	 			[1.4, 0.2, 0.4, 1, 1000, FALSE ],
! TASTEID:					[0.2, 0, 0.8, 1, 1000, FALSE ],
! TINKERING:				[0.5, 0.2, 0.3, 1, 1000, FALSE],
! TRACKING:				[0, 1.25, 1.25, 1, 1000, FALSE ],
! VETERINARY:				[0.8, 0.4, 0,8,	1, 1000, FALSE ],
! SWORDSMANSHIP:		[0.75, 0.25, 0, 1, 1000, FALSE],
! MACEFIGHTING:			[0.9, 0.1, 0, 1, 1000, FALSE],
! FENCING:	 				[0.45, 0.55, 0, 1, 1000, FALSE],
! WRESTLING:	 			[0.9, 0.1, 0, 1, 1000, FALSE],
! LUMBERJACKING:		[2, 0, 0, 1, 1000, FALSE ],
! MINING:	 				[2, 0, 0, 1, 1000, FALSE ],
! MEDITATION: 			[0, 0, 0, 1, 1000, FALSE ],
! STEALTH:					[0, 0, 0, 1, 1000, FALSE ],
! REMOVETRAPS:			[0, 0, 0, 1, 1000, FALSE ],
! NECROMANCY:			[0, 0, 0, 1, 1000, FALSE ],
! FOCUS:	 					[0, 0, 0, 1, 1000, FALSE],
! CHIVALRY:				[0, 0, 0, 1, 1000, FALSE ]                
  }
  
***************
*** 100,104 ****
  	resourceitem.id = table[ resname ][ RESOURCEID ]
  	resourceitem.amount = amount
!         gem.settag( 'resourcecount', gem.gettag( 'resourcecount' ) - amount )
  
  	backpack.additem( resourceitem )
--- 100,104 ----
  	resourceitem.id = table[ resname ][ RESOURCEID ]
  	resourceitem.amount = amount
!         gem.settag( 'resourcecount', str( int( gem.gettag( 'resourcecount' ) ) - amount ) )
  
  	backpack.additem( resourceitem )
***************
*** 129,133 ****
  	
  	#If you lucky and antimacro is agree so let's gain this skill
! 	if ( gainchance >= whrandom.random() and antimacrocheck( char, skillid, targetobject ) ) or skillvalue < 100:
  		skillgain( char, skillid )
  
--- 129,133 ----
  	
  	#If you lucky and antimacro is agree so let's gain this skill
! 	if ( gainchance >= whrandom.random() ) or skillvalue < 100:
  		skillgain( char, skillid )
  
***************
*** 174,181 ****
  def statgain( char, stat ):
  	#STATGAINDELAY is not over ?
! 	if char.hastag( 'laststatgain' ) and ( time.time() - char.gettag( 'laststatgain' ) ) < STATGAINDELAY:
  		return OOPS
  	
! 	char.settag( 'laststatgain', time.time() )
  	if float( totalstats( char ) ) / wolfpack.settings.getNumber( "General", "StatCap", 225 ) >= whrandom.random():
  		if stat == STRENGTH:
--- 174,181 ----
  def statgain( char, stat ):
  	#STATGAINDELAY is not over ?
! 	if char.hastag( 'laststatgain' ) and ( time.time() - int(char.gettag( 'laststatgain' ) ) ) < STATGAINDELAY:
  		return OOPS
  	
! 	char.settag( 'laststatgain', str( time.time() ) )
  	if float( totalstats( char ) ) / wolfpack.settings.getNumber( "General", "StatCap", 225 ) >= whrandom.random():
  		if stat == STRENGTH:
***************
*** 199,206 ****
  def antimacrocheck( char, skillid, object ):
  	#Get or set antimacro tag: "AM" + SERIAL = COUNT
! 	tagname = "AMAC" + str( char.serial ) + " " + str( skillid )
! 	if object.hastag( tagname ):	
  		count = object.gettag( tagname )
! 		object.settag( tagname, count + 1 )
  		if count <= ANTIMACROALLOWANCE:
  			return OK
--- 199,206 ----
  def antimacrocheck( char, skillid, object ):
  	#Get or set antimacro tag: "AM" + SERIAL = COUNT
! 	tagname = "AMC_" + str( char.serial ) + " " + str( skillid )
! 	if object.hastag( tagname ):
  		count = object.gettag( tagname )
! 		object.settag( tagname, str( int( count + 1 ) ) )
  		if count <= ANTIMACROALLOWANCE:
  			return OK
***************
*** 211,215 ****
  			return OOPS
  	else:
! 		object.settag( tagname, 1 )
  		return OK
  
--- 211,215 ----
  			return OOPS
  	else:
! 		object.settag( tagname, "1" )
  		return OK
  

Index: mining.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mining.py	15 Nov 2003 20:55:13 -0000	1.6
--- mining.py	16 Jan 2004 21:14:20 -0000	1.7
***************
*** 22,162 ****
  oretable = \
  {
! 'iron':		[   0,   0, 1000, 1007072, 0x19b9,     0, 49.6,  0 ],
! 'dullcopper':	[ 650, 250, 1050, 1007073, 0x19b9, 0x973, 11.2, 50 ],
! 'shadowiron':	[ 700, 300, 1100, 1007074, 0x19b9, 0x966,  9.8, 50 ], 
! 'copper':	[ 750, 350, 1150, 1007075, 0x19b9, 0x960,  8.4, 50 ],
! 'bronze':	[ 800, 400, 1200, 1007076, 0x19b9, 0x972,    7, 50 ],
! 'gold':		[ 850, 450, 1250, 1007077, 0x19b9, 0x8a5,  5.6, 50 ],
! 'agapite':	[ 900, 500, 1300, 1007078, 0x19b9, 0x979,  4.2, 50 ],
! 'verite':	[ 950, 550, 1350, 1007079, 0x19b9, 0x89f,  2.8, 50 ],
! 'valorite':	[ 990, 590, 1390, 1007080, 0x19b9, 0x8ab,  1.4, 50 ]
  }
  
  def mining( char, pos, tool ):
!    char.addtimer( 1300, "skills.mining.domining", [oresound,tool,pos] )
!    char.settag( 'is_mining', servertime() + miningdelay )
!    char.turnto( pos )
!    char.action( 11 )
! 
!    return OK
  
  
  def getvein( socket, pos ):
!    #Check if we have ore_gems near ( range = 4 )
!    gems = wolfpack.items( pos.x, pos.y, pos.map, 4 )
!    if len( gems ) < 1:
!       gem = wolfpack.additem( 'ore_gem' )
!       gem.settag( 'resourcecount', whrandom.randint( 10, 34 ) )
!       gem.settag( 'resname', 'iron' )
!       gem.moveto( pos )
!       gem.visible = 0
!       gem.update()
!       return gem
!    else:
!       return gems[0]
  
  
  #Response from mining tool
  def response( char, args, target ):
!    socket = char.socket
!    if not socket:
!       return OOPS
! 
!    pos = target.pos
! 
!    # Player can reach that ?
!    if char.pos.map != pos.map or char.pos.distance( pos ) > MINING_MAX_DISTANCE:
!       socket.clilocmessage( 500446, "", RED, NORMAL ) # That is too far away
!       return OK
! 
!    tool = args[0]
! 
!    #Player also can't mine when riding, polymorphed and dead.
!    #Mine char ?!
!    if target.char:
!       socket.clilocmessage( 501863, "", RED, NORMAL ) # You can't mine that.
!       return OK
! 
!    
!    #Check if item is ore gem
!    elif target.item and isoregem( target.item ):
!       #Mine if ore gem is validated
!       socket.sysmessage( 'Ore gem founded' )
!       mining( char, target.pos, tool )
!       return OK
! 
!    #Find tile by it's position if we haven't model
!    elif target.model == 0:
!       map = wolfpack.map( target.pos.x, target.pos.y, target.pos.map )
!       if ismountainorcave( map['id'] ):
!          mining( char, target.pos, tool )
!       else:
!          socket.clilocmessage( 501862, "", RED, NORMAL ) # You can't mine there.
!       return OK
! 
!    #Find tile by it's model
!    elif target.model != 0:
!       if ismountainorcave( target.model ):
!          #add new ore gem here and mine
!          mining( char, target.pos, tool )
!       else:
!          socket.clilocmessage( 501862, "", RED, NORMAL ) # You can't mine there.
!       return OK
!    else:
!       return OOPS
! 
!    return OK
  
  #Sound effect
  def domining( char, args ):
!    char.soundeffect( args[0] )
!    tool = args[1]
!    pos = args[2]
!    socket = char.socket
! 
!    if char.hastag( 'mining_gem' ):
!       veingem = wolfpack.finditem( char.gettag( 'mining_gem' ) )
!       if not veingem:
!          veingem = getvein( socket, pos )
!          if not veingem:
!             char.deltag( 'mining_gem' )
!             return OOPS
!    else:
!       veingem = getvein( socket, pos )
!       if not veingem:
!          return OOPS
!       else:
!          char.settag( 'mining_gem', veingem.serial )
! 
!    if char.distanceto( veingem ) > MINING_MAX_DISTANCE:
!       veingem = getvein( socket, pos )
! 
!    if not veingem:
!       return OOPS
! 
!    if not veingem.hastag( 'resname' ) or not veingem.hastag( 'resourcecount' ):
!       return OOPS
! 
!    resname = veingem.gettag( 'resname' ) # Sometimes mutated in colored ore and back
!    resourcecount = veingem.gettag( 'resourcecount' )
!    reqskill = oretable[ resname ][ REQSKILL ]
! 
!    success = 0
!    char.update()
!    char.updatestats()
! 
!    # Are you skilled enough ? And here is ore ?
!    if resourcecount > 2 and ( char.skill[ MINING ] >= reqskill or char.skill[ MINING ] <= 100 ):
!          skills.checkskill( char, veingem, MINING, 0 )
!          if whrandom.random() > 0.7:
!             skills.successharvest( char, veingem, oretable, resname, 1 ) # 1 - amount of ore
!             success = 1
! 
! 
! 
!    if success == 0:
!       socket.clilocmessage( 501869, "", GRAY, NORMAL ) # You loosen some rocks but fail to find any usable ore.
!       
!    char.deltag('nowmining')
  
!    return OK
--- 22,160 ----
  oretable = \
  {
! 	'iron':			[ 0, 0, 1000, 1007072, 0x19b9, 0x0, 49.6, 0 ],
! 	'dullcopper':	[ 650, 250, 1050, 1007073, 0x19b9, 0x973, 11.2, 50 ],
! 	'shadowiron':	[ 700, 300, 1100, 1007074, 0x19b9, 0x966,  9.8, 50 ], 
! 	'copper':		[ 750, 350, 1150, 1007075, 0x19b9, 0x960,  8.4, 50 ],
! 	'bronze':		[ 800, 400, 1200, 1007076, 0x19b9, 0x972,    7, 50 ],
! 	'gold':			[ 850, 450, 1250, 1007077, 0x19b9, 0x8a5,  5.6, 50 ],
! 	'agapite':		[ 900, 500, 1300, 1007078, 0x19b9, 0x979,  4.2, 50 ],
! 	'verite':			[ 950, 550, 1350, 1007079, 0x19b9, 0x89f,  2.8, 50 ],
! 	'valorite':		[ 990, 590, 1390, 1007080, 0x19b9, 0x8ab,  1.4, 50 ]
  }
  
  def mining( char, pos, tool ):
! 	char.addtimer( 1300, "skills.mining.domining", [ oresound, tool, pos ] )
! 	char.settag( 'is_mining', str( servertime() + miningdelay ) )
! 	char.turnto( pos )
! 	char.action( ANIM_ATTACK3 )
! 	
! 	return OK
  
  
  def getvein( socket, pos ):
! 	#Check if we have ore_gems near ( range = 4 )
! 	gems = wolfpack.items( pos.x, pos.y, pos.map, 4 )
! 	if len( gems ) < 1:
! 		gem = wolfpack.additem( 'ore_gem' )
! 		gem.settag( 'resourcecount', str( whrandom.randint( 10, 34 ) ) )
! 		gem.settag( 'resname', 'iron' )
! 		gem.moveto( pos )
! 		gem.visible = 0
! 		gem.update()
! 		return gem
! 	else:
! 		return gems[0]
  
  
  #Response from mining tool
  def response( char, args, target ):
! 	socket = char.socket
! 	if not socket:
! 		return OOPS
! 	
! 	pos = target.pos
! 	
! 	# Player can reach that ?
! 	if char.pos.map != pos.map or char.pos.distance( pos ) > MINING_MAX_DISTANCE:
! 		socket.clilocmessage( 500446, "", RED, NORMAL ) # That is too far away
! 		return OK
! 	
! 	tool = args[0]
! 	
! 	#Player also can't mine when riding, polymorphed and dead.
! 	#Mine char ?!
! 	if target.char:
! 		socket.clilocmessage( 501863, "", RED, NORMAL ) # You can't mine that.
! 		return OK
! 	
! 	
! 	#Check if item is ore gem
! 	elif target.item and isoregem( target.item ):
! 		#Mine if ore gem is validated
! 		socket.sysmessage( 'Ore gem founded' )
! 		mining( char, target.pos, tool )
! 		return OK
! 	
! 	#Find tile by it's position if we haven't model
! 	elif target.model == 0:
! 		map = wolfpack.map( target.pos.x, target.pos.y, target.pos.map )
! 		if ismountainorcave( map['id'] ):
! 			mining( char, target.pos, tool )
! 		else:
! 			socket.clilocmessage( 501862, "", RED, NORMAL ) # You can't mine there.
! 		return OK
! 	
! 	#Find tile by it's model
! 	elif target.model != 0:
! 		if ismountainorcave( target.model ):
! 			#add new ore gem here and mine
! 			mining( char, target.pos, tool )
! 		else:
! 			socket.clilocmessage( 501862, "", RED, NORMAL ) # You can't mine there.
! 		return OK
! 	else:
! 		return OOPS
! 	
! 	return OK
  
  #Sound effect
  def domining( char, args ):
! 	char.soundeffect( args[0] )
! 	tool = args[1]
! 	pos = args[2]
! 	socket = char.socket
  
! 	if char.hastag( 'mining_gem' ):
! 		veingem = wolfpack.finditem( char.gettag( 'mining_gem' ) )
! 		if not veingem:
! 			veingem = getvein( socket, pos )
! 			if not veingem:
! 				char.deltag( 'mining_gem' )
! 				return OOPS
! 	else:
! 		veingem = getvein( socket, pos )
! 		if not veingem:
! 			return OOPS
! 		else:
! 			char.settag( 'mining_gem', str( veingem.serial ) )
! 	
! 	if char.distanceto( veingem ) > MINING_MAX_DISTANCE:
! 		veingem = getvein( socket, pos )
! 	
! 	if not veingem:
! 		return OOPS
! 	
! 	if not veingem.hastag( 'resname' ) or not veingem.hastag( 'resourcecount' ):
! 		return OOPS
! 	
! 	resname = veingem.gettag( 'resname' ) # Sometimes mutated in colored ore and back
! 	resourcecount = int( veingem.gettag( 'resourcecount' ) )
! 	reqskill = oretable[ resname ][ REQSKILL ]
! 	
! 	success = 0
! 	char.update()
! 	char.updatestats()
! 	
! 	# Are you skilled enough ? And here is ore ?
! 	if resourcecount > 2 and ( char.skill[ MINING ] >= reqskill or char.skill[ MINING ] <= 100 ):
! 			skills.checkskill( char, veingem, MINING, 0 )
! 			if whrandom.random() > 0.7:
! 				skills.successharvest( char, veingem, oretable, resname, 1 ) # 1 - amount of ore
! 				success = 1
! 	
! 	if success == 0:
! 		socket.clilocmessage( 501869, "", GRAY, NORMAL ) # You loosen some rocks but fail to find any usable ore.
! 		
! 	char.deltag('is_mining')
! 	
! 	return OK

[wpdev-commits] xmlscripts/scripts/tools pickaxe.py,1.5,1.6

From: <dr...@us...> - 2004-01-16 21:14:23

Update of /cvsroot/wpdev/xmlscripts/scripts/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv6444/scripts/tools

Modified Files:
	pickaxe.py 
Log Message:
Skills should now work, I disabled the anti macro stuff for now, because that is what was breaking it...
Mining now works too.


Index: pickaxe.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/tools/pickaxe.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pickaxe.py	3 Oct 2003 16:21:11 -0000	1.5
--- pickaxe.py	16 Jan 2004 21:14:20 -0000	1.6
***************
*** 16,42 ****
  
  def onUse( char, tool ):
!    #Already digging ?
!    if char.hastag( 'is_mining' ) and ( char.gettag( 'is_mining' ) > servertime() ):
!       char.socket.clilocmessage( 503029, "", GRAY, NORMAL ) # You are already digging.
!       return OK
! 
!    # Can't mine on horses
!    if char.itemonlayer( LAYER_MOUNT ):
!       char.socket.clilocmessage( 501864, "", RED, NORMAL ) # You can't mine while riding.
!       return OK
!    
!    # Who is tool owner ?
!    if tool.getoutmostchar() != char:
!       char.socket.clilocmessage( 500364, "", RED, NORMAL ) # You can't use that, it belongs to someone else
!       return OK
! 
!    # Is that mining tool ?
!    if isminingtool(tool):
!       char.socket.clilocmessage( 503033, "", YELLOW, NORMAL ) # Where do you wish to dig?
!       char.socket.attachtarget( "skills.mining.response", [tool] )
!    else:
!       char.socket.clilocmessage( 500735, "", RED, NORMAL ) # Don't play with things you don't know about. :)
!       return OK
! 
!    return OK
  
--- 16,42 ----
  
  def onUse( char, tool ):
! 	#Already digging ?
! 	if char.hastag( 'is_mining' ) and ( char.gettag( 'is_mining' ) > servertime() ):
! 		char.socket.clilocmessage( 503029, "", GRAY, NORMAL ) # You are already digging.
! 		return OK
! 	
! 	# Can't mine on horses
! 	if char.itemonlayer( LAYER_MOUNT ):
! 		char.socket.clilocmessage( 501864, "", RED, NORMAL ) # You can't mine while riding.
! 		return OK
! 	
! 	# Who is tool owner ?
! 	if tool.getoutmostchar() != char:
! 		char.socket.clilocmessage( 500364, "", RED, NORMAL ) # You can't use that, it belongs to someone else
! 		return OK
! 	
! 	# Is that mining tool ?
! 	if isminingtool(tool):
! 		char.socket.clilocmessage( 503033, "", YELLOW, NORMAL ) # Where do you wish to dig?
! 		char.socket.attachtarget( "skills.mining.response", [ tool ] )
! 	else:
! 		char.socket.clilocmessage( 500735, "", RED, NORMAL ) # Don't play with things you don't know about. :)
! 		return OK
! 	
! 	return OK

[wpdev-commits] xmlscripts/definitions/items/weaponry/swordsmanship pickaxe.xml,1.2,1.3

From: <dr...@us...> - 2004-01-16 21:14:23

Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship
In directory sc8-pr-cvs1:/tmp/cvs-serv6444/definitions/items/weaponry/swordsmanship

Modified Files:
	pickaxe.xml 
Log Message:
Skills should now work, I disabled the anti macro stuff for now, because that is what was breaking it...
Mining now works too.


Index: pickaxe.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/pickaxe.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pickaxe.xml	14 Jan 2004 13:07:33 -0000	1.2
--- pickaxe.xml	16 Jan 2004 21:14:20 -0000	1.3
***************
*** 17,21 ****
  		<tag name="req_str" value="50" type="int" />
  		<type>1001</type>
! 		<events>equipment</events>
  		<category>Weapons\Swords\Pickaxe (N/S)</category>
  		<category>Professions\Miner\Pickaxe (N/S)</category>
--- 17,21 ----
  		<tag name="req_str" value="50" type="int" />
  		<type>1001</type>
! 		<events>equipment,tools.pickaxe</events>
  		<category>Weapons\Swords\Pickaxe (N/S)</category>
  		<category>Professions\Miner\Pickaxe (N/S)</category>

[wpdev-commits] xmlscripts/scripts wall_clock.py,1.2,1.3

From: <dar...@us...> - 2004-01-15 20:25:29

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv8949

Modified Files:
	wall_clock.py 
Log Message:


Index: wall_clock.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wall_clock.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wall_clock.py	15 Jan 2004 19:52:56 -0000	1.2
--- wall_clock.py	15 Jan 2004 20:25:20 -0000	1.3
***************
*** 56,58 ****
  
  	char.message( time )
!   return 1
\ No newline at end of file
--- 56,58 ----
  
  	char.message( time )
! 	return 1
\ No newline at end of file

[wpdev-commits] xmlscripts/scripts wall_clock.py,1.1,1.2

From: <dar...@us...> - 2004-01-15 19:52:59

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv32337

Modified Files:
	wall_clock.py 
Log Message:


Index: wall_clock.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wall_clock.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wall_clock.py	11 Aug 2002 14:39:09 -0000	1.1
--- wall_clock.py	15 Jan 2004 19:52:56 -0000	1.2
***************
*** 56,57 ****
--- 56,58 ----
  
  	char.message( time )
+   return 1
\ No newline at end of file

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

From: <dr...@us...> - 2004-01-14 17:53:41

Update of /cvsroot/wpdev/xmlscripts/scripts/weapons
In directory sc8-pr-cvs1:/tmp/cvs-serv26493

Modified Files:
	blades.py 
Log Message:
Lumberjacking should work a lot better now :)


Index: blades.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/weapons/blades.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** blades.py	14 Jan 2004 13:12:28 -0000	1.10
--- blades.py	14 Jan 2004 17:53:38 -0000	1.11
***************
*** 33,40 ****
  	item = wolfpack.finditem( args[0] )
  
! 	if not item or not item.container == char:
! 		char.message( "You have to have the item in your hand to use it!" )
  		return
! 
  	# Corpse => Carve
  	# Wood => Kindling/Logs
--- 33,39 ----
  	item = wolfpack.finditem( args[0] )
  
! 	if not item:
  		return
! 		
  	# Corpse => Carve
  	# Wood => Kindling/Logs
***************
*** 90,94 ****
  		# Also allows a mace's war axe to be use. 0x13af and 0x13b0
  		if item.type == 1002 or item.id == 0x13af or item.id == 0x13b0:
! 			hack_logs( char, target.pos )
  		# Swords and Fencing Weapons: Get kindling
  		elif item.type == 1001 or item.type == 1005:
--- 89,97 ----
  		# Also allows a mace's war axe to be use. 0x13af and 0x13b0
  		if item.type == 1002 or item.id == 0x13af or item.id == 0x13b0:
! 			if not item or not item.container == char:
! 				char.message( "You must equip this item to use it on this target!" )
! 				return
! 			else:
! 				hack_logs( char, target.pos )
  		# Swords and Fencing Weapons: Get kindling
  		elif item.type == 1001 or item.type == 1005:
***************
*** 114,117 ****
--- 117,185 ----
  	return 0
  
+ # Delay for chopping trees and getting the logs
+ def chop_delay( time, args ):
+ 	char = args[0]
+ 	pos = args[1]
+ 	resource = args[2]
+ 	amount = args[3]
+ 	
+ 	# Skill Check against LUMBERJACKING
+ 	if not char.checkskill( LUMBERJACKING, LUMBERJACKING_MIN_SKILL, LUMBERJACKING_MAX_SKILL ):
+ 		char.socket.clilocmessage( 0x7A30F, "", 0x3b2, 3, char  ) # You hack at the tree for a while but fail to produce...
+ 		return
+ 	
+ 	char.socket.clilocmessage( 0x7A312, "", 0x3b2, 3, char  ) # You put some logs into your backpack
+ 
+ 	# Create an item in my pack (logs to be specific)
+ 	item = wolfpack.additem( "1be0" )
+ 	item.amount = 10
+ 	if not wolfpack.utilities.tobackpack( item, char ):
+ 		item.update()
+ 
+ 	# Create a resource item if neccesary
+ 	if not resource:
+ 		resource = wolfpack.additem( "1ea7" )
+ 		resource.name = 'Resource Item: logs'
+ 		resource.settag( 'resourcecount', str( amount - 1 ) )
+ 		resource.settag( 'resource', 'logs' )
+ 		resource.visible = 0 # GM Visible only
+ 		resource.moveto( pos )
+ 		resource.decay = 1
+ 		resource.decaytime = wolfpack.time.servertime() + ( LUMBERJACKING_REFILLTIME * 1000 )
+ 		resource.update() # Send to GMs
+ 	else:
+ 		resource.settag( 'resourcecount', amount - 1 )
+ 	
+ 	return OK
+ 
+ # Animation Sequence
+ def chop_tree_two( time, args ):
+ 	char = args[0]
+ 	pos = args[1]
+ 	# Turn to our lumberjacking position
+ 	direction = char.directionto( pos )
+ 	if char.direction != direction:
+ 		char.direction = direction
+ 		char.updateflags()
+ 
+ 	# Let him hack
+ 	char.action( 0xd )
+ 	char.soundeffect( 0x13e )
+ 	return OK
+ 	
+ def chop_tree_three( time, args ):
+ 	char = args[0]
+ 	pos = args[1]
+ 	# Turn to our lumberjacking position
+ 	direction = char.directionto( pos )
+ 	if char.direction != direction:
+ 		char.direction = direction
+ 		char.updateflags()
+ 
+ 	# Let him hack
+ 	char.action( 0xd )
+ 	char.soundeffect( 0x13e )
+ 	return OK
+ 	
  # HACK LOGS
  def hack_logs( char, pos ):
***************
*** 132,136 ****
  
  	# Default Range for each tree is 10 to 15 Logs
! 	if not resource:		
  		amount = whrandom.randint( LUMBERJACKING_MIN_LOGS, LUMBERJACKING_MAX_LOGS )
  	else:
--- 200,204 ----
  
  	# Default Range for each tree is 10 to 15 Logs
! 	if not resource:
  		amount = whrandom.randint( LUMBERJACKING_MIN_LOGS, LUMBERJACKING_MAX_LOGS )
  	else:
***************
*** 149,180 ****
  
  	# Let him hack
! 	char.action( 0x9 )
  	char.soundeffect( 0x13e )
- 
- 	# SkillCheck against LUMBERJACKING
- 	if not char.checkskill( LUMBERJACKING, LUMBERJACKING_MIN_SKILL, LUMBERJACKING_MAX_SKILL ):
- 		char.socket.clilocmessage( 0x7A30F, "", 0x3b2, 3, char  ) # You hack at the tree for a while but fail to produce...
- 		return
  	
! 	char.socket.clilocmessage( 0x7A312, "", 0x3b2, 3, char  ) # You put some logs into your backpack
! 
! 	# Create an item in my pack (logs to be specific)
! 	item = wolfpack.additem( "1be0" )
! 	if not wolfpack.utilities.tobackpack( item, char ):
! 		item.update()
! 
! 	# Create a resource item if neccesary
! 	if not resource:
! 		resource = wolfpack.additem( "1ea7" )
! 		resource.name = 'Resource Item: logs'
! 		resource.settag( 'resourcecount', str( amount - 1 ) )
! 		resource.settag( 'resource', 'logs' )
! 		resource.visible = 0 # GM Visible only
! 		resource.moveto( pos )
! 		resource.decay = 1
! 		resource.decaytime = wolfpack.time.servertime() + ( LUMBERJACKING_REFILLTIME * 1000 )
! 		resource.update() # Send to GMs
! 	else:
! 		resource.settag( 'resourcecount', amount - 1 )
  
  # CARVE CORPSE
--- 217,227 ----
  
  	# Let him hack
! 	char.action( 0xd )
  	char.soundeffect( 0x13e )
  	
! 	wolfpack.addtimer( 2000, "weapons.blades.chop_tree_two", [char, pos] ) 
! 	wolfpack.addtimer( 3500, "weapons.blades.chop_tree_three", [char, pos] )
! 	wolfpack.addtimer( 4000, "weapons.blades.chop_delay", [char, pos, resource, amount ] ) 
! 	return
  
  # CARVE CORPSE

[wpdev-commits] xmlscripts/scripts/weapons blades.py,1.9,1.10

From: <dr...@us...> - 2004-01-14 13:12:31

Update of /cvsroot/wpdev/xmlscripts/scripts/weapons
In directory sc8-pr-cvs1:/tmp/cvs-serv24563

Modified Files:
	blades.py 
Log Message:
Fixes the following error:
ERROR: An error occured in "weapons.blades": TypeError
TypeError: item.settag( key, tag )() argument 2 must be string, not int



Index: blades.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/weapons/blades.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** blades.py	14 Jan 2004 13:06:47 -0000	1.9
--- blades.py	14 Jan 2004 13:12:28 -0000	1.10
***************
*** 168,172 ****
  		resource = wolfpack.additem( "1ea7" )
  		resource.name = 'Resource Item: logs'
! 		resource.settag( 'resourcecount', amount - 1 )
  		resource.settag( 'resource', 'logs' )
  		resource.visible = 0 # GM Visible only
--- 168,172 ----
  		resource = wolfpack.additem( "1ea7" )
  		resource.name = 'Resource Item: logs'
! 		resource.settag( 'resourcecount', str( amount - 1 ) )
  		resource.settag( 'resource', 'logs' )
  		resource.visible = 0 # GM Visible only

[wpdev-commits] xmlscripts/definitions/items/weaponry/swordsmanship bardiche.xml,1.2,1.3 halberd.xml,1.2,1.3 pickaxe.xml,1.1,1.2 scythe.xml,1.2,1.3

From: <dr...@us...> - 2004-01-14 13:07:36

Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship
In directory sc8-pr-cvs1:/tmp/cvs-serv23612/swordsmanship

Modified Files:
	bardiche.xml halberd.xml pickaxe.xml scythe.xml 
Log Message:
Fixes for blades.py


Index: bardiche.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bardiche.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bardiche.xml	12 Jan 2004 05:00:49 -0000	1.2
--- bardiche.xml	14 Jan 2004 13:07:33 -0000	1.3
***************
*** 16,20 ****
  		<weight>7.0</weight>
  		<tag name="req_str" value="45" type="int" />
! 		<type>1001</type>
  		<events>equipment,weapons.blades</events>
  		<category>Weapons\Swords\Bardiche (N/S)</category>
--- 16,20 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="45" type="int" />
! 		<type>1002</type>
  		<events>equipment,weapons.blades</events>
  		<category>Weapons\Swords\Bardiche (N/S)</category>

Index: halberd.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/halberd.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** halberd.xml	12 Jan 2004 05:00:49 -0000	1.2
--- halberd.xml	14 Jan 2004 13:07:33 -0000	1.3
***************
*** 16,20 ****
  		<weight>16.0</weight>
  		<tag name="req_str" value="95" type="int" />
! 		<type>1001</type>
  		<events>equipment,weapons.blades</events>
  		<category>Weapons\Swords\Halberd (N/S)</category>
--- 16,20 ----
  		<weight>16.0</weight>
  		<tag name="req_str" value="95" type="int" />
! 		<type>1002</type>
  		<events>equipment,weapons.blades</events>
  		<category>Weapons\Swords\Halberd (N/S)</category>

Index: pickaxe.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/pickaxe.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pickaxe.xml	27 Dec 2003 15:26:59 -0000	1.1
--- pickaxe.xml	14 Jan 2004 13:07:33 -0000	1.2
***************
*** 17,21 ****
  		<tag name="req_str" value="50" type="int" />
  		<type>1001</type>
! 		<events>equipment,tools.pickaxe</events>
  		<category>Weapons\Swords\Pickaxe (N/S)</category>
  		<category>Professions\Miner\Pickaxe (N/S)</category>
--- 17,21 ----
  		<tag name="req_str" value="50" type="int" />
  		<type>1001</type>
! 		<events>equipment</events>
  		<category>Weapons\Swords\Pickaxe (N/S)</category>
  		<category>Professions\Miner\Pickaxe (N/S)</category>

Index: scythe.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/scythe.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scythe.xml	12 Jan 2004 05:00:49 -0000	1.2
--- scythe.xml	14 Jan 2004 13:07:33 -0000	1.3
***************
*** 16,20 ****
  		<weight>10.0</weight>
  		<tag name="req_str" value="45" type="int" />
! 		<type>1001</type>
  		<events>equipment,weapons.blades</events>
  		<category>Weapons\Swords\Scythe (N/S)</category>
--- 16,20 ----
  		<weight>10.0</weight>
  		<tag name="req_str" value="45" type="int" />
! 		<type>1002</type>
  		<events>equipment,weapons.blades</events>
  		<category>Weapons\Swords\Scythe (N/S)</category>

[wpdev-commits] xmlscripts/definitions/items/weaponry/fencing lance.xml,1.2,1.3 pitchfork.xml,1.2,1.3 short_spear.xml,1.2,1.3 spear.xml,1.2,1.3 war_fork.xml,1.2,1.3

From: <dr...@us...> - 2004-01-14 13:07:36

Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing
In directory sc8-pr-cvs1:/tmp/cvs-serv23612/fencing

Modified Files:
	lance.xml pitchfork.xml short_spear.xml spear.xml war_fork.xml 
Log Message:
Fixes for blades.py


Index: lance.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/lance.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lance.xml	12 Jan 2004 05:00:49 -0000	1.2
--- lance.xml	14 Jan 2004 13:07:33 -0000	1.3
***************
*** 16,20 ****
  		<weight>12.0</weight>
  		<tag name="req_str" value="95" type="int" />
! 		<events>equipment,weapons.blades</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\Lance (N/S)</category>
--- 16,20 ----
  		<weight>12.0</weight>
  		<tag name="req_str" value="95" type="int" />
! 		<events>equipment</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\Lance (N/S)</category>

Index: pitchfork.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pitchfork.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pitchfork.xml	12 Jan 2004 05:00:49 -0000	1.2
--- pitchfork.xml	14 Jan 2004 13:07:33 -0000	1.3
***************
*** 16,20 ****
  		<weight>10.0</weight>
  		<tag name="req_str" value="50" type="int" />
! 		<events>equipment,weapons.blades</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\Pitchfork (N/S)</category>
--- 16,20 ----
  		<weight>10.0</weight>
  		<tag name="req_str" value="50" type="int" />
! 		<events>equipment</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\Pitchfork (N/S)</category>

Index: short_spear.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/short_spear.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** short_spear.xml	12 Jan 2004 05:00:49 -0000	1.2
--- short_spear.xml	14 Jan 2004 13:07:33 -0000	1.3
***************
*** 16,20 ****
  		<weight>4.0</weight>
  		<tag name="req_str" value="40" type="int" />
! 		<events>equipment,weapons.blades</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\Short Spear (N/S)</category>
--- 16,20 ----
  		<weight>4.0</weight>
  		<tag name="req_str" value="40" type="int" />
! 		<events>equipment</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\Short Spear (N/S)</category>

Index: spear.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/spear.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spear.xml	12 Jan 2004 05:00:49 -0000	1.2
--- spear.xml	14 Jan 2004 13:07:33 -0000	1.3
***************
*** 16,20 ****
  		<weight>7.0</weight>
  		<tag name="req_str" value="50" type="int" />
! 		<events>equipment,weapons.blades</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\Spear (N/S)</category>
--- 16,20 ----
  		<weight>7.0</weight>
  		<tag name="req_str" value="50" type="int" />
! 		<events>equipment</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\Spear (N/S)</category>

Index: war_fork.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/war_fork.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** war_fork.xml	12 Jan 2004 05:00:49 -0000	1.2
--- war_fork.xml	14 Jan 2004 13:07:33 -0000	1.3
***************
*** 16,20 ****
  		<weight>1.0</weight>
  		<tag name="req_str" value="35" type="int" />
! 		<events>equipment,weapons.blades</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\War Fork (N/S)</category>
--- 16,20 ----
  		<weight>1.0</weight>
  		<tag name="req_str" value="35" type="int" />
! 		<events>equipment</events>
  		<type>1005</type>
  		<category>Weapons\Fencing\War Fork (N/S)</category>

[wpdev-commits] xmlscripts/definitions/items/weaponry/macefighting war_axe.xml,1.1,1.2

From: <dr...@us...> - 2004-01-14 13:07:36

Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting
In directory sc8-pr-cvs1:/tmp/cvs-serv23612/macefighting

Modified Files:
	war_axe.xml 
Log Message:
Fixes for blades.py


Index: war_axe.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/macefighting/war_axe.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** war_axe.xml	27 Dec 2003 15:26:59 -0000	1.1
--- war_axe.xml	14 Jan 2004 13:07:33 -0000	1.2
***************
*** 16,20 ****
  		<weight>3.0</weight>
  		<tag name="req_str" value="35" type="int" />
! 		<events>equipment</events>
  		<type>1004</type>
  		<category>Weapons\Axes\War Axe (N/S)</category>
--- 16,20 ----
  		<weight>3.0</weight>
  		<tag name="req_str" value="35" type="int" />
! 		<events>equipment,weapons.blades</events>
  		<type>1004</type>
  		<category>Weapons\Axes\War Axe (N/S)</category>

[wpdev-commits] xmlscripts/scripts/weapons blades.py,1.8,1.9

From: <dr...@us...> - 2004-01-14 13:07:01

Update of /cvsroot/wpdev/xmlscripts/scripts/weapons
In directory sc8-pr-cvs1:/tmp/cvs-serv23374

Modified Files:
	blades.py 
Log Message:
Not all bladed weapons should get logs from a tree, only the axe types.
Normal blades get kindling.
The war axe is allowed to get logs.
The scythe can get logs.
:)


Index: blades.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/weapons/blades.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** blades.py	12 Feb 2003 14:37:23 -0000	1.8
--- blades.py	14 Jan 2004 13:06:47 -0000	1.9
***************
*** 16,20 ****
  import weapons.blades
  
! # List of Blood IDs
  blood = [ "122a", "122b", "122d", "122f" ]
  trees = []
--- 16,20 ----
  import weapons.blades
  
! # Lists of IDs
  blood = [ "122a", "122b", "122d", "122f" ]
  trees = []
***************
*** 87,94 ****
  			return
  
! 		# This depends on the Weapon Type, 1001 (=Swords) and 1002 (=Axes) can hack logs
! 		if item.type == 1001 or item.type == 1002:
  			hack_logs( char, target.pos )
! 		else:
  			hack_kindling( char, target.pos )
  
--- 87,96 ----
  			return
  
! 		# Axes/Polearms get Logs, Swords get kindling. 
! 		# Also allows a mace's war axe to be use. 0x13af and 0x13b0
! 		if item.type == 1002 or item.id == 0x13af or item.id == 0x13b0:
  			hack_logs( char, target.pos )
! 		# Swords and Fencing Weapons: Get kindling
! 		elif item.type == 1001 or item.type == 1005:
  			hack_kindling( char, target.pos )

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

From: <dr...@us...> - 2004-01-14 12:48:33

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv19722

Modified Files:
	door.py 
Log Message:
The door linking works even better now.
Sleeping on things really helps :D


Index: door.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/door.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** door.py	14 Jan 2004 03:11:41 -0000	1.4
--- door.py	14 Jan 2004 12:48:29 -0000	1.5
***************
*** 62,66 ****
  			[ 0x6bF, 0x6c0, 1, -1, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
  			[ 0x6c1, 0x6c2, 0, 0, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
! 			[ 0x6c3, 0x6c4, 0, -1, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],		
  			
  			[ 0x6c5, 0x6c6, -1, 1, SOUND_OPENSTEEL, SOUND_CLOSESTEEL ],
--- 62,66 ----
  			[ 0x6bF, 0x6c0, 1, -1, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
  			[ 0x6c1, 0x6c2, 0, 0, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
! 			[ 0x6c3, 0x6c4, 0, -1, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
  			
  			[ 0x6c5, 0x6c6, -1, 1, SOUND_OPENSTEEL, SOUND_CLOSESTEEL ],
***************
*** 99,103 ****
  			[ 0x82e, 0x82f, 1, -1, SOUND_OPENGATE, SOUND_CLOSEGATE ],
  			[ 0x830, 0x831, 0, 0, SOUND_OPENGATE, SOUND_CLOSEGATE ],
! 			[ 0x832, 0x833, 0, -1, SOUND_OPENGATE, SOUND_CLOSEGATE ],			
  			
  			# Wooden Gate 1
--- 99,103 ----
  			[ 0x82e, 0x82f, 1, -1, SOUND_OPENGATE, SOUND_CLOSEGATE ],
  			[ 0x830, 0x831, 0, 0, SOUND_OPENGATE, SOUND_CLOSEGATE ],
! 			[ 0x832, 0x833, 0, -1, SOUND_OPENGATE, SOUND_CLOSEGATE ],
  			
  			# Wooden Gate 1
***************
*** 129,133 ****
  			[ 0x870, 0x871, 1, -1, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
  			[ 0x872, 0x873, 0, 0, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
! 			[ 0x874, 0x875, 0, -1, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],	
  			
  			# Barred Metal Door
--- 129,133 ----
  			[ 0x870, 0x871, 1, -1, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
  			[ 0x872, 0x873, 0, 0, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
! 			[ 0x874, 0x875, 0, -1, SOUND_OPENWOOD, SOUND_CLOSEWOOD ],
  			
  			# Barred Metal Door
***************
*** 149,153 ****
  			[ 0xF2, 0xF3, 1, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			[ 0xF4, 0xF5, 0, 0, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
! 			[ 0xF6, 0xF7, 0, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],			
  			
  			[ 0x314, 0x315, -1, 1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
--- 149,153 ----
  			[ 0xF2, 0xF3, 1, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			[ 0xF4, 0xF5, 0, 0, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
! 			[ 0xF6, 0xF7, 0, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			
  			[ 0x314, 0x315, -1, 1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
***************
*** 167,171 ****
  			[ 0x32E, 0x32F, 1, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			[ 0x330, 0x331, 0, 0, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
! 			[ 0x332, 0x333, 0, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],			
  			
  			[ 0x334, 0x335, -1, 1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
--- 167,171 ----
  			[ 0x32E, 0x32F, 1, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			[ 0x330, 0x331, 0, 0, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
! 			[ 0x332, 0x333, 0, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			
  			[ 0x334, 0x335, -1, 1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
***************
*** 185,189 ****
  			[ 0x34E, 0x34F, 1, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			[ 0x350, 0x351, 0, 0, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
! 			[ 0x352, 0x353, 0, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],			
  			
  			[ 0x354, 0x355, -1, 1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
--- 185,189 ----
  			[ 0x34E, 0x34F, 1, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			[ 0x350, 0x351, 0, 0, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
! 			[ 0x352, 0x353, 0, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			
  			[ 0x354, 0x355, -1, 1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
***************
*** 194,198 ****
  			[ 0x35E, 0x35F, 1, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			[ 0x360, 0x361, 0, 0, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
! 			[ 0x362, 0x363, 0, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],			
  		]
  		
--- 194,198 ----
  			[ 0x35E, 0x35F, 1, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  			[ 0x360, 0x361, 0, 0, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
! 			[ 0x362, 0x363, 0, -1, SOUND_OPENSECRET, SOUND_CLOSESECRET ],
  		]
  		
***************
*** 235,242 ****
  			if not item.hastag('opened'):
  				item.settag( 'opened', 'true' )
- 			else:
- 				item.deltag( 'opened' )
  			
! 			# Add an autoclose tempeffect			
  			item.addtimer( CLOSEDOOR_DELAY, "door.autoclose", [ opencount ], 1 )
  			
--- 235,240 ----
  			if not item.hastag('opened'):
  				item.settag( 'opened', 'true' )
  			
! 			# Add an autoclose tempeffect
  			item.addtimer( CLOSEDOOR_DELAY, "door.autoclose", [ opencount ], 1 )
  			
***************
*** 257,262 ****
  			item.id = door[0]
  			item.moveto( pos.x - door[2], pos.y - door[3] )
  			item.update()
- 			
  			# Soundeffect (close)			
  			char.soundeffect( door[5] )
--- 255,261 ----
  			item.id = door[0]
  			item.moveto( pos.x - door[2], pos.y - door[3] )
+ 			if item.hastag('opened'):
+ 				item.deltag( 'opened' )
  			item.update()
  			# Soundeffect (close)			
  			char.soundeffect( door[5] )
***************
*** 275,285 ****
  	# We are not supposed to close this door
  	if opencount != args[0]:
! 		return
! 
! 	item.deltag( 'opencount' )
  	
- 	if item.hastag( 'opened' ):
- 		item.deltag( 'opened' )
- 		
  	# Find the door definition for this item	
  	for door in doors:
--- 274,279 ----
  	# We are not supposed to close this door
  	if opencount != args[0]:
! 		return 
  	
  	# Find the door definition for this item	
  	for door in doors:
***************
*** 290,293 ****
--- 284,289 ----
  			item.id = door[0]
  			item.moveto( pos.x - door[2], pos.y - door[3] )
+ 			if item.hastag( 'opened' ):
+ 				item.deltag( 'opened' )
  			item.update()
  			
***************
*** 300,306 ****
  	char.objectdelay = 0
  
! 	if item.hastag('link') and not item.gettag('opened'):
  		doubledoor = wolfpack.finditem( hex2dec(item.gettag('link')) )
! 		if not doubledoor.gettag('opened'):
  			opendoor( char, doubledoor )
  	
--- 296,304 ----
  	char.objectdelay = 0
  
! 	# Do we have a linked door, is this door not open?
! 	if item.hastag('link') and not item.hastag('opened'):
  		doubledoor = wolfpack.finditem( hex2dec(item.gettag('link')) )
! 		# Double check to make sure either door isn't open.
! 		if not item.hastag('opened') and not doubledoor.hastag('opened'):
  			opendoor( char, doubledoor )

[wpdev-commits] wolfpack scriptmanager.cpp,1.8,1.9

From: <thi...@us...> - 2004-01-14 04:55:42

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv14807

Modified Files:
	scriptmanager.cpp 
Log Message:
Small, cosmetic change

Index: scriptmanager.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** scriptmanager.cpp	26 Sep 2003 01:03:52 -0000	1.8
--- scriptmanager.cpp	14 Jan 2004 04:55:39 -0000	1.9
***************
*** 29,33 ****
  //==================================================================================
  
- #include "qapplication.h"
  #include "scriptmanager.h"
  #include "wpdefmanager.h"
--- 29,32 ----
***************
*** 43,46 ****
--- 42,46 ----
  #include <qstring.h>
  #include <qregexp.h>
+ #include <qapplication.h>
  
  using namespace std;

Flat | Threaded

<< < 1 .. 170 171 172 173 174 .. 201 > >> (Page 172 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