wpdev-commits Mailing List for Wolfpack Emu (Page 165)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: <as...@pr...> - 2004-02-01 02:44:46
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8656 Modified Files: world.cpp Log Message: this throw could be dangerous, too. fixed. Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** world.cpp 30 Jan 2004 03:21:39 -0000 1.57 --- world.cpp 30 Jan 2004 09:18:05 -0000 1.58 *************** *** 839,852 **** cDBResult res = persistentBroker->query( QString( "SELECT value FROM settings WHERE option = '%1'" ).arg( persistentBroker->quoteString( name ) ) ); - if( !res.isValid() ) - throw persistentBroker->lastError(); - QString sql; ! if( !res.fetchrow() ) { sql = "INSERT INTO settings VALUES('%1','%2')"; sql = sql.arg( persistentBroker->quoteString( name ) ).arg( persistentBroker->quoteString( value ) ); - } else --- 839,848 ---- cDBResult res = persistentBroker->query( QString( "SELECT value FROM settings WHERE option = '%1'" ).arg( persistentBroker->quoteString( name ) ) ); QString sql; ! if( !res.fetchrow() || !res.isValid() ) { sql = "INSERT INTO settings VALUES('%1','%2')"; sql = sql.arg( persistentBroker->quoteString( name ) ).arg( persistentBroker->quoteString( value ) ); } else |
|
From: <dar...@pr...> - 2004-02-01 02:20:28
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10457/network Modified Files: uosocket.cpp Log Message: Wrong id in the creature list. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.306 retrieving revision 1.307 diff -C2 -d -r1.306 -r1.307 *** uosocket.cpp 30 Jan 2004 18:07:38 -0000 1.306 --- uosocket.cpp 30 Jan 2004 22:51:32 -0000 1.307 *************** *** 2147,2151 **** sendStats.setSex( pChar->gender() ); sendStats.setPets( _player->pets().size() ); ! sendStats.setMaxPets( 0xFF ); sendStats.setStatCap( SrvParams->statcap() ); } --- 2147,2151 ---- sendStats.setSex( pChar->gender() ); sendStats.setPets( _player->pets().size() ); ! sendStats.setMaxPets( 5 ); sendStats.setStatCap( SrvParams->statcap() ); } |
|
From: <dar...@pr...> - 2004-02-01 02:00:21
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10457 Modified Files: basechar.cpp console_win.cpp npc.cpp Log Message: Wrong id in the creature list. Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** basechar.cpp 30 Jan 2004 22:11:52 -0000 1.55 --- basechar.cpp 30 Jan 2004 22:51:32 -0000 1.56 *************** *** 1773,1777 **** switch( bodyID_ ) { - case 0x0034: case 0x004E: case 0x0050: --- 1773,1776 ---- *************** *** 1808,1820 **** if( dist( pChar ) < 2 || pChar->isGM() ) { ! if( !pChar->isHuman() ) ! { ! source->sysMessage( tr( "You are unable to ride an animal." ) ); return; } ! if( pChar->isDead() ) ! { ! source->clilocMessage( 0x7A4D5, "", 0x3b2 ); // You can't do that when you're dead. return; } --- 1807,1817 ---- if( dist( pChar ) < 2 || pChar->isGM() ) { ! if (!pChar->isHuman()) { ! source->clilocMessage(1061628); // You can't do that while polymorphed return; } ! if (pChar->isDead()) { ! source->clilocMessage(500949); return; } *************** *** 1824,1830 **** else pChar->mount( dynamic_cast<P_NPC>( this ) ); } - else - source->sysMessage( tr( "This is too far away" ) ); break; --- 1821,1827 ---- else pChar->mount( dynamic_cast<P_NPC>( this ) ); + } else { + source->clilocMessage(500206); } break; Index: console_win.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** console_win.cpp 30 Jan 2004 03:21:39 -0000 1.24 --- console_win.cpp 30 Jan 2004 22:51:32 -0000 1.25 *************** *** 65,68 **** --- 65,69 ---- HWND lblUptime = 0, bmpLogo; HBRUSH hbSeparator = 0, hbBackground = 0; + HWND statusIcon = 0; HWND logWindow = 0; // Log Window HWND inputWindow = 0; // Input Textfield *************** *** 203,208 **** { case WM_CTLCOLORSTATIC: ! if( (HWND)lparam == lblUptime ) ! { dc = (HDC)wparam; --- 204,208 ---- { case WM_CTLCOLORSTATIC: ! if ((HWND)lparam == lblUptime) { dc = (HDC)wparam; *************** *** 213,218 **** //SelectObject( dc, GetStockObject( SYSTEM_FONT ) ); return (LRESULT)hbBackground; } ! return DefWindowProc( hwnd, msg, wparam, lparam ); case WM_COMMAND: --- 213,222 ---- //SelectObject( dc, GetStockObject( SYSTEM_FONT ) ); return (LRESULT)hbBackground; + } else if ((HWND)lparam == statusIcon) { + dc = (HDC)wparam; + SetBkMode( dc, TRANSPARENT ); + return (LRESULT)hbBackground; } ! return DefWindowProc( hwnd, msg, wparam, lparam ); case WM_COMMAND: *************** *** 240,243 **** --- 244,248 ---- qstrcpy(lfont.lfFaceName, "Arial"); lfont.lfQuality = ANTIALIASED_QUALITY; + lfont.lfHeight = -MulDiv(10, GetDeviceCaps(GetWindowDC(hwnd), LOGPIXELSY), 72); arialFont = CreateFontIndirect( &lfont ); *************** *** 273,276 **** --- 278,284 ---- SendMessage( bmpLogo, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hLogo ); + statusIcon = CreateWindow("STATIC", 0, SS_ICON|WS_CHILD|WS_VISIBLE, 380, 15, 0, 0, hwnd, 0, appInstance, 0); + SendMessage(statusIcon, STM_SETIMAGE, IMAGE_ICON, (LPARAM)iconRed); + lblUptime = CreateWindow( "STATIC", 0, WS_CHILD|WS_VISIBLE, 400, 15, 250, 25, hwnd, 0, appInstance, 0 ); SendMessage( lblUptime, WM_SETFONT, (WPARAM)arialFont, 0 ); *************** *** 541,546 **** --- 549,556 ---- if (serverState == RUNNING) { SendMessage(mainWindow, WM_SETICON, ICON_SMALL, (WPARAM)iconGreen); + SendMessage(statusIcon, STM_SETIMAGE, IMAGE_ICON, (LPARAM)iconGreen); } else { SendMessage(mainWindow, WM_SETICON, ICON_SMALL, (WPARAM)iconRed); + SendMessage(statusIcon, STM_SETIMAGE, IMAGE_ICON, (LPARAM)iconRed); } } Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** npc.cpp 30 Jan 2004 20:29:31 -0000 1.56 --- npc.cpp 30 Jan 2004 22:51:32 -0000 1.57 *************** *** 366,370 **** if( mSock->player() && ( mSock->player()->dist( this ) < 18 ) ) { ! mSock->clilocMessage( MsgID, 0, color, 3, this ); } } --- 366,370 ---- if( mSock->player() && ( mSock->player()->dist( this ) < 18 ) ) { ! mSock->clilocMessage( MsgID, params, color, 3, this ); } } |
|
From: <dar...@pr...> - 2004-02-01 01:33:43
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11193/network Modified Files: uosocket.cpp uotxpackets.h Log Message: Changed notoriety behaviour and added an invul flagging. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.310 retrieving revision 1.311 diff -C2 -d -r1.310 -r1.311 *** uosocket.cpp 1 Feb 2004 01:26:01 -0000 1.310 --- uosocket.cpp 1 Feb 2004 01:31:56 -0000 1.311 *************** *** 1184,1191 **** { cUOTxAcceptMove acceptMove; ! acceptMove.setSequence( sequence ); ! send( &acceptMove ); ! _walkSequence = ( sequence < 255 ) ? sequence : 0; } --- 1184,1192 ---- { cUOTxAcceptMove acceptMove; ! acceptMove.setSequence(sequence); ! acceptMove.setHighlight(_player->notority(_player)); ! send(&acceptMove); ! _walkSequence = (sequence < 255) ? sequence : 0; } Index: uotxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** uotxpackets.h 28 Jan 2004 02:18:14 -0000 1.91 --- uotxpackets.h 1 Feb 2004 01:31:56 -0000 1.92 *************** *** 668,671 **** --- 668,674 ---- cUOTxAcceptMove(): cUOPacket( 0x22, 3 ) {} void setSequence( Q_UINT8 data ) { (*this)[1] = data; } + void setHighlight( unsigned char data ) { + (*this)[2] = data; + } }; |
|
From: <dar...@pr...> - 2004-02-01 01:27:52
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6237/network Modified Files: uosocket.cpp Log Message: Changed notoriety behaviour and added an invul flagging. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.309 retrieving revision 1.310 diff -C2 -d -r1.309 -r1.310 *** uosocket.cpp 1 Feb 2004 01:21:27 -0000 1.309 --- uosocket.cpp 1 Feb 2004 01:26:01 -0000 1.310 *************** *** 1231,1234 **** --- 1231,1235 ---- cUOTxDrawChar drawChar; drawChar.fromChar( _player ); + drawChar.setHighlight(_player->notority(_player)); send( &drawChar ); |
|
From: <dar...@pr...> - 2004-02-01 01:23:14
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2434 Modified Files: npc.cpp player.cpp uobject.cpp Log Message: Changed notoriety behaviour and added an invul flagging. Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** npc.cpp 31 Jan 2004 23:55:08 -0000 1.60 --- npc.cpp 1 Feb 2004 01:21:27 -0000 1.61 *************** *** 396,399 **** --- 396,403 ---- UINT8 result; + if (isInvulnerable()) { + return 0; + } + // Check for Guild status + Highlight // UINT8 guildStatus = GuildCompare( this, pChar ); *************** *** 730,734 **** // Invulnerability ! if( isInvulnerable() ) charName.append( tr(" [invul]") ); --- 734,738 ---- // Invulnerability ! if( isInvulnerable() && socket->player()->isGMorCounselor() ) charName.append( tr(" [invul]") ); *************** *** 766,777 **** switch( notority( socket->player() ) ) { ! case 0x01: speechColor = 0x5A; break; //blue ! case 0x02: speechColor = 0x43; break; //green case 0x03: speechColor = 0x3B2; break; //grey ! case 0x05: speechColor = 0x30; break; //orange ! case 0x06: speechColor = 0x26; break; //red default: speechColor = 0x3B2; break; // grey } // Show it to the socket socket->showSpeech( this, charName, speechColor, 3, cUOTxUnicodeSpeech::System ); --- 770,785 ---- switch( notority( socket->player() ) ) { ! case 0x01: speechColor = 0x59; break; //blue ! case 0x02: speechColor = 0x3F; break; //green case 0x03: speechColor = 0x3B2; break; //grey ! case 0x05: speechColor = 0x90; break; //orange ! case 0x06: speechColor = 0x22; break; //red default: speechColor = 0x3B2; break; // grey } + if (isInvulnerable()) { + speechColor = 0x35; + } + // Show it to the socket socket->showSpeech( this, charName, speechColor, 3, cUOTxUnicodeSpeech::System ); Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** player.cpp 31 Jan 2004 23:55:08 -0000 1.60 --- player.cpp 1 Feb 2004 01:21:27 -0000 1.61 *************** *** 353,360 **** --- 353,365 ---- UINT8 result; + if (isInvulnerable()) { + return 0; + } + // Check for Guild status + Highlight // UINT8 guildStatus = GuildCompare( this, pChar ); if( pChar->kills() > SrvParams->maxkills() ) + { result = 0x06; // 6 = Red -> Murderer *************** *** 365,370 **** // result = 0x05; // 5 = Orange -> Enemy Guild ! else if( account_ ) ! { if( isCriminal() ) result = 0x03; --- 370,374 ---- // result = 0x05; // 5 = Orange -> Enemy Guild ! } else if( account_ ) { if( isCriminal() ) result = 0x03; *************** *** 876,887 **** switch( notority( socket->player() ) ) { ! case 0x01: speechColor = 0x5A; break; //blue ! case 0x02: speechColor = 0x43; break; //green case 0x03: speechColor = 0x3B2; break; //grey ! case 0x05: speechColor = 0x30; break; //orange ! case 0x06: speechColor = 0x26; break; //red default: speechColor = 0x3B2; break; // grey } // Show it to the socket socket->showSpeech( this, charName, speechColor, 3, cUOTxUnicodeSpeech::System ); --- 880,895 ---- switch( notority( socket->player() ) ) { ! case 0x01: speechColor = 0x59; break; //blue ! case 0x02: speechColor = 0x3F; break; //green case 0x03: speechColor = 0x3B2; break; //grey ! case 0x05: speechColor = 0x90; break; //orange ! case 0x06: speechColor = 0x22; break; //red default: speechColor = 0x3B2; break; // grey } + if (isInvulnerable()) { + speechColor = 0x35; + } + // Show it to the socket socket->showSpeech( this, charName, speechColor, 3, cUOTxUnicodeSpeech::System ); Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** uobject.cpp 31 Jan 2004 23:55:08 -0000 1.131 --- uobject.cpp 1 Feb 2004 01:21:28 -0000 1.132 *************** *** 448,452 **** else { ! if (Tag->text().isNull()) { Value = "1"; } --- 448,452 ---- else { ! if (Value.isEmpty()) { Value = "1"; } |
|
From: <dar...@pr...> - 2004-02-01 01:23:14
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2434/network Modified Files: uosocket.cpp uotxpackets.cpp Log Message: Changed notoriety behaviour and added an invul flagging. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.308 retrieving revision 1.309 diff -C2 -d -r1.308 -r1.309 *** uosocket.cpp 31 Jan 2004 01:38:29 -0000 1.308 --- uosocket.cpp 1 Feb 2004 01:21:27 -0000 1.309 *************** *** 1802,1813 **** // If we dont set any serial the attack is rejected cUOTxAttackResponse attack; P_CHAR pc_i = FindCharBySerial( packet->serial() ); ! if( !pc_i ) ! { ! send( &attack ); return; } ! /* // No Fighting in jail --- 1802,1813 ---- // If we dont set any serial the attack is rejected cUOTxAttackResponse attack; + attack.setSerial(INVALID_SERIAL); P_CHAR pc_i = FindCharBySerial( packet->serial() ); ! if (!pc_i || pc_i->isInvulnerable()) { ! send(&attack); return; } ! /* // No Fighting in jail Index: uotxpackets.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** uotxpackets.cpp 31 Jan 2004 21:32:42 -0000 1.76 --- uotxpackets.cpp 1 Feb 2004 01:21:27 -0000 1.77 *************** *** 269,272 **** --- 269,276 ---- setFlag( 0x40 ); + if (pChar->isInvulnerable()) { + setFlag(flag() | 0x08); + } + if( pChar->isHidden() ) setFlag( flag() | 0x80 ); *************** *** 312,315 **** --- 316,323 ---- setFlag( 0x40 ); + if (pChar->isInvulnerable()) { + setFlag(flag() | 0x08); + } + if( pChar->isHidden() || ( pChar->objectType() == enPlayer && !dynamic_cast<P_PLAYER>(pChar)->socket() ) ) setFlag( flag() | 0x80 ); *************** *** 376,379 **** --- 384,391 ---- setFlag( 0x40 ); + if (pChar->isInvulnerable()) { + setFlag(flag() | 0x08); + } + if( pChar->isHidden() ) setFlag( flag() | 0x80 ); *************** *** 389,393 **** setZ( pChar->pos().z ); setDirection( pChar->direction() ); ! //void setFlags( Q_UINT8 data ) { rawPacket[ 10 ] = data; } // // 10 = 0=normal, 4=poison, 0x40=attack, 0x80=hidden CHARMODE_WAR } --- 401,405 ---- setZ( pChar->pos().z ); setDirection( pChar->direction() ); ! //void setFlags( Q_UINT8 data ) { rawPacket[ 10 ] = data; } // // 10 = 0=normal, 4=poison, 9 = invul,0x40=attack, 0x80=hidden CHARMODE_WAR } *************** *** 479,482 **** --- 491,498 ---- setFlag( 0x40 ); + if (pChar->isInvulnerable()) { + setFlag(flag() | 0x08); + } + if( pChar->isHidden() ) setFlag( flag() | 0x80 ); |
|
From: <dar...@pr...> - 2004-01-31 23:56:56
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27453 Modified Files: basechar.cpp basechar.h npc.cpp npc.h player.cpp player.h uobject.cpp Log Message: - Killing Vendors would leave their sell containers on the corpse - <.../> wouldn't work... defaulted to value 1 Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** basechar.cpp 31 Jan 2004 01:38:29 -0000 1.58 --- basechar.cpp 31 Jan 2004 23:55:08 -0000 1.59 *************** *** 1659,1672 **** // Would we die? ! if( amount >= hitpoints_ ) ! { ! this->kill(); ! } ! else ! { hitpoints_ -= amount; updateHealth(); ! Combat::playGetHitSoundEffect( this ); ! Combat::playGetHitAnimation( this ); } --- 1659,1669 ---- // Would we die? ! if( amount >= hitpoints_ ) { ! kill(); ! } else { hitpoints_ -= amount; updateHealth(); ! Combat::playGetHitSoundEffect(this); ! Combat::playGetHitAnimation(this); } *************** *** 2054,2055 **** --- 2051,2056 ---- } } + + bool cBaseChar::kill() { + return false; + } Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** basechar.h 31 Jan 2004 01:38:29 -0000 1.41 --- basechar.h 31 Jan 2004 23:55:08 -0000 1.42 *************** *** 102,106 **** // other methods virtual uchar notority( P_CHAR pChar ) = 0; // Gets the notority towards another char ! virtual void kill() = 0; virtual void showName( cUOSocket *socket ) = 0; virtual void fight(P_CHAR pOpponent) = 0; --- 102,111 ---- // other methods virtual uchar notority( P_CHAR pChar ) = 0; // Gets the notority towards another char ! ! /*! ! Kills the character. ! \returns True if the character was really killed and false if nothing changed. ! */ ! virtual bool kill(); virtual void showName( cUOSocket *socket ) = 0; virtual void fight(P_CHAR pOpponent) = 0; Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** npc.cpp 31 Jan 2004 04:36:20 -0000 1.59 --- npc.cpp 31 Jan 2004 23:55:08 -0000 1.60 *************** *** 444,448 **** } ! void cNPC::kill() { changed( TOOLTIP ); --- 444,448 ---- } ! bool cNPC::kill() { changed( TOOLTIP ); *************** *** 451,458 **** if( free ) ! return; if( isDead() || isInvulnerable() ) ! return; // Do this in the beginning --- 451,458 ---- if( free ) ! return false; if( isDead() || isInvulnerable() ) ! return false; // Do this in the beginning *************** *** 620,628 **** P_ITEM pi_j = *iit; ! if( pi_j->layer() != 0x0B && pi_j->layer() != 0x10 ) { // Let's check all items, except HAIRS and BEARD ! if( pi_j->type() == 1 && pi_j->layer() != 0x1A && pi_j->layer() != 0x1B && pi_j->layer() != 0x1C && pi_j->layer() != 0x1D ) ! { // if this is a pack but it's not a VendorContainer(like the buy container) or a bankbox cItem::ContainerContent container = pi_j->content(); cItem::ContainerContent::const_iterator it2 = container.begin(); --- 620,628 ---- P_ITEM pi_j = *iit; ! if( pi_j->layer() <= 0x18 && pi_j->layer() != 0x0B && pi_j->layer() != 0x10 ) { // Let's check all items, except HAIRS and BEARD ! // if this is a pack but it's not a VendorContainer(like the buy container) or a bankbox ! if (pi_j->type() == 1) { cItem::ContainerContent container = pi_j->content(); cItem::ContainerContent::const_iterator it2 = container.begin(); *************** *** 638,664 **** { corpse->addItem( pi_k ); - - // Ripper...so order/chaos shields disappear when on corpse backpack. - if( pi_k->id() == 0x1BC3 || pi_k->id() == 0x1BC4 ) - { - soundEffect( 0x01FE ); - this->effect( 0x372A, 0x09, 0x06 ); - pi_k->remove(); - } } } ! } // if it's a normal item but ( not newbie and not bank items ) ! else if ( !pi_j->newbie() && pi_j->layer() != 0x1D ) ! { ! if( pi_j != pi_backpack ) ! { pi_j->removeFromView(); ! corpse->addEquipment( pi_j->layer(), pi_j->serial() ); ! corpse->addItem( pi_j ); } ! } ! else if( ( pi_j != pi_backpack ) && ( pi_j->layer() != 0x1D ) ) ! { // else if the item is newbie put it into char's backpack pi_j->removeFromView(); --- 638,652 ---- { corpse->addItem( pi_k ); } } ! // if it's a normal item but ( not newbie and not bank items ) ! } else if (!pi_j->newbie()) { ! if (pi_j != pi_backpack) { pi_j->removeFromView(); ! corpse->addEquipment(pi_j->layer(), pi_j->serial()); ! corpse->addItem(pi_j); } ! } else if (pi_j != pi_backpack) { // else if the item is newbie put it into char's backpack pi_j->removeFromView(); *************** *** 691,694 **** --- 679,683 ---- cCharStuff::DeleteChar( this ); + return true; } Index: npc.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** npc.h 31 Jan 2004 04:36:20 -0000 1.31 --- npc.h 31 Jan 2004 23:55:08 -0000 1.32 *************** *** 95,99 **** void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 ); virtual UINT8 notority( P_CHAR pChar = NULL ); ! virtual void kill(); virtual void showName( cUOSocket *socket ); virtual void fight(P_CHAR pOpponent); --- 95,99 ---- void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 ); virtual UINT8 notority( P_CHAR pChar = NULL ); ! virtual bool kill(); virtual void showName( cUOSocket *socket ); virtual void fight(P_CHAR pOpponent); Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** player.cpp 31 Jan 2004 20:27:18 -0000 1.59 --- player.cpp 31 Jan 2004 23:55:08 -0000 1.60 *************** *** 385,389 **** } ! void cPlayer::kill() { changed( TOOLTIP ); --- 385,389 ---- } ! bool cPlayer::kill() { changed( TOOLTIP ); *************** *** 392,396 **** if (free || isDead() || isInvulnerable()) { ! return; } --- 392,396 ---- if (free || isDead() || isInvulnerable()) { ! return false; } *************** *** 650,653 **** --- 650,654 ---- // trigger the event now onDeath(); + return true; } Index: player.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** player.h 25 Nov 2003 19:41:30 -0000 1.26 --- player.h 31 Jan 2004 23:55:08 -0000 1.27 *************** *** 73,77 **** virtual void talk( const QString &message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ); virtual UINT8 notority( P_CHAR pChar ); ! virtual void kill(); virtual void showName( cUOSocket *socket ); virtual void fight(P_CHAR pOpponent); --- 73,77 ---- virtual void talk( const QString &message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ); virtual UINT8 notority( P_CHAR pChar ); ! virtual bool kill(); virtual void showName( cUOSocket *socket ); virtual void fight(P_CHAR pOpponent); Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** uobject.cpp 30 Jan 2004 23:28:42 -0000 1.130 --- uobject.cpp 31 Jan 2004 23:55:08 -0000 1.131 *************** *** 448,451 **** --- 448,455 ---- else { + if (Tag->text().isNull()) { + Value = "1"; + } + cVariant variant( Value ); setProperty( TagName, variant ); |
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1751/vendors Added Files: alchemist.xml architect.xml armorer.xml artist.xml baker.xml banker.xml barber.xml bard.xml blacksmith.xml bowyer.xml butcher.xml carpenter.xml cobbler.xml cook.xml fishermen.xml healer.xml herbalist.xml innkeeper.xml jeweler.xml leatherworker.xml mage.xml provisioner.xml shipwright.xml spinner.xml stablemaster.xml tailor.xml tanner.xml tavernkeeper.xml tinker.xml veterinarian.xml weaponsmith.xml weaver.xml Log Message: Branched out the vendors. --- NEW FILE: alchemist.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A alchemist vendor --> <npc id="alchemist_male"> <inherit>base_male</inherit> <title>the Alchemist</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="e24"> <amount>10</amount> </item> <item id="e25"> <amount>10</amount> </item> <item id="efd"> <amount>10</amount> </item> <item id="e26"> <amount>10</amount> </item> <item id="efe"> <amount>10</amount> </item> <item id="e27"> <amount>10</amount> </item> <item id="eff"> <amount>10</amount> </item> <item id="e28"> <amount>10</amount> </item> <item id="f00"> <amount>10</amount> </item> <item id="e29"> <amount>10</amount> </item> <item id="f01"> <amount>10</amount> </item> <item id="e2a"> <amount>10</amount> </item> <item id="f02"> <amount>10</amount> </item> <item id="e2b"> <amount>10</amount> </item> <item id="f03"> <amount>10</amount> </item> <item id="e2c"> <amount>10</amount> </item> <item id="f04"> <amount>10</amount> </item> <item id="efb"> <amount>10</amount> </item> <item id="efc"> <amount>10</amount> </item> <item id="1847"> <amount>10</amount> </item> <item id="1848"> <amount>10</amount> </item> <item id="1c18"> <amount>10</amount> </item> <item id="e9b"> <amount>10</amount> </item> <item id="f0e"> <amount>10</amount> </item> <item id="f06"> <amount>10</amount> </item> <item id="f07"> <amount>10</amount> </item> <item id="f08"> <amount>10</amount> </item> <item id="f09"> <amount>10</amount> </item> <item id="f0a"> <amount>10</amount> </item> <item id="f0b"> <amount>10</amount> </item> <item id="f0c"> <amount>10</amount> </item> <item id="f0d"> <amount>10</amount> </item> <item id="f78"> <amount>10</amount> </item> <item id="f79"> <amount>10</amount> </item> <item id="f7a"> <amount>10</amount> </item> <item id="f7b"> <amount>10</amount> </item> <item id="f7c"> <amount>10</amount> </item> <item id="f7d"> <amount>10</amount> </item> <item id="f7e"> <amount>10</amount> </item> <item id="f7f"> <amount>10</amount> </item> <item id="f80"> <amount>10</amount> </item> <item id="f81"> <amount>10</amount> </item> <item id="f82"> <amount>10</amount> </item> <item id="f83"> <amount>10</amount> </item> <item id="f84"> <amount>10</amount> </item> <item id="f85"> <amount>10</amount> </item> <item id="f86"> <amount>10</amount> </item> <item id="f87"> <amount>10</amount> </item> <item id="f88"> <amount>10</amount> </item> <item id="f89"> <amount>10</amount> </item> <item id="f8a"> <amount>10</amount> </item> <item id="f8b"> <amount>10</amount> </item> <item id="f8c"> <amount>10</amount> </item> <item id="f8d"> <amount>10</amount> </item> <item id="f8e"> <amount>10</amount> </item> <item id="f8f"> <amount>10</amount> </item> <item id="f90"> <amount>10</amount> </item> <item id="f91"> <amount>10</amount> </item> </restockable> <sellable> <item id="e24"/> <item id="e25"/> <item id="efd"/> <item id="e26"/> <item id="efe"/> <item id="e27"/> <item id="eff"/> <item id="e28"/> <item id="f00"/> <item id="e29"/> <item id="f01"/> <item id="e2a"/> <item id="f02"/> <item id="e2b"/> <item id="f03"/> <item id="e2c"/> <item id="f04"/> <item id="efb"/> <item id="efc"/> <item id="1847"/> <item id="1848"/> <item id="1c18"/> <item id="e9b"/> <item id="f0e"/> <item id="f06"/> <item id="f07"/> <item id="f08"/> <item id="f09"/> <item id="f0a"/> <item id="f0b"/> <item id="f0c"/> <item id="f0d"/> <item id="f78"/> <item id="f79"/> <item id="f7a"/> <item id="f7b"/> <item id="f7c"/> <item id="f7d"/> <item id="f7e"/> <item id="f7f"/> <item id="f80"/> <item id="f81"/> <item id="f82"/> <item id="f83"/> <item id="f84"/> <item id="f85"/> <item id="f86"/> <item id="f87"/> <item id="f88"/> <item id="f89"/> <item id="f8a"/> <item id="f8b"/> <item id="f8c"/> <item id="f8d"/> <item id="f8e"/> <item id="f8f"/> <item id="f90"/> <item id="f91"/> </sellable> </shopkeeper> <category>Vendors\Alchemist (Male)</category> <invulnerable /> </npc> <npc id="alchemist_female"> <inherit>base_female</inherit> <title>the Alchemist</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="e24"> <amount>10</amount> </item> <item id="e25"> <amount>10</amount> </item> <item id="efd"> <amount>10</amount> </item> <item id="e26"> <amount>10</amount> </item> <item id="efe"> <amount>10</amount> </item> <item id="e27"> <amount>10</amount> </item> <item id="eff"> <amount>10</amount> </item> <item id="e28"> <amount>10</amount> </item> <item id="f00"> <amount>10</amount> </item> <item id="e29"> <amount>10</amount> </item> <item id="f01"> <amount>10</amount> </item> <item id="e2a"> <amount>10</amount> </item> <item id="f02"> <amount>10</amount> </item> <item id="e2b"> <amount>10</amount> </item> <item id="f03"> <amount>10</amount> </item> <item id="e2c"> <amount>10</amount> </item> <item id="f04"> <amount>10</amount> </item> <item id="efb"> <amount>10</amount> </item> <item id="efc"> <amount>10</amount> </item> <item id="1847"> <amount>10</amount> </item> <item id="1848"> <amount>10</amount> </item> <item id="1c18"> <amount>10</amount> </item> <item id="e9b"> <amount>10</amount> </item> <item id="f0e"> <amount>10</amount> </item> <item id="f06"> <amount>10</amount> </item> <item id="f07"> <amount>10</amount> </item> <item id="f08"> <amount>10</amount> </item> <item id="f09"> <amount>10</amount> </item> <item id="f0a"> <amount>10</amount> </item> <item id="f0b"> <amount>10</amount> </item> <item id="f0c"> <amount>10</amount> </item> <item id="f0d"> <amount>10</amount> </item> <item id="f78"> <amount>10</amount> </item> <item id="f79"> <amount>10</amount> </item> <item id="f7a"> <amount>10</amount> </item> <item id="f7b"> <amount>10</amount> </item> <item id="f7c"> <amount>10</amount> </item> <item id="f7d"> <amount>10</amount> </item> <item id="f7e"> <amount>10</amount> </item> <item id="f7f"> <amount>10</amount> </item> <item id="f80"> <amount>10</amount> </item> <item id="f81"> <amount>10</amount> </item> <item id="f82"> <amount>10</amount> </item> <item id="f83"> <amount>10</amount> </item> <item id="f84"> <amount>10</amount> </item> <item id="f85"> <amount>10</amount> </item> <item id="f86"> <amount>10</amount> </item> <item id="f87"> <amount>10</amount> </item> <item id="f88"> <amount>10</amount> </item> <item id="f89"> <amount>10</amount> </item> <item id="f8a"> <amount>10</amount> </item> <item id="f8b"> <amount>10</amount> </item> <item id="f8c"> <amount>10</amount> </item> <item id="f8d"> <amount>10</amount> </item> <item id="f8e"> <amount>10</amount> </item> <item id="f8f"> <amount>10</amount> </item> <item id="f90"> <amount>10</amount> </item> <item id="f91"> <amount>10</amount> </item> </restockable> <sellable> <item id="e24"/> <item id="e25"/> <item id="efd"/> <item id="e26"/> <item id="efe"/> <item id="e27"/> <item id="eff"/> <item id="e28"/> <item id="f00"/> <item id="e29"/> <item id="f01"/> <item id="e2a"/> <item id="f02"/> <item id="e2b"/> <item id="f03"/> <item id="e2c"/> <item id="f04"/> <item id="efb"/> <item id="efc"/> <item id="1847"/> <item id="1848"/> <item id="1c18"/> <item id="e9b"/> <item id="f0e"/> <item id="f06"/> <item id="f07"/> <item id="f08"/> <item id="f09"/> <item id="f0a"/> <item id="f0b"/> <item id="f0c"/> <item id="f0d"/> <item id="f78"/> <item id="f79"/> <item id="f7a"/> <item id="f7b"/> <item id="f7c"/> <item id="f7d"/> <item id="f7e"/> <item id="f7f"/> <item id="f80"/> <item id="f81"/> <item id="f82"/> <item id="f83"/> <item id="f84"/> <item id="f85"/> <item id="f86"/> <item id="f87"/> <item id="f88"/> <item id="f89"/> <item id="f8a"/> <item id="f8b"/> <item id="f8c"/> <item id="f8d"/> <item id="f8e"/> <item id="f8f"/> <item id="f90"/> <item id="f91"/> </sellable> </shopkeeper> <category>Vendors\Alchemist (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: architect.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A architect vendor --> <npc id="architect_male"> <inherit>base_male</inherit> <title>the Architect</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Architect (Male)</category> <invulnerable /> </npc> <npc id="architect_female"> <inherit>base_female</inherit> <title>the Architect</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Architect (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: armorer.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A armorer vendor --> <npc id="armorer_male"> <inherit>base_male</inherit> <title>the Armorer</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="13bb"> <amount>10</amount> </item> <item id="13c3"> <amount>10</amount> </item> <item id="13c4"> <amount>10</amount> </item> <item id="140d"> <amount>10</amount> </item> <item id="140f"> <amount>10</amount> </item> <item id="140b"> <amount>10</amount> </item> <item id="1408"> <amount>10</amount> </item> <item id="1c04"> <amount>10</amount> </item> <item id="1416"> <amount>10</amount> </item> <item id="1410"> <amount>10</amount> </item> <item id="1414"> <amount>10</amount> </item> <item id="1413"> <amount>10</amount> </item> <item id="1412"> <amount>10</amount> </item> <item id="141a"> <amount>10</amount> </item> <item id="13f2"> <amount>10</amount> </item> <item id="13f1"> <amount>10</amount> </item> <item id="13ef"> <amount>10</amount> </item> <item id="13ed"> <amount>10</amount> </item> <item id="1b73"> <amount>10</amount> </item> <item id="1b76"> <amount>10</amount> </item> <item id="1b7b"> <amount>10</amount> </item> <item id="1b74"> <amount>10</amount> </item> </restockable> <sellable> <item id="13bb"/> <item id="13c3"/> <item id="13c4"/> <item id="140d"/> <item id="140f"/> <item id="140b"/> <item id="1408"/> <item id="1c04"/> <item id="1416"/> <item id="1410"/> <item id="1414"/> <item id="1413"/> <item id="1412"/> <item id="141a"/> <item id="13f2"/> <item id="13f1"/> <item id="13ef"/> <item id="13ed"/> <item id="1b73"/> <item id="1b76"/> <item id="1b7b"/> <item id="1b74"/> </sellable> </shopkeeper> <category>Vendors\Armorer (Male)</category> <invulnerable /> </npc> <npc id="armorer_female"> <inherit>base_female</inherit> <title>the Armorer</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="13bb"> <amount>10</amount> </item> <item id="13c3"> <amount>10</amount> </item> <item id="13c4"> <amount>10</amount> </item> <item id="140d"> <amount>10</amount> </item> <item id="140f"> <amount>10</amount> </item> <item id="140b"> <amount>10</amount> </item> <item id="1408"> <amount>10</amount> </item> <item id="1c04"> <amount>10</amount> </item> <item id="1416"> <amount>10</amount> </item> <item id="1410"> <amount>10</amount> </item> <item id="1414"> <amount>10</amount> </item> <item id="1413"> <amount>10</amount> </item> <item id="1412"> <amount>10</amount> </item> <item id="141a"> <amount>10</amount> </item> <item id="13f2"> <amount>10</amount> </item> <item id="13f1"> <amount>10</amount> </item> <item id="13ef"> <amount>10</amount> </item> <item id="13ed"> <amount>10</amount> </item> <item id="1b73"> <amount>10</amount> </item> <item id="1b76"> <amount>10</amount> </item> <item id="1b7b"> <amount>10</amount> </item> <item id="1b74"> <amount>10</amount> </item> </restockable> <sellable> <item id="13bb"/> <item id="13c3"/> <item id="13c4"/> <item id="140d"/> <item id="140f"/> <item id="140b"/> <item id="1408"/> <item id="1c04"/> <item id="1416"/> <item id="1410"/> <item id="1414"/> <item id="1413"/> <item id="1412"/> <item id="141a"/> <item id="13f2"/> <item id="13f1"/> <item id="13ef"/> <item id="13ed"/> <item id="1b73"/> <item id="1b76"/> <item id="1b7b"/> <item id="1b74"/> </sellable> </shopkeeper> <category>Vendors\Armorer (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: artist.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A artist --> <npc id="artist_male"> <inherit>base_male</inherit> <title>the Artist</title> <ai>Human_Vendor</ai> <category>Vendors\Artist (Male)</category> <invulnerable /> </npc> <npc id="artist_female"> <inherit>base_female</inherit> <title>the Artist</title> <ai>Human_Vendor</ai> <category>Vendors\Artist (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: baker.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A baker vendor --> <npc id="baker_male"> <inherit>base_male</inherit> <title>the Baker</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="98c"> <amount>10</amount> </item> <item id="9e9"> <amount>10</amount> </item> <item id="9ea"> <amount>10</amount> </item> <item id="9eb"> <amount>10</amount> </item> <item id="9ec"> <amount>10</amount> </item> <item id="103b"> <amount>10</amount> </item> <item id="103c"> <amount>10</amount> </item> <item id="1039"> <amount>10</amount> </item> <item id="ff8"> <amount>10</amount> </item> <item id="ff9"> <amount>10</amount> </item> <item id="9f0"> <amount>10</amount> </item> <item id="9d6"> <amount>10</amount> </item> </restockable> <sellable> <item id="98c"/> <item id="9e9"/> <item id="9ea"/> <item id="9eb"/> <item id="9ec"/> <item id="103b"/> <item id="103c"/> <item id="1039"/> <item id="ff8"/> <item id="ff9"/> <item id="9f0"/> <item id="9d6"/> </sellable> </shopkeeper> <category>Vendors\Baker (Male)</category> <invulnerable /> </npc> <npc id="baker_female"> <inherit>base_female</inherit> <title>the Baker</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="98c"> <amount>10</amount> </item> <item id="9e9"> <amount>10</amount> </item> <item id="9ea"> <amount>10</amount> </item> <item id="9eb"> <amount>10</amount> </item> <item id="9ec"> <amount>10</amount> </item> <item id="103b"> <amount>10</amount> </item> <item id="103c"> <amount>10</amount> </item> <item id="1039"> <amount>10</amount> </item> <item id="ff8"> <amount>10</amount> </item> <item id="ff9"> <amount>10</amount> </item> <item id="9f0"> <amount>10</amount> </item> <item id="9d6"> <amount>10</amount> </item> </restockable> <sellable> <item id="98c"/> <item id="9e9"/> <item id="9ea"/> <item id="9eb"/> <item id="9ec"/> <item id="103b"/> <item id="103c"/> <item id="1039"/> <item id="ff8"/> <item id="ff9"/> <item id="9f0"/> <item id="9d6"/> </sellable> </shopkeeper> <category>Vendors\Baker (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: banker.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- Banker --> <npc id="banker_male"> <inherit>base_male</inherit> <title>the Banker</title> <events>speech_banker</events> <bindmenu>banker_menu</bindmenu> <ai>Human_Vendor</ai> <equipped> <item id="1515" /> <!-- Cloak --> <item id="1541" /> <!-- Sash --> </equipped> <category>Vendors\Banker (Male)</category> <invulnerable /> </npc> <npc id="banker_female"> <inherit>base_female</inherit> <title>the Banker</title> <events>speech_banker</events> <bindmenu>banker_menu</bindmenu> <ai>Human_Vendor</ai> <equipped> <item id="1515" /> <!-- Cloak --> <item id="1719" /> <!-- Bonnet --> </equipped> <category>Vendors\Banker (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: barber.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- Barber (no real vendor) --> <npc id="barber_male"> <inherit>base_male</inherit> <title>the Barber</title> <events>speech_barber</events> <category>Vendors\Barber (Male)</category> <invulnerable /> </npc> <npc id="barber_female"> <inherit>base_female</inherit> <title>the Barber</title> <events>speech_barber</events> <category>Vendors\Barber (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: bard.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A bard vendor --> <npc id="bard_male"> <inherit>base_male</inherit> <title>the Bard</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Bard (Male)</category> <invulnerable /> </npc> <npc id="bard_female"> <inherit>base_female</inherit> <title>the Bard</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Bard (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: blacksmith.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A blacksmith vendor --> <npc id="blacksmith_male"> <inherit>base_male</inherit> <title>the Blacksmith</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="fbb"> <amount>10</amount> </item> <item id="fbc"> <amount>10</amount> </item> <item id="13e4"> <amount>10</amount> </item> <item id="13e3"> <amount>10</amount> </item> <item id="fb4"> <amount>10</amount> </item> <item id="fb5"> <amount>10</amount> </item> <item id="1bf2"> <amount>10</amount> </item> <item id="e85"> <amount>10</amount> </item> <item id="f39"> <amount>10</amount> </item> <item id="13bb"> <amount>10</amount> </item> <item id="13c3"> <amount>10</amount> </item> <item id="13c4"> <amount>10</amount> </item> <item id="140d"> <amount>10</amount> </item> <item id="140f"> <amount>10</amount> </item> <item id="140b"> <amount>10</amount> </item> <item id="1408"> <amount>10</amount> </item> <item id="1c04"> <amount>10</amount> </item> <item id="1416"> <amount>10</amount> </item> <item id="1410"> <amount>10</amount> </item> <item id="1414"> <amount>10</amount> </item> <item id="1413"> <amount>10</amount> </item> <item id="1412"> <amount>10</amount> </item> <item id="141a"> <amount>10</amount> </item> <item id="13f2"> <amount>10</amount> </item> <item id="13f1"> <amount>10</amount> </item> <item id="13ef"> <amount>10</amount> </item> <item id="13ed"> <amount>10</amount> </item> <item id="1b73"> <amount>10</amount> </item> <item id="1b76"> <amount>10</amount> </item> <item id="1b7b"> <amount>10</amount> </item> <item id="1b74"> <amount>10</amount> </item> </restockable> <sellable> <item id="fbb"/> <item id="fbc"/> <item id="13e4"/> <item id="13e3"/> <item id="fb4"/> <item id="fb5"/> <item id="1bf2"/> <item id="e85"/> <item id="f39"/> <item id="13bb"/> <item id="13c3"/> <item id="13c4"/> <item id="140d"/> <item id="140f"/> <item id="140b"/> <item id="1408"/> <item id="1c04"/> <item id="1416"/> <item id="1410"/> <item id="1414"/> <item id="1413"/> <item id="1412"/> <item id="141a"/> <item id="13f2"/> <item id="13f1"/> <item id="13ef"/> <item id="13ed"/> <item id="1b73"/> <item id="1b76"/> <item id="1b7b"/> <item id="1b74"/> </sellable> </shopkeeper> <category>Vendors\blacksmith (Male)</category> <invulnerable /> </npc> <npc id="blacksmith_female"> <inherit>base_female</inherit> <title>the Blacksmith</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="fbb"> <amount>10</amount> </item> <item id="fbc"> <amount>10</amount> </item> <item id="13e4"> <amount>10</amount> </item> <item id="13e3"> <amount>10</amount> </item> <item id="fb4"> <amount>10</amount> </item> <item id="fb5"> <amount>10</amount> </item> <item id="1bf2"> <amount>10</amount> </item> <item id="e85"> <amount>10</amount> </item> <item id="f39"> <amount>10</amount> </item> <item id="13bb"> <amount>10</amount> </item> <item id="13c3"> <amount>10</amount> </item> <item id="13c4"> <amount>10</amount> </item> <item id="140d"> <amount>10</amount> </item> <item id="140f"> <amount>10</amount> </item> <item id="140b"> <amount>10</amount> </item> <item id="1408"> <amount>10</amount> </item> <item id="1c04"> <amount>10</amount> </item> <item id="1416"> <amount>10</amount> </item> <item id="1410"> <amount>10</amount> </item> <item id="1414"> <amount>10</amount> </item> <item id="1413"> <amount>10</amount> </item> <item id="1412"> <amount>10</amount> </item> <item id="141a"> <amount>10</amount> </item> <item id="13f2"> <amount>10</amount> </item> <item id="13f1"> <amount>10</amount> </item> <item id="13ef"> <amount>10</amount> </item> <item id="13ed"> <amount>10</amount> </item> <item id="1b73"> <amount>10</amount> </item> <item id="1b76"> <amount>10</amount> </item> <item id="1b7b"> <amount>10</amount> </item> <item id="1b74"> <amount>10</amount> </item> </restockable> <sellable> <item id="fbb"/> <item id="fbc"/> <item id="13e4"/> <item id="13e3"/> <item id="fb4"/> <item id="fb5"/> <item id="1bf2"/> <item id="e85"/> <item id="f39"/> <item id="13bb"/> <item id="13c3"/> <item id="13c4"/> <item id="140d"/> <item id="140f"/> <item id="140b"/> <item id="1408"/> <item id="1c04"/> <item id="1416"/> <item id="1410"/> <item id="1414"/> <item id="1413"/> <item id="1412"/> <item id="141a"/> <item id="13f2"/> <item id="13f1"/> <item id="13ef"/> <item id="13ed"/> <item id="1b73"/> <item id="1b76"/> <item id="1b7b"/> <item id="1b74"/> </sellable> </shopkeeper> <category>Vendors\Blacksmith (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: bowyer.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A bowyer vendor --> <npc id="bowyer_male"> <inherit>base_male</inherit> <title>the Bowyer</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Bowyer (Male)</category> <invulnerable /> </npc> <npc id="bowyer_female"> <inherit>base_female</inherit> <title>the Bowyer</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Bowyer (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: butcher.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A butcher vendor --> <npc id="butcher_male"> <inherit>base_male</inherit> <title>the butcher</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Butcher (Male)</category> <invulnerable /> </npc> <npc id="butcher_female"> <inherit>base_female</inherit> <title>the butcher</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Butcher (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: carpenter.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A carpenter vendor --> <npc id="carpenter_male"> <inherit>base_male</inherit> <title>the Carpenter</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Carpenter (Male)</category> <invulnerable /> </npc> <npc id="carpenter_female"> <inherit>base_female</inherit> <title>the Carpenter</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Carpenter (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: cobbler.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A cobbler vendor --> <npc id="cobbler_male"> <inherit>base_male</inherit> <title>the Cobbler</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Cobbler (Male)</category> <invulnerable /> </npc> <npc id="cobbler_female"> <inherit>base_female</inherit> <title>the Cobbler</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Cobbler (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: cook.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A cook vendor --> <npc id="cook_male"> <inherit>base_male</inherit> <title>the Cook</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Cook (Male)</category> <invulnerable /> </npc> <npc id="cook_female"> <inherit>base_female</inherit> <title>the Cook</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Cook (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: fishermen.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A fisherman vendor --> <npc id="fisherman_male"> <inherit>base_male</inherit> <title>the Fisherman</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Fisherman (Male)</category> <invulnerable /> </npc> <!-- A fisherlady vendor --> <npc id="fisherlady_female"> <inherit>base_female</inherit> <title>the Fisherlady</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Fisherlady (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: healer.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A Healer vendor --> <npc id="healer_male"> <inherit>base_male</inherit> <bindmenu>healer_menu</bindmenu> <title>the Healer</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="e21"> <amount>10</amount> </item> <item id="f07"> <amount>10</amount> </item> <item id="f0c"> <amount>10</amount> </item> <item id="f84"> <amount>10</amount> </item> <item id="f85"> <amount>10</amount> </item> <item id="f8d"> <amount>10</amount> </item> <item id="f9e"> <amount>10</amount> </item> </restockable> <sellable> <item id="e21"/> <item id="f07"/> <item id="f0c"/> <item id="f84"/> <item id="f85"/> <item id="f8d"/> <item id="f9e"/> </sellable> </shopkeeper> <category>Vendors\Healer (Male)</category> <invulnerable /> <events>npc.healer</events> </npc> <npc id="healer_female"> <inherit>base_female</inherit> <title>the Healer</title> <ai>Human_Vendor</ai> <bindmenu>healer_menu</bindmenu> <shopkeeper> <restockable> <item id="e21"> <amount>10</amount> </item> <item id="f07"> <amount>10</amount> </item> <item id="f0c"> <amount>10</amount> </item> <item id="f84"> <amount>10</amount> </item> <item id="f85"> <amount>10</amount> </item> <item id="f8d"> <amount>10</amount> </item> <item id="f9e"> <amount>10</amount> </item> </restockable> <sellable> <item id="e21"/> <item id="f07"/> <item id="f0c"/> <item id="f84"/> <item id="f85"/> <item id="f8d"/> <item id="f9e"/> </sellable> </shopkeeper> <category>Vendors\Healer (Female)</category> <invulnerable /> <events>npc.healer</events> </npc> </definitions> --- NEW FILE: herbalist.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A herbalist vendor --> <npc id="herbalist_male"> <inherit>base_male</inherit> <title>the Herbalist</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="f7a"> <amount>50</amount> </item> <item id="f7b"> <amount>50</amount> </item> <item id="f84"> <amount>50</amount> </item> <item id="f85"> <amount>50</amount> </item> <item id="f86"> <amount>50</amount> </item> <item id="f88"> <amount>50</amount> </item> <item id="f8c"> <amount>50</amount> </item> <item id="f8d"> <amount>50</amount> </item> </restockable> <sellable> <item id="f7a"/> <item id="f7b"/> <item id="f84"/> <item id="f85"/> <item id="f86"/> <item id="f88"/> <item id="f8c"/> <item id="f8d"/> </sellable> </shopkeeper> <category>Vendors\Herbalist (Male)</category> <invulnerable /> </npc> <npc id="herbalist_female"> <inherit>base_female</inherit> <title>the Herbalist</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="f7a"> <amount>50</amount> </item> <item id="f7b"> <amount>50</amount> </item> <item id="f84"> <amount>50</amount> </item> <item id="f85"> <amount>50</amount> </item> <item id="f86"> <amount>50</amount> </item> <item id="f88"> <amount>50</amount> </item> <item id="f8c"> <amount>50</amount> </item> <item id="f8d"> <amount>50</amount> </item> </restockable> <sellable> <item id="f7a"/> <item id="f7b"/> <item id="f84"/> <item id="f85"/> <item id="f86"/> <item id="f88"/> <item id="f8c"/> <item id="f8d"/> </sellable> </shopkeeper> <category>Vendors\Herbalist (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: innkeeper.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A innkeeper vendor --> <npc id="innkeeper_male"> <inherit>base_male</inherit> <title>the Innkeeper</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Innkeeper (Male)</category> <invulnerable /> </npc> <npc id="innkeeper_female"> <inherit>base_female</inherit> <title>the Innkeeper</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Innkeeper (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: jeweler.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A jeweler vendor --> <npc id="jeweler_male"> <inherit>base_male</inherit> <title>the Jeweler</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="f1b"> <amount>10</amount> </item> <item id="f0f"> <amount>10</amount> </item> <item id="f21"> <amount>10</amount> </item> <item id="f10"> <amount>10</amount> </item> <item id="f2f"> <amount>10</amount> </item> <item id="f11"> <amount>10</amount> </item> <item id="f12"> <amount>10</amount> </item> <item id="f19"> <amount>10</amount> </item> <item id="f1f"> <amount>10</amount> </item> <item id="f1a"> <amount>10</amount> </item> <item id="f1c"> <amount>10</amount> </item> <item id="f1d"> <amount>10</amount> </item> <item id="f2a"> <amount>10</amount> </item> <item id="f2b"> <amount>10</amount> </item> <item id="f13"> <amount>10</amount> </item> <item id="f14"> <amount>10</amount> </item> <item id="f15"> <amount>10</amount> </item> <item id="f2c"> <amount>10</amount> </item> <item id="f23"> <amount>10</amount> </item> <item id="f24"> <amount>10</amount> </item> <item id="f16"> <amount>10</amount> </item> <item id="f17"> <amount>10</amount> </item> <item id="f2e"> <amount>10</amount> </item> <item id="f22"> <amount>10</amount> </item> <item id="f1e"> <amount>10</amount> </item> <item id="f20"> <amount>10</amount> </item> <item id="f18"> <amount>10</amount> </item> <item id="f2d"> <amount>10</amount> </item> <item id="f26"> <amount>10</amount> </item> <item id="f27"> <amount>10</amount> </item> <item id="f28"> <amount>10</amount> </item> <item id="f29"> <amount>10</amount> </item> <item id="f30"> <amount>10</amount> </item> <item id="f25"> <amount>10</amount> </item> <item id="1f05"> <amount>10</amount> </item> <item id="1f06"> <amount>10</amount> </item> <item id="1f07"> <amount>10</amount> </item> <item id="1f08"> <amount>10</amount> </item> <item id="1f09"> <amount>10</amount> </item> <item id="1f0a"> <amount>10</amount> </item> </restockable> <sellable> <item id="f1b"/> <item id="f0f"/> <item id="f21"/> <item id="f10"/> <item id="f2f"/> <item id="f11"/> <item id="f12"/> <item id="f19"/> <item id="f1f"/> <item id="f1a"/> <item id="f1c"/> <item id="f1d"/> <item id="f2a"/> <item id="f2b"/> <item id="f13"/> <item id="f14"/> <item id="f15"/> <item id="f2c"/> <item id="f23"/> <item id="f24"/> <item id="f16"/> <item id="f17"/> <item id="f2e"/> <item id="f22"/> <item id="f1e"/> <item id="f20"/> <item id="f18"/> <item id="f2d"/> <item id="f26"/> <item id="f27"/> <item id="f28"/> <item id="f29"/> <item id="f30"/> <item id="f25"/> <item id="1f05"/> <item id="1f06"/> <item id="1f07"/> <item id="1f08"/> <item id="1f09"/> <item id="1f0a"/> </sellable> </shopkeeper> <category>Vendors\Jeweler (Male)</category> <invulnerable /> </npc> <npc id="jeweler_female"> <inherit>base_female</inherit> <title>the Jeweler</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="f1b"> <amount>10</amount> </item> <item id="f0f"> <amount>10</amount> </item> <item id="f21"> <amount>10</amount> </item> <item id="f10"> <amount>10</amount> </item> <item id="f2f"> <amount>10</amount> </item> <item id="f11"> <amount>10</amount> </item> <item id="f12"> <amount>10</amount> </item> <item id="f19"> <amount>10</amount> </item> <item id="f1f"> <amount>10</amount> </item> <item id="f1a"> <amount>10</amount> </item> <item id="f1c"> <amount>10</amount> </item> <item id="f1d"> <amount>10</amount> </item> <item id="f2a"> <amount>10</amount> </item> <item id="f2b"> <amount>10</amount> </item> <item id="f13"> <amount>10</amount> </item> <item id="f14"> <amount>10</amount> </item> <item id="f15"> <amount>10</amount> </item> <item id="f2c"> <amount>10</amount> </item> <item id="f23"> <amount>10</amount> </item> <item id="f24"> <amount>10</amount> </item> <item id="f16"> <amount>10</amount> </item> <item id="f17"> <amount>10</amount> </item> <item id="f2e"> <amount>10</amount> </item> <item id="f22"> <amount>10</amount> </item> <item id="f1e"> <amount>10</amount> </item> <item id="f20"> <amount>10</amount> </item> <item id="f18"> <amount>10</amount> </item> <item id="f2d"> <amount>10</amount> </item> <item id="f26"> <amount>10</amount> </item> <item id="f27"> <amount>10</amount> </item> <item id="f28"> <amount>10</amount> </item> <item id="f29"> <amount>10</amount> </item> <item id="f30"> <amount>10</amount> </item> <item id="f25"> <amount>10</amount> </item> <item id="1f05"> <amount>10</amount> </item> <item id="1f06"> <amount>10</amount> </item> <item id="1f07"> <amount>10</amount> </item> <item id="1f08"> <amount>10</amount> </item> <item id="1f09"> <amount>10</amount> </item> <item id="1f0a"> <amount>10</amount> </item> </restockable> <sellable> <item id="f1b"/> <item id="f0f"/> <item id="f21"/> <item id="f10"/> <item id="f2f"/> <item id="f11"/> <item id="f12"/> <item id="f19"/> <item id="f1f"/> <item id="f1a"/> <item id="f1c"/> <item id="f1d"/> <item id="f2a"/> <item id="f2b"/> <item id="f13"/> <item id="f14"/> <item id="f15"/> <item id="f2c"/> <item id="f23"/> <item id="f24"/> <item id="f16"/> <item id="f17"/> <item id="f2e"/> <item id="f22"/> <item id="f1e"/> <item id="f20"/> <item id="f18"/> <item id="f2d"/> <item id="f26"/> <item id="f27"/> <item id="f28"/> <item id="f29"/> <item id="f30"/> <item id="f25"/> <item id="1f05"/> <item id="1f06"/> <item id="1f07"/> <item id="1f08"/> <item id="1f09"/> <item id="1f0a"/> </sellable> </shopkeeper> <category>Vendors\Jeweler (Femele)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: leatherworker.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A leatherworker vendor --> <npc id="leatherworker_male"> <inherit>base_male</inherit> <title>the Leatherworker</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Leatherworker (Male)</category> <invulnerable /> </npc> <npc id="leatherworker_female"> <inherit>base_female</inherit> <title>the Leatherworker</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Leatherworker (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: mage.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A mage vendor --> <npc id="mage_male"> <inherit>base_male</inherit> <title>the Mage</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="efa"> <amount>10</amount> </item> <item id="1f14"> <amount>10</amount> </item> <item id="1f15"> <amount>10</amount> </item> <item id="1f16"> <amount>10</amount> </item> <item id="1f17"> <amount>10</amount> </item> <item id="1f2e"> <amount>10</amount> </item> <item id="1f2f"> <amount>10</amount> </item> <item id="1f30"> <amount>10</amount> </item> <item id="1f31"> <amount>10</amount> </item> <item id="1f32"> <amount>10</amount> </item> <item id="1f33"> <amount>10</amount> </item> <item id="1f2d"> <amount>10</amount> </item> <item id="1f34"> <amount>10</amount> </item> <item id="1f35"> <amount>10</amount> </item> <item id="1f36"> <amount>10</amount> </item> <item id="1f37"> <amount>10</amount> </item> <item id="1f38"> <amount>10</amount> </item> <item id="f7a"> <amount>50</amount> </item> <item id="f7b"> <amount>50</amount> </item> <item id="f84"> <amount>50</amount> </item> <item id="f85"> <amount>50</amount> </item> <item id="f86"> <amount>50</amount> </item> <item id="f88"> <amount>50</amount> </item> <item id="f8c"> <amount>50</amount> </item> <item id="f8d"> <amount>50</amount> </item> <item id="e34"> <amount>10</amount> </item> </restockable> <sellable> <item id="efa"/> <item id="1f14"/> <item id="1f15"/> <item id="1f16"/> <item id="1f17"/> <item id="1f2e"/> <item id="1f2f"/> <item id="1f30"/> <item id="1f31"/> <item id="1f32"/> <item id="1f33"/> <item id="1f2d"/> <item id="1f34"/> <item id="1f35"/> <item id="1f36"/> <item id="1f37"/> <item id="1f38"/> <item id="f7a"/> <item id="f7b"/> <item id="f84"/> <item id="f85"/> <item id="f86"/> <item id="f88"/> <item id="f8c"/> <item id="f8d"/> <item id="e34"/> </sellable> </shopkeeper> <category>Vendors\Mage (Male)</category> <invulnerable /> </npc> <npc id="mage_female"> <inherit>base_female</inherit> <title>the Mage</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="efa"> <amount>10</amount> </item> <item id="1f14"> <amount>10</amount> </item> <item id="1f15"> <amount>10</amount> </item> <item id="1f16"> <amount>10</amount> </item> <item id="1f17"> <amount>10</amount> </item> <item id="1f2e"> <amount>10</amount> </item> <item id="1f2f"> <amount>10</amount> </item> <item id="1f30"> <amount>10</amount> </item> <item id="1f31"> <amount>10</amount> </item> <item id="1f32"> <amount>10</amount> </item> <item id="1f33"> <amount>10</amount> </item> <item id="1f2d"> <amount>10</amount> </item> <item id="1f34"> <amount>10</amount> </item> <item id="1f35"> <amount>10</amount> </item> <item id="1f36"> <amount>10</amount> </item> <item id="1f37"> <amount>10</amount> </item> <item id="1f38"> <amount>10</amount> </item> <item id="f7a"> <amount>50</amount> </item> <item id="f7b"> <amount>50</amount> </item> <item id="f84"> <amount>50</amount> </item> <item id="f85"> <amount>50</amount> </item> <item id="f86"> <amount>50</amount> </item> <item id="f88"> <amount>50</amount> </item> <item id="f8c"> <amount>50</amount> </item> <item id="f8d"> <amount>50</amount> </item> <item id="e34"> <amount>10</amount> </item> </restockable> <sellable> <item id="efa"/> <item id="1f14"/> <item id="1f15"/> <item id="1f16"/> <item id="1f17"/> <item id="1f2e"/> <item id="1f2f"/> <item id="1f30"/> <item id="1f31"/> <item id="1f32"/> <item id="1f33"/> <item id="1f2d"/> <item id="1f34"/> <item id="1f35"/> <item id="1f36"/> <item id="1f37"/> <item id="1f38"/> <item id="f7a"/> <item id="f7b"/> <item id="f84"/> <item id="f85"/> <item id="f86"/> <item id="f88"/> <item id="f8c"/> <item id="f8d"/> <item id="e34"/> </sellable> </shopkeeper> <category>Vendors\Mage (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: provisioner.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A provisioner vendor --> <npc id="provisioner_male"> <inherit>base_male</inherit> <title>the Provisioner</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Provisioner (Male)</category> <invulnerable /> </npc> <npc id="provisioner_female"> <inherit>base_female</inherit> <title>the Provisioner</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable/> </shopkeeper> <category>Vendors\Provisioner (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: shipwright.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A shipwright vendor --> <npc id="shipwright_male"> <inherit>base_male</inherit> <title>the Shipwright</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Shipwright (Male)</category> <invulnerable /> </npc> <npc id="shipwright_female"> <inherit>base_female</inherit> <title>the Shipwright</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Shipwright (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: spinner.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A spinner vendor --> <npc id="spinner_male"> <inherit>base_male</inherit> <title>the Spinner</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Spinner (Male)</category> <invulnerable /> </npc> <npc id="spinner_female"> <inherit>base_female</inherit> <title>the Spinner</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> </restockable> <sellable> </sellable> </shopkeeper> <category>Vendors\Spinner (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: stablemaster.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- Stablemaster (no real vendor) --> <npc id="stablemaster_male"> <inherit>base_male</inherit> <title>the Stablemaster</title> <ai>Human_Stablemaster</ai> <fencing> <random min="150" max="380"/> </fencing> <parrying> <random min="450" max="680"/> </parrying> <swordsmanship> <random min="150" max="380"/> </swordsmanship> <wrestling> <random min="150" max="380"/> </wrestling> <macefighting> <random min="150" max="380"/> </macefighting> <magicresistance> <random min="450" max="680"/> </magicresistance> <tactics> <random min="450" max="680"/> </tactics> <category>Vendors\Stablemaster (Male)</category> <invulnerable /> </npc> <npc id="stablemaster_female"> <inherit>base_female</inherit> <title>the Stablemaster</title> <ai>Human_Stablemaster</ai> <fencing> <random min="150" max="380"/> </fencing> <parrying> <random min="450" max="680"/> </parrying> <swordsmanship> <random min="150" max="380"/> </swordsmanship> <wrestling> <random min="150" max="380"/> </wrestling> <macefighting> <random min="150" max="380"/> </macefighting> <magicresistance> <random min="450" max="680"/> </magicresistance> <tactics> <random min="450" max="680"/> </tactics> <category>Vendors\Stablemaster (Female)</category> <invulnerable /> </npc> </definitions> --- NEW FILE: tailor.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <!-- A Tailor vendor --> <npc id="tailor_male"> <inherit>base_male</inherit> <title>the Tailor</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="153f"> <amount>10</amount> </item> <item id="1515"> <amount>10</amount> </item> <item id="108b"> <amount>10</amount> </item> <item id="1516"> <amount>10</amount> </item> <item id="1517"> <amount>10</amount> </item> </restockable> </shopkeeper> <category>Vendors\Tailor (Male)</category> <invulnerable /> </npc> <npc id="tailor_female"> <inherit>base_female</inherit> <title>the Tailor</title> <ai>Human_Vendor</ai> <shopkeeper> <restockable> <item id="153f"> <amount>10</amount> </item> <item id="1515"> <amount>10</amoun... [truncated message content] |
|
From: <dr...@pr...> - 2004-01-31 22:50:14
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1503 Modified Files: vendors.xml Log Message: Branched out the vendors. Index: vendors.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** vendors.xml 31 Jan 2004 18:20:30 -0000 1.28 --- vendors.xml 31 Jan 2004 22:48:28 -0000 1.29 *************** *** 1,2441 **** - <!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Nasdaq Boom (World of Cracking) --> <!-- ================================================================= ! | ) (\_ | WOLFPACK 13.0.0 Scripts | ! | (( _/{ "-; | Created by: DarkStorm | ! | )).-' {{ ;'` | Revised by: White Wolf | ! | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> [...2456 lines suppressed...] ! <include file="definitions/npcs/humans/vendors/fishermen.xml"/> ! <include file="definitions/npcs/humans/vendors/healer.xml"/> ! <include file="definitions/npcs/humans/vendors/herbalist.xml"/> ! <include file="definitions/npcs/humans/vendors/innkeeper.xml"/> ! <include file="definitions/npcs/humans/vendors/jeweler.xml"/> ! <include file="definitions/npcs/humans/vendors/leatherworker.xml"/> ! <include file="definitions/npcs/humans/vendors/mage.xml"/> ! <include file="definitions/npcs/humans/vendors/provisioner.xml"/> ! <include file="definitions/npcs/humans/vendors/shipwright.xml"/> ! <include file="definitions/npcs/humans/vendors/spinner.xml"/> ! <include file="definitions/npcs/humans/vendors/stablemaster.xml"/> ! <include file="definitions/npcs/humans/vendors/tailor.xml"/> ! <include file="definitions/npcs/humans/vendors/tanner.xml"/> ! <include file="definitions/npcs/humans/vendors/tavernkeeper.xml"/> ! <include file="definitions/npcs/humans/vendors/tinker.xml"/> ! <include file="definitions/npcs/humans/vendors/veterinarian.xml"/> ! <include file="definitions/npcs/humans/vendors/weaponsmith.xml"/> ! <include file="definitions/npcs/humans/vendors/weaver.xml"/> ! </definitions> |
|
From: <dr...@pr...> - 2004-01-31 22:27:46
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13633/vendors Log Message: Directory /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors added to the repository |
|
From: <co...@pr...> - 2004-01-31 22:26:57
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9699 Modified Files: wolf.dsp Log Message: Paths' to ai*.* changed Index: wolf.dsp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v retrieving revision 1.245 retrieving revision 1.246 diff -C2 -d -r1.245 -r1.246 *** wolf.dsp 22 Jan 2004 04:48:12 -0000 1.245 --- wolf.dsp 29 Jan 2004 07:30:40 -0000 1.246 *************** *** 95,111 **** # Begin Source File ! SOURCE=.\ai.cpp # End Source File # Begin Source File ! SOURCE=.\ai_animals.cpp # End Source File # Begin Source File ! SOURCE=.\ai_humans.cpp # End Source File # Begin Source File ! SOURCE=.\ai_monsters.cpp # End Source File # Begin Source File --- 95,111 ---- # Begin Source File ! SOURCE=.\ai\ai.cpp # End Source File # Begin Source File ! SOURCE=.\ai\ai_animals.cpp # End Source File # Begin Source File ! SOURCE=.\ai\ai_humans.cpp # End Source File # Begin Source File ! SOURCE=.\ai\ai_monsters.cpp # End Source File # Begin Source File *************** *** 351,355 **** # Begin Source File ! SOURCE=.\ai.h # End Source File # Begin Source File --- 351,355 ---- # Begin Source File ! SOURCE=.\ai\ai.h # End Source File # Begin Source File |
|
From: <dar...@pr...> - 2004-01-31 21:34:28
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31829/python Modified Files: global.cpp Log Message: Fixed a skin bug. Index: global.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** global.cpp 29 Jan 2004 15:34:42 -0000 1.100 --- global.cpp 31 Jan 2004 21:32:43 -0000 1.101 *************** *** 721,725 **** PyDict_SetItemString( dict, "name", PyString_FromString( tile.name ) ); PyDict_SetItemString( dict, "height", PyInt_FromLong( tile.height ) ); ! PyDict_SetItemString( dict, "weight", PyFloat_FromDouble( tile.weight ) ); PyDict_SetItemString( dict, "layer", PyInt_FromLong( tile.layer ) ); PyDict_SetItemString( dict, "animation", PyInt_FromLong( tile.animation ) ); --- 721,725 ---- PyDict_SetItemString( dict, "name", PyString_FromString( tile.name ) ); PyDict_SetItemString( dict, "height", PyInt_FromLong( tile.height ) ); ! PyDict_SetItemString( dict, "weight", PyInt_FromLong( tile.weight ) ); PyDict_SetItemString( dict, "layer", PyInt_FromLong( tile.layer ) ); PyDict_SetItemString( dict, "animation", PyInt_FromLong( tile.animation ) ); |
|
From: <dar...@pr...> - 2004-01-31 21:34:28
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31829/network Modified Files: uotxpackets.cpp Log Message: Fixed a skin bug. Index: uotxpackets.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** uotxpackets.cpp 30 Jan 2004 18:07:38 -0000 1.75 --- uotxpackets.cpp 31 Jan 2004 21:32:42 -0000 1.76 *************** *** 145,162 **** } - void cUOTxDrawChar::addEquipment( Q_UINT32 serial, Q_UINT16 model, Q_UINT8 layer, Q_UINT16 color ) - { - // Overwrite the last 4 bytes (terminator) and readd them later - Q_INT32 offset = count() - 4; - resize( count() + 9 ); - setShort( 1, count() ); - - setInt( offset, serial ); - setShort( offset+4, model|0x8000 ); - (*this)[offset+6] = layer; - setShort( offset+7, color ); - setInt( offset+9, 0 ); // Terminator - } - void cUOTxUnicodeSpeech::setText( const QString &data ) { --- 145,148 ---- *************** *** 267,273 **** setX( pChar->pos().x ); setY( pChar->pos().y ); ! setZ( pChar->pos().z ); ! setHue( pChar->skin() ); ! setBody( pChar->bodyID() ); // If he's runningSteps we need to take that into account here --- 253,264 ---- setX( pChar->pos().x ); setY( pChar->pos().y ); ! setZ( pChar->pos().z ); ! setBody(pChar->bodyID()); ! ! if (pChar->isHuman()) { ! setHue(pChar->skin() | 0x8000); ! } else { ! setHue(pChar->skin()); ! } // If he's runningSteps we need to take that into account here *************** *** 288,291 **** --- 279,297 ---- } + + void cUOTxDrawChar::addEquipment( Q_UINT32 serial, Q_UINT16 model, Q_UINT8 layer, Q_UINT16 color ) + { + // Overwrite the last 4 bytes (terminator) and readd them later + Q_INT32 offset = count() - 4; + resize( count() + 9 ); + setShort( 1, count() ); + + setInt( offset, serial ); + setShort( offset+4, model|0x8000 ); + (*this)[offset+6] = layer; + setShort( offset+7, color ); + setInt( offset+9, 0 ); // Terminator + } + void cUOTxDrawChar::fromChar( P_CHAR pChar ) { *************** *** 296,300 **** setZ( pChar->pos().z ); setDirection( pChar->direction() ); ! setColor( pChar->skin() ); if( pChar->isAtWar() ) --- 302,311 ---- setZ( pChar->pos().z ); setDirection( pChar->direction() ); ! ! if (pChar->isHuman()) { ! setColor(pChar->skin()|0x8000); ! } else { ! setColor( pChar->skin() ); ! } if( pChar->isAtWar() ) *************** *** 355,359 **** setSerial( pChar->serial() ); setBody( pChar->bodyID() ); ! setSkin( pChar->skin() ); if( pChar->isAtWar() ) --- 366,375 ---- setSerial( pChar->serial() ); setBody( pChar->bodyID() ); ! ! if (pChar->isHuman()) { ! setSkin(pChar->skin() | 0x8000); ! } else { ! setSkin(pChar->skin()); ! } if( pChar->isAtWar() ) |
|
From: <dar...@pr...> - 2004-01-31 20:29:04
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6868 Modified Files: player.cpp tilecache.h Log Message: Aszlig screwed up ^^ The tiledata was packed for a reason. Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** player.cpp 31 Jan 2004 14:48:03 -0000 1.58 --- player.cpp 31 Jan 2004 20:27:18 -0000 1.59 *************** *** 1122,1126 **** { P_ITEM pItem = 0; ! const QString &id = node->getAttribute( "id" ); if( id != QString::null ) --- 1122,1126 ---- { P_ITEM pItem = 0; ! const QString &id = node->getAttribute("id"); if( id != QString::null ) *************** *** 1158,1162 **** { unsigned char layer = pItem->layer(); ! pItem->setLayer( 0 ); if( !layer ) --- 1158,1162 ---- { unsigned char layer = pItem->layer(); ! pItem->setLayer(0); if( !layer ) Index: tilecache.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/tilecache.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tilecache.h 31 Jan 2004 01:38:29 -0000 1.15 --- tilecache.h 31 Jan 2004 20:27:18 -0000 1.16 *************** *** 51,55 **** char flag3; char flag4; ! float weight; char layer; short unknown1; --- 51,55 ---- char flag3; char flag4; ! unsigned char weight; char layer; short unknown1; |
|
From: <dar...@pr...> - 2004-01-31 19:57:30
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11490 Modified Files: dbdriver.cpp world.cpp Log Message: Fixed ` use in SQLite Index: dbdriver.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** dbdriver.cpp 24 Sep 2003 21:19:48 -0000 1.24 --- dbdriver.cpp 31 Jan 2004 19:55:43 -0000 1.25 *************** *** 210,215 **** if( error ) { ! QString err( QString( error ) + " (" + query + ")" ); ! sqlite_freemem( error ); throw err; } --- 210,215 ---- if( error ) { ! QString err( QString(error) + " (" + query + ")" ); ! sqlite_freemem(error); throw err; } Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** world.cpp 31 Jan 2004 18:39:08 -0000 1.64 --- world.cpp 31 Jan 2004 19:55:43 -0000 1.65 *************** *** 837,841 **** // check if the option already exists ! persistentBroker->executeQuery( QString( "DELETE FROM settings WHERE option = '%1'" ).arg( persistentBroker->quoteString( name ) ) ); QString sql; --- 837,841 ---- // check if the option already exists ! persistentBroker->executeQuery( QString( "DELETE FROM `settings` WHERE `option` = '%1'" ).arg( persistentBroker->quoteString( name ) ) ); QString sql; |
|
From: <dar...@pr...> - 2004-01-31 19:57:30
|
Update of /cvsroot/wpdev/wolfpack/sqlite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11490/sqlite Modified Files: tokenize.c Log Message: Fixed ` use in SQLite Index: tokenize.c =================================================================== RCS file: /cvsroot/wpdev/wolfpack/sqlite/tokenize.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tokenize.c 18 Dec 2003 13:20:24 -0000 1.2 --- tokenize.c 31 Jan 2004 19:55:43 -0000 1.3 *************** *** 221,226 **** int i; switch( *z ){ ! case ' ': case '\t': case '\n': case '\f': case '\r': { ! for(i=1; isspace(z[i]); i++){} *tokenType = TK_SPACE; return i; --- 221,226 ---- int i; switch( *z ){ ! case ' ': case '\t': case '\n': case '\f': case '\r': case '`': { ! for(i=1; isspace(z[i]) || z[i] == '`'; i++){} *tokenType = TK_SPACE; return i; |
|
From: <dar...@pr...> - 2004-01-31 19:14:12
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22672 Modified Files: key.py lock.py Log Message: Added some tooltip resending. Index: key.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/key.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** key.py 26 Jan 2004 03:45:19 -0000 1.5 --- key.py 30 Jan 2004 00:02:23 -0000 1.6 *************** *** 31,35 **** char.socket.sysmessage('You erase the lock information from the key.') ! key.update() def rename_key(char, key): --- 31,35 ---- char.socket.sysmessage('You erase the lock information from the key.') ! key.resendtooltip() def rename_key(char, key): *************** *** 127,130 **** --- 127,131 ---- if char.checkskill(TINKERING, 150, 300): key.settag('lock',target.item.gettag('lock')) + key.resendtooltip() char.socket.clilocmessage(501676) else: Index: lock.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/lock.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lock.py 25 Jan 2004 20:26:54 -0000 1.5 --- lock.py 30 Jan 2004 00:02:23 -0000 1.6 *************** *** 31,34 **** --- 31,35 ---- # Set the lock id item.settag('lock', response.text[1]) + item.resendtooltip() char.socket.sysmessage('Added the lock to the item.') *************** *** 49,52 **** --- 50,55 ---- item.deltag('locked') + item.resendtooltip() + char.socket.sysmessage('Modified the lock of this item.') *************** *** 61,64 **** --- 64,68 ---- events.remove('lock') item.events = events + item.resendtooltip() char.socket.sysmessage('The lock has been removed from the item.') |
|
From: <thi...@pr...> - 2004-01-31 18:43:46
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12176 Modified Files: console_unix.cpp pythonscript.h Log Message: clean-up Index: console_unix.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console_unix.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** console_unix.cpp 8 Jan 2004 08:33:38 -0000 1.11 --- console_unix.cpp 31 Jan 2004 18:42:02 -0000 1.12 *************** *** 183,199 **** if( sMessage.contains( "\n" ) ) { - #if defined(Q_OS_UNIX) && 0 - sMessage.replace("\e[0m", ""); - sMessage.replace("\e[1;32m", ""); - sMessage.replace("\e[1;32m", ""); - sMessage.replace("\e[1;31m", ""); - sMessage.replace("\e[1;33m", ""); - sMessage.replace("\e[1;37m", ""); - #endif incompleteLine_.append( sMessage ); // Split by \n QStringList lines = QStringList::split( "\n", incompleteLine_, true ); // Insert all except the last element ! for( int i = 0; i < lines.count()-1; ++i ) linebuffer_.push_back( lines[i] ); --- 183,191 ---- if( sMessage.contains( "\n" ) ) { incompleteLine_.append( sMessage ); // Split by \n QStringList lines = QStringList::split( "\n", incompleteLine_, true ); // Insert all except the last element ! for( uint i = 0; i < lines.count()-1; ++i ) linebuffer_.push_back( lines[i] ); Index: pythonscript.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pythonscript.h 30 Jan 2004 23:28:42 -0000 1.13 --- pythonscript.h 31 Jan 2004 18:42:02 -0000 1.14 *************** *** 128,129 **** --- 128,130 ---- #endif // __WPPYTHONSCRIPT_H__ + |
|
From: <dar...@pr...> - 2004-01-31 18:40:54
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9699 Modified Files: world.cpp Log Message: Fixed saving options. Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** world.cpp 30 Jan 2004 23:28:42 -0000 1.63 --- world.cpp 31 Jan 2004 18:39:08 -0000 1.64 *************** *** 837,859 **** // check if the option already exists ! cDBResult res = persistentBroker->query( QString( "SELECT option,value FROM settings WHERE option = '%1'" ).arg( persistentBroker->quoteString( name ) ) ); QString sql; ! ! if( !res.isValid() || !res.fetchrow() ) ! { ! sql = "INSERT INTO settings VALUES('%1','%2')"; ! sql = sql.arg( persistentBroker->quoteString( name ) ).arg( persistentBroker->quoteString( value ) ); ! } ! else ! { ! sql = "UPDATE settings SET value='%1' WHERE option='%2'"; ! sql = sql.arg( persistentBroker->quoteString( value ) ).arg( persistentBroker->quoteString( name ) ); ! } ! ! res.free(); persistentBroker->executeQuery( sql ); - persistentBroker->disconnect(); } --- 837,847 ---- // check if the option already exists ! persistentBroker->executeQuery( QString( "DELETE FROM settings WHERE option = '%1'" ).arg( persistentBroker->quoteString( name ) ) ); QString sql; ! sql = "INSERT INTO settings VALUES('%1','%2')"; ! sql = sql.arg( persistentBroker->quoteString( name ) ).arg( persistentBroker->quoteString( value ) ); persistentBroker->executeQuery( sql ); persistentBroker->disconnect(); } |
|
From: <dar...@pr...> - 2004-01-31 18:22:14
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25516/npcs/humans Modified Files: vendors.xml Log Message: fixed speech events. Index: vendors.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** vendors.xml 24 Nov 2003 03:15:33 -0000 1.27 --- vendors.xml 31 Jan 2004 18:20:30 -0000 1.28 *************** *** 13,17 **** <inherit>base_male</inherit> <title>the Banker</title> ! <events>speech_banker</events> <bindmenu>banker_menu</bindmenu> <ai>Human_Vendor</ai> --- 13,17 ---- <inherit>base_male</inherit> <title>the Banker</title> ! <events>speech.banker</events> <bindmenu>banker_menu</bindmenu> <ai>Human_Vendor</ai> *************** *** 25,29 **** <inherit>base_female</inherit> <title>the Banker</title> ! <events>speech_banker</events> <bindmenu>banker_menu</bindmenu> <ai>Human_Vendor</ai> --- 25,29 ---- <inherit>base_female</inherit> <title>the Banker</title> ! <events>speech.banker</events> <bindmenu>banker_menu</bindmenu> <ai>Human_Vendor</ai> *************** *** 38,42 **** <inherit>base_male</inherit> <title>the Barber</title> ! <events>speech_barber</events> <category>Vendors\Barber (Male)</category> </npc> --- 38,42 ---- <inherit>base_male</inherit> <title>the Barber</title> ! <events>speech.barber</events> <category>Vendors\Barber (Male)</category> </npc> *************** *** 44,48 **** <inherit>base_female</inherit> <title>the Barber</title> ! <events>speech_barber</events> <category>Vendors\Barber (Female)</category> </npc> --- 44,48 ---- <inherit>base_female</inherit> <title>the Barber</title> ! <events>speech.barber</events> <category>Vendors\Barber (Female)</category> </npc> |
|
From: <dar...@pr...> - 2004-01-31 18:14:44
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18338/items/professions Modified Files: carpenter.xml Log Message: Preliminary carpentry fix. Index: carpenter.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/carpenter.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** carpenter.xml 30 Dec 2002 18:42:09 -0000 1.3 --- carpenter.xml 31 Jan 2004 18:12:52 -0000 1.4 *************** *** 259,262 **** --- 259,263 ---- <id>0x1028</id> <category>Professions\Carpenter\Dovetail Saw (N/S)</category> + <events>skills.carpentry</events> </item> *************** *** 269,272 **** --- 270,274 ---- <id>0x102a</id> <category>Professions\Carpenter\Hammer 1</category> + <events>skills.carpentry</events> </item> *************** *** 279,282 **** --- 281,285 ---- <id>0x102c</id> <category>Professions\Carpenter\Moulding Planes (N/S)</category> + <events>skills.carpentry</events> </item> *************** *** 289,292 **** --- 292,296 ---- <id>0x102e</id> <category>Professions\Carpenter\Nails (W/E)</category> + <events>skills.carpentry</events> </item> *************** *** 299,302 **** --- 303,307 ---- <id>0x1030</id> <category>Professions\Carpenter\Jointing Plane (N/S)</category> + <events>skills.carpentry</events> </item> *************** *** 309,312 **** --- 314,318 ---- <id>0x1032</id> <category>Professions\Carpenter\Smoothing Plane (N/S)</category> + <events>skills.carpentry</events> </item> *************** *** 319,322 **** --- 325,329 ---- <id>0x1034</id> <category>Professions\Carpenter\Saw (N/S)</category> + <events>skills.carpentry</events> </item> *************** *** 329,332 **** --- 336,340 ---- <id>0x10e4</id> <category>Professions\Carpenter\Draw Knife</category> + <events>skills.carpentry</events> </item> *************** *** 334,337 **** --- 342,346 ---- <id>0x10e5</id> <category>Professions\Carpenter\Froe</category> + <events>skills.carpentry</events> </item> *************** *** 339,342 **** --- 348,352 ---- <id>0x10e6</id> <category>Professions\Carpenter\Inshave</category> + <events>skills.carpentry</events> </item> *************** *** 344,347 **** --- 354,358 ---- <id>0x10e7</id> <category>Professions\Carpenter\Scorp</category> + <events>skills.carpentry</events> </item> |
|
From: <dar...@pr...> - 2004-01-31 18:14:34
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18189 Modified Files: makemenus.cpp targetrequests.cpp Log Message: .additem and makemenu fix. Index: makemenus.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/makemenus.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** makemenus.cpp 11 Jan 2004 04:54:07 -0000 1.62 --- makemenus.cpp 31 Jan 2004 18:12:42 -0000 1.63 *************** *** 1438,1442 **** addHtmlGump( 245, 39, 270, 20, htmlmask.arg( action->name() ) ); ! cMakeCustomSection* pMCS = dynamic_cast< cMakeCustomSection* >( makesections[0] ); if( ( makesections.size() > 0 ) && ( pMCS ) ) { --- 1438,1447 ---- addHtmlGump( 245, 39, 270, 20, htmlmask.arg( action->name() ) ); ! cMakeCustomSection* pMCS = 0; ! ! if (makesections.size() > 0) { ! pMCS = dynamic_cast<cMakeCustomSection*>( makesections[0] ); ! } ! if( ( makesections.size() > 0 ) && ( pMCS ) ) { Index: targetrequests.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** targetrequests.cpp 31 Jan 2004 01:38:29 -0000 1.83 --- targetrequests.cpp 31 Jan 2004 18:12:42 -0000 1.84 *************** *** 96,100 **** newPos.x = target->x(); newPos.y = target->y(); ! newPos.z = target->z() + TileCache::instance()->tileHeight( target->model() ); // Model Could be an NPC as well i dont like the idea... pItem->moveTo( newPos ); --- 96,105 ---- newPos.x = target->x(); newPos.y = target->y(); ! if (target->model() != 0 && target->model() != 0xFFFF) { ! newPos.z = target->z() + TileCache::instance()->tileHeight( target->model() ); // Model Could be an NPC as well i dont like the idea... ! } else { ! newPos.z = target->z(); ! } ! pItem->moveTo( newPos ); |
|
From: <as...@pr...> - 2004-01-31 17:03:15
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10549 Modified Files: house.cpp Log Message: removed the backtick quotes around table/field names. Index: house.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/house.cpp,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** house.cpp 30 Jan 2004 23:28:35 -0000 1.121 --- house.cpp 31 Jan 2004 17:01:29 -0000 1.122 *************** *** 354,358 **** return false; ! persistentBroker->addToDeleteQueue( "houses", QString( "`serial` = '%1'" ).arg( serial() ) ); return cMulti::del(); --- 354,358 ---- return false; ! persistentBroker->addToDeleteQueue( "houses", QString( "serial = '%1'" ).arg( serial() ) ); return cMulti::del(); *************** *** 368,372 **** QStringList fields, tables, conditions; buildSqlString( fields, tables, conditions ); // Build our SQL string ! QString sqlString = QString( "SELECT %1 FROM `uobjectmap`,%2 WHERE uobjectmap.type = 'cHouse' AND %3" ).arg( fields.join( "," ) ).arg( tables.join( "," ) ).arg( conditions.join( " AND " ) ); UObjectFactory::instance()->registerType("cHouse", productCreator); UObjectFactory::instance()->registerSqlQuery( "cHouse", sqlString ); --- 368,372 ---- QStringList fields, tables, conditions; buildSqlString( fields, tables, conditions ); // Build our SQL string ! QString sqlString = QString( "SELECT %1 FROM uobjectmap,%2 WHERE uobjectmap.type = 'cHouse' AND %3" ).arg( fields.join( "," ) ).arg( tables.join( "," ) ).arg( conditions.join( " AND " ) ); UObjectFactory::instance()->registerType("cHouse", productCreator); UObjectFactory::instance()->registerSqlQuery( "cHouse", sqlString ); |
|
From: <dar...@pr...> - 2004-01-31 15:21:53
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20803 Modified Files: book.py Log Message: Fixed tooltip refresh Index: book.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/book.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** book.py 29 Jan 2004 22:37:52 -0000 1.4 --- book.py 29 Jan 2004 23:59:44 -0000 1.5 *************** *** 91,111 **** # Request Update def onBookUpdatePage(char, item, page, content): ! if item.hastag('protected'): ! char.message('This book is read only.') ! return ! ! if item.hastag( 'pages' ): ! pages = int(item.gettag('pages')) ! else: ! pages = 64 ! ! if page > pages or page < 1: ! return ! ! if not content or len(content.strip()) == 0: ! item.deltag('page%u' % page) ! return ! ! item.settag( 'page%u' % page, content ) def onBookUpdateInfo(char, item, title, author): --- 91,112 ---- # Request Update def onBookUpdatePage(char, item, page, content): ! if item.hastag('protected'): ! char.message('This book is read only.') ! return ! ! if item.hastag( 'pages' ): ! pages = int(item.gettag('pages')) ! else: ! pages = 64 ! ! if page > pages or page < 1: ! return ! ! if not content or len(content.strip()) == 0: ! item.deltag('page%u' % page) ! return ! ! item.settag( 'page%u' % page, content ) ! item.resendtooltip() def onBookUpdateInfo(char, item, title, author): *************** *** 120,121 **** --- 121,123 ---- item.name = title + item.resendtooltip() |
