wpdev-commits Mailing List for Wolfpack Emu (Page 27)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Sebastian H. <dar...@us...> - 2004-09-30 15:37:21
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22469/ai Modified Files: ai.cpp Log Message: npc movement fixes Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** ai.cpp 25 Sep 2004 22:57:09 -0000 1.32 --- ai.cpp 30 Sep 2004 15:37:12 -0000 1.33 *************** *** 533,536 **** --- 533,540 ---- } + if (m_npc->direction() != dir) { + Movement::instance()->Walking( m_npc, dir, 0xFF ); + } + // Walk in the same direction or if the direction has changed simply turn around. // If there's a obstacle, change the direction slightly to see if we can get *************** *** 590,593 **** --- 594,602 ---- Q_UINT8 dir = m_npc->pos().direction( pos ); + + if (m_npc->direction() != dir) { + Movement::instance()->Walking( m_npc, dir, 0xFF ); + } + Movement::instance()->Walking( m_npc, dir, 0xFF ); break; *************** *** 636,639 **** --- 645,649 ---- Q_UINT8 dir = m_npc->pos().direction( pos ); Coord_cl newPos = Movement::instance()->calcCoordFromDir( dir, m_npc->pos() ); + if ( !mayWalk( m_npc, newPos ) ) { *************** *** 660,663 **** --- 670,679 ---- } } + + // If we're not facing the direction we're trying to walk to, + // call Movement once more. + if (m_npc->direction() != dir) { + Movement::instance()->Walking( m_npc, dir, 0xFF ); + } return Movement::instance()->Walking( m_npc, dir, 0xFF ); *************** *** 694,697 **** --- 710,719 ---- Coord_cl nextmove = m_npc->nextMove(); Q_UINT8 dir = m_npc->pos().direction( nextmove ); + + // 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(); |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 12:47:29
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18728/webroot Modified Files: ChangeLog.wolfpack Log Message: bloodcolor for undeads Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** ChangeLog.wolfpack 30 Sep 2004 12:39:53 -0000 1.129 --- ChangeLog.wolfpack 30 Sep 2004 12:46:59 -0000 1.130 *************** *** 7,10 **** --- 7,11 ---- - Fixed prices for jewels. - Added data for item flipping for carpentry items. + - Added bloodcolor for undeads. * Python Script Changes: - Fixed BONUS* properties. *************** *** 27,30 **** --- 28,32 ---- - Fixed repairing bows. - Carving now takes bloodcolor into account. + - Import now imports multis from WSC files and makes all items non movable. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 12:46:50
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18554/npcs/monsters/undead Modified Files: undead_base.xml Log Message: bloodcolor for undeads Index: undead_base.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/undead_base.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** undead_base.xml 10 Sep 2004 17:08:30 -0000 1.7 --- undead_base.xml 30 Sep 2004 12:46:30 -0000 1.8 *************** *** 14,23 **** <wandertype>1</wandertype> <mintaming>1100</mintaming> </npc> - <!-- headless --> - <list id="CARVE_HEADLESS"> - <item>9f1,1</item> <!-- 1 meat --> - </list> - </definitions> --- 14,19 ---- <wandertype>1</wandertype> <mintaming>1100</mintaming> + <strproperty name="bloodcolor" value="1401,1447" /> </npc> </definitions> |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 12:46:21
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18488/commands Modified Files: import.py Log Message: import now imports multis and makes everything non movable. Index: import.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/import.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** import.py 18 Sep 2004 15:21:02 -0000 1.10 --- import.py 30 Sep 2004 12:46:03 -0000 1.11 *************** *** 371,377 **** else: baseid = lstrip( str( hex( id ) ), "0x" ) ! newitem = wolfpack.additem( "%s" % baseid ) # Generate a new serial for us newitem.decay = 0 newitem.color = color newitem.id = id --- 371,387 ---- else: baseid = lstrip( str( hex( id ) ), "0x" ) ! ! # Multi ? ! if id >= 0x4000: ! newitem = wolfpack.addmulti( "%s" % baseid ) # Generate a new serial for us ! else: ! newitem = wolfpack.additem( "%s" % baseid ) # Generate a new serial for us ! ! if not newitem: ! warning += "Found an invalid item id: %s<br>" % baseid ! continue newitem.decay = 0 + newitem.movable = 3 # Make everything gm movable by default newitem.color = color newitem.id = id |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 12:40:10
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16806/webroot Modified Files: ChangeLog.wolfpack Log Message: carving takes bloodcolors into account Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** ChangeLog.wolfpack 29 Sep 2004 17:11:34 -0000 1.128 --- ChangeLog.wolfpack 30 Sep 2004 12:39:53 -0000 1.129 *************** *** 26,29 **** --- 26,30 ---- - Fixed bug #0000325. (furniture not showing exceptional mark) - Fixed repairing bows. + - Carving now takes bloodcolor into account. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 12:39:31
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16616 Modified Files: blades.py Log Message: carving takes bloodcolors into account Index: blades.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/blades.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** blades.py 21 Sep 2004 05:42:54 -0000 1.9 --- blades.py 30 Sep 2004 12:39:21 -0000 1.10 *************** *** 148,151 **** --- 148,152 ---- if not basedef: char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve.. + return feathers = basedef.getintproperty('carve_feathers', 0) *************** *** 162,171 **** return ! # Create Random Blood ! bloodid = random.choice( blood ) ! blooditem = wolfpack.additem( bloodid ) ! blooditem.moveto( corpse.pos ) ! blooditem.decay = 1 ! blooditem.update() # Mark the corpse as carved --- 163,184 ---- return ! # See if the corpse has blood ! bloodcolor = basedef.getintproperty('bloodcolor', 0) ! ! if bloodcolor != -1: ! try: ! if basedef.hasstrproperty('bloodcolor'): ! (minv, maxv) = basedef.getstrproperty('bloodcolor', '0,0').split(',') ! bloodcolor = random.randint(int(minv), int(maxv)) ! except: ! pass ! ! # Create Random Blood ! bloodid = random.choice( blood ) ! blooditem = wolfpack.additem( bloodid ) ! blooditem.color = bloodcolor ! blooditem.moveto( corpse.pos ) ! blooditem.decay = 1 ! blooditem.update() # Mark the corpse as carved |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 12:34:20
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15244 Modified Files: basechar.cpp Log Message: bloodcolor Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** basechar.cpp 30 Sep 2004 12:31:12 -0000 1.155 --- basechar.cpp 30 Sep 2004 12:34:10 -0000 1.156 *************** *** 2357,2370 **** QStringList bloodColors = QStringList::split(",", basedef_->getStrProperty("bloodcolor")); if (bloodColors.count() == 2) { ! bool ok; ! int from = bloodColors[0].toInt(&ok); ! if (ok) { ! int to = bloodColors[1].toInt(&ok); ! if (ok) { ! if (to < from) { ! std::swap(to, from); ! bloodColor = RandomNum(from, to); ! } ! } } } --- 2357,2365 ---- QStringList bloodColors = QStringList::split(",", basedef_->getStrProperty("bloodcolor")); if (bloodColors.count() == 2) { ! bool ok1, ok2; ! int from = bloodColors[0].toInt(&ok1); ! int to = bloodColors[1].toInt(&ok2); ! if (ok1 && ok2) { ! bloodColor = RandomNum(from, to); } } |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 12:31:22
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14683 Modified Files: ChangeLog basechar.cpp Log Message: bloodcolor Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.154 retrieving revision 1.155 diff -C2 -d -r1.154 -r1.155 *** basechar.cpp 30 Sep 2004 12:23:03 -0000 1.154 --- basechar.cpp 30 Sep 2004 12:31:12 -0000 1.155 *************** *** 2349,2352 **** --- 2349,2374 ---- if (basedef_) { bloodColor = (int)basedef_->getIntProperty("bloodcolor", 0); + + // If we have a strproperty with a custom list of colors, + // that is used instead + if (bloodColor != -1) { + // this property means: from,to + if (basedef_->hasStrProperty("bloodcolor")) { + QStringList bloodColors = QStringList::split(",", basedef_->getStrProperty("bloodcolor")); + if (bloodColors.count() == 2) { + bool ok; + int from = bloodColors[0].toInt(&ok); + if (ok) { + int to = bloodColors[1].toInt(&ok); + if (ok) { + if (to < from) { + std::swap(to, from); + bloodColor = RandomNum(from, to); + } + } + } + } + } + } } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** ChangeLog 29 Sep 2004 19:08:16 -0000 1.86 --- ChangeLog 30 Sep 2004 12:31:12 -0000 1.87 *************** *** 8,11 **** --- 8,12 ---- - Fix bug #0000342 ( "Show Npc Titles" treated as numeric value, instead of boolean ) - Fix bug # 0000341 ( set char.orgname on char creation ) + - The bloodcolor for NPCs can now be defined. Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 12:23:14
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12652 Modified Files: basechar.cpp wolfpack.vcproj Log Message: Compile fixes. Blood color. Index: wolfpack.vcproj =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** wolfpack.vcproj 18 Sep 2004 21:10:40 -0000 1.50 --- wolfpack.vcproj 30 Sep 2004 12:23:03 -0000 1.51 *************** *** 168,175 **** PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_THREAD_SUPPORT;QT_LITE_COMPONENT;QT_DLL;QT_NO_STL;QT_NO_COMPRESS;CRASHHANDLER;MYSQL_DRIVER" StringPooling="TRUE" ! MinimalRebuild="FALSE" BasicRuntimeChecks="0" RuntimeLibrary="2" ! StructMemberAlignment="3" BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="FALSE" --- 168,175 ---- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_THREAD_SUPPORT;QT_LITE_COMPONENT;QT_DLL;QT_NO_STL;QT_NO_COMPRESS;CRASHHANDLER;MYSQL_DRIVER" StringPooling="TRUE" ! MinimalRebuild="TRUE" BasicRuntimeChecks="0" RuntimeLibrary="2" ! StructMemberAlignment="0" BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="FALSE" *************** *** 179,183 **** UsePrecompiledHeader="0" BrowseInformation="1" ! WarningLevel="0" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="3"/> --- 179,183 ---- UsePrecompiledHeader="0" BrowseInformation="1" ! WarningLevel="1" Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="3"/> Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.153 retrieving revision 1.154 diff -C2 -d -r1.153 -r1.154 *** basechar.cpp 27 Sep 2004 15:51:32 -0000 1.153 --- basechar.cpp 30 Sep 2004 12:23:03 -0000 1.154 *************** *** 2342,2376 **** } ! // There is a 33% chance that blood is created on hit by phsical means if ( type == DAMAGE_PHYSICAL && !RandomNum( 0, 2 ) ) { ! P_ITEM blood = 0; ! ! // If more than 50% of the maximum healthpoints has been dealt as damage ! // we display a big puddle of blood ! if ( amount >= maxHitpoints_ * 0.50 ) ! { ! blood = cItem::createFromList( "BIG_BLOOD_PUDDLES" ); ! // Otherwise we display a medium puddle of blood if the damage is greater ! // than 25% of the maximum healthpoints } - else if ( amount >= maxHitpoints_ * 0.35 ) - { - blood = cItem::createFromList( "MEDIUM_BLOOD_PUDDLES" ); ! // at last we only display a small stain of blood if the damage has been ! // greater than 10% of the maximum hitpoints ! } ! else if ( amount >= maxHitpoints_ * 0.20 ) ! { ! blood = cItem::createFromList( "SMALL_BLOOD_PUDDLES" ); ! } ! if ( blood ) ! { ! blood->moveTo( pos_ ); // Move it to the feet of the victim ! blood->setNoDecay( false ); // Override the nodecay tag in the definitions ! blood->update(); // Send it to all sockets in range } } --- 2342,2385 ---- } ! // There is a 33% chance that blood is created on hit by phsical means if ( type == DAMAGE_PHYSICAL && !RandomNum( 0, 2 ) ) { ! int bloodColor = 0; ! if (basedef_) { ! bloodColor = (int)basedef_->getIntProperty("bloodcolor", 0); } ! if (bloodColor != -1) { ! P_ITEM blood = 0; ! // If more than 50% of the maximum healthpoints has been dealt as damage ! // we display a big puddle of blood ! if ( amount >= maxHitpoints_ * 0.50 ) ! { ! blood = cItem::createFromList( "BIG_BLOOD_PUDDLES" ); ! ! // Otherwise we display a medium puddle of blood if the damage is greater ! // than 25% of the maximum healthpoints ! } ! else if ( amount >= maxHitpoints_ * 0.35 ) ! { ! blood = cItem::createFromList( "MEDIUM_BLOOD_PUDDLES" ); ! ! // at last we only display a small stain of blood if the damage has been ! // greater than 10% of the maximum hitpoints ! } ! else if ( amount >= maxHitpoints_ * 0.20 ) ! { ! blood = cItem::createFromList( "SMALL_BLOOD_PUDDLES" ); ! } ! ! if ( blood ) ! { ! blood->setColor(bloodColor); ! blood->setNoDecay( false ); // Override the nodecay tag in the definitions ! blood->moveTo( pos_ ); // Move it to the feet of the victim ! blood->update(); // Send it to all sockets in range ! } } } |
|
From: Sebastian H. <dar...@us...> - 2004-09-29 22:05:20
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13473 Modified Files: loot.py Log Message: Magic item loot fix Index: loot.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/loot.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** loot.py 29 Sep 2004 13:26:39 -0000 1.21 --- loot.py 29 Sep 2004 22:05:10 -0000 1.22 *************** *** 522,544 **** # 10% Jewelry if value > 0.90: ! item = wolfpack.additem(random.choice(DEF_JEWELRY)) # 10% Shield elif value > 0.80: ! item = wolfpack.additem(random.choice(DEF_SHIELDS)) # 40% Armor elif value > 0.40: ! item = wolfpack.additem(random.choice(DEF_ARMOR)) # 40% Weapon else: ! item = wolfpack.additem(random.choice(DEF_ALLWEAPONS)) maxproperties = item[ PACK_MAXPROPERTIES ] minintensity = item[ PACK_MININTENSITY ] maxintensity = item[ PACK_MAXINTENSITY ] ! properties.applyRandom(item, maxproperties, minintensity, maxintensity, luckChance) else: ! item = wolfpack.additem(itemid) ! dropitem(item, char, corpse) # --- 522,544 ---- # 10% Jewelry if value > 0.90: ! citem = wolfpack.additem(random.choice(DEF_JEWELRY)) # 10% Shield elif value > 0.80: ! citem = wolfpack.additem(random.choice(DEF_SHIELDS)) # 40% Armor elif value > 0.40: ! citem = wolfpack.additem(random.choice(DEF_ARMOR)) # 40% Weapon else: ! citem = wolfpack.additem(random.choice(DEF_ALLWEAPONS)) maxproperties = item[ PACK_MAXPROPERTIES ] minintensity = item[ PACK_MININTENSITY ] maxintensity = item[ PACK_MAXINTENSITY ] ! properties.applyRandom(citem, maxproperties, minintensity, maxintensity, luckChance) else: ! citem = wolfpack.additem(itemid) ! dropitem(citem, char, corpse) # |
|
From: Correa <thi...@us...> - 2004-09-29 19:08:27
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4452/network Modified Files: uosocket.cpp Log Message: Fix bug # 0000341 ( set char.orgname on char creation ) Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.420 retrieving revision 1.421 diff -C2 -d -r1.420 -r1.421 *** uosocket.cpp 26 Sep 2004 21:36:23 -0000 1.420 --- uosocket.cpp 29 Sep 2004 19:08:17 -0000 1.421 *************** *** 956,959 **** --- 956,960 ---- pChar->setName( packet->name() ); + pChar->setOrgName( packet->name() ); pChar->setSkin( packet->skinColor() ); |
|
From: Correa <thi...@us...> - 2004-09-29 19:08:26
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4452 Modified Files: ChangeLog Log Message: Fix bug # 0000341 ( set char.orgname on char creation ) Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** ChangeLog 29 Sep 2004 19:05:28 -0000 1.85 --- ChangeLog 29 Sep 2004 19:08:16 -0000 1.86 *************** *** 7,10 **** --- 7,11 ---- - Hopefully fixed crashbug for NPC pathfinding. - Fix bug #0000342 ( "Show Npc Titles" treated as numeric value, instead of boolean ) + - Fix bug # 0000341 ( set char.orgname on char creation ) Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Correa <thi...@us...> - 2004-09-29 19:05:38
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4012 Modified Files: ChangeLog serverconfig.cpp Log Message: Fix bug #0000342 ( "Show Npc Titles" treated as numeric value, instead of boolean ) Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** serverconfig.cpp 19 Sep 2004 16:25:36 -0000 1.10 --- serverconfig.cpp 29 Sep 2004 19:05:29 -0000 1.11 *************** *** 163,167 **** cacheMulFiles_ = getBool( "General", "Cache Mul Files", true, true ); categoryTagAddMenu_ = getBool( "General", "Build AddMenu by Category Tags", true, true ); ! showNpcTitles_ = getNumber( "General", "Show Npc Titles", 1, true ); logMask_ = getNumber( "General", "Logging Mask", LOG_ALL, true ); overwriteDefinitions_ = getBool( "General", "Overwrite Definitions", false, true ); --- 163,167 ---- cacheMulFiles_ = getBool( "General", "Cache Mul Files", true, true ); categoryTagAddMenu_ = getBool( "General", "Build AddMenu by Category Tags", true, true ); ! showNpcTitles_ = getBool( "General", "Show Npc Titles", true, true ); logMask_ = getNumber( "General", "Logging Mask", LOG_ALL, true ); overwriteDefinitions_ = getBool( "General", "Overwrite Definitions", false, true ); Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** ChangeLog 28 Sep 2004 09:49:13 -0000 1.84 --- ChangeLog 29 Sep 2004 19:05:28 -0000 1.85 *************** *** 6,9 **** --- 6,10 ---- - Added an onResurrection event. - Hopefully fixed crashbug for NPC pathfinding. + - Fix bug #0000342 ( "Show Npc Titles" treated as numeric value, instead of boolean ) Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Richard M. <dr...@us...> - 2004-09-29 18:01:16
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23311/definitions/items/armory/ring Modified Files: ringmail_gloves.xml ringmail_leggings.xml ringmail_sleeves.xml ringmail_tunic.xml Log Message: adjusted some sell prices according to stratics bone armor has no sell price, so I gave it a low default. Index: ringmail_tunic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring/ringmail_tunic.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ringmail_tunic.xml 5 Sep 2004 21:02:50 -0000 1.14 --- ringmail_tunic.xml 29 Sep 2004 18:01:06 -0000 1.15 *************** *** 19,23 **** <weight>15.0</weight> <buyprice>218</buyprice> ! <sellprice>109</sellprice> <type>1009</type> <basescripts>equipment</basescripts> --- 19,23 ---- <weight>15.0</weight> <buyprice>218</buyprice> ! <sellprice>84</sellprice> <type>1009</type> <basescripts>equipment</basescripts> Index: ringmail_sleeves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring/ringmail_sleeves.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ringmail_sleeves.xml 5 Sep 2004 21:02:50 -0000 1.14 --- ringmail_sleeves.xml 29 Sep 2004 18:01:06 -0000 1.15 *************** *** 18,22 **** <weight>15</weight> <buyprice>127</buyprice> ! <sellprice>63</sellprice> <type>1009</type> <basescripts>equipment</basescripts> --- 18,22 ---- <weight>15</weight> <buyprice>127</buyprice> ! <sellprice>56</sellprice> <type>1009</type> <basescripts>equipment</basescripts> Index: ringmail_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring/ringmail_leggings.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ringmail_leggings.xml 5 Sep 2004 21:02:50 -0000 1.14 --- ringmail_leggings.xml 29 Sep 2004 18:01:06 -0000 1.15 *************** *** 19,23 **** <weight>15</weight> <buyprice>147</buyprice> ! <sellprice>73</sellprice> <type>1009</type> <basescripts>equipment</basescripts> --- 19,23 ---- <weight>15</weight> <buyprice>147</buyprice> ! <sellprice>62</sellprice> <type>1009</type> <basescripts>equipment</basescripts> Index: ringmail_gloves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/ring/ringmail_gloves.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ringmail_gloves.xml 5 Sep 2004 21:02:50 -0000 1.14 --- ringmail_gloves.xml 29 Sep 2004 18:01:06 -0000 1.15 *************** *** 19,23 **** <weight>2</weight> <buyprice>122</buyprice> ! <sellprice>61</sellprice> <type>1009</type> <basescripts>equipment</basescripts> --- 19,23 ---- <weight>2</weight> <buyprice>122</buyprice> ! <sellprice>66</sellprice> <type>1009</type> <basescripts>equipment</basescripts> |
|
From: Richard M. <dr...@us...> - 2004-09-29 18:01:16
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23311/definitions/items/armory/bone Modified Files: bone_armor.xml bone_arms.xml bone_gloves.xml bone_helm.xml bone_leggings.xml Log Message: adjusted some sell prices according to stratics bone armor has no sell price, so I gave it a low default. Index: bone_arms.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_arms.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** bone_arms.xml 10 Sep 2004 22:17:06 -0000 1.14 --- bone_arms.xml 29 Sep 2004 18:01:04 -0000 1.15 *************** *** 18,21 **** --- 18,22 ---- <weight>2.0</weight> <value>0</value> + <sellprice>15</sellprice> <type>1009</type> <basescripts>equipment</basescripts> Index: bone_gloves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_gloves.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** bone_gloves.xml 10 Sep 2004 22:17:06 -0000 1.14 --- bone_gloves.xml 29 Sep 2004 18:01:04 -0000 1.15 *************** *** 18,21 **** --- 18,22 ---- <weight>2.0</weight> <value>0</value> + <sellprice>15</sellprice> <type>1009</type> <basescripts>equipment</basescripts> Index: bone_armor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_armor.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** bone_armor.xml 10 Sep 2004 22:17:05 -0000 1.14 --- bone_armor.xml 29 Sep 2004 18:01:04 -0000 1.15 *************** *** 19,22 **** --- 19,23 ---- <value>0</value> <type>1009</type> + <sellprice>15</sellprice> <basescripts>equipment</basescripts> <category>Armor\Base\Bone\Bone Armor (N/S)</category> Index: bone_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_leggings.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** bone_leggings.xml 10 Sep 2004 22:17:06 -0000 1.14 --- bone_leggings.xml 29 Sep 2004 18:01:04 -0000 1.15 *************** *** 18,21 **** --- 18,22 ---- <weight>3.0</weight> <value>0</value> + <sellprice>15</sellprice> <type>1009</type> <basescripts>equipment</basescripts> Index: bone_helm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/bone/bone_helm.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** bone_helm.xml 5 Sep 2004 21:02:48 -0000 1.13 --- bone_helm.xml 29 Sep 2004 18:01:04 -0000 1.14 *************** *** 18,21 **** --- 18,22 ---- <weight>3.0</weight> <value>0</value> + <sellprice>15</sellprice> <type>1009</type> <basescripts>equipment</basescripts> |
|
From: Richard M. <dr...@us...> - 2004-09-29 18:01:16
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23311/definitions/items/armory/chain Modified Files: chain_coif.xml chain_leggings.xml chain_tunic.xml Log Message: adjusted some sell prices according to stratics bone armor has no sell price, so I gave it a low default. Index: chain_coif.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_coif.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** chain_coif.xml 5 Sep 2004 21:02:49 -0000 1.13 --- chain_coif.xml 29 Sep 2004 18:01:05 -0000 1.14 *************** *** 19,23 **** <weight>7.0</weight> <buyprice>130</buyprice> ! <sellprice>65</sellprice> <type>1009</type> <basescripts>equipment</basescripts> --- 19,23 ---- <weight>7.0</weight> <buyprice>130</buyprice> ! <sellprice>8</sellprice> <type>1009</type> <basescripts>equipment</basescripts> Index: chain_tunic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_tunic.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** chain_tunic.xml 28 Sep 2004 13:47:30 -0000 1.14 --- chain_tunic.xml 29 Sep 2004 18:01:05 -0000 1.15 *************** *** 19,23 **** <weight>7.0</weight> <buyprice>103</buyprice> ! <sellprice>51</sellprice> <type>1009</type> <basescripts>equipment</basescripts> --- 19,23 ---- <weight>7.0</weight> <buyprice>103</buyprice> ! <sellprice>100</sellprice> <type>1009</type> <basescripts>equipment</basescripts> Index: chain_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chain/chain_leggings.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** chain_leggings.xml 5 Sep 2004 21:02:49 -0000 1.13 --- chain_leggings.xml 29 Sep 2004 18:01:05 -0000 1.14 *************** *** 19,23 **** <weight>7.0</weight> <buyprice>166</buyprice> ! <sellprice>83</sellprice> <type>1009</type> <basescripts>equipment</basescripts> --- 19,23 ---- <weight>7.0</weight> <buyprice>166</buyprice> ! <sellprice>107</sellprice> <type>1009</type> <basescripts>equipment</basescripts> |
|
From: Incanus <inc...@us...> - 2004-09-29 17:11:53
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12908/scripts/skills Modified Files: bowcraft.py Log Message: Fixed repairing bows. Index: bowcraft.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/bowcraft.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** bowcraft.py 20 Sep 2004 04:36:15 -0000 1.18 --- bowcraft.py 29 Sep 2004 17:11:43 -0000 1.19 *************** *** 199,203 **** player.socket.clilocmessage(500424) item.delete() ! elif player.checkskill(TAILORING, 0, 1000): player.socket.clilocmessage(1044279) item.maxhealth -= weaken --- 199,203 ---- player.socket.clilocmessage(500424) item.delete() ! elif player.checkskill(BOWCRAFT, 0, 1000): player.socket.clilocmessage(1044279) item.maxhealth -= weaken |
|
From: Incanus <inc...@us...> - 2004-09-29 17:11:53
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12908/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: Fixed repairing bows. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** ChangeLog.wolfpack 29 Sep 2004 01:43:56 -0000 1.127 --- ChangeLog.wolfpack 29 Sep 2004 17:11:34 -0000 1.128 *************** *** 25,28 **** --- 25,29 ---- - Fixed cutting up leather. - Fixed bug #0000325. (furniture not showing exceptional mark) + - Fixed repairing bows. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-09-29 13:31:22
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32344/system Modified Files: lootlists.py Log Message: hats for armor yay Index: lootlists.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/lootlists.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** lootlists.py 29 Sep 2004 13:01:34 -0000 1.12 --- lootlists.py 29 Sep 2004 13:31:10 -0000 1.13 *************** *** 36,41 **** DEF_SHIELDS = ['1b72', '1b73', '1bc3', '1b76', '1b77', '1b74', '1b75', '1b7b', '1bc4', '1bc5', '1b78', '1b79', '1b79'] DEF_ORCHEADGEAR = DEF_ORCMASKS + DEF_ORCHELMS ! DEF_ARMOR = DEF_LEATHER + DEF_STUDDED + DEF_CHAINMAIL + DEF_RINGMAIL + DEF_BONEMAIL + DEF_PLATEMAIL + DEF_HELMS ! DEF_ALLARMOR = DEF_HATS + DEF_LEATHER + DEF_STUDDED + DEF_CHAINMAIL + DEF_RINGMAIL + DEF_BONEMAIL + DEF_PLATEMAIL + DEF_DRAGONMAIL + DEF_HELMS + DEF_SHIELDS + DEF_SHIELDS # Misc Equipment Lists --- 36,41 ---- DEF_SHIELDS = ['1b72', '1b73', '1bc3', '1b76', '1b77', '1b74', '1b75', '1b7b', '1bc4', '1bc5', '1b78', '1b79', '1b79'] DEF_ORCHEADGEAR = DEF_ORCMASKS + DEF_ORCHELMS ! DEF_ARMOR = DEF_LEATHER + DEF_STUDDED + DEF_CHAINMAIL + DEF_RINGMAIL + DEF_BONEMAIL + DEF_PLATEMAIL + DEF_HELMS + DEF_HATS ! DEF_ALLARMOR = DEF_HATS + DEF_LEATHER + DEF_STUDDED + DEF_CHAINMAIL + DEF_RINGMAIL + DEF_BONEMAIL + DEF_PLATEMAIL + DEF_DRAGONMAIL + DEF_HELMS + DEF_SHIELDS # Misc Equipment Lists |
|
From: Sebastian H. <dar...@us...> - 2004-09-29 13:26:48
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31564/system Modified Files: loot.py Log Message: Fixed loot propability. Index: loot.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/loot.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** loot.py 27 Sep 2004 14:37:27 -0000 1.20 --- loot.py 29 Sep 2004 13:26:39 -0000 1.21 *************** *** 517,524 **** if itemid == 'RANDOM_MAGIC_ITEM': maxproperties = item[ PACK_MAXPROPERTIES ] minintensity = item[ PACK_MININTENSITY ] maxintensity = item[ PACK_MAXINTENSITY ] - item = wolfpack.additem(random.choice(RANDOM_MAGIC_ITEMS)) properties.applyRandom(item, maxproperties, minintensity, maxintensity, luckChance) else: --- 517,539 ---- if itemid == 'RANDOM_MAGIC_ITEM': + # Select the item-id + value = random.random() + + # 10% Jewelry + if value > 0.90: + item = wolfpack.additem(random.choice(DEF_JEWELRY)) + # 10% Shield + elif value > 0.80: + item = wolfpack.additem(random.choice(DEF_SHIELDS)) + # 40% Armor + elif value > 0.40: + item = wolfpack.additem(random.choice(DEF_ARMOR)) + # 40% Weapon + else: + item = wolfpack.additem(random.choice(DEF_ALLWEAPONS)) + maxproperties = item[ PACK_MAXPROPERTIES ] minintensity = item[ PACK_MININTENSITY ] maxintensity = item[ PACK_MAXINTENSITY ] properties.applyRandom(item, maxproperties, minintensity, maxintensity, luckChance) else: |
|
From: Sebastian H. <dar...@us...> - 2004-09-29 13:01:46
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26900 Modified Files: equipment.py Log Message: Fixes Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** equipment.py 29 Sep 2004 12:33:21 -0000 1.43 --- equipment.py 29 Sep 2004 13:01:33 -0000 1.44 *************** *** 44,62 **** tooltip.add(1060442, str(reflectphysical)) - castrecovery = properties.fromitem(object, CASTRECOVERYBONUS) - - if castrecovery: - tooltip.add(1060412, str(castrecovery)) - - castspeed = properties.fromitem(object, CASTSPEEDBONUS) - - if castspeed: - tooltip.add(1060413, str(castspeed)) - - spelldamagebonus = properties.fromitem(object, SPELLDAMAGEBONUS) - - if spelldamagebonus: - tooltip.add(1060483, str(spelldamagebonus)) - luck = properties.fromitem(object, LUCK) if luck != 0: --- 44,47 ---- *************** *** 106,110 **** tooltip.add(1060438, str(mageweapon)) ! if properties.fromitem(object, MAGEARMOR): tooltip.add(1060437, "") --- 91,95 ---- tooltip.add(1060438, str(mageweapon)) ! if properties.fromitem(object, MAGEARMOR) and not object.allowmeditation: tooltip.add(1060437, "") *************** *** 282,285 **** --- 267,289 ---- if spellchanneling: tooltip.add(1060482, "") + else: + spellchanneling = False + + # Those are only relevant if its not a shield/weapon or for spellchanneling items + if (not weapon and not shield) or spellchanneling: + castrecovery = properties.fromitem(object, CASTRECOVERYBONUS) + + if castrecovery: + tooltip.add(1060412, str(castrecovery)) + + castspeed = properties.fromitem(object, CASTSPEEDBONUS) + + if castspeed: + tooltip.add(1060413, str(castspeed)) + + spelldamagebonus = properties.fromitem(object, SPELLDAMAGEBONUS) + + if spelldamagebonus: + tooltip.add(1060483, str(spelldamagebonus)) physical = properties.fromitem(object, RESISTANCE_PHYSICAL) |
|
From: Sebastian H. <dar...@us...> - 2004-09-29 13:01:46
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26900/system Modified Files: lootlists.py Log Message: Fixes Index: lootlists.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/lootlists.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lootlists.py 28 Sep 2004 21:47:50 -0000 1.11 --- lootlists.py 29 Sep 2004 13:01:34 -0000 1.12 *************** *** 9,13 **** '26cb', '26c1', 'f60', 'f61', '13b7', '13b8', '13fe', '13ff', '143e', '143f', '1440', '1441', '26ce', '26cf', 'e85', 'e86', '13b9', '13ba', 'ec4', 'ec5', '26c4', '26ba', '13b5', '13b6'] ! DEF_WEAPONS_AXES = ['f49', 'f4a', 'f47', 'f48', 'f4b', 'f4c', '1143', 'f45', 'f46', '13fa', '13fb', 'f43', 'f44'] DEF_WEAPONS_MACES = ['df0', 'df1', '13b3', '13b4', '13f8', '13f9', '143d', '143c', 'f5c', 'f5d', '143a', '143b', 'e89', 'e8a', '26c6', '26bc', '13f4', '13f5', 'fb4', 'fb5', '13e3', '13e4', '13af', '13b0', '1438', '1439', '1406', '1407'] --- 9,13 ---- '26cb', '26c1', 'f60', 'f61', '13b7', '13b8', '13fe', '13ff', '143e', '143f', '1440', '1441', '26ce', '26cf', 'e85', 'e86', '13b9', '13ba', 'ec4', 'ec5', '26c4', '26ba', '13b5', '13b6'] ! DEF_WEAPONS_AXES = ['f49', 'f4a', 'f47', 'f48', 'f4b', 'f4c', 'f45', 'f46', '13fa', '13fb', 'f43', 'f44'] DEF_WEAPONS_MACES = ['df0', 'df1', '13b3', '13b4', '13f8', '13f9', '143d', '143c', 'f5c', 'f5d', '143a', '143b', 'e89', 'e8a', '26c6', '26bc', '13f4', '13f5', 'fb4', 'fb5', '13e3', '13e4', '13af', '13b0', '1438', '1439', '1406', '1407'] |
|
From: Sebastian H. <dar...@us...> - 2004-09-29 12:33:40
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20813 Modified Files: equipment.py Log Message: removed the object delay for equipping items by dclicking them Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** equipment.py 27 Sep 2004 17:42:33 -0000 1.42 --- equipment.py 29 Sep 2004 12:33:21 -0000 1.43 *************** *** 706,713 **** item.soundeffect(0x57) player.updatestats() ! for script in scripts[scripts.index("equipment")+1:]: if wolfpack.hasevent(script, EVENT_USE): ! return 0 return 1 --- 706,716 ---- item.soundeffect(0x57) player.updatestats() ! ! # Remove the use delay, equipping should be for free... ! player.objectdelay = 0 ! for script in scripts[scripts.index("equipment")+1:]: if wolfpack.hasevent(script, EVENT_USE): ! return 0 return 1 |
|
From: Sebastian H. <dar...@us...> - 2004-09-29 10:45:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31931 Modified Files: environment.py Log Message: Dyetub Fix Index: environment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/environment.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** environment.py 29 Sep 2004 10:43:12 -0000 1.19 --- environment.py 29 Sep 2004 10:44:46 -0000 1.20 *************** *** 199,203 **** # Dying Tub def dyingtub( char, item ): ! if not char.canreach( item, 2 ) or item.getoutmostchar(): char.socket.sysmessage( localemsg( 6 ) ) return 1 --- 199,203 ---- # Dying Tub def dyingtub( char, item ): ! if not char.canreach( item, 2 ): char.socket.sysmessage( localemsg( 6 ) ) return 1 *************** *** 210,214 **** dyetub = wolfpack.finditem( args[0] ) ! if not dyetub or (not char.canreach( dyetub, 2 ) and dyetub.getoutmostchar() != char): char.message( localemsg( 6 ) ) return --- 210,214 ---- dyetub = wolfpack.finditem( args[0] ) ! if not dyetub or not char.canreach( dyetub, 2 ): char.message( localemsg( 6 ) ) return |
|
From: Sebastian H. <dar...@us...> - 2004-09-29 10:43:25
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31747 Modified Files: environment.py Log Message: dyetub and potion fix Index: environment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/environment.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** environment.py 20 Sep 2004 04:28:23 -0000 1.18 --- environment.py 29 Sep 2004 10:43:12 -0000 1.19 *************** *** 210,214 **** dyetub = wolfpack.finditem( args[0] ) ! if not dyetub or not char.canreach( dyetub, 2 ): char.message( localemsg( 6 ) ) return --- 210,214 ---- dyetub = wolfpack.finditem( args[0] ) ! if not dyetub or (not char.canreach( dyetub, 2 ) and dyetub.getoutmostchar() != char): char.message( localemsg( 6 ) ) return |
