wpdev-commits Mailing List for Wolfpack Emu (Page 46)
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-09-09 03:19:48
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/lizardmen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483/npcs/monsters/lizardmen Modified Files: lizardmen.xml Log Message: gm control for npcs. Index: lizardmen.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/lizardmen/lizardmen.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** lizardmen.xml 7 Sep 2004 00:28:05 -0000 1.13 --- lizardmen.xml 9 Sep 2004 03:19:38 -0000 1.14 *************** *** 12,16 **** <npc id="lizardman" inherit="monster_base"> <strproperty name="monsterspeech" value="lizardman" /> ! <basescripts>speech.monster</basescripts> <name><random list="NAMES_LIZARDMAN" /></name> <id><random list="NPCIDS_LIZARDMAN" /></id> --- 12,16 ---- <npc id="lizardman" inherit="monster_base"> <strproperty name="monsterspeech" value="lizardman" /> ! <basescript>speech.monster</basescript> <name><random list="NAMES_LIZARDMAN" /></name> <id><random list="NPCIDS_LIZARDMAN" /></id> |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 03:19:47
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483/npcs/humans/vendors Modified Files: banker.xml barber.xml Log Message: gm control for npcs. Index: banker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/banker.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** banker.xml 28 Aug 2004 19:06:27 -0000 1.8 --- banker.xml 9 Sep 2004 03:19:38 -0000 1.9 *************** *** 16,20 **** <invulnerable /> <title>the Banker</title> ! <basescripts>speech.banker</basescripts> <equipped> <item id="1515" /> <!-- Cloak --> --- 16,20 ---- <invulnerable /> <title>the Banker</title> ! <basescript>speech.banker</basescript> <equipped> <item id="1515" /> <!-- Cloak --> *************** *** 37,41 **** <invulnerable /> <title>the Banker</title> ! <basescripts>speech.banker</basescripts> <equipped> <item id="1515" /> <!-- Cloak --> --- 37,41 ---- <invulnerable /> <title>the Banker</title> ! <basescript>speech.banker</basescript> <equipped> <item id="1515" /> <!-- Cloak --> Index: barber.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/barber.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** barber.xml 27 Aug 2004 14:43:30 -0000 1.5 --- barber.xml 9 Sep 2004 03:19:38 -0000 1.6 *************** *** 12,16 **** <inherit>base_male</inherit> <title>the Barber</title> ! <basescripts>speech.barber</basescripts> <category>Vendors\Barber (Male)</category> <invulnerable /> --- 12,16 ---- <inherit>base_male</inherit> <title>the Barber</title> ! <basescript>speech.barber</basescript> <category>Vendors\Barber (Male)</category> <invulnerable /> *************** *** 20,24 **** <inherit>base_female</inherit> <title>the Barber</title> ! <basescripts>speech.barber</basescripts> <category>Vendors\Barber (Female)</category> <invulnerable /> --- 20,24 ---- <inherit>base_female</inherit> <title>the Barber</title> ! <basescript>speech.barber</basescript> <category>Vendors\Barber (Female)</category> <invulnerable /> |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 03:19:47
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483/npcs/monsters Modified Files: base.xml Log Message: gm control for npcs. Index: base.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/base.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** base.xml 5 Jun 2004 01:39:52 -0000 1.13 --- base.xml 9 Sep 2004 03:19:38 -0000 1.14 *************** *** 32,35 **** --- 32,36 ---- <random min="0" max="7"/> </direction> + <basescripts>speech.pets</basescripts> </npc> </definitions> |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 03:19:47
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483/npcs/humans Modified Files: civilists.xml Log Message: gm control for npcs. Index: civilists.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/civilists.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** civilists.xml 28 Aug 2004 19:06:27 -0000 1.16 --- civilists.xml 9 Sep 2004 03:19:37 -0000 1.17 *************** *** 31,34 **** --- 31,35 ---- <dex><random min="66" max="80" /></dex> <int><random min="66" max="80" /></int> + <basescripts>speech.pets</basescripts> </npc> *************** *** 56,59 **** --- 57,61 ---- <dex><random min="66" max="80" /></dex> <int><random min="66" max="80" /></int> + <basescripts>speech.pets</basescripts> </npc> *************** *** 74,78 **** <ai>Human_Vendor</ai> <bindmenu>vendor_menu,train_menu</bindmenu> ! <basescripts>contextmenus.trainmenu</basescripts> <invulnerable /> <wandertype>0</wandertype> --- 76,80 ---- <ai>Human_Vendor</ai> <bindmenu>vendor_menu,train_menu</bindmenu> ! <basescript>contextmenus.trainmenu</basescript> <invulnerable /> <wandertype>0</wandertype> *************** *** 82,86 **** <ai>Human_Vendor</ai> <bindmenu>vendor_menu,train_menu</bindmenu> ! <basescripts>contextmenus.trainmenu</basescripts> <invulnerable /> <wandertype>0</wandertype> --- 84,88 ---- <ai>Human_Vendor</ai> <bindmenu>vendor_menu,train_menu</bindmenu> ! <basescript>contextmenus.trainmenu</basescript> <invulnerable /> <wandertype>0</wandertype> |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 03:19:46
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483/npcs/animals Modified Files: base.xml Log Message: gm control for npcs. Index: base.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/base.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** base.xml 6 Jun 2004 01:38:42 -0000 1.13 --- base.xml 9 Sep 2004 03:19:37 -0000 1.14 *************** *** 18,21 **** --- 18,22 ---- <maxdamage>3</maxdamage> <bindmenu>tame_menu,pet_menu</bindmenu> + <basescripts>speech.pets</basescripts> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 03:19:41
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13425/webroot Modified Files: ChangeLog.wolfpack Log Message: GM control for npcs. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** ChangeLog.wolfpack 9 Sep 2004 01:51:38 -0000 1.72 --- ChangeLog.wolfpack 9 Sep 2004 03:19:27 -0000 1.73 *************** *** 9,12 **** --- 9,13 ---- - Added several small testing items. - Fixed blue moongate definitions. + - Pet commands are now processed by all NPCs to allow GM control. * Python Script Changes: - Added a script for database structure updates (system/dbupdate.py). *************** *** 33,36 **** --- 34,38 ---- - Fixed another trading issue. - Fixed bug #0000278 (Weapon not being unequipped) + - Pet commands now always allow control by GMs. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Richard M. <dr...@us...> - 2004-09-09 03:04:19
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11017/commands Modified Files: kickban.py Log Message: I think this should work... Index: kickban.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/kickban.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kickban.py 9 Sep 2004 02:31:09 -0000 1.1 --- kickban.py 9 Sep 2004 03:04:04 -0000 1.2 *************** *** 9,12 **** --- 9,18 ---- """ + """ + \command unban + \description Unbans an account with the given account name. + + """ + import wolfpack from wolfpack.consts import LOG_MESSAGE *************** *** 15,18 **** --- 21,25 ---- wolfpack.registercommand( "kick", commandKick ) wolfpack.registercommand( "ban", commandBan ) + wolfpack.registercommand( "unban", commandUnban ) def commandKick( socket, cmd, args ): *************** *** 40,50 **** return False def accountAction( socket, account, action ): if account == None: socket.sysmessage( "Failed to find an account with the given name." ) return False ! elif account and account.acl == 'player': if action == 'kick': ! account.block() for char in account.characters: if char.socket: --- 47,102 ---- return False + def doKick( char, args, target ): + if target.char and target.char.player: + accountAction( char.socket, target.char.account, 'kick' ) + return + + def doBan( char, args, target ): + if target.char and target.char.player: + accountAction( char.socket, target.char.account, 'ban' ) + return + + def commandUnban( socket, cmd, args ): + player = socket.player + playeraccount = player.account + myrank = playeraccount.rank + if len( args ) > 0: + accname = args.lower() + account = None + account = wolfpack.accounts.find( accname ) + if account: + if account.rank > 1: + if playeraccount.authorized( 'Misc', 'May Block Staff Accounts' ): + continue + else: + socket.sysmessage( "You're not authorized to unblock staff members." ) + return False + account.unblock() + socket.sysmessage( "You've unblocked the account %s." % account.name ) + return True + else: + socket.sysmessage( "You need to specify an account name to unban." ) + return False + def accountAction( socket, account, action ): + player = socket.player + playeraccount = player.account + myrank = playeraccount.rank if account == None: socket.sysmessage( "Failed to find an account with the given name." ) return False ! elif account and myrank > account.rank: ! if account.rank == 100: ! socket.sysmessage( "You can not kick or ban admins!" ) ! return False ! if account.rank > 1: ! if playeraccount.authorized( 'Misc', 'May Block Staff Accounts' ): ! continue ! else: ! socket.sysmessage( "You're not authorized to kick or ban staff members." ) ! return False ! if action == 'kick': ! account.block() for char in account.characters: if char.socket: |
|
From: Richard M. <dr...@us...> - 2004-09-09 02:36:34
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7455 Modified Files: player.cpp walking.cpp world.cpp Log Message: I did some value conversion warning fixes. Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** player.cpp 7 Sep 2004 03:21:46 -0000 1.129 --- player.cpp 9 Sep 2004 02:36:24 -0000 1.130 *************** *** 1776,1779 **** unsigned int cPlayer::maxWeight() { ! return 40 + strength_ * 3.5; } --- 1776,1779 ---- unsigned int cPlayer::maxWeight() { ! return (unsigned int)( 40 + strength_ * 3.5 ); } Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.147 retrieving revision 1.148 diff -C2 -d -r1.147 -r1.148 *** walking.cpp 7 Sep 2004 22:23:14 -0000 1.147 --- walking.cpp 9 Sep 2004 02:36:24 -0000 1.148 *************** *** 725,729 **** // Calculate the stones we weight too much ! int overWeight = pChar->weight() - pChar->maxWeight(); bool mounted = pChar->atLayer(cBaseChar::Mount) != 0; bool update = false; --- 725,729 ---- // Calculate the stones we weight too much ! int overWeight = ( int )( pChar->weight() - pChar->maxWeight() ); bool mounted = pChar->atLayer(cBaseChar::Mount) != 0; bool update = false; Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** world.cpp 8 Sep 2004 18:00:59 -0000 1.125 --- world.cpp 9 Sep 2004 02:36:24 -0000 1.126 *************** *** 523,527 **** // post process all loaded objects QPtrList<PersistentObject>::const_iterator cit(objects.begin()); ! while (cit != objects.end()) { (*cit)->postload(reader.version()); --- 523,527 ---- // post process all loaded objects QPtrList<PersistentObject>::const_iterator cit(objects.begin()); ! while (cit != objects.end()) { (*cit)->postload(reader.version()); *************** *** 577,581 **** QString db_version; getOption("db_version", db_version, "7"); ! if (db_version.toInt() != DATABASE_VERSION) { cPythonScript *script = ScriptManager::instance()->getGlobalHook(EVENT_UPDATEDATABASE); --- 577,581 ---- QString db_version; getOption("db_version", db_version, "7"); ! if (db_version.toInt() != DATABASE_VERSION) { cPythonScript *script = ScriptManager::instance()->getGlobalHook(EVENT_UPDATEDATABASE); *************** *** 587,591 **** bool result = script->callEventHandler(EVENT_UPDATEDATABASE, args); Py_DECREF(args); ! if (!result) { throw wpException(QString("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); --- 587,591 ---- bool result = script->callEventHandler(EVENT_UPDATEDATABASE, args); Py_DECREF(args); ! if (!result) { throw wpException(QString("Unable to load world database. Version mismatch: %1 != %2.").arg(db_version.toInt()).arg(DATABASE_VERSION)); *************** *** 762,766 **** pChar->flagUnchanged(); // We've just loaded, nothing changes } ! // post process all loaded objects // Note from DarkStorm: I THINK it's important to do this before --- 762,766 ---- pChar->flagUnchanged(); // We've just loaded, nothing changes } ! // post process all loaded objects // Note from DarkStorm: I THINK it's important to do this before *************** *** 768,772 **** // list that are already deleted. QPtrList<PersistentObject>::const_iterator cit(objects.begin()); ! while (cit != objects.end()) { (*cit)->postload(0); --- 768,772 ---- // list that are already deleted. QPtrList<PersistentObject>::const_iterator cit(objects.begin()); ! while (cit != objects.end()) { (*cit)->postload(0); *************** *** 783,787 **** deleteItems.clear(); } ! // Load SpawnRegion information cDBResult result = PersistentBroker::instance()->query( "SELECT spawnregion,serial FROM spawnregions;" ); --- 783,787 ---- deleteItems.clear(); } ! // Load SpawnRegion information cDBResult result = PersistentBroker::instance()->query( "SELECT spawnregion,serial FROM spawnregions;" ); *************** *** 827,833 **** loadSQL( objects ); } - ! unsigned int duration = getNormalizedTime() - loadStart; --- 827,833 ---- loadSQL( objects ); } ! ! unsigned int duration = getNormalizedTime() - loadStart; *************** *** 1052,1056 **** void cWorld::getOption( const QString& name, QString& value, const QString fallback ) { ! QMap<QString, QString>::iterator it = options.find(name); if (it == options.end()) { value = fallback; --- 1052,1056 ---- void cWorld::getOption( const QString& name, QString& value, const QString fallback ) { ! QMap<QString, QString>::iterator it = options.find(name); if (it == options.end()) { value = fallback; *************** *** 1296,1300 **** QDate date; QTime time; ! // Length has to be -YYYYMMDD-HHMM (14 Characters) if (timestamp.length() != 14) { --- 1296,1300 ---- QDate date; QTime time; ! // Length has to be -YYYYMMDD-HHMM (14 Characters) if (timestamp.length() != 14) { *************** *** 1315,1319 **** date.setYMD(year, month, day); time.setHMS(hour, minute, 0); ! backups.insert(QDateTime(date, time), *sit); } --- 1315,1319 ---- date.setYMD(year, month, day); time.setHMS(hour, minute, 0); ! backups.insert(QDateTime(date, time), *sit); } *************** *** 1333,1337 **** // Check if we need to remove a previous backup QMap<QDateTime, QString> backups = listBackups(filename); ! if (backups.count() >= count) { // Remove the oldest backup --- 1333,1337 ---- // Check if we need to remove a previous backup QMap<QDateTime, QString> backups = listBackups(filename); ! if (backups.count() >= count) { // Remove the oldest backup *************** *** 1399,1403 **** gzwrite(output, buffer, readSize); } ! input.close(); gzclose(output); --- 1399,1403 ---- gzwrite(output, buffer, readSize); } ! input.close(); gzclose(output); *************** *** 1483,1485 **** return ( p->it++ )->second; ! } \ No newline at end of file --- 1483,1485 ---- return ( p->it++ )->second; ! } |
|
From: Richard M. <dr...@us...> - 2004-09-09 02:31:22
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6709/scripts/commands Modified Files: remove.py Added Files: kickban.py Log Message: Made it where remove cannot delete staff characters. Remove gives a warning about removing players. Started the kick/ban commands, not finished yet. Removed definitions.xml, we use definitions/index.xml now anyways. --- NEW FILE: kickban.py --- """ \command kick \description Kicks a connected client by target or account name. """ """ \command ban \description Kick-bans an account by target or account name. """ import wolfpack from wolfpack.consts import LOG_MESSAGE def onLoad(): wolfpack.registercommand( "kick", commandKick ) wolfpack.registercommand( "ban", commandBan ) def commandKick( socket, cmd, args ): if len( args ) > 0: accname = args.lower() account = None account = wolfpack.accounts.find( accname ) accountAction( socket, account, 'kick' ) return else: socket.sysmessage( "Please select the object for removal." ) socket.attachtarget( "commands.remove.doKick", [] ) return True def commandBan( socket, cmd, args ): if len( args ) > 0: accname = args.lower() account = None account = wolfpack.accounts.find( accname ) accountAction( socket, account, 'ban' ) return else: socket.sysmessage( "Please select the object for removal." ) socket.attachtarget( "commands.remove.doBan", [] ) return False def accountAction( socket, account, action ): if account == None: socket.sysmessage( "Failed to find an account with the given name." ) return False elif account and account.acl == 'player': if action == 'kick': account.block() for char in account.characters: if char.socket: char.soscket.sysmessage( "You've been kicked from the shard by the staff." ) char.socket.disconnect() socket.sysmessage( "You have disconnected %s." % char.name ) return True elif action == 'ban': account.block() for char in account.characters: if char.socket: char.soscket.sysmessage( "You've been kick-banned from the shard by the staff." ) char.socket.disconnect() socket.sysmessage( "You have kick-banned %s." % char.name ) return True return False Index: remove.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/remove.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** remove.py 14 Jul 2004 07:17:38 -0000 1.2 --- remove.py 9 Sep 2004 02:31:09 -0000 1.3 *************** *** 12,15 **** --- 12,16 ---- def commandRemove(socket, cmd, args): socket.sysmessage( "Please select the object for removal." ) + socket.sysmessage( "Caution: This can remove players!" ) socket.attachtarget( "commands.remove.doRemove", [] ) return True *************** *** 37,40 **** --- 38,44 ---- return False else: + if player.account.acl != 'player': + char.socket.sysmessage( "Players with special accounts can not be removed." ) + return False if socket: socket.disconnect() |
|
From: Richard M. <dr...@us...> - 2004-09-09 02:31:19
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6709 Removed Files: definitions.xml Log Message: Made it where remove cannot delete staff characters. Remove gives a warning about removing players. Started the kick/ban commands, not finished yet. Removed definitions.xml, we use definitions/index.xml now anyways. --- definitions.xml DELETED --- |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 02:20:05
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5345 Modified Files: ChangeLog Log Message: Don't remember what i changed! Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ChangeLog 7 Sep 2004 23:01:49 -0000 1.40 --- ChangeLog 9 Sep 2004 02:19:56 -0000 1.41 *************** *** 37,40 **** --- 37,42 ---- - Fixed bug #0000252 (Negative parameters to char.checkskill got casted to unsigned short) - Fixed item names for item.say + - The default worldsave driver is now binary. + - Improved the Python interface Unicode support. Wolfpack 12.9.9 Beta (4. September 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 02:08:03
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3758/python Modified Files: item.cpp Log Message: Don't remember what i changed! Index: item.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** item.cpp 7 Sep 2004 03:21:50 -0000 1.129 --- item.cpp 9 Sep 2004 02:07:51 -0000 1.130 *************** *** 895,906 **** { PyObject* item = PyList_GetItem( list, i ); ! if ( PyString_Check( item ) ) ! { ! baseids.append( PyString_AsString( item ) ); ! } ! else if ( PyUnicode_Check( item ) ) ! { ! baseids.append( QString::fromUcs2( ( ushort * ) PyUnicode_AsUnicode( item ) ) ); ! } } --- 895,899 ---- { PyObject* item = PyList_GetItem( list, i ); ! baseids.append( Python2QString(item) ); } |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 02:08:02
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3758 Modified Files: serverconfig.cpp Log Message: Don't remember what i changed! Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** serverconfig.cpp 23 Aug 2004 21:37:39 -0000 1.5 --- serverconfig.cpp 9 Sep 2004 02:07:52 -0000 1.6 *************** *** 112,116 **** databaseUsername_ = getString( "Database", "username", "", true ); databaseHost_ = getString( "Database", "host", "", true ); ! databaseDriver_ = getString( "Database", "driver", "sqlite", true ); databaseName_ = getString( "Database", "name", "world.db", true ); --- 112,116 ---- databaseUsername_ = getString( "Database", "username", "", true ); databaseHost_ = getString( "Database", "host", "", true ); ! databaseDriver_ = getString( "Database", "driver", "binary", true ); databaseName_ = getString( "Database", "name", "world.db", true ); |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 01:52:12
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1663/magic Modified Files: spell.py Log Message: fix for clearing heands Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** spell.py 7 Sep 2004 21:17:00 -0000 1.22 --- spell.py 9 Sep 2004 01:51:52 -0000 1.23 *************** *** 3,7 **** import random import wolfpack.console ! from wolfpack import properties from magic.utilities import * from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \ --- 3,7 ---- import random import wolfpack.console ! from wolfpack import properties, utilities from magic.utilities import * from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \ *************** *** 203,207 **** # Check if the spellchanneling property is true for this item if not properties.fromitem(weapon, SPELLCHANNELING): ! if not wolfpack.tobackpack(weapon, char): weapon.update() --- 203,207 ---- # Check if the spellchanneling property is true for this item if not properties.fromitem(weapon, SPELLCHANNELING): ! if not utilities.tobackpack(weapon, char): weapon.update() |
|
From: Sebastian H. <dar...@us...> - 2004-09-09 01:51:49
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1632/webroot Modified Files: ChangeLog.wolfpack Log Message: fixes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** ChangeLog.wolfpack 8 Sep 2004 04:06:27 -0000 1.71 --- ChangeLog.wolfpack 9 Sep 2004 01:51:38 -0000 1.72 *************** *** 29,32 **** --- 29,36 ---- - Tele and other spells no longer show a smoke puff if you're invisible. - Rewrote properties.fromitem + - Fixed mining. + - The heal command now resends the healthbar. + - Fixed another trading issue. + - Fixed bug #0000278 (Weapon not being unequipped) * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: spddmn <xxx...@us...> - 2004-09-08 18:01:08
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14425 Modified Files: world.cpp world.h Log Message: just making world.load() call helper functions instead of using large if blocks. sorry for the big recompile! Index: world.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** world.h 23 Aug 2004 21:37:39 -0000 1.20 --- world.h 8 Sep 2004 18:00:59 -0000 1.21 *************** *** 39,42 **** --- 39,43 ---- #include "server.h" + class PersistentObject; class cBufferedReader; *************** *** 102,105 **** --- 103,108 ---- // WorldLoader interface void load(); + void loadBinary(QPtrList<PersistentObject> &objects); + void loadSQL(QPtrList<PersistentObject> &objects); void unload(); void save(); Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** world.cpp 4 Sep 2004 21:20:07 -0000 1.124 --- world.cpp 8 Sep 2004 18:00:59 -0000 1.125 *************** *** 422,432 **** } ! void cWorld::load() { - unsigned int loadStart = getNormalizedTime(); - QPtrList<PersistentObject> objects; - - if ( Config::instance()->databaseDriver() == "binary" ) - { QString filename = Config::instance()->binarySavepath(); --- 422,427 ---- } ! void cWorld::loadBinary( QPtrList<PersistentObject> &objects ) { QString filename = Config::instance()->binarySavepath(); *************** *** 534,541 **** } } ! } ! else ! { ! if ( !PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver() ) ) { Console::instance()->log( LOG_ERROR, QString( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); --- 529,537 ---- } } ! } ! ! void cWorld::loadSQL( QPtrList<PersistentObject> &objects ) ! { ! if ( !PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver() ) ) { Console::instance()->log( LOG_ERROR, QString( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) ); *************** *** 816,819 **** --- 812,829 ---- PersistentBroker::instance()->disconnect(); + } + + void cWorld::load() + { + unsigned int loadStart = getNormalizedTime(); + QPtrList<PersistentObject> objects; + + if ( Config::instance()->databaseDriver() == "binary" ) + { + loadBinary( objects ); + } + else + { + loadSQL( objects ); } |
|
From: spddmn <xxx...@us...> - 2004-09-08 17:18:17
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5532/system Modified Files: dbupdate.py Log Message: i unnecessarily was double updating the db version in 7-8 for sqlite Index: dbupdate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/dbupdate.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dbupdate.py 8 Sep 2004 16:07:48 -0000 1.2 --- dbupdate.py 8 Sep 2004 17:18:02 -0000 1.3 *************** *** 33,38 **** database.execute(sql) ! sql = "replace into settings (option, value) values ('db_version',8)" ! database.execute(sql) sql = "VACUUM" --- 33,38 ---- database.execute(sql) ! #sql = "replace into settings (option, value) values ('db_version',8)" ! #database.execute(sql) sql = "VACUUM" |
|
From: spddmn <xxx...@us...> - 2004-09-08 16:07:57
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24756/system Modified Files: dbupdate.py Log Message: will now update a sqlite world db from 7 to 8 Index: dbupdate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/dbupdate.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dbupdate.py 4 Sep 2004 21:19:03 -0000 1.1 --- dbupdate.py 8 Sep 2004 16:07:48 -0000 1.2 *************** *** 12,19 **** database.execute(sql) return True - # # MySQL Database Updates # MYSQL_UPDATES = { 7: mysql_update_7, --- 12,44 ---- database.execute(sql) return True # # MySQL Database Updates # + + def sqlite_update_8(): + + sql = "CREATE TABLE tmp_players7 ( serial bigint, account varchar(16), additionalflags bigint, visualrange tinyint(3), profile longtext, fixedlight tinyint(3), strlock smallint, dexlock smallint, intlock smallint);" + database.execute(sql) + sql = "insert into tmp_players7 select * from players;" + database.execute(sql) + sql = "drop table players;" + database.execute(sql) + + sql = "CREATE TABLE players ( serial bigint NOT NULL default '0', account varchar(16) default NULL, additionalflags bigint NOT NULL default '0', visualrange tinyint(3) NOT NULL default '0', profile longtext, fixedlight tinyint(3) NOT NULL default '0', strlock smallint NOT NULL default '0', dexlock smallint NOT NULL default '0', intlock smallint NOT NULL default '0', maxcontrolslots tinyint(4) NOT NULL default '5', PRIMARY KEY (serial) );" + database.execute(sql) + + sql = "insert into players select *, 5 from tmp_players7" + database.execute(sql) + sql = "drop table tmp_players7;" + database.execute(sql) + + sql = "replace into settings (option, value) values ('db_version',8)" + database.execute(sql) + + sql = "VACUUM" + database.execute(sql) + + return True + MYSQL_UPDATES = { 7: mysql_update_7, *************** *** 21,25 **** SQLITE_UPDATES = { ! # 7: sqlite_update_8, } --- 46,50 ---- SQLITE_UPDATES = { ! 7: sqlite_update_8, } |
|
From: Sebastian H. <dar...@us...> - 2004-09-08 15:09:36
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13724/system Modified Files: trading.py Log Message: trading fix. heal fix. Index: trading.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/trading.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** trading.py 6 Sep 2004 19:36:44 -0000 1.10 --- trading.py 8 Sep 2004 15:09:27 -0000 1.11 *************** *** 35,39 **** return False ! if item.container and item.container.container == char and item.container.layer == LAYER_TRADING: return True else: --- 35,39 ---- return False ! if item.container and item.container.isitem() and item.container.container == char and item.container.layer == LAYER_TRADING: return True else: |
|
From: Sebastian H. <dar...@us...> - 2004-09-08 15:09:35
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13724/commands Modified Files: restore.py Log Message: trading fix. heal fix. Index: restore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/restore.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** restore.py 27 Aug 2004 00:42:39 -0000 1.4 --- restore.py 8 Sep 2004 15:09:26 -0000 1.5 *************** *** 58,62 **** elif target.char: target.char.hitpoints = int( target.char.maxhitpoints ) ! target.char.updatestats() target.char.effect(0x376A, 9, 32) target.char.soundeffect(0x202) --- 58,62 ---- elif target.char: target.char.hitpoints = int( target.char.maxhitpoints ) ! target.char.updatehealth() target.char.effect(0x376A, 9, 32) target.char.soundeffect(0x202) |
|
From: Sebastian H. <dar...@us...> - 2004-09-08 14:44:15
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9052/skills Modified Files: mining.py Log Message: Mining fix Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** mining.py 2 Sep 2004 00:44:29 -0000 1.35 --- mining.py 8 Sep 2004 14:44:01 -0000 1.36 *************** *** 11,15 **** import random from wolfpack.consts import MINING, GRAY, MINING_REFILLTIME, MINING_ORE, \ ! MINING_MAX_DISTANCE, ANIM_ATTACK3, SOUND_MINING from wolfpack import console from wolfpack.utilities import ismountainorcave, tobackpack --- 11,15 ---- import random from wolfpack.consts import MINING, GRAY, MINING_REFILLTIME, MINING_ORE, \ ! MINING_MAX_DISTANCE, ANIM_ATTACK3, SOUND_MINING, FELUCIA2XRESGAIN from wolfpack import console from wolfpack.utilities import ismountainorcave, tobackpack |
|
From: Sebastian H. <dar...@us...> - 2004-09-08 04:16:44
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26075/skills Modified Files: blacksmithing.py Log Message: Weightbonus had to be removed. Index: blacksmithing.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/blacksmithing.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** blacksmithing.py 9 Jul 2004 10:30:26 -0000 1.20 --- blacksmithing.py 8 Sep 2004 04:16:24 -0000 1.21 *************** *** 179,186 **** item.health = item.maxhealth ! weightbonus = fromitem(item, WEIGHTBONUS) ! if weightbonus != 0: ! bonus = int(math.ceil(item.weight * (weightbonus / 100.0))) ! item.weight = max(0, item.weight + bonus) # Distribute another 6 points randomly between the resistances this armor already has --- 179,186 ---- item.health = item.maxhealth ! #weightbonus = fromitem(item, WEIGHTBONUS) ! #if weightbonus != 0: ! #bonus = int(math.ceil(item.weight * (weightbonus / 100.0))) ! #item.weight = max(0, item.weight + bonus) # Distribute another 6 points randomly between the resistances this armor already has |
|
From: Richard M. <dr...@us...> - 2004-09-08 04:12:39
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25305/wolfpack Modified Files: weaponinfo.py Log Message: Vf^2 = Vi2 + 2at^2 Index: weaponinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/weaponinfo.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** weaponinfo.py 5 Sep 2004 21:42:29 -0000 1.8 --- weaponinfo.py 8 Sep 2004 04:12:15 -0000 1.9 *************** *** 105,110 **** # Bow '13b1': { - PROJECTILE: 0xf42, - AMMUNITION: 'f3f', SWING: [ 0x12 ], HITSOUND: [ 0x234 ], --- 105,108 ---- *************** *** 113,118 **** # Crossbow 'f4f': { - PROJECTILE: 0x1bfe, - AMMUNITION: '1bfb', SWING: [ 0x13 ], HITSOUND: [ 0x234 ], --- 111,114 ---- *************** *** 121,126 **** # Heavy Crossbow '13fd': { - PROJECTILE: 0x1bfe, - AMMUNITION: '1bfb', SWING: [ 0x13 ], HITSOUND: [ 0x234 ], --- 117,120 ---- *************** *** 129,134 **** # Composite Bow '26c2': { - PROJECTILE: 0xf42, - AMMUNITION: 'f3f', SWING: [ 0x12 ], HITSOUND: [ 0x234 ], --- 123,126 ---- *************** *** 137,142 **** # Repeating Crossbow '26cd': { - PROJECTILE: 0x1bfe, - AMMUNITION: '1bfb', SWING: [ 0x13 ], HITSOUND: [ 0x234 ], --- 129,132 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-08 04:06:50
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24461/wolfpack Modified Files: armorinfo.py properties.py Log Message: Fixed properties Index: armorinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/armorinfo.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** armorinfo.py 5 Sep 2004 21:42:29 -0000 1.9 --- armorinfo.py 8 Sep 2004 04:06:39 -0000 1.10 *************** *** 172,178 **** } } - - - ARMORINFO = { - - } --- 172,173 ---- Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** properties.py 7 Sep 2004 20:09:53 -0000 1.10 --- properties.py 8 Sep 2004 04:06:39 -0000 1.11 *************** *** 1,6 **** from math import floor ! from wolfpack import weaponinfo ! from wolfpack import armorinfo from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \ RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_PHYSICAL, \ --- 1,8 ---- from math import floor ! #from wolfpack import weaponinfo ! #from wolfpack import armorinfo ! import wolfpack.armorinfo ! import wolfpack.weaponinfo from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \ RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_PHYSICAL, \ *************** *** 100,184 **** # Tags Always go first, override system. ! if item.hastag( info[0] ): # HITSOUND and MISSSOUND need special treatment beacuse of # the list character. ! if property == HITSOUND or property == MISSSOUND: return str(item.gettag(info[0])).split(',') else: return int(item.gettag(info[0])) - elif item.hasintproperty( info[0] ): - return int( item.getintproperty( info[0], 0 ) ) - - elif item.hasstrproperty( info[0] ): - if property == HITSOUND or property == MISSSOUND: - return str(item.getstrproperty( info[0], '' ) ).split(',') - else: - return str(item.getstrproperty( info[0], '' ) ) - else: ! # See if our weapon info has anything for the ! # requested item. Otherwise return the default value. ! if itemcheck(item, ITEM_WEAPON): ! if weaponinfo.WEAPONINFO.has_key(item.baseid): ! weapondata = weaponinfo.WEAPONINFO[item.baseid] ! ! if weapondata.has_key(property): ! value = weapondata[property] ! else: ! value = info[1] ! ! # Resource dependant boni ! if item.hastag('resname'): ! resname = str(item.gettag('resname')) ! if weaponinfo.WEAPON_RESNAME_BONI.has_key(resname): ! if weaponinfo.WEAPON_RESNAME_BONI[resname].has_key(property): ! value += weaponinfo.WEAPON_RESNAME_BONI[resname][property] ! ! if item.hastag('resname2'): ! resname = str(item.gettag('resname2')) ! if weaponinfo.WEAPON_RESNAME_BONI.has_key(resname): ! if weaponinfo.WEAPON_RESNAME_BONI[resname].has_key(property): ! value += weaponinfo.WEAPON_RESNAME_BONI[resname][property] ! return value elif itemcheck(item, ITEM_ARMOR) or itemcheck(item, ITEM_SHIELD): ! if armorinfo.ARMORINFO.has_key(item.baseid): ! armordata = armorinfo.ARMORINFO[item.baseid] ! ! if armordata.has_key(property): ! value = armordata[property] ! else: ! value = info[1] ! ! # Resource dependant boni ! if item.hastag('resname'): ! resname = str(item.gettag('resname')) ! if armorinfo.ARMOR_RESNAME_BONI.has_key(resname): ! if armorinfo.ARMOR_RESNAME_BONI[resname].has_key(property): ! value += armorinfo.ARMOR_RESNAME_BONI[resname][property] ! # No tag, what about property? ! elif item.hasstrproperty('resname'): ! resname = str( item.getstrproperty( 'resname', '' ) ) ! if armorinfo.ARMOR_RESNAME_BONI.has_key(resname): ! if armorinfo.ARMOR_RESNAME_BONI[resname].has_key(property): ! value += armorinfo.ARMOR_RESNAME_BONI[resname][property] ! if item.hastag('resname2'): ! resname = str(item.gettag('resname2')) ! if armorinfo.ARMOR_RESNAME_BONI.has_key(resname): ! if armorinfo.ARMOR_RESNAME_BONI[resname].has_key(property): ! value += armorinfo.ARMOR_RESNAME_BONI[resname][property] ! # No tag, what about property? ! elif item.hasstrproperty('resname2'): ! resname = str( item.getstrproperty( 'resname2', '' ) ) ! if armorinfo.ARMOR_RESNAME_BONI.has_key(resname): ! if armorinfo.ARMOR_RESNAME_BONI[resname].has_key(property): ! value += armorinfo.ARMOR_RESNAME_BONI[resname][property] ! return value ! return info[1] # --- 102,154 ---- # Tags Always go first, override system. ! if item.hastag(info[0]): # HITSOUND and MISSSOUND need special treatment beacuse of # the list character. ! if property in [HITSOUND, MISSSOUND, SWING]: return str(item.gettag(info[0])).split(',') + elif property == AMMUNITION: + return str(item.gettag(info[0])) else: return int(item.gettag(info[0])) else: ! # Take three properties from the hardcoded property list for weapons ! if property in [HITSOUND, MISSSOUND, SWING]: ! if not wolfpack.weaponinfo.WEAPONINFO.has_key(item.baseid): ! return info[1] ! else: ! return info[1] ! ! # Get the base property from the item ! if type(info[1]) == int: ! value = item.getintproperty( info[0], info[1] ) ! elif type(info[1]) == str: ! value = item.getstrproperty( info[0], info[1] ) ! else: ! raise Exception, "Unsupported property type %s for property %u." % (type(info[1]).__name__, property) ! resboni = None + # Get Resname boni from the weapon list. + if itemcheck(item, ITEM_WEAPON): + resboni = wolfpack.weaponinfo.WEAPON_RESNAME_BONI + + # Get Resname boni from the ARMOR list elif itemcheck(item, ITEM_ARMOR) or itemcheck(item, ITEM_SHIELD): ! resboni = wolfpack.armorinfo.ARMOR_RESNAME_BONI ! if resboni and item.hastag('resname'): ! resname = str(item.gettag('resname')) ! if resboni.has_key(resname) and resboni[resname].has_key(property): ! value += resboni[resname][property] ! ! if resboni and item.hastag('resname2'): ! resname = str(item.gettag('resname2')) ! if resboni.has_key(resname) and resboni[resname].has_key(property): ! value += resboni[resname][property] ! return value ! return info[1] # |
|
From: Sebastian H. <dar...@us...> - 2004-09-08 04:06:50
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24461 Modified Files: equipment.py Log Message: Fixed properties Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** equipment.py 7 Sep 2004 20:09:52 -0000 1.36 --- equipment.py 8 Sep 2004 04:06:39 -0000 1.37 *************** *** 3,6 **** --- 3,8 ---- from wolfpack.utilities import * from wolfpack.consts import * + import wolfpack.weaponinfo + import wolfpack.armorinfo from wolfpack import properties from combat.utilities import weaponskill *************** *** 66,85 **** if object.hastag('resname'): resname = str(object.gettag('resname')) ! if armor and properties.armorinfo.ARMOR_RESNAME_BONI.has_key(resname): ! resinfo = properties.armorinfo.ARMOR_RESNAME_BONI[resname] if resinfo.has_key(MATERIALPREFIX): prefix1 = resinfo[MATERIALPREFIX] ! if weapon and properties.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname): ! resinfo = properties.weaponinfo.WEAPON_RESNAME_BONI[resname] if resinfo.has_key(MATERIALPREFIX): prefix1 = resinfo[MATERIALPREFIX] elif object.hasstrproperty( 'resname' ): resname = str( object.getstrproperty( 'resname' ) ) ! if armor and properties.armorinfo.ARMOR_RESNAME_BONI.has_key(resname): ! resinfo = properties.armorinfo.ARMOR_RESNAME_BONI[resname] if resinfo.has_key(MATERIALPREFIX): prefix1 = resinfo[MATERIALPREFIX] ! if weapon and properties.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname): ! resinfo = properties.weaponinfo.WEAPON_RESNAME_BONI[resname] if resinfo.has_key(MATERIALPREFIX): prefix1 = resinfo[MATERIALPREFIX] --- 68,87 ---- if object.hastag('resname'): resname = str(object.gettag('resname')) ! if armor and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname): ! resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname] if resinfo.has_key(MATERIALPREFIX): prefix1 = resinfo[MATERIALPREFIX] ! if weapon and wolfpack.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname): ! resinfo = wolfpack.weaponinfo.WEAPON_RESNAME_BONI[resname] if resinfo.has_key(MATERIALPREFIX): prefix1 = resinfo[MATERIALPREFIX] elif object.hasstrproperty( 'resname' ): resname = str( object.getstrproperty( 'resname' ) ) ! if armor and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname): ! resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname] if resinfo.has_key(MATERIALPREFIX): prefix1 = resinfo[MATERIALPREFIX] ! if weapon and wolfpack.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname): ! resinfo = wolfpack.weaponinfo.WEAPON_RESNAME_BONI[resname] if resinfo.has_key(MATERIALPREFIX): prefix1 = resinfo[MATERIALPREFIX] *************** *** 88,107 **** if object.hastag('resname2'): resname2 = str(object.gettag('resname2')) ! if armor and properties.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2): ! resinfo = properties.armorinfo.ARMOR_RESNAME_BONI[resname2] if resinfo.has_key(MATERIALPREFIX): prefix2 = resinfo[MATERIALPREFIX] ! if weapon and properties.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname2): ! resinfo = properties.weaponinfo.WEAPON_RESNAME_BONI[resname2] if resinfo.has_key(MATERIALPREFIX): prefix2 = resinfo[MATERIALPREFIX] elif object.hasstrproperty( 'resname2' ): resname2 = str( object.getstrproperty( 'resname2' ) ) ! if armor and properties.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2): ! resinfo = properties.armorinfo.ARMOR_RESNAME_BONI[resname2] if resinfo.has_key(MATERIALPREFIX): prefix2 = resinfo[MATERIALPREFIX] ! if weapon and properties.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname2): ! resinfo = properties.weaponinfo.WEAPON_RESNAME_BONI[resname2] if resinfo.has_key(MATERIALPREFIX): prefix2 = resinfo[MATERIALPREFIX] --- 90,109 ---- if object.hastag('resname2'): resname2 = str(object.gettag('resname2')) ! if armor and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2): ! resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname2] if resinfo.has_key(MATERIALPREFIX): prefix2 = resinfo[MATERIALPREFIX] ! if weapon and wolfpack.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname2): ! resinfo = wolfpack.weaponinfo.WEAPON_RESNAME_BONI[resname2] if resinfo.has_key(MATERIALPREFIX): prefix2 = resinfo[MATERIALPREFIX] elif object.hasstrproperty( 'resname2' ): resname2 = str( object.getstrproperty( 'resname2' ) ) ! if armor and wolfpack.armorinfo.ARMOR_RESNAME_BONI.has_key(resname2): ! resinfo = wolfpack.armorinfo.ARMOR_RESNAME_BONI[resname2] if resinfo.has_key(MATERIALPREFIX): prefix2 = resinfo[MATERIALPREFIX] ! if weapon and wolfpack.weaponinfo.WEAPON_RESNAME_BONI.has_key(resname2): ! resinfo = wolfpack.weaponinfo.WEAPON_RESNAME_BONI[resname2] if resinfo.has_key(MATERIALPREFIX): prefix2 = resinfo[MATERIALPREFIX] *************** *** 187,205 **** # Physical Damage Distribution ! fire = object.getintproperty( 'dmg_fire', 0 ) ! if object.hastag( 'dmg_fire' ): ! fire = int( object.gettag( 'dmg_fire' ) ) ! ! cold = object.getintproperty( 'dmg_cold', 0 ) ! if object.hastag( 'dmg_cold' ): ! cold = int( object.gettag( 'dmg_cold' ) ) ! ! poison = object.getintproperty( 'dmg_poison', 0 ) ! if object.hastag( 'dmg_poison' ): ! poison = int( object.gettag( 'dmg_poison' ) ) ! ! energy = object.getintproperty( 'dmg_energy', 0 ) ! if object.hastag( 'dmg_energy' ): ! energy = int( object.gettag( 'dmg_energy' ) ) # This must always total 100 --- 189,196 ---- # Physical Damage Distribution ! fire = properties.fromitem(object, DAMAGE_FIRE) ! cold = properties.fromitem(object, DAMAGE_COLD) ! poison = properties.fromitem(object, DAMAGE_POISON) ! energy = properties.fromitem(object, DAMAGE_ENERGY) # This must always total 100 *************** *** 232,254 **** tooltip.add(1060482, "") ! physical = object.getintproperty( 'res_physical', 0 ) ! if object.hastag( 'res_physical' ): ! physical = int( object.gettag( 'res_physical' ) ) ! ! fire = object.getintproperty( 'res_fire', 0 ) ! if object.hastag( 'res_fire' ): ! fire = int( object.gettag( 'res_fire' ) ) ! ! cold = object.getintproperty( 'res_cold', 0 ) ! if object.hastag( 'res_cold' ): ! cold = int( object.gettag( 'res_cold' ) ) ! ! poison = object.getintproperty( 'res_poison', 0 ) ! if object.hastag( 'res_poison' ): ! poison = int( object.gettag( 'res_poison' ) ) ! ! energy = object.getintproperty( 'res_energy', 0 ) ! if object.hastag( 'res_energy' ): ! energy = int( object.gettag( 'res_energy' ) ) if physical: --- 223,231 ---- tooltip.add(1060482, "") ! physical = properties.fromitem(object, RESISTANCE_PHYSICAL) ! fire = properties.fromitem(object, RESISTANCE_FIRE) ! cold = properties.fromitem(object, RESISTANCE_COLD) ! poison = properties.fromitem(object, RESISTANCE_POISON) ! energy = properties.fromitem(object, RESISTANCE_ENERGY) if physical: |
