wpdev-commits Mailing List for Wolfpack Emu (Page 19)
Brought to you by:
rip,
thiagocorrea
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
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27847 Modified Files: ChangeLog commands.cpp gumps.cpp gumps.h speech.cpp wolf.dsp wolfpack.pro wolfpack.vcproj Removed Files: pagesystem.h Log Message: pagesystem --- pagesystem.h DELETED --- Index: wolf.dsp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v retrieving revision 1.273 retrieving revision 1.274 diff -C2 -d -r1.273 -r1.274 *** wolf.dsp 16 Sep 2004 14:57:45 -0000 1.273 --- wolf.dsp 8 Oct 2004 10:57:10 -0000 1.274 *************** *** 485,492 **** # Begin Source File - SOURCE=.\pagesystem.h - # End Source File - # Begin Source File - SOURCE=.\party.h # End Source File --- 485,488 ---- Index: gumps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -d -r1.172 -r1.173 *** gumps.cpp 2 Oct 2004 22:15:50 -0000 1.172 --- gumps.cpp 8 Oct 2004 10:57:10 -0000 1.173 *************** *** 35,39 **** #include "spawnregions.h" #include "accounts.h" - #include "pagesystem.h" #include "territories.h" #include "basechar.h" --- 35,38 ---- *************** *** 191,612 **** } } - - cPagesGump::cPagesGump( uint page, WPPAGE_TYPE ptype ) - { - if ( page == 0 ) - return; - - page_ = page; - ptype_ = ptype; - QStringList charNames; - QStringList pageTimes; - QStringList pageCategories; - std::vector<WPPAGE_TYPE> pageTypes; - std::vector<uint> offsets; - uint offset = 0; - - QStringList categories = cPagesManager::getInstance()->categories(); - - pagequeue_.clear(); - - cPagesManager::iterator it = cPagesManager::getInstance()->begin(); - while ( it != cPagesManager::getInstance()->end() ) - { - P_CHAR pChar = FindCharBySerial( ( *it )->charSerial() ); - if ( pChar && ptype <= ( *it )->pageType() ) - { - charNames.push_back( pChar->name() ); - pageTimes.push_back( ( *it )->pageTime() ); - pageCategories.push_back( categories[( *it )->pageCategory() - 1] ); - pageTypes.push_back( ( *it )->pageType() ); - offsets.push_back( offset ); - pagequeue_.push_back( ( *it ) ); - } - it++; - offset++; - } - - uint numsocks = charNames.size(); - uint pages = ( ( uint ) ceil( ( double ) numsocks / 10.0f ) ); - - startPage(); - addBackground( 0xE10, 480, 360 ); //Background - addCheckertrans( 15, 15, 450, 330 ); - addGump( 180, 18, 0xFA8 ); - addText( 215, 20, tr( "Page Queue" ), 0x530 ); - - // X button - addText( 70, 320, "Close", 0x834 ); - addButton( 30, 320, 0xFB1, 0xFB3, 0 ); - - startPage( 1 ); - - int right = page_ * 10 - 1; - int left = page_ * 10 - 10; - if ( ( signed int ) numsocks <= ( signed int ) right ) - right = numsocks - 1; - - int i = left; - while ( i <= right ) - { - addButton( 20, 60 + ( i - left ) * 22, 0xFA5, 0xFA7, offsets[i] + 3 ); - addText( 50, 60 + ( i - left ) * 22, QString( "%1" ).arg( charNames[i] ), 0x844 + 5 * pageTypes[i] ); - addText( 200, 60 + ( i - left ) * 22, QString( "%1" ).arg( pageCategories[i] ), 0x844 + 5 * pageTypes[i] ); - addText( 280, 60 + ( i - left ) * 22, QString( "%1" ).arg( pageTimes[i] ), 0x844 + 5 * pageTypes[i] ); - i++; - } - - addText( 280, 320, tr( "Page %1 of %2" ).arg( page_ ).arg( pages ), 0x834 ); - if ( page_ > 1 ) // previous page - addButton( 240, 320, 0x0FC, 0x0FC, 1 ); - - if ( page_ < pages ) // next page - addButton( 260, 320, 0x0FA, 0x0FA, 2 ); - } - - void cPagesGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice ) - { - if ( choice.button == 0 ) - return; - else - { - switch ( choice.button ) - { - case 1: - { - cPagesGump* pGump = new cPagesGump( page_ - 1, ptype_ ); - socket->send( pGump ); - } - break; - case 2: - { - cPagesGump* pGump = new cPagesGump( page_ + 1, ptype_ ); - socket->send( pGump ); - } - break; - default: - { - cPageInfoGump* pGump = new cPageInfoGump( pagequeue_[choice.button - 3] ); - socket->send( pGump ); - } - break; - } - } - } - - cPageInfoGump::cPageInfoGump( cPage* page ) - { - page_ = page; - - if ( cPagesManager::getInstance()->contains( page ) ) - { - P_PLAYER pChar = dynamic_cast<P_PLAYER>( FindCharBySerial( page->charSerial() ) ); - if ( !pChar ) - return; - startPage(); - - addBackground( 0xE10, 440, 440 ); //Background - addResizeGump( 195, 360, 0xBB8, 205, 20 ); - addCheckertrans( 15, 15, 410, 410 ); - - addGump( 165, 18, 0xFA2 ); - addText( 200, 20, tr( "Page Menu" ), 0x530 ); - - // X button - addText( 70, 400, "Close", 0x834 ); - addButton( 30, 400, 0xFB1, 0xFB3, 0 ); - - QStringList categories = cPagesManager::getInstance()->categories(); - switch ( page->pageType() ) - { - case PT_GM: - addText( 150, 400, QString( "GM Page, Category: %1" ).arg( categories[page->pageCategory() - 1] ), 0x844 + 5 * page->pageType() ); - break; - case PT_COUNSELOR: - addText( 150, 400, QString( "Counselor Page, Category: %1" ).arg( categories[page->pageCategory() - 1] ), 0x844 + 5 * page->pageType() ); - break; - } - - startPage( 1 ); - - Q_UINT16 hue = 0x834; - - addText( 50, 60, tr( "Char name:" ), hue ); - addText( 200, 60, QString( "%1" ).arg( pChar->name() ), hue ); - addText( 50, 80, tr( "Account name:" ), hue ); - addText( 200, 80, QString( "%1" ).arg( pChar->account()->login() ), hue ); - addText( 50, 100, tr( "Char position:" ), hue ); - addText( 200, 100, QString( "%1,%2,%3 map %4" ).arg( pChar->pos().x ).arg( pChar->pos().y ).arg( pChar->pos().z ).arg( pChar->pos().map ), hue ); - addText( 50, 120, tr( "Page sent from:" ), hue ); - addText( 200, 120, QString( "%1,%2,%3 map %4" ).arg( page->pagePos().x ).arg( page->pagePos().y ).arg( page->pagePos().z ).arg( page->pagePos().map ), hue ); - addText( 50, 140, tr( "Date/time:" ), hue ); - addText( 200, 140, QString( "%1" ).arg( page->pageTime() ), hue ); - - addText( 50, 160, tr( "Message:" ), hue ); - QString html = QString( "<body text=\"#0000FF\" leftmargin=\"0\" topmargin=\"0\" marginwidth=\"0\" marginheight=\"0\">%1</body>" ).arg( page_->content() ); - addResizeGump( 45, 180, 0xBB8, 345, 84 ); - addHtmlGump( 50, 180, 340, 80, html ); - - addButton( 20, 280, 0xFA5, 0xFA7, 1 ); - addText( 50, 280, tr( "Go to char position" ), 0x834 ); - addButton( 20, 300, 0xFA5, 0xFA71, 2 ); - addText( 50, 300, tr( "Bring char" ), 0x834 ); - addButton( 20, 320, 0xFA5, 0xFA7, 3 ); - addText( 50, 320, tr( "Go to page position" ), 0x834 ); - addButton( 20, 360, 0xFBD, 0xFBF, 4 ); - addText( 50, 360, tr( "Send message:" ), 0x834 ); - addInputField( 200, 360, 190, 16, 1, tr( "<msg>" ), 0x834 ); - - addButton( 220, 280, 0xFAB, 0xFAD, 5 ); - addText( 250, 280, tr( "Show socket info gump" ), 0x834 ); - addButton( 220, 300, 0xFA5, 0xFA7, 6 ); - addText( 250, 300, tr( "Move page on top" ), 0x834 ); - addButton( 220, 320, 0xFA5, 0xFA7, 7 ); - addText( 250, 320, tr( "Delete page" ), 0x834 ); - } - } - - void cPageInfoGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice ) - { - if ( choice.button == 0 ) - return; - else if ( page_ && cPagesManager::getInstance()->contains( page_ ) ) - { - P_PLAYER pChar = dynamic_cast<P_PLAYER>( FindCharBySerial( page_->charSerial() ) ); - - if ( !pChar ) - return; - - cUOSocket* socket_ = pChar->socket(); - - if ( !socket_ ) - return; - - P_PLAYER mChar = socket->player(); - switch ( choice.button ) - { - case 1: - // Check if the privileges are ok - if ( mChar && !mChar->account()->authorized( "command", "go" ) ) - { - socket->sysMessage( tr( "Access to command 'go' was denied" ) ); - } - else if ( mChar ) - { - mChar->removeFromView( false ); - mChar->moveTo( pChar->pos() ); - mChar->resend( false ); - socket->resendPlayer(); - socket->resendWorld(); - } - break; - case 2: - // Check if the privileges are ok - if ( mChar && !mChar->account()->authorized( "command", "move" ) || pChar->account()->rank() >= mChar->account()->rank() ) - { - socket->sysMessage( tr( "Access to command 'move' was denied" ) ); - } - else if ( mChar ) - { - pChar->removeFromView( false ); - pChar->moveTo( mChar->pos() ); - pChar->resend( false ); - socket_->resendPlayer(); - socket_->resendWorld(); - } - break; - case 3: - // Check if the privileges are ok - if ( mChar && !mChar->account()->authorized( "command", "go" ) ) - { - socket->sysMessage( tr( "Access to command 'go' was denied" ) ); - } - else if ( mChar ) - { - mChar->removeFromView( false ); - mChar->moveTo( page_->pagePos() ); - mChar->resend( false ); - socket->resendPlayer(); - socket->resendWorld(); - } - break; - case 4: - { - std::map<Q_UINT16, QString>::const_iterator it = choice.textentries.find( 1 ); - if ( it != choice.textentries.end() ) - socket_->sysMessage( it->second ); - - socket->sysMessage( tr( "Message sent." ) ); - } - break; - case 6: - cPagesManager::getInstance()->moveOnTop( page_ ); - break; - case 7: - cPagesManager::getInstance()->remove( page_ ); - return; - } - cPageInfoGump* pGump = new cPageInfoGump( page_ ); - socket->send( pGump ); - } - else - socket->sysMessage( tr( "ERROR: Page has been deleted in the meantime!" ) ); - } - - cHelpGump::cHelpGump( SERIAL charSerial ) - { - P_CHAR pChar = FindCharBySerial( charSerial ); - if ( !pChar ) - return; - - char_ = charSerial; - QStringList categories = cPagesManager::getInstance()->categories(); - cPage* pPage = cPagesManager::getInstance()->find( pChar->serial() ); - - uint category = 0; - QStringList lines; - if ( pPage ) - { - category = pPage->pageCategory(); - lines = QStringList::split( "<br>", pPage->content(), true ); - } - else - { - lines.push_back( tr( "<msg>" ) ); - lines.push_back( "" ); - lines.push_back( "" ); - lines.push_back( "" ); - } - - if ( category > categories.count() ) - category = 0; - - uint heightmod = ( ( uint ) ( categories.count() / 2 ) + ( ( pPage ) ? 2 : 0 ) ); - - startPage(); - addResizeGump( 0, 40, 0xA28, 450, 330 + 20 * heightmod ); //Background - addGump( 105, 18, 0x58B ); // Fancy top-bar - addGump( 182, 0, 0x589 ); // "Button" like gump - addGump( 193, 10, 0x15E9 ); // "Button" like gump - addText( 190, 90, tr( "Help menu" ), 0x530 ); - - addText( 50, 120, tr( "Message: %1" ).arg( ( ( pPage ) ? pPage->pageTime() : QString( "" ) ) ), 0x834 ); - addResizeGump( 45, 140, 0xBB8, 345, 84 ); - - addInputField( 50, 140, 330, 16, 1, lines[0], 0x834 ); - addInputField( 50, 160, 330, 16, 2, lines[1], 0x834 ); - addInputField( 50, 180, 330, 16, 3, lines[2], 0x834 ); - addInputField( 50, 200, 330, 16, 4, lines[3], 0x834 ); - - startGroup( 1 ); - - addRadioButton( 50, 230, 0xD0, 0xD1, 1, ( ( pPage ) ? ( pPage->pageType() == PT_GM ) : true ) ); - addText( 80, 230, tr( "GM Page" ), 0x844 ); - - addRadioButton( 250, 230, 0xD0, 0xD1, 2, ( ( pPage ) ? ( pPage->pageType() == PT_COUNSELOR ) : false ) ); - addText( 280, 230, tr( "Counselor Page" ), 0x849 ); - - uint i = 0; // categories[0] == none.. should not be option! - uint offset = 0; - startGroup( 2 ); - addText( 50, 270, tr( "Categories:" ), 0x834 ); - while ( i < categories.count() ) - { - addRadioButton( 50, 290 + offset * 20, 0xD0, 0xD1, i + 1, ( ( pPage ) ? ( category == ( i ) ) : ( i == 0 ) ) ); - addText( 80, 290 + offset * 20, categories[i], 0x834 ); - - if ( i + 1 < categories.count() ) - { - addRadioButton( 250, 290 + offset * 20, 0xD0, 0xD1, i + 2, ( ( pPage ) ? ( category == ( i + 1 ) ) : false ) ); - addText( 280, 290 + offset * 20, categories[i + 1], 0x834 ); - } - offset++; - i += 2; - } - - if ( pPage ) - { - addButton( 50, 290 + ( offset + 1 ) * 20, 0xFA5, 0xFA7, 2 ); - addText( 100, 290 + ( offset + 1 ) * 20, "Delete my page", 0x834 ); - } - - // addButton( 20, 280, 0xFA5, 0xFA7, 1 ); - // addText( 60, 280, tr( "" ), 0x834 ); - - // OK button - addButton( 50, 320 + 20 * heightmod, 0xF9, 0xF8, 1 ); - // Cancel button - addButton( 120, 320 + 20 * heightmod, 0xF3, 0xF1, 0 ); - - startPage( 1 ); - } - - void cHelpGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice ) - { - if ( choice.button == 0 ) // canceled - return; - - cPage* pPage = cPagesManager::getInstance()->find( char_ ); - - if ( choice.button == 2 ) - { - if ( pPage ) - { - cPagesManager::getInstance()->remove( pPage ); - socket->sysMessage( "Page successfully deleted." ); - return; - } - } - else - { - P_PLAYER pChar = dynamic_cast<P_PLAYER>( FindCharBySerial( char_ ) ); - if ( !pChar ) - return; - - QStringList lines; - std::map<Q_UINT16, QString>::const_iterator it = choice.textentries.begin(); - while ( it != choice.textentries.end() ) - { - lines.push_back( it->second ); - it++; - } - QString content_ = lines.join( "<br>" ); - - if ( pPage ) - { - pPage->setPageTime(); - pPage->setContent( content_ ); - pPage->setPagePos( pChar->pos() ); - } - else - { - pPage = new cPage( char_, PT_GM, content_, pChar->pos() ); - cPagesManager::getInstance()->push_back( pPage ); - } - - switch ( choice.switches[0] ) - { - case 1: - pPage->setPageType( PT_GM ); - break; - case 2: - pPage->setPageType( PT_COUNSELOR ); - break; - } - - pPage->setPageCategory( choice.switches[1] ); - - QString account = ""; - if ( pChar->account() ) - account = pChar->account()->login(); - QString message = tr( "%1 Page from %2 [%3]: %4" ).arg( choice.switches[0] == 1 ? "GM" : "Counselor" ).arg( pChar->name() ).arg( account ).arg( lines.join( "\n" ) ); - - cUOSocket* mSock = 0; - for ( mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() ) - { - // Send a Message to this Character - if ( mSock->account() && mSock->account()->isPageNotify() ) - mSock->sysMessage( message ); - } - } - } --- 190,191 ---- Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.266 retrieving revision 1.267 diff -C2 -d -r1.266 -r1.267 *** commands.cpp 4 Oct 2004 20:16:26 -0000 1.266 --- commands.cpp 8 Oct 2004 10:57:09 -0000 1.267 *************** *** 41,45 **** #include "definitions.h" #include "scriptmanager.h" - #include "pagesystem.h" #include "sectors.h" #include "contextmenu.h" --- 41,44 ---- *************** *** 462,488 **** /* - \command pages - \description Manage support tickets. - */ - void commandPages( cUOSocket* socket, const QString& command, const QStringList& args ) throw() - { - Q_UNUSED( args ); - Q_UNUSED( command ); - // Pages - if ( socket->player() ) - { - cPagesGump* pGump = NULL; - - if ( socket->player()->isGM() ) - pGump = new cPagesGump( 1, PT_GM ); - else if ( socket->player()->isCounselor() ) - pGump = new cPagesGump( 1, PT_COUNSELOR ); - - if ( pGump ) - socket->send( pGump ); - } - } - - /* \command shutdown \description Shutdown the Wolfpack server. --- 461,464 ---- *************** *** 1563,1567 **** { "DOORGEN", commandDoorGenerator }, { "GMTALK", commandGmtalk }, - { "PAGES", commandPages }, { "PAGENOTIFY", commandPageNotify }, { "RELOAD", commandReload }, --- 1539,1542 ---- Index: wolfpack.vcproj =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** wolfpack.vcproj 30 Sep 2004 12:23:03 -0000 1.51 --- wolfpack.vcproj 8 Oct 2004 10:57:10 -0000 1.52 *************** *** 421,427 **** </File> <File - RelativePath=".\pagesystem.h"> - </File> - <File RelativePath=".\party.cpp"> </File> --- 421,424 ---- Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.190 retrieving revision 1.191 diff -C2 -d -r1.190 -r1.191 *** speech.cpp 8 Oct 2004 01:13:16 -0000 1.190 --- speech.cpp 8 Oct 2004 10:57:10 -0000 1.191 *************** *** 39,43 **** #include "territories.h" #include "network/uosocket.h" - #include "pagesystem.h" #include "skills.h" #include "pythonscript.h" --- 39,42 ---- *************** *** 107,150 **** break; - // Paging a GM - case cPlayer::enPageGM: - { - cPage* pPage = new cPage( pChar->serial(), PT_GM, speech, pChar->pos() ); - cPagesManager::getInstance()->push_back( pPage ); - notification = tr( "GM Page from %1: %2" ).arg( pChar->name() ).arg( speech ); - - for ( cUOSocket*mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() ) - if ( mSock->player() && mSock->player()->isGM() ) - mSock->sysMessage( notification ); - - if ( Network::instance()->count() > 0 ) - socket->sysMessage( tr( "Available Game Masters have been notified of your request." ) ); - else - socket->sysMessage( tr( "There was no Game Master available, page queued." ) ); - - pChar->setInputMode( cPlayer::enNone ); - } - break; - - // Paging a Counselor - case cPlayer::enPageCouns: - { - cPage* pPage = new cPage( pChar->serial(), PT_COUNSELOR, speech, pChar->pos() ); - cPagesManager::getInstance()->push_back( pPage ); - notification = tr( "Counselor Page from %1: %2" ).arg( pChar->name() ).arg( speech ); - - for ( cUOSocket*mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() ) - if ( mSock->player() && ( socket->player()->isCounselor() || socket->player()->isGM() ) ) - mSock->sysMessage( notification ); - - if ( Network::instance()->count() > 0 ) - socket->sysMessage( tr( "Available Counselors have been notified of your request." ) ); - else - socket->sysMessage( tr( "There was no Counselor available, page queued." ) ); - - pChar->setInputMode( cPlayer::enNone ); - } - break; - default: break; // do nothing --- 106,109 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** ChangeLog 8 Oct 2004 01:13:15 -0000 1.99 --- ChangeLog 8 Oct 2004 10:57:09 -0000 1.100 *************** *** 35,38 **** --- 35,39 ---- - Added the ability to sell items from subpacks. - Fixed a bug (Exploit) related to consumeResource. + - Removed old page system from core. Wolfpack 12.9.11 Beta (26. September 2004) Index: gumps.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/gumps.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** gumps.h 24 Sep 2004 04:47:25 -0000 1.44 --- gumps.h 8 Oct 2004 10:57:10 -0000 1.45 *************** *** 254,295 **** }; - class cPagesGump : public cGump - { - OBJECTDEF(cPagesGump) - private: - uint page_; - WPPAGE_TYPE ptype_; - - std::vector<cPage*> pagequeue_; - - public: - cPagesGump( uint page, WPPAGE_TYPE ptype ); - - virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice ); - }; - - class cPageInfoGump : public cGump - { - OBJECTDEF(cPageInfoGump) - private: - cPage* page_; - - public: - cPageInfoGump( cPage* page_ ); - - virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice ); - }; - - class cHelpGump : public cGump - { - OBJECTDEF(cHelpGump) - private: - SERIAL char_; - - public: - cHelpGump( SERIAL charSerial ); - - virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice ); - }; - #endif --- 254,256 ---- Index: wolfpack.pro =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v retrieving revision 1.213 retrieving revision 1.214 diff -C2 -d -r1.213 -r1.214 *** wolfpack.pro 25 Sep 2004 22:57:09 -0000 1.213 --- wolfpack.pro 8 Oct 2004 10:57:10 -0000 1.214 *************** *** 92,96 **** multi.h \ npc.h \ - pagesystem.h \ party.h \ persistentbroker.h \ --- 92,95 ---- |
From: Sebastian H. <dar...@us...> - 2004-10-08 10:57:21
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27847/network Modified Files: uosocket.cpp Log Message: pagesystem Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.424 retrieving revision 1.425 diff -C2 -d -r1.424 -r1.425 *** uosocket.cpp 8 Oct 2004 01:13:16 -0000 1.424 --- uosocket.cpp 8 Oct 2004 10:57:10 -0000 1.425 *************** *** 2762,2771 **** { Q_UNUSED( packet ); ! ! if ( player()->onHelp() ) ! return; ! ! cHelpGump* pGump = new cHelpGump( this->player()->serial() ); ! send( pGump ); } --- 2762,2766 ---- { Q_UNUSED( packet ); ! player()->onHelp(); } |
From: Sebastian H. <dar...@us...> - 2004-10-08 10:50:16
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26490/commands Modified Files: remove.py Log Message: Bugfix for remove Index: remove.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/remove.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** remove.py 9 Sep 2004 02:31:09 -0000 1.3 --- remove.py 8 Oct 2004 10:50:02 -0000 1.4 *************** *** 34,42 **** socket = None ! if player.account.rank >= char.account.rank: char.socket.sysmessage("You cannot remove this player.") return False else: ! if player.account.acl != 'player': char.socket.sysmessage( "Players with special accounts can not be removed." ) return False --- 34,42 ---- socket = None ! if player.rank >= char.rank: char.socket.sysmessage("You cannot remove this player.") return False else: ! if player.account and player.account.acl != 'player': char.socket.sysmessage( "Players with special accounts can not be removed." ) return False |
From: Sebastian H. <dar...@us...> - 2004-10-08 10:37:20
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23621/webroot Modified Files: ChangeLog.wolfpack Log Message: exploit fix Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** ChangeLog.wolfpack 8 Oct 2004 01:05:41 -0000 1.139 --- ChangeLog.wolfpack 8 Oct 2004 10:37:01 -0000 1.140 *************** *** 50,53 **** --- 50,54 ---- - Added two new skill numbers for bushido and ninjitsu. - Added template weaponinfo for new samurai weapons. + - Fixed incognito bug. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
From: Sebastian H. <dar...@us...> - 2004-10-08 10:37:07
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23604/magic Modified Files: circle5.py Log Message: incognito fix Index: circle5.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** circle5.py 27 Sep 2004 22:33:22 -0000 1.24 --- circle5.py 8 Oct 2004 10:36:53 -0000 1.25 *************** *** 162,167 **** char.additem(LAYER_BEARD, beard) ! hair.update() ! beard.update() char.incognito = 1 --- 162,169 ---- char.additem(LAYER_BEARD, beard) ! if hair: ! hair.update() ! if beard: ! beard.update() char.incognito = 1 |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:35:49
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941 Modified Files: skillgain.py Log Message: Skillgain fixes Index: skillgain.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/skillgain.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** skillgain.py 8 Oct 2004 01:14:16 -0000 1.20 --- skillgain.py 8 Oct 2004 01:35:35 -0000 1.21 *************** *** 18,22 **** SKILL_INTCHANCE = 7 ! GLOBAL_FACTOR = 1.0 # --- 18,22 ---- SKILL_INTCHANCE = 7 ! GLOBAL_FACTOR = 0.5 # *************** *** 230,235 **** gainchance = gainchance * GLOBAL_FACTOR - char.log(LOG_TRACE, 'Gainchance for skill %s is %f.\n' % (SKILLNAMES[skill], gainchance)) - # Tamed creatures get a * 2 bonus for their gain. if char.npc and char.tamed: --- 230,233 ---- *************** *** 253,257 **** realint = char.intelligence - char.intelligence2 - if (char.npc or char.strengthlock != 0) or realstr >= char.strengthcap: strchance = 0.0 --- 251,254 ---- *************** *** 269,272 **** --- 266,273 ---- intchance /= 33.3 + # Gainchances for stats + #if skill != FOCUS: + # char.log(LOG_TRACE, "Gainchances. Skill %s. Str: %f Dex: %f Int: %f\n" % (SKILLNAMES[skill], strchance, dexchance, intchance)) + # Roll three times if strchance > random(): |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:19:59
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23309 Modified Files: check.py Log Message: exploit fix Index: check.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/check.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** check.py 8 Oct 2004 01:14:15 -0000 1.9 --- check.py 8 Oct 2004 01:19:41 -0000 1.10 *************** *** 22,25 **** --- 22,29 ---- def onUse( char, item ): + if not char.canreach(item, -1): + char.socket.clilocmessage(500364) + return True + #D: 0xFE8F0 (0) #Gold was deposited in your account: |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:14:26
|
Update of /cvsroot/wpdev/xmlscripts/scripts/speech In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22324/speech Modified Files: banker.py Log Message: various Index: banker.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/banker.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** banker.py 4 Oct 2004 13:47:13 -0000 1.13 --- banker.py 8 Oct 2004 01:14:16 -0000 1.14 *************** *** 10,13 **** --- 10,14 ---- from wolfpack import tr from wolfpack.consts import * + import wolfpack.utilities import wolfpack import re *************** *** 68,72 **** speaker.soundeffect( 0x37, 0 ) ! break --- 69,73 ---- speaker.soundeffect( 0x37, 0 ) ! break *************** *** 127,137 **** # We have enough money, so let's withdraw it # Into your bank box I have placed a check in the amount of: ! total = str( amount ) speaker.socket.clilocmessage( 0xFE8F1, "", 0x3b2, 3, listener, " %s" %total ) bank.useresource( amount, 0xEED, 0x0 ) check = wolfpack.additem( "bank_check" ) check.settag( 'value', amount ) ! check.container = bank check.update() break --- 128,141 ---- # We have enough money, so let's withdraw it # Into your bank box I have placed a check in the amount of: ! total = str(amount) speaker.socket.clilocmessage( 0xFE8F1, "", 0x3b2, 3, listener, " %s" %total ) bank.useresource( amount, 0xEED, 0x0 ) check = wolfpack.additem( "bank_check" ) check.settag( 'value', amount ) ! bank.additem(check) check.update() + + # Resend Status (Money changed) + speaker.socket.resendstatus() break *************** *** 140,145 **** # An item has been dropped on us def onDropOnChar( char, item ): ! char.socket.clilocmessage( 0x7A2A4, "", 0x3b2, 3, listener ) ! #backpack = char.getbackpack() ! #item.container = backpack return 0 --- 144,160 ---- # An item has been dropped on us def onDropOnChar( char, item ): ! player = item.container ! ! if not player or not player.ischar() or not player.socket: ! return False ! ! # Move to bankbox if gold ! if item.id == 0xeed: ! bankbox = player.getbankbox() ! if not wolfpack.utilities.tocontainer(item, bankbox): ! item.update() ! return True ! else: ! char.say( 500388, "", "", False, 0x3b2, player.socket ) ! return 0 |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:14:26
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22324 Modified Files: check.py Log Message: various Index: check.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/check.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** check.py 9 Jul 2004 21:47:45 -0000 1.8 --- check.py 8 Oct 2004 01:14:15 -0000 1.9 *************** *** 12,42 **** import wolfpack ! def onCreate( item, definition ): ! item.settag( 'value', 0 ) ! ! def onShowToolTip( sender, target, tooltip ): ! tooltip.add( 1041361, "" ) # A Bank Check tooltip.add( 1038021, "" ) # Blessed ! tooltip.add( 1060738, str( target.gettag( "value") ) ) ! tooltip.send ( sender ) ! return True def onUse( char, item ): ! #D: 0xFE8F0 (0) #Gold was deposited in your account: bankbox = char.getbankbox() ! value = item.gettag( "value" ) if bankbox: while value > 0: gold = wolfpack.additem( "eed" ) ! gold.amount = min( [ value, 60000 ] ) ! gold.container = bankbox ! value -= min( [ value, 60000 ] ) ! ! amount = str( value ) ! char.soundeffect( 0x37, 0 ) ! char.socket.sendcontainer( bankbox ) item.delete() return True --- 12,42 ---- import wolfpack + import wolfpack.utilities ! def onShowTooltip( sender, target, tooltip ): ! tooltip.reset() tooltip.add( 1041361, "" ) # A Bank Check tooltip.add( 1038021, "" ) # Blessed ! if target.hastag('value'): ! tooltip.add( 1060738, str( target.gettag( "value") ) ) def onUse( char, item ): ! #D: 0xFE8F0 (0) #Gold was deposited in your account: bankbox = char.getbankbox() ! value = int(item.gettag("value")) if bankbox: + amount = value while value > 0: gold = wolfpack.additem( "eed" ) ! gold.amount = min(value, 60000) ! value -= gold.amount ! ! if not wolfpack.utilities.tocontainer(gold, bankbox): ! gold.update() ! item.delete() + char.socket.resendstatus() + char.socket.clilocmessage(1042672, "", 0x3b2, 3, None, " %s" % amount) + char.soundeffect( 0x37, 0 ) return True |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:14:26
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22324/system Modified Files: skillgain.py Log Message: various Index: skillgain.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/skillgain.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** skillgain.py 7 Oct 2004 23:09:19 -0000 1.19 --- skillgain.py 8 Oct 2004 01:14:16 -0000 1.20 *************** *** 253,256 **** --- 253,257 ---- realint = char.intelligence - char.intelligence2 + if (char.npc or char.strengthlock != 0) or realstr >= char.strengthcap: strchance = 0.0 |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:13:30
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22074/python Modified Files: item.cpp Log Message: bugfixing session Index: item.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** item.cpp 1 Oct 2004 23:26:38 -0000 1.136 --- item.cpp 8 Oct 2004 01:13:16 -0000 1.137 *************** *** 329,333 **** } ! Q_UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) ); Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) ); Q_UINT16 color = 0; --- 329,333 ---- } ! Q_UINT32 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) ); Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) ); Q_UINT16 color = 0; *************** *** 336,340 **** color = PyInt_AsLong( PyTuple_GetItem( args, 2 ) ); ! Q_UINT16 deleted = 0; deleted = self->pItem->deleteAmount( amount, id, color ); --- 336,340 ---- color = PyInt_AsLong( PyTuple_GetItem( args, 2 ) ); ! Q_UINT32 deleted = 0; deleted = self->pItem->deleteAmount( amount, id, color ); |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:13:30
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22074 Modified Files: ChangeLog basechar.cpp items.cpp items.h log.h player.cpp speech.cpp trade.cpp Log Message: bugfixing session Index: items.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.h,v retrieving revision 1.218 retrieving revision 1.219 diff -C2 -d -r1.218 -r1.219 *** items.h 24 Sep 2004 04:47:25 -0000 1.218 --- items.h 8 Oct 2004 01:13:15 -0000 1.219 *************** *** 362,366 **** void moveTo( const Coord_cl& pos, bool noremove = false ); ! long reduceAmount( short amount = 1 ); short containerGumpType() const; void setRandPosInCont( cItem* pCont ); --- 362,366 ---- void moveTo( const Coord_cl& pos, bool noremove = false ); ! long reduceAmount( unsigned int amount = 1 ); short containerGumpType() const; void setRandPosInCont( cItem* pCont ); Index: trade.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/trade.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** trade.cpp 22 Sep 2004 05:34:47 -0000 1.13 --- trade.cpp 8 Oct 2004 01:13:16 -0000 1.14 *************** *** 179,183 **** Q_UINT32 bankGold = pChar->countBankGold(); Q_UINT32 packGold = pChar->countGold(); ! bool fromBank; if ( !pChar->isGM() ) --- 179,183 ---- Q_UINT32 bankGold = pChar->countBankGold(); Q_UINT32 packGold = pChar->countGold(); ! bool fromBank = false; if ( !pChar->isGM() ) *************** *** 335,339 **** // now look for the item in the player's pack ! if (pItem->container() != pPack) { socket->sysMessage( tr( "Invalid item sold." ) ); socket->send( &clearBuy ); --- 335,339 ---- // now look for the item in the player's pack ! if (pItem->getOutmostChar() != pChar) { socket->sysMessage( tr( "Invalid item sold." ) ); socket->send( &clearBuy ); Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.158 retrieving revision 1.159 diff -C2 -d -r1.158 -r1.159 *** basechar.cpp 7 Oct 2004 23:02:26 -0000 1.158 --- basechar.cpp 8 Oct 2004 01:13:15 -0000 1.159 *************** *** 2840,2844 **** } } ! } // Fame is reduced by 10% upon death --- 2840,2844 ---- } } ! } // Fame is reduced by 10% upon death *************** *** 2853,2856 **** --- 2853,2890 ---- bool summoned = npc && npc->summoned(); + // Kill Logging + QString logName; + if (npc) { + if (summoned) { + logName = tr("Summoned npc '%1' ('%2', 0x%3)").arg(name()).arg(baseid()).arg(serial_, 0, 16); + } else { + logName = tr("Npc '%1' ('%2', 0x%3)").arg(name()).arg(baseid()).arg(serial_, 0, 16); + } + } else if (player) { + logName = tr("Player '%1' ('%2', 0x%3)").arg(name()).arg(player->account() ? player->account()->login() : QString("Unknown")).arg(serial_, 0, 16); + } + + QString killerName; + if (pKiller && pKiller != this) { + P_NPC pKillerNpc = dynamic_cast<P_NPC>(pKiller); + P_PLAYER pKillerPlayer = dynamic_cast<P_PLAYER>(pKiller); + + if (pKillerNpc) { + if (pKillerNpc->summoned()) { + killerName = tr("summoned npc '%1' ('%2', 0x%3)").arg(pKiller->name()).arg(pKiller->baseid()).arg(pKiller->serial(), 0, 16); + } else { + killerName = tr("npc '%1' ('%2', 0x%3)").arg(pKiller->name()).arg(pKiller->baseid()).arg(pKiller->serial(), 0, 16); + } + } else if (pKillerPlayer) { + killerName = tr("player '%1' ('%2', 0x%3)").arg(pKiller->name()).arg(pKillerPlayer->account() ? pKillerPlayer->account()->login() : QString("Unknown")).arg(pKillerPlayer->serial(), 0, 16); + } + } else if (pKiller && pKiller == this) { + killerName = tr("himself"); + } else if (!pKiller) { + killerName = tr("accident"); + } + + log(LOG_TRACE, tr("%1 was killed by %2.\n").arg(logName).arg(killerName)); + if ( player ) player->unmount(); Index: log.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/log.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** log.h 10 Aug 2004 03:15:57 -0000 1.11 --- log.h 8 Oct 2004 01:13:15 -0000 1.12 *************** *** 48,51 **** --- 48,52 ---- LOG_TRACE = 0x20, LOG_DEBUG = 0x40, + LOG_SPEECH = 0x80, LOG_ALL = 0xFF }; Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** player.cpp 4 Oct 2004 21:50:16 -0000 1.135 --- player.cpp 8 Oct 2004 01:13:15 -0000 1.136 *************** *** 752,757 **** P_ITEM pile = cItem::createFromScript( "eed" ); pile->setAmount( QMIN( total, static_cast<Q_UINT32>( 65535 ) ) ); - pCont->addItem( pile ); total -= pile->amount(); } --- 752,761 ---- P_ITEM pile = cItem::createFromScript( "eed" ); pile->setAmount( QMIN( total, static_cast<Q_UINT32>( 65535 ) ) ); total -= pile->amount(); + + pCont->addItem( pile ); + if (!pile->free) { + pile->update(); + } } Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.189 retrieving revision 1.190 diff -C2 -d -r1.189 -r1.190 *** speech.cpp 25 Sep 2004 19:57:12 -0000 1.189 --- speech.cpp 8 Oct 2004 01:13:16 -0000 1.190 *************** *** 272,275 **** --- 272,278 ---- return; + // log + pChar->log(LOG_SPEECH, tr("Saying '%1' (%2, 0x%3).\n").arg(speech).arg(font).arg(color, 0, 16)); + pChar->unhide(); Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** ChangeLog 6 Oct 2004 22:16:58 -0000 1.98 --- ChangeLog 8 Oct 2004 01:13:15 -0000 1.99 *************** *** 32,35 **** --- 32,38 ---- - SIGPIPE is now ignored on unix systems. - Bugfix for the unix console. + - Added several logging features. + - Added the ability to sell items from subpacks. + - Fixed a bug (Exploit) related to consumeResource. Wolfpack 12.9.11 Beta (26. September 2004) Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.451 retrieving revision 1.452 diff -C2 -d -r1.451 -r1.452 *** items.cpp 22 Sep 2004 05:34:46 -0000 1.451 --- items.cpp 8 Oct 2004 01:13:15 -0000 1.452 *************** *** 149,155 **** * the remainder is returned */ ! long cItem::reduceAmount( const short amt ) { ! Q_UINT16 rest = 0; if ( amount_ > amt ) { --- 149,155 ---- * the remainder is returned */ ! long cItem::reduceAmount( unsigned int amt ) { ! Q_UINT32 rest = 0; if ( amount_ > amt ) { *************** *** 161,166 **** else { - this->remove(); rest = amt - amount_; } return rest; --- 161,166 ---- else { rest = amt - amount_; + this->remove(); } return rest; *************** *** 328,332 **** int cItem::deleteAmount( int amount, unsigned short _id, unsigned short _color ) { ! int rest = amount; P_ITEM pi; cItem::ContainerContent container( this->content() ); --- 328,332 ---- int cItem::deleteAmount( int amount, unsigned short _id, unsigned short _color ) { ! unsigned int rest = amount; P_ITEM pi; cItem::ContainerContent container( this->content() ); |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:13:29
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22074/network Modified Files: uosocket.cpp Log Message: bugfixing session Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.423 retrieving revision 1.424 diff -C2 -d -r1.423 -r1.424 *** uosocket.cpp 6 Oct 2004 00:02:37 -0000 1.423 --- uosocket.cpp 8 Oct 2004 01:13:16 -0000 1.424 *************** *** 2689,2692 **** --- 2689,2723 ---- } + static void walkSellItems(P_ITEM pCont, P_ITEM pPurchase, QPtrList<cItem> &items) { + cItem::ContainerContent container = pPurchase->content(); + cItem::ContainerContent::const_iterator it( container.begin() ); + cItem::ContainerContent::const_iterator end( container.end() ); + + cItem::ContainerContent packcont = pCont->content(); + cItem::ContainerContent::const_iterator pit; + + // For every pack item search for an equivalent sellitem + pit = packcont.begin(); + while ( pit != packcont.end() ) { + P_ITEM pItem = *pit; + + // Containers with content are walked and _not_ sold + if (pItem->type() == 1 && pItem->content().size() > 0) { + walkSellItems(pItem, pPurchase, items); + } else { + // Search all sellable items + for (it = container.begin(); it != container.end(); ++it) { + P_ITEM mItem = *it; + if ( pItem->baseid() == mItem->baseid() && pItem->scriptList() == mItem->scriptList() ) { + items.append(pItem); + break; // Break the inner loop + } + } + } + + ++pit; + } + } + void cUOSocket::sendSellWindow( P_NPC pVendor, P_CHAR pSeller ) { *************** *** 2700,2727 **** itemContent.setSerial( pVendor->serial() ); ! cItem::ContainerContent container = pPurchase->content(); ! cItem::ContainerContent::const_iterator it( container.begin() ); ! cItem::ContainerContent::const_iterator end( container.end() ); ! ! cItem::ContainerContent packcont = pBackpack->content(); ! cItem::ContainerContent::const_iterator pit; ! ! for ( Q_INT32 i = 0; it != end; ++it, ++i ) ! { ! P_ITEM mItem = *it; ! if ( mItem ) ! { ! pit = packcont.begin(); ! while ( pit != packcont.end() ) ! { ! if ( *pit && ( *pit )->baseid() == mItem->baseid() && ( *pit )->scriptList() == mItem->scriptList() ) ! { ! unsigned int sellprice = mItem->getSellPrice(pVendor); ! itemContent.addItem( ( *pit )->serial(), ( *pit )->id(), ( *pit )->color(), ( *pit )->amount(), sellprice, ( *pit )->getName() ); ! items.append( ( *pit ) ); ! } ! ++pit; ! } } } --- 2731,2744 ---- itemContent.setSerial( pVendor->serial() ); ! walkSellItems(pBackpack, pPurchase, items); ! // Transfer the found items to the sell list ! P_ITEM pItem; ! unsigned int count = 0; ! for (pItem = items.first(); pItem; pItem = items.next()) { ! unsigned int sellprice = pItem->getSellPrice(pVendor); ! if (sellprice != 0) { ! itemContent.addItem( pItem->serial(), pItem->id(), pItem->color(), pItem->amount(), sellprice, pItem->getName() ); ! ++count; } } *************** *** 3104,3120 **** // TODO: Add a XML option for this ! if ( !_player->owns( item ) && !_player->isGM() && _player->isInnocent() ) ! { // Innocent Corpse and not in the same party && party allowance for looting? ! if ( item->hasTag( "notoriety" ) && item->getTag( "notoriety" ).toInt() == 0x01 ) ! { P_PLAYER owner = dynamic_cast<P_PLAYER>( item->owner() ); bool allowed = false; ! if ( owner && owner->party() && owner->party() == _player->party() ) ! { // Check if the player allowed looting his corpse by party members ! if ( owner->party()->lootingAllowed().contains( owner ) ) ! { allowed = true; } --- 3121,3133 ---- // TODO: Add a XML option for this ! if ( !_player->owns( item ) && !_player->isGM() && _player->isInnocent() ) { // Innocent Corpse and not in the same party && party allowance for looting? ! if ( item->hasTag( "notoriety" ) && item->getTag( "notoriety" ).toInt() == 0x01 ) { P_PLAYER owner = dynamic_cast<P_PLAYER>( item->owner() ); bool allowed = false; ! if ( owner && owner->party() && owner->party() == _player->party() ) { // Check if the player allowed looting his corpse by party members ! if ( owner->party()->lootingAllowed().contains( owner ) ) { allowed = true; } *************** *** 3127,3130 **** --- 3140,3150 ---- } } + + // Get the corpse owner + P_PLAYER owner = dynamic_cast<P_PLAYER>(item->owner()); + + if (owner && owner != _player) { + log(LOG_NOTICE, tr("Looking into corpse of player '%1' ('%2', 0x%3)").arg(owner->name()).arg(owner->account() ? owner->account()->login() : QString("unknown")).arg(owner->serial(), 0, 16)); + } } |
From: Sebastian H. <dar...@us...> - 2004-10-08 01:05:53
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20805/webroot Modified Files: ChangeLog.wolfpack Log Message: various Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** ChangeLog.wolfpack 7 Oct 2004 22:58:51 -0000 1.138 --- ChangeLog.wolfpack 8 Oct 2004 01:05:41 -0000 1.139 *************** *** 46,49 **** --- 46,50 ---- - Fixed a bug with loot (typo) - Fixed a bug with the who menu related to more than 10 players connected. + - Implemented random generation of slayer weapons for magic loot. - Added slayer weapons. See ./scripts/system/slayer.py - Added two new skill numbers for bushido and ninjitsu. |
From: Richard M. <dr...@us...> - 2004-10-07 23:09:52
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28963 Modified Files: skillgain.py Log Message: Fix Index: skillgain.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/skillgain.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** skillgain.py 6 Oct 2004 20:56:23 -0000 1.18 --- skillgain.py 7 Oct 2004 23:09:19 -0000 1.19 *************** *** 109,113 **** cap = char.skillcap[skill] / 10.0 info = SKILLS[skill] ! if lock == 0 and value < cap: # Skills lower than 10.0% will gain 0.1% - 0.5% at once --- 109,113 ---- cap = char.skillcap[skill] / 10.0 info = SKILLS[skill] ! if lock == 0 and value < cap: # Skills lower than 10.0% will gain 0.1% - 0.5% at once *************** *** 127,131 **** if char.hastag('skillbonus_%u' % i): value = int(char.gettag('skillbonus_%u' % i)) ! # Skip this skill if reducing it wouldn't work if char.skill[i] - int(points * 10) < value: --- 127,131 ---- if char.hastag('skillbonus_%u' % i): value = int(char.gettag('skillbonus_%u' % i)) ! # Skip this skill if reducing it wouldn't work if char.skill[i] - int(points * 10) < value: *************** *** 133,137 **** except: pass ! char.skill[i] -= int(points * 10) totalskill -= points --- 133,137 ---- except: pass ! char.skill[i] -= int(points * 10) totalskill -= points *************** *** 152,158 **** if DEBUG_SKILLS == 1: char.log(LOG_TRACE, u'Character [%(serial)x] gained %(points).01f%% %(name)s [%(value).01f%%].\n' % { \ ! 'serial': char.serial, 'points': points, ! 'name': info[SKILL_NAME], 'value': (char.skill[skill] / 10.0) }) --- 152,158 ---- if DEBUG_SKILLS == 1: char.log(LOG_TRACE, u'Character [%(serial)x] gained %(points).01f%% %(name)s [%(value).01f%%].\n' % { \ ! 'serial': char.serial, 'points': points, ! 'name': info[SKILL_NAME], 'value': (char.skill[skill] / 10.0) }) *************** *** 226,233 **** # There is also a 1% minimum chance for gain gainchance = gainchance * info[SKILL_GAINFACTOR] ! # Multiply with another gainfactor gainchance = gainchance * GLOBAL_FACTOR ! char.log(LOG_TRACE, 'Gainchance for skill %s is %f.\n' % (SKILLNAMES[skill], gainchance)) --- 226,233 ---- # There is also a 1% minimum chance for gain gainchance = gainchance * info[SKILL_GAINFACTOR] ! # Multiply with another gainfactor gainchance = gainchance * GLOBAL_FACTOR ! char.log(LOG_TRACE, 'Gainchance for skill %s is %f.\n' % (SKILLNAMES[skill], gainchance)) *************** *** 253,257 **** realint = char.intelligence - char.intelligence2 ! if (char.npc or char.strengthlock != 0 or realstr >= char.strengthcap: strchance = 0.0 else: --- 253,257 ---- realint = char.intelligence - char.intelligence2 ! if (char.npc or char.strengthlock != 0) or realstr >= char.strengthcap: strchance = 0.0 else: *************** *** 274,278 **** gainstat(char, 1) elif intchance > random(): ! gainstat(char, 2) # --- 274,278 ---- gainstat(char, 1) elif intchance > random(): ! gainstat(char, 2) # |
From: Richard M. <dr...@us...> - 2004-10-07 23:07:36
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28163 Modified Files: index.xml Added Files: leather_ninja_belt.xml leather_ninja_mitts.xml Removed Files: leather_nina_belt.xml leather_nina_mitts.xml Log Message: Typos --- NEW FILE: leather_ninja_mitts.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Leather Nina Mitts --> <item id="2792"> <id>0x2792</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Leather\Nina Mitts</category> <!-- Properties --> <tag name="resname" value="leather" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27dd" inherit="2792"> <id>0x27dd</id> <baseid>2792</baseid> <category>Armor\Base\Samurai\Leather\Nina Mitts 2</category> </item> </definitions> --- leather_nina_mitts.xml DELETED --- --- NEW FILE: leather_ninja_belt.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Leather Nina Belt --> <item id="2790"> <id>0x2790</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Leather\Nina Belt</category> <!-- Properties --> <tag name="resname" value="leather" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27db" inherit="2790"> <id>0x27db</id> <baseid>2790</baseid> <category>Armor\Base\Samurai\Leather\Nina Belt 2</category> </item> </definitions> --- leather_nina_belt.xml DELETED --- Index: index.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai/index.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.xml 7 Oct 2004 22:44:44 -0000 1.3 --- index.xml 7 Oct 2004 23:07:12 -0000 1.4 *************** *** 19,26 **** <include file="definitions/items/armory/samurai/leather_jingasa.xml" /> <include file="definitions/items/armory/samurai/leather_mempo.xml" /> <include file="definitions/items/armory/samurai/leather_ninja_belt.xml" /> <include file="definitions/items/armory/samurai/leather_ninja_mitts.xml" /> <include file="definitions/items/armory/samurai/leather_ninja_hood.xml" /> ! <include file="definitions/items/armory/samurai/leather_ninja_jackte.xml" /> <include file="definitions/items/armory/samurai/leather_ninja_pants.xml" /> <include file="definitions/items/armory/samurai/leather_suneate.xml" /> --- 19,27 ---- <include file="definitions/items/armory/samurai/leather_jingasa.xml" /> <include file="definitions/items/armory/samurai/leather_mempo.xml" /> + <include file="definitions/items/armory/samurai/leather_ninja_belt.xml" /> <include file="definitions/items/armory/samurai/leather_ninja_mitts.xml" /> <include file="definitions/items/armory/samurai/leather_ninja_hood.xml" /> ! <include file="definitions/items/armory/samurai/leather_ninja_jacket.xml" /> <include file="definitions/items/armory/samurai/leather_ninja_pants.xml" /> <include file="definitions/items/armory/samurai/leather_suneate.xml" /> |
From: Sebastian H. <dar...@us...> - 2004-10-07 23:02:37
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26956 Modified Files: basechar.cpp timing.cpp Log Message: various Index: timing.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** timing.cpp 3 Oct 2004 13:51:39 -0000 1.16 --- timing.cpp 7 Oct 2004 23:02:26 -0000 1.17 *************** *** 387,391 **** // Criminal Flagging ! if ( player->criminalTime() > 0 && player->criminalTime() <= time ) { socket->sysMessage( tr( "You are no longer criminal." ) ); --- 387,391 ---- // Criminal Flagging ! if ( player->criminalTime() != 0 && player->criminalTime() <= time ) { socket->sysMessage( tr( "You are no longer criminal." ) ); Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** basechar.cpp 1 Oct 2004 16:32:52 -0000 1.157 --- basechar.cpp 7 Oct 2004 23:02:26 -0000 1.158 *************** *** 331,336 **** hunger_ = atoi( result[offset++] ); poison_ = ( char ) atoi( result[offset++] ); ! murdererTime_ = atoi( result[offset++] ) + Server::instance()->time(); ! criminalTime_ = atoi( result[offset++] ) + Server::instance()->time(); gender_ = atoi( result[offset++] ); propertyFlags_ = atoi( result[offset++] ); --- 331,342 ---- hunger_ = atoi( result[offset++] ); poison_ = ( char ) atoi( result[offset++] ); ! murdererTime_ = atoi( result[offset++] ); ! if (murdererTime_ != 0) { ! murdererTime_ += Server::instance()->time(); ! } ! criminalTime_ = atoi( result[offset++] ); ! if (criminalTime_ != 0) { ! criminalTime_ += Server::instance()->time(); ! } gender_ = atoi( result[offset++] ); propertyFlags_ = atoi( result[offset++] ); |
From: Richard M. <dr...@us...> - 2004-10-07 22:59:07
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25790/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.137 retrieving revision 1.138 diff -C2 -d -r1.137 -r1.138 *** ChangeLog.wolfpack 7 Oct 2004 20:21:00 -0000 1.137 --- ChangeLog.wolfpack 7 Oct 2004 22:58:51 -0000 1.138 *************** *** 47,50 **** --- 47,52 ---- - Fixed a bug with the who menu related to more than 10 players connected. - Added slayer weapons. See ./scripts/system/slayer.py + - Added two new skill numbers for bushido and ninjitsu. + - Added template weaponinfo for new samurai weapons. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
From: Richard M. <dr...@us...> - 2004-10-07 22:56:24
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25063/wolfpack Modified Files: consts.py weaponinfo.py Log Message: I hope I added these skill numbers in the right spots... Oh, and now we have some template stuff for weaponinfo Index: weaponinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/weaponinfo.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** weaponinfo.py 8 Sep 2004 04:12:15 -0000 1.9 --- weaponinfo.py 7 Oct 2004 22:56:12 -0000 1.10 *************** *** 422,423 **** --- 422,512 ---- } } + + SAMURAIWEAPONINFO = { + # Bokuto + '27a8': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Daisho + '27a9': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Fukiya + '27aa': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Kama + '27ad': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Lajatang + '27a7': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # No-Dachi + '27a2': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Nunchaku + '27ae': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Sai + '27af': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Shuriken + '27ac': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Tekagi + '27ab': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Tessen + '27a3': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Tetsubo + '27a6': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Wakizashi + '27a4': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + }, + # Yumi + '27a5': { + SWING: [0x9], + HITSOUND: [0x233, 0x232], + MISSSOUND: [ 0x23a, 0x239 ] + } + } + + WEAPONINFO.update( SAMURAIWEAPONINFO ) Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** consts.py 6 Oct 2004 20:06:00 -0000 1.85 --- consts.py 7 Oct 2004 22:56:12 -0000 1.86 *************** *** 197,201 **** FOCUS = 50 CHIVALRY = 51 ! ALLSKILLS = 52 # skills + 1 """ \end --- 197,203 ---- FOCUS = 50 CHIVALRY = 51 ! NINJITSU = 52 ! BUSHIDO = 53 ! ALLSKILLS = 54 # skills + 1 """ \end *************** *** 210,214 **** 'taming', 'tasteid', 'tinkering', 'tracking', 'veterinary', 'swordsmanship', 'macefighting', 'fencing', 'wrestling', 'lumberjacking', 'mining', 'meditation', ! 'stealth', 'removetraps', 'necromancy', 'focus', 'chivalry' ] skillnamesids = { --- 212,216 ---- 'taming', 'tasteid', 'tinkering', 'tracking', 'veterinary', 'swordsmanship', 'macefighting', 'fencing', 'wrestling', 'lumberjacking', 'mining', 'meditation', ! 'stealth', 'removetraps', 'necromancy', 'focus', 'chivalry', 'ninjitsu', 'bushido' ] skillnamesids = { *************** *** 264,268 **** 'necromancy' : NECROMANCY, 'focus' : FOCUS, ! 'chivalry' : CHIVALRY } --- 266,272 ---- 'necromancy' : NECROMANCY, 'focus' : FOCUS, ! 'chivalry' : CHIVALRY, ! 'ninjitsu' : NINJITSU, ! 'bushido' : BUSHIDO } |
From: Richard M. <dr...@us...> - 2004-10-07 22:46:21
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22558 Modified Files: clothes.xml Log Message: Samurai clothes! Index: clothes.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/clothes.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** clothes.xml 16 Sep 2004 18:44:16 -0000 1.17 --- clothes.xml 7 Oct 2004 22:46:05 -0000 1.18 *************** *** 639,641 **** --- 639,723 ---- </item> + <!-- Samurai Empire --> + + <!-- Male Kimono --> + <item id="2782"> + <category>Clothes\Samurai\Male Kimono</category> + <id>0x2782</id> + </item> + <item id="27cd" inherit="2782"> + <id>0x27cd</id> + <baseid>2782</baseid> + </item> + + <!-- Female Kimono --> + <item id="2783"> + <category>Clothes\Samurai\Female Kimono</category> + <id>0x2783</id> + </item> + <item id="27ce" inherit="2783"> + <id>0x27ce</id> + <baseid>2783</baseid> + </item> + + <!-- Kamishimo --> + <item id="2799"> + <category>Clothes\Samurai\Kamishimo</category> + <id>0x2799</id> + </item> + <item id="27e4" inherit="2799"> + <id>0x27e4</id> + <baseid>2799</baseid> + </item> + + <!-- Hakama --> + <item id="279a"> + <category>Clothes\Samurai\Hakama</category> + <id>0x279a</id> + </item> + <item id="27e5" inherit="279a"> + <id>0x27e5</id> + <baseid>279a</baseid> + </item> + + <!-- Tattsuke-Hakama --> + <item id="279b"> + <category>Clothes\Samurai\Tattsuke-Hakama</category> + <id>0x279b</id> + </item> + <item id="27e6" inherit="279b"> + <id>0x27e6</id> + <baseid>279b</baseid> + </item> + + <!-- Tattsuke-Shita --> + <item id="279c"> + <category>Clothes\Samurai\Tattsuke-Shita</category> + <id>0x279c</id> + </item> + <item id="27e7" inherit="279c"> + <id>0x27e7</id> + <baseid>279c</baseid> + </item> + + <!-- Obi --> + <item id="27a0"> + <category>Clothes\Samurai\Obi</category> + <id>0x27a0</id> + </item> + <item id="27eb" inherit="27a0"> + <id>0x27eb</id> + <baseid>27a0</baseid> + </item> + + <!-- Jin-Baori --> + <item id="27a1"> + <category>Clothes\Samurai\Jin-Baori</category> + <id>0x27a1</id> + </item> + <item id="27ec" inherit="27a1"> + <id>0x27ec</id> + <baseid>27a1</baseid> + </item> + </definitions> |
From: Richard M. <dr...@us...> - 2004-10-07 22:44:54
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22280/samurai Modified Files: index.xml Added Files: kasa.xml Log Message: Damn hats! Index: index.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai/index.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.xml 7 Oct 2004 22:33:21 -0000 1.2 --- index.xml 7 Oct 2004 22:44:44 -0000 1.3 *************** *** 9,12 **** --- 9,14 ---- <definitions> + <include file="definitions/items/armory/samurai/kasa.xml" /> + <include file="definitions/items/armory/samurai/cloth_ninja_hood.xml" /> <include file="definitions/items/armory/samurai/cloth_ninja_jacket.xml" /> --- NEW FILE: kasa.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Kasa --> <item id="2798"> <category>Clothes\Samurai\Headwear\Kasa</category> <category>Armor\Samurai\Headwear\Kasa</category> <id>0x2798</id> <dye /> <durability><random min="20" max="25" /></durability> <buyprice>25</buyprice> <sellprice>12</sellprice> <weight>1.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <!-- Properties --> <intproperty name="req_strength" value="10" /> <intproperty name="res_fire" value="5" /> <intproperty name="res_cold" value="9" /> <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> <allowmeditation /> </item> <item id="27e3" inherit="2798"> <id>0x27e3</id> <baseid>2798</baseid> <category>Clothes\Samurai\Headwear\Kasa 2</category> <category>Armor\Samurai\Headwear\Kasa 2</category> </item> </definitions> |
From: Richard M. <dr...@us...> - 2004-10-07 22:33:40
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20044 Modified Files: index.xml Added Files: cloth_ninja_hood.xml cloth_ninja_jacket.xml leather_jingasa.xml mail_hatsuburi.xml plate_hatsuburi.xml plate_jingasa.xml Log Message: Rest of the armor IDs --- NEW FILE: plate_hatsuburi.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Plate Hatsuburi --> <item id="2775"> <id>0x2775</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Plate\Hatsuburi</category> <!-- Properties --> <tag name="resname" value="iron" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27c0" inherit="2775"> <id>0x27c0</id> <baseid>2775</baseid> <category>Armor\Base\Samurai\Plate\Hatsuburi 2</category> </item> </definitions> Index: index.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/samurai/index.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.xml 2 Oct 2004 03:26:29 -0000 1.1 --- index.xml 7 Oct 2004 22:33:21 -0000 1.2 *************** *** 9,13 **** --- 9,42 ---- <definitions> + <include file="definitions/items/armory/samurai/cloth_ninja_hood.xml" /> + <include file="definitions/items/armory/samurai/cloth_ninja_jacket.xml" /> + <include file="definitions/items/armory/samurai/leather_do.xml" /> + <include file="definitions/items/armory/samurai/leather_hiadate.xml" /> + <include file="definitions/items/armory/samurai/leather_hiro_sode.xml" /> + <include file="definitions/items/armory/samurai/leather_jingasa.xml" /> + <include file="definitions/items/armory/samurai/leather_mempo.xml" /> + <include file="definitions/items/armory/samurai/leather_ninja_belt.xml" /> + <include file="definitions/items/armory/samurai/leather_ninja_mitts.xml" /> + <include file="definitions/items/armory/samurai/leather_ninja_hood.xml" /> + <include file="definitions/items/armory/samurai/leather_ninja_jackte.xml" /> + <include file="definitions/items/armory/samurai/leather_ninja_pants.xml" /> + <include file="definitions/items/armory/samurai/leather_suneate.xml" /> + + <include file="definitions/items/armory/samurai/mail_hatsuburi.xml" /> + + <include file="definitions/items/armory/samurai/plate_do.xml" /> + <include file="definitions/items/armory/samurai/plate_hatsuburi.xml" /> + <include file="definitions/items/armory/samurai/plate_hiadate.xml" /> + <include file="definitions/items/armory/samurai/plate_hiro_sode.xml" /> + <include file="definitions/items/armory/samurai/plate_jingasa.xml" /> + <include file="definitions/items/armory/samurai/plate_mempo.xml" /> + <include file="definitions/items/armory/samurai/plate_suneate.xml" /> + + <include file="definitions/items/armory/samurai/studded_leather_do.xml" /> + <include file="definitions/items/armory/samurai/studded_leather_hiadate.xml" /> + <include file="definitions/items/armory/samurai/studded_leather_hiro_sode.xml" /> + <include file="definitions/items/armory/samurai/studded_leather_mempo.xml" /> + <include file="definitions/items/armory/samurai/studded_leather_suneate.xml" /> </definitions> --- NEW FILE: mail_hatsuburi.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Mail Hatsuburi --> <item id="2774"> <id>0x2774</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Mail\Hatsuburi</category> <!-- Properties --> <tag name="resname" value="iron" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27bf" inherit="2774"> <id>0x27bf</id> <baseid>2774</baseid> <category>Armor\Base\Samurai\Mail\Hatsuburi 2</category> </item> </definitions> --- NEW FILE: cloth_ninja_jacket.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Cloth Nina Jacket --> <item id="2794"> <id>0x2794</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Cloth\Nina Jacket</category> <!-- Properties --> <tag name="resname" value="leather" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27df" inherit="2794"> <id>0x27df</id> <baseid>2794</baseid> <category>Armor\Base\Samurai\Cloth\Nina Jacket 2</category> </item> </definitions> --- NEW FILE: plate_jingasa.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Plate Jingasa 1 --> <item id="2777"> <id>0x2777</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Shields\Plate\Jingasa 1-1</category> <!-- Properties --> <tag name="resname" value="iron" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27c2" inherit="2777"> <id>0x27c2</id> <baseid>2777</baseid> <category>Armor\Base\Samurai\Shields\Plate\Jingasa 1-2</category> </item> <!-- Plate Jingasa 2 --> <item id="2781"> <id>0x2781</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Shields\Plate\Jingasa 2-1</category> <!-- Properties --> <tag name="resname" value="iron" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27cc" inherit="2781"> <id>0x27cc</id> <baseid>2781</baseid> <category>Armor\Base\Samurai\Shields\Plate\Jingasa 2-2</category> </item> <!-- Plate Jingasa 3 --> <item id="2784"> <id>0x2784</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Shields\Plate\Jingasa 3-1</category> <!-- Properties --> <tag name="resname" value="iron" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27cf" inherit="2784"> <id>0x27cf</id> <baseid>2784</baseid> <category>Armor\Base\Samurai\Shields\Plate\Jingasa 3-2</category> </item> </definitions> --- NEW FILE: leather_jingasa.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Leather Jingasa --> <item id="2776"> <id>0x2776</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Shields\Leather\Jingasa</category> <!-- Properties --> <tag name="resname" value="leather" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27c1" inherit="2776"> <id>0x27c1</id> <baseid>2776</baseid> <category>Armor\Base\Samurai\Shields\Plate\Jingasa 2</category> </item> </definitions> --- NEW FILE: cloth_ninja_hood.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Cloth Nina Hood --> <item id="278f"> <id>0x278f</id> <decay /> <nodye /> <durability><random min="60" max="100" /></durability> <smelt>20</smelt> <weight>10.0</weight> <type>1009</type> <basescripts>equipment</basescripts> <category>Armor\Base\Samurai\Cloth\Nina Hood</category> <!-- Properties --> <tag name="resname" value="leather" /> <intproperty name="req_strength" value="95" /> <intproperty name="res_physical" value="3" /> <intproperty name="res_fire" value="3" /> <intproperty name="res_cold" value="3" /> <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> </item> <item id="27da" inherit="278f"> <id>0x27da</id> <baseid>278f</baseid> <category>Armor\Base\Samurai\Cloth\Nina Hood 2</category> </item> </definitions> |
From: Richard M. <dr...@us...> - 2004-10-07 22:32:09
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19412 Modified Files: index.xml Log Message: Updates. WARNING: SAMURAI WEAPONS ARE NOT SORTED OR ADJUSTED FOR STATS YET! THIS IS AN ID ADDITION ONLY FOR NOW! :P Index: index.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/index.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.xml 2 Oct 2004 03:38:42 -0000 1.1 --- index.xml 7 Oct 2004 22:31:23 -0000 1.2 *************** *** 10,72 **** <!-- Archery --> ! <include file="definitions/items/weaponry/archery/bow.xml"/> ! <include file="definitions/items/weaponry/archery/composite_bow.xml"/> ! <include file="definitions/items/weaponry/archery/crossbow.xml"/> ! <include file="definitions/items/weaponry/archery/heavy_crossbow.xml"/> ! <include file="definitions/items/weaponry/archery/repeating_crossbow.xml"/> <!-- Fencing --> ! <include file="definitions/items/weaponry/fencing/dagger.xml"/> ! <include file="definitions/items/weaponry/fencing/double_bladed_staff.xml"/> ! <include file="definitions/items/weaponry/fencing/kryss.xml"/> ! <include file="definitions/items/weaponry/fencing/lance.xml"/> ! <include file="definitions/items/weaponry/fencing/pike.xml"/> ! <include file="definitions/items/weaponry/fencing/pitchfork.xml"/> ! <include file="definitions/items/weaponry/fencing/short_spear.xml"/> ! <include file="definitions/items/weaponry/fencing/spear.xml"/> ! <include file="definitions/items/weaponry/fencing/war_fork.xml"/> <!-- Macefighting --> ! <include file="definitions/items/weaponry/macefighting/black_staff.xml"/> ! <include file="definitions/items/weaponry/macefighting/club.xml"/> ! <include file="definitions/items/weaponry/macefighting/gnarled_staff.xml"/> ! <include file="definitions/items/weaponry/macefighting/hammer_pick.xml"/> ! <include file="definitions/items/weaponry/macefighting/mace.xml"/> ! <include file="definitions/items/weaponry/macefighting/maul.xml"/> ! <include file="definitions/items/weaponry/macefighting/quarter_staff.xml"/> ! <include file="definitions/items/weaponry/macefighting/scepter.xml"/> ! <include file="definitions/items/weaponry/macefighting/shepherds_crook.xml"/> ! <include file="definitions/items/weaponry/macefighting/sledge_hammer.xml"/> ! <include file="definitions/items/weaponry/macefighting/smithing_hammer.xml"/> ! <include file="definitions/items/weaponry/macefighting/war_axe.xml"/> ! <include file="definitions/items/weaponry/macefighting/war_hammer.xml"/> ! <include file="definitions/items/weaponry/macefighting/war_mace.xml"/> <!-- Swordsmanship --> ! <include file="definitions/items/weaponry/swordsmanship/axe.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/bardiche.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/battle_axe.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/bladed_staff.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/bone_harvester.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/broadsword.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/butcher_knife.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/cleaver.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/crescent_blade.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/cutlass.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/double_axe.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/executioners_axe.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/halberd.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/hatchet.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/katana.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/large_battle_axe.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/long_sword.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/longsword.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/paladin_sword.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/pickaxe.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/scimitar.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/scythe.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/skinning_knife.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/two_handed_axe.xml"/> ! <include file="definitions/items/weaponry/swordsmanship/viking_sword.xml"/> </definitions> --- 10,26 ---- <!-- Archery --> ! <include file="definitions/items/weaponry/archery/index.xml"/> <!-- Fencing --> ! <include file="definitions/items/weaponry/fencing/index.xml"/> <!-- Macefighting --> ! <include file="definitions/items/weaponry/macefighting/index.xml"/> <!-- Swordsmanship --> ! <include file="definitions/items/weaponry/swordsmanship/index.xml"/> ! ! <!-- Samurai Empire New Weapons --> ! <include file="definitions/items/weaponry/samurai/index.xml"/> </definitions> |
From: Richard M. <dr...@us...> - 2004-10-07 22:31:40
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19412/swordsmanship Added Files: index.xml Log Message: Updates. WARNING: SAMURAI WEAPONS ARE NOT SORTED OR ADJUSTED FOR STATS YET! THIS IS AN ID ADDITION ONLY FOR NOW! :P --- NEW FILE: index.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Swordsmanship --> <include file="definitions/items/weaponry/swordsmanship/axe.xml"/> <include file="definitions/items/weaponry/swordsmanship/bardiche.xml"/> <include file="definitions/items/weaponry/swordsmanship/battle_axe.xml"/> <include file="definitions/items/weaponry/swordsmanship/bladed_staff.xml"/> <include file="definitions/items/weaponry/swordsmanship/bone_harvester.xml"/> <include file="definitions/items/weaponry/swordsmanship/broadsword.xml"/> <include file="definitions/items/weaponry/swordsmanship/butcher_knife.xml"/> <include file="definitions/items/weaponry/swordsmanship/cleaver.xml"/> <include file="definitions/items/weaponry/swordsmanship/crescent_blade.xml"/> <include file="definitions/items/weaponry/swordsmanship/cutlass.xml"/> <include file="definitions/items/weaponry/swordsmanship/double_axe.xml"/> <include file="definitions/items/weaponry/swordsmanship/executioners_axe.xml"/> <include file="definitions/items/weaponry/swordsmanship/halberd.xml"/> <include file="definitions/items/weaponry/swordsmanship/hatchet.xml"/> <include file="definitions/items/weaponry/swordsmanship/katana.xml"/> <include file="definitions/items/weaponry/swordsmanship/large_battle_axe.xml"/> <include file="definitions/items/weaponry/swordsmanship/long_sword.xml"/> <include file="definitions/items/weaponry/swordsmanship/longsword.xml"/> <include file="definitions/items/weaponry/swordsmanship/paladin_sword.xml"/> <include file="definitions/items/weaponry/swordsmanship/pickaxe.xml"/> <include file="definitions/items/weaponry/swordsmanship/scimitar.xml"/> <include file="definitions/items/weaponry/swordsmanship/scythe.xml"/> <include file="definitions/items/weaponry/swordsmanship/skinning_knife.xml"/> <include file="definitions/items/weaponry/swordsmanship/two_handed_axe.xml"/> <include file="definitions/items/weaponry/swordsmanship/viking_sword.xml"/> </definitions> |
From: Richard M. <dr...@us...> - 2004-10-07 22:31:38
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/samurai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19412/samurai Added Files: bokuto.xml daisho.xml fukiya.xml index.xml kama.xml lajatang.xml no-dachi.xml nunchaku.xml sai.xml shuriken.xml tekagi.xml tessen.xml tetsubo.xml wakizashi.xml yumi.xml Log Message: Updates. WARNING: SAMURAI WEAPONS ARE NOT SORTED OR ADJUSTED FOR STATS YET! THIS IS AN ID ADDITION ONLY FOR NOW! :P --- NEW FILE: shuriken.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing ??? --> <!-- Shuriken --> <item id="27ac"> <id>0x27ac</id> <twohanded /> <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\Shuriken</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> <item id="27f7" inherit="27ac"> <id>0x27f7</id> <baseid>27ac</baseid> <category>Weapons\Samurai\Shuriken 2</category> </item> </definitions> --- NEW FILE: index.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Unsorted Classes --> <include file="definitions/items/weaponry/samurai/bokuto.xml"/> <include file="definitions/items/weaponry/samurai/daisho.xml"/> <include file="definitions/items/weaponry/samurai/fukiya.xml"/> <include file="definitions/items/weaponry/samurai/kama.xml"/> <include file="definitions/items/weaponry/samurai/lajatang.xml"/> <include file="definitions/items/weaponry/samurai/no-dachi.xml"/> <include file="definitions/items/weaponry/samurai/nunchaku.xml"/> <include file="definitions/items/weaponry/samurai/sai.xml"/> <include file="definitions/items/weaponry/samurai/shuriken.xml"/> <include file="definitions/items/weaponry/samurai/tekagi.xml"/> <include file="definitions/items/weaponry/samurai/tessen.xml"/> <include file="definitions/items/weaponry/samurai/tetsubo.xml"/> <include file="definitions/items/weaponry/samurai/wakizashi.xml"/> <include file="definitions/items/weaponry/samurai/yumi.xml"/> <!-- Archery --> <!-- Fencing --> <!-- Mace Fighting --> <!-- Swordsmanship --> <!-- Wrestling --> <!-- Boshido --> <!-- Ninjitsu --> </definitions> --- NEW FILE: bokuto.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing Swords --> <!-- Bokuto --> <item id="27a8"> <id>0x27a8</id> <twohanded /> <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\Bokuto</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> <item id="27f3" inherit="27a8"> <id>0x27f3</id> <baseid>27a8</baseid> <category>Weapons\Samurai\Bokuto 2</category> </item> </definitions> --- NEW FILE: wakizashi.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Wakizashi --> <item id="27a4"> <id>0x27a4</id> <!--<twohanded />--> <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\Wakizashi</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> <item id="27ef" inherit="27a4"> <id>0x27ef</id> <baseid>27a4</baseid> <category>Weapons\Samurai\Wakizashi 2</category> </item> </definitions> --- NEW FILE: no-dachi.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- No-Dachi --> <item id="27a2"> <id>0x27a2</id> <!--<twohanded />--> <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\No-Dachi</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> <item id="27ed" inherit="27a2"> <id>0x27ed</id> <baseid>27a2</baseid> <category>Weapons\Samurai\No-Dachi 2</category> </item> </definitions> --- NEW FILE: lajatang.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing Fencing --> <!-- Lajatang --> <item id="27a7"> <id>0x27a7</id> <twohanded /> <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\Lajatang</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> <item id="27f2" inherit="27a7"> <id>0x27f2</id> <baseid>27a7</baseid> <category>Weapons\Samurai\Lajatang 2</category> </item> </definitions> --- NEW FILE: tetsubo.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing Mace Fighting --> <!-- Tetsubo --> <item id="27a6"> <id>0x27a6</id> <twohanded /> <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\Tetsubo</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> <item id="27f1" inherit="27a6"> <id>0x27f1</id> <baseid>27a6</baseid> <category>Weapons\Samurai\Tetsubo 2</category> </item> </definitions> --- NEW FILE: tessen.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Tessen --> <item id="27a3"> <id>0x27a3</id> <!--<twohanded />--> <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\Tessen</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> <item id="27ee" inherit="27a3"> <id>0x27ee</id> <baseid>27a3</baseid> <category>Weapons\Samurai\Tessen 2</category> </item> </definitions> --- NEW FILE: tekagi.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing Wrestling --> <!-- Tekagi --> <item id="27ab"> <id>0x27ab</id> <twohanded /> <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\Tekagi</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> <item id="27f6" inherit="27ab"> <id>0x27f6</id> <baseid>27ab</baseid> <category>Weapons\Samurai\Tekagi 2</category> </item> </definitions> --- NEW FILE: fukiya.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing Macefighting --> <!-- Fukiya --> <item id="27aa"> <id>0x27aa</id> <twohanded /> <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\Fukiya</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> <item id="27f5" inherit="27aa"> <id>0x27f5</id> <baseid>27aa</baseid> <category>Weapons\Samurai\Fukiya 2</category> </item> </definitions> --- NEW FILE: yumi.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing Archery --> <!-- Yumi --> <item id="27a5"> <id>0x27a5</id> <twohanded /> <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> <item id="27f0" inherit="27a5"> <id>0x27f0</id> <baseid>27a5</baseid> <category>Weapons\Samurai\Yumi 2</category> </item> </definitions> --- NEW FILE: sai.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing ??? --> <!-- Sai --> <item id="27af"> <id>0x27af</id> <twohanded /> <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\Sai</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> <item id="27fa" inherit="27af"> <id>0x27fa</id> <baseid>27af</baseid> <category>Weapons\Samurai\Sai 2</category> </item> </definitions> --- NEW FILE: daisho.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing Swords --> <!-- Daisho --> <item id="27a9"> <id>0x27a9</id> <twohanded /> <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\Daisho</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> <item id="27f4" inherit="27a9"> <id>0x27f4</id> <baseid>27a9</baseid> <category>Weapons\Samurai\Daisho 2</category> </item> </definitions> --- NEW FILE: nunchaku.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing ??? --> <!-- Nunchaku --> <item id="27ae"> <id>0x27ae</id> <twohanded /> <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\Nunchaku</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> <item id="27f9" inherit="27ae"> <id>0x27f9</id> <baseid>27ae</baseid> <category>Weapons\Samurai\Nunchaku 2</category> </item> </definitions> --- NEW FILE: kama.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | Revised by: * ( ( ;._ \\ | Last modification: *=======================================================*/ --> <definitions> <!-- Guessing ??? --> <!-- Kama --> <item id="27ad"> <id>0x27ad</id> <twohanded /> <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\Kama</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> <item id="27f8" inherit="27ad"> <id>0x27f8</id> <baseid>27ad</baseid> <category>Weapons\Samurai\Kama 2</category> </item> </definitions> |