wpdev-commits Mailing List for Wolfpack Emu (Page 24)
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-03 13:57:53
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30330 Modified Files: kindling.py Log Message: 0000346 Index: kindling.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/kindling.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kindling.py 24 Sep 2004 11:07:04 -0000 1.7 --- kindling.py 3 Oct 2004 13:57:09 -0000 1.8 *************** *** 50,54 **** campfire.moveto( pos ) campfire.decay = True - #campfire.decaytime = wolfpack.time.servertime() + ( 2 * 60 * 1000 ) # Decays in 2 Minutes campfire.update() --- 50,53 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-03 13:53:39
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29544/webroot Modified Files: ChangeLog.wolfpack Log Message: 0000346 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** ChangeLog.wolfpack 2 Oct 2004 10:07:50 -0000 1.134 --- ChangeLog.wolfpack 3 Oct 2004 13:53:09 -0000 1.135 *************** *** 40,43 **** --- 40,44 ---- - The character info page now logs every changed property. - The characters weight is now being resent on lumberjacking and other skills. + - Fixed bug #0000346. (Unmovable items crafted by carpenters) * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-03 13:52:16
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29184/ai Modified Files: ai.cpp ai.h ai_humans.cpp Log Message: Guards now run towards their targets. Fixed bug #0000345. Index: ai_humans.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ai_humans.cpp 26 Sep 2004 17:53:05 -0000 1.22 --- ai_humans.cpp 3 Oct 2004 13:51:40 -0000 1.23 *************** *** 392,400 **** { P_CHAR pChar = ri.GetData(); ! if ( pChar && !pChar->free && pChar != m_npc && !pChar->isInvulnerable() && !pChar->isHidden() && !pChar->isInvisible() && !pChar->isDead() && !pChar->isInnocent() ) { ! P_PLAYER pPlayer = dynamic_cast<P_PLAYER>( pChar ); ! if ( pPlayer && pPlayer->isGMorCounselor() ) ! continue; m_currentVictim = pChar; --- 392,420 ---- { P_CHAR pChar = ri.GetData(); ! if ( pChar && !pChar->free && pChar != m_npc && !pChar->isInvulnerable() && !pChar->isHidden() && !pChar->isInvisible() && !pChar->isDead() ) { ! // If its a NPC... special handling ! P_NPC pNpc = dynamic_cast<P_NPC>(pChar); ! ! // NPCs owned by innocent players aren't attacked ! if (pNpc) { ! if (pNpc->isTamed() && pNpc->owner()) { ! if (pNpc->owner()->isInnocent()) { ! continue; ! } ! } else { ! // Check for the AI, guards only attack other npcs if they ! // are monsters. ! Monster_Aggressive *npcai = dynamic_cast<Monster_Aggressive*>(pNpc->ai()); ! if (!npcai) { ! continue; ! } ! } ! } else { ! // Innocent players aren't attacked ! P_PLAYER pPlayer = dynamic_cast<P_PLAYER>( pChar ); ! if ( pPlayer && (pPlayer->isInnocent() || pPlayer->isGMorCounselor()) ) ! continue; ! } m_currentVictim = pChar; *************** *** 454,461 **** return; if ( Config::instance()->pathfind4Combat() ) ! movePath( pTarget->pos() ); else ! moveTo( pTarget->pos() ); } --- 474,484 ---- return; + // Guards always run + bool run = true; + if ( Config::instance()->pathfind4Combat() ) ! movePath( pTarget->pos(), run ); else ! moveTo( pTarget->pos(), run ); } Index: ai.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ai.h 25 Sep 2004 22:57:09 -0000 1.16 --- ai.h 3 Oct 2004 13:51:40 -0000 1.17 *************** *** 128,131 **** --- 128,135 ---- virtual QString name() = 0; + AbstractAction *currentAction() { + return m_currentAction; + } + P_NPC npc() const { *************** *** 191,196 **** protected: ! bool moveTo( const Coord_cl& pos ); ! bool movePath( const Coord_cl& pos ); int waitForPathCalculation; }; --- 195,200 ---- protected: ! bool moveTo( const Coord_cl& pos, bool run = false ); ! bool movePath( const Coord_cl& pos, bool run = false ); int waitForPathCalculation; }; *************** *** 542,545 **** --- 546,550 ---- m_actions.append( new Action_Defend( npc, this ) ); m_actions.append( new Animal_Wild_Flee( npc, this ) ); + m_actions.append( new Monster_Aggr_MoveToTarget( npc, this ) ); } Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ai.cpp 2 Oct 2004 22:28:21 -0000 1.35 --- ai.cpp 3 Oct 2004 13:51:40 -0000 1.36 *************** *** 647,651 **** } ! bool Action_Wander::moveTo( const Coord_cl& pos ) { // simply move towards the target --- 647,651 ---- } ! bool Action_Wander::moveTo( const Coord_cl& pos, bool run ) { // simply move towards the target *************** *** 681,691 **** // call Movement once more. if (m_npc->direction() != dir) { ! Movement::instance()->Walking( m_npc, dir, 0xFF ); } ! return Movement::instance()->Walking( m_npc, dir, 0xFF ); } ! bool Action_Wander::movePath( const Coord_cl& pos ) { if ( waitForPathCalculation <= 0 && !m_npc->hasPath() ) --- 681,699 ---- // call Movement once more. if (m_npc->direction() != dir) { ! if (run) { ! Movement::instance()->Walking( m_npc, dir|0x80, 0xFF ); ! } else { ! Movement::instance()->Walking( m_npc, dir, 0xFF ); ! } } ! if (run) { ! return Movement::instance()->Walking( m_npc, dir|0x80, 0xFF ); ! } else { ! return Movement::instance()->Walking( m_npc, dir, 0xFF ); ! } } ! bool Action_Wander::movePath( const Coord_cl& pos, bool run ) { if ( waitForPathCalculation <= 0 && !m_npc->hasPath() ) *************** *** 709,713 **** { waitForPathCalculation--; ! return moveTo( pos ); } --- 717,721 ---- { waitForPathCalculation--; ! return moveTo( pos, run ); } *************** *** 720,727 **** // Make sure we face the direction... if (m_npc->direction() != dir) { ! Movement::instance()->Walking( m_npc, dir, 0xFF ); } ! bool result = Movement::instance()->Walking( m_npc, dir, 0xFF ); m_npc->popMove(); return result; --- 728,744 ---- // Make sure we face the direction... if (m_npc->direction() != dir) { ! if (run) { ! Movement::instance()->Walking( m_npc, dir|0x80, 0xFF ); ! } else { ! Movement::instance()->Walking( m_npc, dir, 0xFF ); ! } } ! bool result; ! if (run) { ! result = Movement::instance()->Walking( m_npc, dir|0x80, 0xFF ); ! } else { ! result = Movement::instance()->Walking( m_npc, dir, 0xFF ); ! } m_npc->popMove(); return result; *************** *** 730,734 **** { waitForPathCalculation = 3; ! return moveTo( pos ); } } --- 747,751 ---- { waitForPathCalculation = 3; ! return moveTo( pos, run ); } } *************** *** 789,795 **** return 0.0f; - if ( m_npc->hitpoints() < m_npc->criticalHealth() ) - return 0.0f; - pFleeFromSer = pAttacker->serial(); --- 806,809 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-03 13:52:16
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29184 Modified Files: ChangeLog npc.cpp timing.cpp walking.cpp Log Message: Guards now run towards their targets. Fixed bug #0000345. Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** ChangeLog 2 Oct 2004 22:15:49 -0000 1.93 --- ChangeLog 3 Oct 2004 13:51:39 -0000 1.94 *************** *** 25,28 **** --- 25,30 ---- Because of that the format changed, please hop on irc and ask for details if you want to convert your scripts. + - Guards now run towards their targets. + - Fixed bug #0000345. Wolfpack 12.9.11 Beta (26. September 2004) Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** walking.cpp 1 Oct 2004 16:32:53 -0000 1.152 --- walking.cpp 3 Oct 2004 13:51:39 -0000 1.153 *************** *** 877,880 **** --- 877,882 ---- return false; + int oldz = pos.z; + // Go trough the array top-to-bottom and check // If we find a tile to walk on *************** *** 922,925 **** --- 924,959 ---- return false; + // Another loop *IS* needed here (at least that's what i think) + for ( i = 0; i < blockList.size(); ++i ) + { + // So we know about the new Z position we are moving to + // Lets check if there is enough space ABOVE that position (at least 15 z units) + // If there is ANY impassable object between pos.z and pos.z + 15 we can't walk here + stBlockItem item = blockList[i]; + Q_INT8 itemTop = ( item.z + item.height ); + + // If the item is below what we step on, ignore it + if (itemTop <= pos.z) { + continue; + } + + // Does the top of the item looms into our space + // Like before 15 is the assumed height of ourself + // Use the new position here. + if ( ( itemTop > pos.z ) && ( itemTop < pos.z + P_M_MAX_Z_BLOCKS ) ) + return false; + + // Or the bottom ? + // note: the following test was commented out. by putting the code back in, + // npcs stop wandering through the walls of multis. I am curious if this code + // has other (negative) affects besides that. + if ( ( item.z > oldz ) && ( item.z < oldz + P_M_MAX_Z_BLOCKS / 2 ) ) + return false; + + // Or does it spread the whole range ? + if ( ( item.z <= oldz ) && ( itemTop >= oldz + P_M_MAX_Z_BLOCKS / 2 ) ) + return false; + } + return true; } Index: timing.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** timing.cpp 18 Sep 2004 21:10:40 -0000 1.15 --- timing.cpp 3 Oct 2004 13:51:39 -0000 1.16 *************** *** 452,458 **** { startProfiling(PF_AICHECK); - unsigned int delay = RandomNum(250, 750); - npc->setAICheckTime( time + delay ); npc->ai()->check(); stopProfiling(PF_AICHECK); } --- 452,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); } Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** npc.cpp 2 Oct 2004 22:15:50 -0000 1.118 --- npc.cpp 3 Oct 2004 13:51:39 -0000 1.119 *************** *** 230,234 **** bool cNPC::isInnocent() { ! return notoriety() == 1; } --- 230,235 ---- bool cNPC::isInnocent() { ! unsigned char notoriety = this->notoriety(); ! return notoriety >= 4 && notoriety <= 6; } *************** *** 271,274 **** --- 272,285 ---- } + // If we are moving to a targert, run! + if (ai_ && ai_->currentAction()) { + Human_Guard_MoveToTarget *moveToTargetG = dynamic_cast<Human_Guard_MoveToTarget*>(ai_->currentAction()); + Monster_Aggr_MoveToTarget *moveToTargetM = dynamic_cast<Monster_Aggr_MoveToTarget*>(ai_->currentAction()); + + if (moveToTargetG || moveToTargetM) { + interval = 250; + } + } + setNextMoveTime( Server::instance()->time() + interval ); } |
|
From: Sebastian H. <dar...@us...> - 2004-10-03 12:59:28
|
Update of /cvsroot/wpdev/xmlscripts/definitions/teleports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18345/teleports Modified Files: tokuno.xml Log Message: fix Index: tokuno.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/tokuno.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tokuno.xml 27 Sep 2004 14:14:58 -0000 1.1 --- tokuno.xml 3 Oct 2004 12:59:03 -0000 1.2 *************** *** 12,20 **** <definitions> - <region name="tokuno_teleports"> - <!-- The World --> - <!--<rectangle x1="1" y1="1" x2="2560" y2="2048" map="4" />--> - <!-- Teleports --> - </region> - </definitions> --- 12,14 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 23:27:01
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24978/items Modified Files: unsorted.xml Log Message: Missing items Index: unsorted.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/unsorted.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** unsorted.xml 2 Oct 2004 22:33:06 -0000 1.9 --- unsorted.xml 2 Oct 2004 23:25:38 -0000 1.10 *************** *** 1 **** ! <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: olafk | | ( ( ;._ \\ ctr | Last Modification: item names added | ================================================================= | Stuff not yet Sorted | ================================================================= --> <definitions> <!-- Lava --> <item id="12f0"> <id>0x12f0</id> <nodecay /> </item> <!-- Third Dawn Weapons --> <!-- daemon sword --> <item id="2554"> <id>0x2554</id> </item> <!-- ettin hammer --> <item id="2555"> <id>0x2555</id> </item> <!-- liche's staff --> <item id="2556"> <id>0x2556</id> </item> <!-- lizardman's mace --> <item id="2557"> <id>0x2557</id> </item> <!-- lizardman's spea --> <item id="2558"> <id>0x2558</id> </item> <!-- ogre's club --> <item id="2559"> <id>0x2559</id> </item> <!-- ophidian staff --> <item id="255a"> <id>0x255a</id> </item> <!-- ophidian bardich --> <item id="255b"> <id>0x255b</id> </item> <!-- orc club --> <item id="255c"> <id>0x255c</id> </item> <!-- ratman axe --> <item id="255d"> <id>0x255d</id> </item> <!-- ratman sword --> <item id="255e"> <id>0x255e</id> </item> <!-- skeleton axe --> <item id="255f"> <id>0x255f</id> </item> <!-- skeleton scimita --> <item id="2560"> <id>0x2560</id> </item> <!-- terathan staff --> <item id="2561"> <id>0x2561</id> </item> <!-- terathan spear --> <item id="2562"> <id>0x2562</id> </item> <!-- terathan mace --> <item id="2563"> <id>0x2563</id> </item> <!-- troll axe --> <item id="2564"> <id>0x2564</id> </item> <!-- troll maul --> <item id="2565"> <id>0x2565</id> </item> <!-- frost troll club --> <item id="2566"> <id>0x2566</id> </item> <!-- orc lord battleaxe --> <item id="2567"> <id>0x2567</id> </item> <!-- orc mage staff --> <item id="2568"> <id>0x2568</id> </item> <!-- bone mage staff --> <item id="2569"> <id>0x2569</id> </item> <!-- magic staff --> <item id="256b"> <id>0x256b</id> </item> <!-- magic staff --> <item id="256c"> <id>0x256c</id> </item> <!-- magic staff --> <item id="256d"> <id>0x256d</id> </item> <!-- magic staff --> <item id="256e"> <id>0x256e</id> </item> <!-- smyth hammer --> <item id="256f"> <id>0x256f</id> </item> <!-- hatchet --> <item id="2570"> <id>0x2570</id> </item> <!-- horseman's bow --> <item id="2571"> <id>0x2571</id> </item> <!-- javelin --> <item id="2572"> <id>0x2572</id> </item> <!-- magic sword --> <item id="2573"> <id>0x2573</id> </item> <!-- magic sword --> <item id="2574"> <id>0x2574</id> </item> <!-- magic sword --> <item id="2575"> <id>0x2575</id> </item> <!-- magic sword --> <item id="2576"> <id>0x2576</id> </item> <!-- naginata --> <item id="2577"> <id>0x2577</id> </item> <!-- no-dachi --> <item id="2578"> <id>0x2578</id> </item> <!-- pick --> <item id="2579"> <id>0x2579</id> </item> <!-- spear --> <item id="257a"> <id>0x257a</id> </item> <!-- spear --> <item id="257b"> <id>0x257b</id> </item> <!-- sword --> <item id="257c"> <id>0x257c</id> </item> <!-- longsword --> <item id="257d"> <id>0x257d</id> </item> <!-- shortsword --> <item id="257e"> <id>0x257e</id> </item> <!-- war mace --> <item id="257f"> <id>0x257f</id> </item> <!-- Third Dawn Clothes & Armor --> <!-- spiked shorts --> <item id="25e4"> <id>0x25e4</id> </item> <!-- spiked shorts --> <item id="25e5"> <id>0x25e5</id> </item> <!-- amazon harness --> <item id="25e6"> <id>0x25e6</id> </item> <!-- amazon harness --> <item id="25e7"> <id>0x25e7</id> </item> <!-- elite harness --> <item id="25e8"> <id>0x25e8</id> </item> <!-- elite harness --> <item id="25e9"> <id>0x25e9</id> </item> <!-- checkered shirt --> <item id="25ea"> <id>0x25ea</id> </item> <!-- checkered shirt --> <item id="25eb"> <id>0x25eb</id> </item> <!-- robe --> <item id="25ec"> <id>0x25ec</id> </item> <!-- robe --> <item id="25ed"> <id>0x25ed</id> </item> <!-- robe --> <item id="25ee"> <id>0x25ee</id> </item> <!-- robe --> <item id="25ef"> <id>0x25ef</id> </item> <!-- death shroud --> <item id="25f0"> <id>0x25f0</id> </item> <!-- death shroud --> <item id="25f1"> <id>0x25f1</id> </item> <!-- knee skirt --> <item id="25f2"> <id>0x25f2</id> </item> <!-- knee skirt --> <item id="25f3"> <id>0x25f3</id> </item> <!-- jester pants --> <item id="2649"> <id>0x2649</id> </item> <!-- jester pants --> <item id="264a"> <id>0x264a</id> </item> <!-- plate gorget --> <item id="264b"> <id>0x264b</id> </item> <!-- plate gorget --> <item id="264c"> <id>0x264c</id> </item> <!-- haidate --> <item id="264d"> <id>0x264d</id> </item> <!-- haidate --> <item id="264e"> <id>0x264e</id> </item> <!-- kobakama --> <item id="264f"> <id>0x264f</id> </item> <!-- kobakama --> <item id="2650"> <id>0x2650</id> </item> <!-- ninja pants --> <item id="2651"> <id>0x2651</id> </item> <!-- ninja pants --> <item id="2652"> <id>0x2652</id> </item> <!-- waraji --> <item id="2653"> <id>0x2653</id> </item> <!-- waraji --> <item id="2654"> <id>0x2654</id> </item> <!-- jester shoes --> <item id="2655"> <id>0x2655</id> </item> <!-- jester shoes --> <item id="2656"> <id>0x2656</id> </item> <!-- amazon armor --> <item id="2659"> <id>0x2659</id> </item> <!-- amazon armor --> <item id="265a"> <id>0x265a</id> </item> <!-- amazon armor --> <item id="265b"> <id>0x265b</id> </item> <!-- amazon armor --> <item id="265c"> <id>0x265c</id> </item> <!-- amazon armor --> <item id="265d"> <id>0x265d</id> </item> <!-- amazon armor --> <item id="265e"> <id>0x265e</id> </item> <!-- shirt --> <item id="265f"> <id>0x265f</id> </item> <!-- shirt --> <item id="2660"> <id>0x2660</id> </item> <!-- shirt --> <item id="2661"> <id>0x2661</id> </item> <!-- shirt --> <item id="2662"> <id>0x2662</id> </item> <!-- shirt --> <item id="2663"> <id>0x2663</id> </item> <!-- shirt --> <item id="2664"> <id>0x2664</id> </item> <!-- shirt --> <item id="2665"> <id>0x2665</id> </item> <!-- shirt --> <item id="2666"> <id>0x2666</id> </item> <!-- ninja shirt --> <item id="2667"> <id>0x2667</id> </item> <!-- ninja shirt --> <item id="2668"> <id>0x2668</id> </item> <!-- kote sleeves --> <item id="266b"> <id>0x266b</id> </item> <!-- kote sleeves --> <item id="266c"> <id>0x266c</id> </item> <!-- kote sleeves --> <item id="266d"> <id>0x266d</id> </item> <!-- kote sleeves --> <item id="266e"> <id>0x266e</id> </item> <!-- do-maru --> <item id="2671"> <id>0x2671</id> </item> <!-- do-maru --> <item id="2672"> <id>0x2672</id> </item> <!-- haramaki-do --> <item id="2673"> <id>0x2673</id> </item> <!-- haramaki-do --> <item id="2674"> <id>0x2674</id> </item> <!-- kote gloves --> <item id="2677"> <id>0x2677</id> </item> <!-- kote gloves --> <item id="2678"> <id>0x2678</id> </item> <!-- kote gloves --> <item id="2679"> <id>0x2679</id> </item> <!-- kote gloves --> <item id="267a"> <id>0x267a</id> </item> <!-- fancy dress --> <item id="267b"> <id>0x267b</id> </item> <!-- fancy dress --> <item id="267c"> <id>0x267c</id> </item> <!-- fancy dress --> <item id="267d"> <id>0x267d</id> </item> <!-- fancy dress --> <item id="267e"> <id>0x267e</id> </item> <!-- long dress --> <item id="267f"> <id>0x267f</id> </item> <!-- long dress --> <item id="2680"> <id>0x2680</id> </item> <!-- kimono --> <item id="2681"> <id>0x2681</id> </item> <!-- kimono --> <item id="2682"> <id>0x2682</id> </item> <!-- hooded shroud --> <item id="2683"> <id>0x2683</id> </item> <!-- hooded shroud --> <item id="2684"> <id>0x2684</id> </item> <!-- death shroud --> <item id="2685"> <id>0x2685</id> </item> <!-- death shroud --> <item id="2686"> <id>0x2686</id> </item> <!-- winged helmet --> <item id="2689"> <id>0x2689</id> </item> <!-- winged helmet --> <item id="268a"> <id>0x268a</id> </item> <!-- hachimaki --> <item id="268b"> <id>0x268b</id> </item> <!-- hachimaki --> <item id="268c"> <id>0x268c</id> </item> <!-- kabuto --> <item id="268d"> <id>0x268d</id> </item> <!-- kabuto --> <item id="268e"> <id>0x268e</id> </item> <!-- kabuto mempo --> <item id="268f"> <id>0x268f</id> </item> <!-- kabuto mempo --> <item id="2690"> <id>0x2690</id> </item> <!-- leather cap --> <item id="2691"> <id>0x2691</id> </item> <!-- leather cap --> <item id="2692"> <id>0x2692</id> </item> <!-- robin hood cap --> <item id="269d"> <id>0x269d</id> </item> <!-- robin hood cap --> <item id="269e"> <id>0x269e</id> </item> <!-- feathered mask --> <item id="26a1"> <id>0x26a1</id> </item> <!-- feathered mask --> <item id="26a2"> <id>0x26a2</id> </item> <!-- ninja mask --> <item id="26a3"> <id>0x26a3</id> </item> <!-- ninja mask --> <item id="26a4"> <id>0x26a4</id> </item> <!-- bolas --> <item id="26ac"> <id>0x26ac</id> </item> <!-- Arcane Cloak --> <item id="26ad"> <id>0x26ad</id> </item> <!-- Arcane Cloak --> <item id="26ae"> <id>0x26ae</id> </item> <!-- Arcane Thigh Boots --> <item id="26af"> <id>0x26af</id> </item> <!-- Arcane Gloves --> <item id="26b0"> <id>0x26b0</id> </item> </definitions> \ No newline at end of file --- 1 ---- ! <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: olafk | | ( ( ;._ \\ ctr | Last Modification: item names added | ================================================================= | Stuff not yet Sorted | ================================================================= --> <definitions> <!-- Lava --> <item id="12f0"> <id>0x12f0</id> <nodecay /> </item> <!-- Lava --> <item id="1321"> <id>0x1321</id> <nodecay /> </item> <item id="131b"> <id>0x131b</id> <nodecay /> </item> <!-- Third Dawn Weapons --> <!-- daemon sword --> <item id="2554"> <id>0x2554</id> </item> <!-- ettin hammer --> <item id="2555"> <id>0x2555</id> </item> <!-- liche's staff --> <item id="2556"> <id>0x2556</id> </item> <!-- lizardman's mace --> <item id="2557"> <id>0x2557</id> </item> <!-- lizardman's spea --> <item id="2558"> <id>0x2558</id> </item> <!-- ogre's club --> <item id="2559"> <id>0x2559</id> </item> <!-- ophidian staff --> <item id="255a"> <id>0x255a</id> </item> <!-- ophidian bardich --> <item id="255b"> <id>0x255b</id> </item> <!-- orc club --> <item id="255c"> <id>0x255c</id> </item> <!-- ratman axe --> <item id="255d"> <id>0x255d</id> </item> <!-- ratman sword --> <item id="255e"> <id>0x255e</id> </item> <!-- skeleton axe --> <item id="255f"> <id>0x255f</id> </item> <!-- skeleton scimita --> <item id="2560"> <id>0x2560</id> </item> <!-- terathan staff --> <item id="2561"> <id>0x2561</id> </item> <!-- terathan spear --> <item id="2562"> <id>0x2562</id> </item> <!-- terathan mace --> <item id="2563"> <id>0x2563</id> </item> <!-- troll axe --> <item id="2564"> <id>0x2564</id> </item> <!-- troll maul --> <item id="2565"> <id>0x2565</id> </item> <!-- frost troll club --> <item id="2566"> <id>0x2566</id> </item> <!-- orc lord battleaxe --> <item id="2567"> <id>0x2567</id> </item> <!-- orc mage staff --> <item id="2568"> <id>0x2568</id> </item> <!-- bone mage staff --> <item id="2569"> <id>0x2569</id> </item> <!-- magic staff --> <item id="256b"> <id>0x256b</id> </item> <!-- magic staff --> <item id="256c"> <id>0x256c</id> </item> <!-- magic staff --> <item id="256d"> <id>0x256d</id> </item> <!-- magic staff --> <item id="256e"> <id>0x256e</id> </item> <!-- smyth hammer --> <item id="256f"> <id>0x256f</id> </item> <!-- hatchet --> <item id="2570"> <id>0x2570</id> </item> <!-- horseman's bow --> <item id="2571"> <id>0x2571</id> </item> <!-- javelin --> <item id="2572"> <id>0x2572</id> </item> <!-- magic sword --> <item id="2573"> <id>0x2573</id> </item> <!-- magic sword --> <item id="2574"> <id>0x2574</id> </item> <!-- magic sword --> <item id="2575"> <id>0x2575</id> </item> <!-- magic sword --> <item id="2576"> <id>0x2576</id> </item> <!-- naginata --> <item id="2577"> <id>0x2577</id> </item> <!-- no-dachi --> <item id="2578"> <id>0x2578</id> </item> <!-- pick --> <item id="2579"> <id>0x2579</id> </item> <!-- spear --> <item id="257a"> <id>0x257a</id> </item> <!-- spear --> <item id="257b"> <id>0x257b</id> </item> <!-- sword --> <item id="257c"> <id>0x257c</id> </item> <!-- longsword --> <item id="257d"> <id>0x257d</id> </item> <!-- shortsword --> <item id="257e"> <id>0x257e</id> </item> <!-- war mace --> <item id="257f"> <id>0x257f</id> </item> <!-- Third Dawn Clothes & Armor --> <!-- spiked shorts --> <item id="25e4"> <id>0x25e4</id> </item> <!-- spiked shorts --> <item id="25e5"> <id>0x25e5</id> </item> <!-- amazon harness --> <item id="25e6"> <id>0x25e6</id> </item> <!-- amazon harness --> <item id="25e7"> <id>0x25e7</id> </item> <!-- elite harness --> <item id="25e8"> <id>0x25e8</id> </item> <!-- elite harness --> <item id="25e9"> <id>0x25e9</id> </item> <!-- checkered shirt --> <item id="25ea"> <id>0x25ea</id> </item> <!-- checkered shirt --> <item id="25eb"> <id>0x25eb</id> </item> <!-- robe --> <item id="25ec"> <id>0x25ec</id> </item> <!-- robe --> <item id="25ed"> <id>0x25ed</id> </item> <!-- robe --> <item id="25ee"> <id>0x25ee</id> </item> <!-- robe --> <item id="25ef"> <id>0x25ef</id> </item> <!-- death shroud --> <item id="25f0"> <id>0x25f0</id> </item> <!-- death shroud --> <item id="25f1"> <id>0x25f1</id> </item> <!-- knee skirt --> <item id="25f2"> <id>0x25f2</id> </item> <!-- knee skirt --> <item id="25f3"> <id>0x25f3</id> </item> <!-- jester pants --> <item id="2649"> <id>0x2649</id> </item> <!-- jester pants --> <item id="264a"> <id>0x264a</id> </item> <!-- plate gorget --> <item id="264b"> <id>0x264b</id> </item> <!-- plate gorget --> <item id="264c"> <id>0x264c</id> </item> <!-- haidate --> <item id="264d"> <id>0x264d</id> </item> <!-- haidate --> <item id="264e"> <id>0x264e</id> </item> <!-- kobakama --> <item id="264f"> <id>0x264f</id> </item> <!-- kobakama --> <item id="2650"> <id>0x2650</id> </item> <!-- ninja pants --> <item id="2651"> <id>0x2651</id> </item> <!-- ninja pants --> <item id="2652"> <id>0x2652</id> </item> <!-- waraji --> <item id="2653"> <id>0x2653</id> </item> <!-- waraji --> <item id="2654"> <id>0x2654</id> </item> <!-- jester shoes --> <item id="2655"> <id>0x2655</id> </item> <!-- jester shoes --> <item id="2656"> <id>0x2656</id> </item> <!-- amazon armor --> <item id="2659"> <id>0x2659</id> </item> <!-- amazon armor --> <item id="265a"> <id>0x265a</id> </item> <!-- amazon armor --> <item id="265b"> <id>0x265b</id> </item> <!-- amazon armor --> <item id="265c"> <id>0x265c</id> </item> <!-- amazon armor --> <item id="265d"> <id>0x265d</id> </item> <!-- amazon armor --> <item id="265e"> <id>0x265e</id> </item> <!-- shirt --> <item id="265f"> <id>0x265f</id> </item> <!-- shirt --> <item id="2660"> <id>0x2660</id> </item> <!-- shirt --> <item id="2661"> <id>0x2661</id> </item> <!-- shirt --> <item id="2662"> <id>0x2662</id> </item> <!-- shirt --> <item id="2663"> <id>0x2663</id> </item> <!-- shirt --> <item id="2664"> <id>0x2664</id> </item> <!-- shirt --> <item id="2665"> <id>0x2665</id> </item> <!-- shirt --> <item id="2666"> <id>0x2666</id> </item> <!-- ninja shirt --> <item id="2667"> <id>0x2667</id> </item> <!-- ninja shirt --> <item id="2668"> <id>0x2668</id> </item> <!-- kote sleeves --> <item id="266b"> <id>0x266b</id> </item> <!-- kote sleeves --> <item id="266c"> <id>0x266c</id> </item> <!-- kote sleeves --> <item id="266d"> <id>0x266d</id> </item> <!-- kote sleeves --> <item id="266e"> <id>0x266e</id> </item> <!-- do-maru --> <item id="2671"> <id>0x2671</id> </item> <!-- do-maru --> <item id="2672"> <id>0x2672</id> </item> <!-- haramaki-do --> <item id="2673"> <id>0x2673</id> </item> <!-- haramaki-do --> <item id="2674"> <id>0x2674</id> </item> <!-- kote gloves --> <item id="2677"> <id>0x2677</id> </item> <!-- kote gloves --> <item id="2678"> <id>0x2678</id> </item> <!-- kote gloves --> <item id="2679"> <id>0x2679</id> </item> <!-- kote gloves --> <item id="267a"> <id>0x267a</id> </item> <!-- fancy dress --> <item id="267b"> <id>0x267b</id> </item> <!-- fancy dress --> <item id="267c"> <id>0x267c</id> </item> <!-- fancy dress --> <item id="267d"> <id>0x267d</id> </item> <!-- fancy dress --> <item id="267e"> <id>0x267e</id> </item> <!-- long dress --> <item id="267f"> <id>0x267f</id> </item> <!-- long dress --> <item id="2680"> <id>0x2680</id> </item> <!-- kimono --> <item id="2681"> <id>0x2681</id> </item> <!-- kimono --> <item id="2682"> <id>0x2682</id> </item> <!-- hooded shroud --> <item id="2683"> <id>0x2683</id> </item> <!-- hooded shroud --> <item id="2684"> <id>0x2684</id> </item> <!-- death shroud --> <item id="2685"> <id>0x2685</id> </item> <!-- death shroud --> <item id="2686"> <id>0x2686</id> </item> <!-- winged helmet --> <item id="2689"> <id>0x2689</id> </item> <!-- winged helmet --> <item id="268a"> <id>0x268a</id> </item> <!-- hachimaki --> <item id="268b"> <id>0x268b</id> </item> <!-- hachimaki --> <item id="268c"> <id>0x268c</id> </item> <!-- kabuto --> <item id="268d"> <id>0x268d</id> </item> <!-- kabuto --> <item id="268e"> <id>0x268e</id> </item> <!-- kabuto mempo --> <item id="268f"> <id>0x268f</id> </item> <!-- kabuto mempo --> <item id="2690"> <id>0x2690</id> </item> <!-- leather cap --> <item id="2691"> <id>0x2691</id> </item> <!-- leather cap --> <item id="2692"> <id>0x2692</id> </item> <!-- robin hood cap --> <item id="269d"> <id>0x269d</id> </item> <!-- robin hood cap --> <item id="269e"> <id>0x269e</id> </item> <!-- feathered mask --> <item id="26a1"> <id>0x26a1</id> </item> <!-- feathered mask --> <item id="26a2"> <id>0x26a2</id> </item> <!-- ninja mask --> <item id="26a3"> <id>0x26a3</id> </item> <!-- ninja mask --> <item id="26a4"> <id>0x26a4</id> </item> <!-- bolas --> <item id="26ac"> <id>0x26ac</id> </item> <!-- Arcane Cloak --> <item id="26ad"> <id>0x26ad</id> </item> <!-- Arcane Cloak --> <item id="26ae"> <id>0x26ae</id> </item> <!-- Arcane Thigh Boots --> <item id="26af"> <id>0x26af</id> </item> <!-- Arcane Gloves --> <item id="26b0"> <id>0x26b0</id> </item> </definitions> \ No newline at end of file |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 23:26:59
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24978/items/buildings Modified Files: windows.xml Log Message: Missing items Index: windows.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/windows.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** windows.xml 15 Jul 2004 21:18:13 -0000 1.2 --- windows.xml 2 Oct 2004 23:25:37 -0000 1.3 *************** *** 84,88 **** <category>Buildings\Walls\Stone Wall 3\Window 3</category> <nodecay/> ! <lightsource>0</lightsource> </item> --- 84,88 ---- <category>Buildings\Walls\Stone Wall 3\Window 3</category> <nodecay/> ! <lightsource>0x1c</lightsource> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 22:34:21
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11952/items Modified Files: unsorted.xml Log Message: item fix Index: unsorted.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/unsorted.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** unsorted.xml 18 Mar 2004 01:24:15 -0000 1.8 --- unsorted.xml 2 Oct 2004 22:33:06 -0000 1.9 *************** *** 1 **** ! <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: olafk | | ( ( ;._ \\ ctr | Last Modification: item names added | ================================================================= | Stuff not yet Sorted | ================================================================= --> <definitions> <!-- Third Dawn Weapons --> <!-- daemon sword --> <item id="2554"> <id>0x2554</id> </item> <!-- ettin hammer --> <item id="2555"> <id>0x2555</id> </item> <!-- liche's staff --> <item id="2556"> <id>0x2556</id> </item> <!-- lizardman's mace --> <item id="2557"> <id>0x2557</id> </item> <!-- lizardman's spea --> <item id="2558"> <id>0x2558</id> </item> <!-- ogre's club --> <item id="2559"> <id>0x2559</id> </item> <!-- ophidian staff --> <item id="255a"> <id>0x255a</id> </item> <!-- ophidian bardich --> <item id="255b"> <id>0x255b</id> </item> <!-- orc club --> <item id="255c"> <id>0x255c</id> </item> <!-- ratman axe --> <item id="255d"> <id>0x255d</id> </item> <!-- ratman sword --> <item id="255e"> <id>0x255e</id> </item> <!-- skeleton axe --> <item id="255f"> <id>0x255f</id> </item> <!-- skeleton scimita --> <item id="2560"> <id>0x2560</id> </item> <!-- terathan staff --> <item id="2561"> <id>0x2561</id> </item> <!-- terathan spear --> <item id="2562"> <id>0x2562</id> </item> <!-- terathan mace --> <item id="2563"> <id>0x2563</id> </item> <!-- troll axe --> <item id="2564"> <id>0x2564</id> </item> <!-- troll maul --> <item id="2565"> <id>0x2565</id> </item> <!-- frost troll club --> <item id="2566"> <id>0x2566</id> </item> <!-- orc lord battleaxe --> <item id="2567"> <id>0x2567</id> </item> <!-- orc mage staff --> <item id="2568"> <id>0x2568</id> </item> <!-- bone mage staff --> <item id="2569"> <id>0x2569</id> </item> <!-- magic staff --> <item id="256b"> <id>0x256b</id> </item> <!-- magic staff --> <item id="256c"> <id>0x256c</id> </item> <!-- magic staff --> <item id="256d"> <id>0x256d</id> </item> <!-- magic staff --> <item id="256e"> <id>0x256e</id> </item> <!-- smyth hammer --> <item id="256f"> <id>0x256f</id> </item> <!-- hatchet --> <item id="2570"> <id>0x2570</id> </item> <!-- horseman's bow --> <item id="2571"> <id>0x2571</id> </item> <!-- javelin --> <item id="2572"> <id>0x2572</id> </item> <!-- magic sword --> <item id="2573"> <id>0x2573</id> </item> <!-- magic sword --> <item id="2574"> <id>0x2574</id> </item> <!-- magic sword --> <item id="2575"> <id>0x2575</id> </item> <!-- magic sword --> <item id="2576"> <id>0x2576</id> </item> <!-- naginata --> <item id="2577"> <id>0x2577</id> </item> <!-- no-dachi --> <item id="2578"> <id>0x2578</id> </item> <!-- pick --> <item id="2579"> <id>0x2579</id> </item> <!-- spear --> <item id="257a"> <id>0x257a</id> </item> <!-- spear --> <item id="257b"> <id>0x257b</id> </item> <!-- sword --> <item id="257c"> <id>0x257c</id> </item> <!-- longsword --> <item id="257d"> <id>0x257d</id> </item> <!-- shortsword --> <item id="257e"> <id>0x257e</id> </item> <!-- war mace --> <item id="257f"> <id>0x257f</id> </item> <!-- Third Dawn Clothes & Armor --> <!-- spiked shorts --> <item id="25e4"> <id>0x25e4</id> </item> <!-- spiked shorts --> <item id="25e5"> <id>0x25e5</id> </item> <!-- amazon harness --> <item id="25e6"> <id>0x25e6</id> </item> <!-- amazon harness --> <item id="25e7"> <id>0x25e7</id> </item> <!-- elite harness --> <item id="25e8"> <id>0x25e8</id> </item> <!-- elite harness --> <item id="25e9"> <id>0x25e9</id> </item> <!-- checkered shirt --> <item id="25ea"> <id>0x25ea</id> </item> <!-- checkered shirt --> <item id="25eb"> <id>0x25eb</id> </item> <!-- robe --> <item id="25ec"> <id>0x25ec</id> </item> <!-- robe --> <item id="25ed"> <id>0x25ed</id> </item> <!-- robe --> <item id="25ee"> <id>0x25ee</id> </item> <!-- robe --> <item id="25ef"> <id>0x25ef</id> </item> <!-- death shroud --> <item id="25f0"> <id>0x25f0</id> </item> <!-- death shroud --> <item id="25f1"> <id>0x25f1</id> </item> <!-- knee skirt --> <item id="25f2"> <id>0x25f2</id> </item> <!-- knee skirt --> <item id="25f3"> <id>0x25f3</id> </item> <!-- jester pants --> <item id="2649"> <id>0x2649</id> </item> <!-- jester pants --> <item id="264a"> <id>0x264a</id> </item> <!-- plate gorget --> <item id="264b"> <id>0x264b</id> </item> <!-- plate gorget --> <item id="264c"> <id>0x264c</id> </item> <!-- haidate --> <item id="264d"> <id>0x264d</id> </item> <!-- haidate --> <item id="264e"> <id>0x264e</id> </item> <!-- kobakama --> <item id="264f"> <id>0x264f</id> </item> <!-- kobakama --> <item id="2650"> <id>0x2650</id> </item> <!-- ninja pants --> <item id="2651"> <id>0x2651</id> </item> <!-- ninja pants --> <item id="2652"> <id>0x2652</id> </item> <!-- waraji --> <item id="2653"> <id>0x2653</id> </item> <!-- waraji --> <item id="2654"> <id>0x2654</id> </item> <!-- jester shoes --> <item id="2655"> <id>0x2655</id> </item> <!-- jester shoes --> <item id="2656"> <id>0x2656</id> </item> <!-- amazon armor --> <item id="2659"> <id>0x2659</id> </item> <!-- amazon armor --> <item id="265a"> <id>0x265a</id> </item> <!-- amazon armor --> <item id="265b"> <id>0x265b</id> </item> <!-- amazon armor --> <item id="265c"> <id>0x265c</id> </item> <!-- amazon armor --> <item id="265d"> <id>0x265d</id> </item> <!-- amazon armor --> <item id="265e"> <id>0x265e</id> </item> <!-- shirt --> <item id="265f"> <id>0x265f</id> </item> <!-- shirt --> <item id="2660"> <id>0x2660</id> </item> <!-- shirt --> <item id="2661"> <id>0x2661</id> </item> <!-- shirt --> <item id="2662"> <id>0x2662</id> </item> <!-- shirt --> <item id="2663"> <id>0x2663</id> </item> <!-- shirt --> <item id="2664"> <id>0x2664</id> </item> <!-- shirt --> <item id="2665"> <id>0x2665</id> </item> <!-- shirt --> <item id="2666"> <id>0x2666</id> </item> <!-- ninja shirt --> <item id="2667"> <id>0x2667</id> </item> <!-- ninja shirt --> <item id="2668"> <id>0x2668</id> </item> <!-- kote sleeves --> <item id="266b"> <id>0x266b</id> </item> <!-- kote sleeves --> <item id="266c"> <id>0x266c</id> </item> <!-- kote sleeves --> <item id="266d"> <id>0x266d</id> </item> <!-- kote sleeves --> <item id="266e"> <id>0x266e</id> </item> <!-- do-maru --> <item id="2671"> <id>0x2671</id> </item> <!-- do-maru --> <item id="2672"> <id>0x2672</id> </item> <!-- haramaki-do --> <item id="2673"> <id>0x2673</id> </item> <!-- haramaki-do --> <item id="2674"> <id>0x2674</id> </item> <!-- kote gloves --> <item id="2677"> <id>0x2677</id> </item> <!-- kote gloves --> <item id="2678"> <id>0x2678</id> </item> <!-- kote gloves --> <item id="2679"> <id>0x2679</id> </item> <!-- kote gloves --> <item id="267a"> <id>0x267a</id> </item> <!-- fancy dress --> <item id="267b"> <id>0x267b</id> </item> <!-- fancy dress --> <item id="267c"> <id>0x267c</id> </item> <!-- fancy dress --> <item id="267d"> <id>0x267d</id> </item> <!-- fancy dress --> <item id="267e"> <id>0x267e</id> </item> <!-- long dress --> <item id="267f"> <id>0x267f</id> </item> <!-- long dress --> <item id="2680"> <id>0x2680</id> </item> <!-- kimono --> <item id="2681"> <id>0x2681</id> </item> <!-- kimono --> <item id="2682"> <id>0x2682</id> </item> <!-- hooded shroud --> <item id="2683"> <id>0x2683</id> </item> <!-- hooded shroud --> <item id="2684"> <id>0x2684</id> </item> <!-- death shroud --> <item id="2685"> <id>0x2685</id> </item> <!-- death shroud --> <item id="2686"> <id>0x2686</id> </item> <!-- winged helmet --> <item id="2689"> <id>0x2689</id> </item> <!-- winged helmet --> <item id="268a"> <id>0x268a</id> </item> <!-- hachimaki --> <item id="268b"> <id>0x268b</id> </item> <!-- hachimaki --> <item id="268c"> <id>0x268c</id> </item> <!-- kabuto --> <item id="268d"> <id>0x268d</id> </item> <!-- kabuto --> <item id="268e"> <id>0x268e</id> </item> <!-- kabuto mempo --> <item id="268f"> <id>0x268f</id> </item> <!-- kabuto mempo --> <item id="2690"> <id>0x2690</id> </item> <!-- leather cap --> <item id="2691"> <id>0x2691</id> </item> <!-- leather cap --> <item id="2692"> <id>0x2692</id> </item> <!-- robin hood cap --> <item id="269d"> <id>0x269d</id> </item> <!-- robin hood cap --> <item id="269e"> <id>0x269e</id> </item> <!-- feathered mask --> <item id="26a1"> <id>0x26a1</id> </item> <!-- feathered mask --> <item id="26a2"> <id>0x26a2</id> </item> <!-- ninja mask --> <item id="26a3"> <id>0x26a3</id> </item> <!-- ninja mask --> <item id="26a4"> <id>0x26a4</id> </item> <!-- bolas --> <item id="26ac"> <id>0x26ac</id> </item> <!-- Arcane Cloak --> <item id="26ad"> <id>0x26ad</id> </item> <!-- Arcane Cloak --> <item id="26ae"> <id>0x26ae</id> </item> <!-- Arcane Thigh Boots --> <item id="26af"> <id>0x26af</id> </item> <!-- Arcane Gloves --> <item id="26b0"> <id>0x26b0</id> </item> </definitions> \ No newline at end of file --- 1 ---- ! <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: olafk | | ( ( ;._ \\ ctr | Last Modification: item names added | ================================================================= | Stuff not yet Sorted | ================================================================= --> <definitions> <!-- Lava --> <item id="12f0"> <id>0x12f0</id> <nodecay /> </item> <!-- Third Dawn Weapons --> <!-- daemon sword --> <item id="2554"> <id>0x2554</id> </item> <!-- ettin hammer --> <item id="2555"> <id>0x2555</id> </item> <!-- liche's staff --> <item id="2556"> <id>0x2556</id> </item> <!-- lizardman's mace --> <item id="2557"> <id>0x2557</id> </item> <!-- lizardman's spea --> <item id="2558"> <id>0x2558</id> </item> <!-- ogre's club --> <item id="2559"> <id>0x2559</id> </item> <!-- ophidian staff --> <item id="255a"> <id>0x255a</id> </item> <!-- ophidian bardich --> <item id="255b"> <id>0x255b</id> </item> <!-- orc club --> <item id="255c"> <id>0x255c</id> </item> <!-- ratman axe --> <item id="255d"> <id>0x255d</id> </item> <!-- ratman sword --> <item id="255e"> <id>0x255e</id> </item> <!-- skeleton axe --> <item id="255f"> <id>0x255f</id> </item> <!-- skeleton scimita --> <item id="2560"> <id>0x2560</id> </item> <!-- terathan staff --> <item id="2561"> <id>0x2561</id> </item> <!-- terathan spear --> <item id="2562"> <id>0x2562</id> </item> <!-- terathan mace --> <item id="2563"> <id>0x2563</id> </item> <!-- troll axe --> <item id="2564"> <id>0x2564</id> </item> <!-- troll maul --> <item id="2565"> <id>0x2565</id> </item> <!-- frost troll club --> <item id="2566"> <id>0x2566</id> </item> <!-- orc lord battleaxe --> <item id="2567"> <id>0x2567</id> </item> <!-- orc mage staff --> <item id="2568"> <id>0x2568</id> </item> <!-- bone mage staff --> <item id="2569"> <id>0x2569</id> </item> <!-- magic staff --> <item id="256b"> <id>0x256b</id> </item> <!-- magic staff --> <item id="256c"> <id>0x256c</id> </item> <!-- magic staff --> <item id="256d"> <id>0x256d</id> </item> <!-- magic staff --> <item id="256e"> <id>0x256e</id> </item> <!-- smyth hammer --> <item id="256f"> <id>0x256f</id> </item> <!-- hatchet --> <item id="2570"> <id>0x2570</id> </item> <!-- horseman's bow --> <item id="2571"> <id>0x2571</id> </item> <!-- javelin --> <item id="2572"> <id>0x2572</id> </item> <!-- magic sword --> <item id="2573"> <id>0x2573</id> </item> <!-- magic sword --> <item id="2574"> <id>0x2574</id> </item> <!-- magic sword --> <item id="2575"> <id>0x2575</id> </item> <!-- magic sword --> <item id="2576"> <id>0x2576</id> </item> <!-- naginata --> <item id="2577"> <id>0x2577</id> </item> <!-- no-dachi --> <item id="2578"> <id>0x2578</id> </item> <!-- pick --> <item id="2579"> <id>0x2579</id> </item> <!-- spear --> <item id="257a"> <id>0x257a</id> </item> <!-- spear --> <item id="257b"> <id>0x257b</id> </item> <!-- sword --> <item id="257c"> <id>0x257c</id> </item> <!-- longsword --> <item id="257d"> <id>0x257d</id> </item> <!-- shortsword --> <item id="257e"> <id>0x257e</id> </item> <!-- war mace --> <item id="257f"> <id>0x257f</id> </item> <!-- Third Dawn Clothes & Armor --> <!-- spiked shorts --> <item id="25e4"> <id>0x25e4</id> </item> <!-- spiked shorts --> <item id="25e5"> <id>0x25e5</id> </item> <!-- amazon harness --> <item id="25e6"> <id>0x25e6</id> </item> <!-- amazon harness --> <item id="25e7"> <id>0x25e7</id> </item> <!-- elite harness --> <item id="25e8"> <id>0x25e8</id> </item> <!-- elite harness --> <item id="25e9"> <id>0x25e9</id> </item> <!-- checkered shirt --> <item id="25ea"> <id>0x25ea</id> </item> <!-- checkered shirt --> <item id="25eb"> <id>0x25eb</id> </item> <!-- robe --> <item id="25ec"> <id>0x25ec</id> </item> <!-- robe --> <item id="25ed"> <id>0x25ed</id> </item> <!-- robe --> <item id="25ee"> <id>0x25ee</id> </item> <!-- robe --> <item id="25ef"> <id>0x25ef</id> </item> <!-- death shroud --> <item id="25f0"> <id>0x25f0</id> </item> <!-- death shroud --> <item id="25f1"> <id>0x25f1</id> </item> <!-- knee skirt --> <item id="25f2"> <id>0x25f2</id> </item> <!-- knee skirt --> <item id="25f3"> <id>0x25f3</id> </item> <!-- jester pants --> <item id="2649"> <id>0x2649</id> </item> <!-- jester pants --> <item id="264a"> <id>0x264a</id> </item> <!-- plate gorget --> <item id="264b"> <id>0x264b</id> </item> <!-- plate gorget --> <item id="264c"> <id>0x264c</id> </item> <!-- haidate --> <item id="264d"> <id>0x264d</id> </item> <!-- haidate --> <item id="264e"> <id>0x264e</id> </item> <!-- kobakama --> <item id="264f"> <id>0x264f</id> </item> <!-- kobakama --> <item id="2650"> <id>0x2650</id> </item> <!-- ninja pants --> <item id="2651"> <id>0x2651</id> </item> <!-- ninja pants --> <item id="2652"> <id>0x2652</id> </item> <!-- waraji --> <item id="2653"> <id>0x2653</id> </item> <!-- waraji --> <item id="2654"> <id>0x2654</id> </item> <!-- jester shoes --> <item id="2655"> <id>0x2655</id> </item> <!-- jester shoes --> <item id="2656"> <id>0x2656</id> </item> <!-- amazon armor --> <item id="2659"> <id>0x2659</id> </item> <!-- amazon armor --> <item id="265a"> <id>0x265a</id> </item> <!-- amazon armor --> <item id="265b"> <id>0x265b</id> </item> <!-- amazon armor --> <item id="265c"> <id>0x265c</id> </item> <!-- amazon armor --> <item id="265d"> <id>0x265d</id> </item> <!-- amazon armor --> <item id="265e"> <id>0x265e</id> </item> <!-- shirt --> <item id="265f"> <id>0x265f</id> </item> <!-- shirt --> <item id="2660"> <id>0x2660</id> </item> <!-- shirt --> <item id="2661"> <id>0x2661</id> </item> <!-- shirt --> <item id="2662"> <id>0x2662</id> </item> <!-- shirt --> <item id="2663"> <id>0x2663</id> </item> <!-- shirt --> <item id="2664"> <id>0x2664</id> </item> <!-- shirt --> <item id="2665"> <id>0x2665</id> </item> <!-- shirt --> <item id="2666"> <id>0x2666</id> </item> <!-- ninja shirt --> <item id="2667"> <id>0x2667</id> </item> <!-- ninja shirt --> <item id="2668"> <id>0x2668</id> </item> <!-- kote sleeves --> <item id="266b"> <id>0x266b</id> </item> <!-- kote sleeves --> <item id="266c"> <id>0x266c</id> </item> <!-- kote sleeves --> <item id="266d"> <id>0x266d</id> </item> <!-- kote sleeves --> <item id="266e"> <id>0x266e</id> </item> <!-- do-maru --> <item id="2671"> <id>0x2671</id> </item> <!-- do-maru --> <item id="2672"> <id>0x2672</id> </item> <!-- haramaki-do --> <item id="2673"> <id>0x2673</id> </item> <!-- haramaki-do --> <item id="2674"> <id>0x2674</id> </item> <!-- kote gloves --> <item id="2677"> <id>0x2677</id> </item> <!-- kote gloves --> <item id="2678"> <id>0x2678</id> </item> <!-- kote gloves --> <item id="2679"> <id>0x2679</id> </item> <!-- kote gloves --> <item id="267a"> <id>0x267a</id> </item> <!-- fancy dress --> <item id="267b"> <id>0x267b</id> </item> <!-- fancy dress --> <item id="267c"> <id>0x267c</id> </item> <!-- fancy dress --> <item id="267d"> <id>0x267d</id> </item> <!-- fancy dress --> <item id="267e"> <id>0x267e</id> </item> <!-- long dress --> <item id="267f"> <id>0x267f</id> </item> <!-- long dress --> <item id="2680"> <id>0x2680</id> </item> <!-- kimono --> <item id="2681"> <id>0x2681</id> </item> <!-- kimono --> <item id="2682"> <id>0x2682</id> </item> <!-- hooded shroud --> <item id="2683"> <id>0x2683</id> </item> <!-- hooded shroud --> <item id="2684"> <id>0x2684</id> </item> <!-- death shroud --> <item id="2685"> <id>0x2685</id> </item> <!-- death shroud --> <item id="2686"> <id>0x2686</id> </item> <!-- winged helmet --> <item id="2689"> <id>0x2689</id> </item> <!-- winged helmet --> <item id="268a"> <id>0x268a</id> </item> <!-- hachimaki --> <item id="268b"> <id>0x268b</id> </item> <!-- hachimaki --> <item id="268c"> <id>0x268c</id> </item> <!-- kabuto --> <item id="268d"> <id>0x268d</id> </item> <!-- kabuto --> <item id="268e"> <id>0x268e</id> </item> <!-- kabuto mempo --> <item id="268f"> <id>0x268f</id> </item> <!-- kabuto mempo --> <item id="2690"> <id>0x2690</id> </item> <!-- leather cap --> <item id="2691"> <id>0x2691</id> </item> <!-- leather cap --> <item id="2692"> <id>0x2692</id> </item> <!-- robin hood cap --> <item id="269d"> <id>0x269d</id> </item> <!-- robin hood cap --> <item id="269e"> <id>0x269e</id> </item> <!-- feathered mask --> <item id="26a1"> <id>0x26a1</id> </item> <!-- feathered mask --> <item id="26a2"> <id>0x26a2</id> </item> <!-- ninja mask --> <item id="26a3"> <id>0x26a3</id> </item> <!-- ninja mask --> <item id="26a4"> <id>0x26a4</id> </item> <!-- bolas --> <item id="26ac"> <id>0x26ac</id> </item> <!-- Arcane Cloak --> <item id="26ad"> <id>0x26ad</id> </item> <!-- Arcane Cloak --> <item id="26ae"> <id>0x26ae</id> </item> <!-- Arcane Thigh Boots --> <item id="26af"> <id>0x26af</id> </item> <!-- Arcane Gloves --> <item id="26b0"> <id>0x26b0</id> </item> </definitions> \ No newline at end of file |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 22:32:25
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11442/commands Modified Files: import.py Log Message: made import use the arguments as the default filename Index: import.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/import.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** import.py 2 Oct 2004 19:00:07 -0000 1.13 --- import.py 2 Oct 2004 22:30:57 -0000 1.14 *************** *** 79,83 **** # InputField gump.addResizeGump( x=20, y=210, id=0xBB8, width=310, height=25 ) ! gump.addInputField( x=25, y=212, width=295, height=20, hue=0x834, id=1, starttext="export.wsc" ) gump.addText( x=265, y=250, text='Import', hue=0x835 ) --- 79,85 ---- # InputField gump.addResizeGump( x=20, y=210, id=0xBB8, width=310, height=25 ) ! if len(arguments) == 0: ! arguments = 'export.wsc' ! gump.addInputField( x=25, y=212, width=295, height=20, hue=0x834, id=1, starttext=arguments ) gump.addText( x=265, y=250, text='Import', hue=0x835 ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 22:29:23
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10788 Modified Files: spawnregions.cpp Log Message: fixes for walking Index: spawnregions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** spawnregions.cpp 2 Oct 2004 22:22:57 -0000 1.72 --- spawnregions.cpp 2 Oct 2004 22:28:21 -0000 1.73 *************** *** 557,563 **** // Apply these settings between the inherited npc and the custom settings in the spawnregion // file ! pChar->setWanderType( enWanderSpawnregion ); ! pChar->setWanderX1( pos.x ); ! pChar->setWanderY1( pos.y ); pChar->applyDefinition( tag ); // Now apply the given tag --- 557,567 ---- // Apply these settings between the inherited npc and the custom settings in the spawnregion // file ! if (countPoints() == 1) { ! pChar->setWanderType( enHalt ); // Most likely a vendor spawn with only one point ! } else { ! pChar->setWanderType( enWanderSpawnregion ); ! pChar->setWanderX1( pos.x ); ! pChar->setWanderY1( pos.y ); ! } pChar->applyDefinition( tag ); // Now apply the given tag |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 22:29:20
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10788/ai Modified Files: ai.cpp Log Message: fixes for walking Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ai.cpp 2 Oct 2004 22:15:52 -0000 1.34 --- ai.cpp 2 Oct 2004 22:28:21 -0000 1.35 *************** *** 531,535 **** } dir = newdir; ! } if (m_npc->direction() != dir) { --- 531,542 ---- } dir = newdir; ! ! newpos = Movement::instance()->calcCoordFromDir( dir, m_npc->pos() ); // Recalculate the new one ! ! // See if it's still invalid ! if ( !region->isValidSpot( newpos ) ) { ! return; ! } ! } if (m_npc->direction() != dir) { |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 22:23:25
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9462 Modified Files: spawnregions.cpp spawnregions.h Log Message: huge spawnregion changes Index: spawnregions.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** spawnregions.h 2 Oct 2004 22:15:51 -0000 1.31 --- spawnregions.h 2 Oct 2004 22:22:57 -0000 1.32 *************** *** 65,69 **** unsigned int countPoints(); ! bool isValidSpot( Coord_cl& pos ); bool findValidSpot( Coord_cl& pos, int tries = -1 ); --- 65,69 ---- unsigned int countPoints(); ! bool isValidSpot( const Coord_cl& pos ); bool findValidSpot( Coord_cl& pos, int tries = -1 ); Index: spawnregions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** spawnregions.cpp 2 Oct 2004 22:15:50 -0000 1.71 --- spawnregions.cpp 2 Oct 2004 22:22:57 -0000 1.72 *************** *** 203,207 **** } ! bool cSpawnRegion::isValidSpot(Coord_cl &pos) { // Check all sub positions cSpawnPosition *position; --- 203,207 ---- } ! bool cSpawnRegion::isValidSpot(const Coord_cl &pos) { // Check all sub positions cSpawnPosition *position; |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 22:17:25
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7529/ai Modified Files: ai.cpp Log Message: huge spawnregion changes Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ai.cpp 30 Sep 2004 15:37:12 -0000 1.33 --- ai.cpp 2 Oct 2004 22:15:52 -0000 1.34 *************** *** 506,510 **** cSpawnRegion* region = m_npc->spawnregion(); ! if ( region && region->contains( m_npc->pos().x, m_npc->pos().y, m_npc->pos().map ) ) { // Calculate the field we're facing. --- 506,510 ---- cSpawnRegion* region = m_npc->spawnregion(); ! if ( region && region->isValidSpot( m_npc->pos() ) ) { // Calculate the field we're facing. *************** *** 519,523 **** // Calculate a new direction. ! if ( !region->contains( newpos.x, newpos.y, newpos.map ) ) { unsigned char newdir = RandomNum( 0, 7 ); --- 519,523 ---- // Calculate a new direction. ! if ( !region->isValidSpot( newpos ) ) { unsigned char newdir = RandomNum( 0, 7 ); |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 22:17:24
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7529/python Modified Files: pyspawnregion.cpp Log Message: huge spawnregion changes Index: pyspawnregion.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyspawnregion.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pyspawnregion.cpp 22 Aug 2004 02:29:52 -0000 1.5 --- pyspawnregion.cpp 2 Oct 2004 22:15:52 -0000 1.6 *************** *** 126,130 **** if ( !strcmp( name, "id" ) ) { ! return QString2Python( self->pRegion->name() ); } /* --- 126,130 ---- if ( !strcmp( name, "id" ) ) { ! return QString2Python( self->pRegion->id() ); } /* *************** *** 161,165 **** else if ( !strcmp( name, "npcspawnlist" ) ) { ! QStringList sections = self->pRegion->npcSections(); PyObject* tuple = PyTuple_New( sections.size() ); for ( uint i = 0; i < sections.size(); ++i ) --- 161,165 ---- else if ( !strcmp( name, "npcspawnlist" ) ) { ! /* QStringList sections = self->pRegion->npcSections(); PyObject* tuple = PyTuple_New( sections.size() ); for ( uint i = 0; i < sections.size(); ++i ) *************** *** 167,171 **** PyTuple_SetItem( tuple, i, QString2Python( sections[i] ) ); } ! return tuple; } /* --- 167,171 ---- PyTuple_SetItem( tuple, i, QString2Python( sections[i] ) ); } ! return tuple;*/ } /* *************** *** 174,178 **** else if ( !strcmp( name, "itemspawnlist" ) ) { ! QStringList sections = self->pRegion->itemSections(); PyObject* tuple = PyTuple_New( sections.size() ); for ( uint i = 0; i < sections.size(); ++i ) --- 174,178 ---- else if ( !strcmp( name, "itemspawnlist" ) ) { ! /*QStringList sections = self->pRegion->itemSections(); PyObject* tuple = PyTuple_New( sections.size() ); for ( uint i = 0; i < sections.size(); ++i ) *************** *** 180,184 **** PyTuple_SetItem( tuple, i, QString2Python( sections[i] ) ); } ! return tuple; } /* --- 180,184 ---- PyTuple_SetItem( tuple, i, QString2Python( sections[i] ) ); } ! return tuple;*/ } /* |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 22:17:20
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7529 Modified Files: ChangeLog basics.cpp basics.h commands.cpp definable.cpp gumps.cpp npc.cpp spawnregions.cpp spawnregions.h uobject.cpp world.cpp Log Message: huge spawnregion changes Index: basics.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** basics.h 22 Aug 2004 12:37:31 -0000 1.36 --- basics.h 2 Oct 2004 22:15:49 -0000 1.37 *************** *** 45,49 **** int rollDice( const QString& dicePattern ); ! bool parseCoordinates( const QString& input, Coord_cl& coord ); int RandomNum( int nLowNum, int nHighNum ); --- 45,49 ---- int rollDice( const QString& dicePattern ); ! bool parseCoordinates( const QString& input, Coord_cl& coord, bool ignoreZ = false ); int RandomNum( int nLowNum, int nHighNum ); Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.188 retrieving revision 1.189 diff -C2 -d -r1.188 -r1.189 *** uobject.cpp 1 Oct 2004 15:15:56 -0000 1.188 --- uobject.cpp 2 Oct 2004 22:15:51 -0000 1.189 *************** *** 781,785 **** if the object wasn't spawned or removed from the spawnregion. */ ! PY_PROPERTY( "spawnregion", spawnregion_ ? spawnregion_->name() : QString() ) PY_PROPERTY( "serial", serial_ ) PY_PROPERTY( "free", free ? 1 : 0 ) --- 781,785 ---- if the object wasn't spawned or removed from the spawnregion. */ ! PY_PROPERTY( "spawnregion", spawnregion_ ? spawnregion_->id() : QString() ) PY_PROPERTY( "serial", serial_ ) PY_PROPERTY( "free", free ? 1 : 0 ) *************** *** 1102,1106 **** if (spawnregion_) { writer.writeByte(0xFA); ! writer.writeUtf8(spawnregion_->name()); writer.writeInt(serial_); } --- 1102,1106 ---- if (spawnregion_) { writer.writeByte(0xFA); ! writer.writeUtf8(spawnregion_->id()); writer.writeInt(serial_); } Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.264 retrieving revision 1.265 diff -C2 -d -r1.264 -r1.265 *** commands.cpp 1 Oct 2004 23:26:37 -0000 1.264 --- commands.cpp 2 Oct 2004 22:15:49 -0000 1.265 *************** *** 330,339 **** if ( !spawnRegion ) { ! socket->sysMessage( tr( "Spawnregion %1 does not exist" ).arg( args[1] ) ); } else { spawnRegion->reSpawn(); ! socket->sysMessage( tr( "Spawnregion '%1' has respawned" ).arg( args[1] ) ); } } --- 330,343 ---- if ( !spawnRegion ) { ! if ( !SpawnRegions::instance()->reSpawnGroup( args[1] ) ) { ! socket->sysMessage( tr( "Spawnregion %1 does not exist." ).arg( args[1] ) ); ! } else { ! socket->sysMessage( tr( "Spawnregion group '%1' has respawned." ).arg( args[1] ) ); ! } } else { spawnRegion->reSpawn(); ! socket->sysMessage( tr( "Spawnregion '%1' has respawned." ).arg( args[1] ) ); } } *************** *** 341,345 **** { SpawnRegions::instance()->reSpawn(); ! socket->sysMessage( tr( "All spawnregions have respawned" ) ); } } --- 345,349 ---- { SpawnRegions::instance()->reSpawn(); ! socket->sysMessage( tr( "All spawnregions have respawned." ) ); } } *************** *** 357,366 **** if ( !spawnRegion ) { ! socket->sysMessage( tr( "Spawnregion %1 does not exist" ).arg( args[1] ) ); } else { spawnRegion->deSpawn(); ! socket->sysMessage( tr( "Spawnregion '%1' has been cleared" ).arg( args[1] ) ); } } --- 361,374 ---- if ( !spawnRegion ) { ! if ( !SpawnRegions::instance()->deSpawnGroup(args[1])) { ! socket->sysMessage( tr( "Spawnregion %1 does not exist." ).arg( args[1] ) ); ! } else { ! socket->sysMessage( tr( "Spawnregion group '%1' has been cleared." ).arg( args[1] ) ); ! } } else { spawnRegion->deSpawn(); ! socket->sysMessage( tr( "Spawnregion '%1' has been cleared." ).arg( args[1] ) ); } } *************** *** 368,372 **** { SpawnRegions::instance()->deSpawn(); ! socket->sysMessage( tr( "All spawnregions have been cleared" ) ); } } --- 376,380 ---- { SpawnRegions::instance()->deSpawn(); ! socket->sysMessage( tr( "All spawnregions have been cleared." ) ); } } *************** *** 384,393 **** if ( !spawnRegion ) { ! socket->sysMessage( tr( "Spawnregion %1 does not exist" ).arg( args[1] ) ); } else { spawnRegion->reSpawnToMax(); ! socket->sysMessage( tr( "Spawnregion '%1' has respawned to maximum" ).arg( args[1] ) ); } } --- 392,405 ---- if ( !spawnRegion ) { ! if (!SpawnRegions::instance()->reSpawnToMaxGroup( args[1] ) ) { ! socket->sysMessage( tr( "Spawnregion %1 does not exist." ).arg( args[1] ) ); ! } else { ! socket->sysMessage( tr( "Spawnregion group '%1' has been filled." ).arg( args[1] ) ); ! } } else { spawnRegion->reSpawnToMax(); ! socket->sysMessage( tr( "Spawnregion '%1' has been filled." ).arg( args[1] ) ); } } *************** *** 395,399 **** { SpawnRegions::instance()->reSpawnToMax(); ! socket->sysMessage( tr( "All spawnregions have respawned to maximum" ) ); } } --- 407,411 ---- { SpawnRegions::instance()->reSpawnToMax(); ! socket->sysMessage( tr( "All spawnregions have respawned to maximum." ) ); } } Index: basics.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basics.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** basics.cpp 22 Aug 2004 12:37:31 -0000 1.40 --- basics.cpp 2 Oct 2004 22:15:49 -0000 1.41 *************** *** 97,106 **** } ! bool parseCoordinates( const QString& input, Coord_cl& coord ) { QStringList coords = QStringList::split( ",", input ); // We at least need x, y, z ! if ( coords.size() < 3 ) return false; --- 97,106 ---- } ! bool parseCoordinates( const QString& input, Coord_cl& coord, bool ignoreZ ) { QStringList coords = QStringList::split( ",", input ); // We at least need x, y, z ! if ( coords.size() < (ignoreZ ? 2 : 3) ) return false; *************** *** 115,121 **** return false; ! Q_INT8 z = coords[2].toShort( &ok ); ! if ( !ok ) ! return false; Q_UINT8 map = coord.map; // Current by default --- 115,124 ---- return false; ! Q_INT8 z = 0; ! if (!ignoreZ) { ! z = coords[2].toShort( &ok ); ! if ( !ok ) ! return false; ! } Q_UINT8 map = coord.map; // Current by default Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** ChangeLog 2 Oct 2004 09:59:51 -0000 1.92 --- ChangeLog 2 Oct 2004 22:15:49 -0000 1.93 *************** *** 22,25 **** --- 22,28 ---- - Fixed documentation for the socket object. - Changed some return values from true to none for socket methods. + - Spawnregions have been rewritten for more speed and functionality. + Because of that the format changed, please hop on irc and ask for details if you want + to convert your scripts. Wolfpack 12.9.11 Beta (26. September 2004) Index: spawnregions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** spawnregions.cpp 1 Oct 2004 22:30:43 -0000 1.70 --- spawnregions.cpp 2 Oct 2004 22:15:50 -0000 1.71 *************** *** 43,56 **** #include "scriptmanager.h" #include "python/pyspawnregion.h" using namespace std; /***************************************************************************** cSpawnRegion member functions *****************************************************************************/ ! void cSpawnRegion::init( void ) [...969 lines suppressed...] { ! if ( !objects.contains( region->name() ) ) { ! objects[region->name()].setAutoDelete( false ); } ! objects[region->name()].append( pChar ); pChar->setSpawnregion( 0 ); // Remove from spawnregion before pointer gets invalid } --- 865,874 ---- if ( region ) { ! if ( !objects.contains( region->id() ) ) { ! objects[region->id()].setAutoDelete( false ); } ! objects[region->id()].append( pChar ); pChar->setSpawnregion( 0 ); // Remove from spawnregion before pointer gets invalid } Index: spawnregions.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** spawnregions.h 1 Oct 2004 22:30:44 -0000 1.30 --- spawnregions.h 2 Oct 2004 22:15:51 -0000 1.31 *************** *** 36,53 **** #include <map> ! class cSpawnRegion : public cBaseRegion ! { ! OBJECTDEF(cSpawnRegion) public: ! cSpawnRegion( const cElement* Tag ) ! { ! this->init(); ! this->name_ = Tag->getAttribute( "id" ); ! this->applyDefinition( Tag ); ! npcs_.setAutoDelete( false ); ! items_.setAutoDelete( false ); } ! void init( void ); // Manage spawned objects --- 36,57 ---- #include <map> ! // Abstract class for spawn position ! class cSpawnPosition { ! protected: ! unsigned int points_; // The number of points public: ! virtual unsigned int points() { ! return points_; } ! virtual Coord_cl findSpot() = 0; ! virtual bool inBounds(const Coord_cl &pos) = 0; ! }; ! ! class cSpawnRegion : public cDefinable { ! OBJECTDEF(cSpawnRegion) ! public: ! cSpawnRegion(const cElement* tag); ! ~cSpawnRegion(); // Manage spawned objects *************** *** 60,78 **** void checkTimer( void ); ! bool findValidSpot( Coord_cl& pos ); // Getters ! QString name( void ) const ! { ! return name_; } ! unsigned int npcs( void ) const ! { return npcs_.count(); } ! unsigned int items( void ) const ! { return items_.count(); } --- 64,81 ---- void checkTimer( void ); ! unsigned int countPoints(); ! bool isValidSpot( Coord_cl& pos ); ! bool findValidSpot( Coord_cl& pos, int tries = -1 ); // Getters ! const QString &id() const { ! return id_; } ! unsigned int npcs( void ) const { return npcs_.count(); } ! unsigned int items( void ) const { return items_.count(); } *************** *** 88,101 **** } - QStringList npcSections() const - { - return npcSections_; - } - - QStringList itemSections() const - { - return itemSections_; - } - QPtrList<cUObject> spawnedItems() const { --- 91,94 ---- *************** *** 108,122 **** } ! QStringList rectangles( void ) ! { ! QStringList rectList; ! QValueVector<rect_st>::iterator it = this->rectangles_.begin(); ! while ( it != this->rectangles_.end() ) ! { ! QString rect = QString( "%1,%2->%3,%4" ).arg( ( *it ).x1 ).arg( ( *it ).y1 ).arg( ( *it ).x2 ).arg( ( *it ).y2 ); ! rectList.push_back( rect ); ! ++it; ! } ! return rectList; } --- 101,110 ---- } ! const QStringList &groups() const { ! return groups_; ! } ! ! bool active() const { ! return active_; } *************** *** 132,140 **** private: ! QPtrList<cUObject> items_; ! QPtrList<cUObject> npcs_; ! QStringList npcSections_; // list of npc's sections ! QStringList itemSections_; // list of item's sections UI16 maxNpcAmt_; // Max amount of characters to spawn --- 120,140 ---- private: ! QString id_; // Spawnregion id ! QStringList groups_; // Spawngroups ! bool active_; // Is this spawnregion active? ! QPtrList<cSpawnPosition> positions_; // Spawn positions ! ! bool checkFreeSpot_; // The target spot has to be free. ! ! QPtrList<cUObject> items_; // List of spawned items ! QPtrList<cUObject> npcs_; // List of spawned npcs ! ! QPtrList<cElement> itemNodes_; // Pointers to definition elements for NPCs ! QPtrList<cElement> npcNodes_; // Pointers to definition elements for Items ! QValueList<unsigned int> itemNodeFrequencies_; // Frequencies for item nodes ! QValueList<unsigned int> npcNodeFrequencies_; // Frequencies for npc nodes ! unsigned int npcNodesTotal_; // The total spawn frequency value. Speedup property. ! unsigned int itemNodesTotal_; // The total spawn frequency value. Speedup property. UI16 maxNpcAmt_; // Max amount of characters to spawn *************** *** 147,152 **** UI32 maxTime_; // Maximum spawn time in sec UI32 nextTime_; // Next time for this region to spawn - - QValueVector<UI08> z_; // Height, if not specified, z will be chosen }; --- 147,150 ---- *************** *** 163,168 **** --- 161,169 ---- void reSpawn( void ); + bool reSpawnGroup( const QString &group ); void reSpawnToMax( void ); + bool reSpawnToMaxGroup( const QString &group ); void deSpawn( void ); + bool deSpawnGroup( const QString &group ); UI16 npcs( void ) Index: gumps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v retrieving revision 1.171 retrieving revision 1.172 diff -C2 -d -r1.171 -r1.172 *** gumps.cpp 19 Aug 2004 01:22:51 -0000 1.171 --- gumps.cpp 2 Oct 2004 22:15:50 -0000 1.172 *************** *** 124,131 **** if ( region ) { ! QStringList allrectangles = region->rectangles(); ! uint page_ = 0; ! uint numrects = allrectangles.size(); uint pages = ( ( uint ) ceil( ( double ) numrects / 10.0f ) ); --- 124,131 ---- if ( region ) { ! /*QStringList allrectangles = region->rectangles(); ! */ uint page_ = 0; ! uint numrects = 0; /*allrectangles.size();*/ uint pages = ( ( uint ) ceil( ( double ) numrects / 10.0f ) ); *************** *** 138,150 **** addText( 170, 90, tr( "Spawnregion Info" ), 0x530 ); // Give information about the spawnregion ! addText( 50, 120, tr( "Name: %1" ).arg( region->name() ), 0x834 ); addText( 50, 140, tr( "NPCs: %1 of %2" ).arg( region->npcs() ).arg( region->maxNpcs() ), 0x834 ); addText( 50, 160, tr( "Items: %1 of %2" ).arg( region->items() ).arg( region->maxItems() ), 0x834 ); ! addText( 50, 180, tr( "Coordinates: %1" ).arg( allrectangles.size() ), 0x834 ); // OK button addButton( 50, 410, 0xF9, 0xF8, 0 ); // Only Exit possible ! for ( page_ = 1; page_ <= pages; page_++ ) { startPage( page_ ); --- 138,150 ---- addText( 170, 90, tr( "Spawnregion Info" ), 0x530 ); // Give information about the spawnregion ! addText( 50, 120, tr( "Name: %1" ).arg( region->id() ), 0x834 ); addText( 50, 140, tr( "NPCs: %1 of %2" ).arg( region->npcs() ).arg( region->maxNpcs() ), 0x834 ); addText( 50, 160, tr( "Items: %1 of %2" ).arg( region->items() ).arg( region->maxItems() ), 0x834 ); ! //addText( 50, 180, tr( "Coordinates: %1" ).arg( allrectangles.size() ), 0x834 ); // OK button addButton( 50, 410, 0xF9, 0xF8, 0 ); // Only Exit possible ! /*for ( page_ = 1; page_ <= pages; page_++ ) { startPage( page_ ); *************** *** 176,180 **** if ( page_ < pages ) // next page addPageButton( 290, 410, 0x0FA, 0x0FA, page_ + 1 ); ! } } } --- 176,180 ---- if ( page_ < pages ) // next page addPageButton( 290, 410, 0x0FA, 0x0FA, page_ + 1 ); ! }*/ } } Index: definable.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definable.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** definable.cpp 2 Jun 2004 15:04:04 -0000 1.21 --- definable.cpp 2 Oct 2004 22:15:50 -0000 1.22 *************** *** 47,50 **** --- 47,52 ---- else if ( sectionNode->name() == "region" ) wpType = WPDT_REGION; + else if ( sectionNode->name() == "spawnregion" ) + wpType = WPDT_SPAWNREGION; const cElement* tInherit = Definitions::instance()->getDefinition( wpType, sectionNode->getAttribute( "inherit", "" ) ); Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** world.cpp 2 Oct 2004 00:28:47 -0000 1.132 --- world.cpp 2 Oct 2004 22:15:51 -0000 1.133 *************** *** 860,866 **** gump.setNoClose( true ); gump.setNoDispose( true ); ! gump.setNoMove( true ); ! gump.setX( -10 ); ! gump.setY( -10 ); gump.setType( 0x98FA2C10 ); --- 860,866 ---- gump.setNoClose( true ); gump.setNoDispose( true ); ! gump.setNoMove( false ); ! gump.setX( 150 ); ! gump.setY( 150 ); gump.setType( 0x98FA2C10 ); *************** *** 976,980 **** if ( pItem->spawnregion() ) { ! QString name = PersistentBroker::instance()->quoteString( pItem->spawnregion()->name() ); QString query = QString( "INSERT INTO spawnregions VALUES('%1',%2);" ).arg( name ).arg( pItem->serial() ); PersistentBroker::instance()->executeQuery( query ); --- 976,980 ---- if ( pItem->spawnregion() ) { ! QString name = PersistentBroker::instance()->quoteString( pItem->spawnregion()->id() ); QString query = QString( "INSERT INTO spawnregions VALUES('%1',%2);" ).arg( name ).arg( pItem->serial() ); PersistentBroker::instance()->executeQuery( query ); *************** *** 989,993 **** if ( pChar->spawnregion() ) { ! QString name = PersistentBroker::instance()->quoteString( pChar->spawnregion()->name() ); QString query = QString( "INSERT INTO spawnregions VALUES('%1',%2);" ).arg( name ).arg( pChar->serial() ); PersistentBroker::instance()->executeQuery( query ); --- 989,993 ---- if ( pChar->spawnregion() ) { ! QString name = PersistentBroker::instance()->quoteString( pChar->spawnregion()->id() ); QString query = QString( "INSERT INTO spawnregions VALUES('%1',%2);" ).arg( name ).arg( pChar->serial() ); PersistentBroker::instance()->executeQuery( query ); Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** npc.cpp 28 Sep 2004 09:48:52 -0000 1.117 --- npc.cpp 2 Oct 2004 22:15:50 -0000 1.118 *************** *** 1414,1417 **** --- 1414,1418 ---- pChar->setOrgBody( pChar->body() ); pChar->setOrgSkin( pChar->skin() ); + pChar->setOrgName( pChar->name() ); // Now we call onCreate |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 19:05:48
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1416/npcs/humans/vendors Modified Files: banker.xml Log Message: made banker_female a female Index: banker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/banker.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** banker.xml 26 Sep 2004 12:52:23 -0000 1.10 --- banker.xml 2 Oct 2004 19:04:30 -0000 1.11 *************** *** 32,36 **** <npc id="banker_female"> ! <inherit>base_male</inherit> <ai>Human_Vendor</ai> <bindmenu>banker_menu,vendor_menu</bindmenu> --- 32,36 ---- <npc id="banker_female"> ! <inherit>base_female</inherit> <ai>Human_Vendor</ai> <bindmenu>banker_menu,vendor_menu</bindmenu> |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 19:01:50
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv397/commands Modified Files: import.py Log Message: update Index: import.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/import.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** import.py 2 Oct 2004 18:52:56 -0000 1.12 --- import.py 2 Oct 2004 19:00:07 -0000 1.13 *************** *** 379,383 **** if not newitem: ! warning += "Found an invalid item id '%s' at %s<br>" % (baseid, str(newposition)) continue --- 379,383 ---- if not newitem: ! warnings += "Found an invalid item id '%s' at %s<br>" % (baseid, str(newposition)) continue |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 18:53:48
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31470/commands Modified Files: import.py Log Message: update Index: import.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/import.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** import.py 30 Sep 2004 12:46:03 -0000 1.11 --- import.py 2 Oct 2004 18:52:56 -0000 1.12 *************** *** 379,383 **** if not newitem: ! warning += "Found an invalid item id: %s<br>" % baseid continue --- 379,383 ---- if not newitem: ! warning += "Found an invalid item id '%s' at %s<br>" % (baseid, str(newposition)) continue |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 10:08:13
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28009/webroot Modified Files: ChangeLog.wolfpack Log Message: weight is being sent now Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** ChangeLog.wolfpack 2 Oct 2004 04:31:31 -0000 1.133 --- ChangeLog.wolfpack 2 Oct 2004 10:07:50 -0000 1.134 *************** *** 10,13 **** --- 10,15 ---- - Made leather containers dyable. - Fixed categories for curtains. + - Defined all teleporters thanks to bugging and work from DrkCodeman. + - Added teleporter stairs to ilshenar decoration. - Added index.xml files to armor categories. - Began to add new Samurai armor and weapons (not complete). *************** *** 34,37 **** --- 36,43 ---- - Import now imports multis from WSC files and makes all items non movable. - Fixed bug #0000311. (Hiding and invisibility in combat) + - Static tile color now included in .info. + - Allowed decorating only one facet using .decoration <map>. + - The character info page now logs every changed property. + - The characters weight is now being resent on lumberjacking and other skills. * Misc. Changes: * Known Issues, Bugs, and Missing Features: *************** *** 41,49 **** - Town/World regions are incomplete. We welcome donated OSI-like region scripts! - - Teleport Scripts are incomplete. - We welcome donated OSI-like teleport scripts! - Possible that a few monsters are missing and/or incomplete. - - Reloading Python too many times can crash the server. - - There are still some memory leaks. - Multis (Houses/Boats) are not currently supported. --- 47,51 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 10:05:31
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27471/skills Modified Files: lumberjacking.py mining.py Log Message: weight is being sent now Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** mining.py 23 Sep 2004 20:39:26 -0000 1.37 --- mining.py 2 Oct 2004 10:04:35 -0000 1.38 *************** *** 233,236 **** --- 233,239 ---- if not tobackpack(item, char): item.update() + + # Resend weight + char.socket.resendstatus() resourcecount = max( 1, int( gem.gettag('resourcecount') ) ) Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** lumberjacking.py 23 Sep 2004 19:17:06 -0000 1.20 --- lumberjacking.py 2 Oct 2004 10:04:35 -0000 1.21 *************** *** 164,167 **** --- 164,170 ---- if not wolfpack.utilities.tobackpack( item, char ): item.update() + + # Resend weight + char.socket.resendstatus() # Let him hack *************** *** 235,238 **** --- 238,244 ---- if not wolfpack.utilities.tobackpack( resourceitem, char ): resourceitem.update() + + # Resend weight + char.socket.resendstatus() if resource.gettag( 'resourcecount' ) >= 1: |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 10:05:25
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27471/commands Modified Files: info.py Log Message: weight is being sent now Index: info.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** info.py 1 Oct 2004 23:52:04 -0000 1.27 --- info.py 2 Oct 2004 10:04:34 -0000 1.28 *************** *** 1307,1311 **** item.health = int( hex2dec( textentries[ key ] ) ) elif key == 11: ! item.decay = int( hex2dec( textentries[ key ] ) ) elif key == 12: item.newbie = int( hex2dec( textentries[ key ] ) ) --- 1307,1311 ---- item.health = int( hex2dec( textentries[ key ] ) ) elif key == 11: ! item.decay = str2bool( textentries[ key ] ) elif key == 12: item.newbie = int( hex2dec( textentries[ key ] ) ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 10:05:23
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27471 Modified Files: blades.py Log Message: weight is being sent now Index: blades.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/blades.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** blades.py 30 Sep 2004 12:39:21 -0000 1.10 --- blades.py 2 Oct 2004 10:04:33 -0000 1.11 *************** *** 83,86 **** --- 83,89 ---- if not utilities.tobackpack(wool, char): wool.update() + + # Resend weight + char.socket.resendstatus() char.socket.clilocmessage( 0x7A2E4 ) # You place the gathered wool into your backpack. |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 10:00:19
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26643/python Modified Files: socket.cpp Log Message: doc+python fixes Index: socket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** socket.cpp 1 Oct 2004 23:26:38 -0000 1.88 --- socket.cpp 2 Oct 2004 09:59:51 -0000 1.89 *************** *** 671,676 **** } ! /*! ! Returns the custom tag passed */ static PyObject* wpSocket_gettag( wpSocket* self, PyObject* args ) --- 671,682 ---- } ! /* ! \method socket.gettag ! \description Get a custom tag attached to the socket. ! Please keep in mind these tags are temporary in nature. ! When the socket disconnects, the tag will be gone. ! \return None if there is no such tag, the tag value otherwise. ! Possible return types are: unicode (string), float, integer. ! \param name The name of the tag. */ static PyObject* wpSocket_gettag( wpSocket* self, PyObject* args ) *************** *** 695,700 **** } ! /*! ! Sets a custom tag */ static PyObject* wpSocket_settag( wpSocket* self, PyObject* args ) --- 701,712 ---- } ! /* ! \method socket.settag ! \description Set a custom tag on the object. ! \param name The name of the tag. ! Please keep in mind these tags are temporary in nature. ! When the socket disconnects, the tag will be gone. ! \param value The value of the tag. Possible value types ! are string, unicode, float and integer. */ static PyObject* wpSocket_settag( wpSocket* self, PyObject* args ) *************** *** 722,727 **** } ! /*! ! Checks if a certain tag exists */ static PyObject* wpSocket_hastag( wpSocket* self, PyObject* args ) --- 734,742 ---- } ! /* ! \method socket.hastag ! \description Check if the socket has a certain custom tag attached to it. ! \return True if the tag is present. False otherwise. ! \param name The name of the tag. */ static PyObject* wpSocket_hastag( wpSocket* self, PyObject* args ) *************** *** 741,746 **** } ! /*! ! Deletes a given tag */ static PyObject* wpSocket_deltag( wpSocket* self, PyObject* args ) --- 756,763 ---- } ! /* ! \method socket.deltag ! \description Deletes a tag attached to the socket. ! \param name The name of the tag. */ static PyObject* wpSocket_deltag( wpSocket* self, PyObject* args ) *************** *** 761,766 **** } ! /*! ! Resends the status window to this client. */ static PyObject* wpSocket_resendstatus( wpSocket* self, PyObject* args ) --- 778,785 ---- } ! /* ! \method socket.resendstatus ! \description Resends the status window to this socket. ! Use this for updating weight and other properties. */ static PyObject* wpSocket_resendstatus( wpSocket* self, PyObject* args ) *************** *** 771,775 **** } ! // Resend lightlevel static PyObject* wpSocket_updatelightlevel( wpSocket* self, PyObject* args ) { --- 790,799 ---- } ! /* ! \method socket.updatelightlevel ! \description Send the current lightlevel to this socket. ! Use this for updating the lightlevel after you change the ! lightbonus property on character objects. ! */ static PyObject* wpSocket_updatelightlevel( wpSocket* self, PyObject* args ) { *************** *** 779,782 **** --- 803,813 ---- } + /* + \method socket.questarrow + \param show This boolean flag indicates whether the questarrow should be shown. + \param x The x position the quest arrow points to. + \param y The y position the quest arrow points to. + \description This method shows a quest arrow that points to a given location on the map. + */ static PyObject* wpSocket_questarrow( wpSocket* self, PyObject* args ) { *************** *** 789,795 **** self->pSock->sendQuestArrow( show, x, y ); ! return PyTrue(); } static PyObject* wpSocket_log( wpSocket* self, PyObject* args ) { --- 820,832 ---- self->pSock->sendQuestArrow( show, x, y ); ! Py_RETURN_NONE; } + /* + \method socket.log + \param level The loglevel for this event. Check <library id="wolfpack.consts">wolfpack.consts</library> for constants. + \param text The text that should be logged. + \description Sends a given text to the logfile and console and prepends a timestamp and the socket id. + */ static PyObject* wpSocket_log( wpSocket* self, PyObject* args ) { *************** *** 801,814 **** self->pSock->log( ( eLogLevel ) loglevel, text ); ! return PyTrue(); } static PyObject* wpSocket_updateplayer( wpSocket* self, PyObject* args ) { Q_UNUSED( args ); self->pSock->updatePlayer(); ! return PyTrue(); } static PyObject* wpSocket_updateskill( wpSocket* self, PyObject* args ) { --- 838,861 ---- self->pSock->log( ( eLogLevel ) loglevel, text ); ! Py_RETURN_NONE; } + /* + \method socket.updateplayer + \description Resend the player of this socket only. + Handle with care. + */ static PyObject* wpSocket_updateplayer( wpSocket* self, PyObject* args ) { Q_UNUSED( args ); self->pSock->updatePlayer(); ! Py_RETURN_NONE; } + /* + \method socket.updateskill + \param skill The skill id. + \description Resends the value of one single skill. + */ static PyObject* wpSocket_updateskill( wpSocket* self, PyObject* args ) { *************** *** 821,825 **** self->pSock->sendSkill( skill ); ! return PyTrue(); } --- 868,872 ---- self->pSock->sendSkill( skill ); ! Py_RETURN_NONE; } |
|
From: Sebastian H. <dar...@us...> - 2004-10-02 10:00:19
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26643 Modified Files: ChangeLog Log Message: doc+python fixes Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** ChangeLog 1 Oct 2004 23:26:37 -0000 1.91 --- ChangeLog 2 Oct 2004 09:59:51 -0000 1.92 *************** *** 20,23 **** --- 20,25 ---- - Only 100 spawnregions per cycle are respawned now. - Fixed even more UCS4 problems. + - Fixed documentation for the socket object. + - Changed some return values from true to none for socket methods. Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Richard M. <dr...@us...> - 2004-10-02 04:32:18
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14154/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: Kupo Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** ChangeLog.wolfpack 1 Oct 2004 16:32:55 -0000 1.132 --- ChangeLog.wolfpack 2 Oct 2004 04:31:31 -0000 1.133 *************** *** 10,13 **** --- 10,15 ---- - Made leather containers dyable. - Fixed categories for curtains. + - Added index.xml files to armor categories. + - Began to add new Samurai armor and weapons (not complete). * Python Script Changes: - Fixed BONUS* properties. |
