wpdev-commits Mailing List for Wolfpack Emu (Page 5)
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-27 16:38:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/guilds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11185/guilds Modified Files: member.py Log Message: Possible fix for nightsight problems. Index: member.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/guilds/member.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** member.py 25 Aug 2004 17:03:05 -0000 1.7 --- member.py 27 Oct 2004 16:38:34 -0000 1.8 *************** *** 67,70 **** --- 67,72 ---- player.deltag(tag) + return False + # Notify all guild members that this member has been # removed from the guild because he has been deleted |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:56
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/reptiles Modified Files: giant_serpent.xml giant_toad.xml silver_serpent.xml Log Message: poisoning for monsters Index: giant_serpent.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/giant_serpent.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** giant_serpent.xml 7 Oct 2004 20:13:54 -0000 1.12 --- giant_serpent.xml 27 Oct 2004 16:20:33 -0000 1.13 *************** *** 16,19 **** --- 16,20 ---- <inherit id="KARMA_L2" /> <inherit id="FAME_L2" /> + <!-- Stats --> <str><random min="186" max="215"/></str> *************** *** 22,25 **** --- 23,27 ---- <maxmana>0</maxmana> <maxhitpoints><random min="112" max="129"/></maxhitpoints> + <!-- Skills --> <poisoning><random min="701" max="1000"/></poisoning> *************** *** 27,34 **** --- 29,38 ---- <tactics><random min="651" max="700"/></tactics> <wrestling><random min="601" max="800"/></wrestling> + <!-- Damage --> <mindamage>19</mindamage> <maxdamage>35</maxdamage> <tag name="dmg_poison" value="60" type="int" /> + <!-- Resists --> <tag name="res_cold" value="10,20" type="int" /> *************** *** 37,51 **** <tag name="res_physical" value="30,35" type="int" /> <tag name="res_poison" value="70,90" type="int" /> <!-- Misc. --> <desc>These serpents are unnaturally large, easily able to devour a grownman whole. They are found in the deepest forests and jungles, where they wait in hiding for their prey to walk by. They produce a sweet meat with a flavor not unlike chicken, but they are most earnestly hunted for their scales, which are sought by mages and alchemists for their useful properties in the brewing of thaumaturgical substances.</desc> <!-- Missing: Body Parts --> <lootpacks>lootpack_average</lootpacks> - <carve>carve_serpent_gaint</carve> <category>Monsters\Reptiles\Gaint Serpent</category> <strproperty name="slayer_group" value="snakes" /> <!-- Carve --> <intproperty name="carve_hides" value="15" /> <strproperty name="carve_hides_type" value="spined" /> <intproperty name="carve_meat" value="4" /> </npc> --- 41,60 ---- <tag name="res_physical" value="30,35" type="int" /> <tag name="res_poison" value="70,90" type="int" /> + <!-- Misc. --> <desc>These serpents are unnaturally large, easily able to devour a grownman whole. They are found in the deepest forests and jungles, where they wait in hiding for their prey to walk by. They produce a sweet meat with a flavor not unlike chicken, but they are most earnestly hunted for their scales, which are sought by mages and alchemists for their useful properties in the brewing of thaumaturgical substances.</desc> + <!-- Missing: Body Parts --> <lootpacks>lootpack_average</lootpacks> <category>Monsters\Reptiles\Gaint Serpent</category> <strproperty name="slayer_group" value="snakes" /> + <!-- Carve --> <intproperty name="carve_hides" value="15" /> <strproperty name="carve_hides_type" value="spined" /> <intproperty name="carve_meat" value="4" /> + + <intproperty name="hit_poison_level" value="5" /> + <basescript>npc.poison</basescript> </npc> Index: silver_serpent.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/silver_serpent.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** silver_serpent.xml 7 Oct 2004 20:13:54 -0000 1.14 --- silver_serpent.xml 27 Oct 2004 16:20:33 -0000 1.15 *************** *** 42,45 **** --- 42,48 ---- <strproperty name="slayer_group" value="snakes" /> <intproperty name="carve_meat" value="1" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> </npc> Index: giant_toad.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/reptiles/giant_toad.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** giant_toad.xml 21 Sep 2004 05:27:15 -0000 1.14 --- giant_toad.xml 27 Oct 2004 16:20:33 -0000 1.15 *************** *** 42,46 **** <!-- Carve --> <intproperty name="carve_hides" value="12" /> ! <intproperty name="carve_hides_type" value="spined" /> </npc> --- 42,46 ---- <!-- Carve --> <intproperty name="carve_hides" value="12" /> ! <strproperty name="carve_hides_type" value="spined" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:56
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/shadows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/shadows Modified Files: darknight_creeper.xml impaler.xml Log Message: poisoning for monsters Index: darknight_creeper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/shadows/darknight_creeper.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** darknight_creeper.xml 16 Oct 2004 18:19:33 -0000 1.6 --- darknight_creeper.xml 27 Oct 2004 16:20:33 -0000 1.7 *************** *** 46,49 **** --- 46,52 ---- <strproperty name="slayer_group" value="undeads" /> <category>Monsters\Shadows\Darknight Creeper</category> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> </npc> Index: impaler.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/shadows/impaler.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** impaler.xml 7 Oct 2004 20:13:55 -0000 1.5 --- impaler.xml 27 Oct 2004 16:20:33 -0000 1.6 *************** *** 41,44 **** --- 41,47 ---- <category>Monsters\Shadows\Impaler</category> <strproperty name="slayer_group" value="daemons" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="5" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:55
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/terathen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/terathen Modified Files: terathen_avenger.xml Log Message: poisoning for monsters Index: terathen_avenger.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/terathen/terathen_avenger.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** terathen_avenger.xml 16 Oct 2004 18:19:34 -0000 1.14 --- terathen_avenger.xml 27 Oct 2004 16:20:33 -0000 1.15 *************** *** 45,48 **** --- 45,51 ---- <strproperty name="slayer_group" value="terathans" /> <intproperty name="carve_meat" value="2" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="3" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:55
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/undead Modified Files: rotting_corpse.xml Log Message: poisoning for monsters Index: rotting_corpse.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/rotting_corpse.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** rotting_corpse.xml 10 Oct 2004 18:24:31 -0000 1.15 --- rotting_corpse.xml 27 Oct 2004 16:20:33 -0000 1.16 *************** *** 46,49 **** --- 46,52 ---- <strproperty name="slayer_group" value="undeads" /> <inherit id="speed_slow" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/insect Modified Files: dread_spider.xml giant_black_widow.xml giant_spider.xml scorpion.xml Log Message: poisoning for monsters Index: giant_spider.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/giant_spider.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** giant_spider.xml 7 Oct 2004 20:13:53 -0000 1.13 --- giant_spider.xml 27 Oct 2004 16:20:33 -0000 1.14 *************** *** 41,44 **** --- 41,47 ---- <!-- Priv --> <strproperty name="slayer_group" value="spiders" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="1" /> </npc> Index: giant_black_widow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/giant_black_widow.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** giant_black_widow.xml 10 Oct 2004 18:24:30 -0000 1.12 --- giant_black_widow.xml 27 Oct 2004 16:20:33 -0000 1.13 *************** *** 42,45 **** --- 42,48 ---- <strproperty name="slayer_group" value="spiders" /> <inherit id="speed_fast" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="3" /> </npc> Index: dread_spider.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/dread_spider.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** dread_spider.xml 26 Oct 2004 19:23:50 -0000 1.14 --- dread_spider.xml 27 Oct 2004 16:20:33 -0000 1.15 *************** *** 45,48 **** --- 45,51 ---- <inherit id="speed_fast" /> <ai>Monster_Mage</ai> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> </npc> Index: scorpion.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/scorpion.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** scorpion.xml 7 Oct 2004 20:13:53 -0000 1.14 --- scorpion.xml 27 Oct 2004 16:20:33 -0000 1.15 *************** *** 46,49 **** --- 46,52 ---- <strproperty name="slayer_group" value="scorpions" /> <intproperty name="carve_meat" value="1" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="5" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/elemental Modified Files: acid_elemental.xml poison_elemental.xml Log Message: poisoning for monsters Index: poison_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/poison_elemental.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** poison_elemental.xml 26 Oct 2004 19:23:50 -0000 1.15 --- poison_elemental.xml 27 Oct 2004 16:20:32 -0000 1.16 *************** *** 46,49 **** --- 46,53 ---- <inherit id="speed_fast" /> <ai>Monster_Mage</ai> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> + <intproperty name="hit_poison_chance" value="75" /> </npc> Index: acid_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/acid_elemental.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** acid_elemental.xml 26 Oct 2004 19:23:48 -0000 1.13 --- acid_elemental.xml 27 Oct 2004 16:20:32 -0000 1.14 *************** *** 44,47 **** --- 44,51 ---- <category>Monsters\Elementals\Acid Elemental</category> <ai>Monster_Mage</ai> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> + <intproperty name="hit_poison_chance" value="60" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/ophidian Modified Files: ophidian_knight_errant.xml Log Message: poisoning for monsters Index: ophidian_knight_errant.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_knight_errant.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ophidian_knight_errant.xml 10 Oct 2004 18:24:30 -0000 1.13 --- ophidian_knight_errant.xml 27 Oct 2004 16:20:33 -0000 1.14 *************** *** 43,46 **** --- 43,48 ---- <intproperty name="carve_meat" value="2" /> <inherit id="speed_fast" /> + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:42
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/animals/land Modified Files: snake.xml Log Message: poisoning for monsters Index: snake.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/snake.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** snake.xml 7 Oct 2004 20:13:49 -0000 1.13 --- snake.xml 27 Oct 2004 16:20:31 -0000 1.14 *************** *** 46,49 **** --- 46,52 ---- <strproperty name="slayer_group" value="snakes" /> <intproperty name="carve_meat" value="1" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="0" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:42
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/common Modified Files: slime.xml Log Message: poisoning for monsters Index: slime.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/slime.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** slime.xml 10 Oct 2004 18:24:29 -0000 1.13 --- slime.xml 27 Oct 2004 16:20:32 -0000 1.14 *************** *** 41,44 **** --- 41,47 ---- <category>Monsters\Common\Slime</category> <inherit id="speed_slow" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="0" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:42
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/daemonic Modified Files: quagmire.xml Log Message: poisoning for monsters Index: quagmire.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/quagmire.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** quagmire.xml 10 Oct 2004 18:24:29 -0000 1.5 --- quagmire.xml 27 Oct 2004 16:20:32 -0000 1.6 *************** *** 42,45 **** --- 42,49 ---- <category>Monsters\Daemonic\Quagmire</category> <inherit id="speed_slow" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> + <intproperty name="hit_poison_chance" value="10" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:42
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/champions Modified Files: mephitis.xml Log Message: poisoning for monsters Index: mephitis.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/mephitis.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mephitis.xml 10 Oct 2004 18:24:29 -0000 1.7 --- mephitis.xml 27 Oct 2004 16:20:32 -0000 1.8 *************** *** 50,53 **** --- 50,56 ---- <strproperty name="slayer_group" value="spiders" /> <inherit id="speed_veryfast" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="4" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:20:41
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6107/npcs/monsters/dragons Modified Files: shadow_wyrm.xml wyvern.xml Log Message: poisoning for monsters Index: wyvern.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/wyvern.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wyvern.xml 7 Oct 2004 20:13:51 -0000 1.15 --- wyvern.xml 27 Oct 2004 16:20:32 -0000 1.16 *************** *** 44,47 **** --- 44,50 ---- <strproperty name="carve_hides_type" value="horned" /> <intproperty name="carve_meat" value="10" /> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="3" /> </npc> Index: shadow_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/shadow_wyrm.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** shadow_wyrm.xml 26 Oct 2004 19:23:48 -0000 1.15 --- shadow_wyrm.xml 27 Oct 2004 16:20:32 -0000 1.16 *************** *** 50,53 **** --- 50,56 ---- <intproperty name="carve_meat" value="19" /> <ai>Monster_Mage</ai> + + <basescript>npc.poison</basescript> + <intproperty name="hit_poison_level" value="3" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 16:19:51
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5801 Modified Files: ChangeLog commands.cpp walking.cpp wolfpack.sln Log Message: Walking fixes Index: wolfpack.sln =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.sln,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wolfpack.sln 21 Oct 2004 12:11:19 -0000 1.3 --- wolfpack.sln 27 Oct 2004 16:19:42 -0000 1.4 *************** *** 4,11 **** EndProjectSection EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin", "plugin\plugin.vcproj", "{709E9DEC-CDB2-4383-8B2D-10631EA06774}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection - EndProject Global GlobalSection(SolutionConfiguration) = preSolution --- 4,7 ---- *************** *** 21,30 **** {766437DE-37EB-400E-BF08-4AB9B529C83D}.Web-Release.ActiveCfg = Web-Release|Win32 {766437DE-37EB-400E-BF08-4AB9B529C83D}.Web-Release.Build.0 = Web-Release|Win32 - {709E9DEC-CDB2-4383-8B2D-10631EA06774}.Debug.ActiveCfg = Debug|Win32 - {709E9DEC-CDB2-4383-8B2D-10631EA06774}.Debug.Build.0 = Debug|Win32 - {709E9DEC-CDB2-4383-8B2D-10631EA06774}.Release.ActiveCfg = Release|Win32 - {709E9DEC-CDB2-4383-8B2D-10631EA06774}.Release.Build.0 = Release|Win32 - {709E9DEC-CDB2-4383-8B2D-10631EA06774}.Web-Release.ActiveCfg = Release|Win32 - {709E9DEC-CDB2-4383-8B2D-10631EA06774}.Web-Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution --- 17,20 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** ChangeLog 27 Oct 2004 15:04:41 -0000 1.124 --- ChangeLog 27 Oct 2004 16:19:42 -0000 1.125 *************** *** 8,11 **** --- 8,13 ---- - Stablemasters now remove the stabled pets from the follower list. - Corpses now decay in multis too. + - Implemented a walktest command for testing walking. + - Fixed several other walking bugs. Wolfpack 12.9.12 Beta (18. October 2004) Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** walking.cpp 26 Oct 2004 18:37:34 -0000 1.157 --- walking.cpp 27 Oct 2004 16:19:42 -0000 1.158 *************** *** 136,141 **** { // If the items have the same top, the one with the surface flag has precedence ! unsigned int itemTopA = a.height + a.z; ! unsigned int itemTopB = b.height + b.z; if (itemTopA == itemTopB) { --- 136,141 ---- { // If the items have the same top, the one with the surface flag has precedence ! int itemTopA = a.height + a.z; ! int itemTopB = b.height + b.z; if (itemTopA == itemTopB) { *************** *** 145,153 **** if (b.height == 0 && b.walkable) { ! return true; } } ! return ( ( a.height + a.z ) > ( b.height + b.z ) ); } }; --- 145,153 ---- if (b.height == 0 && b.walkable) { ! return false; } } ! return ( itemTopA > itemTopB ); } }; *************** *** 335,339 **** // Then we can as well just return false as while falling we would be // blocked by that object ! if ( !item.walkable && !priviledged && itemTop < pos.z ) return false; --- 335,339 ---- // Then we can as well just return false as while falling we would be // blocked by that object ! if ( !item.walkable && !priviledged && itemTop <= pos.z ) return false; *************** *** 425,428 **** --- 425,432 ---- if ( ( item.z <= oldz ) && ( itemTop >= oldz + P_M_MAX_Z_BLOCKS / 2 ) ) return false; + + // Is it at the new position ? + if ( ( item.z >= pos.z ) && ( item.z < pos.z + P_M_MAX_Z_BLOCKS ) ) + return false; } Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.269 retrieving revision 1.270 diff -C2 -d -r1.269 -r1.270 *** commands.cpp 22 Oct 2004 18:40:32 -0000 1.269 --- commands.cpp 27 Oct 2004 16:19:42 -0000 1.270 *************** *** 45,48 **** --- 45,49 ---- #include "pythonscript.h" #include "network/network.h" + #include "walking.h" #include "dbdriver.h" *************** *** 1287,1290 **** --- 1288,1310 ---- /* + \command walktest + \description Checks if the character could walk into the direction he is facing if he was a npc. + \notes This command is very useful for testing npc movement as a staff member. + */ + void commandWalkTest( cUOSocket* socket, const QString& /*command*/, const QStringList& /*args*/ ) throw() + { + Coord_cl newpos = socket->player()->pos(); + newpos = Movement::instance()->calcCoordFromDir(socket->player()->direction(), newpos); + + bool result = mayWalk(socket->player(), newpos); + + if (!result) { + socket->sysMessage(tr("You may not walk in that direction."), 0x26); + } else { + socket->sysMessage(tr("You may walk in that direction. (New Z: %1)").arg(newpos.z), 0x3a); + } + } + + /* \command doorgen \description Generate doors in passage ways. *************** *** 1550,1553 **** --- 1570,1574 ---- { "STAFF", commandStaff }, { "SPAWNREGION", commandSpawnRegion }, + { "WALKTEST", commandWalkTest }, { NULL, NULL } }; |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 15:04:54
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19522 Modified Files: ChangeLog items.cpp Log Message: Decay for corpses Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.455 retrieving revision 1.456 diff -C2 -d -r1.455 -r1.456 *** items.cpp 16 Oct 2004 18:19:40 -0000 1.455 --- items.cpp 27 Oct 2004 15:04:42 -0000 1.456 *************** *** 2221,2225 **** unsigned int cItem::decayDelay() { ! if ( container_ || nodecay() || multi_ ) { return 0; --- 2221,2225 ---- unsigned int cItem::decayDelay() { ! if ( container_ || nodecay() || (!corpse() && multi_) ) { return 0; Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** ChangeLog 27 Oct 2004 14:06:50 -0000 1.123 --- ChangeLog 27 Oct 2004 15:04:41 -0000 1.124 *************** *** 7,10 **** --- 7,11 ---- - Implemented the onDoDamage event. - Stablemasters now remove the stabled pets from the follower list. + - Corpses now decay in multis too. Wolfpack 12.9.12 Beta (18. October 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:56:09
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17257 Modified Files: basechar.cpp Log Message: onDoDamage now worknig Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** basechar.cpp 27 Oct 2004 14:37:25 -0000 1.170 --- basechar.cpp 27 Oct 2004 14:56:00 -0000 1.171 *************** *** 2270,2279 **** } - P_CHAR sourceChar = dynamic_cast<P_CHAR>(source); if (sourceChar && sourceChar->canHandleEvent(EVENT_DODAMAGE)) { PyObject* args = Py_BuildValue( "NiiN", sourceChar->getPyObject(), type, amount, getPyObject() ); ! PyObject* result = callEvent(EVENT_DODAMAGE, args); if (result) { --- 2270,2278 ---- } P_CHAR sourceChar = dynamic_cast<P_CHAR>(source); if (sourceChar && sourceChar->canHandleEvent(EVENT_DODAMAGE)) { PyObject* args = Py_BuildValue( "NiiN", sourceChar->getPyObject(), type, amount, getPyObject() ); ! PyObject* result = sourceChar->callEvent(EVENT_DODAMAGE, args); if (result) { |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:37:35
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12698 Modified Files: basechar.cpp pythonscript.cpp Log Message: Fixes Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** basechar.cpp 27 Oct 2004 14:06:51 -0000 1.169 --- basechar.cpp 27 Oct 2004 14:37:25 -0000 1.170 *************** *** 2270,2273 **** --- 2270,2289 ---- } + + P_CHAR sourceChar = dynamic_cast<P_CHAR>(source); + + if (sourceChar && sourceChar->canHandleEvent(EVENT_DODAMAGE)) { + PyObject* args = Py_BuildValue( "NiiN", sourceChar->getPyObject(), type, amount, getPyObject() ); + PyObject* result = callEvent(EVENT_DODAMAGE, args); + + if (result) { + if (PyInt_Check(result)) + amount = PyInt_AsLong(result); + Py_DECREF(result); + } + + Py_DECREF(args); + } + // // First of all, call onDamage with the damage-type, amount and source *************** *** 2277,2282 **** { PyObject* args = 0; ! if ( dynamic_cast<P_CHAR>( source ) != 0 ) ! args = Py_BuildValue( "O&iiO&", PyGetCharObject, this, ( unsigned int ) type, amount, PyGetCharObject, source ); else if ( dynamic_cast<P_ITEM>( source ) ) args = Py_BuildValue( "O&iiO&", PyGetCharObject, this, ( unsigned int ) type, amount, PyGetItemObject, source ); --- 2293,2298 ---- { PyObject* args = 0; ! if ( sourceChar ) ! args = Py_BuildValue( "O&iiO&", PyGetCharObject, this, ( unsigned int ) type, amount, PyGetCharObject, sourceChar ); else if ( dynamic_cast<P_ITEM>( source ) ) args = Py_BuildValue( "O&iiO&", PyGetCharObject, this, ( unsigned int ) type, amount, PyGetItemObject, source ); *************** *** 2297,2315 **** } - if (source && source->isChar() && source->canHandleEvent(EVENT_DODAMAGE)) { - P_CHAR sourceChar = static_cast<P_CHAR>(source); - - PyObject* args = Py_BuildValue( "NiiN", sourceChar->getPyObject(), type, amount, getPyObject() ); - PyObject* result = callEvent(EVENT_DAMAGE, args); - - if (result) { - if (PyInt_Check(result)) - amount = PyInt_AsLong(result); - Py_DECREF(result); - } - - Py_DECREF(args); - } - // The damage has been resisted or scripts have taken care of the damage otherwise // Invulnerable Targets don't take any damage at all --- 2313,2316 ---- Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** pythonscript.cpp 27 Oct 2004 14:06:52 -0000 1.56 --- pythonscript.cpp 27 Oct 2004 14:37:25 -0000 1.57 *************** *** 570,573 **** --- 570,574 ---- /* + \event onDoDamage \param char The character dealing the damage. \param type The damage type. |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:12:07
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6789 Modified Files: scripts.xml Log Message: Implemented onCheckVictim and onDoDamage Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -d -r1.172 -r1.173 *** scripts.xml 21 Oct 2004 21:40:29 -0000 1.172 --- scripts.xml 27 Oct 2004 14:11:58 -0000 1.173 *************** *** 162,165 **** --- 162,166 ---- <!-- NPC --> <script>npc.healer</script> + <script>npc.poison</script> <!-- Context menu scripts --> |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:07:33
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5590 Modified Files: ChangeLog basechar.cpp pythonscript.cpp pythonscript.h Log Message: Implemented onCheckVictim and onDoDamage Index: pythonscript.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** pythonscript.h 17 Oct 2004 01:20:19 -0000 1.44 --- pythonscript.h 27 Oct 2004 14:06:53 -0000 1.45 *************** *** 90,93 **** --- 90,95 ---- EVENT_RESURRECT, EVENT_CHECKSECURITY, + EVENT_CHECKVICTIM, + EVENT_DODAMAGE, EVENT_COUNT, }; Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** basechar.cpp 21 Oct 2004 00:19:41 -0000 1.168 --- basechar.cpp 27 Oct 2004 14:06:51 -0000 1.169 *************** *** 2260,2263 **** --- 2260,2267 ---- unsigned int cBaseChar::damage( eDamageType type, unsigned int amount, cUObject* source ) { + if (isInvulnerable()) { + return 0; + } + if ( isFrozen() ) { *************** *** 2293,2300 **** } // The damage has been resisted or scripts have taken care of the damage otherwise // Invulnerable Targets don't take any damage at all ! if ( amount == 0 || isInvulnerable() ) ! { return 0; } --- 2297,2318 ---- } + if (source && source->isChar() && source->canHandleEvent(EVENT_DODAMAGE)) { + P_CHAR sourceChar = static_cast<P_CHAR>(source); + + PyObject* args = Py_BuildValue( "NiiN", sourceChar->getPyObject(), type, amount, getPyObject() ); + PyObject* result = callEvent(EVENT_DAMAGE, args); + + if (result) { + if (PyInt_Check(result)) + amount = PyInt_AsLong(result); + Py_DECREF(result); + } + + Py_DECREF(args); + } + // The damage has been resisted or scripts have taken care of the damage otherwise // Invulnerable Targets don't take any damage at all ! if (amount == 0) { return 0; } *************** *** 2321,2326 **** } ! // There is a 33% chance that blood is created on hit by phsical means ! if ( type == DAMAGE_PHYSICAL && !RandomNum( 0, 2 ) ) { int bloodColor = 0; --- 2339,2344 ---- } ! // There is a 25% chance that blood is created on hit by phsical means ! if ( type == DAMAGE_PHYSICAL && !RandomNum( 0, 4 ) ) { int bloodColor = 0; Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** pythonscript.cpp 17 Oct 2004 01:20:19 -0000 1.55 --- pythonscript.cpp 27 Oct 2004 14:06:52 -0000 1.56 *************** *** 558,561 **** --- 558,582 ---- "onCheckSecurity", + /* + \event onCheckVictim + \param npc The npc that is thinking about a new target. + \param victim The victim that is being thought about. + \param dist The distance in tiles to the victm. + \return True if the target is a valid victim, False otherwise. + \condition This is triggered when the NPC is looking for a better target. + It is triggered for every character that could be attacked by the NPC. + */ + "onCheckVictim", + + /* + \param char The character dealing the damage. + \param type The damage type. + \param amount The amount of damage. + \param victim The victim taking the damage. + \condition Triggered when a character deals damage to another character. + \return Return the new amount of damage dealt to the victim. + */ + "onDoDamage", + 0 }; Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** ChangeLog 21 Oct 2004 12:11:10 -0000 1.122 --- ChangeLog 27 Oct 2004 14:06:50 -0000 1.123 *************** *** 3,6 **** --- 3,10 ---- Wolfpack 12.9.13 Beta (CVS) - Fixed meditation skillcheck in mana regeneration code. + - Changed gm talk color. + - Implemented the onCheckVictim event. + - Implemented the onDoDamage event. + - Stablemasters now remove the stabled pets from the follower list. Wolfpack 12.9.12 Beta (18. October 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:07:17
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5590/ai Modified Files: ai_humans.cpp ai_monsters.cpp Log Message: Implemented onCheckVictim and onDoDamage Index: ai_humans.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ai_humans.cpp 27 Oct 2004 10:56:12 -0000 1.26 --- ai_humans.cpp 27 Oct 2004 14:06:54 -0000 1.27 *************** *** 402,424 **** P_NPC pNpc = dynamic_cast<P_NPC>(pChar); ! // NPCs owned by innocent players aren't attacked ! if (pNpc) { ! if (pNpc->isTamed() && pNpc->owner()) { ! if (pNpc->owner()->isInnocent()) { ! continue; } } else { ! // Check for the AI, guards only attack other npcs if they ! // are monsters. ! Monster_Aggressive *npcai = dynamic_cast<Monster_Aggressive*>(pNpc->ai()); ! if (!npcai) { continue; - } } - } else { - // Innocent players aren't attacked - P_PLAYER pPlayer = dynamic_cast<P_PLAYER>( pChar ); - if ( pPlayer && (pPlayer->isInnocent() || pPlayer->isGMorCounselor()) ) - continue; } --- 402,439 ---- P_NPC pNpc = dynamic_cast<P_NPC>(pChar); ! // If the character has a checkvictim processing function, use that instead ! if (m_npc->canHandleEvent(EVENT_CHECKVICTIM)) { ! if (pNpc && pNpc->owner()) { ! pChar = pNpc->owner(); ! } ! ! PyObject *args = Py_BuildValue("(NNi)", m_npc->getPyObject(), pChar->getPyObject(), pChar->dist(m_npc)); ! bool result = m_npc->callEventHandler(EVENT_CHECKVICTIM, args); ! Py_DECREF(args); ! ! if (!result) { ! continue; ! } ! } else { ! // NPCs owned by innocent players aren't attacked ! if (pNpc) { ! if (pNpc->isTamed() && pNpc->owner()) { ! if ((pNpc->owner()->isInnocent() || pNpc->owner()->isGMorCounselor())) { ! continue; ! } ! } else { ! // Check for the AI, guards only attack other npcs if they ! // are monsters. ! Monster_Aggressive *npcai = dynamic_cast<Monster_Aggressive*>(pNpc->ai()); ! if (!npcai) { ! continue; ! } } } else { ! // Innocent players aren't attacked ! P_PLAYER pPlayer = dynamic_cast<P_PLAYER>( pChar ); ! if ( pPlayer && (pPlayer->isInnocent() || pPlayer->isGMorCounselor()) ) continue; } } *************** *** 454,458 **** P_CHAR pTarget = ( pAI ? pAI->currentVictim() : NULL ); ! if ( !pTarget || pTarget->isDead() || pTarget->isInnocent() ) return 0.0f; --- 469,473 ---- P_CHAR pTarget = ( pAI ? pAI->currentVictim() : NULL ); ! if ( !pTarget || pTarget->isDead() || pTarget->isHidden() || pTarget->isInvisible() ) return 0.0f; *************** *** 495,499 **** P_CHAR pTarget = ( pAI ? pAI->currentVictim() : NULL ); ! if ( !pTarget || pTarget->isDead() || pTarget->isInnocent() ) return 0.0f; --- 510,514 ---- P_CHAR pTarget = ( pAI ? pAI->currentVictim() : NULL ); ! if ( !pTarget || pTarget->isDead() || pTarget->isHidden() || pTarget->isInvisible() ) return 0.0f; *************** *** 514,518 **** P_CHAR pTarget = ( pAI ? pAI->currentVictim() : NULL ); ! if ( !pTarget || pTarget->isDead() || pTarget->isInnocent() ) return 1.0f; --- 529,533 ---- P_CHAR pTarget = ( pAI ? pAI->currentVictim() : NULL ); ! if ( !pTarget || pTarget->isDead() || pTarget->isHidden() || pTarget->isInvisible() ) return 1.0f; Index: ai_monsters.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ai_monsters.cpp 16 Oct 2004 18:19:41 -0000 1.28 --- ai_monsters.cpp 27 Oct 2004 14:07:08 -0000 1.29 *************** *** 78,82 **** } ! return true; } --- 78,91 ---- } ! bool result = true; ! ! // Check if the NPC has a script for target validation ! if (npc->canHandleEvent(EVENT_CHECKVICTIM)) { ! PyObject *args = Py_BuildValue("(NNi)", npc->getPyObject(), victim->getPyObject(), dist); ! result = npc->callEventHandler(EVENT_CHECKVICTIM, args); ! Py_DECREF(args); ! } ! ! return result; } *************** *** 99,103 **** if (victim != target && (!npc->isTamed() || victim->attackTarget() == npc)) { // See if it's a target we want ! unsigned int dist = npc->dist(victim); if (dist < distance && validTarget(npc, victim, dist)) { target = victim; --- 108,112 ---- if (victim != target && (!npc->isTamed() || victim->attackTarget() == npc)) { // See if it's a target we want ! unsigned int dist = npc->dist(victim); if (dist < distance && validTarget(npc, victim, dist)) { target = victim; *************** *** 111,116 **** RegionIterator4Chars ri(npc->pos(), VISRANGE); for ( ri.Begin(); !ri.atEnd(); ri++ ) { ! // We limit ourself to players here ! P_PLAYER victim= dynamic_cast<P_PLAYER>( ri.GetData() ); // We don't already attack the target, right? --- 120,126 ---- RegionIterator4Chars ri(npc->pos(), VISRANGE); for ( ri.Begin(); !ri.atEnd(); ri++ ) { ! // We limit ourself to players and pets owned by players. ! P_PLAYER victim = dynamic_cast<P_PLAYER>( ri.GetData() ); ! P_NPC npcVictim = dynamic_cast<P_NPC>( ri.GetData() ); // We don't already attack the target, right? *************** *** 122,125 **** --- 132,142 ---- distance = dist; } + } else if (npcVictim && npcVictim->owner() && npcVictim != target) { + // See if it's a target we want + unsigned int dist = npc->dist(victim); + if (dist < distance && validTarget(npc, victim, dist)) { + target = victim; + distance = dist; + } } } *************** *** 147,151 **** if (!m_currentVictim || m_currentVictim->dist(m_npc) > 1) { P_CHAR target = findBestTarget(m_npc); - if (target) { m_currentVictim = target; --- 164,167 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:06:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/npc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5513/npc Added Files: poison.py Log Message: fixes --- NEW FILE: poison.py --- from wolfpack.consts import * import system.poison impot random def onDoDamage(npc, damagetype, amount, victim): if damagetype != DAMAGE_PHYSICAL: return amount if npc == victim: return amount # Safety measure so we never poison ourselves hit_poison_level = npc.getintproperty('hit_poison_level', 0) hit_poison_chance = npc.getintproperty('hit_poison_chance', 50) if hit_poison_level < 0 or hit_poison_level > 4: return amount if hit_poison_chance <= 0: return amount # Check the poisoning chance if hit_poison_chance > random.randint(0, 99): system.poison(victim, hit_poison_level) return amount |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:06:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5513/system Modified Files: poison.py Log Message: fixes Index: poison.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/poison.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** poison.py 25 Aug 2004 17:03:06 -0000 1.6 --- poison.py 27 Oct 2004 14:06:33 -0000 1.7 *************** *** 87,90 **** --- 87,96 ---- return + # Check for poison immunity + poison_immunity = char.getintproperty('poison_immunity', -1) + + if poison_immunity != -1 and level <= poison_immunity: + return # Do nothing. We're immune to that kind of poison + # Delete current poison char.dispel(None, 1, "poison_timer", []) |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:06:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5513/wolfpack Modified Files: consts.py Log Message: fixes Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** consts.py 17 Oct 2004 01:20:26 -0000 1.90 --- consts.py 27 Oct 2004 14:06:34 -0000 1.91 *************** *** 418,422 **** EVENT_RESURRECT = 47 EVENT_CHECKSECURITY = 48 ! EVENT_COUNT = 49 """ \end --- 418,424 ---- EVENT_RESURRECT = 47 EVENT_CHECKSECURITY = 48 ! EVENT_CHECKVICTIM = 49 ! EVENT_DODAMAGE = 50 ! EVENT_COUNT = 51 """ \end |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 14:06:03
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5338/webroot Modified Files: ChangeLog.wolfpack Log Message: fixes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.171 retrieving revision 1.172 diff -C2 -d -r1.171 -r1.172 *** ChangeLog.wolfpack 23 Oct 2004 18:07:08 -0000 1.171 --- ChangeLog.wolfpack 27 Oct 2004 14:05:54 -0000 1.172 *************** *** 3,6 **** --- 3,7 ---- Wolfpack 12.9.13 Beta (CVS) * Definition Changes: + - Added the mage AI to most creatures. - Adjusted carving sheeps. - Fixed leatherworkers and tanners not buying leather and hides. *************** *** 9,12 **** --- 10,18 ---- - Fixed bug #0000361. (Pets don't follow trough gate) - Added xoffset, yoffset and zoffset to socket.attachmultitarget. (housing.deed) + - Fixed a runebook bug. (Refuses to work when full) + - Rewrote parts of the runebook. + - Added support for creature based poison immunity. + - Added support for hit based poisoning. + - Fixed several bugs in lumberjacking. - Chars will now get revealed when using training dummy or archery butte. - Fixed blood created at carving not decaying for a long time. |
|
From: Sebastian H. <dar...@us...> - 2004-10-27 10:56:22
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18456/ai Modified Files: ai_humans.cpp Log Message: Stabling animals now removes them from the pet list Index: ai_humans.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ai_humans.cpp 16 Oct 2004 04:53:23 -0000 1.25 --- ai_humans.cpp 27 Oct 2004 10:56:12 -0000 1.26 *************** *** 139,147 **** if ( pPet ) { ! pPet->free = false; ! // we need this for db saves ! pPet->setStablemasterSerial( INVALID_SERIAL ); ! pPet->moveTo( m_npc->pos() ); ! pPet->resend(); } ( *it )->remove(); --- 139,152 ---- if ( pPet ) { ! if (pTalker->pets().count() + pPet->controlSlots() > pTalker->maxControlSlots()) { ! m_npc->talk(1049612, pPet->name()); ! } else { ! pPet->free = false; ! // we need this for db saves ! pPet->setStablemasterSerial( INVALID_SERIAL ); ! pPet->setOwner( pTalker ); // This is important... ! pPet->moveTo( m_npc->pos() ); ! pPet->resend(); ! } } ( *it )->remove(); *************** *** 152,155 **** --- 157,162 ---- pPack->update(); m_npc->talk( 1042559 ); // Here you go... and good day to you!; + } else { + m_npc->talk( 502671 ); // But I have no animals stabled with me at the moment! } } *************** *** 179,183 **** if ( !pPet ) { ! m_npc->talk( 1048053 ); // You can't stable that! } else if ( pPet->owner() != player ) --- 186,190 ---- if ( !pPet ) { ! m_npc->talk( 502672 ); // HA HA HA! Sorry, I am not an inn. } else if ( pPet->owner() != player ) *************** *** 215,218 **** --- 222,226 ---- MapObjects::instance()->remove( pPet ); pPet->setStablemasterSerial( this->m_npc->serial() ); + pPet->setOwner(0); // Remove ownership from this player since it's stabled pPet->removeFromView(); m_npc->talk( 502679 ); // Very well, thy pet is stabled. Thou mayst recover it by saying 'claim' to me. In one real world week, I shall sell it off if it is not claimed! |
