wpdev-commits Mailing List for Wolfpack Emu (Page 17)
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-10 18:25:10
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/animals/mounts Modified Files: nightmare.xml Log Message: speed infos Index: nightmare.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/nightmare.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** nightmare.xml 21 Sep 2004 05:27:06 -0000 1.14 --- nightmare.xml 10 Oct 2004 18:24:28 -0000 1.15 *************** *** 51,54 **** --- 51,55 ---- <strproperty name="carve_hides_type" value="barbed" /> <intproperty name="carve_meat" value="5" /> + <inherit id="speed_fast" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:25:09
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/animals/land Modified Files: rat.xml walrus.xml Log Message: speed infos Index: walrus.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/walrus.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** walrus.xml 21 Sep 2004 05:27:06 -0000 1.12 --- walrus.xml 10 Oct 2004 18:24:28 -0000 1.13 *************** *** 48,51 **** --- 48,52 ---- <intproperty name="carve_hides" value="12" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_slow" /> </npc> Index: rat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/rat.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** rat.xml 21 Sep 2004 05:27:06 -0000 1.13 --- rat.xml 10 Oct 2004 18:24:28 -0000 1.14 *************** *** 46,49 **** --- 46,50 ---- <intproperty name="carve_meat" value="1" /> + <inherit id="speed_slow" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:44
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/undead Modified Files: bone_knight.xml ethereal_warrior.xml ghoul.xml headless_one.xml lich.xml lich_lord.xml mummy.xml rotting_corpse.xml skeletons.xml zombie.xml Log Message: speed infos Index: ethereal_warrior.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/ethereal_warrior.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ethereal_warrior.xml 21 Sep 2004 05:27:31 -0000 1.10 --- ethereal_warrior.xml 10 Oct 2004 18:24:31 -0000 1.11 *************** *** 38,41 **** --- 38,42 ---- <!-- Carve --> <intproperty name="carve_feathers" value="100" /> + <inherit id="speed_fast" /> </npc> Index: lich.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/lich.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** lich.xml 7 Oct 2004 20:13:56 -0000 1.14 --- lich.xml 10 Oct 2004 18:24:31 -0000 1.15 *************** *** 45,48 **** --- 45,49 ---- <category>Monsters\Undead\Lich</category> <strproperty name="slayer_group" value="undeads" /> + <inherit id="speed_fast" /> </npc> Index: ghoul.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/ghoul.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ghoul.xml 7 Oct 2004 20:13:56 -0000 1.8 --- ghoul.xml 10 Oct 2004 18:24:31 -0000 1.9 *************** *** 39,42 **** --- 39,43 ---- <category>Monsters\Undead\Ghoul</category> <strproperty name="slayer_group" value="undeads" /> + <inherit id="speed_slow" /> </npc> Index: skeletons.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/skeletons.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** skeletons.xml 7 Oct 2004 20:13:56 -0000 1.14 --- skeletons.xml 10 Oct 2004 18:24:31 -0000 1.15 *************** *** 37,40 **** --- 37,41 ---- <desc>The animated bones of the dead are terrible to behold, but truth to tell they are not formidable warriors, being able to overcome awell-trained fighter only in large groups. Like ghouls, they appear to ingest meat in some supernatural fashion. The bones of a formerly animated skeleton are desired for certain dark magicks.</desc> <strproperty name="slayer_group" value="undeads" /> + <inherit id="speed_slow" /> </npc> Index: rotting_corpse.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/rotting_corpse.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** rotting_corpse.xml 7 Oct 2004 20:13:56 -0000 1.14 --- rotting_corpse.xml 10 Oct 2004 18:24:31 -0000 1.15 *************** *** 45,48 **** --- 45,49 ---- <category>Monsters\Undead\Rotting Corpse</category> <strproperty name="slayer_group" value="undeads" /> + <inherit id="speed_slow" /> </npc> Index: lich_lord.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/lich_lord.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** lich_lord.xml 7 Oct 2004 20:13:56 -0000 1.14 --- lich_lord.xml 10 Oct 2004 18:24:31 -0000 1.15 *************** *** 47,50 **** --- 47,51 ---- <category>Monsters\Undead\Lich Lord</category> <strproperty name="slayer_group" value="undeads" /> + <inherit id="speed_fast" /> </npc> Index: mummy.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/mummy.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mummy.xml 7 Oct 2004 20:13:56 -0000 1.15 --- mummy.xml 10 Oct 2004 18:24:31 -0000 1.16 *************** *** 42,45 **** --- 42,46 ---- <category>Monsters\Undead\Mummy</category> <strproperty name="slayer_group" value="undeads" /> + <inherit id="speed_slow" /> </npc> Index: bone_knight.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/bone_knight.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** bone_knight.xml 7 Oct 2004 20:13:56 -0000 1.15 --- bone_knight.xml 10 Oct 2004 18:24:31 -0000 1.16 *************** *** 42,45 **** --- 42,46 ---- <strproperty name="slayer_group" value="undeads" /> <desc>Knights who failed to hold to their tenets are doomed to roam the afterlife as Bone Knights. First seen in the new lands, these knights rise in legions to battle the army of the living. Utterly devoid of fear there is no chance a bone knight will ever break off the attack. These knights are the best sword fighters and tacticians doing battle for the ever-growing numbers of undead.</desc> + <inherit id="speed_slow" /> </npc> Index: zombie.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/zombie.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** zombie.xml 7 Oct 2004 20:13:56 -0000 1.14 --- zombie.xml 10 Oct 2004 18:24:31 -0000 1.15 *************** *** 39,42 **** --- 39,43 ---- <category>Monsters\Undead\Zombie</category> <strproperty name="slayer_group" value="undeads" /> + <inherit id="speed_slow" /> </npc> Index: headless_one.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/headless_one.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** headless_one.xml 21 Sep 2004 05:27:32 -0000 1.17 --- headless_one.xml 10 Oct 2004 18:24:31 -0000 1.18 *************** *** 26,29 **** --- 26,32 ---- <anatomy>0</anatomy> + <!-- Slow Speed --> + <speed action="300" wander="600" /> + <!-- Damage --> <mindamage>6</mindamage> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:44
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/ophidian Modified Files: ophidian_apprentice_mage.xml ophidian_avenger.xml ophidian_enforcer.xml ophidian_justicar.xml ophidian_knight_errant.xml ophidian_matriarch.xml ophidian_shaman.xml ophidian_warrior.xml ophidian_zealot.xml Log Message: speed infos Index: ophidian_zealot.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_zealot.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_zealot.xml 7 Oct 2004 20:13:54 -0000 1.12 --- ophidian_zealot.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 43,46 **** --- 43,47 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_fast" /> </npc> Index: ophidian_shaman.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_shaman.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_shaman.xml 7 Oct 2004 20:13:53 -0000 1.12 --- ophidian_shaman.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 42,45 **** --- 42,46 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_fast" /> </npc> Index: ophidian_avenger.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_avenger.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_avenger.xml 7 Oct 2004 20:13:53 -0000 1.12 --- ophidian_avenger.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 40,43 **** --- 40,44 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_fast" /> </npc> Index: ophidian_warrior.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_warrior.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_warrior.xml 7 Oct 2004 20:13:54 -0000 1.12 --- ophidian_warrior.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 42,45 **** --- 42,46 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_fast" /> </npc> Index: ophidian_matriarch.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_matriarch.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_matriarch.xml 7 Oct 2004 20:13:53 -0000 1.12 --- ophidian_matriarch.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 44,47 **** --- 44,48 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_fast" /> </npc> Index: ophidian_knight_errant.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_knight_errant.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_knight_errant.xml 7 Oct 2004 20:13:53 -0000 1.12 --- ophidian_knight_errant.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 42,45 **** --- 42,46 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="2" /> + <inherit id="speed_fast" /> </npc> Index: ophidian_enforcer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_enforcer.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_enforcer.xml 7 Oct 2004 20:13:53 -0000 1.12 --- ophidian_enforcer.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 41,44 **** --- 41,45 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_fast" /> </npc> Index: ophidian_justicar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_justicar.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_justicar.xml 7 Oct 2004 20:13:53 -0000 1.12 --- ophidian_justicar.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 43,46 **** --- 43,47 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_fast" /> </npc> Index: ophidian_apprentice_mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/ophidian/ophidian_apprentice_mage.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ophidian_apprentice_mage.xml 7 Oct 2004 20:13:53 -0000 1.12 --- ophidian_apprentice_mage.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 43,46 **** --- 43,47 ---- <strproperty name="slayer_group" value="ophidians" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_fast" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:44
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/summoned Modified Files: blade_spirit.xml energy_vortex.xml Log Message: speed infos Index: blade_spirit.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/blade_spirit.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** blade_spirit.xml 10 Sep 2004 17:08:29 -0000 1.11 --- blade_spirit.xml 10 Oct 2004 18:24:31 -0000 1.12 *************** *** 44,47 **** --- 44,48 ---- <controlslots>1</controlslots> <category>Summoned\Blade Spirit</category> + <inherit id="speed_fast" /> </npc> Index: energy_vortex.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/energy_vortex.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** energy_vortex.xml 9 Aug 2004 18:45:42 -0000 1.6 --- energy_vortex.xml 10 Oct 2004 18:24:31 -0000 1.7 *************** *** 42,45 **** --- 42,46 ---- <controlslots>1</controlslots> <category>Summoned\Energy Vortex</category> + <inherit id="speed_veryfast" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:44
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/shadows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/shadows Modified Files: dark_father.xml flesh_renderer.xml Log Message: speed infos Index: flesh_renderer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/shadows/flesh_renderer.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** flesh_renderer.xml 7 Sep 2004 00:28:06 -0000 1.4 --- flesh_renderer.xml 10 Oct 2004 18:24:31 -0000 1.5 *************** *** 41,44 **** --- 41,45 ---- <!-- Misc. --> <category>Monsters\Shadows\Flesh Renderer</category> + <inherit id="speed_veryfast" /> </npc> Index: dark_father.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/shadows/dark_father.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dark_father.xml 7 Oct 2004 20:13:55 -0000 1.5 --- dark_father.xml 10 Oct 2004 18:24:31 -0000 1.6 *************** *** 51,54 **** --- 51,55 ---- <category>Monsters\Shadows\Dark Father</category> <strproperty name="slayer_group" value="daemons" /> + <inherit id="speed_fast" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/elemental Modified Files: air_elemental.xml crystal_elemental.xml earth_elemental.xml efreet.xml poison_elemental.xml sand_vortex.xml snow_elemental.xml Log Message: speed infos Index: snow_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/snow_elemental.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** snow_elemental.xml 7 Oct 2004 20:13:52 -0000 1.12 --- snow_elemental.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 40,43 **** --- 40,44 ---- <category>Monsters\Elementals\Snow Elemental</category> <strproperty name="slayer_group" value="snowelementals" /> + <inherit id="speed_fast" /> </npc> Index: earth_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/earth_elemental.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** earth_elemental.xml 7 Oct 2004 20:13:52 -0000 1.12 --- earth_elemental.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 39,42 **** --- 39,43 ---- <category>Monsters\Elementals\Earth Elemental</category> <strproperty name="slayer_group" value="earthelementals" /> + <inherit id="speed_slow" /> </npc> Index: air_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/air_elemental.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** air_elemental.xml 7 Oct 2004 20:13:52 -0000 1.14 --- air_elemental.xml 10 Oct 2004 18:24:30 -0000 1.15 *************** *** 45,48 **** --- 45,49 ---- <category>Monsters\Elementals\Air Elemental</category> <strproperty name="slayer_group" value="airelementals" /> + <inherit id="speed_fast" /> </npc> Index: poison_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/poison_elemental.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** poison_elemental.xml 7 Oct 2004 20:13:52 -0000 1.12 --- poison_elemental.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 44,47 **** --- 44,48 ---- <category>Monsters\Elementals\Poison Elemental</category> <strproperty name="slayer_group" value="poisonelementals" /> + <inherit id="speed_fast" /> </npc> Index: crystal_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/crystal_elemental.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** crystal_elemental.xml 7 Jun 2004 21:39:37 -0000 1.2 --- crystal_elemental.xml 10 Oct 2004 18:24:30 -0000 1.3 *************** *** 43,46 **** --- 43,47 ---- <!-- Misc. --> <category>Monsters\Elementals\Crystal Elemental</category> + <inherit id="speed_slow" /> </npc> Index: efreet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/efreet.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** efreet.xml 7 Sep 2004 00:28:04 -0000 1.12 --- efreet.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 42,45 **** --- 42,46 ---- <lootpacks>lootpack_rich;lootpack_average;gems</lootpacks> <category>Monsters\Elementals\Efreet</category> + <inherit id="speed_fast" /> </npc> Index: sand_vortex.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/sand_vortex.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** sand_vortex.xml 7 Sep 2004 00:28:04 -0000 1.12 --- sand_vortex.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 38,41 **** --- 38,42 ---- <lootpacks>lootpack_rich</lootpacks> <category>Monsters\Elementals\Sand Vortex</category> + <inherit id="speed_fast" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/insect Modified Files: ant_lion.xml dread_spider.xml giant_black_widow.xml Log Message: speed infos Index: giant_black_widow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/giant_black_widow.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** giant_black_widow.xml 7 Oct 2004 20:13:53 -0000 1.11 --- giant_black_widow.xml 10 Oct 2004 18:24:30 -0000 1.12 *************** *** 41,44 **** --- 41,45 ---- <category>Monsters\Insects\Giant Black Widow</category> <strproperty name="slayer_group" value="spiders" /> + <inherit id="speed_fast" /> </npc> Index: dread_spider.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/dread_spider.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dread_spider.xml 7 Oct 2004 20:13:53 -0000 1.11 --- dread_spider.xml 10 Oct 2004 18:24:30 -0000 1.12 *************** *** 43,46 **** --- 43,47 ---- <category>Monsters\Insects\Dread Spider</category> <strproperty name="slayer_group" value="spiders" /> + <inherit id="speed_fast" /> </npc> Index: ant_lion.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/ant_lion.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ant_lion.xml 7 Sep 2004 00:28:04 -0000 1.9 --- ant_lion.xml 10 Oct 2004 18:24:30 -0000 1.10 *************** *** 11,14 **** --- 11,15 ---- <!-- an ant lion --> <npc id="ant_lion" inherit="monster_base"> + <inherit id="speed_slow" /> <name>ant lion</name> <id>787</id> *************** *** 37,41 **** <!-- Missing: Fertile Dirt, 3 Bone, Dull Copper or Shadow or Copper or Bronze Ore --> <lootpacks>gold_average;gems;</lootpacks> ! <category>Monsters\Insects\Ant Lion</category> </npc> --- 38,42 ---- <!-- Missing: Fertile Dirt, 3 Bone, Dull Copper or Shadow or Copper or Bronze Ore --> <lootpacks>gold_average;gems;</lootpacks> ! <category>Monsters\Insects\Ant Lion</category> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/giants Modified Files: arctic_ogre_lord.xml ettin.xml frost_troll.xml ogre.xml ogre_lord.xml Log Message: speed infos Index: frost_troll.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants/frost_troll.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** frost_troll.xml 7 Oct 2004 20:13:52 -0000 1.13 --- frost_troll.xml 10 Oct 2004 18:24:30 -0000 1.14 *************** *** 40,43 **** --- 40,44 ---- <strproperty name="slayer_group" value="trolls" /> <intproperty name="carve_meat" value="2" /> + <inherit id="speed_slow" /> </npc> Index: ogre_lord.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants/ogre_lord.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ogre_lord.xml 7 Oct 2004 20:13:52 -0000 1.13 --- ogre_lord.xml 10 Oct 2004 18:24:30 -0000 1.14 *************** *** 40,43 **** --- 40,44 ---- <strproperty name="slayer_group" value="ogres" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_slow" /> </npc> Index: ettin.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants/ettin.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ettin.xml 21 Sep 2004 05:27:13 -0000 1.13 --- ettin.xml 10 Oct 2004 18:24:30 -0000 1.14 *************** *** 39,43 **** <lootpacks>lootpack_average;lootpack_meager</lootpacks> <category>Monsters\Giants\Ettin (Random)</category> ! <intproperty name="carve_meat" value="4" /> </npc> --- 39,43 ---- <lootpacks>lootpack_average;lootpack_meager</lootpacks> <category>Monsters\Giants\Ettin (Random)</category> ! <inherit id="speed_slow" /> <intproperty name="carve_meat" value="4" /> </npc> Index: ogre.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants/ogre.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ogre.xml 7 Oct 2004 20:13:52 -0000 1.13 --- ogre.xml 10 Oct 2004 18:24:30 -0000 1.14 *************** *** 41,44 **** --- 41,45 ---- <strproperty name="slayer_group" value="ogres" /> <intproperty name="carve_meat" value="2" /> + <inherit id="speed_slow" /> </npc> Index: arctic_ogre_lord.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/giants/arctic_ogre_lord.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** arctic_ogre_lord.xml 7 Oct 2004 20:13:52 -0000 1.12 --- arctic_ogre_lord.xml 10 Oct 2004 18:24:30 -0000 1.13 *************** *** 11,14 **** --- 11,15 ---- <!-- an arctic ogre lord --> <npc id="arctic_ogre_lord" inherit="monster_base"> + <inherit id="speed_slow" /> <name>arctic ogre lord</name> <id>135</id> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:42
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/common Modified Files: frost_ooze.xml gazer_larva.xml mound_of_maggots.xml pixie.xml sewer_rat.xml slime.xml vorpal_bunny.xml wisp.xml Log Message: speed infos Index: wisp.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/wisp.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wisp.xml 7 Sep 2004 00:28:03 -0000 1.11 --- wisp.xml 10 Oct 2004 18:24:29 -0000 1.12 *************** *** 42,45 **** --- 42,46 ---- <lootpacks>lootpack_rich;lootpack_average</lootpacks> <category>Monsters\Common\Wisp</category> + <inherit id="speed_fast" /> </npc> Index: mound_of_maggots.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/mound_of_maggots.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mound_of_maggots.xml 7 Sep 2004 00:28:02 -0000 1.4 --- mound_of_maggots.xml 10 Oct 2004 18:24:29 -0000 1.5 *************** *** 38,41 **** --- 38,42 ---- <!-- Misc. --> <category>Monsters\Common\Mound of Maggots</category> + <inherit id="speed_slow" /> </npc> Index: sewer_rat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/sewer_rat.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** sewer_rat.xml 21 Sep 2004 05:27:12 -0000 1.11 --- sewer_rat.xml 10 Oct 2004 18:24:29 -0000 1.12 *************** *** 36,39 **** --- 36,40 ---- <intproperty name="carve_meat" value="1" /> + <inherit id="speed_slow" /> </npc> Index: frost_ooze.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/frost_ooze.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** frost_ooze.xml 7 Sep 2004 00:28:02 -0000 1.10 --- frost_ooze.xml 10 Oct 2004 18:24:29 -0000 1.11 *************** *** 39,42 **** --- 39,43 ---- <lootpacks>gems</lootpacks> <category>Monsters\Common\Frost Ooze</category> + <inherit id="speed_slow" /> </npc> Index: pixie.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/pixie.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pixie.xml 21 Sep 2004 05:27:12 -0000 1.3 --- pixie.xml 10 Oct 2004 18:24:29 -0000 1.4 *************** *** 48,51 **** --- 48,52 ---- <strproperty name="carve_hides_type" value="spined" /> <intproperty name="carve_meat" value="1" /> + <inherit id="speed_veryfast" /> </npc> Index: vorpal_bunny.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/vorpal_bunny.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** vorpal_bunny.xml 7 Sep 2004 00:28:03 -0000 1.10 --- vorpal_bunny.xml 10 Oct 2004 18:24:29 -0000 1.11 *************** *** 32,35 **** --- 32,36 ---- <lootpacks>lootpack_filthy_rich;lootpack_rich;lootpack_rich;lootpack_rich</lootpacks> <category>Monsters\Common\Vorpal Bunny</category> + <inherit id="speed_veryfast" /> </npc> Index: gazer_larva.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/gazer_larva.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gazer_larva.xml 21 Sep 2004 05:27:12 -0000 1.6 --- gazer_larva.xml 10 Oct 2004 18:24:29 -0000 1.7 *************** *** 37,40 **** --- 37,41 ---- <intproperty name="carve_meat" value="1" /> + <inherit id="speed_slow" /> </npc> Index: slime.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/common/slime.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** slime.xml 10 Sep 2004 17:08:27 -0000 1.12 --- slime.xml 10 Oct 2004 18:24:29 -0000 1.13 *************** *** 40,43 **** --- 40,44 ---- <mintaming>231</mintaming> <category>Monsters\Common\Slime</category> + <inherit id="speed_slow" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:40
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/dragons Modified Files: ancient_wyrm.xml white_wyrm.xml Log Message: speed infos Index: ancient_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/ancient_wyrm.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ancient_wyrm.xml 7 Oct 2004 20:13:51 -0000 1.13 --- ancient_wyrm.xml 10 Oct 2004 18:24:30 -0000 1.14 *************** *** 47,50 **** --- 47,51 ---- <strproperty name="carve_hides_type" value="barbed" /> <intproperty name="carve_meat" value="19" /> + <inherit id="speed_fast" /> </npc> Index: white_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/white_wyrm.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** white_wyrm.xml 7 Oct 2004 20:13:51 -0000 1.17 --- white_wyrm.xml 10 Oct 2004 18:24:30 -0000 1.18 *************** *** 50,53 **** --- 50,54 ---- <strproperty name="carve_hides_type" value="barbed" /> <intproperty name="carve_meat" value="19" /> + <inherit id="speed_fast" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:40
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15881/npcs/monsters/daemonic Modified Files: balron.xml quagmire.xml Log Message: speed infos Index: balron.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/balron.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** balron.xml 7 Oct 2004 20:13:51 -0000 1.17 --- balron.xml 10 Oct 2004 18:24:29 -0000 1.18 *************** *** 46,49 **** --- 46,50 ---- <intproperty name="carve_meat" value="1" /> <strproperty name="slayer_group" value="balron" /> + <inherit id="speed_fast" /> </npc> Index: quagmire.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/quagmire.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** quagmire.xml 7 Sep 2004 00:28:03 -0000 1.4 --- quagmire.xml 10 Oct 2004 18:24:29 -0000 1.5 *************** *** 41,44 **** --- 41,45 ---- <!-- Misc. --> <category>Monsters\Daemonic\Quagmire</category> + <inherit id="speed_slow" /> </npc> |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 18:24:29
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15825/webroot Modified Files: ChangeLog.wolfpack Log Message: speed infos Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -d -r1.144 -r1.145 *** ChangeLog.wolfpack 10 Oct 2004 12:06:21 -0000 1.144 --- ChangeLog.wolfpack 10 Oct 2004 18:24:17 -0000 1.145 *************** *** 17,20 **** --- 17,21 ---- - Added slayer weapon properties to NPCs. - Fiexd bug #0000347. (Campfires not disappearing, wrong light id) + - Added different NPC speeds. * Python Script Changes: - Fixed BONUS* properties. |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 17:51:47
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972 Modified Files: ChangeLog basechar.h basedef.cpp basedef.h npc.cpp npc.h spawnregions.cpp Log Message: npc movement. Index: npc.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** npc.h 28 Sep 2004 09:48:56 -0000 1.61 --- npc.h 10 Oct 2004 17:51:24 -0000 1.62 *************** *** 130,134 **** virtual stError* setProperty( const QString& name, const cVariant& value ); PyObject* getProperty( const QString& name ); ! void setNextMoveTime( void ); virtual void callGuards(); // overriding void makeShop(); --- 130,134 ---- virtual stError* setProperty( const QString& name, const cVariant& value ); PyObject* getProperty( const QString& name ); ! void setNextMoveTime( bool changeDirection = true ); virtual void callGuards(); // overriding void makeShop(); Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** basedef.cpp 9 Oct 2004 14:28:59 -0000 1.24 --- basedef.cpp 10 Oct 2004 17:51:24 -0000 1.25 *************** *** 126,129 **** --- 126,131 ---- controlSlots_ = 1; criticalHealth_ = 0; + wanderSpeed_ = 400; + actionSpeed_ = 200; } *************** *** 182,185 **** --- 184,202 ---- applyDefinition( element ); } + else if ( node->name() == "speed" && node->hasAttribute("wander") && node->hasAttribute("action")) + { + bool ok1, ok2; + + // Convert to unsigned ints + unsigned int wanderSpeed = node->getAttribute("wander").toUInt(&ok1); + unsigned int actionSpeed = node->getAttribute("action").toUInt(&ok2); + + if (!ok1 || !ok2) { + Console::instance()->log(LOG_WARNING, tr("Base definition '%1' has invalid speed tag.\n").arg(id_)); + } else { + actionSpeed_ = actionSpeed; + wanderSpeed_ = wanderSpeed; + } + } else { Index: basedef.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** basedef.h 1 Oct 2004 15:15:56 -0000 1.19 --- basedef.h 10 Oct 2004 17:51:24 -0000 1.20 *************** *** 137,141 **** QCString lootPacks_; unsigned char controlSlots_; ! unsigned char criticalHealth_; // Misc Properties --- 137,143 ---- QCString lootPacks_; unsigned char controlSlots_; ! unsigned char criticalHealth_; ! unsigned int actionSpeed_; // ms between moves ! unsigned int wanderSpeed_; // ms between moves // Misc Properties *************** *** 154,157 **** --- 156,171 ---- } + inline unsigned int wanderSpeed() + { + load(); + return wanderSpeed_; + } + + inline unsigned int actionSpeed() + { + load(); + return actionSpeed_; + } + inline unsigned char criticalHealth() { Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** ChangeLog 10 Oct 2004 12:19:09 -0000 1.103 --- ChangeLog 10 Oct 2004 17:51:24 -0000 1.104 *************** *** 40,43 **** --- 40,45 ---- - Fixed "lingering" characters at the border of the screen if they walk away. - Fixed bug #0000348 ( Guards should kill instantly ) + - Improved NPC movement and allowed custom speeds per npc. + - Reduced network latency. Wolfpack 12.9.11 Beta (26. September 2004) Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** basechar.h 26 Sep 2004 21:36:23 -0000 1.88 --- basechar.h 10 Oct 2004 17:51:24 -0000 1.89 *************** *** 581,584 **** --- 581,594 ---- } + inline unsigned int wanderSpeed() + { + return basedef_ ? basedef_->wanderSpeed() : 400; + } + + inline unsigned int actionSpeed() + { + return basedef_ ? basedef_->actionSpeed() : 200; + } + inline unsigned short figurine() { Index: spawnregions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** spawnregions.cpp 5 Oct 2004 18:20:53 -0000 1.76 --- spawnregions.cpp 10 Oct 2004 17:51:24 -0000 1.77 *************** *** 686,694 **** { if (active_) { ! while ( npcs() < maxNpcAmt_ ) spawnSingleNPC(); ! while ( items() < maxItemAmt_ ) spawnSingleItem(); this->nextTime_ = Server::instance()->time() + RandomNum( this->minTime_, this->maxTime_ ) * MY_CLOCKS_PER_SEC; --- 686,707 ---- { if (active_) { ! unsigned int failed = 0; ! ! while ( npcs() < maxNpcAmt_ && failed < 50) { ! unsigned int oldamount = npcs(); spawnSingleNPC(); + if (npcs() == oldamount) { + failed++; + } + } ! failed = 0; ! while ( items() < maxItemAmt_ ) { ! unsigned int oldamount = items(); spawnSingleItem(); + if (npcs() == oldamount) { + failed++; + } + } this->nextTime_ = Server::instance()->time() + RandomNum( this->minTime_, this->maxTime_ ) * MY_CLOCKS_PER_SEC; *************** *** 735,739 **** int respawned = 0; iterator it( this->begin() ); ! while ( it != this->end() && respawned < 50 ) { if ( it->second->active() && it->second->nextTime() <= Server::instance()->time() ) { --- 748,752 ---- int respawned = 0; iterator it( this->begin() ); ! while ( it != this->end() && respawned < 10 ) { if ( it->second->active() && it->second->nextTime() <= Server::instance()->time() ) { Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** npc.cpp 9 Oct 2004 14:28:59 -0000 1.120 --- npc.cpp 10 Oct 2004 17:51:24 -0000 1.121 *************** *** 69,73 **** ai_ = new Monster_Aggressive_L1( this ); aiCheckInterval_ = ( Q_UINT16 ) floor( Config::instance()->checkAITime() * MY_CLOCKS_PER_SEC ); ! aiCheckTime_ = Server::instance()->time() + aiCheckInterval_; } --- 69,73 ---- ai_ = new Monster_Aggressive_L1( this ); aiCheckInterval_ = ( Q_UINT16 ) floor( Config::instance()->checkAITime() * MY_CLOCKS_PER_SEC ); ! aiCheckTime_ = Server::instance()->time() + aiCheckInterval_ + RandomNum(0, 1000); } *************** *** 252,286 **** } ! void cNPC::setNextMoveTime() { unsigned int interval; ! if ( isTamed() ) ! { ! interval = ( unsigned int ) Config::instance()->tamedNpcMoveTime() * MY_CLOCKS_PER_SEC; ! } ! else ! { ! interval = ( unsigned int ) Config::instance()->npcMoveTime() * MY_CLOCKS_PER_SEC; } // Wander slowly if wandering freely. ! if ( wanderType() == enFreely || wanderType() == enCircle || wanderType() == enRectangle || wanderType() == enWanderSpawnregion ) ! { ! interval *= 3; ! interval += RandomNum(1000, 5000); } ! // If we are moving to a targert, run! ! if (ai_ && ai_->currentAction()) { ! Human_Guard_MoveToTarget *moveToTargetG = dynamic_cast<Human_Guard_MoveToTarget*>(ai_->currentAction()); ! Monster_Aggr_MoveToTarget *moveToTargetM = dynamic_cast<Monster_Aggr_MoveToTarget*>(ai_->currentAction()); ! if (moveToTargetG || moveToTargetM) { ! interval = 250; } } ! setNextMoveTime( Server::instance()->time() + interval ); } --- 252,320 ---- } ! void cNPC::setNextMoveTime(bool changedDirection) { unsigned int interval; + bool passive = true; + bool controlled = summoned() || (owner() != 0); ! if (ai_ && ai_->currentAction()) { ! passive = ai_->currentAction()->isPassive(); } // Wander slowly if wandering freely. ! if ( passive ) { ! interval = wanderSpeed(); ! } else { ! interval = actionSpeed(); } ! // Transform certain standard intervals. ! switch (interval) { ! case 200: ! interval = 300; ! break; ! case 250: ! interval = 450; ! break; ! case 300: ! interval = 600; ! break; ! case 400: ! interval = 900; ! break; ! case 500: ! interval = 1050; ! break; ! case 800: ! interval = 1500; ! break; ! default: ! break; ! }; ! // Wandering creatures are even slower than usual ! if (passive) { ! interval += 200; ! } ! ! // This creature is not player or monster controlled. Thus slower. ! if (isTamed()) { ! // Creatures following their owner are a lot faster than usual ! if (wanderFollowTarget() == owner() && ai_ && dynamic_cast<Action_Wander*>(ai_->currentAction()) != 0) { ! interval >>= 1; // Half the time } + + interval -= 75; // A little faster + } else if (!summoned()) { + interval += 100; // The creature is not summoned nor tamed, make it a little slower } ! // Creatures become slower if hurt ! if (hitpoints() < maxHitpoints()) { ! float ratio = 1.0f - QMAX(0.0f, QMIN(1.0f, (float)hitpoints() / (float)maxHitpoints())); // Range from 0.0 to 1.0 ! interval += (unsigned int)(ratio * 800); ! } ! ! setNextMoveTime(Server::instance()->time() + interval); } |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 17:51:47
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/network Modified Files: asyncnetio.cpp Log Message: npc movement. Index: asyncnetio.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** asyncnetio.cpp 5 Oct 2004 13:21:22 -0000 1.55 --- asyncnetio.cpp 10 Oct 2004 17:51:25 -0000 1.56 *************** *** 572,576 **** //if( buffers.empty() ) // Disconnecting doesnt work for now ! waitCondition.wait( 40 ); // let's rest for a while } } --- 572,576 ---- //if( buffers.empty() ) // Disconnecting doesnt work for now ! waitCondition.wait( 10 ); // let's rest for a while } } |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 17:51:47
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/ai Modified Files: ai.cpp ai.h ai_monsters.cpp Log Message: npc movement. Index: ai.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ai.h 9 Oct 2004 14:32:21 -0000 1.18 --- ai.h 10 Oct 2004 17:51:24 -0000 1.19 *************** *** 66,69 **** --- 66,72 ---- } + // is this action passive (wandering, etc.)? + virtual bool isPassive() = 0; + // executes the action virtual void execute() = 0; *************** *** 183,186 **** --- 186,190 ---- } public: + virtual bool isPassive(); Action_Wander( P_NPC npc, AbstractAI* ai ) : AbstractAction( npc, ai ), waitForPathCalculation( 0 ) { *************** *** 253,257 **** virtual float preCondition(); virtual float postCondition(); ! virtual const char* name() { --- 257,263 ---- virtual float preCondition(); virtual float postCondition(); ! virtual bool isPassive() { ! return false; ! } virtual const char* name() { *************** *** 292,295 **** --- 298,306 ---- nextTry = 0; } + + virtual bool isPassive() { + return false; + } + virtual void execute(); virtual float preCondition(); *************** *** 309,312 **** --- 320,327 ---- } public: + virtual bool isPassive() { + return false; + } + Monster_Aggr_Fight( P_NPC npc, AbstractAI* ai ) : AbstractAction( npc, ai ) { *************** *** 588,591 **** --- 603,607 ---- { } + virtual bool isPassive(); virtual void execute(); virtual float preCondition(); *************** *** 629,633 **** { } ! static void registerInFactory( const QString& name ); virtual QString name() --- 645,649 ---- { } ! static void registerInFactory( const QString& name ); virtual QString name() *************** *** 666,669 **** --- 682,688 ---- virtual float preCondition(); virtual float postCondition(); + virtual bool isPassive() { + return false; + } virtual const char* name() *************** *** 683,686 **** --- 702,708 ---- { } + virtual bool isPassive() { + return false; + } virtual void execute(); virtual float preCondition(); *************** *** 703,706 **** --- 725,731 ---- { } + virtual bool isPassive() { + return false; + } virtual void execute(); virtual float preCondition(); *************** *** 786,789 **** --- 811,817 ---- { } + virtual bool isPassive() { + return false; + } virtual void execute(); virtual float preCondition(); Index: ai.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ai.cpp 3 Oct 2004 13:51:40 -0000 1.36 --- ai.cpp 10 Oct 2004 17:51:24 -0000 1.37 *************** *** 425,428 **** --- 425,442 ---- } + bool Action_Wander::isPassive() { + if (m_npc->attackTarget()) { + return false; + } + + enWanderTypes type = m_npc->wanderType(); + + if (type == enFreely || type == enWanderSpawnregion || type == enCircle || type == enRectangle) { + return true; + } else { + return false; + } + } + float Action_Wander::preCondition() { *************** *** 1026,1027 **** --- 1040,1045 ---- } } + + bool ScriptAction::isPassive() { + return false; + } Index: ai_monsters.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ai_monsters.cpp 9 Oct 2004 14:32:21 -0000 1.25 --- ai_monsters.cpp 10 Oct 2004 17:51:25 -0000 1.26 *************** *** 137,142 **** m_currentVictimSer = INVALID_SERIAL; m_npc->fight(0); ! } ! if (nextVictimCheck < Server::instance()->time()) { --- 137,141 ---- m_currentVictimSer = INVALID_SERIAL; m_npc->fight(0); ! } if (nextVictimCheck < Server::instance()->time()) { *************** *** 296,303 **** { // We failed several times to reach the target so we wait ! if (nextTry > Server::instance()->time()) { return; } Monster_Aggressive* pAI = dynamic_cast<Monster_Aggressive*>( m_ai ); if ( !pAI ) --- 295,304 ---- { // We failed several times to reach the target so we wait ! if (nextTry > Server::instance()->time() || m_npc->nextMoveTime() > Server::instance()->time()) { return; } + m_npc->setNextMoveTime(); + Monster_Aggressive* pAI = dynamic_cast<Monster_Aggressive*>( m_ai ); if ( !pAI ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 12:19:22
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5190/network Modified Files: uosocket.cpp Log Message: Fixes Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.427 retrieving revision 1.428 diff -C2 -d -r1.427 -r1.428 *** uosocket.cpp 9 Oct 2004 14:32:22 -0000 1.427 --- uosocket.cpp 10 Oct 2004 12:19:10 -0000 1.428 *************** *** 2269,2272 **** --- 2269,2285 ---- send( &drawChar ); pChar->sendTooltip( this ); + + // Send the equipment Tooltips + cBaseChar::ItemContainer content = pChar->content(); + cBaseChar::ItemContainer::const_iterator it; + + for ( it = content.begin(); it != content.end(); it++ ) + { + P_ITEM pItem = it.data(); + if ( pItem->layer() <= 0x19 ) + { + pItem->sendTooltip( this ); + } + } } } |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 12:19:21
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5190 Modified Files: ChangeLog walking.cpp Log Message: Fixes Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.153 retrieving revision 1.154 diff -C2 -d -r1.153 -r1.154 *** walking.cpp 3 Oct 2004 13:51:39 -0000 1.153 --- walking.cpp 10 Oct 2004 12:19:09 -0000 1.154 *************** *** 624,628 **** // If we are now out of range, remove from view (just to be sure) ! if (pChar->dist( otherplayer ) > otherplayer->visualRange()) { otherplayer->socket()->removeObject(pChar); } --- 624,628 ---- // If we are now out of range, remove from view (just to be sure) ! if (pChar->dist( otherplayer ) >= otherplayer->visualRange()) { otherplayer->socket()->removeObject(pChar); } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** ChangeLog 9 Oct 2004 14:32:21 -0000 1.102 --- ChangeLog 10 Oct 2004 12:19:09 -0000 1.103 *************** *** 37,40 **** --- 37,42 ---- - Removed old page system from core. - onCreate is now called for players on character creation. + - Fixed sending the tooltips of equipment when using the go menu or teleportation. + - Fixed "lingering" characters at the border of the screen if they walk away. - Fixed bug #0000348 ( Guards should kill instantly ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 12:10:23
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3118/system Modified Files: pages.py Log Message: consistency fix Index: pages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/pages.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pages.py 10 Oct 2004 12:05:50 -0000 1.7 --- pages.py 10 Oct 2004 12:10:10 -0000 1.8 *************** *** 578,583 **** gump.addText( 55, 60 + offset, tr("Char: ") + char.name, 0x844 + 5 * pagetype ) gump.addText( 55, 80 + offset, tr("Account: ") + page.account, 0x844 + 5 * pagetype ) ! gump.addText( 275, 80 + offset, tr("Category: ") + page.category, 0x844 + 5 * pagetype ) ! gump.addText( 275, 60 + offset, tr("Time: ") + time.strftime(FORMAT_DATETIME, time.localtime(page.created)), 0x844 + 5 * pagetype ) else: gump.addText( 55, 60 + offset, tr("Char: ") + char.name, 2100 ) --- 578,583 ---- gump.addText( 55, 60 + offset, tr("Char: ") + char.name, 0x844 + 5 * pagetype ) gump.addText( 55, 80 + offset, tr("Account: ") + page.account, 0x844 + 5 * pagetype ) ! gump.addText( 300, 80 + offset, tr("Category: ") + page.category, 0x844 + 5 * pagetype ) ! gump.addText( 300, 60 + offset, tr("Time: ") + time.strftime(FORMAT_DATETIME, time.localtime(page.created)), 0x844 + 5 * pagetype ) else: gump.addText( 55, 60 + offset, tr("Char: ") + char.name, 2100 ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 12:06:57
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2249/webroot Modified Files: ChangeLog.wolfpack Log Message: removed weightbonus Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** ChangeLog.wolfpack 9 Oct 2004 05:13:18 -0000 1.143 --- ChangeLog.wolfpack 10 Oct 2004 12:06:21 -0000 1.144 *************** *** 56,59 **** --- 56,61 ---- - Rewrote the bandages script. - Added macro support for bowing and salutes. + - Removed the deprecated WEIGHTBONUS property. + - Fixed clientcrashs related to the page menu. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-10 12:06:01
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2128/system Modified Files: pages.py Log Message: page system fixes Index: pages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/pages.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pages.py 8 Oct 2004 11:05:53 -0000 1.6 --- pages.py 10 Oct 2004 12:05:50 -0000 1.7 *************** *** 1,3 **** --- 1,4 ---- + from wolfpack import tr import wolfpack from wolfpack.consts import * *************** *** 58,66 **** """ def type(self): ! if self.category == 'BUG': return 0 ! elif self.category == 'STUCK': return 1 ! elif self.category == 'GAMEPLAY': return 2 else: --- 59,67 ---- """ def type(self): ! if self.category == tr('BUG'): return 0 ! elif self.category == tr('STUCK'): return 1 ! elif self.category == tr('GAMEPLAY'): return 2 else: *************** *** 68,71 **** --- 69,83 ---- """ + Gets a short version of the message from this page. + """ + def getmessage(self): + parts = [] + for part in self.message: + if len(part) != 0: + parts.append(part) + return "\n".join(parts) + + + """ Build a string for the database. """ *************** *** 93,99 **** if not updated: ! result = "New %s page from '%s' on account '%s':" % (self.category, char.name, self.account) else: ! result = "Updated %s page from '%s' on account '%s':" % (self.category, char.name, self.account) return result --- 105,111 ---- if not updated: ! result = tr("New %s page from '%s' on account '%s':") % (self.category, char.name, self.account) else: ! result = tr("Updated %s page from '%s' on account '%s':") % (self.category, char.name, self.account) return result *************** *** 115,128 **** if page: page.assigned = None ! player.socket.sysmessage('You requeue your previous page.', 0x846) ! player.log(LOG_MESSAGE, "%s requeues gm page from %s (%s).\n" % (player.name, char.name, self.account)) ! player.log(LOG_MESSAGE, "%s assigns gm page from %s (%s) to himself.\n" % (player.name, char.name, self.account)) self.assigned = player.serial ! player.socket.sysmessage('You assign the gm page to yourself.', 0x846) assigned = self.assigned == player.serial if not assigned and self.assigned: ! player.socket.sysmessage('This page is already assigned to someone else.', 0x846) return --- 127,140 ---- if page: page.assigned = None ! player.socket.sysmessage(tr('You requeue your previous page.'), 0x846) ! player.log(LOG_MESSAGE, tr("%s requeues gm page from %s (%s).\n") % (player.name, char.name, self.account)) ! player.log(LOG_MESSAGE, tr("%s assigns gm page from %s (%s) to himself.\n") % (player.name, char.name, self.account)) self.assigned = player.serial ! player.socket.sysmessage(tr('You assign the gm page to yourself.'), 0x846) assigned = self.assigned == player.serial if not assigned and self.assigned: ! player.socket.sysmessage(tr('This page is already assigned to someone else.'), 0x846) return *************** *** 136,158 **** # Gump Header gump.addGump( 165, 18, 0xFA2 ) ! gump.addText( 200, 20, "Page Menu", 0x530 ) ! gump.addText( 150, 400, "Category: %s" % self.category, 0x844 + 5 * self.type() ); gump.startPage(1) hue = 0x834 ! gump.addText( 50, 60, "Char name:", hue ) gump.addText( 200, 60, char.name, hue ) ! gump.addText( 50, 80, "Account name:", hue ) gump.addText( 200, 80, self.account, hue ) ! gump.addText( 50, 100, "Char position:", hue ) gump.addText( 200, 100, str(char.pos), hue ) ! gump.addText( 50, 120, "Page sent from:", hue ) gump.addText( 200, 120, str(self.pos), hue ) ! gump.addText( 50, 140, "Date/time:", hue ) gump.addText( 200, 140, time.strftime(FORMAT_DATETIME, time.localtime(self.created)), hue ) ! gump.addText( 50, 160, "Message:", hue ) html = u"<body text=\"#0000FF\" leftmargin=\"0\" topmargin=\"0\" marginwidth=\"0\" marginheight=\"0\">%s</body>" % u"<br>".join(self.message) gump.addResizeGump( 45, 180, 0xBB8, 345, 84 ) --- 148,170 ---- # Gump Header gump.addGump( 165, 18, 0xFA2 ) ! gump.addText( 200, 20, tr("Page Menu"), 0x530 ) ! gump.addText( 150, 400, tr("Category: %s") % self.category, 0x844 + 5 * self.type() ); gump.startPage(1) hue = 0x834 ! gump.addText( 50, 60, tr("Char name:"), hue ) gump.addText( 200, 60, char.name, hue ) ! gump.addText( 50, 80, tr("Account name:"), hue ) gump.addText( 200, 80, self.account, hue ) ! gump.addText( 50, 100, tr("Char position:"), hue ) gump.addText( 200, 100, str(char.pos), hue ) ! gump.addText( 50, 120, tr("Page sent from:"), hue ) gump.addText( 200, 120, str(self.pos), hue ) ! gump.addText( 50, 140, tr("Date/time:"), hue ) gump.addText( 200, 140, time.strftime(FORMAT_DATETIME, time.localtime(self.created)), hue ) ! gump.addText( 50, 160, tr("Message:"), hue ) html = u"<body text=\"#0000FF\" leftmargin=\"0\" topmargin=\"0\" marginwidth=\"0\" marginheight=\"0\">%s</body>" % u"<br>".join(self.message) gump.addResizeGump( 45, 180, 0xBB8, 345, 84 ) *************** *** 161,185 **** # Commands gump.addButton( 20, 280, 0xFA5, 0xFA7, 1 ) ! gump.addText( 55, 280, "Go to char position", 0x834 ) gump.addButton( 20, 300, 0xFA5, 0xFA71, 2 ) ! gump.addText( 55, 300, "Bring char", 0x834 ) gump.addButton( 20, 320, 0xFA5, 0xFA7, 3 ) ! gump.addText( 55, 320, "Go to page position", 0x834 ) gump.addButton( 20, 360, 0xFBD, 0xFBF, 4 ) if char.socket: ! gump.addText( 55, 360, "Send message:", 0x834 ) ! gump.addInputField( 200, 360, 190, 16, 0x834, 1, "<msg>" ) gump.addButton( 220, 280, 0xFAB, 0xFAD, 5 ) ! gump.addText( 255, 280, "Show socket info gump", 0x834 ) gump.addButton( 220, 300, 0xFA5, 0xFA7, 6 ) ! gump.addText( 255, 300, "Requeue page", 0x834 ) gump.addButton( 220, 320, 0xFA5, 0xFA7, 7 ) ! gump.addText( 255, 320, "Delete page", 0x834 ) # X button ! gump.addText( 70, 400, "Close", 0x834 ) gump.addButton( 30, 400, 0xFB1, 0xFB3, 0 ) --- 173,197 ---- # Commands gump.addButton( 20, 280, 0xFA5, 0xFA7, 1 ) ! gump.addText( 55, 280, tr("Go to char position"), 0x834 ) gump.addButton( 20, 300, 0xFA5, 0xFA71, 2 ) ! gump.addText( 55, 300, tr("Bring char"), 0x834 ) gump.addButton( 20, 320, 0xFA5, 0xFA7, 3 ) ! gump.addText( 55, 320, tr("Go to page position"), 0x834 ) gump.addButton( 20, 360, 0xFBD, 0xFBF, 4 ) if char.socket: ! gump.addText( 55, 360, tr("Send message:"), 0x834 ) ! gump.addInputField( 200, 360, 190, 16, 0x834, 1, tr("<msg>") ) gump.addButton( 220, 280, 0xFAB, 0xFAD, 5 ) ! gump.addText( 255, 280, tr("Show socket info gump"), 0x834 ) gump.addButton( 220, 300, 0xFA5, 0xFA7, 6 ) ! gump.addText( 255, 300, tr("Requeue page"), 0x834 ) gump.addButton( 220, 320, 0xFA5, 0xFA7, 7 ) ! gump.addText( 255, 320, tr("Delete page"), 0x834 ) # X button ! gump.addText( 70, 400, tr("Close"), 0x834 ) gump.addButton( 30, 400, 0xFB1, 0xFB3, 0 ) *************** *** 225,233 **** elif response.button == 4: if char.socket: ! char.socket.sysmessage('A message from %s: %s' % (player.name, response.text[1]), 0x846) ! player.socket.sysmessage('The message has been sent.', 0x846) else: ! player.socket.sysmessage('This player is currently offline. The message has not been sent.', 0x846) ! player.log(LOG_MESSAGE, "%s sends player %s (%s) a message: %s\n" % (player.name, char.name, self.account, response.text[1])) # Show socket info gump --- 237,245 ---- elif response.button == 4: if char.socket: ! char.socket.sysmessage(tr('A message from %s: %s') % (player.name, response.text[1]), 0x846) ! player.socket.sysmessage(tr('The message has been sent.'), 0x846) else: ! player.socket.sysmessage(tr('This player is currently offline. The message has not been sent.'), 0x846) ! player.log(LOG_MESSAGE, tr("%s sends player %s (%s) a message: %s\n") % (player.name, char.name, self.account, response.text[1])) # Show socket info gump *************** *** 236,246 **** commands.who.details(player, char) else: ! player.socket.sysmessage('This player is currently offline.', 0x846) # Requeue page elif response.button == 6: self.assigned = None ! player.socket.sysmessage('You requeue the page.', 0x846) ! player.log(LOG_MESSAGE, "%s requeues gm page from %s (%s).\n" % (player.name, char.name, self.account)) # Delete page --- 248,259 ---- commands.who.details(player, char) else: ! player.socket.sysmessage(tr('This player is currently offline.'), 0x846) # Requeue page elif response.button == 6: self.assigned = None ! player.socket.sysmessage(tr('You requeue the page.'), 0x846) ! player.log(LOG_MESSAGE, tr("%s requeues gm page from %s (%s).\n") % (player.name, char.name, self.account)) ! pages_gump(player) # Delete page *************** *** 251,258 **** if char.socket: ! char.socket.sysmessage('Your gm page has been deleted.', 0x846) ! player.socket.sysmessage('You remove the page.', 0x846) ! player.log(LOG_MESSAGE, "%s deletes gm page from %s (%s).\n" % (player.name, char.name, self.account)) # --- 264,272 ---- if char.socket: ! char.socket.sysmessage(tr('Your gm page has been deleted.'), 0x846) ! player.socket.sysmessage(tr('You remove the page.'), 0x846) ! player.log(LOG_MESSAGE, tr("%s deletes gm page from %s (%s).\n") % (player.name, char.name, self.account)) ! pages_gump(player) # *************** *** 346,352 **** if char: if updated: ! char.log(LOG_MESSAGE, "%s (%s) updates his gm page [%s]:\n%s\n" % (char.name, page.account, page.category, "\n".join(page.message))) else: ! char.log(LOG_MESSAGE, "%s (%s) makes a gm page [%s]:\n%s\n" % (char.name, page.account, page.category, "\n".join(page.message))) notification = page.notification(updated) --- 360,366 ---- if char: if updated: ! char.log(LOG_MESSAGE, tr("%s (%s) updates his gm page [%s]:\n%s\n") % (char.name, page.account, page.category, page.getmessage())) else: ! char.log(LOG_MESSAGE, tr("%s (%s) makes a gm page [%s]:\n%s\n") % (char.name, page.account, page.category, page.getmessage())) notification = page.notification(updated) *************** *** 389,398 **** if page and 5 in response.switches: pages.remove(page) ! char.socket.sysmessage('Your page has been removed.', 0x846) ! char.log(LOG_MESSAGE, "%s (%s) deletes his gm page.\n" % (char.name, page.account)) return if len(response.text[1]) + len(response.text[2]) + len(response.text[3]) + len(response.text[4]) == 0: ! char.socket.sysmessage('You have to enter a message for your page.', 0x846) onHelp(char) return --- 403,412 ---- if page and 5 in response.switches: pages.remove(page) ! char.socket.sysmessage(tr('Your page has been removed.'), 0x846) ! char.log(LOG_MESSAGE, tr("%s (%s) deletes his gm page.\n") % (char.name, page.account)) return if len(response.text[1]) + len(response.text[2]) + len(response.text[3]) + len(response.text[4]) == 0: ! char.socket.sysmessage(tr('You have to enter a message for your page.'), 0x846) onHelp(char) return *************** *** 408,418 **** page.created = created if 1 in response.switches: ! page.category = 'BUG' elif 2 in response.switches: ! page.category = 'STUCK' elif 3 in response.switches: ! page.category = 'GAMEPLAY' else: ! page.category = 'BUILD' pages.add(page, True) --- 422,432 ---- page.created = created if 1 in response.switches: ! page.category = tr('BUG') elif 2 in response.switches: ! page.category = tr('STUCK') elif 3 in response.switches: ! page.category = tr('GAMEPLAY') else: ! page.category = tr('BUILD') pages.add(page, True) *************** *** 438,444 **** gump.addGump( 182, 0, 0x589 ) # "Button" like gump gump.addGump( 193, 10, 0x15E9 ) # "Button" like gump ! gump.addText( 190, 90, "Help menu", 0x530 ) ! gump.addText( 50, 120, "Message:", 0x834 ) gump.addResizeGump( 45, 140, 0xBB8, 345, 84 ) --- 452,458 ---- gump.addGump( 182, 0, 0x589 ) # "Button" like gump gump.addGump( 193, 10, 0x15E9 ) # "Button" like gump ! gump.addText( 190, 90, tr("Help menu"), 0x530 ) ! gump.addText( 50, 120, tr("Message:"), 0x834 ) gump.addResizeGump( 45, 140, 0xBB8, 345, 84 ) *************** *** 459,480 **** gump.startGroup(1) ! gump.addText(50, 240, "Category:", 0x834) ! gump.addRadioButton( 50, 260, 0xD0, 0xD1, 1, category == 'BUG' ) ! gump.addText( 80, 260, 'BUG', 0x834 ) ! gump.addRadioButton( 250, 260, 0xD0, 0xD1, 2, category == 'STUCK' ) ! gump.addText( 280, 260, 'STUCK', 0x834 ) ! gump.addRadioButton( 50, 280, 0xD0, 0xD1, 3, category == 'GAMEPLAY' ) ! gump.addText( 80, 280, 'GAMEPLAY', 0x834 ) ! gump.addRadioButton( 250, 280, 0xD0, 0xD1, 4, category == 'BUILD' ) ! gump.addText( 280, 280, 'BUILD', 0x834 ) # Delete page if it exists if page: gump.addCheckbox( 50, 320, 0xd2, 0xd3, 5, 0 ) ! gump.addText( 80, 320, 'Delete page', 0x834 ) gump.addButton( 50, 320 + 40, 0xF9, 0xF8, 1 ) # OK button --- 473,494 ---- gump.startGroup(1) ! gump.addText(50, 240, tr("Category:"), 0x834) ! gump.addRadioButton( 50, 260, 0xD0, 0xD1, 1, category == tr('BUG') ) ! gump.addText( 80, 260, tr('BUG'), 0x834 ) ! gump.addRadioButton( 250, 260, 0xD0, 0xD1, 2, category == tr('STUCK') ) ! gump.addText( 280, 260, tr('STUCK'), 0x834 ) ! gump.addRadioButton( 50, 280, 0xD0, 0xD1, 3, category == tr('GAMEPLAY') ) ! gump.addText( 80, 280, tr('GAMEPLAY'), 0x834 ) ! gump.addRadioButton( 250, 280, 0xD0, 0xD1, 4, category == tr('BUILD') ) ! gump.addText( 280, 280, tr('BUILD'), 0x834 ) # Delete page if it exists if page: gump.addCheckbox( 50, 320, 0xd2, 0xd3, 5, 0 ) ! gump.addText( 80, 320, tr('Delete page'), 0x834 ) gump.addButton( 50, 320 + 40, 0xF9, 0xF8, 1 ) # OK button *************** *** 497,504 **** if response.button == 0: return # Show a detail gump for a given page. global pages ! id = response.button - 1 if id < 0 or id >= len(pages.pages): --- 511,526 ---- if response.button == 0: return + + page = arguments[0] + + if response.button == 1: + pages_gump(player, page - 1) # Previous page + + elif response.button == 2: + pages_gump(player, page + 1) # Next page # Show a detail gump for a given page. global pages ! id = response.button - 3 if id < 0 or id >= len(pages.pages): *************** *** 511,521 **** # Show a pages gump to the player. # ! def pages_gump(player): global pages pages.check() # Make sure all pages are valid gump = wolfpack.gumps.cGump() ! gump.startPage(0) # Gump Background --- 533,552 ---- # Show a pages gump to the player. # ! def pages_gump(player, i=0): ! player.socket.closegump(0x87bde41a) ! global pages pages.check() # Make sure all pages are valid + + count = (pages.count() + 4) / 5 + if count < 1: + count = 1 + + if i >= count or i < 0: + i = 0 gump = wolfpack.gumps.cGump() ! #gump.startPage(0) # Gump Background *************** *** 525,572 **** # Gump Header gump.addGump( 180, 18, 0xFA8 ) ! gump.addText( 215, 20, "Page Queue", 0x530 ) # Close Button ! gump.addText( 70, 320, "Close", 0x834 ) gump.addButton( 30, 320, 0xFB1, 0xFB3, 0 ) ! count = (pages.count() + 9) / 10 # Iterate this loop once for every page ! for i in range(0, count): ! gump.startPage(i + 1) ! offset = 0 ! ! for j in range(i * 10, i * 10 + 10): ! if j < pages.count(): ! page = pages.pages[j] ! pagetype = page.type() ! if not page.assigned: ! gump.addButton( 20, 60 + offset, 0xFA5, 0xFA7, 1 + j ) ! char = wolfpack.findchar(page.serial) ! if char.socket: ! gump.addText( 55, 60 + offset, "%s (%s)" % (char.name, page.account), 0x844 + 5 * pagetype ) ! gump.addText( 200, 60 + offset, page.category, 0x844 + 5 * pagetype ) ! gump.addText( 280, 60 + offset, time.strftime(FORMAT_DATETIME, time.localtime(page.created)), 0x844 + 5 * pagetype ) ! else: ! gump.addText( 55, 60 + offset, "%s (%s)" % (char.name, page.account), 2100 ) ! gump.addText( 200, 60 + offset, page.category, 2100 ) ! gump.addText( 280, 60 + offset, time.strftime(FORMAT_DATETIME, time.localtime(page.created)), 21000 ) ! ! offset += 20 ! gump.addText( 280, 320, "Page %u of %u" % ( i + 1, count ), 0x834 ) ! # Are we on the first page ! if i > 0: ! gump.addPageButton( 240, 320, 0x0FC, 0x0FC, i - 1 ) ! # Would the next page be valid? ! if i + 1 < count: ! gump.addPageButton( 260, 320, 0x0FA, 0x0FA, i + 2 ) gump.setCallback("system.pages.pages_gump_response") gump.send(player.socket) --- 556,604 ---- # Gump Header gump.addGump( 180, 18, 0xFA8 ) ! gump.addText( 215, 20, tr("Page Queue"), 0x530 ) # Close Button ! gump.addText( 70, 320, tr("Close"), 0x834 ) gump.addButton( 30, 320, 0xFB1, 0xFB3, 0 ) ! display = pages.pages[i * 5:][:5] # 5 pages ! pageid = i * 5 ! offset = 0 # Iterate this loop once for every page ! for page in display: ! pagetype = page.type() ! if not page.assigned: ! gump.addButton( 20, 70 + offset, 0xFA5, 0xFA7, 3 + pageid ) ! char = wolfpack.findchar(page.serial) ! if char.socket: ! gump.addText( 55, 60 + offset, tr("Char: ") + char.name, 0x844 + 5 * pagetype ) ! gump.addText( 55, 80 + offset, tr("Account: ") + page.account, 0x844 + 5 * pagetype ) ! gump.addText( 275, 80 + offset, tr("Category: ") + page.category, 0x844 + 5 * pagetype ) ! gump.addText( 275, 60 + offset, tr("Time: ") + time.strftime(FORMAT_DATETIME, time.localtime(page.created)), 0x844 + 5 * pagetype ) ! else: ! gump.addText( 55, 60 + offset, tr("Char: ") + char.name, 2100 ) ! gump.addText( 55, 80 + offset, tr("Account: ") + page.account, 2100 ) ! gump.addText( 300, 80 + offset, tr("Category: ") + page.category, 2100 ) ! gump.addText( 300, 60 + offset, tr("Time: ") + time.strftime(FORMAT_DATETIME, time.localtime(page.created)), 2100 ) ! ! offset += 50 ! pageid += 1 ! gump.addText( 280, 320, tr("Page %u of %u") % ( i + 1, count ), 0x834 ) ! # Are we on the first page ! if i > 0: ! gump.addButton( 240, 320, 0x0FA, 0x0FA, 1 ) ! # Would the next page be valid? ! if i + 1 < count: ! gump.addButton( 260, 320, 0x0FC, 0x0FC, 2 ) + gump.setArgs([i]) + gump.setType(0x87bde41a) gump.setCallback("system.pages.pages_gump_response") gump.send(player.socket) *************** *** 592,595 **** --- 624,628 ---- def onLoad(): global pages + global page pages = Pages() wolfpack.registerglobal(EVENT_HELP, "system.pages") *************** *** 598,602 **** if not wolfpack.isstarting(): pages.load() ! # # Server startup complete --- 631,635 ---- if not wolfpack.isstarting(): pages.load() ! # # Server startup complete |
|
From: Sebastian H. <dar...@us...> - 2004-10-09 23:31:14
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28767/wolfpack Modified Files: armorinfo.py consts.py properties.py weaponinfo.py Log Message: removed WEIGHTBONUS Index: armorinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/armorinfo.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** armorinfo.py 8 Sep 2004 04:06:39 -0000 1.10 --- armorinfo.py 9 Oct 2004 23:31:03 -0000 1.11 *************** *** 7,11 **** LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \ SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \ ! DURABILITYBONUS, WEIGHTBONUS, \ MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ --- 7,11 ---- LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \ SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \ ! DURABILITYBONUS, \ MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ Index: weaponinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/weaponinfo.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** weaponinfo.py 7 Oct 2004 22:56:12 -0000 1.10 --- weaponinfo.py 9 Oct 2004 23:31:03 -0000 1.11 *************** *** 7,11 **** LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \ SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \ ! DURABILITYBONUS, WEIGHTBONUS, \ MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ --- 7,11 ---- LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \ SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \ ! DURABILITYBONUS, \ MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** consts.py 7 Oct 2004 22:56:12 -0000 1.86 --- consts.py 9 Oct 2004 23:31:03 -0000 1.87 *************** *** 66,70 **** REFLECTPHYSICAL = 34 DURABILITYBONUS = 35 ! WEIGHTBONUS = 36 SPELLCHANNELING = 37 CASTRECOVERYBONUS = 38 --- 66,70 ---- REFLECTPHYSICAL = 34 DURABILITYBONUS = 35 ! #WEIGHTBONUS = 36 # VACANT SPELLCHANNELING = 37 CASTRECOVERYBONUS = 38 Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** properties.py 8 Oct 2004 18:51:53 -0000 1.19 --- properties.py 9 Oct 2004 23:31:03 -0000 1.20 *************** *** 104,108 **** REFLECTPHYSICAL: ['reflectphysical', 0, 1], DURABILITYBONUS: ['durabilitybonus', 0, 0], - WEIGHTBONUS: ['weightbonus', 0, 0], SLAYER: ['slayer', '', 0], } --- 104,107 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-10-09 23:31:14
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28767/skills Modified Files: blacksmithing.py tinkering.py Log Message: removed WEIGHTBONUS Index: tinkering.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/tinkering.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tinkering.py 16 May 2004 22:04:23 -0000 1.10 --- tinkering.py 9 Oct 2004 23:31:02 -0000 1.11 *************** *** 128,136 **** item.health = item.maxhealth - weightbonus = fromitem(item, WEIGHTBONUS) - if weightbonus != 0: - bonus = int(math.ceil(item.weight * (weightbonus / 100.0))) - item.weight = max(0, item.weight + bonus) - # Reduce the uses remain count checktool(player, wolfpack.finditem(arguments[0]), 1) --- 128,131 ---- Index: blacksmithing.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/blacksmithing.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** blacksmithing.py 8 Sep 2004 04:16:24 -0000 1.21 --- blacksmithing.py 9 Oct 2004 23:30:48 -0000 1.22 *************** *** 179,187 **** item.health = item.maxhealth - #weightbonus = fromitem(item, WEIGHTBONUS) - #if weightbonus != 0: - #bonus = int(math.ceil(item.weight * (weightbonus / 100.0))) - #item.weight = max(0, item.weight + bonus) - # Distribute another 6 points randomly between the resistances this armor already has if exceptional: --- 179,182 ---- |
|
From: Correa <thi...@us...> - 2004-10-09 14:32:41
|
Update of /cvsroot/wpdev/wolfpack/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12336/win Modified Files: config_win.cpp Log Message: Fixed bug #0000348 ( Guards should kill instantly ) Index: config_win.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/win/config_win.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config_win.cpp 2 Sep 2004 23:29:51 -0000 1.7 --- config_win.cpp 9 Oct 2004 14:32:23 -0000 1.8 *************** *** 102,106 **** if ( !thePath.exists() || thePath.entryList( "*.mul" ).isEmpty() ) { ! Console::instance()->log( LOG_WARNING, QString( "UO Mul files not found at '%1', trying to locate...\n" ).arg( mulPath_ ) ); QString uoPath( getUOPath() ); if ( !uoPath.isEmpty() ) --- 102,106 ---- if ( !thePath.exists() || thePath.entryList( "*.mul" ).isEmpty() ) { ! Console::instance()->log( LOG_WARNING, tr( "UO Mul files not found at '%1', trying to locate...\n" ).arg( mulPath_ ) ); QString uoPath( getUOPath() ); if ( !uoPath.isEmpty() ) *************** *** 111,115 **** } else ! Console::instance()->log( LOG_ERROR, "Unable to find *.mul files path. Please check wolfpack.xml, section \"General\", key \"MulPath\"" ); } return mulPath_; --- 111,115 ---- } else ! Console::instance()->log( LOG_ERROR, tr("Unable to find *.mul files path. Please check wolfpack.xml, section \"General\", key \"MulPath\"") ); } return mulPath_; |
|
From: Correa <thi...@us...> - 2004-10-09 14:32:41
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12336/python Modified Files: engine.cpp gump.h Log Message: Fixed bug #0000348 ( Guards should kill instantly ) Index: engine.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/engine.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** engine.cpp 19 Aug 2004 01:59:16 -0000 1.35 --- engine.cpp 9 Oct 2004 14:32:22 -0000 1.36 *************** *** 142,146 **** catch ( ... ) { ! Console::instance()->send( "Failed to initialize the python extension modules\n" ); } } --- 142,146 ---- catch ( ... ) { ! Console::instance()->send( tr("Failed to initialize the python extension modules\n") ); } } *************** *** 192,200 **** if ( !moduleName.isNull() ) { ! Console::instance()->log( LOG_ERROR, QString( "An error occured while compiling \"%1\": %2" ).arg( moduleName ).arg( PyString_AsString( exceptionName ) ) ); } else { ! Console::instance()->log( LOG_ERROR, QString( "An error occured: %1" ).arg( PyString_AsString( exceptionName ) ) ); } } --- 192,200 ---- if ( !moduleName.isNull() ) { ! Console::instance()->log( LOG_ERROR, tr( "An error occured while compiling \"%1\": %2" ).arg( moduleName ).arg( PyString_AsString( exceptionName ) ) ); } else { ! Console::instance()->log( LOG_ERROR, tr( "An error occured: %1" ).arg( PyString_AsString( exceptionName ) ) ); } } *************** *** 203,211 **** if ( !moduleName.isNull() ) { ! Console::instance()->log( LOG_ERROR, QString( "An error occured in \"%1\": %2" ).arg( moduleName ).arg( PyString_AsString( exceptionName ) ) ); } else { ! Console::instance()->log( LOG_ERROR, QString( "An error occured: %1" ).arg( PyString_AsString( exceptionName ) ) ); } --- 203,211 ---- if ( !moduleName.isNull() ) { ! Console::instance()->log( LOG_ERROR, tr( "An error occured in \"%1\": %2" ).arg( moduleName ).arg( PyString_AsString( exceptionName ) ) ); } else { ! Console::instance()->log( LOG_ERROR, tr( "An error occured: %1" ).arg( PyString_AsString( exceptionName ) ) ); } *************** *** 261,265 **** // Print it ! Console::instance()->log( LOG_PYTHON, QString( "File '%1',%2 in '%3'" ).arg( filename ).arg( line ).arg( function ), false ); // Switch Frames --- 261,265 ---- // Print it ! Console::instance()->log( LOG_PYTHON, tr( "File '%1',%2 in '%3'" ).arg( filename ).arg( line ).arg( function ), false ); // Switch Frames Index: gump.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/gump.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** gump.h 25 Sep 2004 02:03:22 -0000 1.28 --- gump.h 9 Oct 2004 14:32:22 -0000 1.29 *************** *** 179,183 **** else { ! Console::instance()->log( LOG_ERROR, QString( "Couldn't find code module %1 for a gump callback." ).arg( sModule ) ); } } --- 179,183 ---- else { ! Console::instance()->log( LOG_ERROR, tr( "Couldn't find code module %1 for a gump callback." ).arg( sModule ) ); } } |
