wpdev-commits Mailing List for Wolfpack Emu (Page 16)
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-10-12 11:02:39
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31666/webroot Modified Files: ChangeLog.wolfpack Log Message: translation Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.148 retrieving revision 1.149 diff -C2 -d -r1.148 -r1.149 *** ChangeLog.wolfpack 12 Oct 2004 10:43:35 -0000 1.148 --- ChangeLog.wolfpack 12 Oct 2004 11:02:22 -0000 1.149 *************** *** 62,65 **** --- 62,66 ---- - Blacksmithing now logs smelting and repairing and allows using static forges and anvils. - Withdraw now updates the gold put into the players backpack. + - Allowed translation of the base makemenu. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-12 10:43:46
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27489/webroot Modified Files: ChangeLog.wolfpack Log Message: withdraw Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.147 retrieving revision 1.148 diff -C2 -d -r1.147 -r1.148 *** ChangeLog.wolfpack 12 Oct 2004 10:39:54 -0000 1.147 --- ChangeLog.wolfpack 12 Oct 2004 10:43:35 -0000 1.148 *************** *** 61,64 **** --- 61,65 ---- - Crashfix for wipe all in certain situations. - Blacksmithing now logs smelting and repairing and allows using static forges and anvils. + - Withdraw now updates the gold put into the players backpack. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-12 10:43:37
|
Update of /cvsroot/wpdev/xmlscripts/scripts/speech In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27441/speech Modified Files: banker.py Log Message: Fixes Index: banker.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/banker.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** banker.py 8 Oct 2004 01:14:16 -0000 1.14 --- banker.py 12 Oct 2004 10:43:28 -0000 1.15 *************** *** 62,71 **** while amount > 0: ! item = wolfpack.additem( "eed" ) item.amount = min( [ amount, 65535 ] ) ! item.container = backpack ! ! amount -= min( [ amount, 65535 ] ) ! speaker.soundeffect( 0x37, 0 ) --- 62,72 ---- while amount > 0: ! item = wolfpack.additem("eed") item.amount = min( [ amount, 65535 ] ) ! amount -= item.amount ! ! if not wolfpack.utilities.tocontainer(item, backpack): ! item.update() ! speaker.soundeffect( 0x37, 0 ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-12 10:40:15
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26632/skills Modified Files: blacksmithing.py Log Message: fixes Index: blacksmithing.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/blacksmithing.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** blacksmithing.py 9 Oct 2004 23:30:48 -0000 1.22 --- blacksmithing.py 12 Oct 2004 10:40:01 -0000 1.23 *************** *** 46,49 **** --- 46,52 ---- # def checkanvilandforge(char): + if char.gm: + return True + # Check dynamic items. # We should later check for statics too *************** *** 53,62 **** for item in items: if item.id == 0xFAF or item.id == 0xFB0: ! anvil = 1 elif item.id == 0xFB1 or (item.id >= 0x197A and item.id <= 0x19A9): ! forge = 1 if anvil and forge: return True return False --- 56,80 ---- for item in items: if item.id == 0xFAF or item.id == 0xFB0: ! anvil = True elif item.id == 0xFB1 or (item.id >= 0x197A and item.id <= 0x19A9): ! forge = True if anvil and forge: return True + + # Check for static items + for x in range(-2, 3): + for y in range(-2, 3): + statics = wolfpack.statics(char.pos.x + x, char.pos.y + y, char.pos.map, True) + + for tile in statics: + dispid = tile['id'] + if dispid == 0xFAF or dispid == 0xFB0: + anvil = True + elif dispid == 0xFB1 or (dispid >= 0x197A and dispid <= 0x19A9): + forge = True + + if anvil and forge: + return True return False *************** *** 294,303 **** if item.maxhealth <= weaken: player.socket.clilocmessage(500424) item.delete() elif player.checkskill(BLACKSMITHING, 0, 1000): player.socket.clilocmessage(1044279) item.maxhealth -= weaken ! item.health = item.maxhealth item.resendtooltip() else: player.socket.clilocmessage(1044280) --- 312,323 ---- if item.maxhealth <= weaken: player.socket.clilocmessage(500424) + player.log("Tries to repair item %s (0x%x) and destroys it.\n" % (item.baseid, item.serial)) item.delete() elif player.checkskill(BLACKSMITHING, 0, 1000): player.socket.clilocmessage(1044279) item.maxhealth -= weaken ! item.health = item.maxhealth item.resendtooltip() + player.log("Repairs item %s (0x%x) and weakens it by %u points.\n" % (item.baseid, item.serial, weaken)) else: player.socket.clilocmessage(1044280) *************** *** 305,308 **** --- 325,329 ---- item.health = max(0, item.health - weaken) item.resendtooltip() + player.log("Fails to repair item %s (0x%x) and weakens it by %u points.\n" % (item.baseid, item.serial, weaken)) # Warn the user if we'll break the item next time |
|
From: Sebastian H. <dar...@us...> - 2004-10-12 10:40:07
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26601/webroot Modified Files: ChangeLog.wolfpack Log Message: blacksmithing Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.146 retrieving revision 1.147 diff -C2 -d -r1.146 -r1.147 *** ChangeLog.wolfpack 11 Oct 2004 20:24:36 -0000 1.146 --- ChangeLog.wolfpack 12 Oct 2004 10:39:54 -0000 1.147 *************** *** 60,63 **** --- 60,64 ---- - Fixed clientcrashs related to the page menu. - Crashfix for wipe all in certain situations. + - Blacksmithing now logs smelting and repairing and allows using static forges and anvils. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-12 10:24:58
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23078/npcs/monsters/daemonic Modified Files: balron.xml Log Message: bandage price fix Index: balron.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/balron.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** balron.xml 10 Oct 2004 18:24:29 -0000 1.18 --- balron.xml 12 Oct 2004 10:24:46 -0000 1.19 *************** *** 42,46 **** <!-- Missing: 1-7 Scroll, Medium Necro Scroll --> <lootpacks>lootpack_filthy_rich;lootpack_filthy_rich</lootpacks> - <carve>carve_demon_with_sword</carve> <category>Monsters\Daemonic\Balron</category> <intproperty name="carve_meat" value="1" /> --- 42,45 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-12 10:24:58
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23078/items/professions Modified Files: healer.xml Log Message: bandage price fix Index: healer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/healer.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** healer.xml 10 Sep 2004 22:17:09 -0000 1.10 --- healer.xml 12 Oct 2004 10:24:45 -0000 1.11 *************** *** 15,19 **** <category>Professions\Healer\Bloody Bandages 1</category> <basescripts>bandages</basescripts> ! <buyprice>1</buyprice> <weight>0.1</weight> </item> --- 15,20 ---- <category>Professions\Healer\Bloody Bandages 1</category> <basescripts>bandages</basescripts> ! <buyprice>3</buyprice> ! <sellprice>3</sellprice> <weight>0.1</weight> </item> *************** *** 28,33 **** <category>Professions\Healer\Clean Bandages 1</category> <weight>0.1</weight> ! <buyprice>1</buyprice> ! <sellprice>3</sellprice> <basescripts>bandages</basescripts> </item> --- 29,34 ---- <category>Professions\Healer\Clean Bandages 1</category> <weight>0.1</weight> ! <sellprice>1</sellprice> ! <buyprice>3</buyprice> <basescripts>bandages</basescripts> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-10-11 20:27:13
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22443 Modified Files: ChangeLog spawnregions.cpp Log Message: spawnregion update Index: spawnregions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** spawnregions.cpp 10 Oct 2004 17:51:24 -0000 1.77 --- spawnregions.cpp 11 Oct 2004 20:27:01 -0000 1.78 *************** *** 847,861 **** this->clear(); // clear the std::map ! QStringList DefSections = Definitions::instance()->getSections( WPDT_SPAWNREGION ); ! QStringList::iterator it = DefSections.begin(); ! while ( it != DefSections.end() ) ! { ! const cElement* DefSection = Definitions::instance()->getDefinition( WPDT_SPAWNREGION, *it ); ! cSpawnRegion* toinsert_ = new cSpawnRegion( DefSection ); ! this->insert( make_pair( *it, toinsert_ ) ); ! ++it; } cComponent::load(); } --- 847,865 ---- this->clear(); // clear the std::map ! // Don't load spawnregions if disabled ! if (!Config::instance()->getBool("General", "Disable Spawnregions", false, true)) { ! QStringList DefSections = Definitions::instance()->getSections( WPDT_SPAWNREGION ); ! QStringList::iterator it = DefSections.begin(); ! while ( it != DefSections.end() ) ! { ! const cElement* DefSection = Definitions::instance()->getDefinition( WPDT_SPAWNREGION, *it ); ! cSpawnRegion* toinsert_ = new cSpawnRegion( DefSection ); ! this->insert( make_pair( *it, toinsert_ ) ); ! ++it; ! } } + cComponent::load(); } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** ChangeLog 11 Oct 2004 19:03:41 -0000 1.105 --- ChangeLog 11 Oct 2004 20:27:01 -0000 1.106 *************** *** 43,46 **** --- 43,47 ---- - Reduced network latency. - Made AI checks occur more often if the npc moves faster. + - Added an option to disable spawnregions alltogether for build servers etc. Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-10-11 20:24:45
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21898/webroot Modified Files: ChangeLog.wolfpack Log Message: fix for wipe all Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -d -r1.145 -r1.146 *** ChangeLog.wolfpack 10 Oct 2004 18:24:17 -0000 1.145 --- ChangeLog.wolfpack 11 Oct 2004 20:24:36 -0000 1.146 *************** *** 59,62 **** --- 59,63 ---- - Removed the deprecated WEIGHTBONUS property. - Fixed clientcrashs related to the page menu. + - Crashfix for wipe all in certain situations. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-11 20:24:33
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21842/commands Modified Files: wipe.py Log Message: fix for wipe all Index: wipe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/wipe.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wipe.py 23 Sep 2004 00:27:55 -0000 1.7 --- wipe.py 11 Oct 2004 20:24:22 -0000 1.8 *************** *** 65,75 **** iterator = wolfpack.itemiterator() item = iterator.first ! count = 0 while item: if item.container == None: ! item.delete() ! count += 1 item = iterator.next ! player.socket.sysmessage( "%i items have been removed from world" % count ) return --- 65,79 ---- iterator = wolfpack.itemiterator() item = iterator.first ! serials = [] while item: if item.container == None: ! serials.append(item.serial) item = iterator.next ! for serial in serials: ! item = wolfpack.finditem(serial) ! if item: ! item.delete() ! ! player.socket.sysmessage( "%i items have been removed from world" % len(serials) ) return |
|
From: Sebastian H. <dar...@us...> - 2004-10-11 19:03:52
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3942/ai Modified Files: ai.cpp Log Message: AI Checks Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** ai.cpp 10 Oct 2004 17:51:24 -0000 1.37 --- ai.cpp 11 Oct 2004 19:03:42 -0000 1.38 *************** *** 164,172 **** #endif // Now we should have a current action set, else do nothing! startProfiling(PF_AICHECKEXECUTEACTION); if ( m_currentAction ) { ! m_currentAction->execute(); // We must check the postcondition now and set the current action to NULL --- 164,178 ---- #endif + m_npc->setAICheckTime(Server::instance()->time() + m_npc->wanderSpeed()); + // Now we should have a current action set, else do nothing! startProfiling(PF_AICHECKEXECUTEACTION); if ( m_currentAction ) { ! if (!m_currentAction->isPassive()) { ! m_npc->setAICheckTime(Server::instance()->time() + m_npc->actionSpeed()); ! } ! ! m_currentAction->execute(); // We must check the postcondition now and set the current action to NULL *************** *** 184,187 **** --- 190,194 ---- } } + stopProfiling(PF_AICHECKEXECUTEACTION); } *************** *** 634,640 **** moveTo( pTarget->pos()); } - - if ( pTarget->dist( m_npc ) > 3 ) - m_npc->setAICheckTime( ( uint )( Server::instance()->time() + ( float ) m_npc->aiCheckInterval() * 0.0005f * MY_CLOCKS_PER_SEC ) ); } } --- 641,644 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-11 19:03:51
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3942 Modified Files: ChangeLog npc.cpp timing.cpp Log Message: AI Checks Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** ChangeLog 10 Oct 2004 17:51:24 -0000 1.104 --- ChangeLog 11 Oct 2004 19:03:41 -0000 1.105 *************** *** 42,45 **** --- 42,46 ---- - Improved NPC movement and allowed custom speeds per npc. - Reduced network latency. + - Made AI checks occur more often if the npc moves faster. Wolfpack 12.9.11 Beta (26. September 2004) Index: timing.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** timing.cpp 7 Oct 2004 23:02:26 -0000 1.17 --- timing.cpp 11 Oct 2004 19:03:42 -0000 1.18 *************** *** 453,468 **** startProfiling(PF_AICHECK); npc->ai()->check(); - - // Check the current action - Monster_Aggr_MoveToTarget *a1 = dynamic_cast<Monster_Aggr_MoveToTarget*>(npc->ai()->currentAction()); - Human_Guard_MoveToTarget *a2 = dynamic_cast<Human_Guard_MoveToTarget*>(npc->ai()->currentAction()); - - if (a1 || a2) { - npc->setAICheckTime( time + 100 ); - } else { - unsigned int delay = RandomNum(250, 700); - npc->setAICheckTime( time + delay ); - } - stopProfiling(PF_AICHECK); } --- 453,456 ---- Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** npc.cpp 10 Oct 2004 17:51:24 -0000 1.121 --- npc.cpp 11 Oct 2004 19:03:41 -0000 1.122 *************** *** 298,308 **** } // This creature is not player or monster controlled. Thus slower. if (isTamed()) { ! // Creatures following their owner are a lot faster than usual ! if (wanderFollowTarget() == owner() && ai_ && dynamic_cast<Action_Wander*>(ai_->currentAction()) != 0) { ! interval >>= 1; // Half the time ! } ! interval -= 75; // A little faster } else if (!summoned()) { --- 298,308 ---- } + if (owner() && wanderFollowTarget() == owner() && ai_ && dynamic_cast<Action_Wander*>(ai_->currentAction()) != 0) { + interval >>= 1; // Half the time + } + // This creature is not player or monster controlled. Thus slower. if (isTamed()) { ! // Creatures following their owner are a lot faster than usual interval -= 75; // A little faster } else if (!summoned()) { *************** *** 317,320 **** --- 317,324 ---- setNextMoveTime(Server::instance()->time() + interval); + + if (nextMoveTime() < aiCheckTime()) { + setAICheckTime(nextMoveTime()); + } } |
|
From: Correa <thi...@us...> - 2004-10-11 08:05:23
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15438 Modified Files: definitions.cpp Log Message: ops. Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** definitions.cpp 11 Oct 2004 07:58:00 -0000 1.22 --- definitions.cpp 11 Oct 2004 08:05:10 -0000 1.23 *************** *** 198,206 **** } - if( qName == "acl" ) - { - int i = 0; - } - // Include another file if( qName == "include" ) --- 198,201 ---- |
|
From: Correa <thi...@us...> - 2004-10-11 07:58:13
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13664 Modified Files: definitions.cpp definitions.h Log Message: Definitions are now loaded recursively. The <include> tag can now be used to include child elements into another element. -- HellRaider Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** definitions.cpp 9 Oct 2004 14:28:59 -0000 1.21 --- definitions.cpp 11 Oct 2004 07:58:00 -0000 1.22 *************** *** 31,34 **** --- 31,35 ---- #include <qptrstack.h> #include <qregexp.h> + #include <qvaluestack.h> #include <qstringlist.h> #include <qvaluevector.h> *************** *** 105,140 **** private: cDefManagerPrivate* impl; ! QPtrStack<cElement> stack; ! QString filename; ! QXmlLocator* locator; public: ! cXmlHandler( cDefManagerPrivate* impl, const QString& filename ) { this->impl = impl; ! this->filename = filename; ! }; ! virtual ~cXmlHandler() { ! while ( stack.count() > 1 ) ! stack.pop(); // The parent node should take care of deleting the children ! if ( stack.count() == 1 ) ! delete stack.pop(); } ! void setDocumentLocator( QXmlLocator* locator ) { ! this->locator = locator; } ! bool endDocument() { ! while ( stack.count() > 1 ) ! stack.pop(); // The parent node should take care of deleting the children ! if ( stack.count() == 1 ) ! delete stack.pop(); return true; } --- 106,178 ---- private: cDefManagerPrivate* impl; ! // Element level within the current file ! QValueStack<int> levels; ! // Holds all read elements. ! QPtrStack<cElement> elements; ! // Files stack (each <include> pushes a file) ! QValueStack<QString> filenames; ! // Locators associated to each document ! QPtrStack<QXmlLocator> locators; public: ! cXmlHandler( cDefManagerPrivate* impl ) { this->impl = impl; ! } ! virtual ~cXmlHandler() ! { ! while( !elements.isEmpty() ) ! { ! cElement *parent; ! while( elements.current() != NULL ) ! { ! parent = elements.pop(); ! } ! delete parent; ! while( elements.current() == NULL ) ! elements.pop(); ! } } ! void load( const QString &filename ) { ! QFile file( filename ); ! ! if( !file.open( IO_ReadOnly ) ) ! { ! Console::instance()->send( tr("Unable to open %1!\n").arg( filename ) ); ! return; ! } ! ! filenames.push( filename ); ! ! QXmlInputSource input( &file ); ! QXmlSimpleReader reader; ! reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false ); ! ! reader.setContentHandler( this ); ! reader.setErrorHandler( this ); ! reader.parse( &input, false ); ! ! filenames.pop(); } ! void setDocumentLocator( QXmlLocator* locator ) { ! locators.push( locator ); ! } ! bool startDocument() ! { ! levels.push( 0 ); ! return true; ! } + bool endDocument() + { + levels.pop(); + locators.pop(); return true; } *************** *** 142,158 **** bool startElement( const QString& /*namespaceURI*/, const QString& localName, const QString& qName, const QXmlAttributes& atts ) { ! // Some Parent Elements have special meanings ! if ( stack.isEmpty() ) ! { ! if ( qName == "definitions" ) ! return true; ! // Include another file ! if ( qName == "include" ) { ! QString value = atts.value( "file" ); ! impl->imports.push_back( value ); ! return true; } } --- 180,214 ---- bool startElement( const QString& /*namespaceURI*/, const QString& localName, const QString& qName, const QXmlAttributes& atts ) { ! levels.top()++; ! // Ignore document root ! if( levels.top() == 1 ) ! { ! if( levels.isEmpty() ) { ! // Top level ! elements.push( NULL ); } + else + { + // Within an include + elements.push( elements.current() ); + } + return true; + } + + if( qName == "acl" ) + { + int i = 0; + } + + // Include another file + if( qName == "include" ) + { + QString value = atts.value( "file" ); + load( value ); + + elements.push( elements.current() ); + return true; } *************** *** 161,173 **** element->copyAttributes( atts ); ! // Child Element ? ! if ( stack.count() > 0 ) { ! cElement* parent = stack.current(); // Pop the potential parent parent->addChild( element ); // Add the child to it's parent element->setParent( parent ); } ! stack.push( element ); // Push our element (there may be children) return true; } --- 217,230 ---- element->copyAttributes( atts ); ! // Child Element? ! if( elements.current() != NULL ) { ! cElement* parent = elements.current(); // Pop the potential parent parent->addChild( element ); // Add the child to it's parent element->setParent( parent ); } ! elements.push( element ); // Push our element (there may be children) ! return true; } *************** *** 175,187 **** bool endElement( const QString& /*namespaceURI*/, const QString& /*localName*/, const QString& /*qName*/ ) { ! if ( stack.isEmpty() ) { return true; } ! cElement* element = stack.pop(); // Did we complete a parent node? ! if ( stack.isEmpty() ) { // Find a category node --- 232,250 ---- bool endElement( const QString& /*namespaceURI*/, const QString& /*localName*/, const QString& /*qName*/ ) { ! cElement* element = elements.pop(); ! if( --( levels.top() ) == 0 ) { + // Ignore root return true; } ! if( element == elements.current() ) ! { ! // Ignore include ! return true; ! } // Did we complete a parent node? ! if( elements.current() == NULL ) { // Find a category node *************** *** 200,204 **** if ( impl->unique[categories[i].key].contains( tagId ) && !Config::instance()->overwriteDefinitions() ) { ! Console::instance()->log( LOG_WARNING, tr( "Duplicate %1: %2\n[File: %3, Line: %4]\n" ).arg( element->name() ).arg( tagId ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } --- 263,268 ---- if ( impl->unique[categories[i].key].contains( tagId ) && !Config::instance()->overwriteDefinitions() ) { ! Console::instance()->log( LOG_WARNING, tr( "Duplicate %1: %2\n[File: %3, Line: %4]\n" ) ! .arg( element->name() ).arg( tagId ).arg( filenames.top() ).arg( locators.current()->lineNumber() ) ); delete element; } *************** *** 218,222 **** } ! Console::instance()->log( LOG_WARNING, tr( "Unknown element: %1\n[File: %2, Line: %3]\n" ).arg( element->name() ).arg( filename ).arg( locator->lineNumber() ) ); delete element; } --- 282,287 ---- } ! Console::instance()->log( LOG_WARNING, tr( "Unknown element: %1\n[File: %2, Line: %3]\n" ) ! .arg( element->name() ).arg( filenames.top() ).arg( locators.current()->lineNumber() ) ); delete element; } *************** *** 227,235 **** bool characters( const QString& ch ) { ! if ( !stack.isEmpty() ) { ! cElement* element = stack.pop(); ! element->setText( element->text() + ch ); ! stack.push( element ); } --- 292,300 ---- bool characters( const QString& ch ) { ! if( !elements.isEmpty() ) { ! cElement *element = elements.current(); ! if( element ) ! element->setText( element->text() + ch ); } *************** *** 240,282 **** bool warning( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_WARNING, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool error( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool fatalError( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, tr( "%1\n[File: %2, Line: %3, Column: %4" ).arg( exception.message(), filename ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } }; - // Recursive Function for Importing Script Sections - bool cDefinitions::ImportSections( const QString& FileName ) - { - QFile File( FileName ); - - if ( !File.open( IO_ReadOnly ) ) - { - Console::instance()->send( tr("Unable to open %1!\n").arg(FileName) ); - return false; - } - - QXmlInputSource input( &File ); - QXmlSimpleReader reader; - reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false ); - - cXmlHandler handler( impl, FileName ); - reader.setContentHandler( &handler ); - reader.setErrorHandler( &handler ); - reader.parse( &input, false ); - - File.close(); - return true; - } - void cDefinitions::unload() { --- 305,326 ---- bool warning( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_WARNING, tr( "%1\n[File: %2, Line: %3, Column: %4" ) ! .arg( exception.message(), filenames.top() ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool error( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, tr( "%1\n[File: %2, Line: %3, Column: %4" ) ! .arg( exception.message(), filenames.top() ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } bool fatalError( const QXmlParseException& exception ) { ! Console::instance()->log( LOG_ERROR, tr( "%1\n[File: %2, Line: %3, Column: %4" ) ! .arg( exception.message(), filenames.top() ).arg( exception.lineNumber() ).arg( exception.columnNumber() ) ); return true; // continue } }; void cDefinitions::unload() { *************** *** 326,336 **** void cDefinitions::load( void ) { - unsigned int i = 0; impl->imports = QStringList::split( ";", Config::instance()->getString( "General", "Definitions", "definitions/index.xml", true ) ); ! while ( i < impl->imports.size() ) { ! ImportSections( impl->imports[i] ); ! ++i; } --- 370,379 ---- void cDefinitions::load( void ) { impl->imports = QStringList::split( ";", Config::instance()->getString( "General", "Definitions", "definitions/index.xml", true ) ); ! for( unsigned int i = 0; i < impl->imports.size(); ++i ) { ! cXmlHandler handler( impl ); ! handler.load( impl->imports[i] ); } Index: definitions.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** definitions.h 1 Oct 2004 19:43:56 -0000 1.5 --- definitions.h 11 Oct 2004 07:58:00 -0000 1.6 *************** *** 142,146 **** void unload( void ); - bool ImportSections( const QString& FileName ); const cElement* getDefinition( eDefCategory Type, const QString& id ) const; const QValueVector<cElement*>& getDefinitions( eDefCategory Type ) const; --- 142,145 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 20:40:30
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13585 Modified Files: walking.cpp Log Message: fixes Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.154 retrieving revision 1.155 diff -C2 -d -r1.154 -r1.155 *** walking.cpp 10 Oct 2004 12:19:09 -0000 1.154 --- walking.cpp 10 Oct 2004 20:39:38 -0000 1.155 *************** *** 624,628 **** // If we are now out of range, remove from view (just to be sure) ! if (pChar->dist( otherplayer ) >= otherplayer->visualRange()) { otherplayer->socket()->removeObject(pChar); } --- 624,628 ---- // If we are now out of range, remove from view (just to be sure) ! if (pChar->dist( otherplayer ) > otherplayer->visualRange()) { otherplayer->socket()->removeObject(pChar); } |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 20:10:13
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7935 Modified Files: items.h Log Message: allowed more color bits Index: items.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.h,v retrieving revision 1.219 retrieving revision 1.220 diff -C2 -d -r1.219 -r1.220 *** items.h 8 Oct 2004 01:13:15 -0000 1.219 --- items.h 10 Oct 2004 20:10:02 -0000 1.220 *************** *** 456,460 **** unsigned short id_; // Display id of the item ! unsigned short color_ : 12; // Color of this item (Note: only colors up to 0xBFF available -> 12 bit) unsigned short amount_; // Amount of this item --- 456,460 ---- unsigned short id_; // Display id of the item ! unsigned short color_; // Color of this item (Note: only colors up to 0xBFF available -> 12 bit) unsigned short amount_; // Amount of this item |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 19:56:54
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4434/wolfpack Modified Files: consts.py Log Message: fixes Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** consts.py 10 Oct 2004 19:23:23 -0000 1.88 --- consts.py 10 Oct 2004 19:56:43 -0000 1.89 *************** *** 112,119 **** # Potion Delays ! HEAL_POT_DELAY = 10000 # 10 Seconds ! AGILITY_TIME = 120000 # 2 minutes ! STRENGTH_TIME = 120000 # 2 minutes ! INTELLIGENCE_TIME = 120000 # 2 minutes # Potion Ranges POTION_LESSERHEAL_RANGE = [ 3, 10] --- 112,119 ---- # Potion Delays ! HEAL_POT_DELAY = 10.0 # 10 Seconds ! AGILITY_TIME = 120.0 # 2 minutes ! STRENGTH_TIME = 120.0 # 2 minutes ! INTELLIGENCE_TIME = 120.0 # 2 minutes # Potion Ranges POTION_LESSERHEAL_RANGE = [ 3, 10] |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 19:56:54
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4434 Modified Files: potions.py Log Message: fixes Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** potions.py 30 Sep 2004 16:01:14 -0000 1.57 --- potions.py 10 Oct 2004 19:56:41 -0000 1.58 *************** *** 3,6 **** --- 3,7 ---- import wolfpack.time import math + import time from random import randint, random from wolfpack.utilities import hex2dec, throwobject, energydamage, checkLoS *************** *** 405,411 **** if socket.hastag('heal_pot_timer'): elapsed = int( socket.gettag( "heal_pot_timer" ) ) ! if elapsed > wolfpack.time.currenttime(): # Broken Timer ! if wolfpack.time.currenttime() - elapsed > HEAL_POT_DELAY: socket.deltag('heal_pot_timer') else: --- 406,412 ---- if socket.hastag('heal_pot_timer'): elapsed = int( socket.gettag( "heal_pot_timer" ) ) ! if elapsed > time.time(): # Broken Timer ! if time.time() - elapsed > HEAL_POT_DELAY: socket.deltag('heal_pot_timer') else: *************** *** 413,417 **** return False ! socket.settag( "heal_pot_timer", wolfpack.time.currenttime() + HEAL_POT_DELAY) amount = 0 --- 414,418 ---- return False ! socket.settag( "heal_pot_timer", time.time() + HEAL_POT_DELAY) amount = 0 *************** *** 499,515 **** return False ! if not char.hastag( "dex_pot_timer" ): ! char.settag( "dex_pot_timer", (wolfpack.time.currenttime() + AGILITY_TIME) ) ! # Compare ! elapsed = int( char.gettag( "dex_pot_timer" ) ) ! if elapsed > wolfpack.time.currenttime(): ! socket.clilocmessage(502173) # You are already under a similar effect. ! return False ! else: ! char.settag( 'dex_pot_timer', (wolfpack.time.currenttime() + AGILITY_TIME) ) if char.dexterity + bonus < 1: bonus = -(char.strength - 1) char.dexterity2 += bonus char.dexterity += bonus --- 500,519 ---- return False ! if char.hastag( "dex_pot_timer" ): ! # Compare ! elapsed = int( char.gettag( "dex_pot_timer" ) ) ! ! # Some bug occured ! if elapsed - time.time() > AGILITY_TIME: ! char.deltag('dex_pot_timer') ! elif elapsed > time.time(): ! socket.clilocmessage(502173) # You are already under a similar effect. ! return False ! char.settag('dex_pot_timer', time.time() + AGILITY_TIME) if char.dexterity + bonus < 1: bonus = -(char.strength - 1) + char.dexterity2 += bonus char.dexterity += bonus *************** *** 518,522 **** char.updatestats() ! char.addtimer( AGILITY_TIME, "magic.utilities.statmodifier_expire", [1, bonus], 1, 1, "magic_statmodifier_1", "magic.utilities.statmodifier_dispel" ) char.action( ANIM_FIDGET3 ) --- 522,526 ---- char.updatestats() ! char.addtimer( int(AGILITY_TIME * 1000), "magic.utilities.statmodifier_expire", [1, bonus], 1, 1, "magic_statmodifier_1", "magic.utilities.statmodifier_dispel" ) char.action( ANIM_FIDGET3 ) *************** *** 546,559 **** return False ! if not char.hastag( "str_pot_timer" ): ! char.settag( "str_pot_timer", (wolfpack.time.currenttime() + STRENGTH_TIME) ) ! ! # Compare ! elapsed = int( char.gettag( "str_pot_timer" ) ) ! if elapsed > wolfpack.time.currenttime(): ! socket.clilocmessage(502173) # You are already under a similar effect ! return False ! else: ! char.settag( 'str_pot_timer', (wolfpack.time.currenttime() + STRENGTH_TIME) ) if char.strength + bonus < 1: --- 550,564 ---- return False ! if char.hastag( "str_pot_timer" ): ! # Compare ! elapsed = int( char.gettag( "str_pot_timer" ) ) ! ! if elapsed - time.time() > STRENGTH_TIME: ! char.deltag('str_pot_timer') ! elif elapsed > time.time(): ! socket.clilocmessage(502173) # You are already under a similar effect ! return False ! ! char.settag( "str_pot_timer", time.time() + STRENGTH_TIME ) if char.strength + bonus < 1: *************** *** 565,569 **** char.updatestats() ! char.addtimer( STRENGTH_TIME, "magic.utilities.statmodifier_expire", [0, bonus], 1, 1, "magic_statmodifier_0", "magic.utilities.statmodifier_dispel" ) char.action( ANIM_FIDGET3 ) --- 570,574 ---- char.updatestats() ! char.addtimer( int(STRENGTH_TIME * 1000.0), "magic.utilities.statmodifier_expire", [0, bonus], 1, 1, "magic_statmodifier_0", "magic.utilities.statmodifier_dispel" ) char.action( ANIM_FIDGET3 ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 19:29:03
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30015/npcs/monsters Modified Files: base.xml Log Message: fix Index: base.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/base.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** base.xml 10 Oct 2004 18:24:28 -0000 1.17 --- base.xml 10 Oct 2004 19:28:30 -0000 1.18 *************** *** 39,55 **** <!-- Monster Speeds --> <npc id="speed_slow"> ! <speed action="300" wander"600" /> </npc> <npc id="speed_medium"> ! <speed action="250" wander"500" /> </npc> <npc id="speed_fast"> ! <speed action="200" wander"400" /> </npc> <npc id="speed_veryfast"> ! <speed action="175" wander"350" /> </npc> </definitions> --- 39,55 ---- <!-- Monster Speeds --> <npc id="speed_slow"> ! <speed action="300" wander="600" /> </npc> <npc id="speed_medium"> ! <speed action="250" wander="500" /> </npc> <npc id="speed_fast"> ! <speed action="200" wander="400" /> </npc> <npc id="speed_veryfast"> ! <speed action="175" wander="350" /> </npc> </definitions> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 19:23:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29037/wolfpack Modified Files: consts.py Log Message: Fixed a bandage and potion bug. Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** consts.py 9 Oct 2004 23:31:03 -0000 1.87 --- consts.py 10 Oct 2004 19:23:23 -0000 1.88 *************** *** 117,123 **** INTELLIGENCE_TIME = 120000 # 2 minutes # Potion Ranges ! POTION_LESSERHEAL_RANGE = [ 1, 16 ] ! POTION_HEAL_RANGE = [ 3, 19 ] ! POTION_GREATERHEAL_RANGE = [ 5, 25 ] POTION_LESSEREXPLOSION_RANGE = [ 1, 5 ] POTION_EXPLOSION_RANGE = [ 6, 10 ] --- 117,123 ---- INTELLIGENCE_TIME = 120000 # 2 minutes # Potion Ranges ! POTION_LESSERHEAL_RANGE = [ 3, 10] ! POTION_HEAL_RANGE = [ 6, 20 ] ! POTION_GREATERHEAL_RANGE = [ 9, 30 ] POTION_LESSEREXPLOSION_RANGE = [ 1, 5 ] POTION_EXPLOSION_RANGE = [ 6, 10 ] |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 19:23:42
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29037 Modified Files: bandages.py Log Message: Fixed a bandage and potion bug. Index: bandages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bandages.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** bandages.py 8 Oct 2004 19:59:29 -0000 1.17 --- bandages.py 10 Oct 2004 19:23:22 -0000 1.18 *************** *** 125,129 **** return ! slipped = int(socket.gettag('bandage_slipped')) # How many times the fingers slipped socket.deltag('bandage_slipped') --- 125,132 ---- return ! if socket.hastag('bandage_slipped'): ! slipped = int(socket.gettag('bandage_slipped')) # How many times the fingers slipped ! else: ! slipped = 0 socket.deltag('bandage_slipped') |
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/champions Modified Files: barracoon_the_piper.xml lord_oaks.xml mephitis.xml neira_the_necromancer.xml rikktor.xml semidar.xml silvani.xml Log Message: speed infos Index: rikktor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/rikktor.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rikktor.xml 28 Sep 2004 13:02:19 -0000 1.7 --- rikktor.xml 10 Oct 2004 18:24:29 -0000 1.8 *************** *** 51,54 **** --- 51,55 ---- <intproperty name="carve_scales" value="20" /> <strproperty name="carve_scales_type" value="all" /> + <inherit id="speed_veryfast" /> </npc> Index: semidar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/semidar.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** semidar.xml 7 Oct 2004 20:13:50 -0000 1.7 --- semidar.xml 10 Oct 2004 18:24:29 -0000 1.8 *************** *** 51,54 **** --- 51,55 ---- <category>Monsters\Champions\Semidar</category> <strproperty name="slayer_group" value="daemons" /> + <inherit id="speed_veryfast" /> </npc> Index: neira_the_necromancer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/neira_the_necromancer.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** neira_the_necromancer.xml 3 Aug 2004 13:23:42 -0000 1.5 --- neira_the_necromancer.xml 10 Oct 2004 18:24:29 -0000 1.6 *************** *** 50,53 **** --- 50,54 ---- <!-- Misc. --> <category>Monsters\Champions\Neira</category> + <inherit id="speed_veryfast" /> </npc> Index: barracoon_the_piper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/barracoon_the_piper.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** barracoon_the_piper.xml 3 Aug 2004 13:23:42 -0000 1.6 --- barracoon_the_piper.xml 10 Oct 2004 18:24:29 -0000 1.7 *************** *** 44,47 **** --- 44,48 ---- <!-- Misc. --> <category>Monsters\Champions\Baracoon The Piper</category> + <inherit id="speed_veryfast" /> </npc> Index: lord_oaks.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/lord_oaks.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lord_oaks.xml 3 Aug 2004 13:23:42 -0000 1.5 --- lord_oaks.xml 10 Oct 2004 18:24:29 -0000 1.6 *************** *** 19,23 **** <dex><random min="101" max="150"/></dex> <int><random min="503" max="800"/></int> ! <maxhitpoints><random min="" max=""/></maxhitpoints> <!-- Skills --> <wrestling><random min="1000" max="1000"/></wrestling> --- 19,23 ---- <dex><random min="101" max="150"/></dex> <int><random min="503" max="800"/></int> ! <maxhitpoints>3000</maxhitpoints> <!-- Skills --> <wrestling><random min="1000" max="1000"/></wrestling> *************** *** 49,52 **** --- 49,53 ---- <!-- Misc. --> <category>Monsters\Champions\Lord Oaks</category> + <inherit id="speed_fast" /> </npc> Index: mephitis.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/mephitis.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mephitis.xml 7 Oct 2004 20:13:50 -0000 1.6 --- mephitis.xml 10 Oct 2004 18:24:29 -0000 1.7 *************** *** 49,52 **** --- 49,53 ---- <category>Monsters\Champions\Mephitis</category> <strproperty name="slayer_group" value="spiders" /> + <inherit id="speed_veryfast" /> </npc> Index: silvani.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/silvani.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** silvani.xml 28 Sep 2004 13:02:20 -0000 1.6 --- silvani.xml 10 Oct 2004 18:24:29 -0000 1.7 *************** *** 50,53 **** --- 50,54 ---- <!-- Misc. --> <category>Monsters\Champions\Silvani</category> + <inherit id="speed_fast" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:25:11
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/clockwork In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/clockwork Modified Files: golem.xml Log Message: speed infos Index: golem.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/clockwork/golem.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** golem.xml 7 Sep 2004 00:28:02 -0000 1.11 --- golem.xml 10 Oct 2004 18:24:29 -0000 1.12 *************** *** 39,42 **** --- 39,43 ---- <!--<lootpacks></lootpacks>--> <category>Monsters\Clockwork\Golem</category> + <inherit id="speed_slow" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:25:10
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters Modified Files: base.xml Log Message: speed infos Index: base.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/base.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** base.xml 10 Sep 2004 17:56:49 -0000 1.16 --- base.xml 10 Oct 2004 18:24:28 -0000 1.17 *************** *** 10,13 **** --- 10,14 ---- <!-- monster base --> <npc id="monster_base"> + <inherit id="speed_medium" /> <!-- Default Speed --> <ai>Monster_Aggressive_L1</ai> <name>unknown monster</name> *************** *** 35,37 **** --- 36,55 ---- <basescripts>speech.pets</basescripts> </npc> + + <!-- Monster Speeds --> + <npc id="speed_slow"> + <speed action="300" wander"600" /> + </npc> + + <npc id="speed_medium"> + <speed action="250" wander"500" /> + </npc> + + <npc id="speed_fast"> + <speed action="200" wander"400" /> + </npc> + + <npc id="speed_veryfast"> + <speed action="175" wander"350" /> + </npc> </definitions> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:25:10
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/beasts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/beasts Modified Files: bog_thing.xml plague_beast.xml Log Message: speed infos Index: bog_thing.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/beasts/bog_thing.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** bog_thing.xml 7 Sep 2004 00:28:02 -0000 1.12 --- bog_thing.xml 10 Oct 2004 18:24:28 -0000 1.13 *************** *** 38,41 **** --- 38,42 ---- <lootpacks>lootpack_average</lootpacks> <category>Monsters\Beasts\Bog Thing</category> + <inherit id="speed_slow" /> </npc> Index: plague_beast.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/beasts/plague_beast.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** plague_beast.xml 7 Sep 2004 00:28:02 -0000 1.11 --- plague_beast.xml 10 Oct 2004 18:24:28 -0000 1.12 *************** *** 39,42 **** --- 39,43 ---- <lootpacks>lootpack_filthy_rich;gems;armor_platemail_high</lootpacks> <category>Monsters\Beasts\Plague Beast</category> + <inherit id="speed_slow" /> </npc> |
