wpdev-commits Mailing List for Wolfpack Emu (Page 14)
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: Incanus <inc...@us...> - 2004-10-14 22:51:52
|
Update of /cvsroot/wpdev/xmlscripts/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31659/web Modified Files: status_template.html Log Message: Invis GMs are not shown on server status anymore Index: status_template.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/status_template.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** status_template.html 28 Aug 2004 16:42:49 -0000 1.3 --- status_template.html 14 Oct 2004 22:51:42 -0000 1.4 *************** *** 82,86 **** <td width="520"><strong>Connected Accounts:</strong> <%=wolfpack.sockets.count()%> of <%=wolfpack.accounts.count()%><br /> <br /> ! <strong>Player Characters:</strong> <%=wolfpack.playercount()%> <br /> <strong>NPCs:</strong> <%=wolfpack.npccount()%> <br /> <strong>Items:</strong> <%=wolfpack.itemcount()%> <br /> --- 82,96 ---- <td width="520"><strong>Connected Accounts:</strong> <%=wolfpack.sockets.count()%> of <%=wolfpack.accounts.count()%><br /> <br /> ! <% ! socket = wolfpack.sockets.first() ! nextsocket = wolfpack.sockets.next() ! count_players = 0 ! while socket: ! if( socket.player and not socket.player.invisible ): ! count_players+=1 ! socket = nextsocket ! nextsocket = wolfpack.sockets.next() ! %> ! <strong>Player Characters:</strong> <%=count_players%> <br /> <strong>NPCs:</strong> <%=wolfpack.npccount()%> <br /> <strong>Items:</strong> <%=wolfpack.itemcount()%> <br /> *************** *** 92,96 **** nextsocket = wolfpack.sockets.next() while socket: ! if socket.player: %> <tr> --- 102,106 ---- nextsocket = wolfpack.sockets.next() while socket: ! if( socket.player and not socket.player.invisible ): %> <tr> *************** *** 131,135 **** %></tr> <% ! if nextsocket and nextsocket.player: %> <tr><td colspan="2" bgcolor="#DDDDDD"><img src="spacer.gif" width="1" height="1"></td></tr> --- 141,145 ---- %></tr> <% ! if( nextsocket and nextsocket.player and not nextsocket.player.invisible ): %> <tr><td colspan="2" bgcolor="#DDDDDD"><img src="spacer.gif" width="1" height="1"></td></tr> |
|
From: Incanus <inc...@us...> - 2004-10-14 22:51:52
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31659/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: Invis GMs are not shown on server status anymore Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.153 retrieving revision 1.154 diff -C2 -d -r1.153 -r1.154 *** ChangeLog.wolfpack 14 Oct 2004 15:36:23 -0000 1.153 --- ChangeLog.wolfpack 14 Oct 2004 22:51:41 -0000 1.154 *************** *** 68,71 **** --- 68,72 ---- - Fixed hunger for players. - Fixed a bug in trainmenus (training above skillcap) + - Invis GMs are not shown on server status anymore. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 18:02:31
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25048 Modified Files: serverconfig.cpp Log Message: updates for 12.9.11 Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** serverconfig.cpp 14 Oct 2004 02:03:08 -0000 1.14 --- serverconfig.cpp 14 Oct 2004 18:02:16 -0000 1.15 *************** *** 134,138 **** snoopdelay_ = getNumber( "Game Speed", "Snoop Delay", 7, true ); housedecay_secs_ = getNumber( "Game Speed", "House Decay-Sec.", 604800, true ); ! spawnRegionCheckTime_ = getNumber( "Game Speed", "SpawnRegion Check Time", 300, true ); itemDecayTime_ = getNumber( "Game Speed", "Item Decay Time", 300, true ); corpseDecayTime_ = getNumber( "Game Speed", "Corpse Decay Time", 600, true ); --- 134,138 ---- snoopdelay_ = getNumber( "Game Speed", "Snoop Delay", 7, true ); housedecay_secs_ = getNumber( "Game Speed", "House Decay-Sec.", 604800, true ); ! spawnRegionCheckTime_ = getNumber( "Game Speed", "SpawnRegion Check Time", 5, true ); itemDecayTime_ = getNumber( "Game Speed", "Item Decay Time", 300, true ); corpseDecayTime_ = getNumber( "Game Speed", "Corpse Decay Time", 600, true ); |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 17:59:28
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24354/system Modified Files: encryption.xml Log Message: new encryption support Index: encryption.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/encryption.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** encryption.xml 2 Sep 2004 17:36:25 -0000 1.5 --- encryption.xml 14 Oct 2004 17:59:18 -0000 1.6 *************** *** 12,15 **** --- 12,16 ---- <!-- Client identification string (optional) ; Key1 ; Key2 --> + <item> Client 4.0.5 ; 0x2F0B97AC ; 0xA290DE7F </item> <item> Client 4.0.4 ; 0x2EF385BD ; 0xA26D127F </item> <item> Client 4.0.3 ; 0x2EBBB7CD ; 0xA2495E7F </item> *************** *** 20,24 **** <item> Client 3.0.7 ; 0x2C1BC78D ; 0xA31BFE7F </item> <item> Client 3.0.6 ; 0x2CC3ED9D ; 0xA374227F </item> ! <item> Client 3.0.5 ; 0x2C8B97AD ; 0xA350DE7F </item> </list> </definitions> --- 21,25 ---- <item> Client 3.0.7 ; 0x2C1BC78D ; 0xA31BFE7F </item> <item> Client 3.0.6 ; 0x2CC3ED9D ; 0xA374227F </item> ! <item> Client 3.0.5 ; 0x2C8B97AD ; 0xA350DE7F </item> </list> </definitions> |
|
From: Correa <thi...@us...> - 2004-10-14 16:55:45
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5466 Modified Files: platform.h Log Message: Better platform.h :) Index: platform.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/platform.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** platform.h 20 Sep 2004 04:32:14 -0000 1.17 --- platform.h 14 Oct 2004 16:55:34 -0000 1.18 *************** *** 1,98 **** ! //======================================================================== ! //File: platform.h ! //======================================================================== ! // Copyright (c) 2001 by Sheppard Norfleet and Charles Kerr ! // All Rights Reserved ! // ! // Redistribution and use in source and binary forms, with or without ! // modification, are permitted provided the following conditions are met: ! // ! // Redistributions of source code must retain the above copyright notice, ! // this list of conditions and the following disclaimer. Redistributions ! // in binary form must reproduce the above copyright notice, this list of ! // conditions and the following disclaimer in the documentation and/or ! // other materials provided with the distribution. ! // ! // Neither the name of the SWORDS nor the names of its contributors may ! // be used to endorse or promote products derived from this software ! // without specific prior written permission. ! // ! // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! // `AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! // A PARTICULAR PURPOSE ARE DISCLAIMED. . ! //======================================================================== ! #ifndef IN_PLATFORM_H ! #define IN_PLATFORM_H ! //======================================================================== ! enum enByteOrder ! { ! littleEndian, ! bigEndian ! }; ! #define BYTEORDER littleEndian ! // We have to worry about Intel's compilier as well ! ! #if defined(_MSC_VER) | defined(__INTEL_COMPILER) | defined(__BORLANDC__) ! ! //PRAGMAS ! ! //#pragma pack(1) ! #pragma pack(8) ! // no global pack for windows ! ! // packing is activated on per struct basis ! // #include start_pack ! // struct bla ! // { ! // ... ! // } PACK ! // #include stop_pack ! // ! // if we want global packing for windows ! // (for linux its not possible due to bus errors you'll get then) ! // you'd have to de-activate global packing BEFORE including any(!) stl headers ! #pragma warning(disable: 4514) ! #pragma warning(disable: 4786) ! #pragma warning(disable: 4710) ! #pragma warning(disable: 4702) ! // The intel compilier doesnt like this one ! #pragma warning(disable: 985) ! //#pragma optimize("y", off) ! #define OBSOLETETIME ! #define PACK #endif - //======================================================================== - /// GCC - #if defined(__GNUG__) ! #if defined(WIN32) // mingw needs these ! #define OBSOLETETIME #endif ! #define PACK __attribute__((packed)) ! #if __GNUC__ > 2 && !defined(WIN32) ! #undef OBSOLETESTREAM ! #else ! #if __GNUC_MINOR__ < 95 ! #define in_addr_t UI32 ! #endif ! #define OLDGCC ! #define stringstream strstream ! #define sstream strstream ! #define OBSOLETESTREAM ! #endif #endif ! #ifdef Q_OS_FREEBSD ! #include <math.h> ! inline float ceilf(float _X) ! {return ((float)ceil((double)_X)); } #endif - //======================================================================== typedef unsigned long UI32; typedef unsigned short UI16; --- 1,89 ---- ! /* ! * Wolfpack Emu (WP) ! * UO Server Emulation Program ! * ! * Copyright 2001-2004 by holders identified in AUTHORS.txt ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. ! * ! * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA. ! * ! * In addition to that license, if you are running this program or modified ! * versions of it on a public system you HAVE TO make the complete source of ! * the version used by you available or provide people with a location to ! * download it. ! * ! * Wolfpack Homepage: http://wpdev.sf.net/ ! */ ! #if !defined( __PLATFORM_H__ ) ! #define __PLATFORM_H__ ! #include <qglobal.h> ! #if defined(Q_CC_MSVC) | defined(Q_CC_INTEL) | defined(Q_CC_BOR) ! # pragma pack(8) ! # pragma warning(disable: 4514) ! # pragma warning(disable: 4786) ! # pragma warning(disable: 4710) ! # pragma warning(disable: 4702) + // The intel compiler doesn't like this one + # pragma warning(disable: 985) + # define PACK #endif ! #if defined(Q_CC_GNU) ! # define PACK __attribute__((packed)) #endif ! #if defined (Q_OS_FREEBSD) ! # include <math.h> ! inline float ceilf(float _X) ! {return ((float)ceil((double)_X)); } #endif ! /*! ! * The WP_ISLIKELY macro tags a boolean expression as likely to evaluate to ! * 'true'. When used in an if ( ) statement, it gives a hint to the compiler ! * that the following code block is likely to get executed. Providing this ! * information helps the compiler to optimize the code for better performance. ! * Using the macro has an insignificant code size or runtime memory footprint impact. ! * The code semantics is not affected. ! * ! * \note ! * Providing wrong information ( like marking a condition that almost never ! * passes as 'likely' ) will cause a significant runtime slowdown. Therefore only ! * use it for cases where you can be sure about the odds of the expression to pass ! * in all cases ( independent from e.g. user configuration ). ! * ! * \par ! * The WP_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. ! * ! * \note ! * Do NOT use ( !WP_ISLIKELY(foo) ) as an replacement for WP_ISUNLIKELY ! ! * ! * \code ! * if ( WP_ISUNLIKELY( testsomething() ) ) ! * abort(); // assume its unlikely that the application aborts ! * \endcode ! */ ! #if __GNUC__ - 0 >= 3 ! # define WP_ISLIKELY( x ) __builtin_expect(!!(x),1) ! # define WP_ISUNLIKELY( x ) __builtin_expect(!!(x),0) ! #else ! # define WP_ISLIKELY( x ) ( x ) ! # define WP_ISUNLIKELY( x ) ( x ) #endif typedef unsigned long UI32; typedef unsigned short UI16; *************** *** 103,112 **** typedef float RF32; typedef double RF64; - //======================================================================== - //======================================================================== - //======================================================================== - //====================== End of platform.h ============================= - //======================================================================== - //======================================================================== ! #endif --- 94,97 ---- typedef float RF32; typedef double RF64; ! #endif // __PLATFORM_H__ |
|
From: Correa <thi...@us...> - 2004-10-14 16:30:54
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30446 Modified Files: ChangeLog player.cpp Log Message: Fix bug #302 ( Char should face mount's direction after mouting ) Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -d -r1.137 -r1.138 *** player.cpp 9 Oct 2004 14:28:59 -0000 1.137 --- player.cpp 14 Oct 2004 16:30:40 -0000 1.138 *************** *** 543,547 **** pMountItem->setId( 0x3EBE ); break; // armor dragon } ! this->addItem( cBaseChar::Mount, pMountItem ); pMountItem->setTag( "pet", cVariant( pMount->serial() ) ); --- 543,548 ---- pMountItem->setId( 0x3EBE ); break; // armor dragon } ! ! this->setDirection( pMount->direction() ); this->addItem( cBaseChar::Mount, pMountItem ); pMountItem->setTag( "pet", cVariant( pMount->serial() ) ); *************** *** 553,557 **** pMount->setOwner( this ); } ! // remove it from screen! pMount->bark( Bark_Idle ); --- 554,558 ---- pMount->setOwner( this ); } ! // remove it from screen! pMount->bark( Bark_Idle ); Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** ChangeLog 14 Oct 2004 00:24:53 -0000 1.109 --- ChangeLog 14 Oct 2004 16:30:40 -0000 1.110 *************** *** 50,53 **** --- 50,54 ---- - Made the spawnregion info gump show the active/inactive state and the groups for spawnregions. - Fix for items on very high z values interfering with walking. + - Fix bug #302 ( Char should face mount's direction after mouting ) Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Incanus <inc...@us...> - 2004-10-14 15:36:33
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18034/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: Fixed training above skillcap Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -d -r1.152 -r1.153 *** ChangeLog.wolfpack 14 Oct 2004 01:59:21 -0000 1.152 --- ChangeLog.wolfpack 14 Oct 2004 15:36:23 -0000 1.153 *************** *** 67,70 **** --- 67,71 ---- - Implemented item enhancement via tailoring and blacksmithing. - Fixed hunger for players. + - Fixed a bug in trainmenus (training above skillcap) * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Incanus <inc...@us...> - 2004-10-14 15:32:21
|
Update of /cvsroot/wpdev/xmlscripts/scripts/contextmenus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17037/scripts/contextmenus Modified Files: trainmenu.py Log Message: Fixed training above skillcap Index: trainmenu.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/contextmenus/trainmenu.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** trainmenu.py 18 Sep 2004 19:53:36 -0000 1.10 --- trainmenu.py 14 Oct 2004 15:32:11 -0000 1.11 *************** *** 1,107 **** ! ################################################################# ! # ) (\_ # WOLFPACK 13.0.0 Scripts # ! # (( _/{ "-; # Created by: Correa # ! # )).-' {{ ;'` # Revised by: # ! # ( ( ;._ \\ ctr # Last Modification: # ! ################################################################# ! ! import wolfpack.settings ! import skills ! from wolfpack.consts import * ! ! MAX_TEACHING = 300 ! MIN_TEACHING = 20 ! ! # onContextCheckVisible ! def onContextCheckVisible( char, target, tag ): ! if (target.skill[tag - 1] >= 300): ! return 1 # visible ! ! return 0 # not visible ! ! def onContextCheckEnabled( char, target, tag ): ! skill = tag - 1 ! if ( skill == STEALTH and char.skill[ HIDING ] < 800 ): ! return 0 # disabled ! if ( skill == REMOVETRAPS and ( char.skill[ LOCKPICKING ] < 500 or char.skill[ DETECTINGHIDDEN ] < 500 ) ): ! return 0 # disabled ! if ( char.skill[ skill ] >= MAX_TEACHING ): ! return 0 # disabled ! else: ! return 1 #enabled ! ! def onContextEntry( char, target, tag ): ! ! skill = tag - 1 ! if ( char.dead or skill < 0 ): ! return 1 ! ! baseToSet = target.skill[ skill ] / ( 1000 / MAX_TEACHING ) ! if ( baseToSet > MAX_TEACHING ): ! baseToSet = MAX_TEACHING ! elif ( baseToSet < MIN_TEACHING ): ! target.say( str( baseToSet ) ) ! return 1 ! pointsToLearn = baseToSet - char.skill[ skill ] ! if ( pointsToLearn < 0 ): # Player knows more than me ! return 1 ! ! target.say( 1019077, args = "", affix = " " + str( pointsToLearn*10 ), prepend = 0, socket = char.socket ) # I will teach thee all I know, if paid the amount in full. The price is: ! target.say( 1043108, socket = char.socket ) #For less I shall teach thee less. ! char.settag("npctrainer", str( target.serial ) ) ! char.settag("trainningskill", str( skill ) ) ! return 1 ! ! def onDropOnChar( char, item ): ! ! if ( item.id != 0xeed ): ! return 0 # not what we expected :( ! ! dropper = item.container ! if ( dropper.gettag("npctrainer") == str( char.serial ) and dropper.hastag("trainningskill") ): ! skill = int( dropper.gettag("trainningskill") ) ! dropper.deltag("npctrainer") ! dropper.deltag("trainningskill") ! amount = item.amount / 10 ! ! if ( amount > MAX_TEACHING ): ! amount = MAX_TEACHING ! ! # check for skill cap ! cap = wolfpack.settings.getnumber("General", "SkillCap", 700) * 10 ! ! sum = 0 ! skills = dropper.skill ! for i in range(0, ALLSKILLS): ! sum += skills[i] ! ! if ( sum >= cap ): ! return 0 ! ! baseToSet = char.skill[ skill ] / ( 1000 / MAX_TEACHING ) ! if ( baseToSet > MAX_TEACHING ): ! baseToSet = MAX_TEACHING ! elif ( baseToSet < MIN_TEACHING ): ! char.say( str( baseToSet ) ) ! return 0 ! ! if ( baseToSet + sum > cap ): ! baseToSet = cap - sum ! ! pointsToLearn = baseToSet - dropper.skill[ skill ] ! if ( pointsToLearn < 0 ): # Player knows more than me ! return 0 ! ! if ( amount > pointsToLearn ): ! amount = pointsToLearn ! item.amount = item.amount - amount * 10 ! else: ! item.delete() ! ! dropper.skill[skill] = dropper.skill[skill] + amount ! ! char.say( 501539 ) # Let me show thee something of how this is done. ! return 1 ! return 0 ! ! --- 1,114 ---- ! ################################################################# ! # ) (\_ # WOLFPACK 13.0.0 Scripts # ! # (( _/{ "-; # Created by: Correa # ! # )).-' {{ ;'` # Revised by: # ! # ( ( ;._ \\ ctr # Last Modification: # ! ################################################################# ! ! import wolfpack.settings ! import skills ! from wolfpack.consts import * ! ! MAX_TEACHING = 300 ! MIN_TEACHING = 20 ! ! def onContextCheckVisible( char, target, tag ): ! if (target.skill[tag - 1] >= 300): ! return True # visible ! ! return False # not visible ! ! def onContextCheckEnabled( char, target, tag ): ! skill = tag - 1 ! if ( skill == STEALTH and char.skill[ HIDING ] < 800 ): ! return False # disabled ! if ( skill == REMOVETRAPS and ( char.skill[ LOCKPICKING ] < 500 or char.skill[ DETECTINGHIDDEN ] < 500 ) ): ! return False # disabled ! if ( char.skill[ skill ] >= MAX_TEACHING ): ! return False # disabled ! if ( char.skill[ skill ] >= char.skillcap[ skill ] ): ! return False # disabled ! else: ! return True #enabled ! ! def onContextEntry( char, target, tag ): ! skill = tag - 1 ! if ( char.dead or skill < 0 ): ! return True ! ! baseToSet = target.skill[ skill ] / ( 1000 / MAX_TEACHING ) ! if ( baseToSet > MAX_TEACHING ): ! baseToSet = MAX_TEACHING ! elif ( baseToSet < MIN_TEACHING ): ! #target.say( str( baseToSet ) ) ! return True ! pointsToLearn = baseToSet - char.skill[ skill ] ! #it shouldn't be able to teach a skill above the chars skillcap ! pointsToLearn = min( pointsToLearn, char.skillcap[ skill ] - char.skill[ skill ] ) ! if ( pointsToLearn <= 0 ): # Player knows more than me ! return True ! ! target.say( 1019077, args = "", affix = " " + str( pointsToLearn*10 ), prepend = 0, socket = char.socket ) # I will teach thee all I know, if paid the amount in full. The price is: ! target.say( 1043108, socket = char.socket ) #For less I shall teach thee less. ! char.settag("npctrainer", str( target.serial ) ) ! char.settag("trainningskill", str( skill ) ) ! return True ! ! def onDropOnChar( char, item ): ! if ( item.baseid != 'eed' ): ! return False # not what we expected :( ! ! dropper = item.container ! if ( dropper.gettag("npctrainer") == str( char.serial ) and dropper.hastag("trainningskill") ): ! skill = int( dropper.gettag("trainningskill") ) ! dropper.deltag("npctrainer") ! dropper.deltag("trainningskill") ! amount = item.amount / 10 ! ! if ( amount == 0 ): ! #we will be nice and give him his gold back ! return False ! ! if ( amount > MAX_TEACHING ): ! amount = MAX_TEACHING ! ! # check for skill cap ! cap = wolfpack.settings.getnumber("General", "SkillCap", 700) * 10 ! ! sum = 0 ! skills = dropper.skill ! for i in range(0, ALLSKILLS): ! sum += skills[i] ! ! if ( sum >= cap ): ! return False ! ! baseToSet = char.skill[ skill ] / ( 1000 / MAX_TEACHING ) ! if ( baseToSet > MAX_TEACHING ): ! baseToSet = MAX_TEACHING ! elif ( baseToSet < MIN_TEACHING ): ! #char.say( str( baseToSet ) ) ! return False ! ! if ( baseToSet + sum > cap ): ! baseToSet = cap - sum ! ! pointsToLearn = baseToSet - dropper.skill[ skill ] ! #it shouldn't be able to teach a skill above the chars skillcap ! pointsToLearn = min( pointsToLearn, dropper.skillcap[ skill ] - dropper.skill[ skill ] ) ! if ( pointsToLearn <= 0 ): # Player knows more than me ! return False ! ! if ( amount > pointsToLearn ): ! amount = pointsToLearn ! item.amount = item.amount - amount * 10 ! else: ! item.delete() ! ! dropper.skill[skill] = dropper.skill[skill] + amount ! ! char.say( 501539 ) # Let me show thee something of how this is done. ! return True ! return False ! ! |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 02:03:19
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16491 Modified Files: serverconfig.cpp Log Message: hunger fix Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** serverconfig.cpp 9 Oct 2004 14:28:59 -0000 1.13 --- serverconfig.cpp 14 Oct 2004 02:03:08 -0000 1.14 *************** *** 129,133 **** maxStealthSteps_ = getNumber( "Game Speed", "Max Stealth Steps", 10, true ); runningStamSteps_ = getNumber( "Game Speed", "Running Stamina Steps", 15, true ); ! hungerRate_ = getNumber( "Game Speed", "Hunger Rate", 6000, true ); hungerDamageRate_ = getNumber( "Game Speed", "Hunger Damage Rate", 10, true ); boatSpeed_ = getDouble( "Game Speed", "Boat Speed", 0.750000, true ); --- 129,133 ---- maxStealthSteps_ = getNumber( "Game Speed", "Max Stealth Steps", 10, true ); runningStamSteps_ = getNumber( "Game Speed", "Running Stamina Steps", 15, true ); ! hungerRate_ = getNumber( "Game Speed", "Hunger Rate", 120, true ); hungerDamageRate_ = getNumber( "Game Speed", "Hunger Damage Rate", 10, true ); boatSpeed_ = getDouble( "Game Speed", "Boat Speed", 0.750000, true ); |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 02:02:40
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16340 Modified Files: timing.cpp Log Message: hunger fix Index: timing.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** timing.cpp 11 Oct 2004 19:03:42 -0000 1.18 --- timing.cpp 14 Oct 2004 02:02:28 -0000 1.19 *************** *** 410,436 **** } - // All food related things are disabled for gms - if ( player->isGMorCounselor() ) - { - // Decrease food level - if ( Config::instance()->hungerRate() > 1 && ( player->hungerTime() <= time ) ) - { - if ( player->hunger() ) - player->setHunger( player->hunger() - 1 ); - - player->setHungerTime( time + Config::instance()->hungerRate() * MY_CLOCKS_PER_SEC ); - } - - // Damage if we are starving - if ( Config::instance()->hungerDamage() && nextHungerCheck <= time ) - { - if ( player->hitpoints() > 0 && player->hunger() < 2 && !player->isDead() ) - { - socket->sysMessage( tr( "You are starving." ) ); - player->damage( DAMAGE_HUNGER, Config::instance()->hungerDamage() ); - } - } - } - stopProfiling(PF_PLAYERCHECK); } --- 410,413 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 01:59:40
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15561/webroot Modified Files: ChangeLog.wolfpack Log Message: hunger fix Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.151 retrieving revision 1.152 diff -C2 -d -r1.151 -r1.152 *** ChangeLog.wolfpack 13 Oct 2004 18:45:26 -0000 1.151 --- ChangeLog.wolfpack 14 Oct 2004 01:59:21 -0000 1.152 *************** *** 66,69 **** --- 66,70 ---- - Making runebooks now allows to use all 4 types of runes. - Implemented item enhancement via tailoring and blacksmithing. + - Fixed hunger for players. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 01:59:16
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15464/commands Modified Files: wipe.py Log Message: hunger fix Index: wipe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/wipe.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wipe.py 11 Oct 2004 20:24:22 -0000 1.8 --- wipe.py 14 Oct 2004 01:59:00 -0000 1.9 *************** *** 35,47 **** #from wolfpack.utilities import * ! def getBoundingBox( socket, callback ) : ! socket.attachtarget( "commands.wipe.getBoundingBoxResponse", [0, callback] ) return def getBoundingBoxResponse( char, args, target ): if args[0] == 0: ! char.socket.attachtarget("commands.wipe.getBoundingBoxResponse", [1, args[1], target] ) else: ! args[1]( char.socket, args[2], target ) return --- 35,47 ---- #from wolfpack.utilities import * ! def getBoundingBox( socket, callback, args ) : ! socket.attachtarget( "commands.wipe.getBoundingBoxResponse", [0, callback, None, args] ) return def getBoundingBoxResponse( char, args, target ): if args[0] == 0: ! char.socket.attachtarget("commands.wipe.getBoundingBoxResponse", [1, args[1], target, args[3]] ) else: ! args[1]( char.socket, args[2], target, args[3] ) return *************** *** 49,58 **** if len( argstring ) > 0: if argstring.lower() == "all": ! gump = WarningGump( 1060635, 30720, "Wipping <i>all</i> items in the world.<br>Do you wish to proceed?", 0xFFC000, 420, 400, wipeAllWorld, [] ) gump.send( socket ) else: ! socket.sysmessage("Select the area to remove") ! getBoundingBox( socket, wipeBoundingBox ) ! return 1 --- 49,62 ---- if len( argstring ) > 0: if argstring.lower() == "all": ! gump = WarningGump( 1060635, 30720, "Wiping <i>all</i> items in the world.<br>Do you wish to proceed?", 0xFFC000, 420, 400, wipeAllWorld, [] ) gump.send( socket ) + return + else: + baseid = argstring else: ! baseid = None ! ! socket.sysmessage("Select the area to remove") ! getBoundingBox( socket, wipeBoundingBox, baseid ) return 1 *************** *** 78,82 **** return ! def wipeBoundingBox( socket, target1, target2 ): if target1.pos.map != target2.pos.map: return False --- 82,86 ---- return ! def wipeBoundingBox( socket, target1, target2, baseid ): if target1.pos.map != target2.pos.map: return False *************** *** 90,95 **** count = 0 while item: ! item.delete() ! count += 1 item = iterator.next socket.sysmessage( "%i items removed" % count ) --- 94,100 ---- count = 0 while item: ! if not baseid or item.baseid == baseid: ! item.delete() ! count += 1 item = iterator.next socket.sysmessage( "%i items removed" % count ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 01:59:16
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15464/system Modified Files: hunger.py Log Message: hunger fix Index: hunger.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/hunger.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** hunger.py 5 Sep 2004 22:27:05 -0000 1.5 --- hunger.py 14 Oct 2004 01:59:00 -0000 1.6 *************** *** 3,18 **** import random import wolfpack.time def onTimeChange( player ): ! hungerrate = int(wolfpack.settings.getstring("Game Speed", "Hunger Rate", "2")) ! hungerdamage = int(wolfpack.settings.getstring("General", "Hunger Damage", "0")) ! if wolfpack.time.hour() in range( hungerrate, 23, hungerrate ): ! if player.socket: if player.hunger >= 1 and player.hunger <= 6: player.hunger -= 1 ! player.socket.sysmessage( "Your stomach growls..." ) elif player.hunger == 0: player.damage( 3, random.randint( 0, hungerdamage ) ) ! player.socket.sysmessage( "Your stomach hurts from the lack of food..." ) return False --- 3,27 ---- import random import wolfpack.time + from wolfpack import tr + + hungerrate = int(wolfpack.settings.getstring("Game Speed", "Hunger Rate", "120")) # Every 120 minutes + hungerdamage = int(wolfpack.settings.getstring("General", "Hunger Damage", "0")) # Damage? def onTimeChange( player ): ! global hungerrate ! global hungerdamage ! # Use the minutes ! lasthunger = 0 ! if player.hastag('lasthunger'): ! lasthunger = int(player.gettag('lasthunger')) ! ! if lasthunger + 2 < wolfpack.time.minutes(): ! if player.socket and not player.gm: if player.hunger >= 1 and player.hunger <= 6: player.hunger -= 1 ! player.socket.sysmessage( tr("Your stomach growls...") ) elif player.hunger == 0: player.damage( 3, random.randint( 0, hungerdamage ) ) ! player.socket.sysmessage( tr("Your stomach hurts from the lack of food...") ) return False |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 01:15:09
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4978 Modified Files: gumps.cpp spawnregions.h Log Message: spawn fixes Index: spawnregions.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** spawnregions.h 13 Oct 2004 14:45:20 -0000 1.33 --- spawnregions.h 14 Oct 2004 01:14:57 -0000 1.34 *************** *** 117,120 **** --- 117,128 ---- } + inline unsigned int minTime() { + return minTime_; + } + + inline unsigned int maxTime() { + return maxTime_; + } + private: virtual void processNode( const cElement* Tag ); Index: gumps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v retrieving revision 1.174 retrieving revision 1.175 diff -C2 -d -r1.174 -r1.175 *** gumps.cpp 13 Oct 2004 14:45:20 -0000 1.174 --- gumps.cpp 14 Oct 2004 01:14:57 -0000 1.175 *************** *** 141,149 **** addText( 50, 160, tr( "Items: %1 of %2" ).arg( region->items() ).arg( region->maxItems() ), 0x834 ); if (region->active()) { ! addText( 50, 180, tr( "Active" ), 0x834 ); } else { ! addText( 50, 180, tr( "Inactive" ), 0x834 ); } addText( 50, 200, tr( "Groups: %1" ).arg(region->groups().join(", ")), 0x834 ); //addText( 50, 180, tr( "Coordinates: %1" ).arg( allrectangles.size() ), 0x834 ); --- 141,159 ---- addText( 50, 160, tr( "Items: %1 of %2" ).arg( region->items() ).arg( region->maxItems() ), 0x834 ); if (region->active()) { ! addText( 50, 180, tr( "Status: Active" ), 0x834 ); } else { ! addText( 50, 180, tr( "Status: Inactive" ), 0x834 ); } addText( 50, 200, tr( "Groups: %1" ).arg(region->groups().join(", ")), 0x834 ); + + // Next Spawn + unsigned int nextRespawn = 0; + if (region->nextTime() > Server::instance()->time()) { + (region->nextTime() - Server::instance()->time()) / 1000; + } + addText( 50, 220, tr("Next Respawn: %1 seconds").arg(nextRespawn), 0x834); + addText( 50, 240, tr("Total Points: %1").arg(region->countPoints()), 0x834); + addText( 50, 260, tr("Delay: %1 to %2 seconds").arg(region->minTime()).arg(region->maxTime()), 0x834); + //addText( 50, 180, tr( "Coordinates: %1" ).arg( allrectangles.size() ), 0x834 ); |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 00:25:03
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24824 Modified Files: ChangeLog walking.cpp Log Message: walking fix. Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** walking.cpp 10 Oct 2004 20:39:38 -0000 1.155 --- walking.cpp 14 Oct 2004 00:24:53 -0000 1.156 *************** *** 324,328 **** { stBlockItem item = blockList[i]; ! Q_INT8 itemTop = ( item.z + item.height ); // If we found something to step on and the next tile --- 324,328 ---- { stBlockItem item = blockList[i]; ! Q_INT32 itemTop = ( item.z + item.height ); // If we found something to step on and the next tile Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** ChangeLog 13 Oct 2004 14:45:53 -0000 1.108 --- ChangeLog 14 Oct 2004 00:24:53 -0000 1.109 *************** *** 49,52 **** --- 49,53 ---- - Fixed the spawnregion python interface and added documentation. - Made the spawnregion info gump show the active/inactive state and the groups for spawnregions. + - Fix for items on very high z values interfering with walking. Wolfpack 12.9.11 Beta (26. September 2004) |
|
From: Richard M. <dr...@us...> - 2004-10-13 22:38:41
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25044 Modified Files: potions.py Log Message: Hope this works... Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** potions.py 10 Oct 2004 19:56:41 -0000 1.58 --- potions.py 13 Oct 2004 22:38:29 -0000 1.59 *************** *** 77,81 **** # char, potion, counter value if not item.hastag('exploding'): ! potionexplosion( item, [char, 4, item.amount] ) item.settag('exploding', 'true') socket.sysmessage( 'You should throw this now!', RED ) --- 77,81 ---- # char, potion, counter value if not item.hastag('exploding'): ! potionexplosion( item, [char.serial, 4, item.amount] ) item.settag('exploding', 'true') socket.sysmessage( 'You should throw this now!', RED ) *************** *** 162,165 **** --- 162,166 ---- # Explosion Potion Function def potionexplosion( potion, args ): + # args[0] == char.serial if args[1] > 0: potion.addtimer( 1000, "potions.potioncountdown", [args[0], args[1], args[2]] ) *************** *** 173,176 **** --- 174,178 ---- # Explosion Potion Function def potioncountdown( potion, args ): + # args[0] == char.serial counter = args[1] if potion: *************** *** 196,206 **** bomb.settag( 'exploding', char.serial ) if bomb.hastag( 'kegfill' ) and int( bomb.gettag( 'kegfill' ) ) >= 1: ! bomb.addtimer( randint( 1000, 2250 ), "potions.potioncountdown", [ char, 0, int( bomb.gettag( 'kegfill' ) ) ] ) else: ! bomb.addtimer( randint( 1000, 2250 ), "potions.potioncountdown", [ char, 0, bomb.amount ] ) return # Explosion Potion Function ! def potionregion( char, potion, bonus=0 ): if potion.gettag('potiontype') == 11: outradius = 1 --- 198,209 ---- bomb.settag( 'exploding', char.serial ) if bomb.hastag( 'kegfill' ) and int( bomb.gettag( 'kegfill' ) ) >= 1: ! bomb.addtimer( randint( 1000, 2250 ), "potions.potioncountdown", [ char.serial, 0, int( bomb.gettag( 'kegfill' ) ) ] ) else: ! bomb.addtimer( randint( 1000, 2250 ), "potions.potioncountdown", [ char.serial, 0, bomb.amount ] ) return # Explosion Potion Function ! def potionregion( charserial, potion, bonus=0 ): ! char = wolfpack.findchar( charserial ) if potion.gettag('potiontype') == 11: outradius = 1 *************** *** 410,414 **** if time.time() - elapsed > HEAL_POT_DELAY: socket.deltag('heal_pot_timer') ! else: socket.clilocmessage( 500235 ) # You must wait 10 seconds before using another healing potion. return False --- 413,417 ---- if time.time() - elapsed > HEAL_POT_DELAY: socket.deltag('heal_pot_timer') ! else: socket.clilocmessage( 500235 ) # You must wait 10 seconds before using another healing potion. return False *************** *** 503,507 **** # Compare elapsed = int( char.gettag( "dex_pot_timer" ) ) ! # Some bug occured if elapsed - time.time() > AGILITY_TIME: --- 506,510 ---- # Compare elapsed = int( char.gettag( "dex_pot_timer" ) ) ! # Some bug occured if elapsed - time.time() > AGILITY_TIME: *************** *** 553,557 **** # Compare elapsed = int( char.gettag( "str_pot_timer" ) ) ! if elapsed - time.time() > STRENGTH_TIME: char.deltag('str_pot_timer') --- 556,560 ---- # Compare elapsed = int( char.gettag( "str_pot_timer" ) ) ! if elapsed - time.time() > STRENGTH_TIME: char.deltag('str_pot_timer') *************** *** 559,563 **** socket.clilocmessage(502173) # You are already under a similar effect return False ! char.settag( "str_pot_timer", time.time() + STRENGTH_TIME ) --- 562,566 ---- socket.clilocmessage(502173) # You are already under a similar effect return False ! char.settag( "str_pot_timer", time.time() + STRENGTH_TIME ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:50:27
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8402/skills Modified Files: provocation.py Log Message: more crashfixes Index: provocation.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/provocation.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** provocation.py 13 Oct 2004 19:47:48 -0000 1.11 --- provocation.py 13 Oct 2004 19:50:16 -0000 1.12 *************** *** 185,189 **** return True ! char, type ): socket = char.socket value = skilltotal( char ) --- 185,189 ---- return True ! def tobard( char, type ): socket = char.socket value = skilltotal( char ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:48:05
|
Update of /cvsroot/wpdev/xmlscripts/scripts/deeds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7817/deeds Modified Files: carpentry_deed.py clothing_bless_deed.py commoditydeed.py item_bless_deed.py Log Message: more crashfixes Index: carpentry_deed.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/carpentry_deed.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** carpentry_deed.py 27 Sep 2004 22:36:47 -0000 1.4 --- carpentry_deed.py 13 Oct 2004 19:47:48 -0000 1.5 *************** *** 75,84 **** # send target cursor ! char.socket.attachtarget( "deeds.carpentry_deed.response", [ item ] ) return True def response( char, args, target ): ! item = args[0] if not item or item.getoutmostchar() != char: # msg --- 75,84 ---- # send target cursor ! char.socket.attachtarget( "deeds.carpentry_deed.response", [ item.serial ] ) return True def response( char, args, target ): ! item = wolfpack.finditem(args[0]) if not item or item.getoutmostchar() != char: # msg Index: commoditydeed.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/commoditydeed.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** commoditydeed.py 25 Apr 2004 18:53:21 -0000 1.1 --- commoditydeed.py 13 Oct 2004 19:47:48 -0000 1.2 *************** *** 44,48 **** if not item.hastag ( "filled" ): char.socket.clilocmessage( 0xFF9F5, "", 0x3b2, 3 ) ! char.socket.attachtarget( "deeds.commoditydeed.response", [item] ) return 1 --- 44,48 ---- if not item.hastag ( "filled" ): char.socket.clilocmessage( 0xFF9F5, "", 0x3b2, 3 ) ! char.socket.attachtarget( "deeds.commoditydeed.response", [item.serial] ) return 1 *************** *** 65,69 **** bank = char.getbankbox() ! deed = args[0] # "0x1761", "0x1762", "0x1763", "0x1764" possible? --- 65,69 ---- bank = char.getbankbox() ! deed = wolfpack.finditem(args[0]) # "0x1761", "0x1762", "0x1763", "0x1764" possible? Index: clothing_bless_deed.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/clothing_bless_deed.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** clothing_bless_deed.py 25 Apr 2004 18:53:21 -0000 1.1 --- clothing_bless_deed.py 13 Oct 2004 19:47:48 -0000 1.2 *************** *** 22,26 **** char.socket.clilocmessage( 0xF55DA, "", 0x3b2, 3 ) ! char.socket.attachtarget( "deeds.clothing_bless_deed.response", [item] ) return 1 --- 22,26 ---- char.socket.clilocmessage( 0xF55DA, "", 0x3b2, 3 ) ! char.socket.attachtarget( "deeds.clothing_bless_deed.response", [item.serial] ) return 1 *************** *** 36,40 **** return 0 ! item = args[0] backpack = char.getbackpack() --- 36,40 ---- return 0 ! item = wolfpack.finditem(args[0]) backpack = char.getbackpack() Index: item_bless_deed.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/item_bless_deed.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** item_bless_deed.py 25 Apr 2004 18:53:21 -0000 1.1 --- item_bless_deed.py 13 Oct 2004 19:47:48 -0000 1.2 *************** *** 24,28 **** char.socket.clilocmessage( 0x7A31A, "", 0x3b2, 3 ) ! char.socket.attachtarget( "deeds.item_bless_deed.response", [item] ) return 1 --- 24,28 ---- char.socket.clilocmessage( 0x7A31A, "", 0x3b2, 3 ) ! char.socket.attachtarget( "deeds.item_bless_deed.response", [item.serial] ) return 1 *************** *** 47,51 **** return 0 ! item = args[0] backpack = char.getbackpack() --- 47,51 ---- return 0 ! item = wolfpack.finditem(args[0]) backpack = char.getbackpack() |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:48:04
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7817 Modified Files: pickaxe.py Log Message: more crashfixes Index: pickaxe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/pickaxe.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pickaxe.py 16 Jul 2004 07:09:26 -0000 1.5 --- pickaxe.py 13 Oct 2004 19:47:48 -0000 1.6 *************** *** 36,40 **** # Where do you wish to dig? char.socket.clilocmessage( 503033, "", GRAY) ! char.socket.attachtarget( "skills.mining.response", [ tool ] ) else: char.socket.clilocmessage( 500735, "", GRAY) # Don't play with things you don't know about. :) --- 36,40 ---- # Where do you wish to dig? char.socket.clilocmessage( 503033, "", GRAY) ! char.socket.attachtarget( "skills.mining.response", [ tool.serial ] ) else: char.socket.clilocmessage( 500735, "", GRAY) # Don't play with things you don't know about. :) |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:48:04
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7817/skills Modified Files: mining.py poisoning.py provocation.py Log Message: more crashfixes Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** mining.py 13 Oct 2004 19:41:03 -0000 1.39 --- mining.py 13 Oct 2004 19:47:48 -0000 1.40 *************** *** 103,107 **** return True ! tool = args[0] #Player also can't mine when riding, polymorphed and dead. --- 103,107 ---- return True ! tool = wolfpack.finditem(args[0]) #Player also can't mine when riding, polymorphed and dead. Index: provocation.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/provocation.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** provocation.py 17 Jul 2004 03:49:21 -0000 1.10 --- provocation.py 13 Oct 2004 19:47:48 -0000 1.11 *************** *** 36,45 **** socket.clilocmessage( 0x7A74D, "", 0x3b2, 3 ) # What do you wish to incite? ! socket.attachtarget( "skills.provocation.response1", [instrument] ) return True def response1( char, args, target ): socket = char.socket ! instrument = args[0] if target.item: --- 36,45 ---- socket.clilocmessage( 0x7A74D, "", 0x3b2, 3 ) # What do you wish to incite? ! socket.attachtarget( "skills.provocation.response1", [instrument.serial] ) return True def response1( char, args, target ): socket = char.socket ! instrument = wolfpack.finditem(args[0]) if target.item: *************** *** 68,72 **** playinstrument( char, instrument, "success" ) socket.clilocmessage( 0xF61D5, "", 0x3b2, 3 ) # You play your music and your target becomes angered. Whom do you wish them to attack? ! socket.attachtarget( "skills.provocation.response2", [target.char, tobardtarget1, instrument] ) return True --- 68,72 ---- playinstrument( char, instrument, "success" ) socket.clilocmessage( 0xF61D5, "", 0x3b2, 3 ) # You play your music and your target becomes angered. Whom do you wish them to attack? ! socket.attachtarget( "skills.provocation.response2", [target.char.serial, tobardtarget1, instrument.serial] ) return True *************** *** 77,83 **** return False ! creature1 = args[0] tobardtarget1 = args[1] ! instrument = args[2] tobardtarget2 = tobard( target.char, "provoke" ) minimum = int( ( ( tobardtarget1 + tobardtarget2 ) / 2.0 ) - 25.0 ) --- 77,83 ---- return False ! creature1 = wolfpack.findchar(args[0]) tobardtarget1 = args[1] ! instrument = wolfpack.finditem(args[2]) tobardtarget2 = tobard( target.char, "provoke" ) minimum = int( ( ( tobardtarget1 + tobardtarget2 ) / 2.0 ) - 25.0 ) *************** *** 162,166 **** socket.settag( 'instrument', serial ) socket.clilocmessage( 0x7A753, "", 0x3b2, 3, ) ! socket.attachtarget( "skills.provocation.response1", [target.item] ) return True --- 162,166 ---- socket.settag( 'instrument', serial ) socket.clilocmessage( 0x7A753, "", 0x3b2, 3, ) ! socket.attachtarget( "skills.provocation.response1", [target.item.serial] ) return True *************** *** 185,189 **** return True ! def tobard( char, type ): socket = char.socket value = skilltotal( char ) --- 185,189 ---- return True ! char, type ): socket = char.socket value = skilltotal( char ) Index: poisoning.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/poisoning.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** poisoning.py 13 Oct 2004 19:41:03 -0000 1.7 --- poisoning.py 13 Oct 2004 19:47:48 -0000 1.8 *************** *** 40,44 **** # assign target request char.socket.clilocmessage( 502142 ) ! char.socket.attachtarget( "skills.poisoning.selecttarget", [ potion ] ) return 1 --- 40,44 ---- # assign target request char.socket.clilocmessage( 502142 ) ! char.socket.attachtarget( "skills.poisoning.selecttarget", [ potion.serial ] ) return 1 *************** *** 49,53 **** return ! potion = args[ 0 ] if not potion: return --- 49,53 ---- return ! potion = wolfpack.finditem(args[ 0 ]) if not potion: return |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:41:15
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6406 Modified Files: trashcan.py wool.py Log Message: Crash Fixes Index: trashcan.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/trashcan.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** trashcan.py 17 Jul 2004 07:23:59 -0000 1.1 --- trashcan.py 13 Oct 2004 19:41:02 -0000 1.2 *************** *** 10,14 **** if target.baseid == 'trashcan': target.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) ) ! wolfpack.addtimer( delete_time, "trashcan.timerPass", [ target ] ) return False else: --- 10,14 ---- if target.baseid == 'trashcan': target.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) ) ! wolfpack.addtimer( delete_time, "trashcan.timerPass", [ target.serial ] ) return False else: *************** *** 17,21 **** def timerPass( timer, args ): ! trashcan = args[0] if trashcan.baseid != "trashcan": return False --- 17,21 ---- def timerPass( timer, args ): ! trashcan = wolfpack.finditem(args[0]) if trashcan.baseid != "trashcan": return False *************** *** 40,43 **** return False item.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) ) ! wolfpack.addtimer( delete_time, "trashcan.timerPass", [ item ] ) return False --- 40,43 ---- return False item.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) ) ! wolfpack.addtimer( delete_time, "trashcan.timerPass", [ item.serial ] ) return False Index: wool.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wool.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wool.py 2 Sep 2004 00:44:27 -0000 1.10 --- wool.py 13 Oct 2004 19:41:02 -0000 1.11 *************** *** 70,74 **** wheel = wolfpack.finditem( target.item.serial ) processtime = 5000 # 5 Seconds ! char.addtimer( processtime, "wool.ProcessTimer", [wheel, color] ) elif target.item.id in animids: --- 70,74 ---- wheel = wolfpack.finditem( target.item.serial ) processtime = 5000 # 5 Seconds ! char.addtimer( processtime, "wool.ProcessTimer", [wheel.serial, color] ) elif target.item.id in animids: *************** *** 83,87 **** def ProcessTimer( char, args ): ! wheel = args[0] color = args[1] GetYarn( char, wheel, color ) --- 83,87 ---- def ProcessTimer( char, args ): ! wheel = wolfpack.finditem(args[0]) color = args[1] GetYarn( char, wheel, color ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:41:15
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6406/skills Modified Files: __init__.py lumberjacking.py mining.py poisoning.py Log Message: Crash Fixes Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mining.py 2 Oct 2004 10:04:35 -0000 1.38 --- mining.py 13 Oct 2004 19:41:03 -0000 1.39 *************** *** 45,49 **** def mining( char, pos, tool ): ! char.addtimer( 1300, "skills.mining.domining", [ tool, pos ] ) char.socket.settag( 'is_mining', ( wolfpack.time.currenttime() + miningdelay ) ) char.turnto( pos ) --- 45,49 ---- def mining( char, pos, tool ): ! char.addtimer( 1300, "skills.mining.domining", [ tool.serial, pos ] ) char.socket.settag( 'is_mining', ( wolfpack.time.currenttime() + miningdelay ) ) char.turnto( pos ) *************** *** 139,143 **** def domining(char, args): char.soundeffect( SOUND_MINING ) ! tool = args[0] pos = args[1] socket = char.socket --- 139,143 ---- def domining(char, args): char.soundeffect( SOUND_MINING ) ! tool = wolfpack.finditem(args[0]) pos = args[1] socket = char.socket Index: poisoning.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/poisoning.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** poisoning.py 13 Oct 2004 19:11:13 -0000 1.6 --- poisoning.py 13 Oct 2004 19:41:03 -0000 1.7 *************** *** 73,82 **** char.soundeffect( 0x4F ) # apply poison to the item ! char.addtimer( POISONING_DELAY, "skills.poisoning.poisonit", [ potion, target.item ] ) return 1 def poisonit( char, args ): ! potion = args[ 0 ] ! item = args[ 1 ] if not potion or not item: return --- 73,82 ---- char.soundeffect( 0x4F ) # apply poison to the item ! char.addtimer( POISONING_DELAY, "skills.poisoning.poisonit", [ potion.serial, target.item.serial ] ) return 1 def poisonit( char, args ): ! potion = wolfpack.finditem(args[ 0 ]) ! item = wolfpack.finditem(args[ 1 ]) if not potion or not item: return Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** __init__.py 17 Jul 2004 07:24:00 -0000 1.18 --- __init__.py 13 Oct 2004 19:41:03 -0000 1.19 *************** *** 100,104 **** def cleartag( self, args ): ! char = args[0] tagname = args[1] self.deltag( tagname ) --- 100,104 ---- def cleartag( self, args ): ! char = wolfpack.findchar(args[0]) tagname = args[1] self.deltag( tagname ) *************** *** 116,120 **** return False else: ! object.addtimer( ANTIMACRODELAY, "skills.cleartag", [char, tagname] ) return False else: --- 116,120 ---- return False else: ! object.addtimer( ANTIMACRODELAY, "skills.cleartag", [char.serial, tagname] ) return False else: Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** lumberjacking.py 2 Oct 2004 10:04:35 -0000 1.21 --- lumberjacking.py 13 Oct 2004 19:41:03 -0000 1.22 *************** *** 144,148 **** char.addtimer( 2000, "skills.lumberjacking.chop_tree", [pos] ) char.addtimer( 3500, "skills.lumberjacking.chop_tree", [pos] ) ! char.addtimer( 4000, "skills.lumberjacking.successlumberjacking", [pos, resource, amount, tool, resname, woodtable ] ) return --- 144,148 ---- char.addtimer( 2000, "skills.lumberjacking.chop_tree", [pos] ) char.addtimer( 3500, "skills.lumberjacking.chop_tree", [pos] ) ! char.addtimer( 4000, "skills.lumberjacking.successlumberjacking", [pos, resource.serial, amount, tool.serial, resname, woodtable ] ) return *************** *** 176,182 **** socket = char.socket pos = args[0] # Target POS ! resource = args[1] amount = args[2] ! tool = args[3] resname = args[4] table = args[5] --- 176,182 ---- socket = char.socket pos = args[0] # Target POS ! resource = wolfpack.finditem(args[1]) amount = args[2] ! tool = wolfpack.finditem(args[3]) resname = args[4] table = args[5] |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:15:35
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418 Modified Files: lightsource.py Log Message: bugfixes Index: lightsource.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/lightsource.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** lightsource.py 13 Oct 2004 19:14:35 -0000 1.12 --- lightsource.py 13 Oct 2004 19:15:26 -0000 1.13 *************** *** 130,134 **** dropper.soundeffect(0x226) ! return True def onDropOnChar( char, item ): --- 130,134 ---- dropper.soundeffect(0x226) ! return False def onDropOnChar( char, item ): |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:14:48
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32157 Modified Files: lightsource.py Log Message: bugfixes Index: lightsource.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/lightsource.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lightsource.py 13 Oct 2004 19:13:22 -0000 1.11 --- lightsource.py 13 Oct 2004 19:14:35 -0000 1.12 *************** *** 116,119 **** --- 116,124 ---- return True + def update_light(serial): + item = wolfpack.finditem(serial) + if item: + item.update() + def onDropOnItem( container, item ): dropper = item.container *************** *** 122,127 **** if item.id in burning and ids.has_key( item.id ): item.id = ids[item.id] ! #if not wolfpack.utilities.tocontainer(item, container): ! # item.update() dropper.soundeffect(0x226) --- 127,131 ---- if item.id in burning and ids.has_key( item.id ): item.id = ids[item.id] ! wolfpack.queuecode(update_light, (item.serial, )) dropper.soundeffect(0x226) |
|
From: Sebastian H. <dar...@us...> - 2004-10-13 19:13:38
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31794 Modified Files: lightsource.py Log Message: bugfixes Index: lightsource.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/lightsource.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lightsource.py 13 Oct 2004 19:11:13 -0000 1.10 --- lightsource.py 13 Oct 2004 19:13:22 -0000 1.11 *************** *** 121,127 **** # Turn off the lightsource if item.id in burning and ids.has_key( item.id ): ! item.id = ids[ item.id ] ! if not wolfpack.utilities.tocontainer(item, container): ! item.update() dropper.soundeffect(0x226) --- 121,127 ---- # Turn off the lightsource if item.id in burning and ids.has_key( item.id ): ! item.id = ids[item.id] ! #if not wolfpack.utilities.tocontainer(item, container): ! # item.update() dropper.soundeffect(0x226) |
