wpdev-commits Mailing List for Wolfpack Emu (Page 57)
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: Sebastian H. <dar...@us...> - 2004-08-29 20:40:59
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1196/network Modified Files: uosocket.cpp Log Message: overweight Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.400 retrieving revision 1.401 diff -C2 -d -r1.400 -r1.401 *** uosocket.cpp 28 Aug 2004 14:42:05 -0000 1.400 --- uosocket.cpp 29 Aug 2004 20:40:50 -0000 1.401 *************** *** 3019,3025 **** void cUOSocket::handleChat( cUOPacket* packet ) { ! if ( cPythonScript::canChainHandleEvent( EVENT_CHAT, _player->getScripts() ) ) { PyObject* args = Py_BuildValue( "(N)", _player->getPyObject() ); Py_DECREF( args ); } --- 3019,3026 ---- void cUOSocket::handleChat( cUOPacket* packet ) { ! if ( _player->canHandleEvent( EVENT_CHAT ) ) { PyObject* args = Py_BuildValue( "(N)", _player->getPyObject() ); + _player->callEventHandler(EVENT_CHAT, args); Py_DECREF( args ); } |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 18:30:59
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10591/magic Modified Files: circle3.py Log Message: fix for basescripts issues Index: circle3.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle3.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** circle3.py 29 Aug 2004 17:53:43 -0000 1.11 --- circle3.py 29 Aug 2004 18:30:49 -0000 1.12 *************** *** 184,192 **** # Check if there is an event handling onUse but not onTelekinesis for event in target.scripts: ! if wolfpack.hasscript(event, EVENT_TELEKINESIS): hasevent = 1 # The object has at least one telekinesis handler continue ! if wolfpack.hasscript(event, EVENT_USE): if char.socket: char.socket.clilocmessage(501857) --- 184,192 ---- # Check if there is an event handling onUse but not onTelekinesis for event in target.scripts: ! if wolfpack.hasevent(event, EVENT_TELEKINESIS): hasevent = 1 # The object has at least one telekinesis handler continue ! if wolfpack.hasevent(event, EVENT_USE): if char.socket: char.socket.clilocmessage(501857) *************** *** 208,212 **** for event in target.scripts: # If the event can handle onTelekinesis, call it ! if wolfpack.hasscript(event, EVENT_TELEKINESIS): if wolfpack.callevent(event, EVENT_TELEKINESIS, (char, target)): return --- 208,212 ---- for event in target.scripts: # If the event can handle onTelekinesis, call it ! if wolfpack.hasevent(event, EVENT_TELEKINESIS): if wolfpack.callevent(event, EVENT_TELEKINESIS, (char, target)): return |
|
From: Klaus M. <nad...@us...> - 2004-08-29 17:53:53
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4043/scripts/magic Modified Files: circle3.py Log Message: fixed a bug pointed out by incanus Index: circle3.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle3.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** circle3.py 25 Aug 2004 17:03:05 -0000 1.10 --- circle3.py 29 Aug 2004 17:53:43 -0000 1.11 *************** *** 128,132 **** # We cannot use this on locked down chests ! if target.secure: char.message(501761) return --- 128,132 ---- # We cannot use this on locked down chests ! if target.secured: char.message(501761) return |
|
From: Klaus M. <nad...@us...> - 2004-08-29 17:07:39
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29095 Modified Files: export.py Log Message: small bugfix =) Index: export.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/export.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** export.py 25 Aug 2004 17:03:04 -0000 1.13 --- export.py 29 Aug 2004 17:07:30 -0000 1.14 *************** *** 170,174 **** output.write( "ID=0%x%s" % ( item.id, newline ) ) output.write( "COLOR=0%x%s" % ( item.color, newline ) ) ! output.write( "P=%i,%i,%i%s%s" % ( item.pos.x, item.pos.y, item.pos.z, newline ) ) elif format == 2: # WSC, Lonewolf Style, Compatible with Linux Worldforge --- 170,174 ---- output.write( "ID=0%x%s" % ( item.id, newline ) ) output.write( "COLOR=0%x%s" % ( item.color, newline ) ) ! output.write( "P=%i,%i,%i%s%s" % ( item.pos.x, item.pos.y, item.pos.z, newline, newline ) ) elif format == 2: # WSC, Lonewolf Style, Compatible with Linux Worldforge |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 16:44:52
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24829 Modified Files: items.cpp Log Message: a fix for the fix Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.443 retrieving revision 1.444 diff -C2 -d -r1.443 -r1.444 *** items.cpp 29 Aug 2004 16:32:50 -0000 1.443 --- items.cpp 29 Aug 2004 16:44:39 -0000 1.444 *************** *** 384,388 **** priv_ = reader.readByte(); basedef_ = ItemBaseDefs::instance()->get( reader.readAscii() ); ! totalweight_ = weight(); // Add to container and handle weight --- 384,388 ---- priv_ = reader.readByte(); basedef_ = ItemBaseDefs::instance()->get( reader.readAscii() ); ! totalweight_ = amount_ * weight(); // Add to container and handle weight |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 16:39:39
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23925 Modified Files: basedef.cpp Log Message: a fix for the fix Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** basedef.cpp 29 Aug 2004 16:32:50 -0000 1.14 --- basedef.cpp 29 Aug 2004 16:39:30 -0000 1.15 *************** *** 145,151 **** const cElement* element = Definitions::instance()->getDefinition( WPDT_NPC, id_ ); ! if ( !element && !id_.isEmpty() ) { ! Console::instance()->log( LOG_WARNING, QString( "Missing npc definition '%1'.\n" ).arg( id_ ) ); return; } --- 145,153 ---- const cElement* element = Definitions::instance()->getDefinition( WPDT_NPC, id_ ); ! if ( !element ) { ! if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, QString( "Missing npc definition '%1'.\n" ).arg( id_ ) ); ! } return; } *************** *** 289,295 **** const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ ); ! if ( !element && !id_.isEmpty() ) { ! Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) ); return; } --- 291,299 ---- const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ ); ! if ( !element ) { ! if (!id_.isEmpty()) { ! Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) ); ! } return; } |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 16:36:48
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23453 Modified Files: equipment.py Log Message: fix for unequippable items. Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** equipment.py 26 Aug 2004 01:21:22 -0000 1.29 --- equipment.py 29 Aug 2004 16:36:38 -0000 1.30 *************** *** 341,344 **** --- 341,348 ---- tile = wolfpack.tiledata(item.id) + + if not tile.has_key('layer'): + return 0 + layer = tile['layer'] |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 16:36:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/combat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23453/combat Modified Files: __init__.py Log Message: fix for unequippable items. Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/__init__.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** __init__.py 16 Jul 2004 07:09:26 -0000 1.13 --- __init__.py 29 Aug 2004 16:36:38 -0000 1.14 *************** *** 66,70 **** raise ! attacker.nextswing = time + properties.getdelay(attacker, weapon) # --- 66,71 ---- raise ! delay = properties.getdelay(attacker, weapon) ! attacker.nextswing = time + delay # |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 16:32:59
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22793 Modified Files: basedef.cpp items.cpp Log Message: Fixes for item weight on load Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.442 retrieving revision 1.443 diff -C2 -d -r1.442 -r1.443 *** items.cpp 28 Aug 2004 14:42:04 -0000 1.442 --- items.cpp 29 Aug 2004 16:32:50 -0000 1.443 *************** *** 384,387 **** --- 384,388 ---- priv_ = reader.readByte(); basedef_ = ItemBaseDefs::instance()->get( reader.readAscii() ); + totalweight_ = weight(); // Add to container and handle weight Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** basedef.cpp 28 Aug 2004 21:14:53 -0000 1.13 --- basedef.cpp 29 Aug 2004 16:32:50 -0000 1.14 *************** *** 145,149 **** const cElement* element = Definitions::instance()->getDefinition( WPDT_NPC, id_ ); ! if ( !element ) { Console::instance()->log( LOG_WARNING, QString( "Missing npc definition '%1'.\n" ).arg( id_ ) ); --- 145,149 ---- const cElement* element = Definitions::instance()->getDefinition( WPDT_NPC, id_ ); ! if ( !element && !id_.isEmpty() ) { Console::instance()->log( LOG_WARNING, QString( "Missing npc definition '%1'.\n" ).arg( id_ ) ); *************** *** 289,293 **** const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ ); ! if ( !element ) { Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) ); --- 289,293 ---- const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ ); ! if ( !element && !id_.isEmpty() ) { Console::instance()->log( LOG_WARNING, QString( "Missing item definition '%1'.\n" ).arg( id_ ) ); |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 16:07:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17885/wolfpack Modified Files: properties.py Log Message: corrected swing speeds Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** properties.py 11 Jul 2004 02:47:25 -0000 1.5 --- properties.py 29 Aug 2004 16:07:38 -0000 1.6 *************** *** 21,30 **** def getdelay(attacker, weapon): speed = fromitem(weapon, SPEED) ! value = max(1, (attacker.stamina + 100) * speed) # Scale value according to bonus # value += bonus * value / 100 ! return floor(40000.0 / value) * 500 # --- 21,33 ---- def getdelay(attacker, weapon): speed = fromitem(weapon, SPEED) ! value = (attacker.stamina + 100) * speed # Scale value according to bonus # value += bonus * value / 100 + + if value <= 0: + value = 1 ! return floor(40000.0 / float(value)) * 500 # |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 15:35:12
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12072 Modified Files: combat.cpp Log Message: combat fix (hopefully) Index: combat.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/combat.cpp,v retrieving revision 1.173 retrieving revision 1.174 diff -C2 -d -r1.173 -r1.174 *** combat.cpp 4 Aug 2004 23:17:35 -0000 1.173 --- combat.cpp 29 Aug 2004 15:35:03 -0000 1.174 *************** *** 141,144 **** --- 141,148 ---- if ( victim_ ) { + if (victim_->attackTarget() == attacker_) { + victim_->setAttackTarget(0); + } + victim_->fights().remove( this ); } *************** *** 146,149 **** --- 150,157 ---- if ( attacker_ ) { + if (attacker_->attackTarget() == victim_) { + attacker_->setAttackTarget(0); + } + attacker_->fights().remove( this ); } |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 14:05:27
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30204/python Modified Files: tempeffect.h Log Message: bugfix for loading python effect arguments from a binary save. Index: tempeffect.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** tempeffect.h 22 Aug 2004 02:29:53 -0000 1.29 --- tempeffect.h 29 Aug 2004 14:05:17 -0000 1.30 *************** *** 225,228 **** --- 225,229 ---- int count = reader.readInt(); + args = PyTuple_New(count); for(int i = 0; i < count; ++i) { cVariant variant; |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 13:37:28
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26087/magic Modified Files: __init__.py Log Message: fixes for custom spells Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** __init__.py 29 Aug 2004 13:15:25 -0000 1.11 --- __init__.py 29 Aug 2004 13:37:16 -0000 1.12 *************** *** 103,107 **** return ! if type(self.spellid) == int: message = "Casting spell %u (%s) on character %s (0x%x).\n" % (spell.spellid, spell.__class__.__name__, target.char.name, target.char.serial) else: --- 103,107 ---- return ! if type(spell.spellid) == int: message = "Casting spell %u (%s) on character %s (0x%x).\n" % (spell.spellid, spell.__class__.__name__, target.char.name, target.char.serial) else: |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 13:37:28
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26087 Modified Files: spiderweb.py Log Message: fixes for custom spells Index: spiderweb.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/spiderweb.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** spiderweb.py 25 Aug 2004 17:03:05 -0000 1.5 --- spiderweb.py 29 Aug 2004 13:37:17 -0000 1.6 *************** *** 3,6 **** --- 3,7 ---- from math import ceil from wolfpack.consts import DAMAGE_MAGICAL, DAMAGE_PHYSICAL + import random # *************** *** 40,44 **** else: if char.socket: ! char.socket.sysmessage('You damage the spiderweb.') packet = wolfpack.packet(0x21, 8) packet.setbyte(1, sequence) --- 41,46 ---- else: if char.socket: ! if random.random() <= 0.25: ! char.socket.sysmessage('You damage the spiderweb.') packet = wolfpack.packet(0x21, 8) packet.setbyte(1, sequence) *************** *** 52,56 **** char.removescript( 'spiderweb' ) ! char.socket.sysmessage('You manage to break free of the spiderweb.') return False --- 54,59 ---- char.removescript( 'spiderweb' ) ! if char.socket: ! char.socket.sysmessage('You manage to break free of the spiderweb.') return False |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 13:15:38
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22703/magic Modified Files: __init__.py Log Message: Rassenbücher fixes Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** __init__.py 22 Jul 2004 17:22:06 -0000 1.10 --- __init__.py 29 Aug 2004 13:15:25 -0000 1.11 *************** *** 103,107 **** return ! message = "Casting spell %u (%s) on character %s (0x%x).\n" % (spell.spellid, spell.__class__.__name__, target.char.name, target.char.serial) char.log(LOG_MESSAGE, message) spell.target(char, mode, TARGET_CHAR, target.char, args, item) --- 103,110 ---- return ! if type(self.spellid) == int: ! message = "Casting spell %u (%s) on character %s (0x%x).\n" % (spell.spellid, spell.__class__.__name__, target.char.name, target.char.serial) ! else: ! message = "Casting spell %s on character %s (0x%x).\n" % (spell.__class__.__name__, target.char.name, target.char.serial) char.log(LOG_MESSAGE, message) spell.target(char, mode, TARGET_CHAR, target.char, args, item) |
|
From: Sebastian H. <dar...@us...> - 2004-08-29 13:00:46
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19944/magic Modified Files: spell.py Log Message: A fix for custom spells Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** spell.py 25 Aug 2004 17:03:05 -0000 1.17 --- spell.py 29 Aug 2004 13:00:34 -0000 1.18 *************** *** 155,159 **** source = 'command' ! char.log(LOG_MESSAGE, "Casting spell %u (%s) from %s.\n" % (self.spellid, self.__class__.__name__, source)) char.addtimer(self.calcdelay(), 'magic.spell.callback', [self, mode, args, target, item], 0, 0, "cast_delay") return 1 --- 155,163 ---- source = 'command' ! if type(self.spellid) == int: ! char.log(LOG_MESSAGE, "Casting spell %u (%s) from %s.\n" % (self.spellid, self.__class__.__name__, source)) ! else: ! char.log(LOG_MESSAGE, "Casting spell %s from %s.\n" % (self.__class__.__name__, source)) ! char.addtimer(self.calcdelay(), 'magic.spell.callback', [self, mode, args, target, item], 0, 0, "cast_delay") return 1 |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 21:15:04
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13373 Modified Files: basedef.cpp speech.cpp Log Message: fix for basechar basescripts Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.187 retrieving revision 1.188 diff -C2 -d -r1.187 -r1.188 *** speech.cpp 28 Aug 2004 20:59:29 -0000 1.187 --- speech.cpp 28 Aug 2004 21:14:53 -0000 1.188 *************** *** 190,221 **** } - bool BankerSpeech( cUOSocket* socket, P_PLAYER pPlayer, P_NPC pBanker, const QString& comm ) - { - // Needs to be a banker - /* if( pBanker->npcaitype() != 8 ) - return false;*/ - - if ( !pBanker->ai() || pBanker->ai()->name() != "Banker" ) - return false; - - if ( pPlayer->dist( pBanker ) > 6 ) - return false; - - if ( comm.contains( "BANK" ) ) - { - pBanker->turnTo( pPlayer ); - socket->sendContainer( pPlayer->getBankbox() ); - return true; - } - - if ( ( comm.contains( "BALANCE" ) ) | ( comm.contains( "WITHDRAW" ) ) || ( comm.contains( "CHECK" ) ) ) - { - //BankerAI->DoAI( s, pBanker, comm ); - return true; - } - - return false; - } - bool VendorChkName( P_CHAR pVendor, const QString& comm ) { --- 190,193 ---- *************** *** 282,288 **** } - if ( BankerSpeech( socket, pPlayer, pNpc, speechUpr ) ) - return true; - if ( QuestionSpeech( socket, pPlayer, pNpc, speechUpr ) ) return true; --- 254,257 ---- Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** basedef.cpp 28 Aug 2004 12:15:35 -0000 1.12 --- basedef.cpp 28 Aug 2004 21:14:53 -0000 1.13 *************** *** 119,122 **** --- 119,123 ---- { baseScriptList_ = node->text(); + refreshScripts(); } } |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 20:59:45
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11609 Modified Files: speech.cpp walking.cpp Log Message: I forgot about basescripts and onSpeech. Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.186 retrieving revision 1.187 diff -C2 -d -r1.186 -r1.187 *** speech.cpp 25 Aug 2004 17:01:23 -0000 1.186 --- speech.cpp 28 Aug 2004 20:59:29 -0000 1.187 *************** *** 259,266 **** continue; ! cPythonScript** events = pNpc->getScripts(); ! ! if ( events ) ! { PyObject* pkeywords = PyList_New( keywords.size() ); --- 259,263 ---- continue; ! if (pNpc->canHandleEvent(EVENT_SPEECH)) { PyObject* pkeywords = PyList_New( keywords.size() ); *************** *** 271,275 **** PyObject* args = Py_BuildValue( "(NNNO)", pNpc->getPyObject(), pPlayer->getPyObject(), QString2Python( comm ), pkeywords ); ! bool result = cPythonScript::callChainedEventHandler( EVENT_SPEECH, events, args ); Py_DECREF( args ); --- 268,272 ---- PyObject* args = Py_BuildValue( "(NNNO)", pNpc->getPyObject(), pPlayer->getPyObject(), QString2Python( comm ), pkeywords ); ! bool result = pNpc->callEventHandler(EVENT_SPEECH, args); Py_DECREF( args ); Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** walking.cpp 27 Aug 2004 18:56:59 -0000 1.139 --- walking.cpp 28 Aug 2004 20:59:35 -0000 1.140 *************** *** 352,357 **** // Or the bottom ? ! if ( ( item.z > oldz ) && ( item.z < oldz + P_M_MAX_Z_BLOCKS ) ) ! return false; // Or does it spread the whole range ? --- 352,357 ---- // Or the bottom ? ! // if ( ( item.z > oldz ) && ( item.z < oldz + P_M_MAX_Z_BLOCKS ) ) ! // return false; // Or does it spread the whole range ? |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 19:06:35
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27361/npcs/humans/vendors Modified Files: banker.xml Log Message: bankers shouldn't wander around Index: banker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/banker.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** banker.xml 27 Aug 2004 14:43:30 -0000 1.7 --- banker.xml 28 Aug 2004 19:06:27 -0000 1.8 *************** *** 28,31 **** --- 28,32 ---- <category>Vendors\Banker (Male)</category> <invulnerable /> + <wandertype>0</wandertype> </npc> *************** *** 48,51 **** --- 49,53 ---- <category>Vendors\Banker (Female)</category> <invulnerable /> + <wandertype>0</wandertype> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 19:06:35
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27361/npcs/humans Modified Files: civilists.xml Log Message: bankers shouldn't wander around Index: civilists.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/civilists.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** civilists.xml 27 Aug 2004 14:43:29 -0000 1.15 --- civilists.xml 28 Aug 2004 19:06:27 -0000 1.16 *************** *** 76,79 **** --- 76,80 ---- <basescripts>contextmenus.trainmenu</basescripts> <invulnerable /> + <wandertype>0</wandertype> </npc> <npc id="vendor_female"> *************** *** 83,86 **** --- 84,88 ---- <basescripts>contextmenus.trainmenu</basescripts> <invulnerable /> + <wandertype>0</wandertype> </npc> </definitions> |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 16:43:09
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3158/system Modified Files: status.py Log Message: fix for umlauts Index: status.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/status.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** status.py 18 Jul 2004 16:43:38 -0000 1.1 --- status.py 28 Aug 2004 16:42:56 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- from wolfpack import settings, console, accounts, sockets import wolfpack.time # Already imported + import htmlentitydefs from threading import Thread, Event, Lock import time *************** *** 44,48 **** try: fp = file(outputfile, 'wu') ! fp.write(data) fp.close() except Exception, e: --- 45,49 ---- try: fp = file(outputfile, 'wu') ! fp.write(data.encode('utf-8')) fp.close() except Exception, e: |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 16:42:58
|
Update of /cvsroot/wpdev/xmlscripts/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3128 Modified Files: status_template.html Log Message: fix for foreign languages Index: status_template.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/status_template.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** status_template.html 28 Aug 2004 16:25:27 -0000 1.2 --- status_template.html 28 Aug 2004 16:42:49 -0000 1.3 *************** *** 5,13 **** import wolfpack.accounts import wolfpack.time %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <title>Wolfpack Status</title> <style type="text/css"> --- 5,14 ---- import wolfpack.accounts import wolfpack.time + %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>Wolfpack Status</title> <style type="text/css"> |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 16:25:36
|
Update of /cvsroot/wpdev/xmlscripts/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32638 Modified Files: status_template.html Log Message: fix for umlauts Index: status_template.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/status_template.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** status_template.html 18 Jul 2004 16:43:54 -0000 1.1 --- status_template.html 28 Aug 2004 16:25:27 -0000 1.2 *************** *** 120,129 **** if NOTOCOLORS.has_key(notoriety): ! print '<font color="%s" face="Georgia"><b>%s</b></font>' % (NOTOCOLORS[notoriety], socket.player.name) else: print '<b>%s</b>' % socket.player.name if socket.player.region and len(socket.player.region.name) > 0: ! print ' (%s)' % socket.player.region.name print '</td></tr>' --- 120,129 ---- if NOTOCOLORS.has_key(notoriety): ! print '<font color="%s" face="Georgia"><b>%s</b></font>' % (NOTOCOLORS[notoriety], unicode(socket.player.name)) else: print '<b>%s</b>' % socket.player.name if socket.player.region and len(socket.player.region.name) > 0: ! print ' (%s)' % unicode(socket.player.region.name) print '</td></tr>' |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 16:14:18
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30607/commands Modified Files: move.py Log Message: fix for .move Index: move.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/move.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** move.py 13 Jul 2004 22:50:44 -0000 1.1 --- move.py 28 Aug 2004 16:14:10 -0000 1.2 *************** *** 82,86 **** item = target.item pos = item.pos ! if not newmap: newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap ) else: --- 82,86 ---- item = target.item pos = item.pos ! if type(newmap) == int: newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap ) else: *************** *** 93,97 **** npc = target.char pos = npc.pos ! if not newmap: newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap ) else: --- 93,97 ---- npc = target.char pos = npc.pos ! if type(newmap) == int: newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap ) else: *************** *** 103,107 **** player = target.char pos = player.pos ! if not newmap: newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap ) else: --- 103,107 ---- player = target.char pos = player.pos ! if type(newmap) == int: newposition = "%i,%i,%i,%i" % ( (pos.x + xmod) , (pos.y + ymod ), (pos.z + zmod), newmap ) else: |
|
From: Sebastian H. <dar...@us...> - 2004-08-28 15:45:36
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26474/commands Modified Files: who.py Log Message: Hopeful fix for the character region Index: who.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/who.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** who.py 28 Aug 2004 15:44:39 -0000 1.3 --- who.py 28 Aug 2004 15:45:27 -0000 1.4 *************** *** 100,104 **** gump.addText( 250, 100, unicode( "%i,%i,%i,%i" % ( pos.x, pos.y, pos.z, pos.map ) ), 0x834 ) gump.addText( 50, 120, unicode( "Region:" ), 0x834 ) ! gump.addText( 250, 120, unicode( "%s" % unicode(player.region) ), 0x834 ) gump.addText( 50, 140, unicode( "Account / ACL:" ), 0x834 ) gump.addText( 250, 140, unicode( "%s / %s" % ( account.name, account.acl) ), 0x834 ) --- 100,107 ---- gump.addText( 250, 100, unicode( "%i,%i,%i,%i" % ( pos.x, pos.y, pos.z, pos.map ) ), 0x834 ) gump.addText( 50, 120, unicode( "Region:" ), 0x834 ) ! if player.region: ! gump.addText( 250, 120, unicode( "%s" % unicode(player.region.name) ), 0x834 ) ! else: ! gump.addText( 250, 120, "Unknown", 0x834 ) gump.addText( 50, 140, unicode( "Account / ACL:" ), 0x834 ) gump.addText( 250, 140, unicode( "%s / %s" % ( account.name, account.acl) ), 0x834 ) |
