wpdev-commits Mailing List for Wolfpack Emu (Page 33)
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-24 11:07:13
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4247/magic Modified Files: __init__.py utilities.py Log Message: kindling fix Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** __init__.py 16 Sep 2004 16:42:28 -0000 1.17 --- __init__.py 24 Sep 2004 11:07:04 -0000 1.18 *************** *** 58,69 **** # Target Cancel def target_cancel(char): ! if char.socket.hastag('cast_target'): ! char.socket.deltag('cast_target') # Target Timeout def target_timeout(char): ! char.socket.deltag('cast_target') ! char.socket.clilocmessage(500641) ! fizzle(char) # Target Response --- 58,70 ---- # Target Cancel def target_cancel(char): ! char.socket.deltag('cast_target') ! char.dispel(char, 1, 'cast_delay') ! char.removescript('magic') # Target Timeout def target_timeout(char): ! if char.socket.hastag('cast_target'): ! char.socket.clilocmessage(500641) ! fizzle(char) # Target Response Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/utilities.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** utilities.py 14 Sep 2004 01:22:49 -0000 1.15 --- utilities.py 24 Sep 2004 11:07:04 -0000 1.16 *************** *** 51,55 **** def fizzle(char): char.dispel(char, 1, 'cast_delay') - char.removescript('magic') --- 51,54 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-24 11:07:13
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4247 Modified Files: kindling.py Log Message: kindling fix Index: kindling.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/kindling.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kindling.py 9 Jul 2004 21:47:45 -0000 1.6 --- kindling.py 24 Sep 2004 11:07:04 -0000 1.7 *************** *** 49,54 **** campfire = wolfpack.additem( "de3" ) campfire.moveto( pos ) ! campfire.decay = 1 ! campfire.decaytime = wolfpack.time.servertime() + ( 2 * 60 * 1000 ) # Decays in 2 Minutes campfire.update() --- 49,54 ---- campfire = wolfpack.additem( "de3" ) campfire.moveto( pos ) ! campfire.decay = True ! #campfire.decaytime = wolfpack.time.servertime() + ( 2 * 60 * 1000 ) # Decays in 2 Minutes campfire.update() |
|
From: Sebastian H. <dar...@us...> - 2004-09-24 11:07:08
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4163/npcs/humans/vendors Modified Files: alchemist.xml Log Message: kindling fix. Index: alchemist.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/alchemist.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** alchemist.xml 22 Sep 2004 06:11:01 -0000 1.5 --- alchemist.xml 24 Sep 2004 11:06:52 -0000 1.6 *************** *** 58,62 **** <item id="potion_lesserheal" /> <item id="potion_lesserpoison" /> ! <item id="potion_lesserexplosion" /> </sellable> </shopkeeper> --- 58,62 ---- <item id="potion_lesserheal" /> <item id="potion_lesserpoison" /> ! <item id="potion_lesserexplosion" /> </sellable> </shopkeeper> |
|
From: Sebastian H. <dar...@us...> - 2004-09-24 11:07:08
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4163/items/buildings Modified Files: misc.xml Log Message: kindling fix. Index: misc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/misc.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** misc.xml 21 Jul 2004 04:18:27 -0000 1.14 --- misc.xml 24 Sep 2004 11:06:52 -0000 1.15 *************** *** 650,653 **** --- 650,654 ---- <id>0xde3</id> <nodecay /> + <decaytime>120000</decaytime> <category>Decoration\Campfire\Campfire</category> </item> |
|
From: Correa <thi...@us...> - 2004-09-24 04:47:56
|
Update of /cvsroot/wpdev/wolfpack/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1995/languages Modified Files: wolfpack_it.ts wolfpack_nl.ts Added Files: wolfpack_pt_br.ts Removed Files: wolfpack_pt-BR.ts Log Message: - Fixed translations - It's possible to disable translations in compile time Index: wolfpack_it.ts =================================================================== RCS file: /cvsroot/wpdev/wolfpack/languages/wolfpack_it.ts,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wolfpack_it.ts 15 Sep 2003 02:00:41 -0000 1.5 --- wolfpack_it.ts 24 Sep 2004 04:47:38 -0000 1.6 *************** *** 1,1526 **** <!DOCTYPE TS><TS> <context> - <name></name> - <message> - <source>The spellbook needs to be in your hands or in your backpack.</source> - <translation type="obsolete">Lo spellbook deve essere in vostre mani o nel vostro fagotto.</translation> - </message> - <message> - <source>You cannot place guildstones at any other location than your house</source> - <translation type="obsolete">Non potete disporre i guildstones a qualunque altra posizione che la vostra casa</translation> [...6323 lines suppressed...] ! <source>Worldsave Initialized</source> ! <translation type="unfinished"></translation> </message> <message> ! <source>WORLDSAVE IN PROGRESS</source> ! <translation type="unfinished"></translation> ! </message> ! <message> ! <source>Saving %1 items.</source> ! <translation type="unfinished"></translation> ! </message> ! <message> ! <source>Saving %1 characters.</source> ! <translation type="unfinished"></translation> ! </message> ! <message> ! <source>Worldsave Completed In %1ms</source> ! <translation type="unfinished"></translation> </message> </context> --- wolfpack_pt-BR.ts DELETED --- --- NEW FILE: wolfpack_pt_br.ts --- <!DOCTYPE TS><TS> <context> <name>@default</name> <message> <source>Usage: set <key> <value></source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target to 'set %1 %2' </source> <translation type="unfinished"></translation> </message> <message> <source>Server time: %1</source> <translation type="unfinished"></translation> </message> <message> <source>Please select a target</source> <translation type="unfinished"></translation> </message> [...1201 lines suppressed...] <translation type="unfinished"></translation> </message> <message> <source>WORLDSAVE IN PROGRESS</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 items.</source> <translation type="unfinished"></translation> </message> <message> <source>Saving %1 characters.</source> <translation type="unfinished"></translation> </message> <message> <source>Worldsave Completed In %1ms</source> <translation type="unfinished"></translation> </message> </context> </TS> Index: wolfpack_nl.ts =================================================================== RCS file: /cvsroot/wpdev/wolfpack/languages/wolfpack_nl.ts,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wolfpack_nl.ts 15 Sep 2003 02:00:41 -0000 1.5 --- wolfpack_nl.ts 24 Sep 2004 04:47:38 -0000 1.6 *************** *** 1,90 **** <!DOCTYPE TS><TS> <context> - <name></name> - </context> - <context> <name>@default</name> <message> ! <source>You are at peace.</source> ! <translation type="unfinished"></translation> ! </message> [...3159 lines suppressed...] <message> ! <source>Worldsave Initialized</source> <translation type="unfinished"></translation> </message> <message> ! <source>WORLDSAVE IN PROGRESS</source> <translation type="unfinished"></translation> </message> <message> ! <source>Saving %1 items.</source> <translation type="unfinished"></translation> </message> <message> ! <source>Saving %1 characters.</source> <translation type="unfinished"></translation> </message> <message> ! <source>Worldsave Completed In %1ms</source> <translation type="unfinished"></translation> </message> |
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1995 Modified Files: ChangeLog basechar.h configure.py console.h dragdrop.cpp gumps.h inlines.h items.h npc.h player.h server.cpp server.h skills.h spawnregions.h targetrequests.cpp targetrequests.h territories.h timing.h wolfpack.pro world.cpp world.h Added Files: objectdef.h Log Message: - Fixed translations - It's possible to disable translations in compile time Index: world.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** world.h 10 Sep 2004 04:06:26 -0000 1.22 --- world.h 24 Sep 2004 04:47:38 -0000 1.23 *************** *** 33,36 **** --- 33,37 ---- #include "typedefs.h" #include "singleton.h" + #include "objectdef.h" // Library Includes *************** *** 80,83 **** --- 81,85 ---- class cWorld : public cComponent { + OBJECTDEF(cWorld) friend class cCharIterator; friend class cItemIterator; Index: targetrequests.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** targetrequests.h 19 Aug 2004 01:55:56 -0000 1.74 --- targetrequests.h 24 Sep 2004 04:47:38 -0000 1.75 *************** *** 40,48 **** #include "muls/tilecache.h" #include "npc.h" ! #include "ai/ai.h" class cKillTarget : public cTargetRequest { public: virtual bool responsed( cUOSocket* socket, cUORxTarget* target ) --- 40,49 ---- #include "muls/tilecache.h" #include "npc.h" ! #include "objectdef.h" #include "ai/ai.h" class cKillTarget : public cTargetRequest { + OBJECTDEF(cKillTarget) public: virtual bool responsed( cUOSocket* socket, cUORxTarget* target ) *************** *** 78,81 **** --- 79,83 ---- class cSetTarget : public cTargetRequest { + OBJECTDEF(cSetTarget) QString key, value; public: *************** *** 88,91 **** --- 90,94 ---- class cRemoveTarget : public cTargetRequest { + OBJECTDEF(cRemoveTarget) public: bool responsed( cUOSocket* socket, cUORxTarget* target ); *************** *** 118,121 **** --- 121,125 ---- class cShowTarget : public cTargetRequest { + OBJECTDEF(cShowTarget) private: QString key; *************** *** 130,133 **** --- 134,138 ---- class cSetTagTarget : public cTargetRequest { + OBJECTDEF(cSetTagTarget) private: Q_UINT8 type_; *************** *** 187,190 **** --- 192,196 ---- class cGetTagTarget : public cTargetRequest { + OBJECTDEF(cGetTagTarget) private: QString key_; *************** *** 221,224 **** --- 227,231 ---- class cRemoveTagTarget : public cTargetRequest { + OBJECTDEF(cRemoveTagTarget) private: QString key_; *************** *** 296,299 **** --- 303,307 ---- class cMoveTarget : public cTargetRequest { + OBJECTDEF(cMoveTarget) private: Q_INT16 x, y, z; *************** *** 355,358 **** --- 363,367 ---- class cRestockTarget : public cTargetRequest { + OBJECTDEF(cRestockTarget) public: virtual bool responsed( cUOSocket* socket, cUORxTarget* target ) Index: skills.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/skills.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** skills.h 19 Aug 2004 01:55:56 -0000 1.33 --- skills.h 24 Sep 2004 04:47:37 -0000 1.34 *************** *** 33,36 **** --- 33,37 ---- #include "typedefs.h" #include "targetrequests.h" + #include "objectdef.h" // Library Includes *************** *** 49,52 **** --- 50,54 ---- class cSkills { + OBJECTDEF(cSkills) private: QStringList skillRanks; Index: targetrequests.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** targetrequests.cpp 10 Aug 2004 03:15:57 -0000 1.103 --- targetrequests.cpp 24 Sep 2004 04:47:38 -0000 1.104 *************** *** 108,112 **** } else ! socket->sysMessage( "You need to select either an item or a character" ); return true; } --- 108,112 ---- } else ! socket->sysMessage( tr("You need to select either an item or a character") ); return true; } Index: wolfpack.pro =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v retrieving revision 1.211 retrieving revision 1.212 diff -C2 -d -r1.211 -r1.212 *** wolfpack.pro 18 Sep 2004 21:23:00 -0000 1.211 --- wolfpack.pro 24 Sep 2004 04:47:38 -0000 1.212 *************** *** 177,181 **** INTERFACES = TRANSLATIONS = \ ! languages/wolfpack_pt-BR.ts \ languages/wolfpack_it.ts \ languages/wolfpack_nl.ts \ --- 177,181 ---- INTERFACES = TRANSLATIONS = \ ! languages/wolfpack_pt_br.ts \ languages/wolfpack_it.ts \ languages/wolfpack_nl.ts \ Index: spawnregions.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** spawnregions.h 13 Aug 2004 19:51:04 -0000 1.28 --- spawnregions.h 24 Sep 2004 04:47:38 -0000 1.29 *************** *** 32,35 **** --- 32,36 ---- #include "singleton.h" #include "server.h" + #include "objectdef.h" #include <map> *************** *** 37,40 **** --- 38,42 ---- class cSpawnRegion : public cBaseRegion { + OBJECTDEF(cSpawnRegion) public: cSpawnRegion( const cElement* Tag ) Index: items.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.h,v retrieving revision 1.217 retrieving revision 1.218 diff -C2 -d -r1.217 -r1.218 *** items.h 22 Sep 2004 05:34:47 -0000 1.217 --- items.h 24 Sep 2004 04:47:25 -0000 1.218 *************** *** 35,38 **** --- 35,39 ---- #include "network/uotxpackets.h" #include "singleton.h" + #include "objectdef.h" // Library Includes *************** *** 54,57 **** --- 55,59 ---- class cItem : public cUObject { + OBJECTDEF(cItem) friend class cBaseChar; private: Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** server.cpp 19 Sep 2004 16:50:41 -0000 1.25 --- server.cpp 24 Sep 2004 04:47:37 -0000 1.26 *************** *** 57,70 **** #include "persistentbroker.h" #include "profile.h" ! // System Includes #include <qwaitcondition.h> #include <qptrvector.h> #include <qapplication.h> ! #include "python/engine.h" ! #include "verinfo.h" ! #include "network/network.h" - #include "sqlite/sqlite.h" #if defined(MYSQL_DRIVER) #if defined(Q_OS_WIN32) --- 57,71 ---- #include "persistentbroker.h" #include "profile.h" + #include "python/engine.h" + #include "verinfo.h" + #include "network/network.h" + #include "sqlite/sqlite.h" ! // Qt Includes #include <qwaitcondition.h> #include <qptrvector.h> #include <qapplication.h> ! #include <qtextcodec.h> #if defined(MYSQL_DRIVER) #if defined(Q_OS_WIN32) *************** *** 260,264 **** new QApplication ( argc, argv, false ); - QTranslator translator( 0 ); // Load wolfpack.xml --- 261,264 ---- *************** *** 279,293 **** setupConsole(); // Start the QT translator ! QString languageFile = Config::instance()->getString( "General", "Language File", "", true ); if ( !languageFile.isEmpty() ) { ! if ( !translator.load( languageFile, "." ) ) { Console::instance()->log( LOG_ERROR, "Couldn't load translator.\n" ); return false; } ! qApp->installTranslator( &translator ); } // Load all subcomponents --- 279,299 ---- setupConsole(); + #if !defined( QT_NO_TRANSLATION ) // Start the QT translator ! QString languageFile = Config::instance()->getString( "General", "Language File", QString("wolfpack_") + QTextCodec::locale(), true ); if ( !languageFile.isEmpty() ) { ! QTranslator* translator = new QTranslator( qApp ); ! if ( !translator->load( languageFile, "." ) ) { Console::instance()->log( LOG_ERROR, "Couldn't load translator.\n" ); return false; } ! else ! { ! qApp->installTranslator( translator ); ! } } + #endif // Load all subcomponents *************** *** 396,400 **** Console::instance()->stop(); ScriptManager::instance()->onServerStop(); // Notify python scripts about shutdown ! Network::instance()->broadcast( "The server is shutting down." ); unload(); --- 402,406 ---- Console::instance()->stop(); ScriptManager::instance()->onServerStop(); // Notify python scripts about shutdown ! Network::instance()->broadcast( tr("The server is shutting down.") ); unload(); *************** *** 430,434 **** QString UnicodeType("UCS-2"); #endif ! Console::instance()->send( tr("Compiled for Python %1 %2 (Using: %3 )\n").arg(PY_VERSION, UnicodeType, pythonBuild) ); Console::instance()->send( "Compiled with SQLite " SQLITE_VERSION "\n" ); #if defined (MYSQL_DRIVER) --- 436,440 ---- QString UnicodeType("UCS-2"); #endif ! Console::instance()->send( tr("Compiled for Python %1 %2 (Using: %3)\n").arg(PY_VERSION, UnicodeType, pythonBuild) ); Console::instance()->send( "Compiled with SQLite " SQLITE_VERSION "\n" ); #if defined (MYSQL_DRIVER) Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** basechar.h 16 Sep 2004 01:40:16 -0000 1.86 --- basechar.h 24 Sep 2004 04:47:23 -0000 1.87 *************** *** 44,47 **** --- 44,48 ---- #include "territories.h" #include "log.h" + #include "objectdef.h" // include for ceilf() *************** *** 55,58 **** --- 56,60 ---- class cBaseChar : public cUObject { + OBJECTDEF(cBaseChar) public: const char* objectID() const Index: server.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** server.h 31 Aug 2004 17:44:37 -0000 1.5 --- server.h 24 Sep 2004 04:47:37 -0000 1.6 *************** *** 33,36 **** --- 33,37 ---- #include <qvaluevector.h> #include "singleton.h" + #include "objectdef.h" enum enServerState *************** *** 122,125 **** --- 123,127 ---- class cServer { + OBJECTDEF(cServer) private: class Private; Index: player.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.h,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** player.h 4 Sep 2004 21:20:07 -0000 1.59 --- player.h 24 Sep 2004 04:47:37 -0000 1.60 *************** *** 37,40 **** --- 37,41 ---- #include "basechar.h" #include "accounts.h" + #include "objectdef.h" class cGuild; *************** *** 43,46 **** --- 44,48 ---- class cPlayer : public cBaseChar { + OBJECTDEF(cPlayer) public: const char* objectID() const Index: dragdrop.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v retrieving revision 1.245 retrieving revision 1.246 diff -C2 -d -r1.245 -r1.246 *** dragdrop.cpp 16 Sep 2004 01:40:17 -0000 1.245 --- dragdrop.cpp 24 Sep 2004 04:47:23 -0000 1.246 *************** *** 44,51 **** #include "inlines.h" - #undef DBGFILE - #define DBGFILE "dragdrop.cpp" - - // New Class implementation void DragAndDrop::grabItem( cUOSocket* socket, cUORxDragItem* packet ) --- 44,47 ---- Index: territories.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** territories.h 19 Aug 2004 01:22:53 -0000 1.30 --- territories.h 24 Sep 2004 04:47:38 -0000 1.31 *************** *** 31,34 **** --- 31,35 ---- #include "baseregion.h" #include "singleton.h" + #include "objectdef.h" #include <map> *************** *** 251,254 **** --- 252,256 ---- class cTerritories : public cComponent { + OBJECTDEF(cTerritories) private: QMap<uint, QPtrList<cTerritory> > topregions; Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** ChangeLog 22 Sep 2004 05:34:46 -0000 1.74 --- ChangeLog 24 Sep 2004 04:47:22 -0000 1.75 *************** *** 48,51 **** --- 48,53 ---- - Added the ability to dynamically determine the sell value of an item using the onGetSellPrice event. + - Fixed translation support. + - Added ability to disable translation support during compile time thru configure.py Wolfpack 12.9.10 Beta (10. September 2004) Index: timing.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timing.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** timing.h 10 Aug 2004 03:15:57 -0000 1.4 --- timing.h 24 Sep 2004 04:47:38 -0000 1.5 *************** *** 31,34 **** --- 31,35 ---- #include "singleton.h" #include "typedefs.h" + #include "objectdef.h" #include <qpair.h> *************** *** 37,40 **** --- 38,42 ---- class cTiming { + OBJECTDEF(cTiming) private: unsigned int nextSpawnRegionCheck; Index: gumps.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/gumps.h,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** gumps.h 19 Aug 2004 01:22:52 -0000 1.43 --- gumps.h 24 Sep 2004 04:47:25 -0000 1.44 *************** *** 30,33 **** --- 30,34 ---- #include "typedefs.h" + #include "objectdef.h" #include <qstringlist.h> *************** *** 243,246 **** --- 244,248 ---- class cSpawnRegionInfoGump : public cGump { + OBJECTDEF(cSpawnRegionInfoGump) protected: cSpawnRegion* region_; *************** *** 254,257 **** --- 256,260 ---- class cPagesGump : public cGump { + OBJECTDEF(cPagesGump) private: uint page_; *************** *** 268,271 **** --- 271,275 ---- class cPageInfoGump : public cGump { + OBJECTDEF(cPageInfoGump) private: cPage* page_; *************** *** 279,282 **** --- 283,287 ---- class cHelpGump : public cGump { + OBJECTDEF(cHelpGump) private: SERIAL char_; Index: inlines.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/inlines.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** inlines.h 16 Sep 2004 01:41:02 -0000 1.29 --- inlines.h 24 Sep 2004 04:47:25 -0000 1.30 *************** *** 32,42 **** #include <algorithm> #include <math.h> ! #include "qapplication.h" ! #include "qstring.h" ! ! inline QString tr( const QString& text, const char* comment = 0, const char* context = "@default" ) ! { ! return qApp->translate( context, text.latin1(), comment ); ! } inline bool isHair( Q_UINT16 model ) --- 32,36 ---- #include <algorithm> #include <math.h> ! #include <qglobal.h> inline bool isHair( Q_UINT16 model ) Index: console.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** console.h 14 Sep 2004 18:05:15 -0000 1.19 --- console.h 24 Sep 2004 04:47:23 -0000 1.20 *************** *** 34,37 **** --- 34,38 ---- #include "singleton.h" #include "server.h" + #include "objectdef.h" // System Includes *************** *** 69,72 **** --- 70,74 ---- class cConsole { + OBJECTDEF(cConsole) private: QString linebuffer_; Index: npc.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.h,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** npc.h 29 Aug 2004 20:40:50 -0000 1.59 --- npc.h 24 Sep 2004 04:47:37 -0000 1.60 *************** *** 37,40 **** --- 37,41 ---- // wolfpack includes #include "basechar.h" + #include "objectdef.h" class AbstractAI; *************** *** 43,46 **** --- 44,48 ---- class cNPC : public cBaseChar { + OBJECTDEF(cNPC) public: const char* objectID() const --- NEW FILE: objectdef.h --- /* * Wolfpack Emu (WP) * UO Server Emulation Program * * Copyright 2001-2004 by holders identified in AUTHORS.txt * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA. * * In addition to that license, if you are running this program or modified * versions of it on a public system you HAVE TO make the complete source of * the version used by you available or provide people with a location to * download it. * * Wolfpack Homepage: http://wpdev.sf.net/ */ #if !defined( __OBJECTDEF_H__ ) #define __OBJECTDEF_H__ #ifndef QT_H #include <qglobal.h> #include <qapplication.h> #endif // QT_H /*! Since we are not using QObject due to memory footprint, moc won't create some nice functions either, we need some macro magic to get them ( or disabling some ) without doing too much mess */ #ifndef QT_NO_TRANSLATION inline QString tr( const QString& text, const char* comment = 0, const char* context = "@default" ) { return qApp->translate( context, text.latin1(), comment ); } # ifndef QT_NO_TEXTCODEC // full set of tr functions # define WP_TR_FUNCTIONS(classname) \ static QString tr( const char* s, const char* c = 0 ) \ { \ if ( qApp ) \ return qApp->translate( #classname, s, c, QApplication::DefaultCodec ); \ else \ return QString::fromLatin1( s ); \ } \ \ static QString trUtf8( const char* s, const char* c = 0 ) \ { \ if ( qApp ) \ return qApp->translate( #classname, s, c, QApplication::UnicodeUTF8 ); \ else \ return QString::fromUtf8( s ); \ } # else // no QTextCodec, no utf8 # define WP_TR_FUNCTIONS \ static QString tr( const char* s, const char* c = 0 ) \ { \ if ( qApp ) \ return qApp->translate( #classname, s, c, QApplication::DefaultCodec ); \ else \ return QString::fromLatin1( s ); \ } # endif #else # define WP_TR_FUNCTIONS(classname) # define tr(x) QString(x) #endif #define OBJECTDEF(classname) \ public: \ /*virtual const char *className() const { return #classname; }*/ \ WP_TR_FUNCTIONS(classname) \ private: #endif // __OBJECTDEF_H__ Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** world.cpp 19 Sep 2004 16:50:41 -0000 1.128 --- world.cpp 24 Sep 2004 04:47:38 -0000 1.129 *************** *** 501,505 **** guild->load(reader, reader.version()); Guilds::instance()->registerGuild(guild); ! } catch (wpException& e) { delete guild; } --- 501,505 ---- guild->load(reader, reader.version()); Guilds::instance()->registerGuild(guild); ! } catch (wpException& ) { delete guild; } *************** *** 614,618 **** continue; // Move on... ! Console::instance()->send( "\n" + tr( "Loading " ) + QString::number( count ) + tr( " objects of type " ) + type ); res = PersistentBroker::instance()->query( PersistentFactory::instance()->findSqlQuery( type ) ); --- 614,618 ---- continue; // Move on... ! Console::instance()->send( "\n" + tr( "Loading %1 objects of type %2" ).arg( count ).arg( type ) ); res = PersistentBroker::instance()->query( PersistentFactory::instance()->findSqlQuery( type ) ); Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** configure.py 19 Sep 2004 05:07:05 -0000 1.36 --- configure.py 24 Sep 2004 04:47:23 -0000 1.37 *************** *** 282,285 **** --- 282,286 ---- parser.add_option("--enable-aidebug", action="store_true", dest="enable_aidebug", help="Enabled debugging of NPC AI.") parser.add_option("--enable-mysql", action="store_true", dest="enable_mysql", help="Enables MySQL support.") + parser.add_option("--disable-translation", action="store_true", dest="disable_translation", help="Disable non-English language support.") (options, args) = parser.parse_args() *************** *** 294,297 **** --- 295,301 ---- checkQt() + if options.disable_translation: + DEFINES += "QT_NO_TRANSLATION " + # Create config.pri global py_libpath |
|
From: Correa <thi...@us...> - 2004-09-24 04:47:56
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1995/network Modified Files: uosocket.h Log Message: - Fixed translations - It's possible to disable translations in compile time Index: uosocket.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** uosocket.h 19 Aug 2004 01:55:56 -0000 1.125 --- uosocket.h 24 Sep 2004 04:47:39 -0000 1.126 *************** *** 53,56 **** --- 53,57 ---- #include "../targetrequest.h" #include "../customtags.h" + #include "../objectdef.h" struct stTargetItem *************** *** 65,68 **** --- 66,70 ---- class cUOSocket { + OBJECTDEF(cUOSocket) public: enum eSocketState |
|
From: Richard M. <dr...@us...> - 2004-09-23 22:24:58
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30854 Modified Files: potions.py Log Message: Fixed... Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** potions.py 20 Sep 2004 16:03:25 -0000 1.52 --- potions.py 23 Sep 2004 22:24:47 -0000 1.53 *************** *** 76,80 **** # char, potion, counter value if not item.hastag('exploding'): ! potionexplosion( item, [ char.serial, 4] ) item.settag('exploding', 'true') socket.sysmessage( 'You should throw this now!', RED ) --- 76,80 ---- # char, potion, counter value if not item.hastag('exploding'): ! potionexplosion( item, [char, 4, item.amount] ) item.settag('exploding', 'true') socket.sysmessage( 'You should throw this now!', RED ) *************** *** 161,186 **** # Explosion Potion Function def potionexplosion( potion, args ): ! char = wolfpack.findchar(args[0]) ! counter = args[1] ! bonus = potion.amount ! if not bonus: ! bonus = 1 ! if counter > 0: ! potion.addtimer( 1000, "potions.potioncountdown", [char.serial, counter, bonus] ) ! return else: potion.soundeffect(0x307) # Boom! potion.effect( explosions[randint( 0, 2 )], 20, 10 ) ! potionregion( [char, potion, bonus] ) potion.delete() ! return # Explosion Potion Function def potioncountdown( potion, args ): counter = args[1] - bonus = args[2] if potion: - if not bonus: - bonus = 1 if counter >= 0: if counter > 0: --- 161,177 ---- # Explosion Potion Function def potionexplosion( potion, args ): ! if args[1] > 0: ! potion.addtimer( 1000, "potions.potioncountdown", [args[0], args[1], args[2]] ) else: potion.soundeffect(0x307) # Boom! potion.effect( explosions[randint( 0, 2 )], 20, 10 ) ! potionregion( args[0], potion, args[2] ) potion.delete() ! return # Explosion Potion Function def potioncountdown( potion, args ): counter = args[1] if potion: if counter >= 0: if counter > 0: *************** *** 188,199 **** potion.say("%u" % (counter - 1)) counter -= 1 ! potion.addtimer( 0, "potions.potionexplosion", [ args[0], counter, bonus ] ) return # Explosion Potion Function ! def potionregion( args ): ! char = args[0] ! potion = args[1] ! bonus = args[2] if potion.gettag('potiontype') == 11: outradius = 1 --- 179,205 ---- potion.say("%u" % (counter - 1)) counter -= 1 ! potion.addtimer( 0, "potions.potionexplosion", [args[0], counter, args[2]] ) ! return ! ! def chainpotiontimer( char, potion, bomb, outradius ): ! # Doing error checks first, makes it faster ! if not checkLoS( potion, bomb, outradius ): ! return ! if not bomb.hastag('potiontype'): ! return ! if not int( bomb.gettag('potiontype') ) in [ 11, 12, 13 ]: ! return ! if bomb.hastag('exploding'): return + bomb.settag( 'exploding', char.serial ) + if bomb.hastag( 'kegfill' ) and int( bomb.gettag( 'kegfill' ) ) >= 1: + bomb.addtimer( randint( 1000, 2250 ), "potions.potioncountdown", [ char, 0, int( bomb.gettag( 'kegfill' ) ) ] ) + else: + bomb.addtimer( randint( 1000, 2250 ), "potions.potioncountdown", [ char, 0, bomb.amount ] ) + return + # Explosion Potion Function ! def potionregion( char, potion, bonus=0 ): if potion.gettag('potiontype') == 11: outradius = 1 *************** *** 226,243 **** else: outradius = 5 ! # Empty Lists ! potion_chainlist = [] # Potion is thrown on the ground if not potion.container: ! x1 = int(potion.pos.x - outradius) ! y1 = int(potion.pos.y - outradius) ! x2 = int(potion.pos.x + outradius) ! y2 = int(potion.pos.y + outradius) ! damageregion = wolfpack.charregion( x1, y1, x2, y2, potion.pos.map ) # Character Bombing target = damageregion.first while target: if checkLoS( target, potion, outradius ): ! potiondamage(char, target, potion, bonus) target = damageregion.next else: --- 232,251 ---- else: outradius = 5 ! ! outradius = max( 1, outradius ) # Potion is thrown on the ground if not potion.container: ! x1 = min( int(potion.pos.x - outradius), int(potion.pos.x + outradius) ) ! x2 = max( int(potion.pos.x - outradius), int(potion.pos.x + outradius) ) ! y1 = min( int(potion.pos.y - outradius), int(potion.pos.y + outradius) ) ! y2 = max( int(potion.pos.y - outradius), int(potion.pos.y + outradius) ) # Character Bombing + damageregion = wolfpack.charregion( x1, y1, x2, y2, potion.pos.map ) target = damageregion.first while target: + if not target.ischar: + target = damageregion.next if checkLoS( target, potion, outradius ): ! potiondamage( char, target, potion, bonus ) target = damageregion.next else: *************** *** 246,289 **** # Chain Reaction Bombing chainregion = wolfpack.itemregion( x1, y1, x2, y2, potion.pos.map ) - chainbomb = chainregion.first # Scan the region, build a list of explosives while chainbomb: ! # Doing error checks first, makes it faster ! if not checkLoS( potion, chainbomb, outradius ): ! chainbomb = chainregion.next ! if chainbomb.hastag('exploding'): ! chainbomb = chainregion.next ! # Type Checking ! if not potion.hastag('potiontype') or not chainbomb.gettag('potiontype') in [11,12,13]: ! chainbomb = chainregion.next ! # Append ! potion_chainlist.append( chainbomb ) chainbomb = chainregion.next - # Explosions - for bomb in potion_chainlist: - bomb.settag( 'exploding', char.serial ) - if chainbomb.hastag( 'kegfill' ) and int( chainbomb.gettag( 'kegfill' ) ) >= 1: - bomb.addtimer( randint(1000,2250), "potions.potioncountdown", [ char.serial, 0, int( bomb.gettag( 'kegfill' ) ) ] ) - else: - bomb.addtimer( randint( 1000, 2250 ), "potions.potioncountdown", [ char.serial, 0, bomb.amount ] ) - return # Potion is in a container else: ! x1 = int(char.pos.x - outradius) ! y1 = int(char.pos.y - outradius) ! x2 = int(char.pos.x + outradius) ! y2 = int(char.pos.y + outradius) ! damageregion = wolfpack.charregion( x1, y1, x2, y2, char.pos.map ) # Area Bombing target = damageregion.first while target: if checkLoS( char, target, outradius ): ! potiondamage(char, target, potion, bonus) target = damageregion.next else: target = damageregion.next # Chain Reaction Bombing chainregion = wolfpack.itemregion( x1, y1, x2, y2, char.pos.map ) --- 254,282 ---- # Chain Reaction Bombing chainregion = wolfpack.itemregion( x1, y1, x2, y2, potion.pos.map ) chainbomb = chainregion.first # Scan the region, build a list of explosives while chainbomb: ! chainpotiontimer( char, potion, chainbomb, outradius ) chainbomb = chainregion.next return # Potion is in a container else: ! x1 = min( int(char.pos.x - outradius), int(char.pos.x + outradius) ) ! x2 = max( int(char.pos.x - outradius), int(char.pos.x + outradius) ) ! y1 = min( int(char.pos.y - outradius), int(char.pos.y + outradius) ) ! y2 = max( int(char.pos.y - outradius), int(char.pos.y + outradius) ) # Area Bombing + damageregion = wolfpack.charregion( x1, y1, x2, y2, potion.pos.map ) target = damageregion.first while target: + if not target.ischar: + target = damageregion.next if checkLoS( char, target, outradius ): ! potiondamage( char, target, potion, bonus ) target = damageregion.next else: target = damageregion.next + potion_chainlist = [] # Chain Reaction Bombing chainregion = wolfpack.itemregion( x1, y1, x2, y2, char.pos.map ) *************** *** 291,312 **** # Scan the region, build a list of explosives while chainbomb: ! # Doing error checks first, makes it faster ! if not checkLoS( potion, chainbomb, outradius ): ! chainbomb = chainregion.next ! if chainbomb.hastag('exploding'): ! chainbomb = chainregion.next ! # Type Checking ! if not potion.hastag('potiontype') or not chainbomb.gettag('potiontype') in [11,12,13]: ! chainbomb = chainregion.next ! # Append ! potion_chainlist.append( chainbomb ) chainbomb = chainregion.next - # Explosions - for bomb in potion_chainlist: - bomb.settag( 'exploding', char.serial ) - if chainbomb.hastag( 'kegfill' ) and int( chainbomb.gettag( 'kegfill' ) ) >= 1: - bomb.addtimer( randint(1000,2250), "potions.potioncountdown", [ char.serial, 0, int( bomb.gettag( 'kegfill' ) ) ] ) - else: - bomb.addtimer( randint( 1000, 2250 ), "potions.potioncountdown", [ char.serial, 0, bomb.amount ] ) return --- 284,289 ---- # Scan the region, build a list of explosives while chainbomb: ! chainpotiontimer( char, potion, chainbomb, outradius ) chainbomb = chainregion.next return |
|
From: Richard M. <dr...@us...> - 2004-09-23 20:39:41
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7479/skills Modified Files: mining.py Log Message: Tweak Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** mining.py 8 Sep 2004 14:44:01 -0000 1.36 --- mining.py 23 Sep 2004 20:39:26 -0000 1.37 *************** *** 41,45 **** 'agapite': [900, 450, 1007078, 0x979, 4, '#1042850', '#1042689'], 'verite': [950, 475, 1007079, 0x89f, 3, '#1042851', '#1042690'], ! 'valorite': [990, 495, 1007080, 0x8ab, 2, '#1042852', '#1042691'], } --- 41,45 ---- 'agapite': [900, 450, 1007078, 0x979, 4, '#1042850', '#1042689'], 'verite': [950, 475, 1007079, 0x89f, 3, '#1042851', '#1042690'], ! 'valorite': [990, 495, 1007080, 0x8ab, 2, '#1042852', '#1042691'] } |
|
From: Sebastian H. <dar...@us...> - 2004-09-23 19:17:20
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23495/skills Modified Files: lumberjacking.py Log Message: lumberjacking fix. Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** lumberjacking.py 23 Sep 2004 19:15:24 -0000 1.19 --- lumberjacking.py 23 Sep 2004 19:17:06 -0000 1.20 *************** *** 214,218 **** # You broke your axe! socket.clilocmessage( 500499, '', GRAY ) - char.socket.deltag( 'wood_gem' ) char.socket.deltag( 'is_lumberjacking' ) success = 1 --- 214,217 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-23 19:16:51
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23396/webroot Modified Files: ChangeLog.wolfpack Log Message: lumberjacking fix. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** ChangeLog.wolfpack 23 Sep 2004 01:18:37 -0000 1.112 --- ChangeLog.wolfpack 23 Sep 2004 19:16:41 -0000 1.113 *************** *** 55,58 **** --- 55,59 ---- - Nuke also works from bottom right to top left now. - Removed spell cast animation while mounted. + - Fixed a lumberjacking bug. * Misc. Changes: - Fixed configure.py for FreeBSD 5 |
|
From: Sebastian H. <dar...@us...> - 2004-09-23 19:15:33
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22803/skills Modified Files: lumberjacking.py Log Message: lumberjacking fix. Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** lumberjacking.py 23 Sep 2004 18:47:14 -0000 1.18 --- lumberjacking.py 23 Sep 2004 19:15:24 -0000 1.19 *************** *** 55,73 **** ########## ! if socket.hastag( 'wood_gem' ): ! veingem = wolfpack.finditem( socket.gettag( 'wood_gem' ) ) ! if not veingem: ! veingem = getvein( socket, pos, target ) ! if not veingem: ! socket.deltag( 'wood_gem' ) ! veingem = createwoodgem( target, pos ) ! socket.settag( 'wood_gem', int(veingem.serial) ) ! else: ! veingem = getvein( socket, pos, target ) ! # OK, we still don't have a veingem to get our wood, lets create it here. ! if not veingem: ! veingem = createwoodgem( target, pos ) ! else: ! socket.settag( 'wood_gem', veingem.serial ) if not veingem: --- 55,62 ---- ########## ! veingem = getvein( socket, pos, target ) ! # OK, we still don't have a veingem to get our wood, lets create it here. ! if not veingem: ! veingem = createwoodgem( target, pos ) if not veingem: *************** *** 137,141 **** amount = resource.gettag( 'resourcecount' ) ! resourcecount = resource.gettag( 'resourcecount' ) # No resource left to harvest? --- 126,130 ---- amount = resource.gettag( 'resourcecount' ) ! resourcecount = int(resource.gettag( 'resourcecount' )) # No resource left to harvest? |
|
From: Sebastian H. <dar...@us...> - 2004-09-23 18:50:28
|
Update of /cvsroot/wpdev/xmlscripts/scripts/speech In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16458/speech Modified Files: __init__.py Log Message: blabla Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/__init__.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** __init__.py 19 Dec 2002 17:36:23 -0000 1.1 --- __init__.py 23 Sep 2004 18:50:18 -0000 1.2 *************** *** 0 **** --- 1 ---- + |
|
From: Sebastian H. <dar...@us...> - 2004-09-23 18:47:26
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15898/skills Modified Files: lumberjacking.py Log Message: lumberjacking fix. Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** lumberjacking.py 2 Sep 2004 00:44:28 -0000 1.17 --- lumberjacking.py 23 Sep 2004 18:47:14 -0000 1.18 *************** *** 99,108 **** def getvein( socket, pos, target ): #Check if we have wood_gems near ( range = 4) ! gems = wolfpack.items( pos.x, pos.y, pos.map, 4 ) for gem in gems: ! if wolfpack.finditem( gem.serial ): ! if gem.hastag('resource') and gem.gettag('resource') == 'wood' and gem.hastag('resname') and gem.id == hex2dec( 0x1ea7 ): ! return gem ! break if not gems: gem = createwoodgem(target, pos) --- 99,107 ---- def getvein( socket, pos, target ): #Check if we have wood_gems near ( range = 4) ! gems = wolfpack.items( pos.x, pos.y, pos.map, 0 ) for gem in gems: ! if gem.hastag('resource') and gem.gettag('resource') == 'wood' and gem.hastag('resname') and gem.id == 0x1ea7: ! return gem ! break if not gems: gem = createwoodgem(target, pos) |
|
From: Richard M. <dr...@us...> - 2004-09-23 01:18:47
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23097/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: Meh Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** ChangeLog.wolfpack 22 Sep 2004 07:37:54 -0000 1.111 --- ChangeLog.wolfpack 23 Sep 2004 01:18:37 -0000 1.112 *************** *** 54,59 **** - Made .move work correctly on players again. - Nuke also works from bottom right to top left now. ! - Fix for guildstone if guild has more than 4 members. ! - You no longer keep your beard when polymorphing into a human female. * Misc. Changes: - Fixed configure.py for FreeBSD 5 --- 54,58 ---- - Made .move work correctly on players again. - Nuke also works from bottom right to top left now. ! - Removed spell cast animation while mounted. * Misc. Changes: - Fixed configure.py for FreeBSD 5 |
|
From: Richard M. <dr...@us...> - 2004-09-23 01:12:11
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22027/magic Modified Files: spell.py Log Message: Removed casting animation when on a mount. Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** spell.py 14 Sep 2004 00:10:52 -0000 1.25 --- spell.py 23 Sep 2004 01:11:49 -0000 1.26 *************** *** 43,51 **** def callback(char, args): char.removescript('magic') ! # target if args[3] and type(args[3]) is int: target = wolfpack.findobject(args[3]) ! # Object went out of scope if not target: --- 43,51 ---- def callback(char, args): char.removescript('magic') ! # target if args[3] and type(args[3]) is int: target = wolfpack.findobject(args[3]) ! # Object went out of scope if not target: *************** *** 54,62 **** else: target = None ! # item if args[4] and (type(args[4]) is int): item = wolfpack.findobject(args[4]) ! # Object went out of scope if not item: --- 54,62 ---- else: target = None ! # item if args[4] and (type(args[4]) is int): item = wolfpack.findobject(args[4]) ! # Object went out of scope if not item: *************** *** 98,102 **** self.casttime = 500 + (250 * self.circle) self.castaction = ANIM_CASTDIRECTED ! # Change this to 0 for AoS behaviour self.castrecovery = 1 * circle --- 98,102 ---- self.casttime = 500 + (250 * self.circle) self.castaction = ANIM_CASTDIRECTED ! # Change this to 0 for AoS behaviour self.castrecovery = 1 * circle *************** *** 105,115 **** # Prepare the casting of this spell. # ! def precast(self, char, mode=0, args=[], target = None, item = None): socket = char.socket ! # Casting from a scroll and no scroll was passed if mode == MODE_SCROLL and not item: return ! # Casting from a wand and no wand was passed if mode == MODE_WAND and not item: --- 105,115 ---- # Prepare the casting of this spell. # ! def precast(self, char, mode=0, args=[], target = None, item = None): socket = char.socket ! # Casting from a scroll and no scroll was passed if mode == MODE_SCROLL and not item: return ! # Casting from a wand and no wand was passed if mode == MODE_WAND and not item: *************** *** 143,157 **** # Precasting char.addscript('magic') ! # Show the cast action ! if char.bodytype == BODY_HUMAN: char.action(self.castaction) ! if item: item = item.serial ! if target and (type(target).__name__ == 'wpchar' or type(target).__name__ == 'wpitem'): target = target.serial ! if mode == MODE_BOOK: source = 'book' --- 143,157 ---- # Precasting char.addscript('magic') ! # Show the cast action ! if char.bodytype == BODY_HUMAN and not char.itemonlayer( LAYER_MOUNT ): char.action(self.castaction) ! if item: item = item.serial ! if target and (type(target).__name__ == 'wpchar' or type(target).__name__ == 'wpitem'): target = target.serial ! if mode == MODE_BOOK: source = 'book' *************** *** 167,171 **** else: char.log(LOG_MESSAGE, "Casting spell %s from %s.\n" % (self.__class__.__name__, source)) ! char.addtimer(self.calcdelay(char, mode), 'magic.spell.callback', [self, mode, args, target, item], 0, 0, "cast_delay") return 1 --- 167,171 ---- else: char.log(LOG_MESSAGE, "Casting spell %s from %s.\n" % (self.__class__.__name__, source)) ! char.addtimer(self.calcdelay(char, mode), 'magic.spell.callback', [self, mode, args, target, item], 0, 0, "cast_delay") return 1 *************** *** 178,185 **** if mode == MODE_WAND or mode == MODE_CMD: return 0 ! # Get the AOS bonus from all items the character wears castspeed = 3 - properties.fromchar(char, CASTSPEEDBONUS) ! # Under the influence of the protection spell # spells are cast more slowly --- 178,185 ---- if mode == MODE_WAND or mode == MODE_CMD: return 0 ! # Get the AOS bonus from all items the character wears castspeed = 3 - properties.fromchar(char, CASTSPEEDBONUS) ! # Under the influence of the protection spell # spells are cast more slowly *************** *** 195,213 **** #char.message(str(castspeed / 4.0)) return castspeed * 250 ! def checkweapon(self, char): weapon = char.itemonlayer(LAYER_RIGHTHAND) ! if not weapon or not properties.itemcheck(weapon, ITEM_WEAPON): weapon = char.itemonlayer(LAYER_LEFTHAND) ! if not weapon: return True ! # Check if the spellchanneling property is true for this item if not properties.fromitem(weapon, SPELLCHANNELING): if not utilities.tobackpack(weapon, char): weapon.update() ! return True else: --- 195,213 ---- #char.message(str(castspeed / 4.0)) return castspeed * 250 ! def checkweapon(self, char): weapon = char.itemonlayer(LAYER_RIGHTHAND) ! if not weapon or not properties.itemcheck(weapon, ITEM_WEAPON): weapon = char.itemonlayer(LAYER_LEFTHAND) ! if not weapon: return True ! # Check if the spellchanneling property is true for this item if not properties.fromitem(weapon, SPELLCHANNELING): if not utilities.tobackpack(weapon, char): weapon.update() ! return True else: *************** *** 217,221 **** # Set the delay for the next spell # ! def setspelldelay(self, char, mode): if char.npc: pass --- 217,221 ---- # Set the delay for the next spell # ! def setspelldelay(self, char, mode): if char.npc: pass *************** *** 223,228 **** castrecovery = - properties.fromchar(char, CASTRECOVERYBONUS) castrecovery += 6 ! castrecovery += self.castrecovery ! if castrecovery < 0: castrecovery = 0 --- 223,228 ---- castrecovery = - properties.fromchar(char, CASTRECOVERYBONUS) castrecovery += 6 ! castrecovery += self.castrecovery ! if castrecovery < 0: castrecovery = 0 *************** *** 236,240 **** if char.dead: return False ! if char.gm: return True --- 236,240 ---- if char.dead: return False ! if char.gm: return True *************** *** 244,248 **** char.message(502626) return 0 ! # Check for Mana if char.mana < self.mana: --- 244,248 ---- char.message(502626) return 0 ! # Check for Mana if char.mana < self.mana: *************** *** 268,272 **** char.message(501625) return 0 ! # Check for Mana if char.mana < (self.mana + 1) / 2: --- 268,272 ---- char.message(501625) return 0 ! # Check for Mana if char.mana < (self.mana + 1) / 2: *************** *** 284,292 **** if char.gm: return True ! # Check Basic Requirements before proceeding (Includes Death of Caster etc.) if not self.checkrequirements(char, mode, args, target, item): fizzle(char) ! return 0 # Consume Mana --- 284,292 ---- if char.gm: return True ! # Check Basic Requirements before proceeding (Includes Death of Caster etc.) if not self.checkrequirements(char, mode, args, target, item): fizzle(char) ! return 0 # Consume Mana *************** *** 299,303 **** if len(self.reagents) > 0: consumeReagents(char.getbackpack(), self.reagents.copy()) ! # Reduced Skill, Reduced Mana, No Reagents elif mode == MODE_SCROLL: --- 299,303 ---- if len(self.reagents) > 0: consumeReagents(char.getbackpack(), self.reagents.copy()) ! # Reduced Skill, Reduced Mana, No Reagents elif mode == MODE_SCROLL: *************** *** 305,309 **** char.mana = max(0, char.mana - (self.mana + 1) / 2) char.updatemana() ! # Remove one of the scrolls if item.amount == 1: --- 305,309 ---- char.mana = max(0, char.mana - (self.mana + 1) / 2) char.updatemana() ! # Remove one of the scrolls if item.amount == 1: *************** *** 314,318 **** # No requirements at all ! elif mode == MODE_WAND: pass --- 314,318 ---- # No requirements at all ! elif mode == MODE_WAND: pass *************** *** 330,334 **** fizzle(char) return 0 ! # Set the next spell delay self.setspelldelay(char, mode) --- 330,334 ---- fizzle(char) return 0 ! # Set the next spell delay self.setspelldelay(char, mode) |
|
From: Richard M. <dr...@us...> - 2004-09-23 00:53:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18761/commands Modified Files: add.py Log Message: Fix for the add menu. Index: add.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/add.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** add.py 21 Sep 2004 08:00:21 -0000 1.11 --- add.py 23 Sep 2004 00:52:46 -0000 1.12 *************** *** 25,31 **** player.socket.sysmessage("You can't add the multi there.") return ! multi = wolfpack.addmulti(str(arguments[0])) ! # If arguments[1] is true, make the item # static --- 25,31 ---- player.socket.sysmessage("You can't add the multi there.") return ! multi = wolfpack.addmulti(str(arguments[0])) ! # If arguments[1] is true, make the item # static *************** *** 33,37 **** multi.decay = False multi.movable = 3 ! multi.moveto(target.pos) multi.update() --- 33,37 ---- multi.decay = False multi.movable = 3 ! multi.moveto(target.pos) multi.update() *************** *** 40,46 **** # Target response for adding an item # ! def additem(player, arguments, target): item = wolfpack.additem(str(arguments[0])) ! # If arguments[1] is true, make the item # static --- 40,46 ---- # Target response for adding an item # ! def additem(player, arguments, target): item = wolfpack.additem(str(arguments[0])) ! # If arguments[1] is true, make the item # static *************** *** 48,52 **** item.decay = False item.movable = 3 ! if target.item: if target.item.type == 1: --- 48,52 ---- item.decay = False item.movable = 3 ! if target.item: if target.item.type == 1: *************** *** 137,141 **** def make(self, player, arguments, nodelay=0): player.socket.sysmessage("Where do you want to place the item '%s'?" % self.definition) ! player.socket.attachtarget("commands.add.additem", [self.definition]) MakeAction.make(self, player, arguments, nodelay) --- 137,141 ---- def make(self, player, arguments, nodelay=0): player.socket.sysmessage("Where do you want to place the item '%s'?" % self.definition) ! player.socket.attachtarget("commands.add.additem", [self.definition, False]) MakeAction.make(self, player, arguments, nodelay) *************** *** 250,257 **** wolfpack.registercommand('add', add) wolfpack.registercommand('static', static) ! def onUnload(): ! global generated ! generated = 0 """ --- 250,257 ---- wolfpack.registercommand('add', add) wolfpack.registercommand('static', static) ! def onUnload(): ! global generated ! generated = 0 """ |
|
From: Richard M. <dr...@us...> - 2004-09-23 00:28:20
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13778/commands Modified Files: tele.py wipe.py Log Message: Fixes, though I found a bug with item iteration... Index: tele.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/tele.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tele.py 7 Sep 2004 23:43:02 -0000 1.2 --- tele.py 23 Sep 2004 00:27:55 -0000 1.3 *************** *** 6,10 **** import wolfpack from wolfpack import utilities - from wolfpack.consts import * def onLoad(): --- 6,9 ---- *************** *** 31,34 **** char.socket.resendworld() utilities.smokepuff(char, source) ! utilities.smokepuff(char, target) return True --- 30,33 ---- char.socket.resendworld() utilities.smokepuff(char, source) ! utilities.smokepuff(char, target) return True Index: wipe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/wipe.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wipe.py 21 Sep 2004 12:36:11 -0000 1.6 --- wipe.py 23 Sep 2004 00:27:55 -0000 1.7 *************** *** 33,40 **** import wolfpack.gumps from wolfpack.gumps import WarningGump ! from wolfpack.utilities import * def getBoundingBox( socket, callback ) : socket.attachtarget( "commands.wipe.getBoundingBoxResponse", [0, callback] ) def getBoundingBoxResponse( char, args, target ): --- 33,41 ---- import wolfpack.gumps from wolfpack.gumps import WarningGump ! #from wolfpack.utilities import * def getBoundingBox( socket, callback ) : socket.attachtarget( "commands.wipe.getBoundingBoxResponse", [0, callback] ) + return def getBoundingBoxResponse( char, args, target ): *************** *** 43,47 **** else: args[1]( char.socket, args[2], target ) ! def nuke( socket, command, argstring ): --- 44,48 ---- else: args[1]( char.socket, args[2], target ) ! return def nuke( socket, command, argstring ): *************** *** 64,68 **** iterator = wolfpack.itemiterator() item = iterator.first ! count = 0; while item: if item.container == None: --- 65,69 ---- iterator = wolfpack.itemiterator() item = iterator.first ! count = 0 while item: if item.container == None: *************** *** 71,90 **** item = iterator.next player.socket.sysmessage( "%i items have been removed from world" % count ) def wipeBoundingBox( socket, target1, target2 ): ! x1 = min(target1.pos.x, target2.pos.x) ! x2 = max(target1.pos.x, target2.pos.x) ! y1 = min(target1.pos.y, target2.pos.y) ! y2 = max(target1.pos.y, target2.pos.y) ! ! count = 0 ! iterator = wolfpack.itemregion( x1, y1, x2, x2, target2.pos.map ) item = iterator.first while item: item.delete() item = iterator.next - count += 1; - socket.sysmessage( "%i items removed" % count ) return 1 --- 72,94 ---- item = iterator.next player.socket.sysmessage( "%i items have been removed from world" % count ) + return def wipeBoundingBox( socket, target1, target2 ): ! if target1.pos.map != target2.pos.map: ! return False ! x1 = min( target1.pos.x, target2.pos.x ) ! x2 = max( target1.pos.x, target2.pos.x ) ! y1 = min( target1.pos.y, target2.pos.y ) ! y2 = max( target1.pos.y, target2.pos.y ) ! ! iterator = wolfpack.itemregion( x1, y1, x2, y2, target2.pos.map ) item = iterator.first + count = 0 while item: item.delete() + count += 1 item = iterator.next socket.sysmessage( "%i items removed" % count ) + return 1 *************** *** 92,93 **** --- 96,98 ---- wolfpack.registercommand( "wipe", nuke ) wolfpack.registercommand( "nuke", nuke ) + return |
|
From: Sebastian H. <dar...@us...> - 2004-09-22 17:14:20
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17670 Modified Files: player.cpp Log Message: Guildsignf ixes Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** player.cpp 19 Sep 2004 23:41:17 -0000 1.132 --- player.cpp 22 Sep 2004 17:14:11 -0000 1.133 *************** *** 596,600 **** if ( !isIncognito() && guild_ && !guild_->abbreviation().isEmpty() ) { ! affix.append( QString( " [%1]" ).arg( guild_->abbreviation() ) ); } --- 596,605 ---- if ( !isIncognito() && guild_ && !guild_->abbreviation().isEmpty() ) { ! cGuild::MemberInfo* info = guild_->getMemberInfo( this ); ! ! if ( info && info->showSign() ) ! { ! affix.append( QString( "[%1]" ).arg( guild_->abbreviation() ) ); ! } } *************** *** 1650,1654 **** cGuild::MemberInfo* info = guild_->getMemberInfo( this ); ! if ( info ) { if ( !info->guildTitle().isEmpty() ) --- 1655,1659 ---- cGuild::MemberInfo* info = guild_->getMemberInfo( this ); ! if ( info && info->showSign() ) { if ( !info->guildTitle().isEmpty() ) |
|
From: Sebastian H. <dar...@us...> - 2004-09-22 07:38:03
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20454/webroot Modified Files: ChangeLog.wolfpack Log Message: polymorph fix. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** ChangeLog.wolfpack 22 Sep 2004 07:23:19 -0000 1.110 --- ChangeLog.wolfpack 22 Sep 2004 07:37:54 -0000 1.111 *************** *** 55,58 **** --- 55,59 ---- - Nuke also works from bottom right to top left now. - Fix for guildstone if guild has more than 4 members. + - You no longer keep your beard when polymorphing into a human female. * Misc. Changes: - Fixed configure.py for FreeBSD 5 |
|
From: Sebastian H. <dar...@us...> - 2004-09-22 07:37:56
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20413/magic Modified Files: circle7.py Log Message: Fix for polymorph. Index: circle7.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** circle7.py 7 Sep 2004 23:43:03 -0000 1.15 --- circle7.py 22 Sep 2004 07:37:46 -0000 1.16 *************** *** 329,332 **** --- 329,350 ---- def polymorph_expire(char, arguments): + # Hidden beard? + if char.hastag('polymorph_beard_id'): + current = char.itemonlayer(LAYER_BEARD) + if current: + current.delete() + + newid = char.gettag('polymorph_beard_id') + color = 0 + if char.hastag('polymorph_beard_color'): + color = int(char.gettag('polymorph_beard_color')) + item = wolfpack.additem(newid) + item.color = color + char.additem(LAYER_BEARD, item) + item.update() + + char.deltag('polymorph_beard_id') + char.deltag('polymorph_beard_color') + char.id = char.orgid char.skin = char.orgskin *************** *** 375,378 **** --- 393,405 ---- else: char.skin = 0 + + # Remove the beard if morphing into a female + if char.id == 0x191: + beard = char.itemonlayer(LAYER_BEARD) + if beard: + char.settag('polymorph_beard_id', beard.baseid) + char.settag('polymorph_beard_color', beard.color) + beard.delete() + char.polymorph = 1 char.update() |
|
From: Sebastian H. <dar...@us...> - 2004-09-22 07:23:28
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16916/webroot Modified Files: ChangeLog.wolfpack Log Message: Fix for guildstone if guild has more than 4 members. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** ChangeLog.wolfpack 21 Sep 2004 13:18:49 -0000 1.109 --- ChangeLog.wolfpack 22 Sep 2004 07:23:19 -0000 1.110 *************** *** 54,57 **** --- 54,58 ---- - Made .move work correctly on players again. - Nuke also works from bottom right to top left now. + - Fix for guildstone if guild has more than 4 members. * Misc. Changes: - Fixed configure.py for FreeBSD 5 |
|
From: Sebastian H. <dar...@us...> - 2004-09-22 07:23:12
|
Update of /cvsroot/wpdev/xmlscripts/scripts/guilds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16824/guilds Modified Files: stone.py Log Message: Fix for guildstone if guild has more than 4 members. Index: stone.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/guilds/stone.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** stone.py 25 Aug 2004 17:03:05 -0000 1.6 --- stone.py 22 Sep 2004 07:23:03 -0000 1.7 *************** *** 449,453 **** dialog.addText(259, 223 + offset, "No Title", 2100) ! if offset == 280: offset = 0 else: --- 449,453 ---- dialog.addText(259, 223 + offset, "No Title", 2100) ! if offset == 210: offset = 0 else: |
|
From: Sebastian H. <dar...@us...> - 2004-09-22 06:11:12
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2778/npcs/humans/vendors Modified Files: alchemist.xml tailor.xml Log Message: Fixed the alchemist vendor and added sellables for tailors. Index: alchemist.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/alchemist.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** alchemist.xml 26 Feb 2004 02:33:46 -0000 1.4 --- alchemist.xml 22 Sep 2004 06:11:01 -0000 1.5 *************** *** 8,11 **** --- 8,65 ---- --> <definitions> + <npc id="alchemist_inventory"> + <shopkeeper> + <restockable> + <!-- Reagents --> + <item id="f7a"><amount>999</amount></item> + <item id="f7b"><amount>999</amount></item> + <item id="f84"><amount>999</amount></item> + <item id="f85"><amount>999</amount></item> + <item id="f86"><amount>999</amount></item> + <item id="f88"><amount>999</amount></item> + <item id="f8c"><amount>999</amount></item> + <item id="f8d"><amount>999</amount></item> + + <item id="f0e"><amount>100</amount></item> <!-- Bottle --> + <item id="eff"><amount>10</amount></item> <!-- Hair Dye --> + <item id="e9b"><amount>10</amount></item> <!-- Mortar and Pestle --> + + <!-- Potions --> + <item id="potion_nightsight"><amount>10</amount></item> + <item id="potion_agility"><amount>10</amount></item> + <item id="potion_strength"><amount>10</amount></item> + <item id="potion_refresh"><amount>10</amount></item> + <item id="potion_lessercure"><amount>10</amount></item> + <item id="potion_lesserheal"><amount>10</amount></item> + <item id="potion_lesserpoison"><amount>10</amount></item> + <item id="potion_lesserexplosion"><amount>10</amount></item> + </restockable> + <sellable> + <!-- Reagents --> + <item id="f7a" /> + <item id="f7b" /> + <item id="f84" /> + <item id="f85" /> + <item id="f86" /> + <item id="f88" /> + <item id="f8c" /> + <item id="f8d" /> + + <item id="f0e" /> <!-- Bottles --> + <item id="eff" /> <!-- Hair Dyes --> + <item id="e9b" /> <!-- Mortar and Peste --> + + <!-- Sellable Potions --> + <item id="potion_nightsight" /> + <item id="potion_agility" /> + <item id="potion_strength" /> + <item id="potion_refresh" /> + <item id="potion_lessercure" /> + <item id="potion_lesserheal" /> + <item id="potion_lesserpoison" /> + <item id="potion_lesserexplosion" /> + </sellable> + </shopkeeper> + </npc> <!-- A alchemist vendor --> *************** *** 19,260 **** </item> </equipped> ! <shopkeeper> ! <restockable> ! <item id="e24"> ! <amount>10</amount> ! </item> ! <item id="e25"> ! <amount>10</amount> ! </item> ! <item id="efd"> ! <amount>10</amount> ! </item> ! <item id="e26"> ! <amount>10</amount> ! </item> ! <item id="efe"> ! <amount>10</amount> ! </item> ! <item id="e27"> ! <amount>10</amount> ! </item> ! <item id="eff"> ! <amount>10</amount> ! </item> ! <item id="e28"> ! <amount>10</amount> ! </item> ! <item id="f00"> ! <amount>10</amount> ! </item> ! <item id="e29"> ! <amount>10</amount> ! </item> ! <item id="f01"> ! <amount>10</amount> ! </item> ! <item id="e2a"> ! <amount>10</amount> ! </item> ! <item id="f02"> ! <amount>10</amount> ! </item> ! <item id="e2b"> ! <amount>10</amount> ! </item> ! <item id="f03"> ! <amount>10</amount> ! </item> ! <item id="e2c"> ! <amount>10</amount> ! </item> ! <item id="f04"> ! <amount>10</amount> ! </item> ! <item id="efb"> ! <amount>10</amount> ! </item> ! <item id="efc"> ! <amount>10</amount> ! </item> ! <item id="1847"> ! <amount>10</amount> ! </item> ! <item id="1848"> ! <amount>10</amount> ! </item> ! <item id="1c18"> ! <amount>10</amount> ! </item> ! <item id="e9b"> ! <amount>10</amount> ! </item> ! <item id="f0e"> ! <amount>10</amount> ! </item> ! <item id="f06"> ! <amount>10</amount> ! </item> ! <item id="f07"> ! <amount>10</amount> ! </item> ! <item id="f08"> ! <amount>10</amount> ! </item> ! <item id="f09"> ! <amount>10</amount> ! </item> ! <item id="f0a"> ! <amount>10</amount> ! </item> ! <item id="f0b"> ! <amount>10</amount> ! </item> ! <item id="f0c"> ! <amount>10</amount> ! </item> ! <item id="f0d"> ! <amount>10</amount> ! </item> ! <item id="f78"> ! <amount>10</amount> ! </item> ! <item id="f79"> ! <amount>10</amount> ! </item> ! <item id="f7a"> ! <amount>10</amount> ! </item> ! <item id="f7b"> ! <amount>10</amount> ! </item> ! <item id="f7c"> ! <amount>10</amount> ! </item> ! <item id="f7d"> ! <amount>10</amount> ! </item> ! <item id="f7e"> ! <amount>10</amount> ! </item> ! <item id="f7f"> ! <amount>10</amount> ! </item> ! <item id="f80"> ! <amount>10</amount> ! </item> ! <item id="f81"> ! <amount>10</amount> ! </item> ! <item id="f82"> ! <amount>10</amount> ! </item> ! <item id="f83"> ! <amount>10</amount> ! </item> ! <item id="f84"> ! <amount>10</amount> ! </item> ! <item id="f85"> ! <amount>10</amount> ! </item> ! <item id="f86"> ! <amount>10</amount> ! </item> ! <item id="f87"> ! <amount>10</amount> ! </item> ! <item id="f88"> ! <amount>10</amount> ! </item> ! <item id="f89"> ! <amount>10</amount> ! </item> ! <item id="f8a"> ! <amount>10</amount> ! </item> ! <item id="f8b"> ! <amount>10</amount> ! </item> ! <item id="f8c"> ! <amount>10</amount> ! </item> ! <item id="f8d"> ! <amount>10</amount> ! </item> ! <item id="f8e"> ! <amount>10</amount> ! </item> ! <item id="f8f"> ! <amount>10</amount> ! </item> ! <item id="f90"> ! <amount>10</amount> ! </item> ! <item id="f91"> ! <amount>10</amount> ! </item> ! </restockable> ! <sellable> ! <item id="e24"/> ! <item id="e25"/> ! <item id="efd"/> ! <item id="e26"/> ! <item id="efe"/> ! <item id="e27"/> ! <item id="eff"/> ! <item id="e28"/> ! <item id="f00"/> ! <item id="e29"/> ! <item id="f01"/> ! <item id="e2a"/> ! <item id="f02"/> ! <item id="e2b"/> ! <item id="f03"/> ! <item id="e2c"/> ! <item id="f04"/> ! <item id="efb"/> ! <item id="efc"/> ! <item id="1847"/> ! <item id="1848"/> ! <item id="1c18"/> ! <item id="e9b"/> ! <item id="f0e"/> ! <item id="f06"/> ! <item id="f07"/> ! <item id="f08"/> ! <item id="f09"/> ! <item id="f0a"/> ! <item id="f0b"/> ! <item id="f0c"/> ! <item id="f0d"/> ! <item id="f78"/> ! <item id="f79"/> ! <item id="f7a"/> ! <item id="f7b"/> ! <item id="f7c"/> ! <item id="f7d"/> ! <item id="f7e"/> ! <item id="f7f"/> ! <item id="f80"/> ! <item id="f81"/> ! <item id="f82"/> ! <item id="f83"/> ! <item id="f84"/> ! <item id="f85"/> ! <item id="f86"/> ! <item id="f87"/> ! <item id="f88"/> ! <item id="f89"/> ! <item id="f8a"/> ! <item id="f8b"/> ! <item id="f8c"/> ! <item id="f8d"/> ! <item id="f8e"/> ! <item id="f8f"/> ! <item id="f90"/> ! <item id="f91"/> ! </sellable> ! </shopkeeper> <alchemy><random min="850" max="1000" /></alchemy> <tasteidentification><random min="650" max="880" /></tasteidentification> --- 73,77 ---- </item> </equipped> ! <inherit id="alchemist_inventory" /> <alchemy><random min="850" max="1000" /></alchemy> <tasteidentification><random min="650" max="880" /></tasteidentification> *************** *** 271,512 **** </item> </equipped> ! <shopkeeper> ! <restockable> ! <item id="e24"> ! <amount>10</amount> ! </item> ! <item id="e25"> ! <amount>10</amount> ! </item> ! <item id="efd"> ! <amount>10</amount> ! </item> ! <item id="e26"> ! <amount>10</amount> ! </item> ! <item id="efe"> ! <amount>10</amount> ! </item> ! <item id="e27"> ! <amount>10</amount> ! </item> ! <item id="eff"> ! <amount>10</amount> ! </item> ! <item id="e28"> ! <amount>10</amount> ! </item> ! <item id="f00"> ! <amount>10</amount> ! </item> ! <item id="e29"> ! <amount>10</amount> ! </item> ! <item id="f01"> ! <amount>10</amount> ! </item> ! <item id="e2a"> ! <amount>10</amount> ! </item> ! <item id="f02"> ! <amount>10</amount> ! </item> ! <item id="e2b"> ! <amount>10</amount> ! </item> ! <item id="f03"> ! <amount>10</amount> ! </item> ! <item id="e2c"> ! <amount>10</amount> ! </item> ! <item id="f04"> ! <amount>10</amount> ! </item> ! <item id="efb"> ! <amount>10</amount> ! </item> ! <item id="efc"> ! <amount>10</amount> ! </item> ! <item id="1847"> ! <amount>10</amount> ! </item> ! <item id="1848"> ! <amount>10</amount> ! </item> ! <item id="1c18"> ! <amount>10</amount> ! </item> ! <item id="e9b"> ! <amount>10</amount> ! </item> ! <item id="f0e"> ! <amount>10</amount> ! </item> ! <item id="f06"> ! <amount>10</amount> ! </item> ! <item id="f07"> ! <amount>10</amount> ! </item> ! <item id="f08"> ! <amount>10</amount> ! </item> ! <item id="f09"> ! <amount>10</amount> ! </item> ! <item id="f0a"> ! <amount>10</amount> ! </item> ! <item id="f0b"> ! <amount>10</amount> ! </item> ! <item id="f0c"> ! <amount>10</amount> ! </item> ! <item id="f0d"> ! <amount>10</amount> ! </item> ! <item id="f78"> ! <amount>10</amount> ! </item> ! <item id="f79"> ! <amount>10</amount> ! </item> ! <item id="f7a"> ! <amount>10</amount> ! </item> ! <item id="f7b"> ! <amount>10</amount> ! </item> ! <item id="f7c"> ! <amount>10</amount> ! </item> ! <item id="f7d"> ! <amount>10</amount> ! </item> ! <item id="f7e"> ! <amount>10</amount> ! </item> ! <item id="f7f"> ! <amount>10</amount> ! </item> ! <item id="f80"> ! <amount>10</amount> ! </item> ! <item id="f81"> ! <amount>10</amount> ! </item> ! <item id="f82"> ! <amount>10</amount> ! </item> ! <item id="f83"> ! <amount>10</amount> ! </item> ! <item id="f84"> ! <amount>10</amount> ! </item> ! <item id="f85"> ! <amount>10</amount> ! </item> ! <item id="f86"> ! <amount>10</amount> ! </item> ! <item id="f87"> ! <amount>10</amount> ! </item> ! <item id="f88"> ! <amount>10</amount> ! </item> ! <item id="f89"> ! <amount>10</amount> ! </item> ! <item id="f8a"> ! <amount>10</amount> ! </item> ! <item id="f8b"> ! <amount>10</amount> ! </item> ! <item id="f8c"> ! <amount>10</amount> ! </item> ! <item id="f8d"> ! <amount>10</amount> ! </item> ! <item id="f8e"> ! <amount>10</amount> ! </item> ! <item id="f8f"> ! <amount>10</amount> ! </item> ! <item id="f90"> ! <amount>10</amount> ! </item> ! <item id="f91"> ! <amount>10</amount> ! </item> ! </restockable> ! <sellable> ! <item id="e24"/> ! <item id="e25"/> ! <item id="efd"/> ! <item id="e26"/> ! <item id="efe"/> ! <item id="e27"/> ! <item id="eff"/> ! <item id="e28"/> ! <item id="f00"/> ! <item id="e29"/> ! <item id="f01"/> ! <item id="e2a"/> ! <item id="f02"/> ! <item id="e2b"/> ! <item id="f03"/> ! <item id="e2c"/> ! <item id="f04"/> ! <item id="efb"/> ! <item id="efc"/> ! <item id="1847"/> ! <item id="1848"/> ! <item id="1c18"/> ! <item id="e9b"/> ! <item id="f0e"/> ! <item id="f06"/> ! <item id="f07"/> ! <item id="f08"/> ! <item id="f09"/> ! <item id="f0a"/> ! <item id="f0b"/> ! <item id="f0c"/> ! <item id="f0d"/> ! <item id="f78"/> ! <item id="f79"/> ! <item id="f7a"/> ! <item id="f7b"/> ! <item id="f7c"/> ! <item id="f7d"/> ! <item id="f7e"/> ! <item id="f7f"/> ! <item id="f80"/> ! <item id="f81"/> ! <item id="f82"/> ! <item id="f83"/> ! <item id="f84"/> ! <item id="f85"/> ! <item id="f86"/> ! <item id="f87"/> ! <item id="f88"/> ! <item id="f89"/> ! <item id="f8a"/> ! <item id="f8b"/> ! <item id="f8c"/> ! <item id="f8d"/> ! <item id="f8e"/> ! <item id="f8f"/> ! <item id="f90"/> ! <item id="f91"/> ! </sellable> ! </shopkeeper> <alchemy><random min="850" max="1000" /></alchemy> <tasteidentification><random min="650" max="880" /></tasteidentification> --- 88,92 ---- </item> </equipped> ! <inherit id="alchemist_inventory" /> <alchemy><random min="850" max="1000" /></alchemy> <tasteidentification><random min="650" max="880" /></tasteidentification> Index: tailor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tailor.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tailor.xml 9 Sep 2004 04:31:45 -0000 1.4 --- tailor.xml 22 Sep 2004 06:11:01 -0000 1.5 *************** *** 52,55 **** --- 52,95 ---- <item id="df8"><amount>20</amount></item> <!-- Wool --> </restockable> + <sellable> + <item id="f9e"></item> <!-- Scissors --> + <item id="f9d"></item> <!-- Sewing Kit --> + <item id="fa9"></item> <!-- Dyes --> + <item id="fab"></item> <!-- Dye Tub --> + <item id="f95"></item> <!-- Bolt Of Cloth --> + + <item id="1efd"></item> <!-- Fancy Shirt --> + <item id="1517"></item> <!-- Shirt --> + <item id="152e"></item> <!-- Short Pants --> + <item id="15e9"></item> <!-- Long Pants --> + <item id="1515"></item> <!-- Cloak --> + <item id="1eff"></item> <!-- Fancy Dress --> + <item id="1f03"></item> <!-- Robe --> + <item id="1516"></item> <!-- Skirt --> + <item id="1537"></item> <!-- Kilt --> + <item id="153d"></item> <!-- Full Apron --> + <item id="153b"></item> <!-- Half Apron --> + <item id="1f7b"></item> <!-- Doublet --> + <item id="1fa1"></item> <!-- Tunic --> + <item id="1f9f"></item> <!-- Jester Suit --> + + <item id="171c"></item> <!-- Jester Hat --> + <item id="1713"></item> <!-- Floppy Hat --> + <item id="1714"></item> <!-- Wide Brim Hat --> + <item id="1715"></item> <!-- Cap --> + <item id="1543"></item> <!-- Skull Cap --> + <item id="153f"></item> <!-- Bandana --> + <item id="1716"></item> <!-- Tall Straw Hat --> + <item id="1717"></item> <!-- Straw Hat --> + <item id="1718"></item> <!-- Wizards Hat --> + <item id="1719"></item> <!-- Bonnet --> + <item id="171a"></item> <!-- Feathered Hat --> + <item id="171b"></item> <!-- Tricorne Hat --> + + <item id="fa0"></item> <!-- Spool Of Thread --> + <item id="1a9c"></item> <!-- Flax --> + <item id="df9"></item> <!-- Cotton --> + <item id="df8"></item> <!-- Wool --> + </sellable> </shopkeeper> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-09-22 06:11:12
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2778/items/professions Modified Files: alchemist.xml tailorer.xml Log Message: Fixed the alchemist vendor and added sellables for tailors. Index: alchemist.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/alchemist.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** alchemist.xml 10 Sep 2004 22:17:07 -0000 1.19 --- alchemist.xml 22 Sep 2004 06:11:01 -0000 1.20 *************** *** 140,147 **** <item id="eff"> <id>0xeff</id> ! <name>hair dye</name> <category>Professions\Alchemist\Hair Dye 2</category> <basescripts>environment</basescripts> ! <buyprice>60</buyprice> <weight>1.0</weight> </item> --- 140,148 ---- <item id="eff"> <id>0xeff</id> ! <name>#1041060</name> <category>Professions\Alchemist\Hair Dye 2</category> <basescripts>environment</basescripts> ! <buyprice>37</buyprice> ! <sellprice>19</sellprice> <weight>1.0</weight> </item> Index: tailorer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/tailorer.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** tailorer.xml 10 Sep 2004 22:17:09 -0000 1.19 --- tailorer.xml 22 Sep 2004 06:11:01 -0000 1.20 *************** *** 243,246 **** --- 243,247 ---- <category>Professions\Tailorer\Resources\Flax</category> <buyprice>102</buyprice> + <sellprice>51</sellprice> <weight>1.0</weight> </item> *************** *** 251,254 **** --- 252,256 ---- <category>Professions\Tailorer\Resources\Raw Cotton 2</category> <buyprice>102</buyprice> + <sellprice>51</sellprice> <weight>3.0</weight> </item> *************** *** 260,263 **** --- 262,266 ---- <basescripts>wool</basescripts> <buyprice>62</buyprice> + <sellprice>31</sellprice> <weight>3.0</weight> </item> *************** *** 292,295 **** --- 295,299 ---- <category>Professions\Tailorer\Bolt of Cloth 1</category> <buyprice>120</buyprice> + <sellprice>60</sellprice> <weight>5.0</weight> </item> *************** *** 336,339 **** --- 340,344 ---- <basescripts>skills.tailoring,equipment</basescripts> <buyprice>3</buyprice> + <sellprice>1</sellprice> <weight>2.0</weight> </item> *************** *** 344,347 **** --- 349,353 ---- <basescripts>scissors</basescripts> <buyprice>13</buyprice> + <sellprice>6</sellprice> <weight>1.0</weight> </item> *************** *** 357,360 **** --- 363,367 ---- <basescripts>yarn</basescripts> <buyprice>18</buyprice> + <sellprice>9</sellprice> <weight>1.0</weight> </item> *************** *** 371,374 **** --- 378,382 ---- <basescripts>dyes</basescripts> <buyprice>8</buyprice> + <sellprice>4</sellprice> <weight>3.0</weight> </item> *************** *** 379,382 **** --- 387,391 ---- <basescripts>environment</basescripts> <buyprice>9</buyprice> + <sellprice>4</sellprice> <weight>10.0</weight> </item> |
