wpdev-commits Mailing List for Wolfpack Emu (Page 39)
Brought to you by:
rip,
thiagocorrea
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
From: Sebastian H. <dar...@us...> - 2004-09-18 04:26:34
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32458/network Modified Files: uosocket.cpp Log Message: Fixed #0000187 Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.412 retrieving revision 1.413 diff -C2 -d -r1.412 -r1.413 *** uosocket.cpp 16 Sep 2004 01:40:17 -0000 1.412 --- uosocket.cpp 18 Sep 2004 04:26:26 -0000 1.413 *************** *** 2180,2184 **** // Check if there really was a response or if it just was canceled ! if ( !packet->serial() && ( ( packet->x() == 0xFFFF ) || ( packet->y() == 0xFFFF ) || ( ( Q_UINT8 ) packet->z() == 0xFF ) ) ) targetRequest->canceled( this ); else --- 2180,2184 ---- // Check if there really was a response or if it just was canceled ! if ( !packet->serial() && ( ( packet->x() == 0xFFFF ) || ( packet->y() == 0xFFFF ) ) ) targetRequest->canceled( this ); else |
From: Sebastian H. <dar...@us...> - 2004-09-18 04:26:34
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32458 Modified Files: ChangeLog Log Message: Fixed #0000187 Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** ChangeLog 17 Sep 2004 23:32:58 -0000 1.60 --- ChangeLog 18 Sep 2004 04:26:25 -0000 1.61 *************** *** 25,28 **** --- 25,29 ---- - Improved NPC walking. - Fixed bug #0000317. (Server not refusing to load even when accounts db corrupt) + - Fixed bug #0000187. (Land and Static targets on height -1 were broken) Wolfpack 12.9.10 Beta (10. September 2004) |
From: Sebastian H. <dar...@us...> - 2004-09-18 01:32:21
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6258 Modified Files: basedef.cpp Log Message: Base Definition fix. Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** basedef.cpp 14 Sep 2004 00:00:37 -0000 1.19 --- basedef.cpp 18 Sep 2004 01:32:12 -0000 1.20 *************** *** 170,173 **** --- 170,185 ---- lootPacks_ = node->text(); } + else if ( node->name() == "inherit" ) + { + QString inheritID; + if ( node->hasAttribute( "id" ) ) + inheritID = node ->getAttribute( "id" ); + else + inheritID = node->value(); + + const cElement* element = Definitions::instance()->getDefinition( WPDT_NPC, inheritID ); + if ( element ) + applyDefinition( element ); + } else { *************** *** 399,402 **** --- 411,426 ---- setWaterSource( node->value().toUInt() != 0 ); } + else if ( node->name() == "inherit" ) + { + QString inheritID; + if ( node->hasAttribute( "id" ) ) + inheritID = node ->getAttribute( "id" ); + else + inheritID = node->value(); + + const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, inheritID ); + if ( element ) + applyDefinition( element ); + } else { |
From: Sebastian H. <dar...@us...> - 2004-09-18 01:21:39
|
Update of /cvsroot/wpdev/xmlscripts/definitions/menus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4395/menus Modified Files: contextmenu.xml Log Message: fixes for context menus Index: contextmenu.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/menus/contextmenu.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** contextmenu.xml 27 Aug 2004 14:43:29 -0000 1.19 --- contextmenu.xml 18 Sep 2004 01:21:30 -0000 1.20 *************** *** 8,12 **** <definitions> <contextmenu id="train_menu"> ! <basescripts>contextmenus.trainmenu</basescripts> <option tag="1" msgid="6000" checkvisible="true" checkenabled="true" /> <!-- Alchemy --> <option tag="2" msgid="6001" checkvisible="true" checkenabled="true" /> <!-- Anatomy --> --- 8,12 ---- <definitions> <contextmenu id="train_menu"> ! <scripts>contextmenus.trainmenu</scripts> <option tag="1" msgid="6000" checkvisible="true" checkenabled="true" /> <!-- Alchemy --> <option tag="2" msgid="6001" checkvisible="true" checkenabled="true" /> <!-- Anatomy --> *************** *** 61,65 **** <contextmenu id="vendor_menu"> ! <basescripts>contextmenus.vendormenu</basescripts> <option tag="1" msgid="6103" /> <option tag="2" msgid="6104" /> --- 61,65 ---- <contextmenu id="vendor_menu"> ! <scripts>contextmenus.vendormenu</scripts> <option tag="1" msgid="6103" /> <option tag="2" msgid="6104" /> *************** *** 67,71 **** <contextmenu id="banker_menu"> ! <basescripts>contextmenus.bankermenu</basescripts> <option tag="1" msgid="6105"/> <option tag="2" msgid="6124"/> --- 67,71 ---- <contextmenu id="banker_menu"> ! <scripts>contextmenus.bankermenu</scripts> <option tag="1" msgid="6105"/> <option tag="2" msgid="6124"/> *************** *** 73,92 **** <contextmenu id="paperdoll_menu"> ! <basescripts>contextmenus.paperdollmenu</basescripts> <option tag="1" msgid="6123"/> </contextmenu> <contextmenu id="healer_menu"> ! <basescripts>contextmenus.healermenu</basescripts> <option tag="1" msgid="0489" checkvisible="true" /> </contextmenu> <contextmenu id="tame_menu"> ! <basescripts>contextmenus.tamemenu</basescripts> <option tag="1" msgid="6130" checkvisible="true" /> </contextmenu> <contextmenu id="pet_menu"> ! <basescripts>contextmenus.petmenu</basescripts> <option tag="1" msgid="6111" checkvisible="true" /> <option tag="2" msgid="6108" checkvisible="true" /> --- 73,92 ---- <contextmenu id="paperdoll_menu"> ! <scripts>contextmenus.paperdollmenu</scripts> <option tag="1" msgid="6123"/> </contextmenu> <contextmenu id="healer_menu"> ! <scripts>contextmenus.healermenu</scripts> <option tag="1" msgid="0489" checkvisible="true" /> </contextmenu> <contextmenu id="tame_menu"> ! <scripts>contextmenus.tamemenu</scripts> <option tag="1" msgid="6130" checkvisible="true" /> </contextmenu> <contextmenu id="pet_menu"> ! <scripts>contextmenus.petmenu</scripts> <option tag="1" msgid="6111" checkvisible="true" /> <option tag="2" msgid="6108" checkvisible="true" /> *************** *** 109,113 **** <contextmenu id="ITEM_MENU"> ! <basescripts>daggermenu</basescripts> <option tag="5" msgid="5121" /> </contextmenu> --- 109,113 ---- <contextmenu id="ITEM_MENU"> ! <scripts>daggermenu</scripts> <option tag="5" msgid="5121" /> </contextmenu> |
From: Sebastian H. <dar...@us...> - 2004-09-17 23:35:27
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16829/commands Modified Files: info.py Log Message: info fix Index: info.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** info.py 14 Sep 2004 14:24:02 -0000 1.21 --- info.py 17 Sep 2004 23:35:09 -0000 1.22 *************** *** 1261,1264 **** --- 1261,1265 ---- if choice.button == 1: iteminfo( socket, item ) + item.update() |
From: Sebastian H. <dar...@us...> - 2004-09-17 23:33:07
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16372 Modified Files: ChangeLog accounts.cpp Log Message: Fixed bug #0000317 Index: accounts.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/accounts.cpp,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** accounts.cpp 3 Sep 2004 20:37:43 -0000 1.103 --- accounts.cpp 17 Sep 2004 23:32:58 -0000 1.104 *************** *** 410,415 **** if ( !PersistentBroker::instance()->openDriver( Config::instance()->accountsDriver() ) ) { ! Console::instance()->log( LOG_ERROR, QString( "Unknown Account Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->accountsDriver() ) ); ! return; } --- 410,414 ---- if ( !PersistentBroker::instance()->openDriver( Config::instance()->accountsDriver() ) ) { ! throw wpException( QString( "Unknown Account Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->accountsDriver() ) ); } *************** *** 474,482 **** catch ( QString& error ) { ! Console::instance()->log( LOG_ERROR, QString( "Error while loading Accounts: %1" ).arg( error ) ); } catch ( ... ) { ! Console::instance()->log( LOG_ERROR, "Unknown error while loading Accounts" ); } --- 473,481 ---- catch ( QString& error ) { ! throw wpException( QString( "Error while loading Accounts: %1" ).arg( error ) ); } catch ( ... ) { ! throw wpException( "Unknown error while loading Accounts" ); } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** ChangeLog 17 Sep 2004 23:28:15 -0000 1.59 --- ChangeLog 17 Sep 2004 23:32:58 -0000 1.60 *************** *** 24,27 **** --- 24,28 ---- - Fixed negative z values for spawnregion xml files. - Improved NPC walking. + - Fixed bug #0000317. (Server not refusing to load even when accounts db corrupt) Wolfpack 12.9.10 Beta (10. September 2004) |
From: Sebastian H. <dar...@us...> - 2004-09-17 23:28:35
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15468/ai Modified Files: ai.cpp ai.h Log Message: improved npc walking and wandering. Index: ai.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ai.h 10 Sep 2004 04:06:27 -0000 1.13 --- ai.h 17 Sep 2004 23:28:17 -0000 1.14 *************** *** 33,36 **** --- 33,37 ---- // wolfpack includes + #include "../basics.h" #include "../factory.h" #include "../definable.h" Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ai.cpp 10 Sep 2004 04:06:27 -0000 1.28 --- ai.cpp 17 Sep 2004 23:28:16 -0000 1.29 *************** *** 479,482 **** --- 479,483 ---- return; } + m_npc->setNextMoveTime(); *************** *** 498,501 **** --- 499,508 ---- // Calculate the field we're facing. unsigned char dir = m_npc->direction(); + + // There is a 5% chance of changing the direction + if (!RandomNum(0, 19)) { + dir = RandomNum(0, 7); + } + Coord_cl newpos = Movement::instance()->calcCoordFromDir( dir, m_npc->pos() ); *************** *** 531,536 **** } ! m_npc->setDirection( newdir ); ! m_npc->update(); } --- 538,542 ---- } ! Movement::instance()->Walking( m_npc, newdir, 0xFF ); } *************** *** 545,549 **** dir = RandomNum( 0, 7 ); - m_npc->setDirection( dir ); Movement::instance()->Walking( m_npc, dir, 0xFF ); break; --- 551,554 ---- *************** *** 557,561 **** Q_UINT8 dir = m_npc->pos().direction( Coord_cl( rndx, rndy ) ); - m_npc->setDirection( dir ); Movement::instance()->Walking( m_npc, dir, 0xFF ); break; --- 562,565 ---- *************** *** 575,579 **** Q_UINT8 dir = m_npc->pos().direction( pos ); - m_npc->setDirection( dir ); Movement::instance()->Walking( m_npc, dir, 0xFF ); break; --- 579,582 ---- *************** *** 639,643 **** } - m_npc->setDirection( dir ); Movement::instance()->Walking( m_npc, dir, 0xFF ); } --- 642,645 ---- *************** *** 673,677 **** Coord_cl nextmove = m_npc->nextMove(); Q_UINT8 dir = m_npc->pos().direction( nextmove ); - m_npc->setDirection( dir ); Movement::instance()->Walking( m_npc, dir, 0xFF ); m_npc->popMove(); --- 675,678 ---- |
From: Sebastian H. <dar...@us...> - 2004-09-17 23:28:35
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15468 Modified Files: ChangeLog npc.cpp Log Message: improved npc walking and wandering. Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** ChangeLog 17 Sep 2004 22:52:32 -0000 1.58 --- ChangeLog 17 Sep 2004 23:28:15 -0000 1.59 *************** *** 23,26 **** --- 23,27 ---- - Added support for the Samurai Empire map. - Fixed negative z values for spawnregion xml files. + - Improved NPC walking. Wolfpack 12.9.10 Beta (10. September 2004) Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** npc.cpp 14 Sep 2004 00:00:38 -0000 1.114 --- npc.cpp 17 Sep 2004 23:28:16 -0000 1.115 *************** *** 265,271 **** // Wander slowly if wandering freely. ! if ( wanderType() == enFreely || wanderType() == enCircle || wanderType() == enRectangle ) { interval *= 3; } --- 265,272 ---- // Wander slowly if wandering freely. ! if ( wanderType() == enFreely || wanderType() == enCircle || wanderType() == enRectangle || wanderType() == enWanderSpawnregion ) { interval *= 3; + interval += RandomNum(1000, 5000); } |
From: Sebastian H. <dar...@us...> - 2004-09-17 23:05:58
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10808/system Modified Files: spawns.py Log Message: fixed spawngem circle wander. Index: spawns.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/spawns.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** spawns.py 25 Aug 2004 17:03:06 -0000 1.6 --- spawns.py 17 Sep 2004 23:05:48 -0000 1.7 *************** *** 17,20 **** --- 17,22 ---- npc.settag('spawner', spawner.serial) npc.wandertype = 3 + npc.wanderx1 = spawner.pos.x + npc.wandery1 = spawner.pos.y npc.wanderradius = area npc.addscript( 'system.spawns' ) |
From: Sebastian H. <dar...@us...> - 2004-09-17 22:59:07
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9288/npcs/monsters/elemental Modified Files: blood_elemental.xml Log Message: lesser blood elemental Index: blood_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/blood_elemental.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** blood_elemental.xml 7 Sep 2004 00:28:03 -0000 1.12 --- blood_elemental.xml 17 Sep 2004 22:58:58 -0000 1.13 *************** *** 45,48 **** --- 45,81 ---- <category>Monsters\Elementals\Blood Elemental</category> </npc> + + <npc id="lesser_blood_elemental" inherit="blood_elemental"> + <name>lesser blood elemental</name> + <inherit id="KARMA_L3" /> + <inherit id="FAME_L3" /> + <str><random min="276" max="315"/></str> + <dex><random min="66" max="85"/></dex> + <int><random min="126" max="150"/></int> + <maxhitpoints><random min="160" max="170"/></maxhitpoints> + <category>Monsters\Elementals\Blood Elemental (Lesser)</category> + <!-- Skills --> + <magicresistance><random min="501" max="650"/></magicresistance> + <tactics><random min="701" max="800"/></tactics> + <wrestling><random min="701" max="800"/></wrestling> + + <!-- Damage --> + <mindamage>37</mindamage> + <maxdamage>41</maxdamage> + <tag name="dmg_energy" value="50" type="int" /> + <tag name="dmg_poison" value="50" type="int" /> + + <!-- Resists --> + <tag name="res_cold" value="30,40" type="int" /> + <tag name="res_energy" value="20,30" type="int" /> + <tag name="res_fire" value="10,20" type="int" /> + <tag name="res_physical" value="45,55" type="int" /> + <tag name="res_poison" value="40,50" type="int" /> + + <!-- Misc --> + <desc>Formed from the blood of the dead, blood elementals are strong magic-users, and an aggressive and formidable foe. You have blood, and they want it.</desc> + <!-- Missing: Reagents, Level 5 Map --> + <lootpacks>lootpack_filthy_rich</lootpacks> + </npc> </definitions> |
From: Sebastian H. <dar...@us...> - 2004-09-17 22:52:43
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8233 Modified Files: ChangeLog Log Message: Spawnregoin fix. Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** ChangeLog 17 Sep 2004 16:33:59 -0000 1.57 --- ChangeLog 17 Sep 2004 22:52:32 -0000 1.58 *************** *** 22,25 **** --- 22,26 ---- pets not being reset. - Added support for the Samurai Empire map. + - Fixed negative z values for spawnregion xml files. Wolfpack 12.9.10 Beta (10. September 2004) |
From: Sebastian H. <dar...@us...> - 2004-09-17 22:52:26
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8206 Modified Files: spawnregions.cpp Log Message: Spawnregoin fix. Index: spawnregions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** spawnregions.cpp 27 Aug 2004 18:56:59 -0000 1.68 --- spawnregions.cpp 17 Sep 2004 22:52:17 -0000 1.69 *************** *** 193,197 **** if ( Tag->hasAttribute( "z" ) ) ! this->z_.push_back( Tag->getAttribute( "z" ).toUShort() ); else this->z_.push_back( 255 ); --- 193,197 ---- if ( Tag->hasAttribute( "z" ) ) ! this->z_.push_back( Tag->getAttribute( "z" ).toShort() ); else this->z_.push_back( 255 ); |
From: Sebastian H. <dar...@us...> - 2004-09-17 20:40:33
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18083/ai Modified Files: ai_monsters.cpp Log Message: Removed debugging code. Index: ai_monsters.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ai_monsters.cpp 10 Sep 2004 04:06:27 -0000 1.21 --- ai_monsters.cpp 17 Sep 2004 20:40:23 -0000 1.22 *************** *** 70,74 **** } ! if (!npc->lineOfSight(victim, true)) { return false; } --- 70,74 ---- } ! if (!npc->lineOfSight(victim)) { return false; } |
From: Sebastian H. <dar...@us...> - 2004-09-17 18:19:55
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22328/system Modified Files: pages.py Log Message: pages unicode fix. Index: pages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/pages.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pages.py 3 Sep 2004 00:53:54 -0000 1.2 --- pages.py 17 Sep 2004 18:19:46 -0000 1.3 *************** *** 156,160 **** html = "<body text=\"#0000FF\" leftmargin=\"0\" topmargin=\"0\" marginwidth=\"0\" marginheight=\"0\">%s</body>" % "<br>".join(self.message) gump.addResizeGump( 45, 180, 0xBB8, 345, 84 ) ! gump.addHtmlGump( 50, 180, 340, 80, html ) # Commands --- 156,160 ---- html = "<body text=\"#0000FF\" leftmargin=\"0\" topmargin=\"0\" marginwidth=\"0\" marginheight=\"0\">%s</body>" % "<br>".join(self.message) gump.addResizeGump( 45, 180, 0xBB8, 345, 84 ) ! gump.addHtmlGump( 50, 180, 340, 80, unicode(html) ) # Commands |
From: Sebastian H. <dar...@us...> - 2004-09-17 18:07:04
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19562/magic Modified Files: circle2.py spellbook.py Log Message: spellbook updates Index: spellbook.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spellbook.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** spellbook.py 14 Sep 2004 03:58:05 -0000 1.11 --- spellbook.py 17 Sep 2004 18:06:53 -0000 1.12 *************** *** 204,208 **** # This is annoying and eats bandwith but its the only way to "reopen" the spellbook # once its already open. ! char.socket.removeobject(item) char.socket.sendobject(item) --- 204,210 ---- # This is annoying and eats bandwith but its the only way to "reopen" the spellbook # once its already open. ! #char.socket.removeobject(item) ! if item.container and item.container.isitem(): ! char.socket.sendobject(item.container) char.socket.sendobject(item) Index: circle2.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle2.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** circle2.py 25 Aug 2004 17:03:05 -0000 1.11 --- circle2.py 17 Sep 2004 18:06:53 -0000 1.12 *************** *** 155,159 **** # Remove Magic Resistance Skill ! amount = 35 - int(char.skill[INSCRIPTION] / 200) if char.skill[MAGICRESISTANCE] - amount < 0: amount = char.skill[MAGICRESISTANCE] --- 155,159 ---- # Remove Magic Resistance Skill ! amount = 350 - int(char.skill[INSCRIPTION] / 200) if char.skill[MAGICRESISTANCE] - amount < 0: amount = char.skill[MAGICRESISTANCE] |
From: Sebastian H. <dar...@us...> - 2004-09-17 18:07:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19562/commands Modified Files: __init__.py Log Message: spellbook updates Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/__init__.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** __init__.py 16 Sep 2004 16:42:28 -0000 1.19 --- __init__.py 17 Sep 2004 18:06:52 -0000 1.20 *************** *** 119,122 **** --- 119,155 ---- """ + \command goname + \usage - <code>goname name</code> + \description Go to the first character found with the given name. + """ + def goname(socket, command, arguments): + if len(arguments) == 0: + socket.sysmessage('Usage: goname <name>') + return + + chars = wolfpack.chariterator() + + char = chars.first + found = None + name = hash(arguments.lower()) + + while char: + if hash(char.name.lower()) == name: + found = char + break + + char = chars.next + + if not found: + socket.sysmessage('A character with the given name was not found.') + else: + socket.sysmessage("Going to character '%s' [Serial: 0x%x]." % (found.name, found.serial)) + pos = found.pos + socket.player.removefromview() + socket.player.moveto(pos) + socket.player.update() + socket.resendworld() + + """ \command gouid \usage - <code>gouid serial</code> *************** *** 134,137 **** --- 167,171 ---- if item: container = item.getoutmostitem() + if container.container: container = container.container *************** *** 144,147 **** --- 178,185 ---- socket.player.update() socket.resendworld() + + if item.container.isitem(): + socket.sendobject(item.container) + socket.sendcontainer(item.container) else: socket.sysmessage('No item with the serial 0x%x could be found.' % uid) *************** *** 215,218 **** --- 253,257 ---- wolfpack.registercommand("followers", followers) wolfpack.registercommand("gouid", gouid) + wolfpack.registercommand("goname", goname) wolfpack.registercommand("newlos", newlos) |
From: Sebastian H. <dar...@us...> - 2004-09-17 16:34:18
|
Update of /cvsroot/wpdev/wolfpack/muls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1614/muls Modified Files: maps.cpp Log Message: crashfix Index: maps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** maps.cpp 16 Sep 2004 01:40:17 -0000 1.11 --- maps.cpp 17 Sep 2004 16:34:01 -0000 1.12 *************** *** 266,269 **** --- 266,270 ---- registerMap( 2, "map2.mul", 288, 200, "statics2.mul", "staidx2.mul" ); registerMap( 3, "map3.mul", 320, 256, "statics3.mul", "staidx3.mul" ); + registerMap( 4, "map4.mul", 181, 181, "statics4.mul", "staidx4.mul" ); cComponent::load(); |
From: Sebastian H. <dar...@us...> - 2004-09-17 16:34:18
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1614 Modified Files: ChangeLog player.cpp sectors.cpp Log Message: crashfix Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** player.cpp 9 Sep 2004 02:36:24 -0000 1.130 --- player.cpp 17 Sep 2004 16:33:59 -0000 1.131 *************** *** 1746,1749 **** --- 1746,1766 ---- } + // Remove the owner tag from all of our followers + CharContainer::iterator it; + for (it = pets_.begin(); it != pets_.end(); ++it) { + P_NPC npc = dynamic_cast<P_NPC>((*it)); + + if (npc && npc->owner() == this) { + npc->setOwner(NULL, true); + npc->setTamed(false); + + // Remove his stabled NPCs. + if (npc->stablemasterSerial() != INVALID_SERIAL) { + npc->remove(); + } + } + } + pets_.clear(); + cBaseChar::remove(); } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** ChangeLog 16 Sep 2004 18:52:43 -0000 1.56 --- ChangeLog 17 Sep 2004 16:33:59 -0000 1.57 *************** *** 19,22 **** --- 19,25 ---- - Completely rewrote line of sight. - Fixed a crashbug related to trying to remove basescripts from objects. + - Fixed a crasbhug related to players being removed and the owner property of their + pets not being reset. + - Added support for the Samurai Empire map. Wolfpack 12.9.10 Beta (10. September 2004) Index: sectors.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/sectors.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** sectors.cpp 15 Sep 2004 02:15:28 -0000 1.31 --- sectors.cpp 17 Sep 2004 16:34:00 -0000 1.32 *************** *** 305,308 **** --- 305,309 ---- addMap( 2, 2304, 1600 ); addMap( 3, 2560, 2048 ); + addMap( 4, 1448, 1448 ); cComponent::load(); |
From: Sebastian H. <dar...@us...> - 2004-09-16 18:52:52
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6538 Modified Files: ChangeLog uobject.cpp Log Message: crashfix Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.184 retrieving revision 1.185 diff -C2 -d -r1.184 -r1.185 *** uobject.cpp 14 Sep 2004 00:14:39 -0000 1.184 --- uobject.cpp 16 Sep 2004 18:52:43 -0000 1.185 *************** *** 392,397 **** } ! if ( !hasScript( name ) ) ! { return; } --- 392,408 ---- } ! bool found = false; ! if (scriptChain) { ! unsigned int count = reinterpret_cast<unsigned int>( scriptChain[0] ); ! ! for ( unsigned int i = 1; i <= count; ++i ) ! { ! if ( scriptChain[i]->name() == name ) ! found = true; ! break; ! } ! } ! ! if (!found) { return; } *************** *** 433,440 **** changed_ = true; ! if ( event && event->canHandleEvent( EVENT_ATTACH ) ) { PyObject* args = Py_BuildValue( "(N)", getPyObject() ); ! event->callEvent( EVENT_ATTACH, args ); Py_DECREF( args ); } --- 444,451 ---- changed_ = true; ! if ( event && event->canHandleEvent( EVENT_DETACH ) ) { PyObject* args = Py_BuildValue( "(N)", getPyObject() ); ! event->callEvent( EVENT_DETACH, args ); Py_DECREF( args ); } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** ChangeLog 16 Sep 2004 18:45:01 -0000 1.55 --- ChangeLog 16 Sep 2004 18:52:43 -0000 1.56 *************** *** 18,21 **** --- 18,22 ---- - Fixed bug #0000309. (Console in web administration caused endless loop) - Completely rewrote line of sight. + - Fixed a crashbug related to trying to remove basescripts from objects. Wolfpack 12.9.10 Beta (10. September 2004) |
From: Sebastian H. <dar...@us...> - 2004-09-16 18:46:46
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4603 Modified Files: coord.cpp Log Message: Removed line of sight debugging. Index: coord.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** coord.cpp 16 Sep 2004 16:43:27 -0000 1.62 --- coord.cpp 16 Sep 2004 18:46:33 -0000 1.63 *************** *** 261,267 **** // Play an effect for the tile if (blocked) { ! point.effect(0x181D, 10, 50, 0x21); return false; ! } else { point.effect(0x181D, 10, 50, 0x44); } --- 261,269 ---- // Play an effect for the tile if (blocked) { ! if (debug) { ! point.effect(0x181D, 10, 50, 0x21); ! } return false; ! } else if (debug) { point.effect(0x181D, 10, 50, 0x44); } |
From: Sebastian H. <dar...@us...> - 2004-09-16 18:45:53
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4196/webroot Modified Files: ChangeLog.wolfpack Log Message: fixes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** ChangeLog.wolfpack 16 Sep 2004 18:44:57 -0000 1.91 --- ChangeLog.wolfpack 16 Sep 2004 18:45:43 -0000 1.92 *************** *** 30,33 **** --- 30,34 ---- - Added a goname <name> command to find players and npcs. - Fixed magic resistance penalty for the protection spell. + - Fixed the mindamage/maxdamage for npcs. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
From: Sebastian H. <dar...@us...> - 2004-09-16 18:45:12
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4009 Modified Files: ChangeLog Log Message: fixes Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** ChangeLog 14 Sep 2004 18:05:15 -0000 1.54 --- ChangeLog 16 Sep 2004 18:45:01 -0000 1.55 *************** *** 17,20 **** --- 17,21 ---- - Fixed bug #0000253. (Invalid drop sound for items dropped to ground) - Fixed bug #0000309. (Console in web administration caused endless loop) + - Completely rewrote line of sight. Wolfpack 12.9.10 Beta (10. September 2004) |
From: Sebastian H. <dar...@us...> - 2004-09-16 18:45:12
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4009/python Modified Files: global.cpp Log Message: fixes Index: global.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** global.cpp 14 Sep 2004 18:05:16 -0000 1.157 --- global.cpp 16 Sep 2004 18:45:02 -0000 1.158 *************** *** 632,636 **** /* ! \function wolfpack.allitemsiterator \return An <object id="ITEMITERATOR">itemiterator</object> object. \description This function creates an itemiterator object to allow iteration --- 632,636 ---- /* ! \function wolfpack.itemiterator \return An <object id="ITEMITERATOR">itemiterator</object> object. \description This function creates an itemiterator object to allow iteration *************** *** 645,649 **** /* ! \function wolfpack.allcharsiterator \return A <object id="CHARITERATOR">chariterator</object> object. \description This function creates a chariterator object to allow iteration --- 645,649 ---- /* ! \function wolfpack.chariterator \return A <object id="CHARITERATOR">chariterator</object> object. \description This function creates a chariterator object to allow iteration |
From: Sebastian H. <dar...@us...> - 2004-09-16 18:45:07
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3982/webroot Modified Files: ChangeLog.wolfpack Log Message: fixes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** ChangeLog.wolfpack 14 Sep 2004 03:56:37 -0000 1.90 --- ChangeLog.wolfpack 16 Sep 2004 18:44:57 -0000 1.91 *************** *** 11,14 **** --- 11,15 ---- - Fishing pole now should have the twohanded flag. - Fishing now shows the success cliloc message correctly. + - Fixed the dyable attribute for certain new items. * Python Script Changes: - Removed weight from the info menu. *************** *** 27,30 **** --- 28,33 ---- - Fixed bug #0000297. (Messages for Anatomy/EvalInt only showing up in journal) - Fixed bug #0000301. (Spellbook not reopening after using it once) + - Added a goname <name> command to find players and npcs. + - Fixed magic resistance penalty for the protection spell. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
From: Sebastian H. <dar...@us...> - 2004-09-16 18:44:26
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3825/items/misc Modified Files: siegeweapons.xml Log Message: fixes Index: siegeweapons.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/misc/siegeweapons.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** siegeweapons.xml 26 May 2004 13:45:14 -0000 1.7 --- siegeweapons.xml 16 Sep 2004 18:44:17 -0000 1.8 *************** *** 1028,1181 **** </item> - <item id="18b5"> - <id>0x18B5</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 23</category> - </item> - - <item id="18b6"> - <id>0x18B6</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 24</category> - </item> - - <item id="18b7"> - <id>0x18B7</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 25</category> - </item> - - <item id="18b8"> - <id>0x18B8</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 26</category> - </item> - - <item id="18b9"> - <id>0x18B9</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 27</category> - </item> - - <item id="18ba"> - <id>0x18BA</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 28</category> - </item> - - <item id="18bb"> - <id>0x18BB</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 29</category> - </item> - - <item id="18bc"> - <id>0x18BC</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 30</category> - </item> - - <item id="18bd"> - <id>0x18BD</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 31</category> - </item> - - <item id="18be"> - <id>0x18BE</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 32</category> - </item> - - <item id="18bf"> - <id>0x18BF</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 33</category> - </item> - - <item id="18c0"> - <id>0x18C0</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 34</category> - </item> - - <item id="18c1"> - <id>0x18C1</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 35</category> - </item> - - <item id="18c2"> - <id>0x18C2</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 36</category> - </item> - - <item id="18c3"> - <id>0x18C3</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 37</category> - </item> - - <item id="18c4"> - <id>0x18C4</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 38</category> - </item> - - <item id="18c5"> - <id>0x18C5</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 39</category> - </item> - - <item id="18c6"> - <id>0x18C6</id> - <nodecay /> - <category>Misc\Balista\21-40\Balista 40</category> - </item> - - <item id="18c7"> - <id>0x18C7</id> - <nodecay /> - <category>Misc\Balista\41-60\Balista 41</category> - </item> - - <item id="18c8"> - <id>0x18C8</id> - <nodecay /> - <category>Misc\Balista\41-60\Balista 42</category> - </item> - - <item id="18c9"> - <id>0x18C9</id> - <nodecay /> - <category>Misc\Balista\41-60\Balista 43</category> - </item> - - <item id="18ca"> - <id>0x18CA</id> - <nodecay /> - <category>Misc\Balista\41-60\Balista 44</category> - </item> - - <item id="18cb"> - <id>0x18CB</id> - <nodecay /> - <category>Misc\Balista\41-60\Balista 45</category> - </item> - - <item id="18cc"> - <id>0x18CC</id> - <nodecay /> - <category>Misc\Balista\41-60\Balista 46</category> - </item> - - <item id="18cd"> - <id>0x18CD</id> - <nodecay /> - <category>Misc\Balista\41-60\Balista 47</category> - </item> - <item id="18ce"> <id>0x18CE</id> --- 1028,1031 ---- |