wpdev-commits Mailing List for Wolfpack Emu (Page 53)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
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
|
|
From: spddmn <xxx...@us...> - 2004-09-04 08:31:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/speech In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30264/speech Modified Files: stablemaster.py Log Message: script update for stables 1.0 Index: stablemaster.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/stablemaster.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** stablemaster.py 26 May 2004 13:07:25 -0000 1.8 --- stablemaster.py 4 Sep 2004 08:31:34 -0000 1.9 *************** *** 112,119 **** def onSpeech( listener, speaker, text, keywords ): # Check if our name is in the beginning of the string ! #if not text.lower().startswith( listener.name.lower() ): ! #return 0 gump = cGump( 0, 0, 0, 50, 50 ) gump.addBackground( 0x24a4, 425, 400 ) --- 112,123 ---- def onSpeech( listener, speaker, text, keywords ): + if not char.socket: + return 0 + # Check if our name is in the beginning of the string ! if not text.lower().startswith( "vendor" ) or not text.lower().startswith( listener.name.lower() ): ! return 0 + speaker.char.socket.sysmessage("May I help thee?") gump = cGump( 0, 0, 0, 50, 50 ) gump.addBackground( 0x24a4, 425, 400 ) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 20:37:52
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28885/python Modified Files: pyaccount.cpp Log Message: fix Index: pyaccount.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyaccount.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** pyaccount.cpp 24 Aug 2004 00:23:24 -0000 1.40 --- pyaccount.cpp 3 Sep 2004 20:37:44 -0000 1.41 *************** *** 93,100 **** Py_RETURN_FALSE; - QValueVector<P_PLAYER> chars = self->account->caracterList(); - for ( uint i = 0; i < chars.size(); ++i ) - chars[i]->remove(); - self->account->remove(); self->account = 0; --- 93,96 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 20:37:52
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28885/network Modified Files: uosocket.cpp Log Message: fix Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.404 retrieving revision 1.405 diff -C2 -d -r1.404 -r1.405 *** uosocket.cpp 2 Sep 2004 23:29:51 -0000 1.404 --- uosocket.cpp 3 Sep 2004 20:37:44 -0000 1.405 *************** *** 477,481 **** _player->onLogout(); _player->setSocket( NULL ); - _player->account()->setInUse( false ); // Remove the player from it's party --- 477,480 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 20:37:52
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28885 Modified Files: accounts.cpp server.cpp Log Message: fix Index: accounts.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** accounts.cpp 31 Aug 2004 13:47:36 -0000 1.102 --- accounts.cpp 3 Sep 2004 20:37:43 -0000 1.103 *************** *** 139,142 **** --- 139,152 ---- void cAccount::remove() { + QValueVector<P_PLAYER>::iterator it; + for (it = characters_.begin(); it != characters_.end(); ++it) { + (*it)->setAccount(0, false); + if ((*it)->socket()) { + (*it)->socket()->setAccount(0); + } + (*it)->remove(); + } + characters_.clear(); + Accounts::instance()->remove( this ); } Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** server.cpp 3 Sep 2004 17:30:42 -0000 1.19 --- server.cpp 3 Sep 2004 20:37:43 -0000 1.20 *************** *** 364,370 **** Console::instance()->log(LOG_ERROR, exception.error() + "\n" ); error = true; ! } catch (...) { error = true; ! } setState( SHUTDOWN ); --- 364,370 ---- Console::instance()->log(LOG_ERROR, exception.error() + "\n" ); error = true; ! } /*catch (...) { error = true; ! }*/ setState( SHUTDOWN ); |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 19:23:38
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16564 Modified Files: basechar.cpp Log Message: fix for the fix. Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** basechar.cpp 3 Sep 2004 19:18:01 -0000 1.141 --- basechar.cpp 3 Sep 2004 19:23:14 -0000 1.142 *************** *** 1582,1585 **** --- 1582,1586 ---- skin_ = value.toInt(); removeFromView(false); + return 0; } |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 19:20:12
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15903 Modified Files: ChangeLog Log Message: A fix for the skin hue not being updated. Stupid UO client! Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ChangeLog 3 Sep 2004 17:30:42 -0000 1.24 --- ChangeLog 3 Sep 2004 19:19:59 -0000 1.25 *************** *** 42,45 **** --- 42,46 ---- - Fixed bug #0000268 (coord.validspawnspot() now corrects the z value of coordinates) - Made startup more fault tolerant. + - Fixed a bug where the skin hue of mobiles was not being sent to clients in range. Wolfpack 12.9.8 Beta (19. August 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 19:18:09
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15547 Modified Files: basechar.cpp Log Message: A fix for the skin hue not being updated. Stupid UO client! Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** basechar.cpp 3 Sep 2004 16:03:04 -0000 1.140 --- basechar.cpp 3 Sep 2004 19:18:01 -0000 1.141 *************** *** 813,817 **** soundEffect( 0x0214 ); setBody( orgBody_ ); ! setSkin( orgSkin_ ); setDead( false ); hitpoints_ = QMAX( 1, ( Q_UINT16 ) ( 0.1 * maxHitpoints_ ) ); --- 813,817 ---- soundEffect( 0x0214 ); setBody( orgBody_ ); ! setSkin( orgSkin_ ); setDead( false ); hitpoints_ = QMAX( 1, ( Q_UINT16 ) ( 0.1 * maxHitpoints_ ) ); *************** *** 887,891 **** corpse->remove(); ! resend( false ); // Let him "stand up" --- 887,892 ---- corpse->remove(); ! removeFromView(false); // The skin changed ! resend(false); // Let him "stand up" *************** *** 1578,1583 **** \property char.skin This integer property contains the skin color of the character. */ ! else ! SET_INT_PROPERTY( "skin", skin_ ) // \property char.direction This is the direction this character is facing. --- 1579,1586 ---- \property char.skin This integer property contains the skin color of the character. */ ! else if (name == "skin") { ! skin_ = value.toInt(); ! removeFromView(false); ! } // \property char.direction This is the direction this character is facing. |
|
From: spddmn <xxx...@us...> - 2004-09-03 18:20:09
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4384 Modified Files: bandages.py Log Message: fixed a bug using system.poison now Index: bandages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bandages.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** bandages.py 3 Sep 2004 17:07:50 -0000 1.11 --- bandages.py 3 Sep 2004 18:19:58 -0000 1.12 *************** *** 2,5 **** --- 2,6 ---- import wolfpack import random + import system.poison import wolfpack.utilities from wolfpack.consts import HEALING, ANATOMY, VETERINARY, ANIMALLORE *************** *** 100,105 **** --- 101,108 ---- if target == char: char.socket.clilocmessage(1061288) + #You do not require healing. else: char.socket.clilocmessage(500955) + #that being is not damaged return 0 *************** *** 126,138 **** if corpse and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.sysmessage("1") return if target.char and target.char.dead and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.sysmessage("You are not skilled enough for that.") return ! if target.char and target.poison > -1 and ( char.skill[ HEALING ] < 600 or char.skill[ ANATOMY ] < 600 ): ! char.socket.sysmessage("You are not skilled enough for that.") return --- 129,141 ---- if corpse and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.sysmessage("You are not skilled enough to heal the dead") return if target.char and target.char.dead and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.sysmessage("You are not skilled enough to heal the dead.") return ! if target.char and target.char.poison > -1 and ( char.skill[ HEALING ] < 600 or char.skill[ ANATOMY ] < 600 ): ! char.socket.sysmessage("You are not skilled enough to cure poisons.") return *************** *** 260,265 **** return ! target.poison=-1 ! target.update() if target <> char: target.socket.clilocmessage(1010059) --- 263,268 ---- return ! system.poison.cure(target) ! if target <> char: target.socket.clilocmessage(1010059) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 17:48:53
|
Update of /cvsroot/wpdev/wolfpack/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31331/data Modified Files: AUTHORS.txt Log Message: authors update Index: AUTHORS.txt =================================================================== RCS file: /cvsroot/wpdev/wolfpack/data/AUTHORS.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AUTHORS.txt 23 May 2004 11:15:15 -0000 1.1 --- AUTHORS.txt 3 Sep 2004 17:48:39 -0000 1.2 *************** *** 4,12 **** Sebastian Hartte (DarkStorm), Richard Meyer (Dreoth), Ki Hong Pae (Khpae), Charles Kerr (Punt), Fred Robinson (Ripper), Jörg Stückler (Sereg), Rüdiger Pakmor (Varan Dar), - Jorge Pereira (Kell), - Thomas Wagenveld (Radiant) --- 4,13 ---- Sebastian Hartte (DarkStorm), Richard Meyer (Dreoth), + Jorge Pereira (Kell), Ki Hong Pae (Khpae), Charles Kerr (Punt), + Thomas Wagenveld (Radiant) Fred Robinson (Ripper), Jörg Stückler (Sereg), + Damian Tedrow (spddmn), Rüdiger Pakmor (Varan Dar), |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 17:48:53
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31331 Modified Files: AUTHORS COPYRIGHT Log Message: authors update Index: COPYRIGHT =================================================================== RCS file: /cvsroot/wpdev/wolfpack/COPYRIGHT,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** COPYRIGHT 31 Aug 2004 00:56:26 -0000 1.4 --- COPYRIGHT 3 Sep 2004 17:48:38 -0000 1.5 *************** *** 1,3 **** ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Wolfpack Emu - We backend your world. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 1,3 ---- ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Wolfpack Emu - We backend your world. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 38,42 **** Unknown (Kid_Sk8) ! Unknown (Incanus) Unknown (spddmn) --- 38,42 ---- Unknown (Kid_Sk8) ! Sölken, Torben (Incanus) Unknown (spddmn) Index: AUTHORS =================================================================== RCS file: /cvsroot/wpdev/wolfpack/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AUTHORS 5 Aug 2004 20:26:28 -0000 1.2 --- AUTHORS 3 Sep 2004 17:48:37 -0000 1.3 *************** *** 1,3 **** ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Wolfpack Emu - We backend your world. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- 1,3 ---- ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Wolfpack Emu - We backend your world. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *************** *** 14,18 **** Desroches, Devon (Viper) Kerr, Charles (Punt) ! Hartte, Sebastian (DarkStorm) Meisl, Klaus (Naddel) Meshkov, Anton (Codex) --- 14,18 ---- Desroches, Devon (Viper) Kerr, Charles (Punt) ! Hartte, Sebastian (DarkStorm) :: seb...@ha... Meisl, Klaus (Naddel) Meshkov, Anton (Codex) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 17:30:54
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28435 Modified Files: ChangeLog server.cpp Log Message: Made startup more fault tolerant. Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** server.cpp 31 Aug 2004 17:44:37 -0000 1.18 --- server.cpp 3 Sep 2004 17:30:42 -0000 1.19 *************** *** 255,258 **** --- 255,259 ---- { bool error = false; + setState( STARTUP ); *************** *** 284,360 **** } ! // Open the Worldsave and Account Database drivers. ! if ( Config::instance()->databaseDriver() != "binary" && !PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver() ) ) ! { ! Console::instance()->log( LOG_ERROR, QString( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); ! return 1; ! } ! if ( !PersistentBroker::instance()->openDriver( Config::instance()->accountsDriver() ) ) ! { ! Console::instance()->log( LOG_ERROR, QString( "Unknown Account Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->accountsDriver() ) ); ! return 1; ! } ! setState( RUNNING ); ! ScriptManager::instance()->onServerStart(); // Notify all scripts about server startup ! Console::instance()->start(); // Notify the console about the server startup ! PyThreadState* _save; ! QWaitCondition niceLevel; ! unsigned char cycles = 0; ! while ( isRunning() ) ! { ! // Every 10th cycle we sleep for a while and give other threads processing time. ! if ( ++cycles == 10 ) { ! cycles = 0; ! _save = PyEval_SaveThread(); // Python threading - start ! switch ( Config::instance()->niceLevel() ) { ! case 0: ! break; // very unnice - hog all cpu time ! case 1: ! if ( Network::instance()->count() != 0 ) ! niceLevel.wait( 10 ); ! else ! niceLevel.wait( 100 ); break; ! case 2: ! niceLevel.wait( 10 ); break; ! case 3: ! niceLevel.wait( 40 ); break;// very nice ! case 4: ! if ( Network::instance()->count() != 0 ) ! niceLevel.wait( 10 ); ! else ! niceLevel.wait( 4000 ); break; // anti busy waiting ! case 5: ! if ( Network::instance()->count() != 0 ) ! niceLevel.wait( 40 ); ! else ! niceLevel.wait( 5000 ); break; ! default: ! niceLevel.wait( 10 ); break; } - qApp->processEvents( 40 ); - PyEval_RestoreThread( _save ); // Python threading - end - } ! pollQueuedActions(); ! d->time = getNormalizedTime(); // Update our currenttime ! try ! { ! Network::instance()->poll(); ! Timing::instance()->poll(); ! Console::instance()->poll(); ! } ! catch ( wpException e ) ! { ! Console::instance()->log( LOG_PYTHON, e.error() + "\n" ); } } --- 285,369 ---- } ! try { ! // Open the Worldsave and Account Database drivers. ! if ( Config::instance()->databaseDriver() != "binary" && !PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver() ) ) ! { ! Console::instance()->log( LOG_ERROR, QString( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); ! return 1; ! } ! if ( !PersistentBroker::instance()->openDriver( Config::instance()->accountsDriver() ) ) ! { ! Console::instance()->log( LOG_ERROR, QString( "Unknown Account Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->accountsDriver() ) ); ! return 1; ! } ! setState( RUNNING ); ! ScriptManager::instance()->onServerStart(); // Notify all scripts about server startup ! Console::instance()->start(); // Notify the console about the server startup ! PyThreadState* _save; ! QWaitCondition niceLevel; ! unsigned char cycles = 0; ! while ( isRunning() ) { ! // Every 10th cycle we sleep for a while and give other threads processing time. ! if ( ++cycles == 10 ) { ! cycles = 0; ! _save = PyEval_SaveThread(); // Python threading - start ! switch ( Config::instance()->niceLevel() ) ! { ! case 0: ! break; // very unnice - hog all cpu time ! case 1: ! if ( Network::instance()->count() != 0 ) ! niceLevel.wait( 10 ); ! else ! niceLevel.wait( 100 ); break; ! case 2: ! niceLevel.wait( 10 ); break; ! case 3: ! niceLevel.wait( 40 ); break;// very nice ! case 4: ! if ( Network::instance()->count() != 0 ) ! niceLevel.wait( 10 ); ! else ! niceLevel.wait( 4000 ); break; // anti busy waiting ! case 5: ! if ( Network::instance()->count() != 0 ) ! niceLevel.wait( 40 ); ! else ! niceLevel.wait( 5000 ); break; ! default: ! niceLevel.wait( 10 ); break; ! } ! qApp->processEvents( 40 ); ! PyEval_RestoreThread( _save ); // Python threading - end } ! pollQueuedActions(); ! d->time = getNormalizedTime(); // Update our currenttime ! try ! { ! Network::instance()->poll(); ! Timing::instance()->poll(); ! Console::instance()->poll(); ! } ! catch ( wpException e ) ! { ! Console::instance()->log( LOG_PYTHON, e.error() + "\n" ); ! } } + + } catch (wpException &exception) { + Console::instance()->log(LOG_ERROR, exception.error() + "\n" ); + error = true; + } catch (...) { + error = true; } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ChangeLog 3 Sep 2004 16:56:17 -0000 1.23 --- ChangeLog 3 Sep 2004 17:30:42 -0000 1.24 *************** *** 41,44 **** --- 41,45 ---- - Fixed bug #0000267 (Max. falling height is now infinite). - Fixed bug #0000268 (coord.validspawnspot() now corrects the z value of coordinates) + - Made startup more fault tolerant. Wolfpack 12.9.8 Beta (19. August 2004) |
|
From: spddmn <xxx...@us...> - 2004-09-03 17:07:59
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24392 Modified Files: bandages.py Log Message: i hope this fixes the bugs i made Index: bandages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bandages.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** bandages.py 2 Sep 2004 18:17:57 -0000 1.10 --- bandages.py 3 Sep 2004 17:07:50 -0000 1.11 *************** *** 9,13 **** # Bandages have to be in backpack if item.getoutmostchar() != char: ! char.socket.clilocmessage(500295) return 1 --- 9,14 ---- # Bandages have to be in backpack if item.getoutmostchar() != char: ! char.socket.clilocmessage(500294) ! # you cannot use that return 1 *************** *** 20,23 **** --- 21,25 ---- if item.id == 0xe21 or item.id == 0xee9: char.socket.clilocmessage(500948) + #who will you use on char.socket.attachtarget('bandages.bandage_response', [item.serial]) *************** *** 35,39 **** if (target.item and target.item.getoutmostchar() and target.item.getoutmostchar() != char) or not char.canreach(target.pos, 5): ! char.socket.sysmessage("You can't reach that.") return --- 37,41 ---- if (target.item and target.item.getoutmostchar() and target.item.getoutmostchar() != char) or not char.canreach(target.pos, 5): ! char.socket.clilocmessage(500312) return *************** *** 67,80 **** if not char.gm and not char.canreach( target, 2 ): ! char.socket.clilocmessage(500313) return 0 if target.id != 0x2006: ! char.socket.clilocmessage(500971) return 0 # Check Owner if not target.owner or not target.owner.dead: ! char.socket.clilocmessage(500971) return 0 --- 69,85 ---- if not char.gm and not char.canreach( target, 2 ): ! char.socket.clilocmessage(500312) ! # cannot reach return 0 if target.id != 0x2006: ! char.socket.clilocmessage(500970) ! #bandages cannot be used on that return 0 # Check Owner if not target.owner or not target.owner.dead: ! char.socket.clilocmessage(500970) ! #bandages cannot be used on that return 0 *************** *** 92,100 **** # Already at full health ! if not target.poison and target.health >= target.maxhitpoints: if target == char: ! char.socket.clilocmessage(1061289) else: ! char.socket.clilocmessage(500956) return 0 --- 97,105 ---- # Already at full health ! if not target.poison > -1 and target.health >= target.maxhitpoints: if target == char: ! char.socket.clilocmessage(1061288) else: ! char.socket.clilocmessage(500955) return 0 *************** *** 102,105 **** --- 107,113 ---- def bandage_response( char, args, target ): + # char is healer + # target is pointer to healing target + corpse = None *************** *** 118,130 **** if corpse and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.clilocmessage(1002086) return if target.char and target.char.dead and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.clilocmessage(1002086) return ! if target.char and target.char.poison and ( char.skill[ HEALING ] < 600 or char.skill[ ANATOMY ] < 600 ): ! char.socket.clilocmessage(1002086) return --- 126,138 ---- if corpse and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.sysmessage("1") return if target.char and target.char.dead and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.sysmessage("You are not skilled enough for that.") return ! if target.char and target.poison > -1 and ( char.skill[ HEALING ] < 600 or char.skill[ ANATOMY ] < 600 ): ! char.socket.sysmessage("You are not skilled enough for that.") return *************** *** 147,151 **** # SkillCheck (0% to 80%) ! if not corpse and not target.char.dead and not target.char.poison: success = char.checkskill( HEALING, 0, 800 ) elif corpse or target.char.dead: --- 155,159 ---- # SkillCheck (0% to 80%) ! if not corpse and not target.char.dead and not target.char.poison > -1: success = char.checkskill( HEALING, 0, 800 ) elif corpse or target.char.dead: *************** *** 169,176 **** if target.char.dead: target.char.socket.sysmessage( char.name + ' begins applying a bandage to you.' ) ! char.addtimer( random.randint( 2500, 5000 ), 'bandages.bandage_timer', [ 2, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage elif char == target.char: char.socket.sysmessage( 'You start applying bandages on yourself' ) ! char.addtimer( random.randint( 1500, 2500 ), 'bandages.bandage_timer', [ 0, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage else: char.socket.sysmessage( 'You start applying bandages on %s' % target.char.name ) --- 177,187 ---- if target.char.dead: target.char.socket.sysmessage( char.name + ' begins applying a bandage to you.' ) ! char.addtimer( random.randint( 5000, 10000 ), 'bandages.bandage_timer', [ 2, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage elif char == target.char: char.socket.sysmessage( 'You start applying bandages on yourself' ) ! if target.char.poison > -1: ! char.addtimer( random.randint( 4000, 7000 ), 'bandages.bandage_timer', [ 0, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage ! else: ! char.addtimer( random.randint( 3000, 6000 ), 'bandages.bandage_timer', [ 0, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage else: char.socket.sysmessage( 'You start applying bandages on %s' % target.char.name ) *************** *** 178,182 **** target.char.socket.sysmessage( char.name + ' begins applying a bandage to you.' ) char.turnto( target.char ) ! char.addtimer( random.randint( 1500, 2500 ), 'bandages.bandage_timer', [ 0, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage char.socket.settag( 'using_bandages', 1 ) --- 189,196 ---- target.char.socket.sysmessage( char.name + ' begins applying a bandage to you.' ) char.turnto( target.char ) ! if target.char.poison > -1: ! char.addtimer( random.randint( 3000, 4000 ), 'bandages.bandage_timer', [ 0, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage ! else: ! char.addtimer( random.randint( 1500, 3000 ), 'bandages.bandage_timer', [ 0, success, target.char.serial, baseid ] ) # It takes 5 seconds to bandage char.socket.settag( 'using_bandages', 1 ) *************** *** 200,204 **** if not success: ! char.socket.clilocmessage(500967) return --- 214,218 ---- if not success: ! char.socket.clilocmessage(500966) return *************** *** 219,223 **** target.delete() ! char.socket.clilocmessage(500966) else: char.socket.sysmessage( 'You can''t help them anymore' ) --- 233,237 ---- target.delete() ! char.socket.clilocmessage(500965) else: char.socket.sysmessage( 'You can''t help them anymore' ) *************** *** 233,237 **** if target.dead: if not success: ! char.socket.clilocmessage(500967) return --- 247,251 ---- if target.dead: if not success: ! char.socket.clilocmessage(500966) return *************** *** 239,246 **** target.update() ! char.socket.clilocmessage(500966) ! elif target.poison: if not success: ! char.socket.sysmessage( 'You fail to cure the target.' ) char.socket.clilocmessage(1010060) return --- 253,260 ---- target.update() ! char.socket.clilocmessage(500965) ! elif target.poison > -1: if not success: ! #char.socket.sysmessage( 'You fail to cure the target.' ) char.socket.clilocmessage(1010060) return *************** *** 248,259 **** target.poison=-1 target.update() ! ! char.socket.sysmessage( 'You successfully cured ' + target.name ) else: if not success: ! if target != char: ! char.socket.clilocmessage(500969) ! else: ! char.socket.clilocmessage(500969) return --- 262,273 ---- target.poison=-1 target.update() ! if target <> char: ! target.socket.clilocmessage(1010059) ! target.soundeffect( 0x57,0 ) ! char.socket.clilocmessage(1010058) ! char.soundeffect( 0x57,0 ) else: if not success: ! char.socket.clilocmessage(500968) return *************** *** 274,282 **** target.health = min( target.maxhitpoints, target.health + amount ) target.updatehealth() ! ! if char == target: ! char.socket.clilocmessage(500970) ! else: ! char.socket.clilocmessage(500970) # Create bloody bandages --- 288,295 ---- target.health = min( target.maxhitpoints, target.health + amount ) target.updatehealth() ! char.soundeffect( 0x57 ) ! if target <> char: ! target.soundeffect( 0x57 ) ! char.socket.clilocmessage(500969) # Create bloody bandages |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:56:33
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22378/magic Modified Files: circle3.py Log Message: Fix for bug #0000268 Index: circle3.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle3.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** circle3.py 29 Aug 2004 18:30:49 -0000 1.12 --- circle3.py 3 Sep 2004 16:56:23 -0000 1.13 *************** *** 84,97 **** char.turnto(target) ! # Line of Sight (touch!! or else we can teleport trough windows) ! if not char.canreach(target, 12): if char.socket: ! char.socket.clilocmessage(500237) return ! # Check if the target tile is blocked or in a multi ! if (not target.validspawnspot() or wolfpack.findmulti(target)) and not char.gm: if char.socket: ! char.socketclilocmessage(501942) return --- 84,99 ---- char.turnto(target) ! # Check if the target tile is blocked or in a multi ! # target.validspawnspot() will automatically set the z ! # of the coord to the nearest top ! if (not target.validspawnspot() or wolfpack.findmulti(target)) and not char.gm: if char.socket: ! char.socketclilocmessage(501942) return ! # Line of Sight (touch!! or else we can teleport trough windows) ! if not char.canreach(target, 12): if char.socket: ! char.socket.clilocmessage(500237) return |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:56:33
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22362 Modified Files: ChangeLog Log Message: Fix for bug #0000268 Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ChangeLog 3 Sep 2004 16:34:34 -0000 1.22 --- ChangeLog 3 Sep 2004 16:56:17 -0000 1.23 *************** *** 40,43 **** --- 40,44 ---- - Item Base Definitions are now reloaded correctly. - Fixed bug #0000267 (Max. falling height is now infinite). + - Fixed bug #0000268 (coord.validspawnspot() now corrects the z value of coordinates) Wolfpack 12.9.8 Beta (19. August 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:55:29
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22179 Modified Files: walking.cpp walking.h Log Message: Fix for bug #0000268 Index: walking.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** walking.h 31 Aug 2004 15:18:25 -0000 1.28 --- walking.h 3 Sep 2004 16:55:17 -0000 1.29 *************** *** 58,62 **** void CombatWalk( P_CHAR pc ); void NpcMovement( unsigned int currenttime, P_NPC pc_i ); ! bool canLandMonsterMoveHere( const Coord_cl& ) const; bool CheckForCharacterAtXYZ( P_CHAR pc, const Coord_cl& pos ); Coord_cl calcCoordFromDir( Q_UINT8 dir, const Coord_cl& oldCoords ); --- 58,62 ---- void CombatWalk( P_CHAR pc ); void NpcMovement( unsigned int currenttime, P_NPC pc_i ); ! bool canLandMonsterMoveHere( Coord_cl& ) const; bool CheckForCharacterAtXYZ( P_CHAR pc, const Coord_cl& pos ); Coord_cl calcCoordFromDir( Q_UINT8 dir, const Coord_cl& oldCoords ); Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** walking.cpp 3 Sep 2004 16:33:07 -0000 1.143 --- walking.cpp 3 Sep 2004 16:55:17 -0000 1.144 *************** *** 122,125 **** --- 122,129 ---- bool checkWalkable( P_CHAR pChar, Q_UINT16 tileId ) { + if (!pChar) { + return false; + } + Q_UNUSED( pChar ); Q_UNUSED( tileId ); *************** *** 235,239 **** continue; } ! else if ( pChar->isDead() ) { // Doors can be passed by ghosts --- 239,243 ---- continue; } ! else if ( pChar && pChar->isDead() ) { // Doors can be passed by ghosts *************** *** 814,868 **** } ! bool cMovement::canLandMonsterMoveHere( const Coord_cl& pos ) const { if ( pos.x >= ( Maps::instance()->mapTileWidth( pos.map ) * 8 ) || pos.y >= ( Maps::instance()->mapTileHeight( pos.map ) * 8 ) ) return false; ! const signed char elev = Maps::instance()->mapElevation( pos ); ! Coord_cl target = pos; ! target.z = elev; ! if ( ILLEGAL_Z == elev ) ! return false; ! ! // get the tile id of any dynamic tiles at this spot ! Coord_cl mPos = pos; ! mPos.z = elev; ! const Q_INT32 dt = DynTile( mPos ); ! // if there is a dynamic tile at this spot, check to see if its a blocker ! // if it does block, might as well Q_INT16-circuit and return right away ! if ( dt >= 0 ) { ! tile_st tile = TileCache::instance()->getTile( dt ); ! if ( tile.isBlocking() || tile.isWet() ) return false; - } ! // if there's a static block here in our way, return false ! StaticsIterator msi = Maps::instance()->staticsIterator( pos ); ! while ( !msi.atEnd() ) ! { ! tile_st tile = TileCache::instance()->getTile( msi->itemid ); ! const Q_INT32 elev = msi->zoff + cTileCache::tileHeight( tile ); ! if ( ( elev >= pos.z ) && ( msi->zoff <= pos.z ) ) ! { ! if ( tile.isBlocking() || tile.isWet() ) ! return false; } - msi++; } ! RegionIterator4Items items( pos, 0 ); ! for ( items.Begin(); !items.atEnd(); items++ ) ! { ! P_ITEM item = items.GetData(); ! tile_st tile = TileCache::instance()->getTile( item->id() ); ! const Q_INT32 elev = item->pos().z + cTileCache::tileHeight( tile ); ! if ( ( elev >= pos.z ) && ( item->pos().z <= pos.z ) ) ! { ! if ( tile.isBlocking() || tile.isWet() ) ! return false; ! } ! } return true; --- 818,870 ---- } ! bool cMovement::canLandMonsterMoveHere( Coord_cl& pos ) const { if ( pos.x >= ( Maps::instance()->mapTileWidth( pos.map ) * 8 ) || pos.y >= ( Maps::instance()->mapTileHeight( pos.map ) * 8 ) ) return false; ! // Go trough the array top-to-bottom and check ! // If we find a tile to walk on ! vector<stBlockItem> blockList = getBlockingItems( 0, pos ); ! bool found = false; ! Q_UINT32 i; ! for ( i = 0; i < blockList.size(); ++i ) { ! stBlockItem item = blockList[i]; ! Q_INT8 itemTop = ( item.z + item.height ); ! ! // If we encounter any object with itemTop <= pos.z which is NOT walkable ! // Then we can as well just return false as while falling we would be ! // blocked by that object ! if ( !item.walkable && itemTop < pos.z ) return false; ! if ( item.walkable ) { ! // If the top of the item is within our max-climb reach ! // then the first check passed. in addition we need to ! // check if the "bottom" of the item is reachable ! // I would say 2 is a good "reach" value for the bottom ! // of any item ! if ( itemTop < pos.z + P_M_MAX_Z_CLIMB && itemTop >= pos.z - P_M_MAX_Z_FALL ) { ! pos.z = itemTop; ! found = true; ! break; ! // Climbing maptiles is 5 tiles easier ! } else if ( item.maptile && itemTop < pos.z + P_M_MAX_Z_CLIMB + 5 && itemTop >= pos.z - P_M_MAX_Z_FALL ) { ! pos.z = itemTop; ! found = true; ! break; ! } else if ( itemTop < pos.z ) { ! pos.z = itemTop; ! found = true; ! break; ! } } } ! // If we're still at the same position ! // We didn't find anything to step on ! if ( !found ) ! return false; return true; |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:55:29
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22179/python Modified Files: pycoord.cpp Log Message: Fix for bug #0000268 Index: pycoord.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pycoord.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pycoord.cpp 22 Aug 2004 02:29:52 -0000 1.19 --- pycoord.cpp 3 Sep 2004 16:55:17 -0000 1.20 *************** *** 149,153 **** \return A boolean value. \description This method returns true if this coordinate is a valid spawn spot for a monster, character or item. ! Otherwise it returns false. */ static PyObject* wpCoord_validspawnspot( wpCoord* self, PyObject* args ) --- 149,154 ---- \return A boolean value. \description This method returns true if this coordinate is a valid spawn spot for a monster, character or item. ! Otherwise it returns false. This method will also set the z component of the coordinate to the nearest ! item top a land creature can stand on. */ static PyObject* wpCoord_validspawnspot( wpCoord* self, PyObject* args ) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:34:43
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18788 Modified Files: ChangeLog Log Message: Fixed bug #0000267 Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ChangeLog 3 Sep 2004 15:43:50 -0000 1.21 --- ChangeLog 3 Sep 2004 16:34:34 -0000 1.22 *************** *** 39,42 **** --- 39,43 ---- - Documentation fixes for item.addtimer. - Item Base Definitions are now reloaded correctly. + - Fixed bug #0000267 (Max. falling height is now infinite). Wolfpack 12.9.8 Beta (19. August 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:33:17
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18560 Modified Files: walking.cpp Log Message: Fixed bug #0000267 Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** walking.cpp 31 Aug 2004 15:18:25 -0000 1.142 --- walking.cpp 3 Sep 2004 16:33:07 -0000 1.143 *************** *** 317,320 **** --- 317,324 ---- found = true; break; + } else if ( itemTop < pos.z ) { + pos.z = itemTop; + found = true; + break; } } |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:03:36
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12709/webroot Modified Files: ChangeLog.wolfpack Log Message: fixed bug #0000266 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** ChangeLog.wolfpack 3 Sep 2004 15:44:47 -0000 1.54 --- ChangeLog.wolfpack 3 Sep 2004 16:03:21 -0000 1.55 *************** *** 46,49 **** --- 46,50 ---- - Basescripts added to many scripts. Read only assigned scripts. Format is: <basescripts></basescripts> + - Removed the last occurances of <inherit id="" /> * Python Script Changes: - Function Changes: *************** *** 70,73 **** --- 71,75 ---- - Fix for bug #0000263 (casting with weapon allowed although weapon is not spell channeling) - Fix for bug #0000260 (.tile now caps at 250 items if the acl doesn't allow unlimited items) + - Fix for bug #0000266 (summoned npcs had loot) * Misc. Changes: - Experimental Mac OSX Support |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:03:15
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12567/system Modified Files: loot.py Log Message: Fix for bug #0000266 Index: loot.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/loot.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** loot.py 10 Aug 2004 13:44:33 -0000 1.15 --- loot.py 3 Sep 2004 16:03:04 -0000 1.16 *************** *** 500,504 **** # def onDeath(char, killer, corpse): ! if char.player: return --- 500,504 ---- # def onDeath(char, killer, corpse): ! if char.player or char.summoned: return |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 16:03:15
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12523 Modified Files: basechar.cpp Log Message: Fix for bug #0000266 Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** basechar.cpp 31 Aug 2004 15:18:25 -0000 1.139 --- basechar.cpp 3 Sep 2004 16:03:04 -0000 1.140 *************** *** 2843,2846 **** --- 2843,2857 ---- } + // Summoned monsters simply disappear + if ( summoned ) + { + soundEffect( 0x1fe ); + pos_.effect( 0x3735, 10, 30 ); + + onDeath( source, 0 ); + remove(); + return true; + } + // Create Loot - Either on the corpse or on the ground cItem::ContainerContent content = backpack->content(); *************** *** 2862,2876 **** } - // Summoned monsters simply disappear - if ( summoned ) - { - soundEffect( 0x1fe ); - pos_.effect( 0x3735, 10, 30 ); - - onDeath( source, 0 ); - remove(); - return true; - } - playDeathSound(); --- 2873,2876 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:53:29
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9879/items/equipment Modified Files: food.xml Log Message: Fixed <inherit id=""> syntax. Index: food.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/food.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** food.xml 2 Sep 2004 15:07:16 -0000 1.17 --- food.xml 3 Sep 2004 15:53:17 -0000 1.18 *************** *** 375,381 **** <!-- Mug of Ale 1 --> ! <item id="9ee"> <category>Equipment\Food\Mug of Ale 1</category> - <inherit id="drinks_base" /> <id>0x9ee</id> <weight>0.1</weight> --- 375,380 ---- <!-- Mug of Ale 1 --> ! <item id="9ee" inherit="drinks_base"> <category>Equipment\Food\Mug of Ale 1</category> <id>0x9ee</id> <weight>0.1</weight> *************** *** 383,389 **** <!-- Mug of Ale 2 --> ! <item id="9ef"> <category>Equipment\Food\Mug of Ale 2</category> - <inherit id="drinks_base" /> <id>0x9ef</id> <weight>0.1</weight> --- 382,387 ---- <!-- Mug of Ale 2 --> ! <item id="9ef" inherit="drinks_base"> <category>Equipment\Food\Mug of Ale 2</category> <id>0x9ef</id> <weight>0.1</weight> *************** *** 447,458 **** </item> ! <item id="d39"> ! <inherit id="c61" /> <id>0xd39</id> <category>Equipment\Food\Turnip 4</category> </item> ! <item id="d3a"> ! <inherit id="c61" /> <id>0xd3a</id> <category>Equipment\Food\Turnip 5</category> --- 445,454 ---- </item> ! <item id="d39" inherit="c61"> <id>0xd39</id> <category>Equipment\Food\Turnip 4</category> </item> ! <item id="d3a" inherit="c61"> <id>0xd3a</id> <category>Equipment\Food\Turnip 5</category> *************** *** 547,552 **** </item> ! <item id="c73"> ! <inherit id="c72" /> <id>0xc73</id> <category>Equipment\Food\Squash 2</category> --- 543,547 ---- </item> ! <item id="c73" inherit="c72"> <id>0xc73</id> <category>Equipment\Food\Squash 2</category> *************** *** 628,645 **** </item> ! <item id="c80"> ! <inherit id="c7f" /> <id>0xc80</id> <category>Equipment\Food\Ear of Corn 2</category> </item> ! <item id="c81"> ! <inherit id="c7f" /> <id>0xc81</id> <category>Equipment\Food\Ear of Corn 3</category> </item> ! <item id="c82"> ! <inherit id="c7f" /> <id>0xc82</id> <category>Equipment\Food\Ear of Corn 4</category> --- 623,637 ---- </item> ! <item id="c80" inherit="c7f"> <id>0xc80</id> <category>Equipment\Food\Ear of Corn 2</category> </item> ! <item id="c81" inherit="c7f"> <id>0xc81</id> <category>Equipment\Food\Ear of Corn 3</category> </item> ! <item id="c82" inherit="c7f"> <id>0xc82</id> <category>Equipment\Food\Ear of Corn 4</category> *************** *** 647,652 **** <!-- Grape Bunch --> ! <item id="d1a"> ! <inherit id="9d1" /> <id>0xd1a</id> <category>Equipment\Food\Grape Bunch 2</category> --- 639,643 ---- <!-- Grape Bunch --> ! <item id="d1a" inherit="9d1"> <id>0xd1a</id> <category>Equipment\Food\Grape Bunch 2</category> |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:53:28
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9879/items/armory/colored/shields Modified Files: agapite.xml bronze.xml copper.xml dull_copper.xml golden.xml iron.xml merkite.xml mythril.xml shadow.xml silver.xml valorite.xml verite.xml Log Message: Fixed <inherit id=""> syntax. Index: silver.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/silver.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** silver.xml 24 Apr 2004 01:19:45 -0000 1.3 --- silver.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_silver" inherit="1bc4"> - <inherit id="1bc4" /> <silver_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: merkite.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/merkite.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** merkite.xml 24 Apr 2004 01:19:45 -0000 1.3 --- merkite.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_merkite" inherit="1bc4"> - <inherit id="1bc4" /> <merkite_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: valorite.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/valorite.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** valorite.xml 24 Apr 2004 01:19:45 -0000 1.3 --- valorite.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_valorite" inherit="1bc4"> - <inherit id="1bc4" /> <valorite_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: golden.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/golden.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** golden.xml 24 Apr 2004 01:19:45 -0000 1.4 --- golden.xml 3 Sep 2004 15:53:17 -0000 1.5 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_gold" inherit="1bc4"> - <inherit id="1bc4" /> <gold_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: dull_copper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/dull_copper.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dull_copper.xml 24 Apr 2004 01:19:45 -0000 1.3 --- dull_copper.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_dull_copper" inherit="1bc4"> - <inherit id="1bc4" /> <dull_copper_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: mythril.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/mythril.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mythril.xml 24 Apr 2004 01:19:45 -0000 1.3 --- mythril.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_mythril" inherit="1bc4"> - <inherit id="1bc4" /> <mythril_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: agapite.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/agapite.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** agapite.xml 24 Apr 2004 01:19:45 -0000 1.3 --- agapite.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_agapite" inherit="1bc4"> - <inherit id="1bc4" /> <agapite_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: shadow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/shadow.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shadow.xml 24 Apr 2004 01:19:45 -0000 1.3 --- shadow.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_shadow" inherit="1bc4"> - <inherit id="1bc4" /> <shadow_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: verite.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/verite.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** verite.xml 24 Apr 2004 01:19:45 -0000 1.3 --- verite.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_verite" inherit="1bc4"> - <inherit id="1bc4" /> <verite_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: iron.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/iron.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** iron.xml 24 Apr 2004 01:19:45 -0000 1.3 --- iron.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_iron" inherit="1bc4"> - <inherit id="1bc4" /> <iron_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: copper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/copper.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** copper.xml 24 Apr 2004 01:19:45 -0000 1.3 --- copper.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_copper" inherit="1bc4"> - <inherit id="1bc4" /> <copper_armor /> <baseid>1bc4</baseid> --- 79,82 ---- Index: bronze.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/colored/shields/bronze.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bronze.xml 24 Apr 2004 01:19:45 -0000 1.3 --- bronze.xml 3 Sep 2004 15:53:17 -0000 1.4 *************** *** 79,83 **** <!-- order shield --> <item id="1bc4_bronze" inherit="1bc4"> - <inherit id="1bc4" /> <bronze_armor /> <baseid>1bc4</baseid> --- 79,82 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:53:28
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9879/items/professions Modified Files: mage.xml tailorer.xml thieve.xml Log Message: Fixed <inherit id=""> syntax. Index: thieve.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/thieve.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** thieve.xml 27 Aug 2004 14:43:27 -0000 1.7 --- thieve.xml 3 Sep 2004 15:53:18 -0000 1.8 *************** *** 17,22 **** </item> ! <item id="14fc"> ! <inherit id="14fb" /> <id>0x14fc</id> <category>Professions\Thieve\Lockpick (E/W)</category> --- 17,21 ---- </item> ! <item id="14fc" inherit="14fb"> <id>0x14fc</id> <category>Professions\Thieve\Lockpick (E/W)</category> *************** *** 29,34 **** </item> ! <item id="14fe"> ! <inherit id="14fd" /> <id>0x14fe</id> <category>Professions\Thieve\Lockpicks (N/S)</category> --- 28,32 ---- </item> ! <item id="14fe" inherit="14fd"> <id>0x14fe</id> <category>Professions\Thieve\Lockpicks (N/S)</category> Index: mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/mage.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mage.xml 27 Aug 2004 14:43:27 -0000 1.15 --- mage.xml 3 Sep 2004 15:53:18 -0000 1.16 *************** *** 58,75 **** </item> ! <item id="1f15"> ! <inherit id="1f14" /> <id>0x1f15</id> <category>Professions\Mage\Runes\Recall Rune (2)</category> </item> ! <item id="1f16"> ! <inherit id="1f14" /> <id>0x1f16</id> <category>Professions\Mage\Runes\Recall Rune (3)</category> </item> ! <item id="1f17"> ! <inherit id="1f14" /> <id>0x1f17</id> <category>Professions\Mage\Runes\Recall Rune (4)</category> --- 58,72 ---- </item> ! <item id="1f15" inherit="1f14"> <id>0x1f15</id> <category>Professions\Mage\Runes\Recall Rune (2)</category> </item> ! <item id="1f16" inherit="1f14"> <id>0x1f16</id> <category>Professions\Mage\Runes\Recall Rune (3)</category> </item> ! <item id="1f17" inherit="1f14"> <id>0x1f17</id> <category>Professions\Mage\Runes\Recall Rune (4)</category> *************** *** 904,909 **** </item> ! <item id="e3b" type="spellbook"> ! <inherit id="efa" /> <id>0xe3b</id> <category>Professions\Mage\Spellbook (W/E)</category> --- 901,905 ---- </item> ! <item id="e3b" inherit="efa"> <id>0xe3b</id> <category>Professions\Mage\Spellbook (W/E)</category> Index: tailorer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/tailorer.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tailorer.xml 27 Aug 2004 14:43:27 -0000 1.14 --- tailorer.xml 3 Sep 2004 15:53:18 -0000 1.15 *************** *** 318,323 **** </item> ! <item id="f9f"> ! <inherit id="f9e" /> <id>0xf9f</id> <category>Professions\Tailorer\Scissors (W/E)</category> --- 318,322 ---- </item> ! <item id="f9f" inherit="f9e"> <id>0xf9f</id> <category>Professions\Tailorer\Scissors (W/E)</category> |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:53:26
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/books In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9879/items/books Modified Files: base.xml Log Message: Fixed <inherit id=""> syntax. Index: base.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/books/base.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** base.xml 27 Aug 2004 14:43:25 -0000 1.7 --- base.xml 3 Sep 2004 15:53:17 -0000 1.8 *************** *** 19,24 **** <!-- Book 1 --> ! <item id="fef"> ! <inherit id="base_book" /> <category>Equipment\Books\Book 1</category> <id>0x0fef</id> --- 19,23 ---- <!-- Book 1 --> ! <item id="fef" inherit="base_book"> <category>Equipment\Books\Book 1</category> <id>0x0fef</id> *************** *** 26,31 **** <!-- Book 2 --> ! <item id="ff0"> ! <inherit id="base_book" /> <category>Equipment\Books\Book 2</category> <id>0x0ff0</id> --- 25,29 ---- <!-- Book 2 --> ! <item id="ff0" inherit="base_book"> <category>Equipment\Books\Book 2</category> <id>0x0ff0</id> *************** *** 33,38 **** <!-- Book 3 --> ! <item id="ff1"> ! <inherit id="base_book" /> <category>Equipment\Books\Book 3</category> <id>0x0ff1</id> --- 31,35 ---- <!-- Book 3 --> ! <item id="ff1" inherit="base_book"> <category>Equipment\Books\Book 3</category> <id>0x0ff1</id> *************** *** 40,45 **** <!-- Book 4 --> ! <item id="ff2"> ! <inherit id="base_book" /> <category>Equipment\Books\Book 4</category> <id>0x0ff2</id> --- 37,41 ---- <!-- Book 4 --> ! <item id="ff2" inherit="base_book"> <category>Equipment\Books\Book 4</category> <id>0x0ff2</id> *************** *** 47,52 **** <!-- Book 5 --> ! <item id="ff3"> ! <inherit id="base_book" /> <category>Equipment\Books\Book 5</category> <id>0x0ff3</id> --- 43,47 ---- <!-- Book 5 --> ! <item id="ff3" inherit="base_book"> <category>Equipment\Books\Book 5</category> <id>0x0ff3</id> *************** *** 54,77 **** <!-- Book 6 --> ! <item id="ff4"> ! <inherit id="base_book" /> <category>Equipment\Books\Book 6</category> <id>0x0ff4</id> </item> ! <item id="fbd"> ! <inherit id="base_book" /> <id>0x0fbd</id> <category>Equipment\Books\Book 7 (N/S)</category> </item> ! <item id="fbe"> ! <inherit id="base_book" /> <id>0x0fbe</id> <category>Equipment\Books\Book 7 (W/E)</category> </item> ! <item id="1e20"> ! <inherit id="base_book" /> <id>0x1e20</id> <category>Equipment\Books\Book 8</category> --- 49,68 ---- <!-- Book 6 --> ! <item id="ff4" inherit="base_book"> <category>Equipment\Books\Book 6</category> <id>0x0ff4</id> </item> ! <item id="fbd" inherit="base_book"> <id>0x0fbd</id> <category>Equipment\Books\Book 7 (N/S)</category> </item> ! <item id="fbe" inherit="base_book"> <id>0x0fbe</id> <category>Equipment\Books\Book 7 (W/E)</category> </item> ! <item id="1e20" inherit="base_book"> <id>0x1e20</id> <category>Equipment\Books\Book 8</category> |
