wpdev-commits Mailing List for Wolfpack Emu (Page 47)
Brought to you by:
rip,
thiagocorrea
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-08 04:06:41
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24423/webroot Modified Files: ChangeLog.wolfpack Log Message: Nice little updated to .eval Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** ChangeLog.wolfpack 7 Sep 2004 20:35:58 -0000 1.70 --- ChangeLog.wolfpack 8 Sep 2004 04:06:27 -0000 1.71 *************** *** 8,11 **** --- 8,12 ---- - Moved equipment properties to the definitions again. - Added several small testing items. + - Fixed blue moongate definitions. * Python Script Changes: - Added a script for database structure updates (system/dbupdate.py). *************** *** 25,28 **** --- 26,32 ---- - Spellcasting speeds are now corrected and take bonusses into account. - Fixed the skillinfo command gump for remote clients. + - Fixed gatetravel spell. + - Tele and other spells no longer show a smoke puff if you're invisible. + - Rewrote properties.fromitem * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
From: Richard M. <dr...@us...> - 2004-09-08 03:41:19
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20801/archery Modified Files: bow.xml composite_bow.xml crossbow.xml heavy_crossbow.xml repeating_crossbow.xml Log Message: Because I was told to :D Index: heavy_crossbow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/heavy_crossbow.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** heavy_crossbow.xml 5 Sep 2004 21:02:51 -0000 1.12 --- heavy_crossbow.xml 8 Sep 2004 03:40:59 -0000 1.13 *************** *** 24,27 **** --- 24,29 ---- <category>Weapons\Bows\Heavy Crossbow (N/S)</category> <!-- Properties --> + <intproperty name="projectile" value="0x1bfe" /> + <strproperty name="ammunition" value="1bfb" /> <intproperty name="req_strength" value="80" /> <intproperty name="speed" value="22" /> Index: composite_bow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/composite_bow.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** composite_bow.xml 5 Sep 2004 21:02:51 -0000 1.12 --- composite_bow.xml 8 Sep 2004 03:40:59 -0000 1.13 *************** *** 24,27 **** --- 24,29 ---- <category>Weapons\Bows\Composite Bow (N/S)</category> <!-- Properties --> + <intproperty name="projectile" value="0xf42" /> + <strproperty name="ammunition" value="f3f" /> <intproperty name="req_strength" value="45" /> <intproperty name="speed" value="25" /> Index: repeating_crossbow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/repeating_crossbow.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** repeating_crossbow.xml 5 Sep 2004 21:02:51 -0000 1.12 --- repeating_crossbow.xml 8 Sep 2004 03:40:59 -0000 1.13 *************** *** 24,27 **** --- 24,29 ---- <category>Weapons\Bows\Repeating Crossbow (N/S)</category> <!-- Properties --> + <intproperty name="projectile" value="0x1bfe" /> + <strproperty name="ammunition" value="1bfb" /> <intproperty name="req_strength" value="30" /> <intproperty name="speed" value="41" /> Index: bow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/bow.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** bow.xml 5 Sep 2004 21:02:51 -0000 1.13 --- bow.xml 8 Sep 2004 03:40:59 -0000 1.14 *************** *** 23,26 **** --- 23,28 ---- <category>Weapons\Bows\Bow (N/S)</category> <!-- Properties --> + <intproperty name="projectile" value="0xf42" /> + <strproperty name="ammunition" value="f3f" /> <intproperty name="req_strength" value="30" /> <intproperty name="range" value="12" /> Index: crossbow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/archery/crossbow.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** crossbow.xml 5 Sep 2004 21:02:51 -0000 1.12 --- crossbow.xml 8 Sep 2004 03:40:59 -0000 1.13 *************** *** 24,27 **** --- 24,29 ---- <category>Weapons\Bows\Crossbow (N/S)</category> <!-- Properties --> + <intproperty name="projectile" value="0x1bfe" /> + <strproperty name="ammunition" value="1bfb" /> <intproperty name="req_strength" value="35" /> <intproperty name="speed" value="24" /> |
From: spddmn <xxx...@us...> - 2004-09-08 03:23:46
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18135 Modified Files: npc.cpp Log Message: fix silly little unref'd var i made Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** npc.cpp 4 Sep 2004 08:36:22 -0000 1.112 --- npc.cpp 8 Sep 2004 03:23:33 -0000 1.113 *************** *** 164,168 **** { cBaseChar::load( result, offset ); - SERIAL ser; summonTime_ = atoi( result[offset++] ) + Server::instance()->time(); --- 164,167 ---- |
From: Sebastian H. <dar...@us...> - 2004-09-08 03:16:39
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16858/commands Modified Files: eval.py Log Message: Nice little updated to .eval Index: eval.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/eval.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** eval.py 9 Jul 2004 21:47:46 -0000 1.4 --- eval.py 8 Sep 2004 03:16:29 -0000 1.5 *************** *** 4,13 **** import wolfpack def evalcommand(socket, command, arguments): ! script = "import wolfpack\nfrom wolfpack.consts import *\n%s\n\n" % arguments try: ! code = compile(script, '<SOCKET>', 'exec') ! eval(code, globals(), locals()) except Exception, e: socket.sysmessage('Python Error: ' + str(e)) --- 4,18 ---- import wolfpack + from wolfpack.consts import * + from wolfpack import * def evalcommand(socket, command, arguments): ! #script = "import wolfpack\nfrom wolfpack.consts import *\n%s\n\n" % arguments ! script = arguments ! result = None try: ! #code = compile(script, '<SOCKET>', 'exec') ! #result = eval(script, globals(), locals()) ! result = eval(script) except Exception, e: socket.sysmessage('Python Error: ' + str(e)) *************** *** 15,18 **** --- 20,24 ---- socket.sysmessage('Executed the python scriptlet.') + socket.sysmessage('Result: ' + str(result)) def onLoad(): |
From: spddmn <xxx...@us...> - 2004-09-07 23:48:17
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15162 Modified Files: scripts.xml Log Message: removedupes Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** scripts.xml 5 Sep 2004 17:41:36 -0000 1.162 --- scripts.xml 7 Sep 2004 23:47:58 -0000 1.163 *************** *** 106,109 **** --- 106,110 ---- <script>commands.password</script> <script>commands.remove</script> + <script>commands.removedupes</script> <script>commands.restore</script> <script>commands.resurrect</script> |
From: spddmn <xxx...@us...> - 2004-09-07 23:44:54
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14611/commands Added Files: removedupes.py Log Message: removes all but one of: items with pos = pos and id = id from all maps nice after import or decoration commands --- NEW FILE: removedupes.py --- """ \ \ \command removedupes \description removes all (but one) duplicate items from all maps: \ \ a duplicate is an item that is in the same location (x,y,z,map) and has the same ID# \ as another. \ \ NOTE: this *may* delete things you would rather keep. this routine is intended to \ clean up after an 'import or 'decoration command is issued on a map in error. \ \ this routines does NOT know if an item has had the 'dupe command issued on it \ nor does it detect items duped on the account of exploits or other such nonsense. \ \ \ DOUBLE NOTE: you should consider disabling this command once your shard is "live". \ \ """ import wolfpack MAP0_WIDTH = 6144 MAP0_HEIGHT = 4096 MAP1_WIDTH = 6144 MAP1_HEIGHT = 4096 MAP2_WIDTH = 2304 MAP2_HEIGHT = 1600 MAP3_WIDTH = 2560 MAP3_HEIGHT = 2048 def onLoad(): wolfpack.registercommand( "removedupes", commandRemoveDupes ) def commandRemoveDupes(socket, cmd, args): socket.sysmessage( "Removing Dupes From Map 0, please wait." ) removeDupesFromMap( socket, 0 ) socket.sysmessage( "Removing Dupes From Map 1, please wait." ) removeDupesFromMap( socket, 1 ) socket.sysmessage( "Removing Dupes From Map 2, please wait." ) removeDupesFromMap( socket, 2 ) socket.sysmessage( "Removing Dupes From Map 3, please wait." ) removeDupesFromMap( socket, 3 ) def removeDupesFromMap( socket, mapid ): squareregionsize = 16 if mapid == 0: xiters = MAP0_WIDTH / squareregionsize if 0 <> MAP0_WIDTH % squareregionsize: xiters = xiters + 1 yiters = MAP0_HEIGHT / squareregionsize if 0 <> MAP0_HEIGHT % squareregionsize: yiters = yiters + 1 elif mapid == 1 : xiters = MAP1_WIDTH / squareregionsize if 0 <> MAP1_WIDTH % squareregionsize: xiters = xiters + 1 yiters = MAP1_HEIGHT / squareregionsize if 0 <> MAP1_HEIGHT % squareregionsize: yiters = yiters + 1 elif mapid == 2 : xiters = MAP2_WIDTH / squareregionsize if 0 <> MAP2_WIDTH % squareregionsize: xiters = xiters + 1 yiters = MAP2_HEIGHT / squareregionsize if 0 <> MAP2_HEIGHT % squareregionsize: yiters = yiters + 1 elif mapid == 3 : xiters = MAP3_WIDTH / squareregionsize if 0 <> MAP3_WIDTH % squareregionsize: xiters = xiters + 1 yiters = MAP3_HEIGHT / squareregionsize if 0 <> MAP3_HEIGHT % squareregionsize: yiters = yiters + 1 else: return x = 0 while x <= xiters: y = 0 while y <= yiters: DoMapRegion( x * squareregionsize, y * squareregionsize, squareregionsize, mapid ) y = y + 1 x = x + 1 def DoMapRegion( x_start, y_start, squareregionsize, mapid ): x_end = x_start + squareregionsize y_end = y_start + squareregionsize if mapid == 0: if x_start >= MAP0_WIDTH: return if y_start >= MAP0_HEIGHT: return if x_end > MAP0_WIDTH: x_end = MAP0_WIDTH if y_end > MAP0_HEIGHT: y_end = MAP0_HEIGHT elif mapid == 1: if x_start >= MAP1_WIDTH: return if y_start >= MAP1_HEIGHT: return if x_end > MAP1_WIDTH: x_end = MAP1_WIDTH if y_end > MAP1_HEIGHT: y_end = MAP1_HEIGHT elif mapid == 2: if x_start >= MAP2_WIDTH: return if y_start >= MAP2_HEIGHT: return if x_end > MAP2_WIDTH: x_end = MAP2_WIDTH if y_end > MAP2_HEIGHT: y_end = MAP2_HEIGHT elif mapid == 3: if x_start >= MAP3_WIDTH: return if y_start >= MAP3_HEIGHT: return if x_end > MAP3_WIDTH: x_end = MAP3_WIDTH if y_end > MAP3_HEIGHT: y_end = MAP3_HEIGHT else: return iter = wolfpack.itemregion(x_start, y_start, x_end, y_end, mapid) items = [] item = iter.first while item: items.append(item) item = iter.next todelete = [] item = iter.first while item: for itemb in items: if item == itemb: continue if item.pos != itemb.pos or item.id != itemb.id: continue if itemb not in todelete: todelete.append(itemb) items.remove(itemb) if item in items: items.remove(item) item = iter.next for item in todelete: item.delete() item.update() |
From: Sebastian H. <dar...@us...> - 2004-09-07 23:43:23
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14293/items Modified Files: not_assigned.xml Log Message: fixed gate travel Index: not_assigned.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/not_assigned.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** not_assigned.xml 21 Jul 2004 04:18:27 -0000 1.14 --- not_assigned.xml 7 Sep 2004 23:43:11 -0000 1.15 *************** *** 371,394 **** </item> - <item id="f6c"> - <id>f6c</id> - </item> - - <item id="f6d"> - <id>f6d</id> - </item> - - <item id="f6e"> - <id>f6e</id> - </item> - - <item id="f6f"> - <id>f6f</id> - </item> - - <item id="f70"> - <id>f70</id> - </item> - <!-- Rather stupid Switchs because there is no not-animated tile --> <item id="1ed3"> --- 371,374 ---- |
From: Sebastian H. <dar...@us...> - 2004-09-07 23:43:21
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14293/items/professions Modified Files: mage.xml Log Message: fixed gate travel Index: mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/mage.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mage.xml 3 Sep 2004 15:53:18 -0000 1.16 --- mage.xml 7 Sep 2004 23:43:12 -0000 1.17 *************** *** 979,982 **** --- 979,1007 ---- <weight>1.0</weight> </item> + + <!-- Blue Moongates --> + <item id="f6c"> + <id>0xf6c</id> + <lightsource>9</lightsource> + </item> + <item id="f6d"> + <id>0xf6d</id> + <lightsource>9</lightsource> + </item> + + <item id="f6e"> + <id>0xf6e</id> + <lightsource>9</lightsource> + </item> + + <item id="f6f"> + <id>0xf6f</id> + <lightsource>9</lightsource> + </item> + + <item id="f70"> + <id>0xf70</id> + <lightsource>9</lightsource> + </item> </definitions> |
From: Sebastian H. <dar...@us...> - 2004-09-07 23:43:14
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14177/commands Modified Files: tele.py Log Message: fixed smoke puffs appearing for invisible chars. Index: tele.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/tele.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tele.py 9 Jul 2004 09:00:09 -0000 1.1 --- tele.py 7 Sep 2004 23:43:02 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- import wolfpack + from wolfpack import utilities from wolfpack.consts import * *************** *** 29,34 **** if char.socket: char.socket.resendworld() ! wolfpack.effect(0x3728, source, 10, 15) ! wolfpack.effect(0x3728, target, 10, 15) ! char.soundeffect(0x1fe) return True --- 30,34 ---- if char.socket: char.socket.resendworld() ! utilities.smokepuff(char, source) ! utilities.smokepuff(char, target) return True |
From: Sebastian H. <dar...@us...> - 2004-09-07 23:43:14
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14177 Modified Files: gate.py Log Message: fixed smoke puffs appearing for invisible chars. Index: gate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/gate.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gate.py 9 Jul 2004 21:47:45 -0000 1.7 --- gate.py 7 Sep 2004 23:43:03 -0000 1.8 *************** *** 2,6 **** import wolfpack from wolfpack.consts import LOG_ERROR ! from wolfpack import console from wolfpack.gumps import cGump --- 2,6 ---- import wolfpack from wolfpack.consts import LOG_ERROR ! from wolfpack import console, utilities from wolfpack.gumps import cGump *************** *** 41,49 **** # show some nice effects if not item.hastag('silent'): - player.soundeffect(0x1fe) item.soundeffect(0x1fe) ! wolfpack.effect(0x3728, player.pos, 10, 30) ! pos = item.pos ! wolfpack.effect(0x3728, pos, 10, 30) return 1 --- 41,47 ---- # show some nice effects if not item.hastag('silent'): item.soundeffect(0x1fe) ! utilities.smokepuff(player, pos) ! utilities.smokepuff(player, item.pos) return 1 |
From: Sebastian H. <dar...@us...> - 2004-09-07 23:43:13
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14177/wolfpack Modified Files: utilities.py Log Message: fixed smoke puffs appearing for invisible chars. Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** utilities.py 25 Aug 2004 17:03:06 -0000 1.65 --- utilities.py 7 Sep 2004 23:43:03 -0000 1.66 *************** *** 720,721 **** --- 720,734 ---- return None + + """ + Show a smoke puff for the given character. + Teleportation effect. + """ + def smokepuff(char, position): + if char.invisible: + return + + wolfpack.effect(0x3728, position, 10, 15) + # Only do it once + if position == char.pos: + char.soundeffect(0x1fe) |
From: Sebastian H. <dar...@us...> - 2004-09-07 23:43:13
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14177/magic Modified Files: circle3.py circle7.py gate.py Log Message: fixed smoke puffs appearing for invisible chars. Index: circle3.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle3.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** circle3.py 3 Sep 2004 16:56:23 -0000 1.13 --- circle3.py 7 Sep 2004 23:43:03 -0000 1.14 *************** *** 6,10 **** import random import wolfpack ! from wolfpack.utilities import tobackpack, energydamage from system import poison --- 6,10 ---- import random import wolfpack ! from wolfpack.utilities import tobackpack, energydamage, smokepuff from system import poison *************** *** 109,116 **** char.socket.resendworld() ! wolfpack.effect(0x3728, source, 10, 15) ! wolfpack.effect(0x3728, target, 10, 15) ! char.soundeffect(0x1fe) ! class MagicLock(Spell): --- 109,114 ---- char.socket.resendworld() ! smokepuff(char, source) ! smokepuff(char, target) class MagicLock(Spell): Index: circle7.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** circle7.py 1 Sep 2004 09:44:07 -0000 1.14 --- circle7.py 7 Sep 2004 23:43:03 -0000 1.15 *************** *** 181,202 **** # Create the two gates ! gate = wolfpack.newitem(1) ! gate.id = 0xf6c gate.moveto(char.pos) gate.settag('dispellable_field', 1) gate.addscript( 'magic.gate' ) gate.settag('target', target.gettag('location')) - gate.direction = 9 gate.update() gate.soundeffect(0x20e) serials.append(gate.serial) ! gate = wolfpack.newitem(1) ! gate.id = 0xf6c gate.moveto(location) gate.settag('target', '%u,%u,%d,%u' % (char.pos.x, char.pos.y, char.pos.z, char.pos.map)) gate.settag('dispellable_field', 1) gate.addscript( 'magic.gate' ) - gate.direction = 9 gate.update() gate.soundeffect(0x20e) --- 181,198 ---- # Create the two gates ! gate = wolfpack.additem('f6c') gate.moveto(char.pos) gate.settag('dispellable_field', 1) gate.addscript( 'magic.gate' ) gate.settag('target', target.gettag('location')) gate.update() gate.soundeffect(0x20e) serials.append(gate.serial) ! gate = wolfpack.additem('f6c') gate.moveto(location) gate.settag('target', '%u,%u,%d,%u' % (char.pos.x, char.pos.y, char.pos.z, char.pos.map)) gate.settag('dispellable_field', 1) gate.addscript( 'magic.gate' ) gate.update() gate.soundeffect(0x20e) Index: gate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/gate.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gate.py 26 May 2004 13:07:23 -0000 1.2 --- gate.py 7 Sep 2004 23:43:03 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- import wolfpack + from wolfpack import utilities def onCollide(player, item): *************** *** 32,39 **** # An der alten und neuen position soundeffekt und effekt spielen - player.soundeffect(0x1fe) item.soundeffect(0x1fe) ! wolfpack.effect(0x3728, player.pos, 10, 30) ! pos = item.pos ! wolfpack.effect(0x3728, pos, 10, 30) return 1 --- 33,39 ---- # An der alten und neuen position soundeffekt und effekt spielen item.soundeffect(0x1fe) ! ! utilities.smokepuff(player, player.pos) ! utilities.smokepuff(player, item.pos) return 1 |
From: Sebastian H. <dar...@us...> - 2004-09-07 23:01:59
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5790 Modified Files: ChangeLog items.cpp Log Message: Fixes Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.445 retrieving revision 1.446 diff -C2 -d -r1.445 -r1.446 *** items.cpp 31 Aug 2004 14:04:53 -0000 1.445 --- items.cpp 7 Sep 2004 23:01:49 -0000 1.446 *************** *** 447,451 **** QString cItem::getName( bool shortName ) { ! if ( !name_.isNull() ) return name_; --- 447,451 ---- QString cItem::getName( bool shortName ) { ! if ( !name_.isEmpty() && !name_.startsWith("#") ) return name_; *************** *** 1162,1166 **** textSpeech->setType( speechType ); textSpeech->setLanguage( "" ); ! textSpeech->setName( name() ); textSpeech->setColor( color ); textSpeech->setText( message ); --- 1162,1166 ---- textSpeech->setType( speechType ); textSpeech->setLanguage( "" ); ! textSpeech->setName( getName(true) ); textSpeech->setColor( color ); textSpeech->setText( message ); Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** ChangeLog 7 Sep 2004 20:21:27 -0000 1.39 --- ChangeLog 7 Sep 2004 23:01:49 -0000 1.40 *************** *** 36,39 **** --- 36,40 ---- - Char.settag and item.settag now correctly fail if the type of the value is not supported. - Fixed bug #0000252 (Negative parameters to char.checkskill got casted to unsigned short) + - Fixed item names for item.say Wolfpack 12.9.9 Beta (4. September 2004) |
From: Sebastian H. <dar...@us...> - 2004-09-07 22:23:26
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30344 Modified Files: walking.cpp Log Message: Fixes Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.146 retrieving revision 1.147 diff -C2 -d -r1.146 -r1.147 *** walking.cpp 7 Sep 2004 03:21:47 -0000 1.146 --- walking.cpp 7 Sep 2004 22:23:14 -0000 1.147 *************** *** 522,527 **** { P_NPC npc = dynamic_cast<P_NPC>( pChar ); ! if ( npc ) ! { npc->clearPath(); } --- 522,526 ---- { P_NPC npc = dynamic_cast<P_NPC>( pChar ); ! if ( npc ) { npc->clearPath(); } |
From: Sebastian H. <dar...@us...> - 2004-09-07 22:23:25
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30344/network Modified Files: uosocket.cpp Log Message: Fixes Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.409 retrieving revision 1.410 diff -C2 -d -r1.409 -r1.410 *** uosocket.cpp 7 Sep 2004 03:21:48 -0000 1.409 --- uosocket.cpp 7 Sep 2004 22:23:14 -0000 1.410 *************** *** 566,570 **** clientFeatures.setSixthCharacterSlot( true ); //clientFeatures.setShort( 1, 0xFFFF ); // AoS TEST ! //clientFeatures.setShort(1, 0x801F); send( &clientFeatures ); --- 566,570 ---- clientFeatures.setSixthCharacterSlot( true ); //clientFeatures.setShort( 1, 0xFFFF ); // AoS TEST ! clientFeatures.setShort(1, 0x80FF); send( &clientFeatures ); |
From: Sebastian H. <dar...@us...> - 2004-09-07 22:17:41
|
Update of /cvsroot/wpdev/xmlscripts/definitions/lists In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29372/lists Modified Files: npcs.xml Log Message: Fixes Index: npcs.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/lists/npcs.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** npcs.xml 6 Jun 2004 01:39:40 -0000 1.7 --- npcs.xml 7 Sep 2004 22:17:25 -0000 1.8 *************** *** 41,45 **** <item>black_bear</item> <item>brown_bear</item> ! <item>black_bull</item> <item>boar</item> <item>brown_bull</item> --- 41,45 ---- <item>black_bear</item> <item>brown_bear</item> ! <item>bull_black</item> <item>boar</item> <item>brown_bull</item> |
From: Sebastian H. <dar...@us...> - 2004-09-07 21:17:10
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17644/magic Modified Files: spell.py Log Message: Removed debug messages i forgot in there. Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** spell.py 7 Sep 2004 20:09:52 -0000 1.21 --- spell.py 7 Sep 2004 21:17:00 -0000 1.22 *************** *** 189,193 **** # Was: floor((delay / 4.0) * 1000) ! char.message(str(castspeed / 4.0)) return castspeed * 250 --- 189,193 ---- # Was: floor((delay / 4.0) * 1000) ! #char.message(str(castspeed / 4.0)) return castspeed * 250 *************** *** 225,229 **** delay = float(castrecovery) / 4.0 ! char.message(str(delay)) char.socket.settag('spell_delay', time.time() + delay) --- 225,229 ---- delay = float(castrecovery) / 4.0 ! #char.message(str(delay)) char.socket.settag('spell_delay', time.time() + delay) |
From: Sebastian H. <dar...@us...> - 2004-09-07 20:36:08
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9929/webroot Modified Files: ChangeLog.wolfpack Log Message: Fixed skillinfo command for remote clients. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** ChangeLog.wolfpack 7 Sep 2004 20:21:34 -0000 1.69 --- ChangeLog.wolfpack 7 Sep 2004 20:35:58 -0000 1.70 *************** *** 24,27 **** --- 24,28 ---- - Cast recovery times are now correct and take the CastRecoveryBonus properties into account. - Spellcasting speeds are now corrected and take bonusses into account. + - Fixed the skillinfo command gump for remote clients. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
From: Sebastian H. <dar...@us...> - 2004-09-07 20:35:22
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9824/commands Modified Files: skillinfo.py Log Message: Fixed skillinfo command for remote clients. Index: skillinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/skillinfo.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** skillinfo.py 18 Jul 2004 01:41:47 -0000 1.7 --- skillinfo.py 7 Sep 2004 20:35:12 -0000 1.8 *************** *** 22,29 **** if not target: return False # Iterate trough all skills and see what changed for skill in range( 0, ALLSKILLS ): ! try: newvalue = int(floor(float(response.text[0x1000 | skill]) * 10)) newcap = int(floor(float(response.text[0x2000 | skill]) * 10)) --- 22,38 ---- if not target: return False + + # Switch Page + if response.button & 0x1000 != 0: + page = response.button & 0xFFF + showgump(player, target, page) + return # Iterate trough all skills and see what changed for skill in range( 0, ALLSKILLS ): ! if not response.text.has_key(0x1000 | skill) or not response.text.has_key(0x2000 | skill): ! continue ! ! try: newvalue = int(floor(float(response.text[0x1000 | skill]) * 10)) newcap = int(floor(float(response.text[0x2000 | skill]) * 10)) *************** *** 44,57 **** target.skillcap[skill] = newcap ! # ! # Show the skillinfo gump ! # ! def callback(player, arguments, target): ! if not target.char: ! return ! dialog = wolfpack.gumps.cGump() dialog.setCallback("commands.skillinfo.response") ! dialog.setArgs([target.char.serial]) dialog.startPage(0) --- 53,66 ---- target.skillcap[skill] = newcap ! def showgump(player, target, page): ! # 80 pixel diameter ! pages = int(ceil(ALLSKILLS / 5.0)) ! ! if page > pages: ! return ! dialog = wolfpack.gumps.cGump() dialog.setCallback("commands.skillinfo.response") ! dialog.setArgs([target.serial]) dialog.startPage(0) *************** *** 76,120 **** dialog.addButton(136, 476, 242, 241, 0) ! # 80 pixel diameter ! pages = int(ceil(ALLSKILLS / 5.0)) ! page = 0 ! while page <= pages: ! page += 1 ! dialog.startPage(page) ! if page > 1: ! dialog.addPageButton(60, 444, 9909, 9911, page - 1) ! dialog.addText(88, 444, unicode("Previous Page"), 2100) ! if page < pages: ! dialog.addPageButton(448, 444, 9903, 9905, page + 1) ! dialog.addText(376, 448, unicode("Next Page"), 2100) ! yoffset = 0 ! for i in range(0, 5): ! skill = int(((page - 1) * 5) + i) ! if skill >= ALLSKILLS: ! break ! skillname = SKILLNAMES[skill] ! skillname = str( skillname[0].upper() + skillname[1:] ) ! skillvalue = ( target.char.skill[skill] / 10.0 ) ! skillcapvalue = ( target.char.skillcap[skill] / 10.0 ) ! dialog.addResizeGump(65, 109 + yoffset, 9200, 405, 62) ! dialog.addText(76, 115 + yoffset, unicode( "Skill: %s (%i)" % (skillname, skill) ), 2100) ! dialog.addResizeGump(123, 135 + yoffset, 9300, 63, 26) ! dialog.addText(76, 137 + yoffset, unicode( "Value:" ), 2100) ! dialog.addText(187, 138 + yoffset, unicode( "%" ), 2100) ! dialog.addInputField(128, 138 + yoffset, 50, 20, 2100, 0x1000 | skill, unicode( "%0.1f" % skillvalue ) ) ! dialog.addText(232, 138 + yoffset, unicode( "Cap:" ), 2100) ! dialog.addText(329, 139 + yoffset, unicode( "%" ), 2100) ! dialog.addResizeGump(264, 135 + yoffset, 9300, 63, 26) ! dialog.addInputField(268, 139 + yoffset, 53, 20, 2100, 0x2000 | skill, unicode( "%0.1f" % skillcapvalue ) ) ! yoffset += 65 dialog.send(player) # # Show the skillinfo target # --- 85,133 ---- dialog.addButton(136, 476, 242, 241, 0) ! if page > 0: ! dialog.addButton(60, 444, 9909, 9911, 0x1000 | page - 1) ! dialog.addText(88, 444, unicode("Previous Page"), 2100) ! if page + 1 < pages: ! dialog.addButton(448, 444, 9903, 9905, 0x1000 | page + 1) ! dialog.addText(376, 448, unicode("Next Page"), 2100) ! yoffset = 0 ! for i in range(0, 5): ! skill = int((page * 5) + i) ! if skill >= ALLSKILLS: ! break ! skillname = SKILLNAMES[skill] ! skillname = str( skillname[0].upper() + skillname[1:] ) ! skillvalue = ( target.skill[skill] / 10.0 ) ! skillcapvalue = ( target.skillcap[skill] / 10.0 ) ! dialog.addResizeGump(65, 109 + yoffset, 9200, 405, 62) ! dialog.addText(76, 115 + yoffset, unicode( "Skill: %s (%i)" % (skillname, skill) ), 2100) ! dialog.addResizeGump(123, 135 + yoffset, 9300, 63, 26) ! dialog.addText(76, 137 + yoffset, unicode( "Value:" ), 2100) ! dialog.addText(187, 138 + yoffset, unicode( "%" ), 2100) ! dialog.addInputField(128, 138 + yoffset, 50, 20, 2100, 0x1000 | skill, unicode( "%0.1f" % skillvalue ) ) ! dialog.addText(232, 138 + yoffset, unicode( "Cap:" ), 2100) ! dialog.addText(329, 139 + yoffset, unicode( "%" ), 2100) ! dialog.addResizeGump(264, 135 + yoffset, 9300, 63, 26) ! dialog.addInputField(268, 139 + yoffset, 53, 20, 2100, 0x2000 | skill, unicode( "%0.1f" % skillcapvalue ) ) ! ! yoffset += 65 dialog.send(player) # + # Show the skillinfo gump + # + def callback(player, arguments, target): + if not target.char: + return + + showgump(player, target.char, 0) + + # # Show the skillinfo target # |
From: Sebastian H. <dar...@us...> - 2004-09-07 20:21:45
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7474/webroot Modified Files: ChangeLog.wolfpack Log Message: A lot of magery fixes. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** ChangeLog.wolfpack 7 Sep 2004 03:49:26 -0000 1.68 --- ChangeLog.wolfpack 7 Sep 2004 20:21:34 -0000 1.69 *************** *** 20,23 **** --- 20,27 ---- - Resurrection now can affect dead chars. - Fixed multibags. + - Fixed nightsight potions. + - Casting now clears hands if the weapon doesnt have the SpellChannelling property. + - Cast recovery times are now correct and take the CastRecoveryBonus properties into account. + - Spellcasting speeds are now corrected and take bonusses into account. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
From: Sebastian H. <dar...@us...> - 2004-09-07 20:21:38
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7448/python Modified Files: char.cpp Log Message: Fix for skillchecks. Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.188 retrieving revision 1.189 diff -C2 -d -r1.188 -r1.189 *** char.cpp 7 Sep 2004 03:21:49 -0000 1.188 --- char.cpp 7 Sep 2004 20:21:27 -0000 1.189 *************** *** 548,554 **** unsigned short skill; ! unsigned short min, max; ! if ( !PyArg_ParseTuple( args, "hhh|char.checkskill( skill, min, max )", &skill, &min, &max ) ) return 0; --- 548,554 ---- unsigned short skill; ! int min, max; ! if ( !PyArg_ParseTuple( args, "hii|char.checkskill( skill, min, max )", &skill, &min, &max ) ) return 0; |
From: Sebastian H. <dar...@us...> - 2004-09-07 20:21:36
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7448 Modified Files: ChangeLog Log Message: Fix for skillchecks. Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** ChangeLog 7 Sep 2004 03:21:46 -0000 1.38 --- ChangeLog 7 Sep 2004 20:21:27 -0000 1.39 *************** *** 35,38 **** --- 35,39 ---- - Python longs passed to item.settag and char.settag are now interpreted as integers. - Char.settag and item.settag now correctly fail if the type of the value is not supported. + - Fixed bug #0000252 (Negative parameters to char.checkskill got casted to unsigned short) Wolfpack 12.9.9 Beta (4. September 2004) |
From: Sebastian H. <dar...@us...> - 2004-09-07 20:10:05
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5334/magic Modified Files: __init__.py circle5.py spell.py Log Message: A lot of magery fixes. Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** spell.py 6 Sep 2004 19:30:33 -0000 1.20 --- spell.py 7 Sep 2004 20:09:52 -0000 1.21 *************** *** 7,10 **** --- 7,11 ---- from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \ MAGERY, ANIM_CASTDIRECTED, SPELLDAMAGEBONUS, LOG_WARNING, SPELLCHANNELING + import time # Recursive Function for counting reagents *************** *** 96,99 **** --- 97,103 ---- self.casttime = 500 + (250 * self.circle) self.castaction = ANIM_CASTDIRECTED + + # Change this to 0 for AoS behaviour + self.castrecovery = 1 * circle # *************** *** 160,168 **** char.log(LOG_MESSAGE, "Casting spell %s from %s.\n" % (self.__class__.__name__, source)) ! char.addtimer(self.calcdelay(), 'magic.spell.callback', [self, mode, args, target, item], 0, 0, "cast_delay") return 1 ! def calcdelay(self): ! return self.casttime def checkweapon(self, char): --- 164,194 ---- char.log(LOG_MESSAGE, "Casting spell %s from %s.\n" % (self.__class__.__name__, source)) ! char.addtimer(self.calcdelay(char, mode), 'magic.spell.callback', [self, mode, args, target, item], 0, 0, "cast_delay") return 1 ! # ! # Calculate the time required to cast this spell ! # ! def calcdelay(self, char, mode): ! # Wands and commands don't have a delay ! if mode == MODE_WAND or mode == MODE_CMD: ! return 0 ! ! # Get the AOS bonus from all items the character wears ! castspeed = 3 - properties.fromchar(char, CASTSPEEDBONUS) ! ! # Under the influence of the protection spell ! # spells are cast more slowly ! if char.propertyflags & 0x20000: ! castspeed += 2 ! ! castspeed += self.circle ! ! if castspeed < 1: ! castspeed = 1 ! ! # Was: floor((delay / 4.0) * 1000) ! char.message(str(castspeed / 4.0)) ! return castspeed * 250 def checkweapon(self, char): *************** *** 176,183 **** # Check if the spellchanneling property is true for this item ! if properties.fromitem(weapon, SPELLCHANNELING) == 0: ! return False else: ! return True def checkrequirements(self, char, mode, args=[], target=None, item=None): --- 202,231 ---- # Check if the spellchanneling property is true for this item ! if not properties.fromitem(weapon, SPELLCHANNELING): ! if not wolfpack.tobackpack(weapon, char): ! weapon.update() ! ! return True else: ! return True ! ! # ! # Set the delay for the next spell ! # ! def setspelldelay(self, char, mode): ! if char.npc: ! pass ! elif char.socket: ! castrecovery = - properties.fromchar(char, CASTRECOVERYBONUS) ! castrecovery += 6 ! castrecovery += self.castrecovery ! ! if castrecovery < 0: ! castrecovery = 0 ! ! delay = float(castrecovery) / 4.0 ! char.message(str(delay)) ! ! char.socket.settag('spell_delay', time.time() + delay) def checkrequirements(self, char, mode, args=[], target=None, item=None): *************** *** 272,275 **** --- 320,326 ---- fizzle(char) return 0 + + # Set the next spell delay + self.setspelldelay(char, mode) return 1 Index: circle5.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** circle5.py 3 Sep 2004 01:16:22 -0000 1.20 --- circle5.py 7 Sep 2004 20:09:52 -0000 1.21 *************** *** 182,186 **** if not self.consumerequirements(char, mode, args, target, item): return ! # Toggle Magic Reflection if char.propertyflags & 0x40000: --- 182,186 ---- if not self.consumerequirements(char, mode, args, target, item): return ! # Toggle Magic Reflection if char.propertyflags & 0x40000: Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** __init__.py 3 Sep 2004 01:31:05 -0000 1.15 --- __init__.py 7 Sep 2004 20:09:52 -0000 1.16 *************** *** 5,8 **** --- 5,9 ---- from magic.spell import * from wolfpack import console + import time # Spell Registry *************** *** 39,47 **** if not spells.has_key(spell): if socket: ! socket.log(LOG_ERROR, "Trying to cast unknown spell: %d\n" % spell) socket.sysmessage('ERROR: Unknown Spell') return spells[spell].precast(char, mode, args, target, item) # Target Cancel --- 40,58 ---- if not spells.has_key(spell): if socket: ! socket.log(LOG_ERROR, "Trying to cast unknown spell: %d.\n" % spell) socket.sysmessage('ERROR: Unknown Spell') return + # Deny casting if spell delay hasn't yet expired + if socket and socket.hastag('spell_delay'): + spell_delay = float(socket.gettag('spell_delay')) + if spell_delay > time.time(): + socket.clilocmessage(502644) + return False + else: + socket.deltag('spell_delay') + spells[spell].precast(char, mode, args, target, item) + return True # Target Cancel |
From: Sebastian H. <dar...@us...> - 2004-09-07 20:10:03
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5334/wolfpack Modified Files: consts.py properties.py Log Message: A lot of magery fixes. Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** consts.py 4 Sep 2004 21:19:03 -0000 1.76 --- consts.py 7 Sep 2004 20:09:53 -0000 1.77 *************** *** 68,71 **** --- 68,73 ---- WEIGHTBONUS = 36 SPELLCHANNELING = 37 + CASTRECOVERYBONUS = 38 + CASTSPEEDBONUS = 39 # Checks for certain item types Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** properties.py 6 Sep 2004 17:36:22 -0000 1.9 --- properties.py 7 Sep 2004 20:09:53 -0000 1.10 *************** *** 13,17 **** MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ ! ITEM_PIERCING, ITEM_SLASHING, ITEM_BASHING, SPELLCHANNELING # --- 13,18 ---- MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ ! ITEM_PIERCING, ITEM_SLASHING, ITEM_BASHING, SPELLCHANNELING, \ ! CASTRECOVERYBONUS, CASTSPEEDBONUS # *************** *** 54,58 **** # Flags (Weapons): SPELLCHANNELING: ['spellchanneling', 0, 0], ! # % Boni LOWERREQS: ['lower_reqs', 0, 1], --- 55,59 ---- # Flags (Weapons): SPELLCHANNELING: ['spellchanneling', 0, 0], ! # % Boni LOWERREQS: ['lower_reqs', 0, 1], *************** *** 62,65 **** --- 63,68 ---- DEFENSEBONUS: ['aos_defense_chance', 0, 1], SPELLDAMAGEBONUS: ['spelldamagebonus', 0, 1], + CASTRECOVERYBONUS: ['castrecoverybonus', 0, 1], + CASTSPEEDBONUS: ['castspeedbonus', 0, 1], # Requirements |
From: Sebastian H. <dar...@us...> - 2004-09-07 20:10:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5334 Modified Files: equipment.py Log Message: A lot of magery fixes. Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** equipment.py 7 Sep 2004 00:31:03 -0000 1.35 --- equipment.py 7 Sep 2004 20:09:52 -0000 1.36 *************** *** 30,33 **** --- 30,48 ---- if reflectphysical: 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)) if object.hastag("bestskill"): |