|
From: Correa <thi...@us...> - 2004-08-05 01:48:47
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25776 Modified Files: skills.cpp targetrequests.cpp targetrequests.h Log Message: Removed some skill leftover stuff, if something stopped working it's because it was missing in python, and should be scripted. Index: targetrequests.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** targetrequests.cpp 4 Aug 2004 23:17:37 -0000 1.101 --- targetrequests.cpp 5 Aug 2004 01:48:38 -0000 1.102 *************** *** 47,156 **** #include <math.h> - bool cSkStealing::responsed( cUOSocket* socket, cUORxTarget* target ) - { - int i, skill; - char temp2[512]; - char temp[512]; - tile_st tile; - P_PLAYER pc_currchar = socket->player(); - int cansteal = QMAX( 1, pc_currchar->skillValue( STEALING ) / 10 ); - cansteal = cansteal * 10; - - if ( isCharSerial( target->serial() ) ) - { - Skills::instance()->RandomSteal( socket, target->serial() ); - return true; - } - - const P_ITEM pi = FindItemBySerial( target->serial() ); - if ( !pi ) - { - socket->sysMessage( tr( "You cannot steal that." ) ); - return true; - } - - if ( pi->layer() != 0 // no stealing for items on layers other than 0 (equipped!) , - || pi->newbie() // newbie items, - || pi->isInWorld() ) // and items not being in containers allowed ! - { - socket->sysMessage( tr( "You cannot steal that." ) ); - return true; - } - if ( ( pi->totalweight() ) > cansteal ) // LB, bugfix, (no weight check) - { - socket->sysMessage( tr( "That is too heavy." ) ); - return true; - } - - P_CHAR pc_npc = pi->getOutmostChar(); - - /* if (pc_npc->npcaitype() == 17) - { - socket->sysMessage( tr("You cannot steal that.") ); - return true; - }*/ - - if ( pc_npc == pc_currchar ) - { - socket->sysMessage( tr( "You catch yourself red handed." ) ); - return true; - } - - skill = pc_currchar->checkSkill( STEALING, 0, 999 ); - if ( pc_currchar->inRange( pc_npc, 1 ) ) - { - if ( skill ) - { - P_ITEM pi_pack = pc_currchar->getBackpack(); - if ( pi_pack == NULL ) - return true; - pi_pack->addItem( pi ); - socket->sysMessage( tr( "You successfully steal that item." ) ); - pi->update(); - } - else - socket->sysMessage( tr( "You failed to steal that item." ) ); - - if ( ( ( !( skill ) ) && ( rand() % 16 == 7 ) ) || ( pc_currchar->skillValue( STEALING ) < rand() % 1001 ) ) - { - socket->sysMessage( tr( "You have been cought!" ) ); - - if ( pc_npc != NULL ) //lb - { - if ( pc_npc->objectType() == enNPC ) - pc_npc->talk( tr( "Guards!! A thief is amoung us!" ), -1, 0x09 ); - - pc_currchar->isCriminal(); - - if ( pc_npc->notoriety( pc_currchar ) == 0x01 ) - { - pc_currchar->makeCriminal(); - } - - if ( !pi->name().isNull() ) - { - sprintf( ( char * ) temp, tr( "You notice %1 trying to steal %2 from you!" ).arg( pc_currchar->name() ).arg( pi->name() ) ); - sprintf( ( char * ) temp2, tr( "You notice %1 trying to steal %2 from %3!" ).arg( pc_currchar->name() ).arg( pi->name() ).arg( pc_npc->name() ) ); - } - else - { - tile = TileCache::instance()->getTile( pi->id() ); - sprintf( ( char * ) temp, tr( "You notice %1 trying to steal %2 from you!" ).arg( pc_currchar->name() ).arg( ( char * ) tile.name ) ); - sprintf( ( char * ) temp2, tr( "You notice %1 trying to steal %2 from %3!" ).arg( pc_currchar->name() ).arg( ( char * ) tile.name ).arg( pc_npc->name() ) ); - } - socket->sysMessage( ( char * ) temp ); //lb - } - for ( cUOSocket*mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() ) - { - if ( mSock != socket && mSock->player() && mSock->player()->inRange( pc_currchar, mSock->viewRange() ) && ( rand() % 10 + 10 == 17 || ( rand() % 2 == 1 && mSock->player()->intelligence() >= pc_currchar->intelligence() ) ) ) - mSock->sysMessage( temp2 ); - } - } - } - else - socket->sysMessage( tr( "You are too far away to steal that item." ) ); - return true; - } - bool cSetTarget::responsed( cUOSocket* socket, cUORxTarget* target ) { --- 47,50 ---- Index: targetrequests.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** targetrequests.h 9 Jul 2004 07:40:59 -0000 1.71 --- targetrequests.h 5 Aug 2004 01:48:38 -0000 1.72 *************** *** 43,150 **** #include "ai/ai.h" - // Stealing - class cSkStealing : public cTargetRequest - { - public: - bool cSkStealing::responsed( cUOSocket* socket, cUORxTarget* target ); - }; - - - // Forensics Evaluation - class cSkForensics : public cTargetRequest - { - public: - virtual bool responsed( cUOSocket* socket, cUORxTarget* target ) - { - P_ITEM pi = FindItemBySerial( target->serial() ); - P_PLAYER pc_currchar = socket->player(); - - if ( !pi || !pi->corpse() ) - { - socket->sysMessage( tr( "That does not appear to be a corpse." ) ); - return true; - } - - cCorpse* corpse = dynamic_cast<cCorpse*>( pi ); - if ( !corpse ) - return true; - - unsigned int currentTime = Server::instance()->time(); - unsigned int age = currentTime - corpse->murderTime(); - P_CHAR murderer = FindCharBySerial(corpse->murderer()); - QString murderername = QString::null; - - if (murderer) { - murderername = murderer->name(); - } - - if ( pc_currchar->isGM() ) - { - socket->sysMessage( tr( "The %1 is %2 seconds old and the killer was %3." ).arg( corpse->name() ).arg( age ).arg( murderername ) ); - } - else - { - if ( !pc_currchar->checkSkill( FORENSICS, 0, 500 ) ) - socket->sysMessage( tr( "You are not certain about the corpse." ) ); - else - { - if ( age > 180 ) - socket->sysMessage( tr( "The %1 is many many seconds old." ).arg( corpse->name() ) ); - else if ( age > 60 ) - socket->sysMessage( tr( "The %1 is many seconds old." ).arg( corpse->name() ) ); - else if ( age <= 60 ) - socket->sysMessage( tr( "The %1 is few seconds old." ).arg( corpse->name() ) ); - - if ( !pc_currchar->checkSkill( FORENSICS, 500, 1000, false ) || murderername.isEmpty() ) - socket->sysMessage( tr( "You can't say who was the killer." ) ); - else - { - socket->sysMessage( tr( "The killer was %1." ).arg( murderername ) ); - } - } - } - return true; - } - }; - - - // Poisoning - class cSkPoisoning : public cTargetRequest - { - bool poisonSelected; - P_ITEM pPoison; - public: - cSkPoisoning() : poisonSelected( false ), pPoison( 0 ) - { - } - - bool selectPoison( cUOSocket* socket, cUORxTarget* target ) - { - pPoison = FindItemBySerial( target->serial() ); - if ( !pPoison || pPoison->type() != 19 || pPoison->type() != 6 ) - { - socket->sysMessage( tr( "That is not a valid poison" ) ); - return true; - } - poisonSelected = true; - return false; // Resend the target request - } - - bool poisonItem( cUOSocket* socket, cUORxTarget* target ) - { - Q_UNUSED( socket ); - Q_UNUSED( target ); - return true; - } - - virtual bool responsed( cUOSocket* socket, cUORxTarget* target ) - { - if ( poisonSelected ) - return poisonItem( socket, target ); - else - return selectPoison( socket, target ); - } - }; - class cKillTarget : public cTargetRequest { --- 43,46 ---- Index: skills.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v retrieving revision 1.228 retrieving revision 1.229 diff -C2 -d -r1.228 -r1.229 *** skills.cpp 4 Aug 2004 23:17:36 -0000 1.228 --- skills.cpp 5 Aug 2004 01:48:38 -0000 1.229 *************** *** 95,119 **** switch ( id ) { - case STEALING: - if ( !Config::instance()->stealingEnabled() ) - { - socket->sysMessage( tr( "That skill has been disabled." ) ); - return; - } - - message = tr( "What do you wish to steal?" ); - targetRequest = new cSkStealing; - break; - case TRACKING: - trackingMenu( socket ); - break; - case FORENSICS: - message = tr( "What corpse do you want to examine?" ); - targetRequest = new cSkForensics; - break; - case POISONING: - message = tr( "What poison do you want to apply?" ); - targetRequest = new cSkPoisoning; - break; case MEDITATION: Skills::instance()->Meditation( socket ); --- 95,98 ---- |
