wpdev-commits Mailing List for Wolfpack Emu (Page 6)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Sebastian H. <dar...@us...> - 2004-10-26 20:44:22
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28110/magic Modified Files: circle4.py gate.py runebook.py Log Message: recall fix Index: runebook.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/runebook.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** runebook.py 21 Oct 2004 21:40:25 -0000 1.17 --- runebook.py 26 Oct 2004 20:43:55 -0000 1.18 *************** *** 466,469 **** --- 466,477 ---- return False + # Move his pets if he has any + if char.player: + for follower in char.followers: + if follower.wandertype == 4 and follower.distanceto(char) < 5: + follower.removefromview() + follower.moveto(location) + follower.update(0) + char.soundeffect(0x1fc) char.removefromview() Index: circle4.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle4.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** circle4.py 26 Oct 2004 20:41:34 -0000 1.18 --- circle4.py 26 Oct 2004 20:43:54 -0000 1.19 *************** *** 172,176 **** # Move his pets if he has any ! if char.char: for follower in char.followers: if follower.wandertype == 4 and follower.distanceto(char) < 5: --- 172,176 ---- # Move his pets if he has any ! if char.player: for follower in char.followers: if follower.wandertype == 4 and follower.distanceto(char) < 5: Index: gate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/gate.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gate.py 7 Sep 2004 23:43:03 -0000 1.3 --- gate.py 26 Oct 2004 20:43:55 -0000 1.4 *************** *** 26,29 **** --- 26,37 ---- return + # Move his pets if he has any + if player.player: + for follower in player.followers: + if follower.wandertype == 4 and follower.distanceto(player) < 5: + follower.removefromview() + follower.moveto(location) + follower.update(0) + player.removefromview() player.moveto(pos) |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 20:41:45
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27634/magic Modified Files: circle4.py Log Message: recall fix Index: circle4.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle4.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** circle4.py 21 Oct 2004 17:59:07 -0000 1.17 --- circle4.py 26 Oct 2004 20:41:34 -0000 1.18 *************** *** 171,174 **** --- 171,182 ---- return + # Move his pets if he has any + if char.char: + for follower in char.followers: + if follower.wandertype == 4 and follower.distanceto(char) < 5: + follower.removefromview() + follower.moveto(location) + follower.update(0) + char.soundeffect(0x1fc) char.removefromview() |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 20:32:49
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25527/system Modified Files: bodyinfo.xml Log Message: ostard fix Index: bodyinfo.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/bodyinfo.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bodyinfo.xml 16 Oct 2004 00:43:34 -0000 1.6 --- bodyinfo.xml 26 Oct 2004 20:32:26 -0000 1.7 *************** *** 246,249 **** --- 246,250 ---- <body id="209" basesound="0x99" figurine="0x20e6" type="3" /> <!-- TODO: Unknown --> + <body id="210" basesound="0x270" figurine="0x2135" mountid="0x3EA3" type="3" /> <!-- d2 type=3 --> <!-- TODO: Unknown --> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:58
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/elemental Modified Files: acid_elemental.xml air_elemental.xml blood_elemental.xml efreet.xml fire_elemental.xml ice_elemental.xml poison_elemental.xml water_elemental.xml Log Message: added mage ais Index: fire_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/fire_elemental.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** fire_elemental.xml 16 Oct 2004 18:19:32 -0000 1.13 --- fire_elemental.xml 26 Oct 2004 19:23:49 -0000 1.14 *************** *** 43,46 **** --- 43,47 ---- <category>Monsters\Elementals\Fire Elemental</category> <strproperty name="slayer_group" value="fireelementals" /> + <ai>Monster_Mage</ai> </npc> Index: air_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/air_elemental.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** air_elemental.xml 16 Oct 2004 18:19:32 -0000 1.17 --- air_elemental.xml 26 Oct 2004 19:23:49 -0000 1.18 *************** *** 47,50 **** --- 47,51 ---- <strproperty name="slayer_group" value="airelementals" /> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> Index: blood_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/blood_elemental.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** blood_elemental.xml 16 Oct 2004 18:19:32 -0000 1.15 --- blood_elemental.xml 26 Oct 2004 19:23:49 -0000 1.16 *************** *** 45,48 **** --- 45,49 ---- <category>Monsters\Elementals\Blood Elemental</category> <strproperty name="slayer_group" value="bloodelementals" /> + <ai>Monster_Mage</ai> </npc> *************** *** 79,82 **** --- 80,84 ---- <!-- Missing: Reagents, Level 5 Map --> <lootpacks>lootpack_filthy_rich</lootpacks> + <ai>Monster_Mage</ai> </npc> </definitions> Index: acid_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/acid_elemental.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** acid_elemental.xml 16 Oct 2004 18:19:32 -0000 1.12 --- acid_elemental.xml 26 Oct 2004 19:23:48 -0000 1.13 *************** *** 43,46 **** --- 43,47 ---- <lootpacks>lootpack_rich;lootpack_average;gems</lootpacks> <category>Monsters\Elementals\Acid Elemental</category> + <ai>Monster_Mage</ai> </npc> Index: ice_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/ice_elemental.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ice_elemental.xml 16 Oct 2004 18:19:32 -0000 1.13 --- ice_elemental.xml 26 Oct 2004 19:23:49 -0000 1.14 *************** *** 43,46 **** --- 43,47 ---- <category>Monsters\Elementals\Ice Elemental</category> <strproperty name="slayer_group" value="snowelementals" /> + <ai>Monster_Mage</ai> </npc> Index: poison_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/poison_elemental.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** poison_elemental.xml 16 Oct 2004 18:19:32 -0000 1.14 --- poison_elemental.xml 26 Oct 2004 19:23:50 -0000 1.15 *************** *** 45,48 **** --- 45,49 ---- <strproperty name="slayer_group" value="poisonelementals" /> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> Index: water_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/water_elemental.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** water_elemental.xml 16 Oct 2004 18:19:32 -0000 1.14 --- water_elemental.xml 26 Oct 2004 19:23:50 -0000 1.15 *************** *** 42,45 **** --- 42,46 ---- <category>Monsters\Elementals\Water Elemental</category> <strproperty name="slayer_group" value="waterelementals" /> + <ai>Monster_Mage</ai> </npc> Index: efreet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/efreet.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** efreet.xml 16 Oct 2004 18:19:32 -0000 1.14 --- efreet.xml 26 Oct 2004 19:23:49 -0000 1.15 *************** *** 43,46 **** --- 43,47 ---- <category>Monsters\Elementals\Efreet</category> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:58
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/undead Modified Files: bone_magi.xml lich.xml lich_lord.xml shade.xml skeletal_mage.xml Log Message: added mage ais Index: lich.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/lich.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** lich.xml 16 Oct 2004 18:19:34 -0000 1.16 --- lich.xml 26 Oct 2004 19:24:01 -0000 1.17 *************** *** 46,49 **** --- 46,50 ---- <strproperty name="slayer_group" value="undeads" /> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> Index: shade.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/shade.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** shade.xml 16 Oct 2004 18:19:34 -0000 1.15 --- shade.xml 26 Oct 2004 19:24:01 -0000 1.16 *************** *** 39,42 **** --- 39,43 ---- <category>Monsters\Undead\Shade</category> <strproperty name="slayer_group" value="undeads" /> + <ai>Monster_Mage</ai> </npc> Index: lich_lord.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/lich_lord.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** lich_lord.xml 16 Oct 2004 18:19:34 -0000 1.16 --- lich_lord.xml 26 Oct 2004 19:24:01 -0000 1.17 *************** *** 48,51 **** --- 48,52 ---- <strproperty name="slayer_group" value="undeads" /> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> Index: skeletal_mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/skeletal_mage.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** skeletal_mage.xml 16 Oct 2004 18:19:34 -0000 1.14 --- skeletal_mage.xml 26 Oct 2004 19:24:01 -0000 1.15 *************** *** 42,45 **** --- 42,46 ---- <desc>A dying mage who has chooses to perform the ceremony to become a lich and fails, will often become a Skeleton Mage. Still armed with a formidable repertoire of the dark arts, skeletal mages should not be underestimated. Burning with the power of the damned, the skeleton mage appears as the color of flame.</desc> <category>Monsters\Undead\Skeletal Mage</category> + <ai>Monster_Mage</ai> </npc> Index: bone_magi.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/bone_magi.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** bone_magi.xml 16 Oct 2004 18:19:34 -0000 1.15 --- bone_magi.xml 26 Oct 2004 19:24:00 -0000 1.16 *************** *** 43,46 **** --- 43,47 ---- <category>Monsters\Undead\Bone Magi</category> <strproperty name="slayer_group" value="undeads" /> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:56
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/daemonic Modified Files: balron.xml daemon.xml fire_gargoyle.xml gargoyle.xml ice_fiend.xml imp.xml succubus.xml Log Message: added mage ais Index: balron.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/balron.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** balron.xml 16 Oct 2004 18:19:31 -0000 1.20 --- balron.xml 26 Oct 2004 19:23:44 -0000 1.21 *************** *** 46,49 **** --- 46,50 ---- <strproperty name="slayer_group" value="balron" /> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> Index: daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/daemon.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** daemon.xml 16 Oct 2004 18:19:31 -0000 1.19 --- daemon.xml 26 Oct 2004 19:23:45 -0000 1.20 *************** *** 47,50 **** --- 47,51 ---- <strproperty name="slayer_group" value="daemons" /> <intproperty name="carve_meat" value="1" /> + <ai>Monster_Mage</ai> </npc> Index: succubus.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/succubus.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** succubus.xml 16 Oct 2004 18:19:31 -0000 1.13 --- succubus.xml 26 Oct 2004 19:23:47 -0000 1.14 *************** *** 42,45 **** --- 42,46 ---- <intproperty name="carve_meat" value="1" /> <strproperty name="slayer_group" value="daemons" /> + <ai>Monster_Mage</ai> </npc> Index: gargoyle.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/gargoyle.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** gargoyle.xml 16 Oct 2004 18:19:31 -0000 1.16 --- gargoyle.xml 26 Oct 2004 19:23:47 -0000 1.17 *************** *** 42,45 **** --- 42,46 ---- <strproperty name="slayer_group" value="gargoyles" /> <intproperty name="carve_meat" value="1" /> + <ai>Monster_Mage</ai> </npc> Index: imp.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/imp.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** imp.xml 16 Oct 2004 18:19:31 -0000 1.16 --- imp.xml 26 Oct 2004 19:23:47 -0000 1.17 *************** *** 51,54 **** --- 51,55 ---- <strproperty name="carve_hides_type" value="spined" /> <intproperty name="carve_meat" value="1" /> + <ai>Monster_Mage</ai> </npc> Index: ice_fiend.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/ice_fiend.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ice_fiend.xml 16 Oct 2004 18:19:31 -0000 1.15 --- ice_fiend.xml 26 Oct 2004 19:23:47 -0000 1.16 *************** *** 43,46 **** --- 43,47 ---- <strproperty name="slayer_group" value="daemons" /> <intproperty name="carve_meat" value="1" /> + <ai>Monster_Mage</ai> </npc> Index: fire_gargoyle.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/fire_gargoyle.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** fire_gargoyle.xml 16 Oct 2004 18:19:31 -0000 1.15 --- fire_gargoyle.xml 26 Oct 2004 19:23:46 -0000 1.16 *************** *** 44,47 **** --- 44,48 ---- <intproperty name="carve_meat" value="1" /> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:52
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/common Modified Files: elder_gazer.xml gazer.xml pixie.xml reaper.xml shadow_wisp.xml wisp.xml Log Message: added mage ais Index: wisp.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/wisp.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wisp.xml 16 Oct 2004 18:19:31 -0000 1.13 --- wisp.xml 26 Oct 2004 19:23:44 -0000 1.14 *************** *** 43,46 **** --- 43,47 ---- <category>Monsters\Common\Wisp</category> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> Index: elder_gazer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/elder_gazer.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** elder_gazer.xml 16 Oct 2004 18:19:31 -0000 1.12 --- elder_gazer.xml 26 Oct 2004 19:23:43 -0000 1.13 *************** *** 42,45 **** --- 42,46 ---- <lootpacks>lootpack_filthy_rich;lootpack_rich;gems</lootpacks> <category>Monsters\Common\Elder Gazer</category> + <ai>Monster_Mage</ai> </npc> Index: reaper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/reaper.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** reaper.xml 16 Oct 2004 18:19:31 -0000 1.11 --- reaper.xml 26 Oct 2004 19:23:44 -0000 1.12 *************** *** 43,46 **** --- 43,47 ---- <lootpacks>lootpack_average</lootpacks> <category>Monsters\Common\Reaper</category> + <ai>Monster_Mage</ai> </npc> Index: pixie.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/pixie.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pixie.xml 16 Oct 2004 18:19:31 -0000 1.5 --- pixie.xml 26 Oct 2004 19:23:44 -0000 1.6 *************** *** 49,52 **** --- 49,53 ---- <intproperty name="carve_meat" value="1" /> <inherit id="speed_veryfast" /> + <ai>Monster_Mage</ai> </npc> Index: gazer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/gazer.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gazer.xml 16 Oct 2004 18:19:31 -0000 1.12 --- gazer.xml 26 Oct 2004 19:23:43 -0000 1.13 *************** *** 43,46 **** --- 43,47 ---- <intproperty name="carve_meat" value="1" /> + <ai>Monster_Mage</ai> </npc> Index: shadow_wisp.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/shadow_wisp.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** shadow_wisp.xml 16 Oct 2004 18:19:31 -0000 1.12 --- shadow_wisp.xml 26 Oct 2004 19:23:44 -0000 1.13 *************** *** 40,43 **** --- 40,44 ---- <!--<lootpacks></lootpacks>--> <category>Monsters\Common\Shadow Wisp</category> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:41
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/dragons Modified Files: ancient_wyrm.xml dragon.xml serpentine_dragon.xml shadow_wyrm.xml skeletal_dragon.xml white_wyrm.xml Log Message: added mage ais Index: serpentine_dragon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/serpentine_dragon.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** serpentine_dragon.xml 16 Oct 2004 18:19:31 -0000 1.15 --- serpentine_dragon.xml 26 Oct 2004 19:23:48 -0000 1.16 *************** *** 48,51 **** --- 48,52 ---- <strproperty name="carve_hides_type" value="barbed" /> <intproperty name="carve_meat" value="19" /> + <ai>Monster_Mage</ai> </npc> Index: shadow_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/shadow_wyrm.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** shadow_wyrm.xml 16 Oct 2004 18:19:31 -0000 1.14 --- shadow_wyrm.xml 26 Oct 2004 19:23:48 -0000 1.15 *************** *** 49,52 **** --- 49,53 ---- <strproperty name="carve_hides_type" value="barbed" /> <intproperty name="carve_meat" value="19" /> + <ai>Monster_Mage</ai> </npc> Index: ancient_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/ancient_wyrm.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ancient_wyrm.xml 16 Oct 2004 18:19:31 -0000 1.15 --- ancient_wyrm.xml 26 Oct 2004 19:23:47 -0000 1.16 *************** *** 48,51 **** --- 48,52 ---- <intproperty name="carve_meat" value="19" /> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> Index: white_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/white_wyrm.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** white_wyrm.xml 16 Oct 2004 18:19:31 -0000 1.19 --- white_wyrm.xml 26 Oct 2004 19:23:48 -0000 1.20 *************** *** 51,54 **** --- 51,55 ---- <intproperty name="carve_meat" value="19" /> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> Index: skeletal_dragon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/skeletal_dragon.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** skeletal_dragon.xml 16 Oct 2004 18:19:31 -0000 1.7 --- skeletal_dragon.xml 26 Oct 2004 19:23:48 -0000 1.8 *************** *** 47,50 **** --- 47,51 ---- <intproperty name="carve_hides" value="20" /> <strproperty name="carve_hides_type" value="barbed" /> + <ai>Monster_Mage</ai> </npc> Index: dragon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/dragon.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** dragon.xml 16 Oct 2004 18:19:31 -0000 1.17 --- dragon.xml 26 Oct 2004 19:23:47 -0000 1.18 *************** *** 42,45 **** --- 42,46 ---- <mintaming>939</mintaming> <strproperty name="slayer_group" value="dragons" /> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:41
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/ratmen Modified Files: ratman_mage.xml Log Message: added mage ais Index: ratman_mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ratmen/ratman_mage.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ratman_mage.xml 16 Oct 2004 18:19:33 -0000 1.15 --- ratman_mage.xml 26 Oct 2004 19:23:52 -0000 1.16 *************** *** 47,50 **** --- 47,52 ---- <strproperty name="carve_hides_type" value="spined" /> <intproperty name="carve_meat" value="1" /> + + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:41
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/sea In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/sea Modified Files: deep_sea_serpent.xml Log Message: added mage ais Index: deep_sea_serpent.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/sea/deep_sea_serpent.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** deep_sea_serpent.xml 16 Oct 2004 18:19:33 -0000 1.13 --- deep_sea_serpent.xml 26 Oct 2004 19:24:00 -0000 1.14 *************** *** 45,48 **** --- 45,49 ---- <strproperty name="carve_scales_type" value="blue" /> <intproperty name="carve_meat" value="1" /> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:32
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/insect Modified Files: dread_spider.xml Log Message: added mage ais Index: dread_spider.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/dread_spider.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** dread_spider.xml 16 Oct 2004 18:19:32 -0000 1.13 --- dread_spider.xml 26 Oct 2004 19:23:50 -0000 1.14 *************** *** 44,47 **** --- 44,48 ---- <strproperty name="slayer_group" value="spiders" /> <inherit id="speed_fast" /> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:32
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/orc Modified Files: orc_mage.xml Log Message: added mage ais Index: orc_mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/orc/orc_mage.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** orc_mage.xml 16 Oct 2004 18:19:33 -0000 1.15 --- orc_mage.xml 26 Oct 2004 19:23:51 -0000 1.16 *************** *** 43,46 **** --- 43,47 ---- <strproperty name="slayer_group" value="orcs" /> <intproperty name="carve_meat" value="1" /> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 19:24:32
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10296/npcs/monsters/giants Modified Files: titan.xml Log Message: added mage ais Index: titan.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants/titan.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** titan.xml 16 Oct 2004 18:19:32 -0000 1.15 --- titan.xml 26 Oct 2004 19:23:50 -0000 1.16 *************** *** 44,47 **** --- 44,48 ---- <intproperty name="carve_meat" value="4" /> + <ai>Monster_Mage</ai> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 18:52:56
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3729 Modified Files: spawnregions.cpp Log Message: spawnregion fix Index: spawnregions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** spawnregions.cpp 13 Oct 2004 14:45:20 -0000 1.80 --- spawnregions.cpp 26 Oct 2004 18:52:44 -0000 1.81 *************** *** 564,567 **** --- 564,569 ---- if (countPoints() == 1) { pChar->setWanderType( enHalt ); // Most likely a vendor spawn with only one point + pChar->setWanderX1( pos.x ); + pChar->setWanderY1( pos.y ); } else { pChar->setWanderType( enWanderSpawnregion ); |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 18:38:04
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32526 Modified Files: inlines.h Log Message: Implemented a make ascii funciton that converts german umlauts into their 7bit representation for the ascii only packets (paperdoll, status) Index: inlines.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/inlines.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** inlines.h 26 Oct 2004 18:37:34 -0000 1.31 --- inlines.h 26 Oct 2004 18:37:54 -0000 1.32 *************** *** 33,36 **** --- 33,37 ---- #include <math.h> #include <qglobal.h> + #include <qstring.h> inline bool isHair( Q_UINT16 model ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 18:37:45
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32416/network Modified Files: uosocket.cpp uotxpackets.cpp Log Message: Implemented a make ascii funciton that converts german umlauts into their 7bit representation for the ascii only packets (paperdoll, status) Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.432 retrieving revision 1.433 diff -C2 -d -r1.432 -r1.433 *** uosocket.cpp 18 Oct 2004 12:09:52 -0000 1.432 --- uosocket.cpp 26 Oct 2004 18:37:35 -0000 1.433 *************** *** 40,43 **** --- 40,44 ---- #include "../console.h" #include "../territories.h" + #include "../inlines.h" #include "../sectors.h" #include "../multi.h" *************** *** 2441,2445 **** sendStats.setAllowRename( ( ( pChar->objectType() == enNPC && dynamic_cast<P_NPC>( pChar )->owner() == _player && !pChar->isHuman() ) || _player->isGM() ) && ( _player != pChar ) ); ! sendStats.setName( pChar->name() ); sendStats.setSerial( pChar->serial() ); --- 2442,2446 ---- sendStats.setAllowRename( ( ( pChar->objectType() == enNPC && dynamic_cast<P_NPC>( pChar )->owner() == _player && !pChar->isHuman() ) || _player->isGM() ) && ( _player != pChar ) ); ! sendStats.setName( makeAscii( pChar->name() ) ); sendStats.setSerial( pChar->serial() ); Index: uotxpackets.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** uotxpackets.cpp 12 Oct 2004 12:55:14 -0000 1.103 --- uotxpackets.cpp 26 Oct 2004 18:37:36 -0000 1.104 *************** *** 489,493 **** if ( !nameByScript.isNull() ) { ! setName( nameByScript ); } else --- 489,494 ---- if ( !nameByScript.isNull() ) { ! // Replace non displayable characters ! setName( makeAscii(nameByScript) ); } else *************** *** 567,575 **** } ! setName( prefix + pChar->name() + ( title.isEmpty() ? QString( "" ) : ", " + title ) ); } else { ! setName( pChar->name() + ( title.isEmpty() ? QString( "" ) : ", " + title ) ); } } --- 568,576 ---- } ! setName( makeAscii( prefix + pChar->name() + ( title.isEmpty() ? QString( "" ) : ", " + title ) ) ); } else { ! setName( makeAscii( pChar->name() + ( title.isEmpty() ? QString( "" ) : ", " + title ) ) ); } } |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 18:37:45
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32416 Modified Files: inlines.h npc.cpp walking.cpp Log Message: Implemented a make ascii funciton that converts german umlauts into their 7bit representation for the ascii only packets (paperdoll, status) Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.156 retrieving revision 1.157 diff -C2 -d -r1.156 -r1.157 *** walking.cpp 14 Oct 2004 00:24:53 -0000 1.156 --- walking.cpp 26 Oct 2004 18:37:34 -0000 1.157 *************** *** 529,533 **** // If the direction we're moving is already equal to our current direction bool running = dir & 0x80; ! dir = dir & 0x7F; // Remove the running flag pChar->setRunning(running); --- 529,533 ---- // If the direction we're moving is already equal to our current direction bool running = dir & 0x80; ! dir = dir & 0x7; // Remove all unneeded stuff pChar->setRunning(running); Index: inlines.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/inlines.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** inlines.h 24 Sep 2004 04:47:25 -0000 1.30 --- inlines.h 26 Oct 2004 18:37:34 -0000 1.31 *************** *** 77,79 **** --- 77,120 ---- } + inline QString makeAscii(const QString &input) { + QString result; + + for (int i = 0; i < input.length(); ++i) { + QChar c = input.at(i); + + // German umlauts can be represented differently + switch (c) { + case 'ü': + result.append("ue"); + continue; + case 'ä': + result.append("ae"); + continue; + case 'ö': + result.append("oe"); + continue; + case 'ß': + result.append("ss"); + continue; + case 'Ü': + result.append("Ue"); + continue; + case 'Ä': + result.append("Ae"); + continue; + case 'Ö': + result.append("Oe"); + continue; + } + + // Other non representable char + if (c.latin1() < 1 || (c.latin1() > 122 && c.latin1() != 127)) { + continue; + } + result.append(c); + } + + return result; + } + #endif Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** npc.cpp 15 Oct 2004 14:38:22 -0000 1.123 --- npc.cpp 26 Oct 2004 18:37:34 -0000 1.124 *************** *** 239,242 **** --- 239,243 ---- { owner_->removePet( this, true ); + } |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 18:37:43
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32416/ai Modified Files: ai.cpp Log Message: Implemented a make ascii funciton that converts german umlauts into their 7bit representation for the ascii only packets (paperdoll, status) Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ai.cpp 16 Oct 2004 18:19:40 -0000 1.40 --- ai.cpp 26 Oct 2004 18:37:33 -0000 1.41 *************** *** 606,609 **** --- 606,610 ---- } + // Change our current heading first. if (m_npc->direction() != dir) { Movement::instance()->Walking( m_npc, dir, 0xFF ); |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 18:11:46
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26572/skills Modified Files: lumberjacking.py Log Message: lumberjacking fix Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** lumberjacking.py 25 Oct 2004 16:27:50 -0000 1.24 --- lumberjacking.py 26 Oct 2004 18:11:33 -0000 1.25 *************** *** 2,10 **** import wolfpack import wolfpack.time - import whrandom import skills from wolfpack.consts import * from wolfpack.utilities import * ! from random import randint #import weapons.blades --- 2,9 ---- import wolfpack import wolfpack.time import skills from wolfpack.consts import * from wolfpack.utilities import * ! from random import randint, random #import weapons.blades *************** *** 204,208 **** else: # Skill Check against LUMBERJACKING ! if not skills.checkskill(char, LUMBERJACKING, chance): socket.clilocmessage(500495) success = 0 --- 203,208 ---- else: # Skill Check against LUMBERJACKING ! char.checkskill(LUMBERJACKING, 0, 1200) # Just do a static skillcheck here ! if chance < random(): socket.clilocmessage(500495) success = 0 |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 18:10:31
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26194/items/misc Modified Files: misc.xml Log Message: Fix for leather sold by tanners Index: misc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/misc/misc.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** misc.xml 10 Sep 2004 20:17:33 -0000 1.18 --- misc.xml 26 Oct 2004 18:10:16 -0000 1.19 *************** *** 166,169 **** --- 166,170 ---- <basescripts>key</basescripts> <buyprice>3</buyprice> + <newbie /> </item> *************** *** 173,176 **** --- 174,178 ---- <category>Misc\Keys\Gold Key</category> <basescripts>key</basescripts> + <newbie /> </item> *************** *** 180,183 **** --- 182,186 ---- <category>Misc\Keys\Iron Key</category> <basescripts>key</basescripts> + <newbie /> </item> *************** *** 186,189 **** --- 189,193 ---- <category>Misc\Keys\Keyring 1</category> <basescripts>keyring</basescripts> + <newbie /> </item> *************** *** 192,195 **** --- 196,200 ---- <category>Misc\Keys\Keyring 2</category> <basescripts>keyring</basescripts> + <newbie /> </item> *************** *** 198,201 **** --- 203,207 ---- <category>Misc\Keys\Keyring 3</category> <basescripts>keyring</basescripts> + <newbie /> </item> *************** *** 204,207 **** --- 210,214 ---- <category>Misc\Keys\Keyring 4</category> <basescripts>keyring</basescripts> + <newbie /> </item> *************** *** 211,214 **** --- 218,222 ---- <category>Misc\Keys\Magic Key</category> <basescripts>key</basescripts> + <newbie /> </item> *************** *** 218,221 **** --- 226,230 ---- <category>Misc\Keys\Rusty Iron Key</category> <basescripts>key</basescripts> + <newbie /> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-10-26 18:10:31
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26194/npcs/humans/vendors Modified Files: tanner.xml Log Message: Fix for leather sold by tanners Index: tanner.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tanner.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tanner.xml 19 Oct 2004 13:32:33 -0000 1.6 --- tanner.xml 26 Oct 2004 18:10:19 -0000 1.7 *************** *** 13,17 **** <item id="e76"><amount>20</amount></item> <!-- Bag --> <item id="e79"><amount>20</amount></item> <!-- Pouch --> ! <item id="1081"><amount>20</amount></item> <!-- Leather --> <!--<item id=""><amount>20</amount></item>--> <!-- Taxidermy Kit --> <item id="ec4"><amount>20</amount></item> <!-- Skinning Knife --> --- 13,17 ---- <item id="e76"><amount>20</amount></item> <!-- Bag --> <item id="e79"><amount>20</amount></item> <!-- Pouch --> ! <item id="leather_hides"><amount>20</amount></item> <!-- Leather --> <!--<item id=""><amount>20</amount></item>--> <!-- Taxidermy Kit --> <item id="ec4"><amount>20</amount></item> <!-- Skinning Knife --> |
|
From: HellRaider <hel...@us...> - 2004-10-26 03:25:50
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15385/scripts/magic Modified Files: spell.py Log Message: DelayedDamageSpell was ignoring the 'delay' setting - doh! Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** spell.py 16 Oct 2004 18:41:35 -0000 1.32 --- spell.py 26 Oct 2004 03:25:40 -0000 1.33 *************** *** 99,103 **** # Change this to 0 for AoS behaviour self.castrecovery = 1 * circle ! # # Show the cast action --- 99,103 ---- # Change this to 0 for AoS behaviour self.castrecovery = 1 * circle ! # # Show the cast action *************** *** 105,110 **** def docastaction(self, char, mode): if char.bodytype == BODY_HUMAN and not char.itemonlayer( LAYER_MOUNT ): ! char.action(self.castaction) ! # # Say the mantra --- 105,110 ---- def docastaction(self, char, mode): if char.bodytype == BODY_HUMAN and not char.itemonlayer( LAYER_MOUNT ): ! char.action(self.castaction) ! # # Say the mantra *************** *** 113,117 **** if char.npc and char.bodytype != BODY_HUMAN: return ! if self.mantra and mode in [MODE_BOOK, MODE_SCROLL]: char.say(self.mantra) --- 113,117 ---- if char.npc and char.bodytype != BODY_HUMAN: return ! if self.mantra and mode in [MODE_BOOK, MODE_SCROLL]: char.say(self.mantra) *************** *** 195,199 **** elif target and type(target).__name__ == 'wpchar': target = target.serial ! char.addtimer(self.calcdelay(char, mode), 'magic.spell.callback', [self, mode, args, target, item], 0, 0, "cast_delay") return 1 --- 195,199 ---- elif target and type(target).__name__ == 'wpchar': target = target.serial ! char.addtimer(self.calcdelay(char, mode), 'magic.spell.callback', [self, mode, args, target, item], 0, 0, "cast_delay") return 1 *************** *** 205,209 **** if mode == MODE_SCROLL: mana = (mana + 1) / 2 ! percent = properties.fromchar(char, LOWERMANACOST) / 100.0 return max(0, mana - int(percent * float(mana))) --- 205,209 ---- if mode == MODE_SCROLL: mana = (mana + 1) / 2 ! percent = properties.fromchar(char, LOWERMANACOST) / 100.0 return max(0, mana - int(percent * float(mana))) *************** *** 327,331 **** fizzle(char) return 0 ! # Check Skill if self.skill != None: --- 327,331 ---- fizzle(char) return 0 ! # Check Skill if self.skill != None: *************** *** 352,357 **** if not char.npc and len(self.reagents) > 0: lowerreagentcost = properties.fromchar(char, LOWERREAGENTCOST) ! ! if lowerreagentcost == 0 or lowerreagentcost > random.randint(0, 99): consumeReagents(char.getbackpack(), self.reagents.copy()) --- 352,357 ---- if not char.npc and len(self.reagents) > 0: lowerreagentcost = properties.fromchar(char, LOWERREAGENTCOST) ! ! if lowerreagentcost == 0 or lowerreagentcost > random.randint(0, 99): consumeReagents(char.getbackpack(), self.reagents.copy()) *************** *** 391,400 **** damage = rolldice(dice, sides, bonus) * 100.0 ! bonus = char.skill[INSCRIPTION] / 100.0 bonus += char.intelligence / 10.0 bonus += properties.fromchar(char, SPELLDAMAGEBONUS) damage *= 1.0 + bonus / 100.0 ! char.checkskill(self.damageskill, 0, 1200) damage *= (30 + (9 * char.skill[self.damageskill]) / 100.0) / 100.0 --- 391,400 ---- damage = rolldice(dice, sides, bonus) * 100.0 ! bonus = char.skill[INSCRIPTION] / 100.0 bonus += char.intelligence / 10.0 bonus += properties.fromchar(char, SPELLDAMAGEBONUS) damage *= 1.0 + bonus / 100.0 ! char.checkskill(self.damageskill, 0, 1200) damage *= (30 + (9 * char.skill[self.damageskill]) / 100.0) / 100.0 *************** *** 532,536 **** self.damage(char, target) else: ! target.addtimer(1000, 'magic.spell.damage_callback', [ self.spellid, char.serial ], 0, 0) # --- 532,536 ---- self.damage(char, target) else: ! target.addtimer(self.delay, 'magic.spell.damage_callback', [ self.spellid, char.serial ], 0, 0) # |
|
From: Richard M. <dr...@us...> - 2004-10-25 21:14:42
|
Update of /cvsroot/wpdev/xmlscripts/scripts/housing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29161/housing Added Files: .cvsignore Log Message: We forgot this... --- NEW FILE: .cvsignore --- *.pyc |
|
From: Sebastian H. <dar...@us...> - 2004-10-25 16:27:59
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27358/skills Modified Files: __init__.py lumberjacking.py Log Message: lumberjacking fix Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** __init__.py 13 Oct 2004 19:41:03 -0000 1.19 --- __init__.py 25 Oct 2004 16:27:50 -0000 1.20 *************** *** 91,98 **** # Normalize chance = min(1.0, max(0.02, chance)) minskill = (1.0 - chance) * 1200 maxskill = 1200 char.checkskill(skill, minskill, maxskill) ! return chance >= random.random() def totalstats( char ): --- 91,100 ---- # Normalize chance = min(1.0, max(0.02, chance)) + minskill = (1.0 - chance) * 1200 maxskill = 1200 char.checkskill(skill, minskill, maxskill) ! result = chance >= random.random() ! return result def totalstats( char ): Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** lumberjacking.py 23 Oct 2004 18:06:23 -0000 1.23 --- lumberjacking.py 25 Oct 2004 16:27:50 -0000 1.24 *************** *** 208,212 **** success = 0 return False ! elif chance >= randint(1, 100): char.socket.clilocmessage( 500498 ) # You put some logs into your backpack if tool.gettag( 'remaining_uses' ) > 1: --- 208,212 ---- success = 0 return False ! else: char.socket.clilocmessage( 500498 ) # You put some logs into your backpack if tool.gettag( 'remaining_uses' ) > 1: *************** *** 219,226 **** char.socket.deltag( 'is_lumberjacking' ) success = 1 - else: - char.socket.clilocmessage( 500495 ) # You hack at the tree for a while but fail to produce... - success = 0 - return False if success == 1: --- 219,222 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-25 01:08:37
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21417/system Modified Files: skills.xml Log Message: skill gain fixes Index: skills.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/skills.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** skills.xml 25 Oct 2004 00:43:11 -0000 1.4 --- skills.xml 25 Oct 2004 01:08:28 -0000 1.5 *************** *** 305,308 **** --- 305,309 ---- <dexchance>0.25</dexchance> <intchance>0.5</intchance> + <gainchance>1.0</gainchance> <defname>MAGICRESIST</defname> <name>MagicResist</name> |
