wpdev-commits Mailing List for Wolfpack Emu (Page 80)
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: Richard M. <dr...@us...> - 2004-07-11 23:58:36
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26211/equipment Modified Files: food.xml Log Message: Tweaks Index: food.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/food.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** food.xml 29 May 2004 01:06:59 -0000 1.11 --- food.xml 11 Jul 2004 23:58:26 -0000 1.12 *************** *** 39,43 **** <category>Equipment\Food\Stew</category> <note>Use in conjunction with <ref id="item:974">cauldron n/s</ref> and <ref id="item:975">cauldron w/e</ref></note> ! <id>0x0970</id> <events>food</events> <!-- You can eat stew out of the cauldrons --> </item> --- 39,43 ---- <category>Equipment\Food\Stew</category> <note>Use in conjunction with <ref id="item:974">cauldron n/s</ref> and <ref id="item:975">cauldron w/e</ref></note> ! <id>0x970</id> <events>food</events> <!-- You can eat stew out of the cauldrons --> [...2033 lines suppressed...] <category>Decoration\Bar\Skull Mug 3</category> </item> <item id="ffe"> ! <id>0xffe</id> <category>Decoration\Bar\Skull Mug 4</category> </item> *************** *** 1247,1251 **** <!-- Pewter Mug --> <item id="fff"> ! <id>0x0fff</id> <category>Decoration\Bar\Pewter Mug 1</category> </item> --- 1233,1237 ---- <!-- Pewter Mug --> <item id="fff"> ! <id>0xfff</id> <category>Decoration\Bar\Pewter Mug 1</category> </item> |
|
From: Richard M. <dr...@us...> - 2004-07-11 23:57:06
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25946 Modified Files: food.py Log Message: Added some stuff that lets creatures like rabbits eat crops. Index: food.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/food.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** food.py 9 Jul 2004 21:47:45 -0000 1.6 --- food.py 11 Jul 2004 23:56:58 -0000 1.7 *************** *** 1,3 **** --- 1,4 ---- + import wolfpack import random from wolfpack.consts import ANIM_FIDGET3 *************** *** 5,8 **** --- 6,11 ---- from system import poison + farm_food = [ 'c7c', 'c70', 'c7b', 'c78', 'c71', 'c64', 'c65' ] + farm_eaters = [ 'rabbit' ] # # Feed the food *************** *** 81,82 **** --- 84,117 ---- return 1 + + def onCollide( char, item ): + if char.npc and item.baseid in farm_food and char.baseid in farm_eaters: + if 'food' in char.events: + return True + if char.baseid in farm_food: + char.events = ['food'] + char.events + return True + else: + return False + else: + return False + + def onWalk(char, dir, sequence): + if char.baseid in farm_eaters: + items = wolfpack.items(char.pos.x, char.pos.y, char.pos.map, 0) + for item in items: + if 'food' in item.events and item.baseid in farm_food: + food = item + break + if food: + food.delete() + char.sound( random.choice( [ 0x03a, 0x03b, 0x03c ] ) ) + char.say( "*munch*" ) + if char.hitpoints < char.maxhitpoints: + char.hitpoints += 1 + char.update() + events = char.events + while 'food' in events: + events.remove('food') + char.events = events + return True |
|
From: Richard M. <dr...@us...> - 2004-07-11 21:07:24
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29759/commands Modified Files: fix.py go.py skillinfo.py Log Message: Tweaks Index: fix.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/fix.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fix.py 9 Jul 2004 10:36:57 -0000 1.3 --- fix.py 11 Jul 2004 21:07:13 -0000 1.4 *************** *** 22,28 **** def commandFix( socket, cmd, args ): socket.sysmessage( "Resending the world, please wait." ) ! socket.player.update() ! socket.player.resendtooltip() socket.sysmessage( "Resend complete." ) return True --- 22,30 ---- def commandFix( socket, cmd, args ): + char = socket.player socket.sysmessage( "Resending the world, please wait." ) ! socket.resendplayer() ! char.update() ! #socket.resendworld() socket.sysmessage( "Resend complete." ) return True Index: go.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/go.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** go.py 9 Jul 2004 21:08:36 -0000 1.9 --- go.py 11 Jul 2004 21:07:13 -0000 1.10 *************** *** 64,68 **** object = target.item elif target.char: ! if target.char.rank >= player.rank and player != target.char: player.socket.sysmessage("You've burnt your fingers!") return --- 64,68 ---- object = target.item elif target.char: ! if target.char.rank > player.rank and player != target.char: player.socket.sysmessage("You've burnt your fingers!") return Index: skillinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/skillinfo.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** skillinfo.py 9 Jul 2004 21:08:36 -0000 1.5 --- skillinfo.py 11 Jul 2004 21:07:13 -0000 1.6 *************** *** 7,11 **** import wolfpack.gumps from wolfpack.utilities import tobackpack ! from wolfpack.consts import ALLSKILLS, SKILLNAMES, LOG_MESSAGE from math import ceil, floor from commands.info import iteminfo --- 7,11 ---- import wolfpack.gumps from wolfpack.utilities import tobackpack ! from wolfpack.consts import ALLSKILLS, SKILLNAMES, LOG_MESSAGE, skillnamesids from math import ceil, floor from commands.info import iteminfo *************** *** 21,28 **** if not target: ! return # Iterate trough all skills and see what changed ! for skill in range(0, ALLSKILLS): try: newvalue = int(floor(float(response.text[0x1000 | skill]) * 10)) --- 21,28 ---- 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)) *************** *** 30,34 **** except: player.socket.sysmessage('You have entered invalid values for %s.' % SKILLNAMES[skill]) ! return oldvalue = target.skill[skill] --- 30,34 ---- except: player.socket.sysmessage('You have entered invalid values for %s.' % SKILLNAMES[skill]) ! return False oldvalue = target.skill[skill] |
|
From: Richard M. <dr...@us...> - 2004-07-11 21:07:22
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29759/wolfpack Modified Files: consts.py Log Message: Tweaks Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** consts.py 2 Jul 2004 13:40:47 -0000 1.71 --- consts.py 11 Jul 2004 21:07:13 -0000 1.72 *************** *** 265,269 **** """ \constants wolfpack.consts Layer Constants ! These constants provide fast access to equipment on certain layers of a character. See the itemonlayer method for <object id="char">char</object> objects. """ --- 265,269 ---- """ \constants wolfpack.consts Layer Constants ! These constants provide fast access to equipment on certain layers of a character. See the itemonlayer method for <object id="char">char</object> objects. """ *************** *** 413,417 **** \constants wolfpack.consts Damage Constants These constants specify a damage type for the ! damage method in the <object id="char">char</object> object. """ --- 413,417 ---- \constants wolfpack.consts Damage Constants These constants specify a damage type for the ! damage method in the <object id="char">char</object> object. """ *************** *** 427,431 **** """ \constants wolfpack.consts Animation Constants ! These constants are animation ids for the action method in the <object id="char">char</object> object. --- 427,431 ---- """ \constants wolfpack.consts Animation Constants ! These constants are animation ids for the action method in the <object id="char">char</object> object. *************** *** 747,751 **** """ \constants wolfpack.consts Definition Constants ! These constants represent the definition section types as used in getdefinition in the <module id="wolfpack">wolfpack</module> module. """ --- 747,751 ---- """ \constants wolfpack.consts Definition Constants ! These constants represent the definition section types as used in getdefinition in the <module id="wolfpack">wolfpack</module> module. """ |
|
From: Richard M. <dr...@us...> - 2004-07-11 21:05:45
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29545 Modified Files: index.xml lightsources.xml walls.xml Added Files: windows.xml Log Message: Updates, later I will track down all the proper lightsource values for windows... Index: index.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/index.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.xml 13 May 2004 07:02:47 -0000 1.2 --- index.xml 11 Jul 2004 21:05:33 -0000 1.3 *************** *** 28,30 **** --- 28,31 ---- <include file="definitions/items/buildings/walls.xml"/> <include file="definitions/items/buildings/weapons.xml"/> + <include file="definitions/items/buildings/windows.xml"/> </definitions> Index: lightsources.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/lightsources.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** lightsources.xml 2 Jun 2004 15:02:18 -0000 1.12 --- lightsources.xml 11 Jul 2004 21:05:34 -0000 1.13 *************** *** 16,20 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Sconce (W/E) (Off)</category> ! <direction>2</direction> </item> --- 16,20 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Sconce (W/E) (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 23,27 **** <nodecay /> <category>Decoration\Lightsources\Wall Sconce (W/E) (Empty)</category> ! <direction>2</direction> </item> --- 23,27 ---- <nodecay /> <category>Decoration\Lightsources\Wall Sconce (W/E) (Empty)</category> ! <lightsource>2</lightsource> </item> *************** *** 31,35 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Sconce (W/E) (On)</category> ! <direction>2</direction> </item> --- 31,35 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Sconce (W/E) (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 39,43 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Sconce (N/S) (Off)</category> ! <direction>2</direction> </item> --- 39,43 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Sconce (N/S) (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 46,50 **** <nodecay /> <category>Decoration\Lightsources\Wall Sconce (W/E) (Empty)</category> ! <direction>2</direction> </item> --- 46,50 ---- <nodecay /> <category>Decoration\Lightsources\Wall Sconce (W/E) (Empty)</category> ! <lightsource>2</lightsource> </item> *************** *** 54,58 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Sconce (W/E) (On)</category> ! <direction>2</direction> </item> --- 54,58 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Sconce (W/E) (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 62,66 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (W/E) (Off)</category> ! <direction>2</direction> </item> --- 62,66 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (W/E) (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 70,74 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (W/E) (Empty)</category> ! <direction>2</direction> </item> --- 70,74 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (W/E) (Empty)</category> ! <lightsource>2</lightsource> </item> *************** *** 78,82 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (W/E) (On)</category> ! <direction>2</direction> </item> --- 78,82 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (W/E) (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 86,90 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (N/S) (Off)</category> ! <direction>2</direction> </item> --- 86,90 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (N/S) (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 94,98 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (N/S) (Empty)</category> ! <direction>2</direction> </item> --- 94,98 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (N/S) (Empty)</category> ! <lightsource>2</lightsource> </item> *************** *** 102,106 **** <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (N/S) (On)</category> ! <direction>2</direction> </item> --- 102,106 ---- <events>lightsource</events> <category>Decoration\Lightsources\Wall Torch (N/S) (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 110,114 **** <events>lightsource</events> <category>Decoration\Lightsources\Hanging Lantern 1 (Off)</category> ! <direction>2</direction> </item> --- 110,114 ---- <events>lightsource</events> <category>Decoration\Lightsources\Hanging Lantern 1 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 118,122 **** <events>lightsource</events> <category>Decoration\Lightsources\Hanging Lantern 1 (On)</category> ! <direction>2</direction> </item> --- 118,122 ---- <events>lightsource</events> <category>Decoration\Lightsources\Hanging Lantern 1 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 126,130 **** <events>lightsource</events> <category>Decoration\Lightsources\Hanging Lantern 2 (Off)</category> ! <direction>2</direction> </item> --- 126,130 ---- <events>lightsource</events> <category>Decoration\Lightsources\Hanging Lantern 2 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 134,138 **** <events>lightsource</events> <category>Decoration\Lightsources\Hanging Lantern 2 (On)</category> ! <direction>2</direction> </item> --- 134,138 ---- <events>lightsource</events> <category>Decoration\Lightsources\Hanging Lantern 2 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 154,158 **** <events>lightsource</events> <category>Decoration\Lightsources\Lantern (Off)</category> ! <direction>29</direction> </item> --- 154,158 ---- <events>lightsource</events> <category>Decoration\Lightsources\Lantern (Off)</category> ! <lightsource>29</lightsource> </item> *************** *** 162,166 **** <events>lightsource</events> <category>Decoration\Lightsources\Lantern (On)</category> ! <direction>29</direction> </item> --- 162,166 ---- <events>lightsource</events> <category>Decoration\Lightsources\Lantern (On)</category> ! <lightsource>29</lightsource> </item> *************** *** 170,174 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 1 (Off)</category> ! <direction>2</direction> </item> --- 170,174 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 1 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 178,182 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 1 (On)</category> ! <direction>2</direction> </item> --- 178,182 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 1 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 186,190 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 2 (Off)</category> ! <direction>2</direction> </item> --- 186,190 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 2 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 194,198 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 2 (On)</category> ! <direction>2</direction> </item> --- 194,198 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 2 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 202,206 **** <events>lightsource</events> <category>Decoration\Lightsources\Small Candelabra (Off)</category> ! <direction>1</direction> <weight>3.0</weight> </item> --- 202,206 ---- <events>lightsource</events> <category>Decoration\Lightsources\Small Candelabra (Off)</category> ! <lightsource>1</lightsource> <weight>3.0</weight> </item> *************** *** 211,215 **** <events>lightsource</events> <category>Decoration\Lightsources\Small Candelabra (On)</category> ! <direction>1</direction> <weight>3.0</weight> </item> --- 211,215 ---- <events>lightsource</events> <category>Decoration\Lightsources\Small Candelabra (On)</category> ! <lightsource>1</lightsource> <weight>3.0</weight> </item> *************** *** 220,224 **** <events>lightsource</events> <category>Decoration\Lightsources\Big Candlabra (Off)</category> ! <direction>2</direction> </item> --- 220,224 ---- <events>lightsource</events> <category>Decoration\Lightsources\Big Candlabra (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 228,232 **** <events>lightsource</events> <category>Decoration\Lightsources\Big Candlabra (On)</category> ! <direction>2</direction> </item> --- 228,232 ---- <events>lightsource</events> <category>Decoration\Lightsources\Big Candlabra (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 242,246 **** <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 1 (Off)</category> ! <direction>2</direction> </item> --- 242,246 ---- <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 1 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 250,254 **** <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 1 (On)</category> ! <direction>2</direction> </item> --- 250,254 ---- <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 1 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 258,262 **** <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 2 (Off)</category> ! <direction>2</direction> </item> --- 258,262 ---- <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 2 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 266,270 **** <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 2 (On)</category> ! <direction>2</direction> </item> --- 266,270 ---- <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 2 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 274,278 **** <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 3 (Off)</category> ! <direction>2</direction> </item> --- 274,278 ---- <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 3 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 282,286 **** <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 3 (On)</category> ! <direction>2</direction> </item> --- 282,286 ---- <events>lightsource</events> <category>Decoration\Lightsources\Lamp Post 3 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 288,292 **** <id>0xe31</id> <nodecay /> ! <category>Decoration\Lightsources\Brazier 1</category> </item> --- 288,292 ---- <id>0xe31</id> <nodecay /> ! <category>Decoration\Lightsources\Brazier 1</category> </item> *************** *** 314,318 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 3 (On)</category> ! <direction>2</direction> </item> --- 314,318 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 3 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 322,326 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 3 (Off)</category> ! <direction>2</direction> </item> --- 322,326 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 3 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 330,334 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 4 (On)</category> ! <direction>2</direction> </item> --- 330,334 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 4 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 338,342 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 4 (Off)</category> ! <direction>2</direction> </item> --- 338,342 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 4 (Off)</category> ! <lightsource>2</lightsource> </item> *************** *** 346,350 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 5 (On)</category> ! <direction>2</direction> </item> --- 346,350 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 5 (On)</category> ! <lightsource>2</lightsource> </item> *************** *** 354,358 **** <events>lightsource</events> <category>Decoration\Lightsources\Candle 5 (Off)</category> ! <direction>2</direction> </item> --- 354,358 ---- <events>lightsource</events> <category>Decoration\Lightsources\Candle 5 (Off)</category> ! <lightsource>2</lightsource> </item> --- NEW FILE: windows.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | (( _/{ "-; | Created by: Dreoth | )).-' {{ ;'` | Revised by: | ( ( ;._ \\ ctr | Last Modification: Split From walls.xml ================================================================= --> <definitions> <item id="e"> <id>0xe</id> <category>Buildings\Walls\Wooden Wall 1\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="f"> <id>0xf</id> <category>Buildings\Walls\Wooden Wall 1\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="22"> <id>0x22</id> <category>Buildings\Walls\Stone Wall 1\Window 1</category> <nodecay/> <lightsource>2</lightsource> </item> <item id="23"> <id>0x23</id> <category>Buildings\Walls\Stone Wall 1\Window 2</category> <lightsource>0</lightsource> <nodecay/> </item> <item id="3b"> <id>0x3b</id> <category>Buildings\Walls\Brick Wall\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="3c"> <id>0x3c</id> <category>Buildings\Walls\Brick Wall\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="5d"> <id>0x5d</id> <category>Buildings\Walls\Stone Wall 2\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="5e"> <id>0x5e</id> <category>Buildings\Walls\Stone Wall 2\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="83"> <id>0x83</id> <category>Buildings\Walls\Stone Wall 3\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="85"> <id>0x85</id> <category>Buildings\Walls\Stone Wall 3\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="8d"> <id>0x8d</id> <category>Buildings\Walls\Stone Wall 3\Window 3</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="8f"> <id>0x8f</id> <category>Buildings\Walls\Stone Wall 3\Window 4</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="98"> <id>0x98</id> <category>Buildings\Walls\Log Wall\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="99"> <id>0x99</id> <category>Buildings\Walls\Log Wall\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="b9"> <id>0xb9</id> <category>Buildings\Walls\Wooden Wall 2\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="ba"> <id>0xba</id> <category>Buildings\Walls\Wooden Wall 2\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="bb"> <id>0xbb</id> <category>Buildings\Walls\Wooden Wall 2\Window w. Bar 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="bc"> <id>0xbc</id> <category>Buildings\Walls\Wooden Wall 2\Window w. Bar 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="fc"> <id>0xfc</id> <category>Buildings\Walls\Marble Wall 1\Fancy\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="fd"> <id>0xfd</id> <category>Buildings\Walls\Marble Wall 1\Fancy\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="102"> <id>0x102</id> <category>Buildings\Walls\Marble Wall 1\With Bar\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="103"> <id>0x103</id> <category>Buildings\Walls\Marble Wall 1\With Bar\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="108"> <id>0x108</id> <category>Buildings\Walls\Marble Wall 1\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="109"> <id>0x109</id> <category>Buildings\Walls\Marble Wall 1\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="13a"> <id>0x13a</id> <category>Buildings\Walls\Plaster Wall 1\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="13b"> <id>0x13b</id> <category>Buildings\Walls\Plaster Wall 1\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="154"> <id>0x154</id> <category>Buildings\Walls\Plaster Wall 1\Fancy\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="155"> <id>0x155</id> <category>Buildings\Walls\Plaster Wall 1\Fancy\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="156"> <id>0x156</id> <category>Buildings\Walls\Plaster Wall 1\Fancy\Window 3</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="157"> <id>0x157</id> <category>Buildings\Walls\Plaster Wall 1\Fancy\Window 4</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="15c"> <id>0x15c</id> <category>Buildings\Walls\Sandstone Wall 1\Patterned\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="15d"> <id>0x15d</id> <category>Buildings\Walls\Sandstone Wall 1\Patterned\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="162"> <id>0x162</id> <category>Buildings\Walls\Sandstone Wall 1\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="163"> <id>0x163</id> <category>Buildings\Walls\Sandstone Wall 1\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="252"> <id>0x252</id> <category>Buildings\Walls\Sandstone Wall 1\Fancy\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="253"> <id>0x253</id> <category>Buildings\Walls\Sandstone Wall 1\Fancy\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="254"> <id>0x254</id> <category>Buildings\Walls\Sandstone Wall 1\Fancy\Window 3</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1ad"> <id>0x1ad</id> <category>Buildings\Walls\Rattan Wall\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1ae"> <id>0x1ae</id> <category>Buildings\Walls\Rattan Wall\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1af"> <id>0x1af</id> <category>Buildings\Walls\Rattan Wall\Window 3</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1b0"> <id>0x1b0</id> <category>Buildings\Walls\Rattan Wall\Window 4</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1c4"> <id>0x1c4</id> <category>Buildings\Walls\Hide Wall\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1c5"> <id>0x1c5</id> <category>Buildings\Walls\Hide Wall\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1c6"> <id>0x1c6</id> <category>Buildings\Walls\Hide Wall\Window 3</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1c7"> <id>0x1c7</id> <category>Buildings\Walls\Hide Wall\Window 4</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1d3"> <id>0x1d3</id> <category>Buildings\Walls\Stone Wall 5\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="1d4"> <id>0x1d4</id> <category>Buildings\Walls\Stone Wall 5\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="207"> <id>0x207</id> <category>Buildings\Walls\Plaster Wall 2\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="208"> <id>0x208</id> <category>Buildings\Walls\Plaster Wall 2\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="209"> <id>0x209</id> <category>Buildings\Walls\Plaster Wall 2\Window 3</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="20a"> <id>0x20a</id> <category>Buildings\Walls\Plaster Wall 2\Window 4</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="295"> <id>0x295</id> <category>Buildings\Walls\Marble Wall 2\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="296"> <id>0x296</id> <category>Buildings\Walls\Marble Wall 2\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="29b"> <id>0x29b</id> <category>Buildings\Walls\Marble Wall 2\With Bar\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="29c"> <id>0x29c</id> <category>Buildings\Walls\Marble Wall 2\With Bar\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="2ad"> <id>0x2ad</id> <category>Buildings\Walls\Marble Wall 2\Fancy\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="2ae"> <id>0x2ae</id> <category>Buildings\Walls\Marble Wall 2\Fancy\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="3dd"> <id>0x3dd</id> <category>Buildings\Walls\Sandstone Wall 2\Window 1</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="3de"> <id>0x3de</id> <category>Buildings\Walls\Sandstone Wall 2\Window 2</category> <nodecay/> <lightsource>0</lightsource> </item> <item id="3df"> <id>0x3df</id> <category>Buildings\Walls\Sandstone Wall 2\Window 3</category> <nodecay/> <lightsource>0</lightsource> </item> </definitions> Index: walls.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/walls.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** walls.xml 22 Feb 2004 08:38:17 -0000 1.5 --- walls.xml 11 Jul 2004 21:05:34 -0000 1.6 *************** *** 58,73 **** </item> - <item id="e"> - <id>0xe</id> - <category>Buildings\Walls\Wooden Wall 1\Window 1</category> - <nodecay/> - </item> - - <item id="f"> - <id>0xf</id> - <category>Buildings\Walls\Wooden Wall 1\Window 2</category> - <nodecay/> - </item> - <item id="10"> <id>0x10</id> --- 58,61 ---- *************** *** 179,194 **** </item> - <item id="22"> - <id>0x22</id> - <category>Buildings\Walls\Stone Wall 1\Window 1</category> - <nodecay/> - </item> - - <item id="23"> - <id>0x23</id> - <category>Buildings\Walls\Stone Wall 1\Window 2</category> - <nodecay/> - </item> - <item id="24"> <id>0x24</id> --- 167,170 ---- *************** *** 330,345 **** </item> - <item id="3b"> - <id>0x3b</id> - <category>Buildings\Walls\Brick Wall\Window 1</category> - <nodecay/> - </item> - - <item id="3c"> - <id>0x3c</id> - <category>Buildings\Walls\Brick Wall\Window 2</category> - <nodecay/> - </item> - <item id="3d"> <id>0x3d</id> --- 306,309 ---- *************** *** 535,550 **** </item> - <item id="5d"> - <id>0x5d</id> - <category>Buildings\Walls\Stone Wall 2\Window 1</category> - <nodecay/> - </item> - - <item id="5e"> - <id>0x5e</id> - <category>Buildings\Walls\Stone Wall 2\Window 2</category> - <nodecay/> - </item> - <item id="5f"> <id>0x5f</id> --- 499,502 ---- *************** *** 764,773 **** </item> - <item id="83"> - <id>0x83</id> - <category>Buildings\Walls\Stone Wall 3\Window 1</category> - <nodecay/> - </item> - <item id="84"> <id>0x84</id> --- 716,719 ---- *************** *** 776,785 **** </item> - <item id="85"> - <id>0x85</id> - <category>Buildings\Walls\Stone Wall 3\Window 2</category> - <nodecay/> - </item> - <item id="86"> <id>0x86</id> --- 722,725 ---- *************** *** 824,833 **** </item> - <item id="8d"> - <id>0x8d</id> - <category>Buildings\Walls\Stone Wall 3\Window 3</category> - <nodecay/> - </item> - <item id="8e"> <id>0x8e</id> --- 764,767 ---- *************** *** 836,845 **** </item> - <item id="8f"> - <id>0x8f</id> - <category>Buildings\Walls\Stone Wall 3\Window 4</category> - <nodecay/> - </item> - <item id="2c7"> <id>0x2c7</id> --- 770,773 ---- *************** *** 1005,1020 **** </item> - <item id="98"> - <id>0x98</id> - <category>Buildings\Walls\Log Wall\Window 1</category> - <nodecay/> - </item> - - <item id="99"> - <id>0x99</id> - <category>Buildings\Walls\Log Wall\Window 2</category> - <nodecay/> - </item> - <item id="9a"> <id>0x9a</id> --- 933,936 ---- *************** *** 1372,1399 **** </item> - <item id="b9"> - <id>0xb9</id> - <category>Buildings\Walls\Wooden Wall 2\Window 1</category> - <nodecay/> - </item> - - <item id="ba"> - <id>0xba</id> - <category>Buildings\Walls\Wooden Wall 2\Window 2</category> - <nodecay/> - </item> - - <item id="bb"> - <id>0xbb</id> - <category>Buildings\Walls\Wooden Wall 2\Window w. Bar 1</category> - <nodecay/> - </item> - - <item id="bc"> - <id>0xbc</id> - <category>Buildings\Walls\Wooden Wall 2\Window w. Bar 2</category> - <nodecay/> - </item> - <item id="bd"> <id>0xbd</id> --- 1288,1291 ---- *************** *** 1746,1761 **** </item> - <item id="fc"> - <id>0xfc</id> - <category>Buildings\Walls\Marble Wall 1\Fancy\Window 1</category> - <nodecay/> - </item> - - <item id="fd"> - <id>0xfd</id> - <category>Buildings\Walls\Marble Wall 1\Fancy\Window 2</category> - <nodecay/> - </item> - <item id="fe"> <id>0xfe</id> --- 1638,1641 ---- *************** *** 1782,1797 **** </item> - <item id="102"> - <id>0x102</id> - <category>Buildings\Walls\Marble Wall 1\With Bar\Window 1</category> - <nodecay/> - </item> - - <item id="103"> - <id>0x103</id> - <category>Buildings\Walls\Marble Wall 1\With Bar\Window 2</category> - <nodecay/> - </item> - <item id="104"> <id>0x104</id> --- 1662,1665 ---- *************** *** 1818,1833 **** </item> - <item id="108"> - <id>0x108</id> - <category>Buildings\Walls\Marble Wall 1\Window 1</category> - <nodecay/> - </item> - - <item id="109"> - <id>0x109</id> - <category>Buildings\Walls\Marble Wall 1\Window 2</category> - <nodecay/> - </item> - <item id="10a"> <id>0x10a</id> --- 1686,1689 ---- *************** *** 2203,2218 **** </item> - <item id="13a"> - <id>0x13a</id> - <category>Buildings\Walls\Plaster Wall 1\Window 1</category> - <nodecay/> - </item> - - <item id="13b"> - <id>0x13b</id> - <category>Buildings\Walls\Plaster Wall 1\Window 2</category> - <nodecay/> - </item> - <item id="13c"> <id>0x13c</id> --- 2059,2062 ---- *************** *** 2336,2363 **** </item> - <item id="154"> - <id>0x154</id> - <category>Buildings\Walls\Plaster Wall 1\Fancy\Window 1</category> - <nodecay/> - </item> - - <item id="155"> - <id>0x155</id> - <category>Buildings\Walls\Plaster Wall 1\Fancy\Window 2</category> - <nodecay/> - </item> - - <item id="156"> - <id>0x156</id> - <category>Buildings\Walls\Plaster Wall 1\Fancy\Window 3</category> - <nodecay/> - </item> - - <item id="157"> - <id>0x157</id> - <category>Buildings\Walls\Plaster Wall 1\Fancy\Window 4</category> - <nodecay/> - </item> - <!-- Plaster Wall 1\Wrecked --> <item id="37f"> --- 2180,2183 ---- *************** *** 2590,2605 **** </item> - <item id="15c"> - <id>0x15c</id> - <category>Buildings\Walls\Sandstone Wall 1\Patterned\Window 1</category> - <nodecay/> - </item> - - <item id="15d"> - <id>0x15d</id> - <category>Buildings\Walls\Sandstone Wall 1\Patterned\Window 2</category> - <nodecay/> - </item> - <item id="15e"> <id>0x15e</id> --- 2410,2413 ---- *************** *** 2626,2641 **** </item> - <item id="162"> - <id>0x162</id> - <category>Buildings\Walls\Sandstone Wall 1\Window 1</category> - <nodecay/> - </item> - - <item id="163"> - <id>0x163</id> - <category>Buildings\Walls\Sandstone Wall 1\Window 2</category> - <nodecay/> - </item> - <item id="164"> <id>0x164</id> --- 2434,2437 ---- *************** *** 3065,3086 **** </item> - <item id="252"> - <id>0x252</id> - <category>Buildings\Walls\Sandstone Wall 1\Fancy\Window 1</category> - <nodecay/> - </item> - - <item id="253"> - <id>0x253</id> - <category>Buildings\Walls\Sandstone Wall 1\Fancy\Window 2</category> - <nodecay/> - </item> - - <item id="254"> - <id>0x254</id> - <category>Buildings\Walls\Sandstone Wall 1\Fancy\Window 3</category> - <nodecay/> - </item> - <item id="255"> <id>0x255</id> --- 2861,2864 ---- *************** *** 3234,3261 **** </item> - <item id="1ad"> - <id>0x1ad</id> - <category>Buildings\Walls\Rattan Wall\Window 1</category> - <nodecay/> - </item> - - <item id="1ae"> - <id>0x1ae</id> - <category>Buildings\Walls\Rattan Wall\Window 2</category> - <nodecay/> - </item> - - <item id="1af"> - <id>0x1af</id> - <category>Buildings\Walls\Rattan Wall\Window 3</category> - <nodecay/> - </item> - - <item id="1b0"> - <id>0x1b0</id> - <category>Buildings\Walls\Rattan Wall\Window 4</category> - <nodecay/> - </item> - <item id="215a"> <id>0x215a</id> --- 3012,3015 ---- *************** *** 3367,3394 **** </item> - <item id="1c4"> - <id>0x1c4</id> - <category>Buildings\Walls\Hide Wall\Window 1</category> - <nodecay/> - </item> - - <item id="1c5"> - <id>0x1c5</id> - <category>Buildings\Walls\Hide Wall\Window 2</category> - <nodecay/> - </item> - - <item id="1c6"> - <id>0x1c6</id> - <category>Buildings\Walls\Hide Wall\Window 3</category> - <nodecay/> - </item> - - <item id="1c7"> - <id>0x1c7</id> - <category>Buildings\Walls\Hide Wall\Window 4</category> - <nodecay/> - </item> - <item id="1c8"> <id>0x1c8</id> --- 3121,3124 ---- *************** *** 3452,3467 **** </item> - <item id="1d3"> - <id>0x1d3</id> - <category>Buildings\Walls\Stone Wall 5\Window 1</category> - <nodecay/> - </item> - - <item id="1d4"> - <id>0x1d4</id> - <category>Buildings\Walls\Stone Wall 5\Window 2</category> - <nodecay/> - </item> - <item id="1d5"> <id>0x1d5</id> --- 3182,3185 ---- *************** *** 3773,3800 **** </item> - <item id="207"> - <id>0x207</id> - <category>Buildings\Walls\Plaster Wall 2\Window 1</category> - <nodecay/> - </item> - - <item id="208"> - <id>0x208</id> - <category>Buildings\Walls\Plaster Wall 2\Window 2</category> - <nodecay/> - </item> - - <item id="209"> - <id>0x209</id> - <category>Buildings\Walls\Plaster Wall 2\Window 3</category> - <nodecay/> - </item> - - <item id="20a"> - <id>0x20a</id> - <category>Buildings\Walls\Plaster Wall 2\Window 4</category> - <nodecay/> - </item> - <item id="20b"> <id>0x20b</id> --- 3491,3494 ---- *************** *** 4691,4706 **** </item> - <item id="295"> - <id>0x295</id> - <category>Buildings\Walls\Marble Wall 2\Window 1</category> - <nodecay/> - </item> - - <item id="296"> - <id>0x296</id> - <category>Buildings\Walls\Marble Wall 2\Window 2</category> - <nodecay/> - </item> - <item id="297"> <id>0x297</id> --- 4385,4388 ---- *************** *** 4727,4742 **** </item> - <item id="29b"> - <id>0x29b</id> - <category>Buildings\Walls\Marble Wall 2\With Bar\Window 1</category> - <nodecay/> - </item> - - <item id="29c"> - <id>0x29c</id> - <category>Buildings\Walls\Marble Wall 2\With Bar\Window 2</category> - <nodecay/> - </item> - <item id="29d"> <id>0x29d</id> --- 4409,4412 ---- *************** *** 4835,4850 **** </item> - <item id="2ad"> - <id>0x2ad</id> - <category>Buildings\Walls\Marble Wall 2\Fancy\Window 1</category> - <nodecay/> - </item> - - <item id="2ae"> - <id>0x2ae</id> - <category>Buildings\Walls\Marble Wall 2\Fancy\Window 2</category> - <nodecay/> - </item> - <item id="2b0"> <id>0x2b0</id> --- 4505,4508 ---- *************** *** 5522,5543 **** </item> - <item id="3dd"> - <id>0x3dd</id> - <category>Buildings\Walls\Sandstone Wall 2\Window 1</category> - <nodecay/> - </item> - - <item id="3de"> - <id>0x3de</id> - <category>Buildings\Walls\Sandstone Wall 2\Window 2</category> - <nodecay/> - </item> - - <item id="3df"> - <id>0x3df</id> - <category>Buildings\Walls\Sandstone Wall 2\Window 3</category> - <nodecay/> - </item> - <item id="3e0"> <id>0x3e0</id> --- 5180,5183 ---- |
|
From: Richard M. <dr...@us...> - 2004-07-11 19:05:06
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8494 Modified Files: speech.cpp Log Message: Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.177 retrieving revision 1.178 diff -C2 -d -r1.177 -r1.178 *** speech.cpp 15 Jun 2004 02:44:45 -0000 1.177 --- speech.cpp 11 Jul 2004 19:04:58 -0000 1.178 *************** *** 71,75 **** bool ok; ! INT32 num = speech.toInt( &ok ); // Generally try to convert it QString notification; --- 71,75 ---- bool ok; ! //INT32 num = speech.toInt( &ok ); // Generally try to convert it QString notification; |
|
From: Richard M. <dr...@us...> - 2004-07-11 02:48:04
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16874/wolfpack Modified Files: armorinfo.py properties.py utilities.py weaponinfo.py Log Message: I tried reducing more imports... I also think this is starting to have a positive effect on memory usage... I did some testing the other day and recorded a 5m leak per console reload. # Before Cleanups From Initial Startup # CONSOLE RELOAD VRIT RES SHR SWAP DATA 95972 33m 19m 60m 91m 99.4m 38m 19m 90m 97m 104m 43m 19m 60m 102m 109m 48m 19m 60m 107m 114m 53m 19m 60m 112m 119m 58m 19m 60m 117m 124m 64m 19m 60m 122m # After Cleanups From Initial Startup # CONSOLE RELOAD VRIT RES SHR SWAP DATA 94868 32m 19m 60m 90m 98.0m 37m 19m 60m 96m 102m 42m 19m 60m 100m 107m 46m 19m 60m 105m 112m 51m 19m 60m 110m 116m 56m 19m 60m 114m 121m 60m 19m 60m 119m Overall it appears that the total memory used on startup has decreased just a bit, and the amount of memory leaked per reload seems to drop just slightly. Index: armorinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/armorinfo.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** armorinfo.py 9 Jun 2004 21:47:26 -0000 1.6 --- armorinfo.py 11 Jul 2004 02:47:25 -0000 1.7 *************** *** 1,4 **** ! from wolfpack.consts import * ARMOR_RESNAME_BONI = { --- 1,11 ---- ! from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \ ! RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_ENERGY, \ ! DAMAGE_COLD, DAMAGE_POISON, DAMAGE_FIRE, DAMAGEBONUS, SPEEDBONUS, \ ! HITBONUS, DEFENSEBONUS, MINDAMAGE, MAXDAMAGE, SPEED, MISSSOUND, \ ! HITSOUND, PROJECTILE, PROJECTILEHUE, AMMUNITION, REQSTR, REQDEX, REQINT, \ ! LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \ ! SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \ ! DURABILITYBONUS, WEIGHTBONUS, DAMAGE_PHYSICAL ARMOR_RESNAME_BONI = { Index: weaponinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/weaponinfo.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** weaponinfo.py 14 May 2004 14:40:37 -0000 1.5 --- weaponinfo.py 11 Jul 2004 02:47:25 -0000 1.6 *************** *** 1,4 **** ! from wolfpack.consts import * WEAPON_RESNAME_BONI = { --- 1,11 ---- ! from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \ ! RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_ENERGY, \ ! DAMAGE_COLD, DAMAGE_POISON, DAMAGE_FIRE, DAMAGEBONUS, SPEEDBONUS, \ ! HITBONUS, DEFENSEBONUS, MINDAMAGE, MAXDAMAGE, SPEED, MISSSOUND, \ ! HITSOUND, PROJECTILE, PROJECTILEHUE, AMMUNITION, REQSTR, REQDEX, REQINT, \ ! LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \ ! SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \ ! DURABILITYBONUS, WEIGHTBONUS, DAMAGE_PHYSICAL WEAPON_RESNAME_BONI = { Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** properties.py 22 Jun 2004 12:05:29 -0000 1.4 --- properties.py 11 Jul 2004 02:47:25 -0000 1.5 *************** *** 1,7 **** - from wolfpack.consts import * from math import floor from wolfpack import weaponinfo from wolfpack import armorinfo # --- 1,17 ---- from math import floor from wolfpack import weaponinfo from wolfpack import armorinfo + from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \ + RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_PHYSICAL, \ + DAMAGE_ENERGY, DAMAGE_COLD, DAMAGE_POISON, DAMAGE_FIRE, DAMAGEBONUS, \ + SPEEDBONUS, HITBONUS, DEFENSEBONUS, MINDAMAGE, MAXDAMAGE, SPEED, MISSSOUND, \ + HITSOUND, PROJECTILE, PROJECTILEHUE, AMMUNITION, REQSTR, REQDEX, REQINT, \ + LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \ + SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \ + DURABILITYBONUS, WEIGHTBONUS, \ + MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ + ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ + ITEM_PIERCING, ITEM_SLASHING, ITEM_BASHING # *************** *** 221,225 **** maxdamage = int(char.gettag('maxdamage')) return (mindamage, maxdamage) ! # Special treatment for fists. if not weapon: --- 231,235 ---- maxdamage = int(char.gettag('maxdamage')) return (mindamage, maxdamage) ! # Special treatment for fists. if not weapon: *************** *** 227,231 **** if char.maxdamage != 0: return (char.mindamage, char.maxdamage) ! mindamage = char.strength / 28 maxdamage = mindamage + 7 --- 237,241 ---- if char.maxdamage != 0: return (char.mindamage, char.maxdamage) ! mindamage = char.strength / 28 maxdamage = mindamage + 7 *************** *** 236,240 **** if not weapon and char.maxdamage != 0: return (char.mindamage, char.maxdamage) ! mindamage = fromitem(weapon, MINDAMAGE) maxdamage = fromitem(weapon, MAXDAMAGE) --- 246,250 ---- if not weapon and char.maxdamage != 0: return (char.mindamage, char.maxdamage) ! mindamage = fromitem(weapon, MINDAMAGE) maxdamage = fromitem(weapon, MAXDAMAGE) Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** utilities.py 9 Jul 2004 10:06:54 -0000 1.60 --- utilities.py 11 Jul 2004 02:47:25 -0000 1.61 *************** *** 16,23 **** import wolfpack from wolfpack import properties - from wolfpack.consts import * import random import string from types import * """ --- 16,23 ---- import wolfpack from wolfpack import properties import random import string from types import * + from wolfpack.consts import * """ |
|
From: Richard M. <dr...@us...> - 2004-07-11 02:47:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16874 Modified Files: pickpocket_dip.py potionkeg.py potions.py scissors.py shrine.py signpost.py slotmachine.py spawngem.py spiderweb.py training_dummy.py wall_clock.py wool.py xmlconfig.py yarn.py Log Message: I tried reducing more imports... I also think this is starting to have a positive effect on memory usage... I did some testing the other day and recorded a 5m leak per console reload. # Before Cleanups From Initial Startup # CONSOLE RELOAD VRIT RES SHR SWAP DATA 95972 33m 19m 60m 91m 99.4m 38m 19m 90m 97m 104m 43m 19m 60m 102m 109m 48m 19m 60m 107m 114m 53m 19m 60m 112m 119m 58m 19m 60m 117m 124m 64m 19m 60m 122m # After Cleanups From Initial Startup # CONSOLE RELOAD VRIT RES SHR SWAP DATA 94868 32m 19m 60m 90m 98.0m 37m 19m 60m 96m 102m 42m 19m 60m 100m 107m 46m 19m 60m 105m 112m 51m 19m 60m 110m 116m 56m 19m 60m 114m 121m 60m 19m 60m 119m Overall it appears that the total memory used on startup has decreased just a bit, and the amount of memory leaked per reload seems to drop just slightly. Index: slotmachine.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/slotmachine.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** slotmachine.py 26 May 2004 13:07:20 -0000 1.5 --- slotmachine.py 11 Jul 2004 02:47:25 -0000 1.6 *************** *** 7,11 **** import wolfpack ! from random import randrange, choice # Define prizes here --- 7,11 ---- import wolfpack ! import random # Define prizes here *************** *** 41,50 **** # 5% Win chance ! chance = randrange( 1, 100 ) # We won! if( chance <= 5 ): # Select a price randomly ! prize = choice( prizes ) char.message( prize[0] ) --- 41,50 ---- # 5% Win chance ! chance = random.randrange( 1, 100 ) # We won! if( chance <= 5 ): # Select a price randomly ! prize = random.choice( prizes ) char.message( prize[0] ) Index: spawngem.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/spawngem.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** spawngem.py 26 May 2004 13:07:20 -0000 1.3 --- spawngem.py 11 Jul 2004 02:47:25 -0000 1.4 *************** *** 1,8 **** import wolfpack ! from wolfpack.consts import * from wolfpack import console from system import spawns - import wolfpack.gumps # --- 1,7 ---- import wolfpack ! import wolfpack.gumps from wolfpack import console from system import spawns # *************** *** 59,63 **** def onUse(player, item): if not player.gm: ! return 1 dialog = wolfpack.gumps.cGump() --- 58,62 ---- def onUse(player, item): if not player.gm: ! return True dialog = wolfpack.gumps.cGump() *************** *** 139,141 **** dialog.send(player) ! return 1 --- 138,140 ---- dialog.send(player) ! return True Index: wall_clock.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wall_clock.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wall_clock.py 1 Jul 2004 21:43:28 -0000 1.5 --- wall_clock.py 11 Jul 2004 02:47:25 -0000 1.6 *************** *** 56,58 **** char.message( time ) ! return 1 --- 56,58 ---- char.message( time ) ! return True Index: wool.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wool.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wool.py 2 Jul 2004 13:40:45 -0000 1.8 --- wool.py 11 Jul 2004 02:47:25 -0000 1.9 *************** *** 8,13 **** # wool import wolfpack ! from wolfpack.utilities import * ! from wolfpack.consts import * ids = [ 0x10a4, 0x1015, 0x101c, 0x1019 ] --- 8,13 ---- # wool import wolfpack ! import wolfpack.utilities ! from wolfpack.consts import GRAY ids = [ 0x10a4, 0x1015, 0x101c, 0x1019 ] Index: spiderweb.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/spiderweb.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** spiderweb.py 26 May 2004 13:07:20 -0000 1.2 --- spiderweb.py 11 Jul 2004 02:47:25 -0000 1.3 *************** *** 1,6 **** import wolfpack - from wolfpack.consts import * from math import ceil # --- 1,6 ---- import wolfpack from math import ceil + from wolfpack.consts import DAMAGE_MAGICAL, DAMAGE_PHYSICAL # *************** *** 49,53 **** packet.send(char.socket) char.socket.walksequence = 0 ! return 1 events = char.events --- 49,53 ---- packet.send(char.socket) char.socket.walksequence = 0 ! return True events = char.events *************** *** 57,61 **** char.socket.sysmessage('You manage to break free of the spiderweb.') ! return 0 # --- 57,61 ---- char.socket.sysmessage('You manage to break free of the spiderweb.') ! return False # Index: scissors.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/scissors.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** scissors.py 26 May 2004 13:07:20 -0000 1.10 --- scissors.py 11 Jul 2004 02:47:25 -0000 1.11 *************** *** 9,13 **** import wolfpack import wolfpack.utilities ! from wolfpack.consts import * ids_rawleather = [ 0x1078, 0x1079 ] --- 9,13 ---- import wolfpack import wolfpack.utilities ! from wolfpack.consts import GRAY ids_rawleather = [ 0x1078, 0x1079 ] Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** potions.py 2 Jul 2004 13:40:45 -0000 1.38 --- potions.py 11 Jul 2004 02:47:25 -0000 1.39 *************** *** 2,9 **** from random import randint, random from wolfpack import time - from wolfpack.consts import * from wolfpack.utilities import hex2dec, throwobject, energydamage, checkLoS import math from system import poison # potion [ return_bottle, aggressive, target, name ] --- 2,14 ---- from random import randint, random from wolfpack import time from wolfpack.utilities import hex2dec, throwobject, energydamage, checkLoS import math from system import poison + from wolfpack.consts import RED, ALCHEMY, STRENGTH_TIME, ANIM_FIDGET3, \ + SOUND_DRINK1, SOUND_AGILITY_UP, AGILITY_TIME, POTION_GREATERHEAL_RANGE, \ + POTION_HEAL_RANGE, POTION_LESSERHEAL_RANGE, MAGERY, \ + POTION_LESSEREXPLOSION_RANGE, POTION_GREATEREXPLOSION_RANGE, \ + POTION_EXPLOSION_RANGE, SOUND_STRENGTH_UP + # potion [ return_bottle, aggressive, target, name ] *************** *** 65,69 **** # Do we throw this thing? ! if potions[ potiontype ][ POT_TARGET ] == TRUE: # Explosion Potion if potiontype in [ 11, 12, 13 ]: --- 70,74 ---- # Do we throw this thing? ! if potions[ potiontype ][ POT_TARGET ] == True: # Explosion Potion if potiontype in [ 11, 12, 13 ]: *************** *** 350,354 **** potion.update() ! if givebottle == TRUE: # Lets add an empty bottle! bottle = wolfpack.additem( 'f0e' ) # Empty Bottle Definition if not wolfpack.utilities.tocontainer( bottle, char.getbackpack() ): --- 355,359 ---- potion.update() ! if givebottle == True: # Lets add an empty bottle! bottle = wolfpack.additem( 'f0e' ) # Empty Bottle Definition if not wolfpack.utilities.tocontainer( bottle, char.getbackpack() ): Index: training_dummy.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/training_dummy.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** training_dummy.py 26 May 2004 13:07:20 -0000 1.4 --- training_dummy.py 11 Jul 2004 02:47:25 -0000 1.5 *************** *** 7,13 **** import wolfpack - from wolfpack.consts import * import random from combat.utilities import weaponskill # 0x1070 Facing South/North (Swinging: 0x1071) --- 7,13 ---- import wolfpack import random from combat.utilities import weaponskill + from wolfpack.consts import FENCING, MACEFIGHTING, SWORDSMANSHIP, WRESTLING # 0x1070 Facing South/North (Swinging: 0x1071) *************** *** 18,27 **** if( item.id != 0x1070 and item.id != 0x1074 ): char.socket.sysmessage( 'Wait until the dummy stops swinging.' ) ! return 1 # Distance & Direction checks if( char.distanceto( item ) > 1 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return 1 # Calculates the direction we'll have to look --- 18,27 ---- if( item.id != 0x1070 and item.id != 0x1074 ): char.socket.sysmessage( 'Wait until the dummy stops swinging.' ) ! return True # Distance & Direction checks if( char.distanceto( item ) > 1 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return True # Calculates the direction we'll have to look *************** *** 32,41 **** if( item.id == 0x1070 and direction != 0 and direction != 4 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return 1 # For a e/w dummy we need to either face eath or west elif( item.id == 0x1074 and direction != 2 and direction != 6 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return 1 # Turn to the correct direction --- 32,41 ---- if( item.id == 0x1070 and direction != 0 and direction != 4 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return True # For a e/w dummy we need to either face eath or west elif( item.id == 0x1074 and direction != 2 and direction != 6 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return True # Turn to the correct direction *************** *** 48,57 **** if( skill != FENCING and skill != MACEFIGHTING and skill != SWORDSMANSHIP and skill != WRESTLING ): char.message( "You can't train with this weapon on this dummy." ) ! return 1 # If we've already learned all we can > cancel. if( char.skill[ skill ] >= 300 ): char.message( "You can learn much from a dummy but you have already learned it all." ) ! return 1 # This increases the users skill --- 48,57 ---- if( skill != FENCING and skill != MACEFIGHTING and skill != SWORDSMANSHIP and skill != WRESTLING ): char.message( "You can't train with this weapon on this dummy." ) ! return True # If we've already learned all we can > cancel. if( char.skill[ skill ] >= 300 ): char.message( "You can learn much from a dummy but you have already learned it all." ) ! return True # This increases the users skill *************** *** 74,78 **** wolfpack.addtimer( random.randint( 2000, 3000 ), "training_dummy.resetid", [ item.serial ], 1 ) ! return 1 # Reset the id of a swinging dummy --- 74,78 ---- wolfpack.addtimer( random.randint( 2000, 3000 ), "training_dummy.resetid", [ item.serial ], 1 ) ! return True # Reset the id of a swinging dummy Index: potionkeg.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potionkeg.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** potionkeg.py 9 Jul 2004 10:30:25 -0000 1.7 --- potionkeg.py 11 Jul 2004 02:47:25 -0000 1.8 *************** *** 3,11 **** import wolfpack ! from random import randint ! from wolfpack.time import * ! from wolfpack.consts import * ! from wolfpack.utilities import hex2dec, tobackpack from potions import potions # Imports the potion table. POT_RETURN_BOTTLE = 0 --- 3,10 ---- import wolfpack ! import wolfpack.time ! import wolfpack.utilities from potions import potions # Imports the potion table. + #from wolfpack.consts import * POT_RETURN_BOTTLE = 0 Index: signpost.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/signpost.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** signpost.py 26 May 2004 13:07:20 -0000 1.8 --- signpost.py 11 Jul 2004 02:47:25 -0000 1.9 *************** *** 1,5 **** import wolfpack - from wolfpack.consts import * from wolfpack.gumps import cGump # Register as a global script --- 1,6 ---- + import wolfpack from wolfpack.gumps import cGump + from wolfpack.consts import EVENT_CHLEVELCHANGE # Register as a global script Index: xmlconfig.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/xmlconfig.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** xmlconfig.py 26 May 2004 13:07:20 -0000 1.7 --- xmlconfig.py 11 Jul 2004 02:47:25 -0000 1.8 *************** *** 1,3 **** ! from xml.dom.minidom import * import sys --- 1,3 ---- ! import sys *************** *** 5,8 **** --- 5,9 ---- import Pmw import Tkinter + from xml.dom.minidom import * class Option: Index: shrine.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/shrine.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shrine.py 3 Apr 2004 02:46:04 -0000 1.1 --- shrine.py 11 Jul 2004 02:47:25 -0000 1.2 *************** *** 5,10 **** def onCollide(player, item): if not player.dead or not player.player or not player.socket: ! return player.resurrect() ! return 1 --- 5,10 ---- def onCollide(player, item): if not player.dead or not player.player or not player.socket: ! return False player.resurrect() ! return True Index: pickpocket_dip.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/pickpocket_dip.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pickpocket_dip.py 9 Jul 2004 21:47:45 -0000 1.4 --- pickpocket_dip.py 11 Jul 2004 02:47:25 -0000 1.5 *************** *** 17,30 **** if( char.skill[ STEALING ] >= 600 ): char.message( "Go search for real people." ) ! return 1 # Either the dummy is swinging or we aren't assigned to a dummy if( item.id != 0x1EC0 and item.id != 0x1EC3 ): ! return 1 # Distance & Direction checks if( char.distanceto( item ) > 1 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return 1 # Calculates the direction we'll have to look --- 17,30 ---- if( char.skill[ STEALING ] >= 600 ): char.message( "Go search for real people." ) ! return True # Either the dummy is swinging or we aren't assigned to a dummy if( item.id != 0x1EC0 and item.id != 0x1EC3 ): ! return True # Distance & Direction checks if( char.distanceto( item ) > 1 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return True # Calculates the direction we'll have to look *************** *** 35,39 **** if( direction != 2 and direction != 6 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return 1 # Turn to the correct direction if not already --- 35,39 ---- if( direction != 2 and direction != 6 ): char.message( 'You must be standing in front of or behind the dummy to use it.' ) ! return True # Turn to the correct direction if not already *************** *** 45,49 **** if( char.checkskill( STEALING, 0, 1000 ) ): char.message( "You succeed in your try to pickpocket the dip" ) ! return 1 if( item.id == 0x1EC0 ): --- 45,49 ---- if( char.checkskill( STEALING, 0, 1000 ) ): char.message( "You succeed in your try to pickpocket the dip" ) ! return True if( item.id == 0x1EC0 ): *************** *** 65,69 **** addtimer( "pickpocket_dip.resetid", 3000, (item.serial,) ) ! return 1 # Reset the id of a swinging dummy --- 65,69 ---- addtimer( "pickpocket_dip.resetid", 3000, (item.serial,) ) ! return True # Reset the id of a swinging dummy Index: yarn.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/yarn.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** yarn.py 5 Apr 2004 20:37:46 -0000 1.9 --- yarn.py 11 Jul 2004 02:47:25 -0000 1.10 *************** *** 9,13 **** import wolfpack import wolfpack.utilities ! from wolfpack.consts import * ids = [ 0x1063, 0x1066, 0x105f, 0x1061 ] --- 9,13 ---- import wolfpack import wolfpack.utilities ! from wolfpack.consts import GRAY ids = [ 0x1063, 0x1066, 0x105f, 0x1061 ] *************** *** 17,25 **** if item.getoutmostchar() != char: char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that. ! return 1 char.socket.clilocmessage( 500366, '', GRAY ) # Select a loom to use that on. char.socket.attachtarget( "yarn.response", [ item.serial ] ) ! return 1 --- 17,25 ---- if item.getoutmostchar() != char: char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that. ! return True char.socket.clilocmessage( 500366, '', GRAY ) # Select a loom to use that on. char.socket.attachtarget( "yarn.response", [ item.serial ] ) ! return True *************** *** 33,46 **** if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4): char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. ! return 1 if abs( char.pos.z - target.pos.z ) > 5: char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. ! return 1 # Check target (only item targets valid) if not target.item: char.socket.clilocmessage( 500367, '', GRAY ) # Try using that on a loom. ! return 1 if target.item.id in ids: --- 33,46 ---- if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4): char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. ! return True if abs( char.pos.z - target.pos.z ) > 5: char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. ! return True # Check target (only item targets valid) if not target.item: char.socket.clilocmessage( 500367, '', GRAY ) # Try using that on a loom. ! return True if target.item.id in ids: |
|
From: Richard M. <dr...@us...> - 2004-07-11 01:49:25
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10833/webroot Modified Files: ChangeLog.wolfpack Log Message: Updates Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ChangeLog.wolfpack 10 Jul 2004 11:55:01 -0000 1.14 --- ChangeLog.wolfpack 11 Jul 2004 01:49:16 -0000 1.15 *************** *** 17,20 **** --- 17,23 ---- - Removed command: fix - Removed command: resend + - Region Updates/Fixes. + Added flags: noentermessage and noguardmessage + Fixed guardowner messages * Definition Changes: - Fixed Sheep definitions *************** *** 41,44 **** --- 44,49 ---- - new wolfpack.utilities function: booleantoggle( boolean ) - Cleanups to help reduce memory consumption. + - New script: system.regionchange + This overrides the core region change messages. * Misc. Changes: * Known Issues, Bugs, and Missing Features: *************** *** 48,52 **** - Teleport Scripts are incomplete. - Possible that a few monsters are missing. ! - Reloading python too many times crashes the server. - There are still some memory leaks. - Healers do not resurrect. --- 53,57 ---- - Teleport Scripts are incomplete. - Possible that a few monsters are missing. ! - Reloading python too many times can crash the server. - There are still some memory leaks. - Healers do not resurrect. |
|
From: Richard M. <dr...@us...> - 2004-07-11 01:41:41
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9762/system Modified Files: regionchange.py Log Message: More checks for parent/children stuff. Index: regionchange.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/regionchange.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** regionchange.py 11 Jul 2004 01:34:25 -0000 1.2 --- regionchange.py 11 Jul 2004 01:41:32 -0000 1.3 *************** *** 29,40 **** if not newregion.noentermessage and not oldregion.noentermessage: # Case 0 ! if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaLeaveMessage( socket, oldregion.name ) areaEnterMessage( socket, newregion.name ) # Case 5 ! elif oldregion.parent == newregion: areaEnterMessage( socket, newregion.name ) # Case 7 ! elif newregion.parent == oldregion: areaLeaveMessage( socket, oldregion.name ) # Cases 1 8 10 --- 29,40 ---- if not newregion.noentermessage and not oldregion.noentermessage: # Case 0 ! if newregion.parent == None or oldregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaLeaveMessage( socket, oldregion.name ) areaEnterMessage( socket, newregion.name ) # Case 5 ! elif oldregion.parent == newregion or oldregion.name in newregion.children: areaEnterMessage( socket, newregion.name ) # Case 7 ! elif newregion.parent == oldregion or newregion.name in oldregion.children: areaLeaveMessage( socket, oldregion.name ) # Cases 1 8 10 *************** *** 42,52 **** elif newregion.noentermessage and oldregion.noentermessage: # Case 1 ! if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: pass # Case 8 ! elif oldregion.parent == newregion: pass # Case 10 ! elif newregion.parent == oldregion: pass # Cases 2 9 11 --- 42,52 ---- elif newregion.noentermessage and oldregion.noentermessage: # Case 1 ! if newregion.parent == None or oldregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: pass # Case 8 ! elif oldregion.parent == newregion or oldregion.name in newregion.children: pass # Case 10 ! elif newregion.parent == oldregion or newregion.name in oldregion.children: pass # Cases 2 9 11 *************** *** 54,64 **** elif not newregion.noentermessage and oldregion.noentermessage: # Case 2 ! if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaEnterMessage( socket, newregion.name ) # Case 9 ! elif oldregion.parent == newregion: pass # Case 11 ! elif newregion.parent == oldregion: pass # Cases 3 4 6 --- 54,64 ---- elif not newregion.noentermessage and oldregion.noentermessage: # Case 2 ! if newregion.parent == None or oldregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaEnterMessage( socket, newregion.name ) # Case 9 ! elif oldregion.parent == newregion or oldregion.name in newregion.children: pass # Case 11 ! elif newregion.parent == oldregion or newregion.name in oldregion.children: pass # Cases 3 4 6 *************** *** 66,76 **** elif not newregion.noentermessage and oldregion.noentermessage: # Case 3 ! if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaLeaveMessage( socket, oldregion.name ) # Case 4 ! elif oldregion.parent == newregion: pass # Case 6 ! elif newregion.parent == oldregion: pass --- 66,76 ---- elif not newregion.noentermessage and oldregion.noentermessage: # Case 3 ! if newregion.parent == None or oldregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaLeaveMessage( socket, oldregion.name ) # Case 4 ! elif oldregion.parent == newregion or oldregion.name in newregion.children: pass # Case 6 ! elif newregion.parent == oldregion or newregion.name in oldregion.children: pass |
|
From: Richard M. <dr...@us...> - 2004-07-11 01:34:34
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8831/system Modified Files: regionchange.py Log Message: Small fix Index: regionchange.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/regionchange.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** regionchange.py 11 Jul 2004 01:25:34 -0000 1.1 --- regionchange.py 11 Jul 2004 01:34:25 -0000 1.2 *************** *** 7,10 **** --- 7,11 ---- import wolfpack + import string def onChangeRegion( char, oldregion, newregion ): *************** *** 122,126 **** # Region Enter Message def areaEnterMessage( socket, name ): ! if name != None or len( name ) > 0: socket.sysmessage( "You have entered %s." % name ) return True --- 123,130 ---- # Region Enter Message def areaEnterMessage( socket, name ): ! name = name.strip() ! if name == None or len( name ) == 0 or name == "": ! return True ! else: socket.sysmessage( "You have entered %s." % name ) return True *************** *** 128,132 **** # Region Leave Message def areaLeaveMessage( socket, name ): ! if name != None or len( name ) > 0: socket.sysmessage( "You have left %s." % name ) return True --- 132,139 ---- # Region Leave Message def areaLeaveMessage( socket, name ): ! name = name.strip() ! if name == None or len( name ) == 0 or name == "": ! return True ! else: socket.sysmessage( "You have left %s." % name ) return True |
|
From: Richard M. <dr...@us...> - 2004-07-11 01:26:34
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7268 Modified Files: scripts.xml Log Message: Default system.regionchange script. Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** scripts.xml 9 Jul 2004 10:06:06 -0000 1.142 --- scripts.xml 11 Jul 2004 01:26:25 -0000 1.143 *************** *** 167,170 **** --- 167,171 ---- <script>system.mysql_optimize_db</script> <script>system.poison</script> + <script>system.regionchange</script> <script>system.skillgain</script> <script>system.spawns</script> |
|
From: Richard M. <dr...@us...> - 2004-07-11 01:26:34
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7268/d Modified Files: players.xml Log Message: Default system.regionchange script. Index: players.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/players.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** players.xml 30 May 2004 13:25:01 -0000 1.1 --- players.xml 11 Jul 2004 01:26:25 -0000 1.2 *************** *** 5,11 **** <definitions> <npc id="player_male"> </npc> ! <npc id="player_female"> </npc> </definitions> --- 5,13 ---- <definitions> <npc id="player_male"> + <events>system.regionchange</events> </npc> ! <npc id="player_female"> + <events>system.regionchange</events> </npc> </definitions> |
|
From: Richard M. <dr...@us...> - 2004-07-11 01:25:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7154 Added Files: regionchange.py Log Message: This should make region messages much better. --- NEW FILE: regionchange.py --- ########################################################### # ) (\_ # WOLFPACK 13.0.0 Scripts # (( _/{ "-; # Created by: Dreoth # )).-' {{ ;'` # Revised by: # ( ( ;._ \\ ctr # Last Modification: Created ########################################################### import wolfpack def onChangeRegion( char, oldregion, newregion ): socket = char.socket """ 0. Both messages enabled == Show Messages Leave Old/Enter New * 1. Both messages disabled == No Messages * 2. New enabled, Old disabled == Show Message Enter New * 3. New disabled, Old enabled == Show Message Leave Old * 4. New disabled, Old enabled. New is a child of Old == No Message * 5. New enabled, Old enabled. New is a child of Old == Show Message Enter New * 6. New disabled, Old enabled. New is a parent of Old == No Message * 7. New enabled, Old enabled. New is a parent of Old == Show Message Leave Old * 8. New disabled, Old disabled. New is a child of Old == No Message * 9. New enabled, Old disabled. New is a child of Old == Show Message Enter New * 10. New disabled, Old disabled. New is a parent of Old. == No Message * 11. New enabled, Old disabled. New is a parent of Old. == No Message * """ # Cases 0 5 7 # Both Enabled if not newregion.noentermessage and not oldregion.noentermessage: # Case 0 if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaLeaveMessage( socket, oldregion.name ) areaEnterMessage( socket, newregion.name ) # Case 5 elif oldregion.parent == newregion: areaEnterMessage( socket, newregion.name ) # Case 7 elif newregion.parent == oldregion: areaLeaveMessage( socket, oldregion.name ) # Cases 1 8 10 # Both Disabled elif newregion.noentermessage and oldregion.noentermessage: # Case 1 if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: pass # Case 8 elif oldregion.parent == newregion: pass # Case 10 elif newregion.parent == oldregion: pass # Cases 2 9 11 # New Enabled, Old Disabled elif not newregion.noentermessage and oldregion.noentermessage: # Case 2 if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaEnterMessage( socket, newregion.name ) # Case 9 elif oldregion.parent == newregion: pass # Case 11 elif newregion.parent == oldregion: pass # Cases 3 4 6 # New Disabled, Old Enabled elif not newregion.noentermessage and oldregion.noentermessage: # Case 3 if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion: areaLeaveMessage( socket, oldregion.name ) # Case 4 elif oldregion.parent == newregion: pass # Case 6 elif newregion.parent == oldregion: pass """ Possible Guard Cases: 0. Both are unguarded. Show Message Disabled == No Message 1. Both are unguarded. Show Message Enabled == No Message 2. New is guarded, Old is not. Show Message Enabled. == Show Message Enter 3. New is guarded, Old is not. Show Message Disabled. == No Message 4. New is not guarded, Old is. Show Message Enabled. == Show Message Leave 5. New is not guarded, Old is. Show Message Disabled == Show Message Leave 6. Both are guarded. Owners are the same. Show Message Enabled == No Message 7. Both are guaded. Owners are the same. Show Message Disabled == No Message 8. Both are guarded. Owners are different. Show Message Disabled == Show Message Leave 9. Both are guarded. Owners are different. Show Message Enabled == Show Message Leave/Join """ # Cases 6 7 8 9 if newregion.guarded and oldregion.guarded: # Case 6 if newregion.guardowner == oldregion.guardowner and not newregion.noguardmessage: pass # Case 7 elif newregion.guardowner == oldregion.guardowner and newregion.noguardmessage: pass # Case 8 elif newregion.guardowner != oldregion.guardowner and newregion.noguardmessage: guardLeaveMessage( socket, oldregion.guardowner ) # Case 9 elif newregion.guardowner != oldregion.guardowner and not newregion.noguardmessage: guardLeaveMessage( socket, oldregion.guardowner ) guardEnterMessage( socket, newregion.guardowner ) # Cases 2 3 elif newregion.guarded and not oldregion.guarded: # Case 2 if not newregion.noguardmessage: guardEnterMessage( socket, newregion.guardowner ) # Case 3 else: pass # Cases 4 5 elif not newregion.guarded and oldregion.guarded: # Case 4 and 5 guardLeaveMessage( socket, oldregion.guardowner ) # Cases 0 1 elif not newregion.guarded and not oldregion.guarded: pass return True # Region Enter Message def areaEnterMessage( socket, name ): if name != None or len( name ) > 0: socket.sysmessage( "You have entered %s." % name ) return True # Region Leave Message def areaLeaveMessage( socket, name ): if name != None or len( name ) > 0: socket.sysmessage( "You have left %s." % name ) return True # Left Guard's Protection Message def guardLeaveMessage( socket, owner ): if owner == None or owner == "the town" or len( owner ) == 0: socket.clilocmessage( 500113 ) return True else: socket.sysmessage( "You have left the protection of %s guards." % owner ) return True # Enter Guard's Protection Message def guardEnterMessage( socket, owner ): if owner == None or owner == "the town" or len( owner ) == 0: socket.clilocmessage( 500112 ) return True else: socket.sysmessage( "You are now under protection by %s guards." % owner ) return True |
|
From: Richard M. <dr...@us...> - 2004-07-10 23:03:39
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18357/python Modified Files: pyregion.cpp Log Message: Updates to territories: <noentermessage /> and <noguardmessage /> added to flags. Fixed guard messages. <guardowner>the town</guardowner> will default to a cliloc message. Index: pyregion.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/pyregion.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** pyregion.cpp 29 Jun 2004 22:22:59 -0000 1.16 --- pyregion.cpp 10 Jul 2004 23:03:30 -0000 1.17 *************** *** 73,77 **** { /* ! \rproperty region.parent This property represents the parent region of this region. If there is no parent region this property contains None, otherwise another region object for the parent region. */ --- 73,77 ---- { /* ! \rproperty region.parent This property represents the parent region of this region. If there is no parent region this property contains None, otherwise another region object for the parent region. */ *************** *** 178,181 **** --- 178,191 ---- else if ( !strcmp( name, "nomusic" ) ) return PyInt_FromLong( self->pRegion->isNoMusic() ? 1 : 0 ); + /* + \rproperty region.noguardmessage This boolean flag indicates that no guard message should show when entering this region.. + */ + else if ( !strcmp( name, "noguardmessage" ) ) + return PyInt_FromLong( self->pRegion->isNoGuardMessage() ? 1 : 0 ); + /* + \rproperty region.noentermessage This boolean flag indicates that no entrance message should show when entering this region. + */ + else if ( !strcmp( name, "noentermessage" ) ) + return PyInt_FromLong( self->pRegion->isNoEnterMessage() ? 1 : 0 ); return Py_FindMethod( wpRegionMethods, ( PyObject * ) self, name ); |
|
From: Richard M. <dr...@us...> - 2004-07-10 23:03:39
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18357 Modified Files: territories.h territories.cpp Log Message: Updates to territories: <noentermessage /> and <noguardmessage /> added to flags. Fixed guard messages. <guardowner>the town</guardowner> will default to a cliloc message. Index: territories.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** territories.cpp 10 Jul 2004 23:01:18 -0000 1.48 --- territories.cpp 10 Jul 2004 23:03:29 -0000 1.49 *************** *** 121,129 **** // <guardowner>text</guardowner> else if ( TagName == "guardowner" ) ! this->guardowner_ = Value; // <midilist>MIDI_COMBAT</midilist> else if ( TagName == "midilist" ) this->midilist_ = Value; else if ( TagName == "flags" ) { --- 121,133 ---- // <guardowner>text</guardowner> else if ( TagName == "guardowner" ) ! if ( Value == "the town" ) ! this->guardowner_ = ""; ! else ! this->guardowner_ = Value; // <midilist>MIDI_COMBAT</midilist> else if ( TagName == "midilist" ) this->midilist_ = Value; + else if ( TagName == "flags" ) { *************** *** 156,159 **** --- 160,167 ---- else if ( childNode->name() == "nomusic" ) setNoMusic( true ); + else if ( childNode->name() == "noguardmessage" ) + setNoGuardMessage( true ); + else if ( childNode->name() == "noentermessage" ) + setNoEnterMessage( true ); } } *************** *** 387,411 **** if ( !cPythonScript::callChainedEventHandler( EVENT_CHANGEREGION, pc->getEvents(), args ) && socket ) { ! if ( lastRegion && !lastRegion->name().isEmpty() ) socket->sysMessage( tr( "You have left %1." ).arg( lastRegion->name() ) ); ! if ( currRegion && !currRegion->name().isEmpty() ) socket->sysMessage( tr( "You have entered %1." ).arg( currRegion->name() ) ); if ( ( currRegion->isGuarded() != lastRegion->isGuarded() ) || ( currRegion->isGuarded() && ( currRegion->guardOwner() != lastRegion->guardOwner() ) ) ) { ! if ( currRegion->isGuarded() ) { ! if ( currRegion->guardOwner().isEmpty() ) ! socket->clilocMessage( 500112 ); // You are now under the protection of the town guards ! else ! socket->sysMessage( currRegion->guardOwner() ); } ! else { ! if ( lastRegion->guardOwner().isEmpty() ) ! socket->clilocMessage( 500113 ); // You have left the protection of the town guards. else ! socket->sysMessage( lastRegion->guardOwner() ); } } --- 395,437 ---- if ( !cPythonScript::callChainedEventHandler( EVENT_CHANGEREGION, pc->getEvents(), args ) && socket ) { ! if ( lastRegion && !lastRegion->name().isEmpty() && !lastRegion->isNoEnterMessage() ) socket->sysMessage( tr( "You have left %1." ).arg( lastRegion->name() ) ); ! if ( currRegion && !currRegion->name().isEmpty() && !currRegion->isNoEnterMessage() ) socket->sysMessage( tr( "You have entered %1." ).arg( currRegion->name() ) ); if ( ( currRegion->isGuarded() != lastRegion->isGuarded() ) || ( currRegion->isGuarded() && ( currRegion->guardOwner() != lastRegion->guardOwner() ) ) ) { ! /* Guarded Setting Changes */ ! if ( currRegion->isGuarded() != lastRegion->isGuarded() ) { ! if ( lastRegion->isGuarded() && !lastRegion->isNoGuardMessage() ) ! { ! if ( lastRegion->guardOwner().isEmpty() ) ! socket->clilocMessage( 500113 ); // You have left the protection of the town guards. ! else ! socket->sysMessage( tr( "You have left the protection of %1 guards." ).arg( lastRegion->guardOwner() ) ); ! } ! if ( currRegion->isGuarded() && !currRegion->isNoGuardMessage() ) ! { ! if ( currRegion->guardOwner().isEmpty() ) ! socket->clilocMessage( 500112 ); // You are now under the protection of the town guards ! else ! socket->sysMessage( tr( "You are now under the protection of %1 guards." ).arg( currRegion->guardOwner() ) ); ! } } ! } ! /* Remain Guarded */ ! if ( currRegion->isGuarded() == lastRegion->isGuarded() ) ! { ! /* Only show if you haven't gotten a message before. ! Or, only show if the guard owner changes. ! */ ! if ( ( !currRegion->isNoGuardMessage() && !lastRegion->isNoGuardMessage() ) && ( currRegion->guardOwner() != lastRegion->guardOwner() ) ) { ! if ( currRegion->guardOwner().isEmpty() ) ! socket->clilocMessage( 500112 ); // You are now under the protection of the town guards else ! socket->sysMessage( tr( "You are now under the protection of %1 guards." ).arg( currRegion->guardOwner() ) ); } } Index: territories.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** territories.h 2 Jun 2004 15:04:07 -0000 1.28 --- territories.h 10 Jul 2004 23:03:29 -0000 1.29 *************** *** 107,110 **** --- 107,118 ---- return flags_ & 0x0400; } + bool isNoGuardMessage( void ) const + { + return flags_ & 0x0800; + } + bool isNoEnterMessage( void ) const + { + return flags_ & 0x1000; + } QString guardOwner( void ) const { *************** *** 202,205 **** --- 210,227 ---- flags_ &= ~0x0400; } + void setNoGuardMessage( bool data ) + { + if ( data ) + flags_ |= 0x0800; + else + flags_ &= ~0x0800; + } + void setNoEnterMessage( bool data ) + { + if ( data ) + flags_ |= 0x1000; + else + flags_ &= ~0x1000; + } virtual void processNode( const cElement* Tag ); |
|
From: Sebastian H. <dar...@us...> - 2004-07-10 23:01:30
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18051 Modified Files: territories.cpp Log Message: unfix Index: territories.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** territories.cpp 10 Jul 2004 11:19:40 -0000 1.47 --- territories.cpp 10 Jul 2004 23:01:18 -0000 1.48 *************** *** 331,335 **** if ( territory->rectangles().empty() ) { ! Console::instance()->log(LOG_WARNING, "Region %1 lacks rectangle tag, ignoring region.\n").arg(territory->name())); delete territory; } --- 331,335 ---- if ( territory->rectangles().empty() ) { ! Console::instance()->log(LOG_WARNING, QString("Region %1 lacks rectangle tag, ignoring region.\n").arg(territory->name())); delete territory; } |
|
From: Richard M. <dr...@us...> - 2004-07-10 12:47:55
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/regions/trammel/towns Modified Files: britain.xml cove.xml delucia.xml minoc.xml moonglow.xml papua.xml skara_brae.xml trinsic.xml vesper.xml yew.xml Log Message: Region name fixes, disabled the teleports script Index: vesper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/vesper.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vesper.xml 10 Jul 2004 11:46:18 -0000 1.2 --- vesper.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Vesper --> ! <region name="trammel_vesper"> <flags> <guarded /> --- 3,7 ---- <!-- Vesper --> ! <region name="Vesper"> <flags> <guarded /> Index: trinsic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/trinsic.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** trinsic.xml 10 Jul 2004 11:46:18 -0000 1.2 --- trinsic.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Trinsic --> ! <region name="trammel_trinsic"> <flags> <guarded /> --- 3,7 ---- <!-- Trinsic --> ! <region name="Trinsic"> <flags> <guarded /> Index: britain.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/britain.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** britain.xml 10 Jul 2004 11:46:18 -0000 1.2 --- britain.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 2,6 **** <definitions> <!-- Britain --> ! <region name="trammel_britain"> <flags> <guarded /> --- 2,6 ---- <definitions> <!-- Britain --> ! <region name="Britain"> <flags> <guarded /> *************** *** 19,72 **** <rectangle x1="1691" y1="1532" x2="1721" y2="1595" map="1" /> <rectangle x1="1388" y1="1697" x2="1410" y2="1766" map="1" /> ! </region> ! <!-- Britain's Farmlands --> ! <region name="trammel_britain_farmlands"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord British's</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1085" y1="1530" x2="1200" y2="1695" map="1" /> ! <rectangle x1="1200" y1="1555" x2="1295" y2="1695" map="1" /> ! <rectangle x1="1295" y1="1695" x2="1330" y2="1850" map="1" /> ! <rectangle x1="1100" y1="1695" x2="1295" y2="1915" map="1" /> ! </region> ! <!-- Lord British's castle --> ! <region name="trammel_lord_british_castle"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <escortregion /> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord British's Personal</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1295" y1="1559" x2="1407" y2="1695" map="1" /> ! </region> - <!-- Lord Blackthorne's castle --> - <region name="trammel_lord_blackthorne_castle"> - <flags> - <guarded /> - <noagressivemagic /> - </flags> - <escortregion /> - <guards> - <list id="standard_guards" /> - </guards> - <guardowner>Lord Blackthorne's Personal</guardowner> - <rainchance><random min="30" max="40" /></rainchance> - <snowchance><random min="45" max="55" /></snowchance> - <rectangle x1="1490" y1="1400" x2="1545" y2="1505" map="1" /> </region> --- 19,72 ---- <rectangle x1="1691" y1="1532" x2="1721" y2="1595" map="1" /> <rectangle x1="1388" y1="1697" x2="1410" y2="1766" map="1" /> ! <!-- Britain's Farmlands --> ! <region name="Britain Farmlands"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord British's</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1085" y1="1530" x2="1200" y2="1695" map="1" /> ! <rectangle x1="1200" y1="1555" x2="1295" y2="1695" map="1" /> ! <rectangle x1="1295" y1="1695" x2="1330" y2="1850" map="1" /> ! <rectangle x1="1100" y1="1695" x2="1295" y2="1915" map="1" /> ! </region> ! <!-- Lord British's castle --> ! <region name="Lord British's Castle"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <escortregion /> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord British's Personal</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1295" y1="1559" x2="1407" y2="1695" map="1" /> ! </region> ! <!-- Lord Blackthorne's castle --> ! <region name="Lord Blackthorne's Castle"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <escortregion /> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord Blackthorne's Personal</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1490" y1="1400" x2="1545" y2="1505" map="1" /> ! </region> </region> Index: delucia.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/delucia.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** delucia.xml 10 Jul 2004 11:46:18 -0000 1.2 --- delucia.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Delucia --> ! <region name="trammel_delucia"> <flags> <guarded /> --- 3,7 ---- <!-- Delucia --> ! <region name="Delucia"> <flags> <guarded /> Index: papua.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/papua.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** papua.xml 10 Jul 2004 11:46:18 -0000 1.2 --- papua.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Papua --> ! <region name="trammel_papua"> <flags> <guarded /> --- 3,7 ---- <!-- Papua --> ! <region name="Papua"> <flags> <guarded /> Index: moonglow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/moonglow.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** moonglow.xml 8 Jul 2004 19:14:50 -0000 1.1 --- moonglow.xml 10 Jul 2004 12:47:45 -0000 1.2 *************** *** 3,7 **** <!-- Moonglow --> ! <region id="trammel_moonglow"> <flags> <guarded /> --- 3,7 ---- <!-- Moonglow --> ! <region id="Moonglow"> <flags> <guarded /> Index: minoc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/minoc.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** minoc.xml 10 Jul 2004 11:46:18 -0000 1.2 --- minoc.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Minoc --> ! <region name="trammel_minoc"> <flags> <guarded /> --- 3,7 ---- <!-- Minoc --> ! <region name="Minoc"> <flags> <guarded /> Index: yew.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/yew.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** yew.xml 10 Jul 2004 11:46:18 -0000 1.2 --- yew.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Yew --> ! <region name="trammel_yew"> <flags> <guarded /> --- 3,7 ---- <!-- Yew --> ! <region name="Yew"> <flags> <guarded /> Index: cove.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/cove.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cove.xml 10 Jul 2004 11:46:18 -0000 1.2 --- cove.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Cove --> ! <region name="trammel_cove"> <flags> <guarded /> --- 3,7 ---- <!-- Cove --> ! <region name="Cove"> <flags> <guarded /> Index: skara_brae.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/skara_brae.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** skara_brae.xml 10 Jul 2004 11:46:18 -0000 1.3 --- skara_brae.xml 10 Jul 2004 12:47:45 -0000 1.4 *************** *** 3,7 **** <!-- Skara Brae --> ! <region name="trammel_skara_brae"> <flags> <guarded /> --- 3,7 ---- <!-- Skara Brae --> ! <region name="Skara Brae"> <flags> <guarded /> |
|
From: Richard M. <dr...@us...> - 2004-07-10 12:47:55
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/regions/felucca/towns Modified Files: britain.xml cove.xml delucia.xml minoc.xml moonglow.xml papua.xml skara_brae.xml trinsic.xml vesper.xml yew.xml Log Message: Region name fixes, disabled the teleports script Index: vesper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/vesper.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vesper.xml 10 Jul 2004 11:46:17 -0000 1.2 --- vesper.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Vesper --> ! <region name="felucca_vesper"> <flags> <guarded /> --- 3,7 ---- <!-- Vesper --> ! <region name="Vesper"> <flags> <guarded /> Index: trinsic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/trinsic.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** trinsic.xml 10 Jul 2004 11:46:17 -0000 1.2 --- trinsic.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Trinsic --> ! <region name="felucca_trinsic"> <flags> <guarded /> --- 3,7 ---- <!-- Trinsic --> ! <region name="Trinsic"> <flags> <guarded /> Index: britain.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/britain.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** britain.xml 10 Jul 2004 11:46:17 -0000 1.2 --- britain.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 2,6 **** <definitions> <!-- Britain --> ! <region name="felucca_britain"> <flags> <guarded /> --- 2,6 ---- <definitions> <!-- Britain --> ! <region name="Britain"> <flags> <guarded /> *************** *** 19,72 **** <rectangle x1="1691" y1="1532" x2="1721" y2="1595" map="0" /> <rectangle x1="1388" y1="1697" x2="1410" y2="1766" map="0" /> ! </region> ! ! <!-- Britain's Farmlands --> ! <region name="felucca_britain_farmlands"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord British's</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1085" y1="1530" x2="1200" y2="1695" map="0" /> ! <rectangle x1="1200" y1="1555" x2="1295" y2="1695" map="0" /> ! <rectangle x1="1295" y1="1695" x2="1330" y2="1850" map="0" /> ! <rectangle x1="1100" y1="1695" x2="1295" y2="1915" map="0" /> ! </region> ! ! <!-- Lord British's castle --> ! <region id="felucca_lord_british_castle"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <escortregion /> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord British's Personal</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1295" y1="1559" x2="1407" y2="1695" map="0" /> ! </region> ! ! <!-- Lord Blackthorne's castle --> ! <region name="felucca_lord_blackthorne_castle"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <escortregion /> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord Blackthorne's Personal</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1490" y1="1400" x2="1545" y2="1505" map="0" /> </region> --- 19,69 ---- <rectangle x1="1691" y1="1532" x2="1721" y2="1595" map="0" /> <rectangle x1="1388" y1="1697" x2="1410" y2="1766" map="0" /> ! <!-- Britain's Farmlands --> ! <region name="The Britain Farmlands"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord British's</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1085" y1="1530" x2="1200" y2="1695" map="0" /> ! <rectangle x1="1200" y1="1555" x2="1295" y2="1695" map="0" /> ! <rectangle x1="1295" y1="1695" x2="1330" y2="1850" map="0" /> ! <rectangle x1="1100" y1="1695" x2="1295" y2="1915" map="0" /> ! </region> ! <!-- Lord British's castle --> ! <region id="Lord British's Castle"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <escortregion /> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord British's Personal</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1295" y1="1559" x2="1407" y2="1695" map="0" /> ! </region> ! <!-- Lord Blackthorne's castle --> ! <region name="Lord Blackthorne's Castle"> ! <flags> ! <guarded /> ! <noagressivemagic /> ! </flags> ! <escortregion /> ! <guards> ! <list id="standard_guards" /> ! </guards> ! <guardowner>Lord Blackthorne's Personal</guardowner> ! <rainchance><random min="30" max="40" /></rainchance> ! <snowchance><random min="45" max="55" /></snowchance> ! <rectangle x1="1490" y1="1400" x2="1545" y2="1505" map="0" /> ! </region> </region> Index: delucia.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/delucia.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** delucia.xml 10 Jul 2004 11:46:17 -0000 1.2 --- delucia.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Delucia --> ! <region name="felucca_delucia"> <flags> <guarded /> --- 3,7 ---- <!-- Delucia --> ! <region name="Delucia"> <flags> <guarded /> Index: papua.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/papua.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** papua.xml 10 Jul 2004 11:46:17 -0000 1.2 --- papua.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Papua --> ! <region name="felucca_papua"> <flags> <guarded /> --- 3,7 ---- <!-- Papua --> ! <region name="Papua"> <flags> <guarded /> Index: moonglow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/moonglow.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** moonglow.xml 10 Jul 2004 11:46:17 -0000 1.2 --- moonglow.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Moonglow --> ! <region name="felucca_moonglow"> <flags> <guarded /> --- 3,7 ---- <!-- Moonglow --> ! <region name="Moonglow"> <flags> <guarded /> Index: minoc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/minoc.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** minoc.xml 10 Jul 2004 11:46:17 -0000 1.2 --- minoc.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Minoc --> ! <region name="felucca_minoc"> <flags> <guarded /> --- 3,7 ---- <!-- Minoc --> ! <region name="Minoc"> <flags> <guarded /> Index: yew.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/yew.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** yew.xml 10 Jul 2004 11:46:17 -0000 1.2 --- yew.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Yew --> ! <region name="felucca_yew"> <flags> <guarded /> --- 3,7 ---- <!-- Yew --> ! <region name="Yew"> <flags> <guarded /> Index: cove.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/cove.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cove.xml 10 Jul 2004 11:46:17 -0000 1.2 --- cove.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Cove --> ! <region name="felucca_cove"> <flags> <guarded /> --- 3,7 ---- <!-- Cove --> ! <region name="Cove"> <flags> <guarded /> Index: skara_brae.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/skara_brae.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** skara_brae.xml 10 Jul 2004 11:46:17 -0000 1.3 --- skara_brae.xml 10 Jul 2004 12:47:45 -0000 1.4 *************** *** 3,7 **** <!-- Skara Brae --> ! <region name="felucca_skara_brae"> <flags> <guarded /> --- 3,7 ---- <!-- Skara Brae --> ! <region name="Skara Brae"> <flags> <guarded /> |
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/regions/ilshenar/towns Modified Files: ancient_citadel.xml bet-lem_reg.xml gargoyle_city.xml mistas.xml montor.xml reg_volon.xml terort_skitas.xml Log Message: Region name fixes, disabled the teleports script Index: montor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/montor.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** montor.xml 10 Jul 2004 11:46:17 -0000 1.2 --- montor.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Montor --> ! <region name="ilshenar_montor"> <rectangle x1="1576" y1="272" x2="1720" y2="368" map="2" /> <rectangle x1="1616" y1="200" x2="1696" y2="272" map="2" /> --- 3,7 ---- <!-- Montor --> ! <region name="Montor"> <rectangle x1="1576" y1="272" x2="1720" y2="368" map="2" /> <rectangle x1="1616" y1="200" x2="1696" y2="272" map="2" /> Index: mistas.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/mistas.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mistas.xml 10 Jul 2004 11:46:17 -0000 1.2 --- mistas.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Mistas --> ! <region name="ilshenar_mistas"> <rectangle x1="744" y1="984" x2="912" y2="1152" map="2" /> <rectangle x1="744" y1="1152" x2="792" y2="1176" map="2" /> --- 3,7 ---- <!-- Mistas --> ! <region name="Mistas"> <rectangle x1="744" y1="984" x2="912" y2="1152" map="2" /> <rectangle x1="744" y1="1152" x2="792" y2="1176" map="2" /> Index: bet-lem_reg.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/bet-lem_reg.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bet-lem_reg.xml 10 Jul 2004 11:46:17 -0000 1.2 --- bet-lem_reg.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Bet-Lem Reg --> ! <region name="ilshenar_bet-lem_reg"> <rectangle x1="1232" y1="936" x2="1272" y2="984" map="2" /> </region> --- 3,7 ---- <!-- Bet-Lem Reg --> ! <region name="Bet-Lem Reg"> <rectangle x1="1232" y1="936" x2="1272" y2="984" map="2" /> </region> Index: gargoyle_city.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/gargoyle_city.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gargoyle_city.xml 10 Jul 2004 11:46:17 -0000 1.2 --- gargoyle_city.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Gargoyle City, Ver Lor Reg --> ! <region name="ilshenar_gargoyle_city"> <rectangle x1="824" y1="552" x2="856" y2="728" map="2" /> <rectangle x1="752" y1="576" x2="824" y2="704" map="2" /> --- 3,7 ---- <!-- Gargoyle City, Ver Lor Reg --> ! <region name="The Gargoyle City"> <rectangle x1="824" y1="552" x2="856" y2="728" map="2" /> <rectangle x1="752" y1="576" x2="824" y2="704" map="2" /> Index: terort_skitas.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/terort_skitas.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** terort_skitas.xml 10 Jul 2004 11:46:17 -0000 1.2 --- terort_skitas.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 2,6 **** <definitions> ! <region name="ilshenar_terort_skitas"> <rectangle x1="528" y1="376" x2="624" y2="464" map="2" /> </region> --- 2,6 ---- <definitions> ! <region name="Terort Skitas"> <rectangle x1="528" y1="376" x2="624" y2="464" map="2" /> </region> Index: ancient_citadel.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/ancient_citadel.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ancient_citadel.xml 10 Jul 2004 11:46:17 -0000 1.2 --- ancient_citadel.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Ancient Citadel --> ! <region name="ilshenar_ancient_citadel"> <rectangle x1="1448" y1="496" x2="1552" y2="600" map="2" /> </region> --- 3,7 ---- <!-- Ancient Citadel --> ! <region name="The Ancient Citadel"> <rectangle x1="1448" y1="496" x2="1552" y2="600" map="2" /> </region> Index: reg_volon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/reg_volon.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** reg_volon.xml 10 Jul 2004 11:46:17 -0000 1.2 --- reg_volon.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Reg Volon --> ! <region name="ilshenar_reg_volon"> <rectangle x1="1328" y1="1008" x2="1408" y2="1120" map="2" /> </region> --- 3,7 ---- <!-- Reg Volon --> ! <region name="Reg Volon"> <rectangle x1="1328" y1="1008" x2="1408" y2="1120" map="2" /> </region> |
|
From: Richard M. <dr...@us...> - 2004-07-10 12:47:54
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/regions/trammel/misc Modified Files: britain_graveyard.xml Log Message: Region name fixes, disabled the teleports script Index: britain_graveyard.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/misc/britain_graveyard.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** britain_graveyard.xml 8 Jul 2004 19:14:50 -0000 1.1 --- britain_graveyard.xml 10 Jul 2004 12:47:45 -0000 1.2 *************** *** 3,7 **** <!-- Britain Graveyard --> ! <region id="trammel_britain_graveyard"> <rectangle x1="1336" y1="1443" x2="1391" y2="1494" map="1" /> <rectangle x1="1336" y1="1494" x2="1376" y2="1511" map="1" /> --- 3,7 ---- <!-- Britain Graveyard --> ! <region id="The Britain Graveyard"> <rectangle x1="1336" y1="1443" x2="1391" y2="1494" map="1" /> <rectangle x1="1336" y1="1494" x2="1376" y2="1511" map="1" /> |
|
From: Richard M. <dr...@us...> - 2004-07-10 12:47:54
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/regions/ilshenar/misc Modified Files: unknown.xml Log Message: Region name fixes, disabled the teleports script Index: unknown.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/misc/unknown.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** unknown.xml 10 Jul 2004 11:46:17 -0000 1.2 --- unknown.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 3,7 **** <!-- Termir Flam --> ! <region name="Ilshenar Termir Flam"> <rectangle x1="1520" y1="368" x2="1752" y2="496" map="2" /> <rectangle x1="1520" y1="296" x2="1576" y2="368" map="2" /> --- 3,7 ---- <!-- Termir Flam --> ! <region name="Termir Flam"> <rectangle x1="1520" y1="368" x2="1752" y2="496" map="2" /> <rectangle x1="1520" y1="296" x2="1576" y2="368" map="2" /> *************** *** 10,14 **** <!-- Twin Oaks --> ! <region name="Ilshenar Twin Oaks"> <rectangle x1="1536" y1="1032" x2="1584" y2="1072" map="2" /> </region> --- 10,14 ---- <!-- Twin Oaks --> ! <region name="Twin Oaks"> <rectangle x1="1536" y1="1032" x2="1584" y2="1072" map="2" /> </region> |
|
From: Richard M. <dr...@us...> - 2004-07-10 12:47:54
|
Update of /cvsroot/wpdev/xmlscripts/definitions/teleports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/teleports Modified Files: index.xml Log Message: Region name fixes, disabled the teleports script Index: index.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/index.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.xml 30 May 2004 05:06:43 -0000 1.2 --- index.xml 10 Jul 2004 12:47:45 -0000 1.3 *************** *** 8,14 **** --- 8,16 ---- --> <definitions> + <!-- <include file="definitions/teleports/felucca.xml"/> <include file="definitions/teleports/trammel.xml"/> <include file="definitions/teleports/ilshenar.xml"/> <include file="definitions/teleports/malas.xml"/> + --> </definitions> |
|
From: Richard M. <dr...@us...> - 2004-07-10 12:47:53
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/regions/felucca/misc Modified Files: britain_graveyard.xml Log Message: Region name fixes, disabled the teleports script Index: britain_graveyard.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/misc/britain_graveyard.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** britain_graveyard.xml 10 Jul 2004 11:46:17 -0000 1.2 --- britain_graveyard.xml 10 Jul 2004 12:47:44 -0000 1.3 *************** *** 3,7 **** <!-- Britain Graveyard --> ! <region name="felucca_britain_graveyard"> <rectangle x1="1336" y1="1443" x2="1391" y2="1494" map="0" /> <rectangle x1="1336" y1="1494" x2="1376" y2="1511" map="0" /> --- 3,7 ---- <!-- Britain Graveyard --> ! <region name="The Britain Graveyard"> <rectangle x1="1336" y1="1443" x2="1391" y2="1494" map="0" /> <rectangle x1="1336" y1="1494" x2="1376" y2="1511" map="0" /> |
|
From: Richard M. <dr...@us...> - 2004-07-10 11:55:09
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7912/webroot Modified Files: ChangeLog.wolfpack Log Message: More Updates Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ChangeLog.wolfpack 9 Jul 2004 10:32:46 -0000 1.13 --- ChangeLog.wolfpack 10 Jul 2004 11:55:01 -0000 1.14 *************** *** 21,24 **** --- 21,25 ---- - Regions are split up facet/type/name.xml This gives a better overview of what we have and do not have. + - Fixed regions so they work properly again. * Python Script Changes: - New Command: taginfo *************** *** 39,42 **** --- 40,44 ---- - Rudimentarily Implemented Map Plotting - new wolfpack.utilities function: booleantoggle( boolean ) + - Cleanups to help reduce memory consumption. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
