wpdev-commits Mailing List for Wolfpack Emu (Page 18)
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: Correa <thi...@us...> - 2004-10-09 14:32:32
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12336 Modified Files: ChangeLog Log Message: Fixed bug #0000348 ( Guards should kill instantly ) Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** ChangeLog 8 Oct 2004 12:16:08 -0000 1.101 --- ChangeLog 9 Oct 2004 14:32:21 -0000 1.102 *************** *** 37,40 **** --- 37,41 ---- - Removed old page system from core. - onCreate is now called for players on character creation. + - Fixed bug #0000348 ( Guards should kill instantly ) Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Correa <thi...@us...> - 2004-10-09 14:32:32
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12336/ai Modified Files: ai.h ai_animals.cpp ai_humans.cpp ai_monsters.cpp Log Message: Fixed bug #0000348 ( Guards should kill instantly ) Index: ai_animals.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_animals.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ai_animals.cpp 1 Oct 2004 22:30:43 -0000 1.16 --- ai_animals.cpp 9 Oct 2004 14:32:21 -0000 1.17 *************** *** 38,60 **** #include <math.h> - static AbstractAI* productCreator_AW() - { - return new Animal_Wild( NULL ); - } - void Animal_Wild::registerInFactory() { ! AIFactory::instance()->registerType( "Animal_Wild", productCreator_AW ); ! AIFactory::instance()->registerType( "Animal_Aggressive", productCreator_AW ); ! } ! ! static AbstractAI* productCreator_AD() ! { ! return new Animal_Domestic( NULL ); } void Animal_Domestic::registerInFactory() { ! AIFactory::instance()->registerType( "Animal_Domestic", productCreator_AD ); } --- 38,50 ---- #include <math.h> void Animal_Wild::registerInFactory() { ! AIFactory::instance()->registerType( "Animal_Wild", productCreatorFunctor<Animal_Wild> ); ! AIFactory::instance()->registerType( "Animal_Aggressive", productCreatorFunctor<Animal_Wild> ); } void Animal_Domestic::registerInFactory() { ! AIFactory::instance()->registerType( "Animal_Domestic", productCreatorFunctor<Animal_Domestic> ); } Index: ai_humans.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ai_humans.cpp 3 Oct 2004 13:51:40 -0000 1.23 --- ai_humans.cpp 9 Oct 2004 14:32:21 -0000 1.24 *************** *** 45,56 **** #include <math.h> - static AbstractAI* productCreator_HV() - { - return new Human_Vendor( 0 ); - } - void Human_Vendor::registerInFactory() { ! AIFactory::instance()->registerType( "Human_Vendor", productCreator_HV ); } --- 45,51 ---- #include <math.h> void Human_Vendor::registerInFactory() { ! AIFactory::instance()->registerType( "Human_Vendor", productCreatorFunctor<Human_Vendor> ); } *************** *** 85,96 **** } - static AbstractAI* productCreator_HS() - { - return new Human_Stablemaster( NULL ); - } - void Human_Stablemaster::registerInFactory() { ! AIFactory::instance()->registerType( "Human_Stablemaster", productCreator_HS ); } --- 80,86 ---- } void Human_Stablemaster::registerInFactory() { ! AIFactory::instance()->registerType( "Human_Stablemaster", productCreatorFunctor<Human_Stablemaster> ); } *************** *** 225,236 **** } - static AbstractAI* productCreator_HGC() - { - return new Human_Guard_Called( NULL ); - } - void Human_Guard_Called::registerInFactory() { ! AIFactory::instance()->registerType( "Human_Guard_Called", productCreator_HGC ); } --- 215,221 ---- } void Human_Guard_Called::registerInFactory() { ! AIFactory::instance()->registerType( "Human_Guard_Called", productCreatorFunctor<Human_Guard_Called> ); } *************** *** 299,302 **** --- 284,288 ---- m_npc->resend( false ); + pTarget->kill( m_npc ); } } *************** *** 338,349 **** } - static AbstractAI* productCreator_HG() - { - return new Human_Guard( NULL ); - } - void Human_Guard::registerInFactory() { ! AIFactory::instance()->registerType( "Human_Guard", productCreator_HG ); } --- 324,330 ---- } void Human_Guard::registerInFactory() { ! AIFactory::instance()->registerType( "Human_Guard", productCreatorFunctor<Human_Guard> ); } *************** *** 439,442 **** --- 420,425 ---- case 1: m_npc->talk( tr( "Death to all Evil!" ), 0xFFFF, 0, true ); break; + default: + break; } } Index: ai.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ai.h 3 Oct 2004 13:51:40 -0000 1.17 --- ai.h 9 Oct 2004 14:32:21 -0000 1.18 *************** *** 825,827 **** --- 825,833 ---- }; + template< typename T > + AbstractAI* productCreatorFunctor() + { + return new T(0); + } + #endif /* AI_H_HEADER_INCLUDED */ Index: ai_monsters.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ai_monsters.cpp 20 Sep 2004 02:37:58 -0000 1.24 --- ai_monsters.cpp 9 Oct 2004 14:32:21 -0000 1.25 *************** *** 158,169 **** } - static AbstractAI* productCreator_MAL0() - { - return new Monster_Aggressive_L0( NULL ); - } - void Monster_Aggressive_L0::registerInFactory() { ! AIFactory::instance()->registerType( "Monster_Aggressive_L0", productCreator_MAL0 ); } --- 158,164 ---- } void Monster_Aggressive_L0::registerInFactory() { ! AIFactory::instance()->registerType( "Monster_Aggressive_L0", productCreatorFunctor<Monster_Aggressive_L0> ); } *************** *** 172,183 **** } - static AbstractAI* productCreator_MB() - { - return new Monster_Berserk( NULL ); - } - void Monster_Berserk::registerInFactory() { ! AIFactory::instance()->registerType( "Monster_Berserk", productCreator_MB ); } --- 167,173 ---- } void Monster_Berserk::registerInFactory() { ! AIFactory::instance()->registerType( "Monster_Berserk", productCreatorFunctor<Monster_Berserk> ); } *************** *** 186,197 **** } - static AbstractAI* productCreator_MAL1() - { - return new Monster_Aggressive_L1( NULL ); - } - void Monster_Aggressive_L1::registerInFactory() { ! AIFactory::instance()->registerType( "Monster_Aggressive_L1", productCreator_MAL1 ); } --- 176,182 ---- } void Monster_Aggressive_L1::registerInFactory() { ! AIFactory::instance()->registerType( "Monster_Aggressive_L1", productCreatorFunctor<Monster_Aggressive_L1> ); } |
|
From: Correa <thi...@us...> - 2004-10-09 14:32:32
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12336/network Modified Files: uosocket.cpp Log Message: Fixed bug #0000348 ( Guards should kill instantly ) Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.426 retrieving revision 1.427 diff -C2 -d -r1.426 -r1.427 *** uosocket.cpp 8 Oct 2004 12:16:08 -0000 1.426 --- uosocket.cpp 9 Oct 2004 14:32:22 -0000 1.427 *************** *** 240,244 **** if ( ( _account == 0 ) && ( packetId != 0x80 ) && ( packetId != 0x91 ) ) { ! log( QString( "Communication error: 0x%1 instead of 0x80 or 0x91\n" ).arg( packetId, 2, 16 ) ); cUOTxDenyLogin denyLogin; --- 240,244 ---- if ( ( _account == 0 ) && ( packetId != 0x80 ) && ( packetId != 0x91 ) ) { ! log( tr( "Communication error: 0x%1 instead of 0x80 or 0x91\n" ).arg( packetId, 2, 16 ) ); cUOTxDenyLogin denyLogin; *************** *** 2112,2116 **** if ( _lastActivity + 180 * MY_CLOCKS_PER_SEC < Server::instance()->time() ) { ! log( QString( "Idle for %1 ms. Disconnecting.\n" ).arg( Server::instance()->time() - _lastActivity ) ); disconnect(); } --- 2112,2116 ---- if ( _lastActivity + 180 * MY_CLOCKS_PER_SEC < Server::instance()->time() ) { ! log( tr( "Idle for %1 ms. Disconnecting.\n" ).arg( Server::instance()->time() - _lastActivity ) ); disconnect(); } *************** *** 3054,3058 **** if ( lock > 2 ) { ! log( LOG_WARNING, QString( "Wrong lock value for extended stats packet: %1\n" ).arg( lock ) ); return; } --- 3054,3058 ---- if ( lock > 2 ) { ! log( LOG_WARNING, tr( "Wrong lock value for extended stats packet: %1\n" ).arg( lock ) ); return; } *************** *** 3073,3077 **** default: ! log( LOG_WARNING, QString( "Wrong stat value for extended stats packet: %1\n" ).arg( stat ) ); break; } --- 3073,3077 ---- default: ! log( LOG_WARNING, tr( "Wrong stat value for extended stats packet: %1\n" ).arg( stat ) ); break; } |
|
From: Correa <thi...@us...> - 2004-10-09 14:32:32
|
Update of /cvsroot/wpdev/wolfpack/muls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12336/muls Modified Files: maps.cpp Log Message: Fixed bug #0000348 ( Guards should kill instantly ) Index: maps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** maps.cpp 1 Oct 2004 19:43:56 -0000 1.15 --- maps.cpp 9 Oct 2004 14:32:22 -0000 1.16 *************** *** 342,346 **** p = new MapsPrivate( basePath + staticsIdxName, basePath + mapFileName, basePath + staticsFileName ); } catch(wpFileNotFoundException &e) { ! Console::instance()->log(LOG_WARNING, QString("Unable to find the files for map %1.\n").arg(id)); return false; } --- 342,346 ---- p = new MapsPrivate( basePath + staticsIdxName, basePath + mapFileName, basePath + staticsFileName ); } catch(wpFileNotFoundException &e) { ! Console::instance()->log(LOG_WARNING, tr("Unable to find the files for map %1.\n").arg(id)); return false; } *************** *** 624,628 **** const_iterator it = d.find( id ); if ( it == d.end() ) { ! Console::instance()->log(LOG_ERROR, QString( "[cMaps::staticsIterator line %1] map id(%2) not registered!\n" ).arg( __LINE__ ).arg( id ) ); return StaticsIterator( x, y, 0, true ); } --- 624,628 ---- const_iterator it = d.find( id ); if ( it == d.end() ) { ! Console::instance()->log(LOG_ERROR, tr( "[cMaps::staticsIterator line %1] map id(%2) not registered!\n" ).arg( __LINE__ ).arg( id ) ); return StaticsIterator( x, y, 0, true ); } |
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11526 Modified Files: basechar.cpp basedef.cpp commands.cpp console.cpp definable.cpp definitions.cpp items.cpp log.cpp npc.cpp party.cpp persistentbroker.cpp player.cpp pythonscript.cpp scriptmanager.cpp sectors.cpp server.cpp serverconfig.cpp serverconfig.h skills.cpp territories.cpp world.cpp Log Message: - Server strings localization Index: persistentbroker.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** persistentbroker.cpp 10 Aug 2004 03:15:57 -0000 1.41 --- persistentbroker.cpp 9 Oct 2004 14:28:59 -0000 1.42 *************** *** 155,159 **** { if ( !d->connection ) ! throw QString( "PersistentBroker not connected to database." ); //qWarning( query ); --- 155,159 ---- { if ( !d->connection ) ! throw tr( "PersistentBroker not connected to database." ); //qWarning( query ); Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** server.cpp 6 Oct 2004 12:09:59 -0000 1.31 --- server.cpp 9 Oct 2004 14:28:59 -0000 1.32 *************** *** 432,437 **** 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" ); ! Console::instance()->send( "Compiled on " __DATE__ " " __TIME__ "\n" ); Console::instance()->send( tr("Compiled for Qt %1 (Using: %2 %3)\n").arg(QT_VERSION_STR, qVersion(), qSharedBuild() ? " Shared" : " Static" ) ); QString pythonBuild = Py_GetVersion(); --- 432,437 ---- Console::instance()->send( "Copyright (C) 2000-2004 Wolfpack Development Team\n" ); Console::instance()->send( "Wolfpack Homepage: http://www.wpdev.org/\n" ); ! Console::instance()->send( tr("By using this software you agree to the license accompanying this release.\n") ); ! Console::instance()->send( tr("Compiled on %1 %2\n").arg( __DATE__ , __TIME__ ) ); Console::instance()->send( tr("Compiled for Qt %1 (Using: %2 %3)\n").arg(QT_VERSION_STR, qVersion(), qSharedBuild() ? " Shared" : " Static" ) ); QString pythonBuild = Py_GetVersion(); *************** *** 450,458 **** #endif Console::instance()->send( tr("Compiled for Python %1 %2 (Using: %3)\n").arg(PY_VERSION, UnicodeType, pythonBuild) ); ! Console::instance()->send( "Compiled with SQLite " SQLITE_VERSION "\n" ); #if defined (MYSQL_DRIVER) Console::instance()->send( tr( "Compiled for MySQL %1 (Using: %2)\n" ).arg( MYSQL_SERVER_VERSION, mysql_get_client_info() ) ); #else ! Console::instance()->send( "MySQL Support: disabled\n" ); #endif Console::instance()->send( "\n" ); --- 450,458 ---- #endif Console::instance()->send( tr("Compiled for Python %1 %2 (Using: %3)\n").arg(PY_VERSION, UnicodeType, pythonBuild) ); ! Console::instance()->send( tr("Compiled with SQLite %1\n" ).arg( SQLITE_VERSION ) ); #if defined (MYSQL_DRIVER) Console::instance()->send( tr( "Compiled for MySQL %1 (Using: %2)\n" ).arg( MYSQL_SERVER_VERSION, mysql_get_client_info() ) ); #else ! Console::instance()->send( tr("MySQL Support: disabled\n") ); #endif Console::instance()->send( "\n" ); Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.159 retrieving revision 1.160 diff -C2 -d -r1.159 -r1.160 *** basechar.cpp 8 Oct 2004 01:13:15 -0000 1.159 --- basechar.cpp 9 Oct 2004 14:28:58 -0000 1.160 *************** *** 1410,1419 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Invalid equipped element missing id and list attribute in npc definition '%1'." ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } else { ! Console::instance()->log( LOG_ERROR, QString( "Invalid equipped element '%1' in npc definition '%2'." ).arg( element->name() ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } --- 1410,1419 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Invalid equipped element missing id and list attribute in npc definition '%1'." ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } else { ! Console::instance()->log( LOG_ERROR, tr( "Invalid equipped element '%1' in npc definition '%2'." ).arg( element->name() ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.267 retrieving revision 1.268 diff -C2 -d -r1.267 -r1.268 *** commands.cpp 8 Oct 2004 10:57:09 -0000 1.267 --- commands.cpp 9 Oct 2004 14:28:59 -0000 1.268 *************** *** 133,137 **** if ( ScriptSections.isEmpty() ) { ! Console::instance()->log( LOG_WARNING, "No ACLs for players, counselors, gms and admins defined!\n" ); return; } --- 133,138 ---- if ( ScriptSections.isEmpty() ) { ! Console::instance()->log( LOG_WARNING, tr("No ACLs for players, counselors, gms and admins defined!\n" ! "Check your scripts, wolfpack.xml and make sure to run Wolfpack from the proper folder\n") ); return; } *************** *** 903,911 **** if ( !driver.open() ) { ! socket->sysMessage( "Unable to open categories.db in your wolfpack directory." ); return; } ! Console::instance()->log( LOG_MESSAGE, QString( "Exporting definitions to %1.\n" ).arg( "categories.db" ) ); try --- 904,912 ---- if ( !driver.open() ) { ! socket->sysMessage( tr("Unable to open categories.db in your wolfpack directory.") ); return; } ! Console::instance()->log( LOG_MESSAGE, tr( "Exporting definitions to %1.\n" ).arg( "categories.db" ) ); try Index: log.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/log.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** log.cpp 25 Sep 2004 02:03:19 -0000 1.20 --- log.cpp 9 Oct 2004 14:28:59 -0000 1.21 *************** *** 87,91 **** if ( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) ) { ! Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path + filename ) ); return false; } --- 87,91 ---- if ( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) ) { ! Console::instance()->send( tr( "Couldn't open logfile '%1'\n" ).arg( path + filename ) ); return false; } *************** *** 181,185 **** case LOG_ERROR: Console::instance()->changeColor( WPC_RED ); ! Console::instance()->send( "ERROR: " ); Console::instance()->changeColor( WPC_NORMAL ); break; --- 181,185 ---- case LOG_ERROR: Console::instance()->changeColor( WPC_RED ); ! Console::instance()->send( tr("ERROR: ") ); Console::instance()->changeColor( WPC_NORMAL ); break; *************** *** 187,191 **** case LOG_WARNING: Console::instance()->changeColor( WPC_YELLOW ); ! Console::instance()->send( "WARNING: " ); Console::instance()->changeColor( WPC_NORMAL ); break; --- 187,191 ---- case LOG_WARNING: Console::instance()->changeColor( WPC_YELLOW ); ! Console::instance()->send( tr("WARNING: ") ); Console::instance()->changeColor( WPC_NORMAL ); break; Index: party.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/party.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** party.cpp 22 Aug 2004 02:29:50 -0000 1.17 --- party.cpp 9 Oct 2004 14:28:59 -0000 1.18 *************** *** 240,244 **** if ( leader && leader->party() && player && player->socket() && leader->party()->canidates().contains( player ) ) { ! player->socket()->log( LOG_TRACE, QString( "Party invitation from '%1' timed out.\n" ).arg( leader->account()->login() ) ); leader->party()->removeMember( player ); // This automatically resends and checks the party } --- 240,244 ---- if ( leader && leader->party() && player && player->socket() && leader->party()->canidates().contains( player ) ) { ! player->socket()->log( LOG_TRACE, tr( "Party invitation from '%1' timed out.\n" ).arg( leader->account()->login() ) ); leader->party()->removeMember( player ); // This automatically resends and checks the party } *************** *** 315,319 **** player->socket()->clilocMessageAffix( 1008089, 0, leader->name(), 0x3b2, 3, 0, false, true ); leader->party()->addCanidate( player ); ! socket->log( LOG_TRACE, QString( "Invited '%1' to join his party.\n" ).arg( player->account()->login() ) ); // Send a party invitation request --- 315,319 ---- player->socket()->clilocMessageAffix( 1008089, 0, leader->name(), 0x3b2, 3, 0, false, true ); leader->party()->addCanidate( player ); ! socket->log( LOG_TRACE, tr( "Invited '%1' to join his party.\n" ).arg( player->account()->login() ) ); // Send a party invitation request *************** *** 356,365 **** if ( player->party() == target->party() && player->party()->leader() == player ) { ! socket->log( LOG_TRACE, QString( "Removed '%1' from the party.\n" ).arg( target->account()->login() ) ); player->party()->removeMember( target ); } else if ( target == player ) { ! socket->log( LOG_TRACE, QString( "Left the party.\n" ).arg( player->account()->login() ) ); player->party()->removeMember( target ); } --- 356,365 ---- if ( player->party() == target->party() && player->party()->leader() == player ) { ! socket->log( LOG_TRACE, tr( "Removed '%1' from the party.\n" ).arg( target->account()->login() ) ); player->party()->removeMember( target ); } else if ( target == player ) { ! socket->log( LOG_TRACE, tr( "Left the party.\n" ).arg( player->account()->login() ) ); player->party()->removeMember( target ); } *************** *** 375,379 **** if ( target ) { ! socket->log( LOG_TRACE, QString( "Told '%1' in party '%2'.\n" ).arg( target->account()->login() ).arg( message ) ); QString message = packet->getUnicodeString( 10, packet->size() - 10 ); player->party()->send( player, target, message ); --- 375,379 ---- if ( target ) { ! socket->log( LOG_TRACE, tr( "Told '%1' in party '%2'.\n" ).arg( target->account()->login() ).arg( message ) ); QString message = packet->getUnicodeString( 10, packet->size() - 10 ); player->party()->send( player, target, message ); *************** *** 387,391 **** { QString message = packet->getUnicodeString( 6, packet->size() - 6 ); ! socket->log( LOG_TRACE, QString( "Told the whole party: '%1'.\n" ).arg( message ) ); player->party()->send( player, message ); } --- 387,391 ---- { QString message = packet->getUnicodeString( 6, packet->size() - 6 ); ! socket->log( LOG_TRACE, tr( "Told the whole party: '%1'.\n" ).arg( message ) ); player->party()->send( player, message ); } *************** *** 410,414 **** { leader->party()->addMember( player ); ! socket->log( QString( "Accepted party invitation from '%1'.\n" ).arg( leader->account()->login() ) ); } break; --- 410,414 ---- { leader->party()->addMember( player ); ! socket->log( tr( "Accepted party invitation from '%1'.\n" ).arg( leader->account()->login() ) ); } break; *************** *** 425,429 **** socket->clilocMessage( 1008092 ); ! socket->log( LOG_TRACE, QString( "Declined party invitation from '%1'.\n" ).arg( leader->account()->login() ) ); } break; --- 425,429 ---- socket->clilocMessage( 1008092 ); ! socket->log( LOG_TRACE, tr( "Declined party invitation from '%1'.\n" ).arg( leader->account()->login() ) ); } break; Index: console.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** console.cpp 25 Sep 2004 21:15:46 -0000 1.27 --- console.cpp 9 Oct 2004 14:28:59 -0000 1.28 *************** *** 84,88 **** progress = QString::null; changeColor( WPC_GREEN ); ! send( "Done\n" ); changeColor( WPC_NORMAL ); } --- 84,88 ---- progress = QString::null; changeColor( WPC_GREEN ); ! send( tr("Done\n") ); changeColor( WPC_NORMAL ); } *************** *** 93,97 **** progress = QString::null; changeColor( WPC_RED ); ! send( "Failed\n" ); changeColor( WPC_NORMAL ); } --- 93,97 ---- progress = QString::null; changeColor( WPC_RED ); ! send( tr("Failed\n") ); changeColor( WPC_NORMAL ); } *************** *** 102,106 **** progress = QString::null; changeColor( WPC_YELLOW ); ! send( "Skipped\n" ); changeColor( WPC_NORMAL ); } --- 102,106 ---- progress = QString::null; changeColor( WPC_YELLOW ); ! send( tr("Skipped\n") ); changeColor( WPC_NORMAL ); } *************** *** 118,124 **** if ( !Server::instance()->getSecure() ) ! Console::instance()->send( "WOLFPACK: Secure mode disabled. Press ? for a commands list.\n" ); else ! Console::instance()->send( "WOLFPACK: Secure mode re-enabled.\n" ); return true; --- 118,124 ---- if ( !Server::instance()->getSecure() ) ! Console::instance()->send( tr("WOLFPACK: Secure mode disabled. Press ? for a commands list.\n") ); else ! Console::instance()->send( tr("WOLFPACK: Secure mode re-enabled.\n") ); return true; *************** *** 128,132 **** if ( Server::instance()->getSecure() && c != '?' ) { ! Console::instance()->send( "WOLFPACK: Secure mode prevents keyboard commands! Press 'S' to disable.\n" ); return false; } --- 128,132 ---- if ( Server::instance()->getSecure() && c != '?' ) { ! Console::instance()->send( tr("WOLFPACK: Secure mode prevents keyboard commands! Press 'S' to disable.\n") ); return false; } *************** *** 135,139 **** { case 'Q': ! Console::instance()->send( "WOLFPACK: Immediate Shutdown initialized!\n" ); Server::instance()->cancel(); break; --- 135,139 ---- { case 'Q': ! Console::instance()->send( tr("WOLFPACK: Immediate Shutdown initialized!\n") ); Server::instance()->cancel(); break; *************** *** 170,186 **** break; case '?': ! Console::instance()->send( "Console commands:\n" ); ! Console::instance()->send( " Q: Shutdown the server.\n" ); ! Console::instance()->send( " # - Save world\n" ); ! Console::instance()->send( " W - Display logged in characters\n" ); ! Console::instance()->send( " A - Reload accounts\n" ); ! Console::instance()->send( " R - Reload scripts\n" ); ! Console::instance()->send( " S - Toggle Secure mode " ); if ( Server::instance()->getSecure() ) ! Console::instance()->send( "[enabled]\n" ); else ! Console::instance()->send( "[disabled]\n" ); ! Console::instance()->send( " ? - Commands list (this)\n" ); ! Console::instance()->send( "End of commands list.\n" ); break; default: --- 170,186 ---- break; case '?': ! Console::instance()->send( tr("Console commands:\n") ); ! Console::instance()->send( tr(" Q: Shutdown the server.\n") ); ! Console::instance()->send( tr(" # - Save world\n") ); ! Console::instance()->send( tr(" W - Display logged in characters\n") ); ! Console::instance()->send( tr(" A - Reload accounts\n") ); ! Console::instance()->send( tr(" R - Reload scripts\n") ); ! Console::instance()->send( tr(" S - Toggle Secure mode ") ); if ( Server::instance()->getSecure() ) ! Console::instance()->send( tr("[enabled]\n") ); else ! Console::instance()->send( tr("[disabled]\n") ); ! Console::instance()->send( tr(" ? - Commands list (this)\n") ); ! Console::instance()->send( tr("End of commands list.\n") ); break; default: Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.452 retrieving revision 1.453 diff -C2 -d -r1.452 -r1.453 *** items.cpp 8 Oct 2004 01:13:15 -0000 1.452 --- items.cpp 9 Oct 2004 14:28:59 -0000 1.453 *************** *** 871,879 **** else if ( element->hasAttribute( "list" ) ) { ! qWarning( "cItem::processContainerNode <item list=\"myList\"/> not implemented!!!" ); } else { ! Console::instance()->log( LOG_ERROR, QString( "Content element lacking id and list attribute in item definition '%1'." ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } --- 871,879 ---- else if ( element->hasAttribute( "list" ) ) { ! Console::instance()->log( LOG_ERROR, tr( "cItem::processContainerNode <item list=\"myList\"/> not implemented!!!" ) ); } else { ! Console::instance()->log( LOG_ERROR, tr( "Content element lacking id and list attribute in item definition '%1'." ).arg( element->getTopmostParent()->getAttribute( "id", "unknown" ) ) ); } } *************** *** 1348,1352 **** if ( pItem == this ) { ! Console::instance()->log( LOG_WARNING, QString( "Rejected putting an item into itself (%1)" ).arg( serial_, 0, 16 ) ); return; } --- 1348,1352 ---- if ( pItem == this ) { ! Console::instance()->log( LOG_WARNING, tr( "Rejected putting an item into itself (%1)" ).arg( serial_, 0, 16 ) ); return; } *************** *** 1970,1974 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Unable to create unscripted item: %1\n" ).arg( id ) ); } --- 1970,1974 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Unable to create unscripted item: %1\n" ).arg( id ) ); } Index: skills.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v retrieving revision 1.232 retrieving revision 1.233 diff -C2 -d -r1.232 -r1.233 *** skills.cpp 19 Aug 2004 01:55:56 -0000 1.232 --- skills.cpp 9 Oct 2004 14:28:59 -0000 1.233 *************** *** 388,392 **** if ( title >= skillRanks.size() ) { ! pChar->log( LOG_ERROR, "Invalid skill rank information.\n" ); return skillTitle; } --- 388,392 ---- if ( title >= skillRanks.size() ) { ! pChar->log( LOG_ERROR, tr("Invalid skill rank information.\n") ); return skillTitle; } *************** *** 395,399 **** if ( skill >= skills.size() ) { ! pChar->log( LOG_ERROR, QString( "Skill id out of range: %u.\n" ).arg( skill ) ); return skillTitle; } --- 395,399 ---- if ( skill >= skills.size() ) { ! pChar->log( LOG_ERROR, tr( "Skill id out of range: %u.\n" ).arg( skill ) ); return skillTitle; } *************** *** 409,413 **** if ( skill >= skills.size() ) { ! Console::instance()->log( LOG_ERROR, QString( "Skill id out of range: %u" ).arg( skill ) ); return QString::null; } --- 409,413 ---- if ( skill >= skills.size() ) { ! Console::instance()->log( LOG_ERROR, tr( "Skill id out of range: %u" ).arg( skill ) ); return QString::null; } *************** *** 433,437 **** if ( skill >= skills.size() ) { ! Console::instance()->log( LOG_ERROR, QString( "Skill id out of range: %u" ).arg( skill ) ); return QString::null; } --- 433,437 ---- if ( skill >= skills.size() ) { ! Console::instance()->log( LOG_ERROR, tr( "Skill id out of range: %u" ).arg( skill ) ); return QString::null; } Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** pythonscript.cpp 26 Sep 2004 22:40:04 -0000 1.53 --- pythonscript.cpp 9 Oct 2004 14:28:59 -0000 1.54 *************** *** 630,634 **** if ( events[i] && !PyCallable_Check( events[i] ) ) { ! Console::instance()->log( LOG_ERROR, QString( "Script %1 has non callable event: %1" ).arg( eventNames[i] ) ); Py_DECREF( events[i] ); --- 630,634 ---- if ( events[i] && !PyCallable_Check( events[i] ) ) { ! Console::instance()->log( LOG_ERROR, tr( "Script %1 has non callable event: %1" ).arg( eventNames[i] ) ); Py_DECREF( events[i] ); Index: sectors.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/sectors.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** sectors.cpp 17 Sep 2004 16:34:00 -0000 1.32 --- sectors.cpp 9 Oct 2004 14:28:59 -0000 1.33 *************** *** 98,102 **** if ( width == 0 || height == 0 ) { ! Console::instance()->log( LOG_ERROR, QString( "Invalid Sectormap boundaries (Width: %1, Height: %2)." ).arg( width ).arg( height ) ); return false; } --- 98,102 ---- if ( width == 0 || height == 0 ) { ! Console::instance()->log( LOG_ERROR, tr( "Invalid Sectormap boundaries (Width: %1, Height: %2)." ).arg( width ).arg( height ) ); return false; } *************** *** 584,588 **** if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findItems)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } --- 584,588 ---- if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findItems)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } *************** *** 597,601 **** if ( it == charmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findChars)" ).arg( map ) ); return new cCharSectorIterator( 0, 0 ); // Return an empty iterator } --- 597,601 ---- if ( it == charmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findChars)" ).arg( map ) ); return new cCharSectorIterator( 0, 0 ); // Return an empty iterator } *************** *** 614,618 **** if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findItems)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } --- 614,618 ---- if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findItems)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } *************** *** 627,631 **** if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findMultis)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } --- 627,631 ---- if ( it == itemmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findMultis)" ).arg( map ) ); return new cItemSectorIterator( 0, 0 ); // Return an empty iterator } *************** *** 640,644 **** if ( it == charmaps.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find a map with the id %1. (cSectorMaps::findChars)" ).arg( map ) ); return new cCharSectorIterator( 0, 0 ); // Return an empty iterator } --- 640,644 ---- if ( it == charmaps.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find a map with the id %1. (cSectorMaps::findChars)" ).arg( map ) ); return new cCharSectorIterator( 0, 0 ); // Return an empty iterator } Index: definable.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definable.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** definable.cpp 2 Oct 2004 22:15:50 -0000 1.22 --- definable.cpp 9 Oct 2004 14:28:59 -0000 1.23 *************** *** 54,58 **** if ( tInherit == sectionNode ) { ! Console::instance()->log( LOG_ERROR, QString( "Circulary inheriting %1.\n" ).arg( sectionNode->getAttribute( "inherit", "" ) ) ); return; } --- 54,58 ---- if ( tInherit == sectionNode ) { ! Console::instance()->log( LOG_ERROR, tr( "Circulary inheriting %1.\n" ).arg( sectionNode->getAttribute( "inherit", "" ) ) ); return; } Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** definitions.cpp 1 Oct 2004 19:43:56 -0000 1.20 --- definitions.cpp 9 Oct 2004 14:28:59 -0000 1.21 *************** *** 200,204 **** if ( impl->unique[categories[i].key].contains( tagId ) && !Config::instance()->overwriteDefinitions() ) { ! Console::instance()->log( LOG_WARNING, QString( "Duplicate %1: %2\n[File: %3, Line: %4]\n" ).arg( element->name() ).arg( tagId ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } --- 200,204 ---- if ( impl->unique[categories[i].key].contains( tagId ) && !Config::instance()->overwriteDefinitions() ) { ! Console::instance()->log( LOG_WARNING, tr( "Duplicate %1: %2\n[File: %3, Line: %4]\n" ).arg( element->name() ).arg( tagId ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } *************** *** 218,222 **** } ! Console::instance()->log( LOG_WARNING, QString( "Unknown element: %1\n[File: %2, Line: %3]\n" ).arg( element->name() ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } --- 218,222 ---- } ! Console::instance()->log( LOG_WARNING, tr( "Unknown element: %1\n[File: %2, Line: %3]\n" ).arg( element->name() ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } *************** *** 240,254 **** bool warning( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_WARNING, QString( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool error( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, QString( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool fatalError( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, QString( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } --- 240,254 ---- bool warning( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_WARNING, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool error( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool fatalError( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } *************** *** 262,268 **** if ( !File.open( IO_ReadOnly ) ) { ! Console::instance()->send( "Unable to open " ); ! Console::instance()->send( FileName ); ! Console::instance()->send( "!\n" ); return false; } --- 262,266 ---- if ( !File.open( IO_ReadOnly ) ) { ! Console::instance()->send( tr("Unable to open %1!\n").arg(FileName) ); return false; } Index: serverconfig.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** serverconfig.h 6 Oct 2004 00:02:37 -0000 1.6 --- serverconfig.h 9 Oct 2004 14:28:59 -0000 1.7 *************** *** 66,69 **** --- 66,70 ---- class cConfig : public Preferences, public cComponent { + OBJECTDEF(cConfig) protected: QString getGroupDoc( const QString& group ); Index: territories.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** territories.cpp 1 Oct 2004 19:43:56 -0000 1.56 --- territories.cpp 9 Oct 2004 14:29:00 -0000 1.57 *************** *** 339,343 **** if ( territory->rectangles().empty() ) { ! Console::instance()->log( LOG_WARNING, QString( "Region %1 lacks rectangle tag, ignoring region.\n" ).arg( territory->name() ) ); delete territory; } --- 339,343 ---- if ( territory->rectangles().empty() ) { ! Console::instance()->log( LOG_WARNING, tr( "Region %1 lacks rectangle tag, ignoring region.\n" ).arg( territory->name() ) ); delete territory; } Index: scriptmanager.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** scriptmanager.cpp 25 Sep 2004 02:03:20 -0000 1.27 --- scriptmanager.cpp 9 Oct 2004 14:28:59 -0000 1.28 *************** *** 149,153 **** if ( scripts.contains( element->text().latin1() ) ) { ! Console::instance()->log( LOG_WARNING, QString( "Duplicate Script: %1" ).arg( element->text() ) ); continue; } --- 149,153 ---- if ( scripts.contains( element->text().latin1() ) ) { ! Console::instance()->log( LOG_WARNING, tr( "Duplicate Script: %1" ).arg( element->text() ) ); continue; } Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** serverconfig.cpp 6 Oct 2004 00:02:37 -0000 1.12 --- serverconfig.cpp 9 Oct 2004 14:28:59 -0000 1.13 *************** *** 366,379 **** }; - static stGroupDoc group_doc[] = - { - {"AI", "This group configures the NPC AI."}, - {"Accounts", "This group configures the account management."}, - {"Database", "This group configures access to the worldsave database."}, - {0, 0} - }; - QString cConfig::getGroupDoc( const QString& group ) { // Try to find documentation for a group in our table unsigned int i = 0; --- 366,379 ---- }; QString cConfig::getGroupDoc( const QString& group ) { + static stGroupDoc group_doc[] = + { + {"AI", QT_TR_NOOP("This group configures the NPC AI.")}, + {"Accounts", QT_TR_NOOP("This group configures the account management.")}, + {"Database", QT_TR_NOOP("This group configures access to the worldsave database.")}, + {0, 0} + }; + // Try to find documentation for a group in our table unsigned int i = 0; *************** *** 383,387 **** if ( group == group_doc[i].group ) { ! return group_doc[i].documentation; } ++i; --- 383,387 ---- if ( group == group_doc[i].group ) { ! return tr(group_doc[i].documentation); } ++i; *************** *** 398,414 **** }; - static stEntryDoc entry_doc[] = - { - {"Accounts", "Auto Create", "If active login attempts with non-existing login names will create a new account automatically\n" - "This is very usefull for new shards without account policy\n"}, - {"Accounts", "Database Driver", "Possible values are: sqlite, mysql"}, - {"Accounts", "Maximum Number of Characters", "Should not be more than 6, due to client restrictions"}, - {"Accounts", "Use MD5 Hashed Passwords", "This will store hashed passwords, increasing password security."}, - {"Accounts", "Automatically Hash Loaded Passwords", "If active, will convert older plain text passwords into MD5 hash"}, - {0, 0, 0} - }; - QString cConfig::getEntryDoc( const QString& group, const QString& entry ) { // Try to find documentation for an entry in our table unsigned int i = 0; --- 398,414 ---- }; QString cConfig::getEntryDoc( const QString& group, const QString& entry ) { + static stEntryDoc entry_doc[] = + { + {"Accounts", "Auto Create", QT_TR_NOOP("If active login attempts with non-existing login names will create a new account automatically\n" + "This is very usefull for new shards without account policy\n")}, + {"Accounts", "Database Driver", QT_TR_NOOP("Possible values are: sqlite, mysql")}, + {"Accounts", "Maximum Number of Characters", QT_TR_NOOP("Should not be more than 6, due to client restrictions")}, + {"Accounts", "Use MD5 Hashed Passwords", QT_TR_NOOP("This will store hashed passwords, increasing password security.")}, + {"Accounts", "Automatically Hash Loaded Passwords", QT_TR_NOOP("If active, will convert older plain text passwords into MD5 hash")}, + {0, 0, 0} + }; + // Try to find documentation for an entry in our table unsigned int i = 0; *************** *** 418,422 **** if ( group == entry_doc[i].group && entry == entry_doc[i].entry ) { ! return entry_doc[i].documentation; } ++i; --- 418,422 ---- if ( group == entry_doc[i].group && entry == entry_doc[i].entry ) { ! return tr(entry_doc[i].documentation); } ++i; Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** player.cpp 8 Oct 2004 01:13:15 -0000 1.136 --- player.cpp 9 Oct 2004 14:28:59 -0000 1.137 *************** *** 692,696 **** if ( !pi ) { ! Console::instance()->log( LOG_ERROR, "cChar::canPickUp() - bad parm" ); return false; } --- 692,696 ---- if ( !pi ) { ! Console::instance()->log( LOG_ERROR, tr("cChar::canPickUp() - bad parm") ); return false; } *************** *** 845,849 **** if ( !pItem ) { ! Console::instance()->log( LOG_ERROR, QString( "Invalid item tag without id or list in startitem definition '%1'" ).arg( element->getAttribute( "id" ) ) ); } else --- 845,849 ---- if ( !pItem ) { ! Console::instance()->log( LOG_ERROR, tr( "Invalid item tag without id or list in startitem definition '%1'" ).arg( element->getAttribute( "id" ) ) ); } else *************** *** 881,885 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Trying to equip invalid item (%1) in startitem definition '%2'" ).arg( pItem->id(), 0, 16 ).arg( element->getAttribute( "id" ) ) ); } } --- 881,885 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Trying to equip invalid item (%1) in startitem definition '%2'" ).arg( pItem->id(), 0, 16 ).arg( element->getAttribute( "id" ) ) ); } } *************** *** 887,891 **** { pItem->remove(); ! Console::instance()->log( LOG_ERROR, QString( "Unrecognized startitem tag '%1' in definition '%2'." ).arg( node->name() ).arg( element->getAttribute( "id" ) ) ); } } --- 887,891 ---- { pItem->remove(); ! Console::instance()->log( LOG_ERROR, tr( "Unrecognized startitem tag '%1' in definition '%2'." ).arg( node->name() ).arg( element->getAttribute( "id" ) ) ); } } Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** basedef.cpp 1 Oct 2004 15:15:56 -0000 1.23 --- basedef.cpp 9 Oct 2004 14:28:59 -0000 1.24 *************** *** 50,54 **** if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Basedef %1 has invalid integer property %2.\n").arg(id_).arg(name)); } --- 50,54 ---- if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Basedef %1 has invalid integer property %2.\n").arg(id_).arg(name)); } *************** *** 199,203 **** { if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, QString( "Missing npc definition '%1'.\n" ).arg( id_ ) ); } return; --- 199,203 ---- { if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, tr( "Missing npc definition '%1'.\n" ).arg( id_ ) ); } return; *************** *** 229,233 **** if (!file.open(IO_ReadOnly)) { ! Console::instance()->log(LOG_WARNING, QString("Unable to load body information from %1.\n").arg(filename)); } --- 229,233 ---- if (!file.open(IO_ReadOnly)) { ! Console::instance()->log(LOG_WARNING, tr("Unable to load body information from %1.\n").arg(filename)); } *************** *** 249,253 **** bodyinfo.body = id.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid body id in bodyinfo file: %1.\n").arg(id)); continue; } --- 249,253 ---- bodyinfo.body = id.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid body id in bodyinfo file: %1.\n").arg(id)); continue; } *************** *** 258,262 **** bodyinfo.basesound = basesound.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid basesound in bodyinfo file: %1.\n").arg(basesound)); continue; } --- 258,262 ---- bodyinfo.basesound = basesound.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid basesound in bodyinfo file: %1.\n").arg(basesound)); continue; } *************** *** 270,274 **** bodyinfo.figurine = figurine.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid figurine in bodyinfo file: %1.\n").arg(figurine)); continue; } --- 270,274 ---- bodyinfo.figurine = figurine.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid figurine in bodyinfo file: %1.\n").arg(figurine)); continue; } *************** *** 282,286 **** bodyinfo.soundmode = soundmode.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid soundmode in bodyinfo file: %1.\n").arg(soundmode)); continue; } --- 282,286 ---- bodyinfo.soundmode = soundmode.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid soundmode in bodyinfo file: %1.\n").arg(soundmode)); continue; } *************** *** 294,298 **** bodyinfo.flags = flags.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid flags in bodyinfo file: %1.\n").arg(flags)); continue; } --- 294,298 ---- bodyinfo.flags = flags.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid flags in bodyinfo file: %1.\n").arg(flags)); continue; } *************** *** 306,310 **** bodyinfo.type = bodytype.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, QString("Invalid bodytype in bodyinfo file: %1.\n").arg(bodytype)); continue; } --- 306,310 ---- bodyinfo.type = bodytype.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid bodytype in bodyinfo file: %1.\n").arg(bodytype)); continue; } *************** *** 441,445 **** { if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) ); } return; --- 441,445 ---- { if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, tr( "Missing item definition '%1'.\n" ).arg( id_ ) ); } return; Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** world.cpp 2 Oct 2004 22:15:51 -0000 1.133 --- world.cpp 9 Oct 2004 14:29:00 -0000 1.134 *************** *** 431,435 **** reader.open( filename ); ! Console::instance()->log( LOG_MESSAGE, QString( "Loading %1 objects from %2.\n" ).arg( reader.objectCount() ).arg( filename ) ); Console::instance()->send( "0%" ); Console::instance()->setProgress( "0%" ); --- 431,435 ---- reader.open( filename ); ! Console::instance()->log( LOG_MESSAGE, tr( "Loading %1 objects from %2.\n" ).arg( reader.objectCount() ).arg( filename ) ); Console::instance()->send( "0%" ); Console::instance()->setProgress( "0%" ); *************** *** 513,517 **** else if ( type != 0xFF ) { ! Console::instance()->log(LOG_ERROR, QString( "Invalid worldfile, unknown and unskippable type %1." ).arg( type ) ); return; } --- 513,517 ---- else if ( type != 0xFF ) { ! Console::instance()->log(LOG_ERROR, tr( "Invalid worldfile, unknown and unskippable type %1." ).arg( type ) ); return; } *************** *** 551,555 **** if ( !PersistentBroker::instance()->connect( Config::instance()->databaseHost(), Config::instance()->databaseName(), Config::instance()->databaseUsername(), Config::instance()->databasePassword() ) ) { ! throw QString( "Unable to open the world database." ); } --- 551,555 ---- if ( !PersistentBroker::instance()->connect( Config::instance()->databaseHost(), Config::instance()->databaseName(), Config::instance()->databaseUsername(), Config::instance()->databasePassword() ) ) { ! throw tr( "Unable to open the world database." ); } *************** *** 591,595 **** cPythonScript *script = ScriptManager::instance()->getGlobalHook(EVENT_UPDATEDATABASE); if (!script || !script->canHandleEvent(EVENT_UPDATEDATABASE)) { ! throw wpException(QString("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); } --- 591,595 ---- cPythonScript *script = ScriptManager::instance()->getGlobalHook(EVENT_UPDATEDATABASE); if (!script || !script->canHandleEvent(EVENT_UPDATEDATABASE)) { ! throw wpException(tr("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); } *************** *** 599,603 **** if (!result) { ! throw wpException(QString("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); } } --- 599,603 ---- if (!result) { ! throw wpException(tr("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); } } *************** *** 683,687 **** if ( pi->pos().x > max_x || pi->pos().y > max_y ) { ! Console::instance()->log( LOG_ERROR, QString( "Item with invalid position %1,%2,%3,%4.\n" ).arg( pi->pos().x ).arg( pi->pos().y ).arg( pi->pos().z ).arg( pi->pos().map ) ); deleteItems.append( pi ); continue; --- 683,687 ---- if ( pi->pos().x > max_x || pi->pos().y > max_y ) { ! Console::instance()->log( LOG_ERROR, tr( "Item with invalid position %1,%2,%3,%4.\n" ).arg( pi->pos().x ).arg( pi->pos().y ).arg( pi->pos().z ).arg( pi->pos().map ) ); deleteItems.append( pi ); continue; *************** *** 705,709 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Item with invalid container [0x%1].\n" ).arg( contserial, 0, 16 ) ); deleteItems.append( pi ); // Queue this item up for deletion continue; // Skip further processing --- 705,709 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Item with invalid container [0x%1].\n" ).arg( contserial, 0, 16 ) ); deleteItems.append( pi ); // Queue this item up for deletion continue; // Skip further processing *************** *** 840,844 **** unsigned int duration = getNormalizedTime() - loadStart; ! Console::instance()->log( LOG_MESSAGE, QString( "The world loaded in %1 ms.\n" ).arg( duration ) ); cComponent::load(); --- 840,844 ---- unsigned int duration = getNormalizedTime() - loadStart; ! Console::instance()->log( LOG_MESSAGE, tr( "The world loaded in %1 ms.\n" ).arg( duration ) ); cComponent::load(); *************** *** 849,853 **** Network::instance()->broadcast(tr("Worldsave Initialized")); ! Console::instance()->send( "Saving World..." ); setOption("db_version", WP_DATABASE_VERSION); // Make SURE it's saved --- 849,853 ---- Network::instance()->broadcast(tr("Worldsave Initialized")); ! Console::instance()->send( tr("Saving World...") ); setOption("db_version", WP_DATABASE_VERSION); // Make SURE it's saved *************** *** 934,938 **** } else { if (!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; } --- 934,938 ---- } else { if (!PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver())) { ! Console::instance()->log( LOG_ERROR, tr( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); return; } *************** *** 941,945 **** PersistentBroker::instance()->connect( Config::instance()->databaseHost(), Config::instance()->databaseName(), Config::instance()->databaseUsername(), Config::instance()->databasePassword() ); } catch (QString& e) { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't open the database: %1\n" ).arg( e ) ); return; } --- 941,945 ---- PersistentBroker::instance()->connect( Config::instance()->databaseHost(), Config::instance()->databaseName(), Config::instance()->databaseUsername(), Config::instance()->databasePassword() ); } catch (QString& e) { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't open the database: %1\n" ).arg( e ) ); return; } *************** *** 1021,1028 **** Console::instance()->changeColor( WPC_GREEN ); ! Console::instance()->send( " Done" ); Console::instance()->changeColor( WPC_NORMAL ); ! Console::instance()->send( QString( " [%1ms]\n" ).arg( Server::instance()->time() - startTime ) ); } catch ( QString& e ) --- 1021,1028 ---- Console::instance()->changeColor( WPC_GREEN ); ! Console::instance()->send( tr(" Done") ); Console::instance()->changeColor( WPC_NORMAL ); ! Console::instance()->send( tr( " [%1ms]\n" ).arg( Server::instance()->time() - startTime ) ); } catch ( QString& e ) *************** *** 1031,1038 **** Console::instance()->changeColor( WPC_RED ); ! Console::instance()->send( " Failed\n" ); Console::instance()->changeColor( WPC_NORMAL ); ! Console::instance()->log( LOG_ERROR, "Saving failed: " + e ); } --- 1031,1038 ---- Console::instance()->changeColor( WPC_RED ); ! Console::instance()->send( tr(" Failed\n") ); Console::instance()->changeColor( WPC_NORMAL ); ! Console::instance()->log( LOG_ERROR, tr("Saving failed: %1").arg( e ) ); } *************** *** 1079,1083 **** if ( !object ) { ! Console::instance()->log( LOG_ERROR, "Couldn't register a NULL object in the world." ); return; } --- 1079,1083 ---- if ( !object ) { ! Console::instance()->log( LOG_ERROR, tr("Couldn't register a NULL object in the world.") ); return; } *************** *** 1090,1094 **** if ( !object ) { ! Console::instance()->log( LOG_ERROR, "Trying to register a null object in the World." ); return; } --- 1090,1094 ---- if ( !object ) { ! Console::instance()->log( LOG_ERROR, tr("Trying to register a null object in the World.") ); return; } *************** *** 1101,1105 **** if ( it != p->items.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to register an item with the Serial 0x%1 which is already in use." ).arg( serial, 0, 16 ) ); return; } --- 1101,1105 ---- if ( it != p->items.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to register an item with the Serial 0x%1 which is already in use." ).arg( serial, 0, 16 ) ); return; } *************** *** 1110,1114 **** if ( !pItem ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to register an object with an item serial (0x%1) which is no item." ).arg( serial, 0, 16 ) ); return; } --- 1110,1114 ---- if ( !pItem ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to register an object with an item serial (0x%1) which is no item." ).arg( serial, 0, 16 ) ); return; } *************** *** 1126,1130 **** if ( it != p->chars.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to register a character with the Serial 0x%1 which is already in use." ).arg( QString::number( serial, 0, 16 ) ) ); return; } --- 1126,1130 ---- if ( it != p->chars.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to register a character with the Serial 0x%1 which is already in use." ).arg( QString::number( serial, 0, 16 ) ) ); return; } *************** *** 1135,1139 **** if ( !pChar ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to register an object with a character serial (0x%1) which is no character." ).arg( QString::number( serial, 0, 16 ) ) ); return; } --- 1135,1139 ---- if ( !pChar ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to register an object with a character serial (0x%1) which is no character." ).arg( QString::number( serial, 0, 16 ) ) ); return; } *************** *** 1156,1160 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Tried to register an object with an invalid Serial (0x%1) in the World." ).arg( QString::number( serial, 0, 16 ) ) ); return; } --- 1156,1160 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Tried to register an object with an invalid Serial (0x%1) in the World." ).arg( QString::number( serial, 0, 16 ) ) ); return; } *************** *** 1165,1169 **** if ( !object ) { ! Console::instance()->log( LOG_ERROR, "Trying to unregister a null object from the world." ); return; } --- 1165,1169 ---- if ( !object ) { ! Console::instance()->log( LOG_ERROR, tr("Trying to unregister a null object from the world.") ); return; } *************** *** 1180,1184 **** if ( it == p->items.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to unregister a non-existing item with the serial 0x%1." ).arg( serial, 0, 16 ) ); return; } --- 1180,1184 ---- if ( it == p->items.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to unregister a non-existing item with the serial 0x%1." ).arg( serial, 0, 16 ) ); return; } *************** *** 1196,1200 **** if ( it == p->chars.end() ) { ! Console::instance()->log( LOG_ERROR, QString( "Trying to unregister a non-existing character with the serial 0x%1." ).arg( serial, 0, 16 ) ); return; } --- 1196,1200 ---- if ( it == p->chars.end() ) { ! Console::instance()->log( LOG_ERROR, tr( "Trying to unregister a non-existing character with the serial 0x%1." ).arg( serial, 0, 16 ) ); return; } *************** *** 1218,1222 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Trying to unregister an object with an invalid serial (0x%1)." ).arg( serial, 0, 16 ) ); return; } --- 1218,1222 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Trying to unregister an object with an invalid serial (0x%1)." ).arg( serial, 0, 16 ) ); return; } *************** *** 1269,1273 **** if ( !object ) { ! Console::instance()->log( LOG_ERROR, "Tried to delete a null object from the worldsave." ); return; } --- 1269,1273 ---- if ( !object ) { ! Console::instance()->log( LOG_ERROR, tr("Tried to delete a null object from the worldsave.") ); return; } *************** *** 1357,1361 **** if (!backup.isNull() && !QFile::remove( backupName + backup )) { ! Console::instance()->log(LOG_ERROR, QString("Unable to remove backup %1. No new backup has been created.\n").arg(backup)); return; } --- 1357,1361 ---- if (!backup.isNull() && !QFile::remove( backupName + backup )) { ! Console::instance()->log(LOG_ERROR, tr("Unable to remove backup %1. No new backup has been created.\n").arg(backup)); return; } Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** npc.cpp 3 Oct 2004 13:51:39 -0000 1.119 --- npc.cpp 9 Oct 2004 14:28:59 -0000 1.120 *************** *** 1412,1416 **** if ( !DefSection ) { ! Console::instance()->log( LOG_ERROR, QString( "Unable to create unscripted npc: %1\n" ).arg( section ) ); return NULL; } --- 1412,1416 ---- if ( !DefSection ) { ! Console::instance()->log( LOG_ERROR, tr( "Unable to create unscripted npc: %1\n" ).arg( section ) ); return NULL; } |
|
From: Richard M. <dr...@us...> - 2004-10-09 05:23:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7903/system Modified Files: clientmacros.py Log Message: Updates Index: clientmacros.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/clientmacros.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** clientmacros.py 9 Oct 2004 05:10:51 -0000 1.1 --- clientmacros.py 9 Oct 2004 05:23:31 -0000 1.2 *************** *** 18,21 **** --- 18,25 ---- def managePacket( socket, packet ): + # Leave this in, used for packet sniffing. + #socket.sysmessage( "%i, %x" % ( packet.size, packet.getbyte(3) ) ) + + # Open Doors if packet.size == 5 and packet.getbyte(3) == int( 0x58 ): if not socket.player: *************** *** 24,28 **** openDoor( socket ) return True ! elif ( packet.size == 11 or packet.size == 8 ) and packet.getbyte(3) == int( 0xC7 ): if not socket.player: return False --- 28,33 ---- openDoor( socket ) return True ! # Actions, Salute and Bow ! elif packet.size in [ 8, 11 ] and packet.getbyte(3) == int( 0xC7 ): if not socket.player: return False *************** *** 30,33 **** --- 35,41 ---- performAction( socket, packet ) return True + # Invoke Virtues + elif packet.size == 6 and packet.getbyte(3) == int( 0xf4 ): + return False def performAction( socket, packet ): |
|
From: Richard M. <dr...@us...> - 2004-10-09 05:13:38
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6271/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: Updates Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** ChangeLog.wolfpack 8 Oct 2004 19:59:35 -0000 1.142 --- ChangeLog.wolfpack 9 Oct 2004 05:13:18 -0000 1.143 *************** *** 55,58 **** --- 55,59 ---- - Fixed bandages for logged out chars. - Rewrote the bandages script. + - Added macro support for bowing and salutes. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Richard M. <dr...@us...> - 2004-10-09 05:12:26
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6022 Modified Files: scripts.xml Log Message: Change Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** scripts.xml 6 Oct 2004 20:16:37 -0000 1.167 --- scripts.xml 9 Oct 2004 05:11:55 -0000 1.168 *************** *** 178,182 **** <script>system.hunger</script> <script>system.loot</script> ! <script>system.macro_opendoor</script> <script>system.makemenus</script> <!-- These require testing --> --- 178,182 ---- <script>system.hunger</script> <script>system.loot</script> ! <script>system.clientmacros</script> <script>system.makemenus</script> <!-- These require testing --> |
|
From: Richard M. <dr...@us...> - 2004-10-09 05:11:30
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5851 Added Files: clientmacros.py Removed Files: macro_opendoor.py Log Message: Guess what! YOU CAN SALUTE AND BOW NOW! --- NEW FILE: clientmacros.py --- import wolfpack from wolfpack.consts import EVENT_USE dirs = { 0: [0, -1], 1: [1, -1], 2: [1, 0], 3: [1, 1], 4: [0, 1], 5: [-1, 1], 6: [-1, 0], 7: [-1, -1] } def onLoad(): wolfpack.registerpackethook( 0x12, managePacket ) def managePacket( socket, packet ): if packet.size == 5 and packet.getbyte(3) == int( 0x58 ): if not socket.player: return False else: openDoor( socket ) return True elif ( packet.size == 11 or packet.size == 8 ) and packet.getbyte(3) == int( 0xC7 ): if not socket.player: return False else: performAction( socket, packet ) return True def performAction( socket, packet ): char = socket.player # Bow if packet.size == 8: char.action( 0x20 ) # Salute elif packet.size == 11: char.action( 0x21 ) return True def openDoor( socket ): char = socket.player dir = char.direction doors = wolfpack.items(char.pos.x + dirs[dir][0], char.pos.y + dirs[dir][1], char.pos.map, 0) if not doors: return False opendoor = 0 reach = 0 for door in doors: if char.pos.z == door.pos.z: reach = 1 elif char.pos.z < door.pos.z and char.pos.z >= ( door.pos.z - 5): reach = 1 elif char.pos.z > door.pos.z and char.pos.z <= ( door.pos.z + 5): reach = 1 if reach == 1: for event in door.scripts: if event == 'door': opendoor = 1 break if opendoor == 1: wolfpack.callevent( event, EVENT_USE, (char, door) ) break return True --- macro_opendoor.py DELETED --- |
|
From: Sebastian H. <dar...@us...> - 2004-10-09 01:45:16
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2008/items Modified Files: unsorted.xml Log Message: support for hue and rendermode Index: unsorted.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/unsorted.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** unsorted.xml 2 Oct 2004 23:25:38 -0000 1.10 --- unsorted.xml 9 Oct 2004 01:44:59 -0000 1.11 *************** *** 1 **** ! <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: olafk | | ( ( ;._ \\ ctr | Last Modification: item names added | ================================================================= | Stuff not yet Sorted | ================================================================= --> <definitions> <!-- Lava --> <item id="12f0"> <id>0x12f0</id> <nodecay /> </item> <!-- Lava --> <item id="1321"> <id>0x1321</id> <nodecay /> </item> <item id="131b"> <id>0x131b</id> <nodecay /> </item> <!-- Third Dawn Weapons --> <!-- daemon sword --> <item id="2554"> <id>0x2554</id> </item> <!-- ettin hammer --> <item id="2555"> <id>0x2555</id> </item> <!-- liche's staff --> <item id="2556"> <id>0x2556</id> </item> <!-- lizardman's mace --> <item id="2557"> <id>0x2557</id> </item> <!-- lizardman's spea --> <item id="2558"> <id>0x2558</id> </item> <!-- ogre's club --> <item id="2559"> <id>0x2559</id> </item> <!-- ophidian staff --> <item id="255a"> <id>0x255a</id> </item> <!-- ophidian bardich --> <item id="255b"> <id>0x255b</id> </item> <!-- orc club --> <item id="255c"> <id>0x255c</id> </item> <!-- ratman axe --> <item id="255d"> <id>0x255d</id> </item> <!-- ratman sword --> <item id="255e"> <id>0x255e</id> </item> <!-- skeleton axe --> <item id="255f"> <id>0x255f</id> </item> <!-- skeleton scimita --> <item id="2560"> <id>0x2560</id> </item> <!-- terathan staff --> <item id="2561"> <id>0x2561</id> </item> <!-- terathan spear --> <item id="2562"> <id>0x2562</id> </item> <!-- terathan mace --> <item id="2563"> <id>0x2563</id> </item> <!-- troll axe --> <item id="2564"> <id>0x2564</id> </item> <!-- troll maul --> <item id="2565"> <id>0x2565</id> </item> <!-- frost troll club --> <item id="2566"> <id>0x2566</id> </item> <!-- orc lord battleaxe --> <item id="2567"> <id>0x2567</id> </item> <!-- orc mage staff --> <item id="2568"> <id>0x2568</id> </item> <!-- bone mage staff --> <item id="2569"> <id>0x2569</id> </item> <!-- magic staff --> <item id="256b"> <id>0x256b</id> </item> <!-- magic staff --> <item id="256c"> <id>0x256c</id> </item> <!-- magic staff --> <item id="256d"> <id>0x256d</id> </item> <!-- magic staff --> <item id="256e"> <id>0x256e</id> </item> <!-- smyth hammer --> <item id="256f"> <id>0x256f</id> </item> <!-- hatchet --> <item id="2570"> <id>0x2570</id> </item> <!-- horseman's bow --> <item id="2571"> <id>0x2571</id> </item> <!-- javelin --> <item id="2572"> <id>0x2572</id> </item> <!-- magic sword --> <item id="2573"> <id>0x2573</id> </item> <!-- magic sword --> <item id="2574"> <id>0x2574</id> </item> <!-- magic sword --> <item id="2575"> <id>0x2575</id> </item> <!-- magic sword --> <item id="2576"> <id>0x2576</id> </item> <!-- naginata --> <item id="2577"> <id>0x2577</id> </item> <!-- no-dachi --> <item id="2578"> <id>0x2578</id> </item> <!-- pick --> <item id="2579"> <id>0x2579</id> </item> <!-- spear --> <item id="257a"> <id>0x257a</id> </item> <!-- spear --> <item id="257b"> <id>0x257b</id> </item> <!-- sword --> <item id="257c"> <id>0x257c</id> </item> <!-- longsword --> <item id="257d"> <id>0x257d</id> </item> <!-- shortsword --> <item id="257e"> <id>0x257e</id> </item> <!-- war mace --> <item id="257f"> <id>0x257f</id> </item> <!-- Third Dawn Clothes & Armor --> <!-- spiked shorts --> <item id="25e4"> <id>0x25e4</id> </item> <!-- spiked shorts --> <item id="25e5"> <id>0x25e5</id> </item> <!-- amazon harness --> <item id="25e6"> <id>0x25e6</id> </item> <!-- amazon harness --> <item id="25e7"> <id>0x25e7</id> </item> <!-- elite harness --> <item id="25e8"> <id>0x25e8</id> </item> <!-- elite harness --> <item id="25e9"> <id>0x25e9</id> </item> <!-- checkered shirt --> <item id="25ea"> <id>0x25ea</id> </item> <!-- checkered shirt --> <item id="25eb"> <id>0x25eb</id> </item> <!-- robe --> <item id="25ec"> <id>0x25ec</id> </item> <!-- robe --> <item id="25ed"> <id>0x25ed</id> </item> <!-- robe --> <item id="25ee"> <id>0x25ee</id> </item> <!-- robe --> <item id="25ef"> <id>0x25ef</id> </item> <!-- death shroud --> <item id="25f0"> <id>0x25f0</id> </item> <!-- death shroud --> <item id="25f1"> <id>0x25f1</id> </item> <!-- knee skirt --> <item id="25f2"> <id>0x25f2</id> </item> <!-- knee skirt --> <item id="25f3"> <id>0x25f3</id> </item> <!-- jester pants --> <item id="2649"> <id>0x2649</id> </item> <!-- jester pants --> <item id="264a"> <id>0x264a</id> </item> <!-- plate gorget --> <item id="264b"> <id>0x264b</id> </item> <!-- plate gorget --> <item id="264c"> <id>0x264c</id> </item> <!-- haidate --> <item id="264d"> <id>0x264d</id> </item> <!-- haidate --> <item id="264e"> <id>0x264e</id> </item> <!-- kobakama --> <item id="264f"> <id>0x264f</id> </item> <!-- kobakama --> <item id="2650"> <id>0x2650</id> </item> <!-- ninja pants --> <item id="2651"> <id>0x2651</id> </item> <!-- ninja pants --> <item id="2652"> <id>0x2652</id> </item> <!-- waraji --> <item id="2653"> <id>0x2653</id> </item> <!-- waraji --> <item id="2654"> <id>0x2654</id> </item> <!-- jester shoes --> <item id="2655"> <id>0x2655</id> </item> <!-- jester shoes --> <item id="2656"> <id>0x2656</id> </item> <!-- amazon armor --> <item id="2659"> <id>0x2659</id> </item> <!-- amazon armor --> <item id="265a"> <id>0x265a</id> </item> <!-- amazon armor --> <item id="265b"> <id>0x265b</id> </item> <!-- amazon armor --> <item id="265c"> <id>0x265c</id> </item> <!-- amazon armor --> <item id="265d"> <id>0x265d</id> </item> <!-- amazon armor --> <item id="265e"> <id>0x265e</id> </item> <!-- shirt --> <item id="265f"> <id>0x265f</id> </item> <!-- shirt --> <item id="2660"> <id>0x2660</id> </item> <!-- shirt --> <item id="2661"> <id>0x2661</id> </item> <!-- shirt --> <item id="2662"> <id>0x2662</id> </item> <!-- shirt --> <item id="2663"> <id>0x2663</id> </item> <!-- shirt --> <item id="2664"> <id>0x2664</id> </item> <!-- shirt --> <item id="2665"> <id>0x2665</id> </item> <!-- shirt --> <item id="2666"> <id>0x2666</id> </item> <!-- ninja shirt --> <item id="2667"> <id>0x2667</id> </item> <!-- ninja shirt --> <item id="2668"> <id>0x2668</id> </item> <!-- kote sleeves --> <item id="266b"> <id>0x266b</id> </item> <!-- kote sleeves --> <item id="266c"> <id>0x266c</id> </item> <!-- kote sleeves --> <item id="266d"> <id>0x266d</id> </item> <!-- kote sleeves --> <item id="266e"> <id>0x266e</id> </item> <!-- do-maru --> <item id="2671"> <id>0x2671</id> </item> <!-- do-maru --> <item id="2672"> <id>0x2672</id> </item> <!-- haramaki-do --> <item id="2673"> <id>0x2673</id> </item> <!-- haramaki-do --> <item id="2674"> <id>0x2674</id> </item> <!-- kote gloves --> <item id="2677"> <id>0x2677</id> </item> <!-- kote gloves --> <item id="2678"> <id>0x2678</id> </item> <!-- kote gloves --> <item id="2679"> <id>0x2679</id> </item> <!-- kote gloves --> <item id="267a"> <id>0x267a</id> </item> <!-- fancy dress --> <item id="267b"> <id>0x267b</id> </item> <!-- fancy dress --> <item id="267c"> <id>0x267c</id> </item> <!-- fancy dress --> <item id="267d"> <id>0x267d</id> </item> <!-- fancy dress --> <item id="267e"> <id>0x267e</id> </item> <!-- long dress --> <item id="267f"> <id>0x267f</id> </item> <!-- long dress --> <item id="2680"> <id>0x2680</id> </item> <!-- kimono --> <item id="2681"> <id>0x2681</id> </item> <!-- kimono --> <item id="2682"> <id>0x2682</id> </item> <!-- hooded shroud --> <item id="2683"> <id>0x2683</id> </item> <!-- hooded shroud --> <item id="2684"> <id>0x2684</id> </item> <!-- death shroud --> <item id="2685"> <id>0x2685</id> </item> <!-- death shroud --> <item id="2686"> <id>0x2686</id> </item> <!-- winged helmet --> <item id="2689"> <id>0x2689</id> </item> <!-- winged helmet --> <item id="268a"> <id>0x268a</id> </item> <!-- hachimaki --> <item id="268b"> <id>0x268b</id> </item> <!-- hachimaki --> <item id="268c"> <id>0x268c</id> </item> <!-- kabuto --> <item id="268d"> <id>0x268d</id> </item> <!-- kabuto --> <item id="268e"> <id>0x268e</id> </item> <!-- kabuto mempo --> <item id="268f"> <id>0x268f</id> </item> <!-- kabuto mempo --> <item id="2690"> <id>0x2690</id> </item> <!-- leather cap --> <item id="2691"> <id>0x2691</id> </item> <!-- leather cap --> <item id="2692"> <id>0x2692</id> </item> <!-- robin hood cap --> <item id="269d"> <id>0x269d</id> </item> <!-- robin hood cap --> <item id="269e"> <id>0x269e</id> </item> <!-- feathered mask --> <item id="26a1"> <id>0x26a1</id> </item> <!-- feathered mask --> <item id="26a2"> <id>0x26a2</id> </item> <!-- ninja mask --> <item id="26a3"> <id>0x26a3</id> </item> <!-- ninja mask --> <item id="26a4"> <id>0x26a4</id> </item> <!-- bolas --> <item id="26ac"> <id>0x26ac</id> </item> <!-- Arcane Cloak --> <item id="26ad"> <id>0x26ad</id> </item> <!-- Arcane Cloak --> <item id="26ae"> <id>0x26ae</id> </item> <!-- Arcane Thigh Boots --> <item id="26af"> <id>0x26af</id> </item> <!-- Arcane Gloves --> <item id="26b0"> <id>0x26b0</id> </item> </definitions> \ No newline at end of file --- 1 ---- ! <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: olafk | | ( ( ;._ \\ ctr | Last Modification: item names added | ================================================================= | Stuff not yet Sorted | ================================================================= --> <definitions> <!-- Death Vortex --> <item id="3798"> <id>0x3798</id> <nodecay /> <category>Animations\Death Vortex</category> </item> <!-- Lava --> <item id="12f0"> <id>0x12f0</id> <nodecay /> </item> <!-- Lava --> <item id="1321"> <id>0x1321</id> <nodecay /> </item> <item id="131b"> <id>0x131b</id> <nodecay /> </item> <!-- Third Dawn Weapons --> <!-- daemon sword --> <item id="2554"> <id>0x2554</id> </item> <!-- ettin hammer --> <item id="2555"> <id>0x2555</id> </item> <!-- liche's staff --> <item id="2556"> <id>0x2556</id> </item> <!-- lizardman's mace --> <item id="2557"> <id>0x2557</id> </item> <!-- lizardman's spea --> <item id="2558"> <id>0x2558</id> </item> <!-- ogre's club --> <item id="2559"> <id>0x2559</id> </item> <!-- ophidian staff --> <item id="255a"> <id>0x255a</id> </item> <!-- ophidian bardich --> <item id="255b"> <id>0x255b</id> </item> <!-- orc club --> <item id="255c"> <id>0x255c</id> </item> <!-- ratman axe --> <item id="255d"> <id>0x255d</id> </item> <!-- ratman sword --> <item id="255e"> <id>0x255e</id> </item> <!-- skeleton axe --> <item id="255f"> <id>0x255f</id> </item> <!-- skeleton scimita --> <item id="2560"> <id>0x2560</id> </item> <!-- terathan staff --> <item id="2561"> <id>0x2561</id> </item> <!-- terathan spear --> <item id="2562"> <id>0x2562</id> </item> <!-- terathan mace --> <item id="2563"> <id>0x2563</id> </item> <!-- troll axe --> <item id="2564"> <id>0x2564</id> </item> <!-- troll maul --> <item id="2565"> <id>0x2565</id> </item> <!-- frost troll club --> <item id="2566"> <id>0x2566</id> </item> <!-- orc lord battleaxe --> <item id="2567"> <id>0x2567</id> </item> <!-- orc mage staff --> <item id="2568"> <id>0x2568</id> </item> <!-- bone mage staff --> <item id="2569"> <id>0x2569</id> </item> <!-- magic staff --> <item id="256b"> <id>0x256b</id> </item> <!-- magic staff --> <item id="256c"> <id>0x256c</id> </item> <!-- magic staff --> <item id="256d"> <id>0x256d</id> </item> <!-- magic staff --> <item id="256e"> <id>0x256e</id> </item> <!-- smyth hammer --> <item id="256f"> <id>0x256f</id> </item> <!-- hatchet --> <item id="2570"> <id>0x2570</id> </item> <!-- horseman's bow --> <item id="2571"> <id>0x2571</id> </item> <!-- javelin --> <item id="2572"> <id>0x2572</id> </item> <!-- magic sword --> <item id="2573"> <id>0x2573</id> </item> <!-- magic sword --> <item id="2574"> <id>0x2574</id> </item> <!-- magic sword --> <item id="2575"> <id>0x2575</id> </item> <!-- magic sword --> <item id="2576"> <id>0x2576</id> </item> <!-- naginata --> <item id="2577"> <id>0x2577</id> </item> <!-- no-dachi --> <item id="2578"> <id>0x2578</id> </item> <!-- pick --> <item id="2579"> <id>0x2579</id> </item> <!-- spear --> <item id="257a"> <id>0x257a</id> </item> <!-- spear --> <item id="257b"> <id>0x257b</id> </item> <!-- sword --> <item id="257c"> <id>0x257c</id> </item> <!-- longsword --> <item id="257d"> <id>0x257d</id> </item> <!-- shortsword --> <item id="257e"> <id>0x257e</id> </item> <!-- war mace --> <item id="257f"> <id>0x257f</id> </item> <!-- Third Dawn Clothes & Armor --> <!-- spiked shorts --> <item id="25e4"> <id>0x25e4</id> </item> <!-- spiked shorts --> <item id="25e5"> <id>0x25e5</id> </item> <!-- amazon harness --> <item id="25e6"> <id>0x25e6</id> </item> <!-- amazon harness --> <item id="25e7"> <id>0x25e7</id> </item> <!-- elite harness --> <item id="25e8"> <id>0x25e8</id> </item> <!-- elite harness --> <item id="25e9"> <id>0x25e9</id> </item> <!-- checkered shirt --> <item id="25ea"> <id>0x25ea</id> </item> <!-- checkered shirt --> <item id="25eb"> <id>0x25eb</id> </item> <!-- robe --> <item id="25ec"> <id>0x25ec</id> </item> <!-- robe --> <item id="25ed"> <id>0x25ed</id> </item> <!-- robe --> <item id="25ee"> <id>0x25ee</id> </item> <!-- robe --> <item id="25ef"> <id>0x25ef</id> </item> <!-- death shroud --> <item id="25f0"> <id>0x25f0</id> </item> <!-- death shroud --> <item id="25f1"> <id>0x25f1</id> </item> <!-- knee skirt --> <item id="25f2"> <id>0x25f2</id> </item> <!-- knee skirt --> <item id="25f3"> <id>0x25f3</id> </item> <!-- jester pants --> <item id="2649"> <id>0x2649</id> </item> <!-- jester pants --> <item id="264a"> <id>0x264a</id> </item> <!-- plate gorget --> <item id="264b"> <id>0x264b</id> </item> <!-- plate gorget --> <item id="264c"> <id>0x264c</id> </item> <!-- haidate --> <item id="264d"> <id>0x264d</id> </item> <!-- haidate --> <item id="264e"> <id>0x264e</id> </item> <!-- kobakama --> <item id="264f"> <id>0x264f</id> </item> <!-- kobakama --> <item id="2650"> <id>0x2650</id> </item> <!-- ninja pants --> <item id="2651"> <id>0x2651</id> </item> <!-- ninja pants --> <item id="2652"> <id>0x2652</id> </item> <!-- waraji --> <item id="2653"> <id>0x2653</id> </item> <!-- waraji --> <item id="2654"> <id>0x2654</id> </item> <!-- jester shoes --> <item id="2655"> <id>0x2655</id> </item> <!-- jester shoes --> <item id="2656"> <id>0x2656</id> </item> <!-- amazon armor --> <item id="2659"> <id>0x2659</id> </item> <!-- amazon armor --> <item id="265a"> <id>0x265a</id> </item> <!-- amazon armor --> <item id="265b"> <id>0x265b</id> </item> <!-- amazon armor --> <item id="265c"> <id>0x265c</id> </item> <!-- amazon armor --> <item id="265d"> <id>0x265d</id> </item> <!-- amazon armor --> <item id="265e"> <id>0x265e</id> </item> <!-- shirt --> <item id="265f"> <id>0x265f</id> </item> <!-- shirt --> <item id="2660"> <id>0x2660</id> </item> <!-- shirt --> <item id="2661"> <id>0x2661</id> </item> <!-- shirt --> <item id="2662"> <id>0x2662</id> </item> <!-- shirt --> <item id="2663"> <id>0x2663</id> </item> <!-- shirt --> <item id="2664"> <id>0x2664</id> </item> <!-- shirt --> <item id="2665"> <id>0x2665</id> </item> <!-- shirt --> <item id="2666"> <id>0x2666</id> </item> <!-- ninja shirt --> <item id="2667"> <id>0x2667</id> </item> <!-- ninja shirt --> <item id="2668"> <id>0x2668</id> </item> <!-- kote sleeves --> <item id="266b"> <id>0x266b</id> </item> <!-- kote sleeves --> <item id="266c"> <id>0x266c</id> </item> <!-- kote sleeves --> <item id="266d"> <id>0x266d</id> </item> <!-- kote sleeves --> <item id="266e"> <id>0x266e</id> </item> <!-- do-maru --> <item id="2671"> <id>0x2671</id> </item> <!-- do-maru --> <item id="2672"> <id>0x2672</id> </item> <!-- haramaki-do --> <item id="2673"> <id>0x2673</id> </item> <!-- haramaki-do --> <item id="2674"> <id>0x2674</id> </item> <!-- kote gloves --> <item id="2677"> <id>0x2677</id> </item> <!-- kote gloves --> <item id="2678"> <id>0x2678</id> </item> <!-- kote gloves --> <item id="2679"> <id>0x2679</id> </item> <!-- kote gloves --> <item id="267a"> <id>0x267a</id> </item> <!-- fancy dress --> <item id="267b"> <id>0x267b</id> </item> <!-- fancy dress --> <item id="267c"> <id>0x267c</id> </item> <!-- fancy dress --> <item id="267d"> <id>0x267d</id> </item> <!-- fancy dress --> <item id="267e"> <id>0x267e</id> </item> <!-- long dress --> <item id="267f"> <id>0x267f</id> </item> <!-- long dress --> <item id="2680"> <id>0x2680</id> </item> <!-- kimono --> <item id="2681"> <id>0x2681</id> </item> <!-- kimono --> <item id="2682"> <id>0x2682</id> </item> <!-- hooded shroud --> <item id="2683"> <id>0x2683</id> </item> <!-- hooded shroud --> <item id="2684"> <id>0x2684</id> </item> <!-- death shroud --> <item id="2685"> <id>0x2685</id> </item> <!-- death shroud --> <item id="2686"> <id>0x2686</id> </item> <!-- winged helmet --> <item id="2689"> <id>0x2689</id> </item> <!-- winged helmet --> <item id="268a"> <id>0x268a</id> </item> <!-- hachimaki --> <item id="268b"> <id>0x268b</id> </item> <!-- hachimaki --> <item id="268c"> <id>0x268c</id> </item> <!-- kabuto --> <item id="268d"> <id>0x268d</id> </item> <!-- kabuto --> <item id="268e"> <id>0x268e</id> </item> <!-- kabuto mempo --> <item id="268f"> <id>0x268f</id> </item> <!-- kabuto mempo --> <item id="2690"> <id>0x2690</id> </item> <!-- leather cap --> <item id="2691"> <id>0x2691</id> </item> <!-- leather cap --> <item id="2692"> <id>0x2692</id> </item> <!-- robin hood cap --> <item id="269d"> <id>0x269d</id> </item> <!-- robin hood cap --> <item id="269e"> <id>0x269e</id> </item> <!-- feathered mask --> <item id="26a1"> <id>0x26a1</id> </item> <!-- feathered mask --> <item id="26a2"> <id>0x26a2</id> </item> <!-- ninja mask --> <item id="26a3"> <id>0x26a3</id> </item> <!-- ninja mask --> <item id="26a4"> <id>0x26a4</id> </item> <!-- bolas --> <item id="26ac"> <id>0x26ac</id> </item> <!-- Arcane Cloak --> <item id="26ad"> <id>0x26ad</id> </item> <!-- Arcane Cloak --> <item id="26ae"> <id>0x26ae</id> </item> <!-- Arcane Thigh Boots --> <item id="26af"> <id>0x26af</id> </item> <!-- Arcane Gloves --> <item id="26b0"> <id>0x26b0</id> </item> </definitions> \ No newline at end of file |
|
From: Sebastian H. <dar...@us...> - 2004-10-09 01:18:02
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29661/python Modified Files: pycoord.cpp Log Message: support for hue and rendermode Index: pycoord.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pycoord.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** pycoord.cpp 5 Oct 2004 13:21:22 -0000 1.26 --- pycoord.cpp 9 Oct 2004 01:17:50 -0000 1.27 *************** *** 191,195 **** { unsigned short id, duration, speed; ! if (!PyArg_ParseTuple(args, "hhh:coord.effect(id, speed, duration)", &id, &speed, &duration)) { return 0; } --- 191,197 ---- { unsigned short id, duration, speed; ! int rendermode = 0; ! short hue = 0; ! if (!PyArg_ParseTuple(args, "hhh|hi:coord.effect(id, speed, duration, [hue], [rendermode])", &id, &speed, &duration, &hue, &rendermode)) { return 0; } *************** *** 201,204 **** --- 203,208 ---- effect.setDuration( duration ); effect.setSpeed( speed ); + effect.setHue(hue); + effect.setRenderMode(rendermode); cUOSocket* mSock; |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 20:00:05
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27096/system Modified Files: players.py Log Message: bandages Index: players.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/players.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** players.py 8 Oct 2004 19:59:29 -0000 1.7 --- players.py 8 Oct 2004 19:59:51 -0000 1.8 *************** *** 1,4 **** --- 1,5 ---- import wolfpack + from wolfpack import tr def onLogin( player ): |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 19:59:45
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27022/webroot Modified Files: ChangeLog.wolfpack Log Message: bandages Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** ChangeLog.wolfpack 8 Oct 2004 11:06:07 -0000 1.141 --- ChangeLog.wolfpack 8 Oct 2004 19:59:35 -0000 1.142 *************** *** 54,57 **** --- 54,58 ---- - Fixed foreign characters for the page system. - Fixed bandages for logged out chars. + - Rewrote the bandages script. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 19:59:40
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26989 Modified Files: bandages.py Log Message: bandages Index: bandages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bandages.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** bandages.py 8 Oct 2004 11:05:53 -0000 1.16 --- bandages.py 8 Oct 2004 19:59:29 -0000 1.17 *************** *** 4,311 **** import system.poison import wolfpack.utilities ! from wolfpack.consts import HEALING, ANATOMY, VETERINARY, ANIMALLORE ! def onUse( char, item ): ! # Bandages have to be in backpack ! if item.getoutmostchar() != char: ! char.socket.clilocmessage(500294) ! # you cannot use that ! return 1 ! ! # Already Bandaging ?? ! if char.socket.hastag( 'using_bandages' ): ! char.socket.sysmessage( 'You are already using bandages.' ) ! return 1 # Display Target 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]) ! ! elif item.id == 0xe20 or item.id == 0xe22: ! char.socket.sysmessage( 'Where do you want to wash these bandages?' ) ! char.socket.attachtarget( 'bandages.wash_response', [ item.serial ] ) return 1 ! ! def wash_response( char, args, target ): ! bandages = wolfpack.finditem( args[0] ) ! ! if not bandages: ! return ! ! if (target.item and target.item.getoutmostchar() and target.item.getoutmostchar() != char) or not char.canreach(target.pos, 5): ! char.socket.clilocmessage(500312) return ! # Did we target something wet? ! id = 0 ! ! if target.item: ! id = target.item.id ! else: ! id = target.model ! ! # Wash Basins are allowed. ! if not target.item or target.item.id != 0x1008: ! tiledata = wolfpack.tiledata(id) ! if not tiledata[ 'flag1' ] & 0x80: ! char.socket.sysmessage('You cannot wash your bandages here.') ! return ! ! char.socket.sysmessage('You wash your bandages and put the clean bandages into your backpack.') ! ! if bandages.id == 0xe20: ! bandages.id = 0xe21 ! bandages.baseid = 'e21' ! elif bandages.id == 0xe22: ! bandages.id = 0xee9 ! bandages.baseid = 'ee9' ! ! bandages.update() ! ! def validCorpseTarget( char, target ): ! if not target: ! return 0 ! ! 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 ! ! return 1 ! ! def validCharTarget( char, target ): ! # Do we have a valid target ! if not target: ! char.socket.sysmessage( 'You have to target a living thing.' ) ! return 0 ! ! if not char.canreach( target, 2 ): ! char.socket.sysmessage( 'You are too far away to apply bandages on %s' % target.name ) ! return 0 ! ! # Already at full health ! if not target.poison > -1 and target.health >= target.maxhitpoints: ! if target == char: ! char.socket.clilocmessage(1061288) ! #You do not require healing. ! else: ! char.socket.clilocmessage(500955) ! #that being is not damaged ! return 0 ! ! return 1 ! ! def bandage_response( char, args, target ): ! # char is healer ! # target is pointer to healing target ! ! corpse = None ! ! if target.item: ! if validCorpseTarget( char, target.item ): ! corpse = target.item ! else: return ! ! elif target.char and not validCharTarget( char, target.char ): ! return ! ! elif not target.char: ! char.socket.sysmessage( 'You have to target either a corpse or a creature.' ) ! return ! ! 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 ! ! # Consume Bandages ! bandages = wolfpack.finditem( args[0] ) ! ! if not bandages: return ! baseid = bandages.id ! container = bandages.container ! ! if bandages.amount == 1: ! bandages.delete() else: ! bandages.amount -= 1 ! bandages.update() ! ! success = 0 ! ! # 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: ! reschance = int( ( char.skill[ HEALING ] + char.skill[ ANATOMY ] ) * 0.17 ) ! rescheck = random.randint( 1, 100 ) ! if char.checkskill( HEALING, 800, 1000 ) and char.checkskill( ANATOMY, 800, 1000 ) and reschance > rescheck: ! success = 1 ! else: # must be poisoned ! reschance = int( ( char.skill[ HEALING ] + char.skill[ ANATOMY ] ) * 0.27 ) ! rescheck = random.randint( 1, 100 ) ! if char.checkskill( HEALING, 600, 1000 ) and char.checkskill( ANATOMY, 600, 1000 ) and reschance > rescheck: ! success = 1 ! #this is non osi, but cool! ! #char.action( 0x09 ) ! if corpse: ! char.addtimer( random.randint( 2500, 5000 ), 'bandages.bandage_timer', [ 1, success, target.item.serial, baseid ] ) # It takes 5 seconds to bandage else: ! 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 ) ! if target.char.player: ! 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 ) ! def bandage_timer( char, args ): ! if not char.socket: ! return # Character disconnected ! char.socket.deltag( 'using_bandages' ) ! resurrect = args[0] ! success = args[1] ! baseid = args[3] ! ! if resurrect == 1: ! # Corpse Target ! target = wolfpack.finditem( args[2] ) ! ! owner = target.owner ! ! if not validCorpseTarget( char, target ): ! return ! ! if not success: ! char.socket.clilocmessage(500966) ! return ! ! if target.owner: ! target.owner.moveto( target.pos ) ! target.owner.update() ! target.owner.resurrect( char ) ! # Move all the belongings from the corpse to the character ! backpack = target.owner.getbackpack() ! for item in target.content: ! # Random Position (for now, maybe storing the original position in a tag would be good) ! # Handle Weight but no Auto Stacking ! backpack.wolfpack.additem( item, 1, 1, 0 ) ! item.update() ! target.delete() ! char.socket.clilocmessage(500965) ! else: ! char.socket.sysmessage( 'You can''t help them anymore' ) ! # Character Target else: ! target = wolfpack.findchar( args[2] ) ! ! if not validCharTarget( char, target ): ! return ! if target.dead: ! if not success: ! char.socket.clilocmessage(500966) ! return ! ! target.resurrect( char ) ! 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 ! ! system.poison.cure(target) ! ! 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 ! ! # Human target ? (players always human) ! if target.player or target.id == 0x190 or target.id == 0x191: ! firstskill = HEALING ! secondskill = ANATOMY ! else: ! firstskill = VETERINARY ! secondskill = ANIMALLORE ! ! # Heal a bit ! healmin = int( char.skill[ firstskill ] / 50.0 ) + int( char.skill[ secondskill ] / 50.0 ) + 3 ! healmax = int( char.skill[ firstskill ] / 50.0 ) + int( char.skill[ secondskill ] / 20.0 ) + 10 ! ! amount = random.randint( healmin, healmax ) ! ! 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 ! # This is target independent ! #if baseid == 0xe21: ! # item = wolfpack.additem( 'e20' ) ! # if not wolfpack.utilities.tobackpack( item, char ): ! # item.update() ! # ! #elif baseid == 0xee9: ! # item = wolfpack.additem( 'e22' ) ! # if not wolfpack.utilities.tobackpack( item, char ): ! # item.update() --- 4,239 ---- import system.poison import wolfpack.utilities ! from wolfpack.consts import * def onUse( char, item ): ! if not char.canreach(item, 2): ! char.socket.clilocmessage(500295) ! return True ! ! char.reveal() # Reveal # Display Target if item.id == 0xe21 or item.id == 0xee9: ! char.socket.clilocmessage(500948) #who will you use on ! char.socket.attachtarget('bandages.response', [item.serial]) return 1 ! ! def response(char, arguments, target): ! bandage = wolfpack.finditem(arguments[0]) ! ! # Out of reach? ! if not bandage or not char.canreach(bandage, 2): ! char.socket.clilocmessage(500295) return ! # Targetcheck ! targetChar = target.char ! ! if not targetChar: ! if target.item and target.item.corpse: ! targetChar = target.item.owner ! ! if not targetChar: ! char.socket.clilocmessage(500970) return ! ! # Range check ! if not char.canreach(targetChar, 2): ! char.socket.clilocmessage(500295) return + + # Remove a bandage if we can start healing + if startheal(char, targetChar): + if bandage.amount > 1: + bandage.amount -= 1 + bandage.update() + else: + bandage.delete() ! def getskills(target): ! if not target.player and target.id not in [0x190, 0x191, 0x192, 0x193]: ! return (VETERINARY, ANIMALLORE) else: ! return (HEALING, ANATOMY) + # Start healing the target + def startheal(char, target): + socket = char.socket + + if target.baseid == 'golem': + socket.clilocmessage(500970) # Golems cannot be healed + return False + + elif target.getstrproperty('slayer_group', '') == 'undeads': + socket.clilocmessage(500951) # Undeads cannot be healed + return False + + elif target.poison == -1 and target.hitpoints >= target.maxhitpoints: + socket.clilocmessage(500955) # Already at full health + return False ! elif target.dead and not target.pos.validspawnspot(): ! socket.clilocmessage(501042) # Not a valid spawnspot for living players ! return False ! (primary, secondary) = getskills(target) # Get the skills used to heal the target ! ! # For resurrecting someone there is a 5 second delay ! if target.dead: ! resurrection = 5000 else: ! resurrection = 0 ! ! # We are bandaging ourself ! if target == char: ! delay = int(5000 + (500 * ((120 - char.dexterity) / 10.0))) ! # We are bandaging someone else ! else: ! # We are targetting an animal ! if primary == VETERINARY: ! if char.dexterity >= 40: ! delay = 2000 else: ! delay = 3000 ! # We are bandaging another player or a human else: ! if char.dexterity >= 100: ! delay = 3000 + resurrection ! elif char.dexterity >= 40: ! delay = 4000 + resurrection else: ! delay = 5000 + resurrection ! char.dispel(None, 1, 'bandage_timer') # Display pending bandage timers ! socket.settag('bandage_slipped', 0) # Clear the "slipping" property ! socket.clilocmessage(500956) # Begin applying bandages ! char.addtimer(delay, 'bandages.endheal', [primary, secondary, target.serial]) # Add a bandage timer ! # Show an emote that he is using bandages ? ! return True ! # Stop healing ! def endheal(char, arguments): ! socket = char.socket ! ! if not socket: ! return # Cancel healing if the player disconnected ! ! if char.dead: ! socket.clilocmessage(500962) # Died before finishing his work ! return ! ! slipped = int(socket.gettag('bandage_slipped')) # How many times the fingers slipped ! socket.deltag('bandage_slipped') ! # Retrieve arguments ! (primary, secondary, target) = arguments ! target = wolfpack.findchar(target) ! ! # Sanity checks again ! if not target or not char.canreach(target, 2): ! socket.clilocmessage(500963) # You did not stay close enough ! return ! ! if target.dead: ! resurrectTarget(char, target, primary, secondary, slipped) # Resurrection attempt ! elif target.poison != -1: ! cureTarget(char, target, primary, secondary, slipped) # Cure attempt ! else: ! healTarget(char, target, primary, secondary, slipped) # Heal attempt ! # Resurrecting the target ! def resurrectTarget(char, target, primary, secondary, slipped): ! socket = char.socket ! primarySkill = char.skill[primary] ! secondarySkill = char.skill[secondary] ! char.soundeffect(0x57) # Play a soundeffect for the applied bandages ! ! chance = ((primarySkill - 680) / 500.0) - (slipped * 0.02) ! if primarySkill >= 800 and secondarySkill >= 800: # Minimum skill ! # Can the guy be resurrected at that position ! if not target.pos.validspawnspot(): ! socket.clilocmessage(501042) ! if target.socket: ! target.socket.clilocmessage(502391) ! return # Cancel ! char.checkskill(primary, 0, 1200) # Check skills ! char.checkskill(secondary, 0, 1200) # Check skills ! ! if chance > random.random(): # We succeed in resurrecting the target ! socket.clilocmessage(500965) # You succeed ! target.resurrect() # Resurrect the target ! return # Cancel or else the other message will appear ! ! if not target.player: ! socket.clilocmessage(503256) # You fail to resurrect the creature else: ! socket.clilocmessage(500966) # You are unable to resurrect your patient ! ! # Curing the target ! def cureTarget(char, target, primary, secondary, slipped): ! socket = char.socket ! primarySkill = char.skill[primary] ! secondarySkill = char.skill[secondary] ! socket.clilocmessage(500969) # Finished applying bandages ! ! chance = ((primarySkill - 300) / 500.0) - (target.poison * 0.1) - (slipped * 0.02) # Calculate chance ! ! if primarySkill >= 600 and secondarySkill >= 600: # Unable to cure the poison ! char.checkskill(primary, 0, 1200) # Check primary skill ! char.checkskill(secondary, 0, 1200) # Check secondary skill ! if chance > random.random(): ! if char != target: ! socket.clilocmessage(1010058) # You cured all poisons ! if target.socket: ! target.socket.clilocmessage(1010059) # You have been cured of all poisons. ! elif target.socket: ! target.socket.clilocmessage(1010059) # You have been cured of all poisons ! ! system.poison.cure(target) # Cure the poison else: ! socket.clilocmessage(1010060) # You failed to cure your target ! else: ! socket.clilocmessage(1010060) # You failed to cure your target ! ! char.soundeffect(0x57) # Play a soundeffect for the applied bandages ! ! # Healing the target ! def healTarget(char, target, primary, secondary, slipped): ! socket = char.socket ! primarySkill = char.skill[primary] ! secondarySkill = char.skill[secondary] ! char.soundeffect(0x57) ! ! if target.hitpoints >= target.maxhitpoints: ! socket.clilocmessage(500967) # Already at full health ! return ! ! char.checkskill(primary, 0, 1200) # Check primary skill ! char.checkskill(secondary, 0, 1200) # Check secondary skill ! ! chance = ((primarySkill + 100) / 1000.0) - slipped * 0.02 ! ! if chance <= random.random(): ! socket.clilocmessage(500968) # Your bandages barely helped ! return ! ! minValue = int((secondarySkill / 80.0) + (primarySkill / 50.0) + 4.0) # Min value to heal ! maxValue = int((secondarySkill / 60.0) + (primarySkill / 25.0) + 4.0) # Max value to heal ! ! value = random.randint(minValue, maxValue) # Calculate a value between min/max ! value = max(1, value - (value * slipped * 0.35)) # Take the count of slipped fingers into account ! ! if value == 1: ! socket.clilocmessage(500968) # Your bandages barley help ! else: ! socket.clilocmessage(500969) # You finish applying the bandages ! ! target.hitpoints = min(target.maxhitpoints, target.hitpoints + value) ! target.updatehealth() |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 19:59:39
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26989/system Modified Files: players.py Log Message: bandages Index: players.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/players.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** players.py 26 Aug 2004 22:03:32 -0000 1.6 --- players.py 8 Oct 2004 19:59:29 -0000 1.7 *************** *** 4,10 **** def onLogin( player ): socket = player.socket ! socket.sysmessage( "Welcome to %s" % ( wolfpack.serverversion() ) ) ! socket.sysmessage( "Report Bugs: http://bugs.wpdev.org/" ) ! player.hidden = 0 player.update() socket.resendplayer() --- 4,10 ---- def onLogin( player ): socket = player.socket ! socket.sysmessage( tr("Welcome to %s") % ( wolfpack.serverversion() ) ) ! socket.sysmessage( tr("Report Bugs: http://bugs.wpdev.org/") ) ! player.hidden = False player.update() socket.resendplayer() *************** *** 15,16 **** --- 15,25 ---- player.hidden = 1 player.update() + + def onDamage(char, type, amount, source): + socket = char.socket + + if socket and amount > 25 and socket.hastag('bandage_slipped'): + socket.settag('bandage_slipped', int(socket.gettag('bandage_slipped')) + 1) + socket.clilocmessage(500961) + + return amount |
|
From: Richard M. <dr...@us...> - 2004-10-08 18:52:10
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12865/wolfpack Modified Files: properties.py Log Message: Meh, possible changes with Samurai Empire Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** properties.py 6 Oct 2004 20:06:00 -0000 1.18 --- properties.py 8 Oct 2004 18:51:53 -0000 1.19 *************** *** 16,26 **** # def getdelay(attacker, weapon): ! speed = fromitem(weapon, SPEED) ! value = (attacker.stamina + 100) * speed bonus = fromchar(attacker, SPEEDBONUS) ! # Scale value according to bonus value += bonus * value / 100 --- 16,26 ---- # def getdelay(attacker, weapon): ! speed = fromitem(weapon, SPEED) ! value = (attacker.stamina + 100) * speed bonus = fromchar(attacker, SPEEDBONUS) ! # Scale value according to bonus value += bonus * value / 100 *************** *** 54,58 **** SPELLCHANNELING: ['spellchanneling', 0, 0], MAGEARMOR: ['magearmor', 0, 0], ! # % Boni LOWERREQS: ['lower_reqs', 0, 1], --- 54,58 ---- SPELLCHANNELING: ['spellchanneling', 0, 0], MAGEARMOR: ['magearmor', 0, 0], ! # % Boni LOWERREQS: ['lower_reqs', 0, 1], *************** *** 79,83 **** REGENSTAMINA: ['regenstamina', 0, 1], REGENMANA: ['regenmana', 0, 1], ! # Misc LUCK: ['luck', 0, 1], --- 79,83 ---- REGENSTAMINA: ['regenstamina', 0, 1], REGENMANA: ['regenmana', 0, 1], ! # Misc LUCK: ['luck', 0, 1], *************** *** 114,118 **** if property == MAGEARMOR and item.allowmeditation: return True ! if not PROPERTIES.has_key(property): raise Exception, "Unknown property value %u" % property --- 114,118 ---- if property == MAGEARMOR and item.allowmeditation: return True ! if not PROPERTIES.has_key(property): raise Exception, "Unknown property value %u" % property *************** *** 142,146 **** else: return wolfpack.weaponinfo.WEAPONINFO[item.baseid][property] ! # Get the base property from the item if type(info[1]) == int: --- 142,146 ---- else: return wolfpack.weaponinfo.WEAPONINFO[item.baseid][property] ! # Get the base property from the item if type(info[1]) == int: *************** *** 149,153 **** value = item.getstrproperty( info[0], info[1] ) else: ! raise Exception, "Unsupported property type %s for property %u." % (type(info[1]).__name__, property) resboni = None --- 149,153 ---- value = item.getstrproperty( info[0], info[1] ) else: ! raise Exception, "Unsupported property type %s for property %u." % (type(info[1]).__name__, property) resboni = None *************** *** 156,160 **** if itemcheck(item, ITEM_WEAPON): resboni = wolfpack.weaponinfo.WEAPON_RESNAME_BONI ! # Get Resname boni from the ARMOR list elif itemcheck(item, ITEM_ARMOR) or itemcheck(item, ITEM_SHIELD): --- 156,160 ---- if itemcheck(item, ITEM_WEAPON): resboni = wolfpack.weaponinfo.WEAPON_RESNAME_BONI ! # Get Resname boni from the ARMOR list elif itemcheck(item, ITEM_ARMOR) or itemcheck(item, ITEM_SHIELD): *************** *** 165,169 **** if resboni.has_key(resname) and resboni[resname].has_key(property): value += resboni[resname][property] ! if resboni and item.hastag('resname2'): resname = str(item.gettag('resname2')) --- 165,169 ---- if resboni.has_key(resname) and resboni[resname].has_key(property): value += resboni[resname][property] ! if resboni and item.hastag('resname2'): resname = str(item.gettag('resname2')) *************** *** 254,262 **** mindamage = char.mindamage maxdamage = char.maxdamage ! try: if char.hastag('mindamage'): mindamage = int(char.gettag('mindamage')) ! if char.hastag('maxdamage'): maxdamage = int(char.gettag('maxdamage')) --- 254,262 ---- mindamage = char.mindamage maxdamage = char.maxdamage ! try: if char.hastag('mindamage'): mindamage = int(char.gettag('mindamage')) ! if char.hastag('maxdamage'): maxdamage = int(char.gettag('maxdamage')) *************** *** 273,277 **** mindamage = fromitem(weapon, MINDAMAGE) maxdamage = fromitem(weapon, MAXDAMAGE) ! return (mindamage, maxdamage) else: --- 273,277 ---- mindamage = fromitem(weapon, MINDAMAGE) maxdamage = fromitem(weapon, MAXDAMAGE) ! return (mindamage, maxdamage) else: *************** *** 303,311 **** # Only type check yet. if check == ITEM_WEAPON: ! return item.type >= 1001 and item.type <= 1007 # Only type check yet. if check == ITEM_MELEE: ! return item.type >= 1001 and item.type <= 1005 # Only type check yet. --- 303,311 ---- # Only type check yet. if check == ITEM_WEAPON: ! return item.type >= 1000 and item.type <= 1007 # Only type check yet. if check == ITEM_MELEE: ! return item.type >= 1000 and item.type <= 1005 # Only type check yet. *************** *** 344,358 **** if maxprops > 5: maxprops = 5 ! if maxprops < 1: return 0 ! maxprops -= 1 ! chances = CHANCES[maxprops] chancesum = sum(chances) ! result = 0 ! rnd = random.randrange(0, chancesum) for i in [5, 4, 3, 2, 1, 0]: --- 344,358 ---- if maxprops > 5: maxprops = 5 ! if maxprops < 1: return 0 ! maxprops -= 1 ! chances = CHANCES[maxprops] chancesum = sum(chances) ! result = 0 ! rnd = random.randrange(0, chancesum) for i in [5, 4, 3, 2, 1, 0]: *************** *** 362,366 **** else: rnd -= chances[i] ! # Take luck into account if result < maxprops and luckChance > random.randint(0, 10000): --- 362,366 ---- else: rnd -= chances[i] ! # Take luck into account if result < maxprops and luckChance > random.randint(0, 10000): *************** *** 376,388 **** propmin = propmin / float(scale) propmax = propmax / float(scale) ! # Although this is the "Worst system ever" (c) RunUO # I think the basic idea of having the chance increase slower than ! # using a normal rand function is good. percent = 100 - sqrt(random.randint(0, 10000)) # Range of the property value ! if luckchance > random.randint(0, 10000): percent += 10 ! # Normalize the percentage percent = min(maximum, max(minimum, percent)) --- 376,388 ---- propmin = propmin / float(scale) propmax = propmax / float(scale) ! # Although this is the "Worst system ever" (c) RunUO # I think the basic idea of having the chance increase slower than ! # using a normal rand function is good. percent = 100 - sqrt(random.randint(0, 10000)) # Range of the property value ! if luckchance > random.randint(0, 10000): percent += 10 ! # Normalize the percentage percent = min(maximum, max(minimum, percent)) *************** *** 422,426 **** def applyArmorRandom(item, props, minintensity, maxintensity, luckchance): properties = ARMOR_PROPERTIES.keys() ! # Remove MageArmor from the list if it's already on the item magearmor = fromitem(item, MAGEARMOR) --- 422,426 ---- def applyArmorRandom(item, props, minintensity, maxintensity, luckchance): properties = ARMOR_PROPERTIES.keys() ! # Remove MageArmor from the list if it's already on the item magearmor = fromitem(item, MAGEARMOR) *************** *** 432,436 **** property = random.choice(properties) properties.remove(property) ! if not PROPERTIES.has_key(property): continue --- 432,436 ---- property = random.choice(properties) properties.remove(property) ! if not PROPERTIES.has_key(property): continue *************** *** 448,454 **** # Resistances are cummulative if info[3]: ! value += fromitem(item, property) ! ! item.settag(PROPERTIES[property][0], value) item.resendtooltip() --- 448,454 ---- # Resistances are cummulative if info[3]: ! value += fromitem(item, property) ! ! item.settag(PROPERTIES[property][0], value) item.resendtooltip() *************** *** 476,480 **** property = random.choice(properties) properties.remove(property) ! if not PROPERTIES.has_key(property): continue --- 476,480 ---- property = random.choice(properties) properties.remove(property) ! if not PROPERTIES.has_key(property): continue *************** *** 496,502 **** # Resistances are cummulative if info[3]: ! value += fromitem(item, property) ! ! item.settag(PROPERTIES[property][0], value) item.resendtooltip() --- 496,502 ---- # Resistances are cummulative if info[3]: ! value += fromitem(item, property) ! ! item.settag(PROPERTIES[property][0], value) item.resendtooltip() *************** *** 516,520 **** RESISTANCE_COLD: [1, 15, 1, False], RESISTANCE_POISON: [1, 15, 1, False], ! RESISTANCE_ENERGY: [1, 15, 1, False], DAMAGEBONUS: [1, 25, 1, False], DEFENSEBONUS: [1, 15, 1, False], --- 516,520 ---- RESISTANCE_COLD: [1, 15, 1, False], RESISTANCE_POISON: [1, 15, 1, False], ! RESISTANCE_ENERGY: [1, 15, 1, False], DAMAGEBONUS: [1, 25, 1, False], DEFENSEBONUS: [1, 15, 1, False], *************** *** 539,543 **** def applyJuwelRandom(item, props, minintensity, maxintensity, luckchance): properties = JUWEL_PROPERTIES.keys() ! # Possible bonus skills skills = [SWORDSMANSHIP, FENCING, MACEFIGHTING, ARCHERY, WRESTLING, PARRYING, TACTICS, ANATOMY, HEALING, MAGERY, MEDITATION, EVALUATINGINTEL, --- 539,543 ---- def applyJuwelRandom(item, props, minintensity, maxintensity, luckchance): properties = JUWEL_PROPERTIES.keys() ! # Possible bonus skills skills = [SWORDSMANSHIP, FENCING, MACEFIGHTING, ARCHERY, WRESTLING, PARRYING, TACTICS, ANATOMY, HEALING, MAGERY, MEDITATION, EVALUATINGINTEL, *************** *** 549,564 **** property = random.choice(properties) properties.remove(property) ! if property in [SKILLBONUS1, SKILLBONUS2, SKILLBONUS3, SKILLBONUS4, SKILLBONUS5]: # Apply a random skillbonus info = JUWEL_PROPERTIES[property] value = scaleValue(minintensity, maxintensity, info[0], info[1], info[2], luckchance) ! skill = random.choice(skills) skills.remove(skill) ! item.settag('skillbonus_%u' % (property - 1000), '%u,%u' % (skill, value * 10)) continue ! if not PROPERTIES.has_key(property): continue --- 549,564 ---- property = random.choice(properties) properties.remove(property) ! if property in [SKILLBONUS1, SKILLBONUS2, SKILLBONUS3, SKILLBONUS4, SKILLBONUS5]: # Apply a random skillbonus info = JUWEL_PROPERTIES[property] value = scaleValue(minintensity, maxintensity, info[0], info[1], info[2], luckchance) ! skill = random.choice(skills) skills.remove(skill) ! item.settag('skillbonus_%u' % (property - 1000), '%u,%u' % (skill, value * 10)) continue ! if not PROPERTIES.has_key(property): continue *************** *** 570,575 **** # Resistances are cummulative if info[3]: ! value += fromitem(item, property) ! item.settag(PROPERTIES[property][0], value) --- 570,575 ---- # Resistances are cummulative if info[3]: ! value += fromitem(item, property) ! item.settag(PROPERTIES[property][0], value) *************** *** 584,593 **** #SPLASH_POISON: [2, 50, 2, False], #SPLASH_ENERGY: [2, 50, 2, False], ! #HIT_MAGICARROW: [2, 50, 2, False], #HIT_HARM: [2, 50, 2, False], #HIT_FIREBALL: [2, 50, 2, False], #HIT_LIGHTNING: [2, 50, 2, False], ! #HIT_DISPEL: [2, 50, 2, False], #HIT_LEECHHITS: [2, 50, 2, False], --- 584,593 ---- #SPLASH_POISON: [2, 50, 2, False], #SPLASH_ENERGY: [2, 50, 2, False], ! #HIT_MAGICARROW: [2, 50, 2, False], #HIT_HARM: [2, 50, 2, False], #HIT_FIREBALL: [2, 50, 2, False], #HIT_LIGHTNING: [2, 50, 2, False], ! #HIT_DISPEL: [2, 50, 2, False], #HIT_LEECHHITS: [2, 50, 2, False], *************** *** 596,600 **** #HIT_LOWERATTACK: [2, 50, 2, False], #HIT_LOWERDEFEND: [2, 50, 2, False], ! BESTSKILL: [1, 1, 1, False], #MAGEWEAPON: [29, 20, 1, False], --- 596,600 ---- #HIT_LOWERATTACK: [2, 50, 2, False], #HIT_LOWERDEFEND: [2, 50, 2, False], ! BESTSKILL: [1, 1, 1, False], #MAGEWEAPON: [29, 20, 1, False], *************** *** 604,608 **** RESISTANCE_COLD: [1, 15, 1, True], RESISTANCE_POISON: [1, 15, 1, True], ! RESISTANCE_ENERGY: [1, 15, 1, True], DAMAGEBONUS: [1, 25, 1, True], DEFENSEBONUS: [1, 15, 1, True], --- 604,608 ---- RESISTANCE_COLD: [1, 15, 1, True], RESISTANCE_POISON: [1, 15, 1, True], ! RESISTANCE_ENERGY: [1, 15, 1, True], DAMAGEBONUS: [1, 25, 1, True], DEFENSEBONUS: [1, 15, 1, True], *************** *** 615,619 **** DURABILITYBONUS: [10, 100, 10, True], LOWERREQS: [10, 100, 10, True], ! SLAYER: [1, 1, 1, False], # Special } --- 615,619 ---- DURABILITYBONUS: [10, 100, 10, True], LOWERREQS: [10, 100, 10, True], ! SLAYER: [1, 1, 1, False], # Special } *************** *** 621,625 **** def applyWeaponRandom(item, props, minintensity, maxintensity, luckchance): properties = WEAPON_PROPERTIES.keys() ! # No bestskill property for ranged weapons if itemcheck(item, ITEM_RANGED): --- 621,625 ---- def applyWeaponRandom(item, props, minintensity, maxintensity, luckchance): properties = WEAPON_PROPERTIES.keys() ! # No bestskill property for ranged weapons if itemcheck(item, ITEM_RANGED): *************** *** 632,636 **** if not PROPERTIES.has_key(property): continue ! # Special handling for slayers if property == SLAYER: --- 632,636 ---- if not PROPERTIES.has_key(property): continue ! # Special handling for slayers if property == SLAYER: *************** *** 655,660 **** # Set cast speed to -1 elif property == SPELLCHANNELING: ! item.settag(PROPERTIES[CASTSPEEDBONUS][0], -1) ! # MageWeapon and BestSkill are exclusive elif property == BESTSKILL: --- 655,660 ---- # Set cast speed to -1 elif property == SPELLCHANNELING: ! item.settag(PROPERTIES[CASTSPEEDBONUS][0], -1) ! # MageWeapon and BestSkill are exclusive elif property == BESTSKILL: *************** *** 667,673 **** # Resistances are cummulative if info[3]: ! value += fromitem(item, property) ! ! item.settag(PROPERTIES[property][0], value) item.resendtooltip() --- 667,673 ---- # Resistances are cummulative if info[3]: ! value += fromitem(item, property) ! ! item.settag(PROPERTIES[property][0], value) item.resendtooltip() *************** *** 678,685 **** def applyRandom(item, maxprops, minintensity, maxintensity, luckchance=0 ): props = 1 + bonusProps(maxprops, luckchance) ! if itemcheck(item, ITEM_ARMOR): applyArmorRandom(item, props, minintensity, maxintensity, luckchance) ! elif itemcheck(item, ITEM_SHIELD): applyShieldRandom(item, props, minintensity, maxintensity, luckchance) --- 678,685 ---- def applyRandom(item, maxprops, minintensity, maxintensity, luckchance=0 ): props = 1 + bonusProps(maxprops, luckchance) ! if itemcheck(item, ITEM_ARMOR): applyArmorRandom(item, props, minintensity, maxintensity, luckchance) ! elif itemcheck(item, ITEM_SHIELD): applyShieldRandom(item, props, minintensity, maxintensity, luckchance) *************** *** 687,691 **** elif itemcheck(item, ITEM_WEAPON): applyWeaponRandom(item, props, minintensity, maxintensity, luckchance) ! else: applyJuwelRandom(item, props, minintensity, maxintensity, luckchance) --- 687,691 ---- elif itemcheck(item, ITEM_WEAPON): applyWeaponRandom(item, props, minintensity, maxintensity, luckchance) ! else: applyJuwelRandom(item, props, minintensity, maxintensity, luckchance) *************** *** 696,700 **** def luckchance(char): luck = fromchar(char, LUCK) ! if luck < 0: luck = 0 --- 696,700 ---- def luckchance(char): luck = fromchar(char, LUCK) ! if luck < 0: luck = 0 *************** *** 702,705 **** if luck > 1200: luck = 1200 ! return LUCKTABLE[luck] --- 702,705 ---- if luck > 1200: luck = 1200 ! return LUCKTABLE[luck] |
|
From: Richard M. <dr...@us...> - 2004-10-08 18:52:10
|
Update of /cvsroot/wpdev/xmlscripts/scripts/combat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12865/combat Modified Files: utilities.py Log Message: Meh, possible changes with Samurai Empire Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/utilities.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** utilities.py 27 Sep 2004 14:37:25 -0000 1.12 --- utilities.py 8 Oct 2004 18:51:53 -0000 1.13 *************** *** 14,17 **** --- 14,23 ---- # WEAPON_INFORMATION = { + # 1000: Wrestling + 1000: { + ONEHANDED_SWING: [0x9], + TWOHANDED_SWING: [0xc], + SKILL: WRESTLING + }, # 1001: Sword Weapons (Swordsmanship) 1001: { *************** *** 26,30 **** SKILL: SWORDSMANSHIP }, ! # 1003: Macefighting (Staffs) 1003: { ONEHANDED_SWING: [0xc], --- 32,36 ---- SKILL: SWORDSMANSHIP }, ! # 1003: Macefighting (Staves) 1003: { ONEHANDED_SWING: [0xc], |
|
From: Richard M. <dr...@us...> - 2004-10-08 18:52:08
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12865 Modified Files: equipment.py Log Message: Meh, possible changes with Samurai Empire Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** equipment.py 6 Oct 2004 20:06:00 -0000 1.45 --- equipment.py 8 Oct 2004 18:51:52 -0000 1.46 *************** *** 22,26 **** if object.hastag(tag): tooltip.add(cliloc, str(object.gettag(tag))) ! speedbonus = properties.fromitem(object, SPEEDBONUS) if speedbonus != 0: --- 22,26 ---- if object.hastag(tag): tooltip.add(cliloc, str(object.gettag(tag))) ! speedbonus = properties.fromitem(object, SPEEDBONUS) if speedbonus != 0: *************** *** 31,39 **** if hitbonus != 0: tooltip.add(1060415, str(hitbonus)) ! defensebonus = properties.fromitem(object, DEFENSEBONUS) if defensebonus != 0: tooltip.add(1060408, str(defensebonus)) ! enhancepotions = properties.fromitem(object, ENHANCEPOTIONS) if enhancepotions != 0: --- 31,39 ---- if hitbonus != 0: tooltip.add(1060415, str(hitbonus)) ! defensebonus = properties.fromitem(object, DEFENSEBONUS) if defensebonus != 0: tooltip.add(1060408, str(defensebonus)) ! enhancepotions = properties.fromitem(object, ENHANCEPOTIONS) if enhancepotions != 0: *************** *** 44,48 **** if reflectphysical: tooltip.add(1060442, str(reflectphysical)) ! luck = properties.fromitem(object, LUCK) if luck != 0: --- 44,48 ---- if reflectphysical: tooltip.add(1060442, str(reflectphysical)) ! luck = properties.fromitem(object, LUCK) if luck != 0: *************** *** 52,60 **** if bonus != 0: tooltip.add(1060485, str(bonus)) ! bonus = properties.fromitem(object, BONUSDEXTERITY) if bonus != 0: tooltip.add(1060409, str(bonus)) ! bonus = properties.fromitem(object, BONUSINTELLIGENCE) if bonus != 0: --- 52,60 ---- if bonus != 0: tooltip.add(1060485, str(bonus)) ! bonus = properties.fromitem(object, BONUSDEXTERITY) if bonus != 0: tooltip.add(1060409, str(bonus)) ! bonus = properties.fromitem(object, BONUSINTELLIGENCE) if bonus != 0: *************** *** 64,80 **** if bonus != 0: tooltip.add(1060431, str(bonus)) ! bonus = properties.fromitem(object, BONUSSTAMINA) if bonus != 0: tooltip.add(1060484, str(bonus)) ! bonus = properties.fromitem(object, BONUSMANA) if bonus != 0: ! tooltip.add(1060439, str(bonus)) regenhitpoints = properties.fromitem(object, REGENHITPOINTS) if regenhitpoints: tooltip.add(1060444, str(regenhitpoints)) ! regenstamina = properties.fromitem(object, REGENSTAMINA) if regenstamina: --- 64,80 ---- if bonus != 0: tooltip.add(1060431, str(bonus)) ! bonus = properties.fromitem(object, BONUSSTAMINA) if bonus != 0: tooltip.add(1060484, str(bonus)) ! bonus = properties.fromitem(object, BONUSMANA) if bonus != 0: ! tooltip.add(1060439, str(bonus)) regenhitpoints = properties.fromitem(object, REGENHITPOINTS) if regenhitpoints: tooltip.add(1060444, str(regenhitpoints)) ! regenstamina = properties.fromitem(object, REGENSTAMINA) if regenstamina: *************** *** 87,98 **** if properties.fromitem(object, BESTSKILL): tooltip.add(1060400, "") ! mageweapon = properties.fromitem(object, MAGEWEAPON) if mageweapon != 0: ! tooltip.add(1060438, str(mageweapon)) if properties.fromitem(object, MAGEARMOR) and not object.allowmeditation: tooltip.add(1060437, "") ! selfrepair = properties.fromitem(object, SELFREPAIR) if selfrepair != 0: --- 87,98 ---- if properties.fromitem(object, BESTSKILL): tooltip.add(1060400, "") ! mageweapon = properties.fromitem(object, MAGEWEAPON) if mageweapon != 0: ! tooltip.add(1060438, str(mageweapon)) if properties.fromitem(object, MAGEARMOR) and not object.allowmeditation: tooltip.add(1060437, "") ! selfrepair = properties.fromitem(object, SELFREPAIR) if selfrepair != 0: *************** *** 198,202 **** if slayer: tooltip.add(slayer.name, '') ! # One or twohanded weapon if object.twohanded: --- 198,202 ---- if slayer: tooltip.add(slayer.name, '') ! # One or twohanded weapon if object.twohanded: *************** *** 215,221 **** elif skill == ARCHERY: tooltip.add(1061175, '') # Special weapon range ! if object.hasintproperty( 'range' ) or object.hastag( 'range' ): if object.hastag( 'range' ): weaponrange = int( object.gettag( 'range' ) ) --- 215,223 ---- elif skill == ARCHERY: tooltip.add(1061175, '') + #elif skill == WRESTLING: + # tooltip.add(1061172, '') # Special weapon range ! if object.hasintproperty( 'range' ) or object.hastag( 'range' ): if object.hastag( 'range' ): weaponrange = int( object.gettag( 'range' ) ) *************** *** 277,297 **** else: spellchanneling = False ! # Those are only relevant if its not a shield/weapon or for spellchanneling items if (not weapon and not shield) or spellchanneling: castrecovery = properties.fromitem(object, CASTRECOVERYBONUS) ! if castrecovery: tooltip.add(1060412, str(castrecovery)) ! castspeed = properties.fromitem(object, CASTSPEEDBONUS) ! if castspeed: tooltip.add(1060413, str(castspeed)) ! spelldamagebonus = properties.fromitem(object, SPELLDAMAGEBONUS) ! if spelldamagebonus: ! tooltip.add(1060483, str(spelldamagebonus)) physical = properties.fromitem(object, RESISTANCE_PHYSICAL) --- 279,299 ---- else: spellchanneling = False ! # Those are only relevant if its not a shield/weapon or for spellchanneling items if (not weapon and not shield) or spellchanneling: castrecovery = properties.fromitem(object, CASTRECOVERYBONUS) ! if castrecovery: tooltip.add(1060412, str(castrecovery)) ! castspeed = properties.fromitem(object, CASTSPEEDBONUS) ! if castspeed: tooltip.add(1060413, str(castspeed)) ! spelldamagebonus = properties.fromitem(object, SPELLDAMAGEBONUS) ! if spelldamagebonus: ! tooltip.add(1060483, str(spelldamagebonus)) physical = properties.fromitem(object, RESISTANCE_PHYSICAL) *************** *** 340,344 **** if req_str: tooltip.add(1061170, str(req_str)) ! # Skill Boni (1-5) for i in range(0, 5): --- 342,346 ---- if req_str: tooltip.add(1061170, str(req_str)) ! # Skill Boni (1-5) for i in range(0, 5): *************** *** 348,354 **** (skill, bonus) = (int(skill), int(bonus)) ! if bonus == 0 or skill < 0 or skill >= ALLSKILLS: continue ! # Add a Bonus for the skill tooltip.add(1060451 + i, "#%u\t%0.01f%%" % (1044060 + skill, bonus / 10.0)) --- 350,356 ---- (skill, bonus) = (int(skill), int(bonus)) ! if bonus == 0 or skill < 0 or skill >= ALLSKILLS: continue ! # Add a Bonus for the skill tooltip.add(1060451 + i, "#%u\t%0.01f%%" % (1044060 + skill, bonus / 10.0)) *************** *** 472,476 **** item.deltag('real_skillbonus_%u' % i) continue ! # Add a Bonus for the skill if char.skill[skill] + bonus > char.skillcap[skill]: --- 474,478 ---- item.deltag('real_skillbonus_%u' % i) continue ! # Add a Bonus for the skill if char.skill[skill] + bonus > char.skillcap[skill]: *************** *** 478,482 **** if char.skill[skill] + bonus < 0: bonus = - char.skill[skill] ! item.settag('real_skillbonus_%u' % i, '%u,%u' % (skill, bonus)) char.skill[skill] += bonus --- 480,484 ---- if char.skill[skill] + bonus < 0: bonus = - char.skill[skill] ! item.settag('real_skillbonus_%u' % i, '%u,%u' % (skill, bonus)) char.skill[skill] += bonus *************** *** 484,488 **** item.deltag('skillbonus_%u' % i) continue ! # Update the bonus tag for the character tagname = 'skillbonus_%u' % skill --- 486,490 ---- item.deltag('skillbonus_%u' % i) continue ! # Update the bonus tag for the character tagname = 'skillbonus_%u' % skill *************** *** 506,510 **** char.staminabonus += bonusstamina changed = True ! # Bonus Mana bonusmana = properties.fromitem(item, BONUSMANA) --- 508,512 ---- char.staminabonus += bonusstamina changed = True ! # Bonus Mana bonusmana = properties.fromitem(item, BONUSMANA) *************** *** 518,522 **** if char.hastag('regenhitpoints'): regenhitpoints += int(char.gettag('regenhitpoints')) ! char.settag('regenhitpoints', regenhitpoints) --- 520,524 ---- if char.hastag('regenhitpoints'): regenhitpoints += int(char.gettag('regenhitpoints')) ! char.settag('regenhitpoints', regenhitpoints) *************** *** 526,532 **** if char.hastag('regenstamina'): regenstamina += int(char.gettag('regenstamina')) ! char.settag('regenstamina', regenstamina) ! # Add mana regeneration rate bonus regenmana = properties.fromitem(item, REGENMANA) --- 528,534 ---- if char.hastag('regenstamina'): regenstamina += int(char.gettag('regenstamina')) ! char.settag('regenstamina', regenstamina) ! # Add mana regeneration rate bonus regenmana = properties.fromitem(item, REGENMANA) *************** *** 534,538 **** if char.hastag('regenmana'): regenmana += int(char.gettag('regenmana')) ! char.settag('regenmana', regenmana) --- 536,540 ---- if char.hastag('regenmana'): regenmana += int(char.gettag('regenmana')) ! char.settag('regenmana', regenmana) *************** *** 546,550 **** def onUnequip(char, item, layer): changed = 0 ! # Bonus Str if item.hastag('real_strength_bonus'): --- 548,552 ---- def onUnequip(char, item, layer): changed = 0 ! # Bonus Str if item.hastag('real_strength_bonus'): *************** *** 581,585 **** item.deltag('real_skillbonus_%u' % i) continue ! # If the bonus would add over the skill limit, # make sure it doesnt --- 583,587 ---- item.deltag('real_skillbonus_%u' % i) continue ! # If the bonus would add over the skill limit, # make sure it doesnt *************** *** 588,600 **** if char.skill[skill] - bonus < 0: bonus = char.skill[skill] ! item.deltag('real_skillbonus_%u' % i, bonus) char.skill[skill] -= bonus ! # Update the bonus tag for the character tagname = 'skillbonus_%u' % skill if char.hastag(tagname): value = int(char.gettag(tagname)) - bonus ! if value != 0: char.settag(tagname, value) --- 590,602 ---- if char.skill[skill] - bonus < 0: bonus = char.skill[skill] ! item.deltag('real_skillbonus_%u' % i, bonus) char.skill[skill] -= bonus ! # Update the bonus tag for the character tagname = 'skillbonus_%u' % skill if char.hastag(tagname): value = int(char.gettag(tagname)) - bonus ! if value != 0: char.settag(tagname, value) *************** *** 603,607 **** except: item.deltag('real_skillbonus_%u' % i) ! continue # Bonus Hitpoints --- 605,609 ---- except: item.deltag('real_skillbonus_%u' % i) ! continue # Bonus Hitpoints *************** *** 616,620 **** char.staminabonus -= bonusstamina changed = True ! # Bonus Mana bonusmana = properties.fromitem(item, BONUSMANA) --- 618,622 ---- char.staminabonus -= bonusstamina changed = True ! # Bonus Mana bonusmana = properties.fromitem(item, BONUSMANA) *************** *** 622,631 **** char.manabonus -= bonusmana changed = True ! # Remove hitpoint regeneration rate bonus regenhitpoints = properties.fromitem(item, REGENHITPOINTS) if regenhitpoints and char.hastag('regenhitpoints'): value = int(char.gettag('regenhitpoints')) - regenhitpoints ! if value <= 0: char.deltag('regenhitpoints') --- 624,633 ---- char.manabonus -= bonusmana changed = True ! # Remove hitpoint regeneration rate bonus regenhitpoints = properties.fromitem(item, REGENHITPOINTS) if regenhitpoints and char.hastag('regenhitpoints'): value = int(char.gettag('regenhitpoints')) - regenhitpoints ! if value <= 0: char.deltag('regenhitpoints') *************** *** 637,655 **** if regenstamina and char.hastag('regenstamina'): value = int(char.gettag('regenstamina')) - regenstamina ! if value <= 0: char.deltag('regenstamina') else: char.settag('regenstamina', value) ! # Remove mana regeneration rate bonus regenmana = properties.fromitem(item, REGENMANA) if regenmana and char.hastag('regenmana'): value = int(char.gettag('regenmana')) - regenmana ! if value <= 0: char.deltag('regenmana') else: ! char.settag('regenmana', value) # Update Stats --- 639,657 ---- if regenstamina and char.hastag('regenstamina'): value = int(char.gettag('regenstamina')) - regenstamina ! if value <= 0: char.deltag('regenstamina') else: char.settag('regenstamina', value) ! # Remove mana regeneration rate bonus regenmana = properties.fromitem(item, REGENMANA) if regenmana and char.hastag('regenmana'): value = int(char.gettag('regenmana')) - regenmana ! if value <= 0: char.deltag('regenmana') else: ! char.settag('regenmana', value) # Update Stats *************** *** 663,668 **** if not item.container or not item.container.ischar(): return ! ! char = item.container onUnequip(char, item, item.layer) --- 665,670 ---- if not item.container or not item.container.ischar(): return ! ! char = item.container onUnequip(char, item, item.layer) *************** *** 718,725 **** item.soundeffect(0x57) player.updatestats() ! # Remove the use delay, equipping should be for free... player.objectdelay = 0 ! for script in scripts[scripts.index("equipment")+1:]: if wolfpack.hasevent(script, EVENT_USE): --- 720,727 ---- item.soundeffect(0x57) player.updatestats() ! # Remove the use delay, equipping should be for free... player.objectdelay = 0 ! for script in scripts[scripts.index("equipment")+1:]: if wolfpack.hasevent(script, EVENT_USE): |
|
From: Richard M. <dr...@us...> - 2004-10-08 18:51:22
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12632/samurai Modified Files: bokuto.xml daisho.xml fukiya.xml kama.xml lajatang.xml no-dachi.xml nunchaku.xml sai.xml shuriken.xml tekagi.xml tessen.xml tetsubo.xml yumi.xml Log Message: Educated guesses... Index: shuriken.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/shuriken.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shuriken.xml 7 Oct 2004 22:31:25 -0000 1.1 --- shuriken.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 21,25 **** <weight>4.0</weight> <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Shuriken</category> <!-- Properties --> --- 21,25 ---- <weight>4.0</weight> <!--<basescripts>equipment,blades</basescripts>--> ! <!--<type>1001</type>--> <category>Weapons\Samurai\Shuriken</category> <!-- Properties --> Index: bokuto.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/bokuto.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bokuto.xml 7 Oct 2004 22:31:25 -0000 1.1 --- bokuto.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 20,28 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> <type>1001</type> <category>Weapons\Samurai\Bokuto</category> <!-- Properties --> ! <tag name="resname" value="iron" /> <intproperty name="req_strength" value="35" /> <intproperty name="speed" value="37" /> --- 20,28 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment</basescripts> <type>1001</type> <category>Weapons\Samurai\Bokuto</category> <!-- Properties --> ! <!--<tag name="resname" value="iron" />--> <intproperty name="req_strength" value="35" /> <intproperty name="speed" value="37" /> Index: no-dachi.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/no-dachi.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** no-dachi.xml 7 Oct 2004 22:31:25 -0000 1.1 --- no-dachi.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 9,16 **** <definitions> <!-- No-Dachi --> <item id="27a2"> <id>0x27a2</id> ! <!--<twohanded />--> <decay /> <nodye /> --- 9,17 ---- <definitions> + <!-- Guessing Swordsmanship --> <!-- No-Dachi --> <item id="27a2"> <id>0x27a2</id> ! <twohanded /> <decay /> <nodye /> Index: lajatang.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/lajatang.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lajatang.xml 7 Oct 2004 22:31:25 -0000 1.1 --- lajatang.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 20,25 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Lajatang</category> <!-- Properties --> --- 20,25 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment,blades</basescripts> ! <type>1005</type> <category>Weapons\Samurai\Lajatang</category> <!-- Properties --> Index: tetsubo.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/tetsubo.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tetsubo.xml 7 Oct 2004 22:31:25 -0000 1.1 --- tetsubo.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 9,17 **** <definitions> - <!-- Guessing Mace Fighting --> <!-- Tetsubo --> <item id="27a6"> <id>0x27a6</id> - <twohanded /> <decay /> <nodye /> --- 9,15 ---- *************** *** 20,25 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Tetsubo</category> <!-- Properties --> --- 18,23 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment</basescripts> ! <type>1004</type> <category>Weapons\Samurai\Tetsubo</category> <!-- Properties --> Index: tessen.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/tessen.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tessen.xml 7 Oct 2004 22:31:25 -0000 1.1 --- tessen.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 9,16 **** <definitions> <!-- Tessen --> <item id="27a3"> <id>0x27a3</id> ! <!--<twohanded />--> <decay /> <nodye /> --- 9,17 ---- <definitions> + <!-- Guessing Fencing --> <!-- Tessen --> <item id="27a3"> <id>0x27a3</id> ! <twohanded /> <decay /> <nodye /> *************** *** 19,24 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Tessen</category> <!-- Properties --> --- 20,25 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment</basescripts> ! <type>1005</type> <category>Weapons\Samurai\Tessen</category> <!-- Properties --> Index: tekagi.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/tekagi.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tekagi.xml 7 Oct 2004 22:31:25 -0000 1.1 --- tekagi.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 20,25 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Tekagi</category> <!-- Properties --> --- 20,25 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment</basescripts> ! <type>1000</type> <category>Weapons\Samurai\Tekagi</category> <!-- Properties --> Index: fukiya.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/fukiya.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fukiya.xml 7 Oct 2004 22:31:25 -0000 1.1 --- fukiya.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 13,17 **** <item id="27aa"> <id>0x27aa</id> - <twohanded /> <decay /> <nodye /> --- 13,16 ---- *************** *** 20,25 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment,blades</basescripts> ! <type>1001</type> <category>Weapons\Samurai\Fukiya</category> <!-- Properties --> --- 19,24 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment</basescripts> ! <type>1004</type> <category>Weapons\Samurai\Fukiya</category> <!-- Properties --> Index: yumi.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/yumi.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** yumi.xml 7 Oct 2004 22:31:25 -0000 1.1 --- yumi.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 9,13 **** <definitions> - <!-- Guessing Archery --> <!-- Yumi --> <item id="27a5"> --- 9,12 ---- *************** *** 16,32 **** <decay /> <nodye /> ! <sellprice>120</sellprice> ! <buyprice>40</buyprice> ! <durability><random min="30" max="60" /></durability> ! <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Yumi</category> <!-- Properties --> ! <!--<tag name="resname" value="iron" />--> ! <intproperty name="req_strength" value="35" /> ! <intproperty name="speed" value="37" /> ! <intproperty name="mindamage" value="14" /> ! <intproperty name="maxdamage" value="16" /> </item> --- 15,33 ---- <decay /> <nodye /> ! <sellprice>18</sellprice> ! <buyprice>36</buyprice> ! <durability><random min="30" max="50" /></durability> ! <weight>7.0</weight> ! <basescripts>equipment</basescripts> ! <type>1006</type> <category>Weapons\Samurai\Yumi</category> <!-- Properties --> ! <intproperty name="projectile" value="0xf42" /> ! <strproperty name="ammunition" value="f3f" /> ! <intproperty name="req_strength" value="30" /> ! <intproperty name="range" value="12" /> ! <intproperty name="speed" value="25" /> ! <intproperty name="mindamage" value="16" /> ! <intproperty name="maxdamage" value="18" /> </item> Index: sai.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/sai.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sai.xml 7 Oct 2004 22:31:25 -0000 1.1 --- sai.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 9,13 **** <definitions> ! <!-- Guessing ??? --> <!-- Sai --> <item id="27af"> --- 9,13 ---- <definitions> ! <!-- Guessing Fencing --> <!-- Sai --> <item id="27af"> *************** *** 20,25 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Sai</category> <!-- Properties --> --- 20,25 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment</basescripts> ! <type>1005</type> <category>Weapons\Samurai\Sai</category> <!-- Properties --> Index: daisho.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/daisho.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** daisho.xml 7 Oct 2004 22:31:25 -0000 1.1 --- daisho.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 9,13 **** <definitions> ! <!-- Guessing Swords --> <!-- Daisho --> <item id="27a9"> --- 9,13 ---- <definitions> ! <!-- Guessing Swordsmanship --> <!-- Daisho --> <item id="27a9"> Index: nunchaku.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/nunchaku.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nunchaku.xml 7 Oct 2004 22:31:25 -0000 1.1 --- nunchaku.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 9,13 **** <definitions> ! <!-- Guessing ??? --> <!-- Nunchaku --> <item id="27ae"> --- 9,13 ---- <definitions> ! <!-- Guessing Macefighting --> <!-- Nunchaku --> <item id="27ae"> *************** *** 20,28 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Nunchaku</category> <!-- Properties --> ! <tag name="resname" value="iron" /> <intproperty name="req_strength" value="35" /> <intproperty name="speed" value="37" /> --- 20,28 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment</basescripts> ! <type>1004</type> <category>Weapons\Samurai\Nunchaku</category> <!-- Properties --> ! <!--<tag name="resname" value="iron" />--> <intproperty name="req_strength" value="35" /> <intproperty name="speed" value="37" /> Index: kama.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai/kama.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kama.xml 7 Oct 2004 22:31:25 -0000 1.1 --- kama.xml 8 Oct 2004 18:51:07 -0000 1.2 *************** *** 9,13 **** <definitions> ! <!-- Guessing ??? --> <!-- Kama --> <item id="27ad"> --- 9,13 ---- <definitions> ! <!-- Guessing fencing --> <!-- Kama --> <item id="27ad"> *************** *** 20,25 **** <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <!--<basescripts>equipment,blades</basescripts>--> ! <type>1001</type> <category>Weapons\Samurai\Kama</category> <!-- Properties --> --- 20,25 ---- <durability><random min="30" max="60" /></durability> <weight>4.0</weight> ! <basescripts>equipment,blades</basescripts> ! <type>1005</type> <category>Weapons\Samurai\Kama</category> <!-- Properties --> |
|
From: Richard M. <dr...@us...> - 2004-10-08 17:10:11
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18914/samurai Modified Files: cloth_ninja_hood.xml leather_jingasa.xml leather_ninja_hood.xml plate_do.xml plate_jingasa.xml Log Message: Category fixes... Apparently the jingasa which LOOKS like a shield, is a helm! :o Index: leather_ninja_hood.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai/leather_ninja_hood.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** leather_ninja_hood.xml 2 Oct 2004 03:26:29 -0000 1.1 --- leather_ninja_hood.xml 8 Oct 2004 17:10:01 -0000 1.2 *************** *** 19,23 **** <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Leather\Nina Hood</category> <!-- Properties --> <tag name="resname" value="leather" /> --- 19,23 ---- <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Headwear\Leather\Nina Hood</category> <!-- Properties --> <tag name="resname" value="leather" /> *************** *** 33,37 **** <id>0x27d9</id> <baseid>278e</baseid> ! <category>Armor\Base\Samurai\Leather\Nina Hood 2</category> </item> --- 33,37 ---- <id>0x27d9</id> <baseid>278e</baseid> ! <category>Armor\Base\Samurai\Headwear\Leather\Nina Hood 2</category> </item> Index: plate_do.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai/plate_do.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plate_do.xml 2 Oct 2004 03:26:29 -0000 1.1 --- plate_do.xml 8 Oct 2004 17:10:01 -0000 1.2 *************** *** 33,37 **** <id>0x27c8</id> <baseid>277d</baseid> ! <category>Armor\Base\Samruai\Plate\Do 2</category> </item> --- 33,37 ---- <id>0x27c8</id> <baseid>277d</baseid> ! <category>Armor\Base\Samurai\Plate\Do 2</category> </item> Index: plate_jingasa.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai/plate_jingasa.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plate_jingasa.xml 7 Oct 2004 22:33:22 -0000 1.1 --- plate_jingasa.xml 8 Oct 2004 17:10:01 -0000 1.2 *************** *** 19,23 **** <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Shields\Plate\Jingasa 1-1</category> <!-- Properties --> <tag name="resname" value="iron" /> --- 19,23 ---- <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Headwear\Plate\Jingasa 1-1</category> <!-- Properties --> <tag name="resname" value="iron" /> *************** *** 33,37 **** <id>0x27c2</id> <baseid>2777</baseid> ! <category>Armor\Base\Samurai\Shields\Plate\Jingasa 1-2</category> </item> --- 33,37 ---- <id>0x27c2</id> <baseid>2777</baseid> ! <category>Armor\Base\Samurai\Headwear\Plate\Jingasa 1-2</category> </item> *************** *** 46,50 **** <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Shields\Plate\Jingasa 2-1</category> <!-- Properties --> <tag name="resname" value="iron" /> --- 46,50 ---- <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Headwear\Plate\Jingasa 2-1</category> <!-- Properties --> <tag name="resname" value="iron" /> *************** *** 60,64 **** <id>0x27cc</id> <baseid>2781</baseid> ! <category>Armor\Base\Samurai\Shields\Plate\Jingasa 2-2</category> </item> --- 60,64 ---- <id>0x27cc</id> <baseid>2781</baseid> ! <category>Armor\Base\Samurai\Headwear\Plate\Jingasa 2-2</category> </item> *************** *** 73,77 **** <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Shields\Plate\Jingasa 3-1</category> <!-- Properties --> <tag name="resname" value="iron" /> --- 73,77 ---- <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Headwear\Plate\Jingasa 3-1</category> <!-- Properties --> <tag name="resname" value="iron" /> *************** *** 87,91 **** <id>0x27cf</id> <baseid>2784</baseid> ! <category>Armor\Base\Samurai\Shields\Plate\Jingasa 3-2</category> </item> --- 87,91 ---- <id>0x27cf</id> <baseid>2784</baseid> ! <category>Armor\Base\Samurai\Headwear\Plate\Jingasa 3-2</category> </item> Index: leather_jingasa.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai/leather_jingasa.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** leather_jingasa.xml 7 Oct 2004 22:33:21 -0000 1.1 --- leather_jingasa.xml 8 Oct 2004 17:10:01 -0000 1.2 *************** *** 19,23 **** <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Shields\Leather\Jingasa</category> <!-- Properties --> <tag name="resname" value="leather" /> --- 19,23 ---- <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Headwear\Leather\Jingasa</category> <!-- Properties --> <tag name="resname" value="leather" /> *************** *** 33,37 **** <id>0x27c1</id> <baseid>2776</baseid> ! <category>Armor\Base\Samurai\Shields\Plate\Jingasa 2</category> </item> --- 33,37 ---- <id>0x27c1</id> <baseid>2776</baseid> ! <category>Armor\Base\Samurai\Headwear\Leather\Jingasa 2</category> </item> Index: cloth_ninja_hood.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai/cloth_ninja_hood.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cloth_ninja_hood.xml 7 Oct 2004 22:33:21 -0000 1.1 --- cloth_ninja_hood.xml 8 Oct 2004 17:10:01 -0000 1.2 *************** *** 19,23 **** <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Cloth\Nina Hood</category> <!-- Properties --> <tag name="resname" value="leather" /> --- 19,23 ---- <type>1009</type> <basescripts>equipment</basescripts> ! <category>Armor\Base\Samurai\Headwear\Cloth\Nina Hood</category> <!-- Properties --> <tag name="resname" value="leather" /> *************** *** 33,37 **** <id>0x27da</id> <baseid>278f</baseid> ! <category>Armor\Base\Samurai\Cloth\Nina Hood 2</category> </item> --- 33,37 ---- <id>0x27da</id> <baseid>278f</baseid> ! <category>Armor\Base\Samurai\Headwear\Cloth\Nina Hood 2</category> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 12:16:21
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14058/network Modified Files: uosocket.cpp Log Message: fixes Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.425 retrieving revision 1.426 diff -C2 -d -r1.425 -r1.426 *** uosocket.cpp 8 Oct 2004 10:57:10 -0000 1.425 --- uosocket.cpp 8 Oct 2004 12:16:08 -0000 1.426 *************** *** 637,641 **** QValueVector<P_PLAYER> characters = _account->caracterList(); ! if ( packet->slot() > characters.size() ) { cUOTxDenyLogin denyLogin; --- 637,641 ---- QValueVector<P_PLAYER> characters = _account->caracterList(); ! if ( packet->slot() >= characters.size() ) { cUOTxDenyLogin denyLogin; *************** *** 654,658 **** _account->setInUse( true ); ! playChar( characters.at( packet->slot() ) ); _player->onLogin(); } --- 654,661 ---- _account->setInUse( true ); ! ! P_PLAYER pChar = characters.at(packet->slot()); ! log(LOG_MESSAGE, tr("Selected character '%1' (0x%2).\n").arg(pChar->name()).arg(pChar->serial(), 0, 16)); ! playChar( pChar ); _player->onLogin(); } *************** *** 1071,1079 **** pChar->giveNewbieItems( skillid2 ); // Start the game with the newly created char -- OR RELAY HIM !! playChar( pChar ); pChar->onLogin(); - // Processes a create character request - // Notes from Lord Binaries packet documentation: #undef cancelCreate } --- 1074,1083 ---- pChar->giveNewbieItems( skillid2 ); + log(LOG_MESSAGE, tr("Created character '%1' (0x%2).\n").arg(pChar->name()).arg(pChar->serial(), 0, 16)); + // Start the game with the newly created char -- OR RELAY HIM !! playChar( pChar ); + pChar->onCreate(pChar->baseid()); // Call onCreate before onLogin pChar->onLogin(); #undef cancelCreate } |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 12:16:20
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14058 Modified Files: ChangeLog Log Message: fixes Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** ChangeLog 8 Oct 2004 10:57:09 -0000 1.100 --- ChangeLog 8 Oct 2004 12:16:08 -0000 1.101 *************** *** 36,39 **** --- 36,40 ---- - Fixed a bug (Exploit) related to consumeResource. - Removed old page system from core. + - onCreate is now called for players on character creation. Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 11:06:15
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30104/webroot Modified Files: ChangeLog.wolfpack Log Message: fixed foreign characters in page system. fixed bandages for logged out chars Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** ChangeLog.wolfpack 8 Oct 2004 10:37:01 -0000 1.140 --- ChangeLog.wolfpack 8 Oct 2004 11:06:07 -0000 1.141 *************** *** 51,54 **** --- 51,57 ---- - Added template weaponinfo for new samurai weapons. - Fixed incognito bug. + - Fixed a bug in the remove command (Players without accounts caused errors) + - Fixed foreign characters for the page system. + - Fixed bandages for logged out chars. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 11:06:05
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30010 Modified Files: bandages.py Log Message: fixed foreign characters in page system. fixed bandages for logged out chars Index: bandages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bandages.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** bandages.py 6 Oct 2004 20:56:22 -0000 1.15 --- bandages.py 8 Oct 2004 11:05:53 -0000 1.16 *************** *** 202,212 **** def bandage_timer( char, args ): char.socket.deltag( 'using_bandages' ) - resurrect = args[0] success = args[1] baseid = args[3] - if resurrect == 1: # Corpse Target --- 202,213 ---- def bandage_timer( char, args ): + if not char.socket: + return # Character disconnected + char.socket.deltag( 'using_bandages' ) resurrect = args[0] success = args[1] baseid = args[3] if resurrect == 1: # Corpse Target |
|
From: Sebastian H. <dar...@us...> - 2004-10-08 11:06:05
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30010/system Modified Files: pages.py Log Message: fixed foreign characters in page system. fixed bandages for logged out chars Index: pages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/pages.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pages.py 20 Sep 2004 14:29:55 -0000 1.5 --- pages.py 8 Oct 2004 11:05:53 -0000 1.6 *************** *** 7,10 **** --- 7,11 ---- import time from urllib import quote, unquote + from wolfpack import console pages = None *************** *** 30,45 **** if type(char) == str: values = char.split(';') ! self.account = unquote( values[0] ) self.serial = int(values[1]) ! self.name = unquote(values[2]) (x, y, z, m) = values[3].split(',') self.pos = wolfpack.coord(int(x), int(y), int(z), int(m)) ! self.category = unquote(values[4]) self.message = ['', '', '', ''] ! self.message[0] = unicode(unquote(values[5])) ! self.message[1] = unicode(unquote(values[6])) ! self.message[2] = unicode(unquote(values[7])) ! self.message[3] = unicode(unquote(values[8])) ! self.created = float(values[9]) else: self.account = char.account.name --- 31,46 ---- if type(char) == str: values = char.split(';') ! self.account = unquote( values[0] ).decode('utf-8') self.serial = int(values[1]) ! self.name = unquote(values[2]).decode('utf-8') (x, y, z, m) = values[3].split(',') self.pos = wolfpack.coord(int(x), int(y), int(z), int(m)) ! self.category = unquote(values[4]).decode('utf-8') self.message = ['', '', '', ''] ! self.message[0] = unquote(values[5]).decode('utf-8') ! self.message[1] = unquote(values[6]).decode('utf-8') ! self.message[2] = unquote(values[7]).decode('utf-8') ! self.message[3] = unquote(values[8]).decode('utf-8') ! self.created = float(values[9]) else: self.account = char.account.name *************** *** 48,52 **** self.pos = char.pos self.category = '' ! self.message = ['', '', '', ''] self.created = 0 --- 49,53 ---- self.pos = char.pos self.category = '' ! self.message = [u'', u'', u'', u''] self.created = 0 *************** *** 71,83 **** def tostring(self): values = [] ! values.append( quote( self.account ) ) values.append( str( self.serial ) ) ! values.append( quote( self.name ) ) values.append( '%d,%d,%d,%d' % ( self.pos.x, self.pos.y, self.pos.z, self.pos.map ) ) ! values.append( quote( self.category ) ) ! values.append( quote( self.message[0] ) ) ! values.append( quote( self.message[1] ) ) ! values.append( quote( self.message[2] ) ) ! values.append( quote( self.message[3] ) ) values.append( str( self.created ) ) return ";".join(values) --- 72,84 ---- def tostring(self): values = [] ! values.append( quote( self.account.encode('utf-8') ) ) values.append( str( self.serial ) ) ! values.append( quote( self.name.encode('utf-8') ) ) values.append( '%d,%d,%d,%d' % ( self.pos.x, self.pos.y, self.pos.z, self.pos.map ) ) ! values.append( quote( self.category.encode('utf-8') ) ) ! values.append( quote( self.message[0].encode('utf-8') ) ) ! values.append( quote( self.message[1].encode('utf-8') ) ) ! values.append( quote( self.message[2].encode('utf-8') ) ) ! values.append( quote( self.message[3].encode('utf-8') ) ) values.append( str( self.created ) ) return ";".join(values) |
