wpdev-commits Mailing List for Wolfpack Emu (Page 69)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Richard M. <dr...@us...> - 2004-08-09 18:51:46
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31514 Modified Files: circle5.py circle8.py Log Message: Summons away Index: circle8.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle8.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** circle8.py 2 Aug 2004 22:25:59 -0000 1.11 --- circle8.py 9 Aug 2004 18:51:38 -0000 1.12 *************** *** 109,118 **** self.reagents = {REAGENT_BLOODMOSS: 1, REAGENT_MANDRAKE: 1, REAGENT_SPIDERSILK: 1} self.casttime = 6000 - self.controlslots = 3 def target(self, char, mode, targettype, target, args, item): char.turnto(target) ! if char.player and char.controlslots + self.controlslots > 5: char.socket.clilocmessage(1049645) return --- 109,118 ---- self.reagents = {REAGENT_BLOODMOSS: 1, REAGENT_MANDRAKE: 1, REAGENT_SPIDERSILK: 1} self.casttime = 6000 def target(self, char, mode, targettype, target, args, item): char.turnto(target) ! # Lowest controlslots we see is 2, Earth Elemental ! if char.player and char.controlslots + 2 > 5: char.socket.clilocmessage(1049645) return *************** *** 122,131 **** creature = wolfpack.addnpc(self.elementid, target) ! creature.controlslots = self.controlslots ! creature.addevent('speech.pets') ! creature.owner = char ! creature.summontime = wolfpack.time.currenttime() + 120000 ! creature.summoned = 1 ! creature.soundeffect(0x217) class SummonAirElement(SummonElementBase): --- 122,135 ---- creature = wolfpack.addnpc(self.elementid, target) ! # If the creature is out of our control, delete it. ! if char.player and char.controlslots + creature.controlslots > 5: ! creature.delete() ! char.socket.clilocmessage(1049645) ! else: ! creature.addevent('speech.pets') ! creature.owner = char ! creature.summontime = wolfpack.time.currenttime() + 120000 ! creature.summoned = 1 ! creature.soundeffect(0x217) class SummonAirElement(SummonElementBase): *************** *** 165,167 **** self.elementid = 'summoned_daemon' self.casttime = 6000 - self.controlslots = 5 --- 169,170 ---- Index: circle5.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** circle5.py 9 Aug 2004 18:23:21 -0000 1.13 --- circle5.py 9 Aug 2004 18:51:38 -0000 1.14 *************** *** 349,352 **** --- 349,353 ---- creature = wolfpack.addnpc(npcid, target) + # If the creature is out of our control, delete it. if creature.controlslots + char.controlslots > 5: creature.delete() |
|
From: Richard M. <dr...@us...> - 2004-08-09 18:46:00
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30208/animals/mounts Modified Files: ethereals.xml fire_steed.xml giant_beetle.xml horse.xml kirin.xml nightmare.xml ostards.xml ridable_llama.xml ridgeback.xml seahorse.xml swamp_dragon.xml unicorn.xml war_horses.xml Log Message: Controlslots Index: ostards.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/ostards.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ostards.xml 6 Jun 2004 01:38:43 -0000 1.10 --- ostards.xml 9 Aug 2004 18:45:41 -0000 1.11 *************** *** 35,38 **** --- 35,39 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>291</totame> <food>5</food> *************** *** 67,70 **** --- 68,72 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>291</totame> <food>5</food> *************** *** 101,104 **** --- 103,107 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>2</controlslots> <totame>771</totame> <food>1</food> Index: fire_steed.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/fire_steed.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** fire_steed.xml 7 Jun 2004 21:37:17 -0000 1.10 --- fire_steed.xml 9 Aug 2004 18:45:41 -0000 1.11 *************** *** 38,41 **** --- 38,42 ---- <!-- Misc. --> <!-- Missing: Sulfurous Ash --> + <controlslots>2</controlslots> <lootpacks>gems</lootpacks> <totame>1060</totame> Index: ridgeback.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/ridgeback.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ridgeback.xml 6 Jun 2004 01:38:43 -0000 1.8 --- ridgeback.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>831</totame> <food>5</food> *************** *** 73,76 **** --- 74,78 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>831</totame> <food>5</food> Index: unicorn.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/unicorn.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** unicorn.xml 7 Jun 2004 21:37:19 -0000 1.9 --- unicorn.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 42,45 **** --- 42,46 ---- <!-- Misc. --> <!-- Missing: 1-7CS, LNS, Potion --> + <controlslots>2</controlslots> <lootpacks>lootpack_rich</lootpacks> <totame>951</totame> Index: giant_beetle.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/giant_beetle.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** giant_beetle.xml 6 Jun 2004 01:38:43 -0000 1.9 --- giant_beetle.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 36,39 **** --- 36,40 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>3</controlslots> <totame>291</totame> <food>1</food> Index: swamp_dragon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/swamp_dragon.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** swamp_dragon.xml 6 Jun 2004 01:38:43 -0000 1.11 --- swamp_dragon.xml 9 Aug 2004 18:45:41 -0000 1.12 *************** *** 38,41 **** --- 38,42 ---- <anatomy><random min="451" max="550" /></anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>939</totame> <food>1</food> Index: ethereals.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/ethereals.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ethereals.xml 2 Jun 2004 21:29:44 -0000 1.7 --- ethereals.xml 9 Aug 2004 18:45:41 -0000 1.8 *************** *** 38,41 **** --- 38,42 ---- <magicresistance>1000</magicresistance> <!-- Misc. --> + <controlslots>1</controlslots> <food>0</food> <totame>0</totame> Index: ridable_llama.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/ridable_llama.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ridable_llama.xml 6 Jun 2004 01:38:43 -0000 1.8 --- ridable_llama.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>291</totame> <food>5</food> Index: seahorse.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/seahorse.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** seahorse.xml 6 Jun 2004 01:38:43 -0000 1.8 --- seahorse.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>2</controlslots> <totame>291</totame> <food>2</food> Index: kirin.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/kirin.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kirin.xml 7 Jun 2004 21:37:19 -0000 1.8 --- kirin.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 42,45 **** --- 42,46 ---- <!-- Misc. --> <!-- Missing: 1-7CS, LNS, Potion --> + <controlslots>2</controlslots> <lootpacks>lootpack_rich</lootpacks> <totame>951</totame> Index: war_horses.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/war_horses.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** war_horses.xml 2 Jun 2004 21:29:44 -0000 1.7 --- war_horses.xml 9 Aug 2004 18:45:41 -0000 1.8 *************** *** 33,36 **** --- 33,37 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>291</totame> <food>5</food> Index: horse.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/horse.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** horse.xml 15 Jul 2004 01:52:48 -0000 1.9 --- horse.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 34,37 **** --- 34,38 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>291</totame> <food>5</food> Index: nightmare.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/nightmare.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** nightmare.xml 7 Jun 2004 21:37:19 -0000 1.10 --- nightmare.xml 9 Aug 2004 18:45:41 -0000 1.11 *************** *** 40,43 **** --- 40,44 ---- <!-- Misc. --> <!-- Missing: 1-7CS, LNS, Potion, 3 Sulfurous Ash --> + <controlslots>2</controlslots> <lootpacks>lootpack_rich</lootpacks> <totame>951</totame> |
|
From: Richard M. <dr...@us...> - 2004-08-09 18:46:00
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30208/monsters/insect Modified Files: frost_spider.xml giant_spider.xml scorpion.xml Log Message: Controlslots Index: giant_spider.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/giant_spider.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** giant_spider.xml 7 Jun 2004 21:39:56 -0000 1.9 --- giant_spider.xml 9 Aug 2004 18:45:42 -0000 1.10 *************** *** 34,37 **** --- 34,38 ---- <desc>Nearly the size of a man, the great spiders are nearly as clever as man as well. I do not know what may pass among them as language, but they lay their traps and defenses with great cunning. As well they might, for the silk of their webs is necessary for the casting of certain spells, and despite their formidable nature, they are earnestly sought for their silk.</desc> <!-- Missing: 5 Spiders Silk --> + <controlslots>1</controlslots> <lootpacks>lootpack_poor</lootpacks> <carve>carve_spider_giant</carve> Index: scorpion.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/scorpion.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** scorpion.xml 14 Jul 2004 21:55:30 -0000 1.9 --- scorpion.xml 9 Aug 2004 18:45:42 -0000 1.10 *************** *** 37,40 **** --- 37,41 ---- <!-- Misc. --> <desc>These are the most horrid of all the giant vermin, for the venom in their great stingers is potent enough to slay a strong man with a single strike. Gold is often found in their nests, but this seems to be more due to the scavenger's love for shiny objects than to any sentience.</desc> + <controlslots>1</controlslots> <carve>carve_scorpion_gaint</carve> <!-- Missing: Lesser Poison Potion --> Index: frost_spider.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/insect/frost_spider.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** frost_spider.xml 7 Jun 2004 21:39:56 -0000 1.8 --- frost_spider.xml 9 Aug 2004 18:45:42 -0000 1.9 *************** *** 36,39 **** --- 36,40 ---- <tag name="res_poison" value="20,30" type="int" /> <!-- Misc. --> + <controlslots>1</controlslots> <desc>The giant spider of the tundra hunts by burrowing into the snow and waiting to trap passers by. Unfortunate creatures caught by the spider are often paralyzed by its venom. The spider then envelops the victimin a cocoon of silk. Victims are then used over time to feed the spider. When the victim is used up, only the desiccated husk and their possessions remain.</desc> <!-- Missing: 7 Spider Silk --> |
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30208/animals/land Modified Files: alligator.xml black_bear.xml boar.xml brown_bear.xml bull.xml bullfrog.xml cat.xml cougar.xml cow.xml dire_wolf.xml dog.xml goat.xml gorilla.xml great_hart.xml grey_wolf.xml grizzly_bear.xml hind.xml jack_rabbit.xml llama.xml pack_horse.xml pack_llama.xml panther.xml polar_bear.xml rabbit.xml rat.xml sheep.xml snake.xml snow_leopard.xml timber_wolf.xml walrus.xml white_wolf.xml Log Message: Controlslots Index: black_bear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/black_bear.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** black_bear.xml 6 Jun 2004 01:38:42 -0000 1.9 --- black_bear.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 36,39 **** --- 36,40 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>351</totame> <food>1</food> Index: snake.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/snake.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** snake.xml 6 Jun 2004 01:38:43 -0000 1.8 --- snake.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>591</totame> <food>0</food> Index: timber_wolf.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/timber_wolf.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** timber_wolf.xml 6 Jun 2004 01:38:43 -0000 1.8 --- timber_wolf.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>231</totame> <food>1</food> Index: rabbit.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/rabbit.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** rabbit.xml 6 Jun 2004 01:38:43 -0000 1.8 --- rabbit.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 35,38 **** --- 35,39 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>0</totame> <food>0</food> Index: alligator.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/alligator.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** alligator.xml 6 Jun 2004 01:38:42 -0000 1.9 --- alligator.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 37,40 **** --- 37,41 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>471</totame> <food>0</food> Index: hind.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/hind.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** hind.xml 6 Jun 2004 01:38:42 -0000 1.8 --- hind.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 35,38 **** --- 35,39 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>231</totame> <food>6</food> Index: rat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/rat.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** rat.xml 7 Jun 2004 21:37:06 -0000 1.9 --- rat.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 37,40 **** --- 37,41 ---- <!-- Misc. --> <!-- Missing: --> + <controlslots>1</controlslots> <lootpacks>lootpack_poor</lootpacks> <totame>0</totame> Index: gorilla.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/gorilla.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gorilla.xml 6 Jun 2004 01:38:42 -0000 1.9 --- gorilla.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 36,39 **** --- 36,40 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>0</totame> <food>5</food> Index: bullfrog.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/bullfrog.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** bullfrog.xml 6 Jun 2004 01:38:42 -0000 1.9 --- bullfrog.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 35,38 **** --- 35,39 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>231</totame> <food>0</food> Index: dire_wolf.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/dire_wolf.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** dire_wolf.xml 6 Jun 2004 01:38:42 -0000 1.9 --- dire_wolf.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>2</controlslots> <totame>831</totame> <food>1</food> Index: cougar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/cougar.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** cougar.xml 6 Jun 2004 01:38:42 -0000 1.9 --- cougar.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 37,40 **** --- 37,41 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>2</controlslots> <totame>411</totame> <food>5</food> Index: polar_bear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/polar_bear.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** polar_bear.xml 6 Jun 2004 01:38:43 -0000 1.8 --- polar_bear.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 37,40 **** --- 37,41 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>351</totame> <food>2</food> Index: dog.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/dog.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** dog.xml 6 Jun 2004 01:38:42 -0000 1.9 --- dog.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 35,38 **** --- 35,39 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>0</totame> <food>0</food> Index: cat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/cat.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** cat.xml 6 Jun 2004 01:38:42 -0000 1.9 --- cat.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 35,38 **** --- 35,39 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>0</totame> <food>0</food> Index: jack_rabbit.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/jack_rabbit.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** jack_rabbit.xml 6 Jun 2004 01:38:42 -0000 1.8 --- jack_rabbit.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 35,38 **** --- 35,39 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>0</totame> <food>5</food> Index: great_hart.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/great_hart.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** great_hart.xml 6 Jun 2004 01:38:42 -0000 1.9 --- great_hart.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 34,37 **** --- 34,38 ---- <magicresistance><random min="268" max="445" /></magicresistance> <!-- Misc. --> + <controlslots>1</controlslots> <totame>591</totame> <food>0</food> Index: snow_leopard.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/snow_leopard.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** snow_leopard.xml 6 Jun 2004 01:38:43 -0000 1.11 --- snow_leopard.xml 9 Aug 2004 18:45:41 -0000 1.12 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>531</totame> <food>1</food> Index: brown_bear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/brown_bear.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** brown_bear.xml 6 Jun 2004 01:38:42 -0000 1.9 --- brown_bear.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 36,39 **** --- 36,40 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>411</totame> <food>1</food> Index: grizzly_bear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/grizzly_bear.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** grizzly_bear.xml 6 Jun 2004 01:38:42 -0000 1.8 --- grizzly_bear.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 37,40 **** --- 37,41 ---- <anatomy>0</anatomy> <!-- MIsc. --> + <controlslots>1</controlslots> <totame>591</totame> <food>1</food> Index: grey_wolf.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/grey_wolf.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** grey_wolf.xml 6 Jun 2004 01:38:42 -0000 1.8 --- grey_wolf.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>531</totame> <food>1</food> Index: pack_llama.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/pack_llama.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pack_llama.xml 6 Jun 2004 01:38:43 -0000 1.8 --- pack_llama.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 39,42 **** --- 39,43 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>2</controlslots> <totame>291</totame> <food>3</food> Index: sheep.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/sheep.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** sheep.xml 7 Jul 2004 13:05:34 -0000 1.9 --- sheep.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 34,37 **** --- 34,38 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>111</totame> <food>5</food> Index: walrus.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/walrus.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** walrus.xml 6 Jun 2004 01:38:43 -0000 1.8 --- walrus.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>351</totame> <food>2</food> Index: bull.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/bull.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** bull.xml 6 Jun 2004 01:38:42 -0000 1.9 --- bull.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 35,38 **** --- 35,39 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>2</controlslots> <totame>711</totame> <food>6</food> Index: llama.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/llama.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** llama.xml 6 Jun 2004 01:38:42 -0000 1.8 --- llama.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 34,37 **** --- 34,38 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>351</totame> <food>5</food> Index: white_wolf.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/white_wolf.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** white_wolf.xml 6 Jun 2004 01:38:43 -0000 1.9 --- white_wolf.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 38,41 **** --- 38,42 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>651</totame> <food>1</food> Index: panther.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/panther.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** panther.xml 6 Jun 2004 01:38:43 -0000 1.8 --- panther.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 37,40 **** --- 37,41 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>531</totame> <food>1</food> Index: boar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/boar.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** boar.xml 6 Jun 2004 01:38:42 -0000 1.10 --- boar.xml 9 Aug 2004 18:45:41 -0000 1.11 *************** *** 37,40 **** --- 37,41 ---- <anatomy>0</anatomy> <!-- Misc --> + <controlslots>1</controlslots> <totame>291</totame> <food>5</food> *************** *** 68,71 **** --- 69,73 ---- <anatomy>0</anatomy> <!-- Misc --> + <controlslots>1</controlslots> <totame>291</totame> <food>5</food> Index: goat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/goat.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** goat.xml 6 Jun 2004 01:38:42 -0000 1.9 --- goat.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 34,37 **** --- 34,38 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>111</totame> <food>0</food> *************** *** 68,71 **** --- 69,73 ---- <tactics><random min="293" max="440" /></tactics> <magicresistance><random min="251" max="300" /></magicresistance> + <controlslots>1</controlslots> <totame>0</totame> <food>1</food> Index: pack_horse.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/pack_horse.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pack_horse.xml 6 Jun 2004 01:38:42 -0000 1.8 --- pack_horse.xml 9 Aug 2004 18:45:41 -0000 1.9 *************** *** 39,42 **** --- 39,43 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>2</controlslots> <totame>291</totame> <food>3</food> Index: cow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/land/cow.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** cow.xml 6 Jun 2004 01:38:42 -0000 1.9 --- cow.xml 9 Aug 2004 18:45:41 -0000 1.10 *************** *** 34,37 **** --- 34,38 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>1</controlslots> <totame>111</totame> <food>6</food> |
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30208/monsters/summoned Modified Files: air_elemental.xml blade_spirit.xml daemon.xml dark_wolf.xml death_adder.xml earth_elemental.xml energy_vortex.xml fire_elemental.xml hellsteed.xml horde_minion.xml mound_of_maggots.xml revenant.xml shadow_wisp.xml skeletal_steed.xml tinkered_golem.xml vampire_bat.xml water_elemental.xml Log Message: Controlslots Index: earth_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/earth_elemental.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** earth_elemental.xml 3 Jun 2004 19:09:17 -0000 1.1 --- earth_elemental.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>2</controlslots> <category>Summoned\Earth Elemental</category> </npc> Index: revenant.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/revenant.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** revenant.xml 3 Jun 2004 21:13:21 -0000 1.2 --- revenant.xml 9 Aug 2004 18:45:42 -0000 1.3 *************** *** 39,42 **** --- 39,43 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>3</controlslots> <category>Summoned\Revenant</category> </npc> Index: daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/daemon.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** daemon.xml 3 Jun 2004 19:09:17 -0000 1.1 --- daemon.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 39,42 **** --- 39,43 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>5</controlslots> <category>Summoned\Daemon</category> </npc> Index: hellsteed.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/hellsteed.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hellsteed.xml 3 Jun 2004 19:09:17 -0000 1.1 --- hellsteed.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- <karma>0</karma> <fame>0</fame> + <controlslots>3</controlslots> <category>Summoned\Hellsteed</category> </npc> Index: mound_of_maggots.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/mound_of_maggots.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mound_of_maggots.xml 3 Jun 2004 19:09:17 -0000 1.1 --- mound_of_maggots.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- <karma>0</karma> <fame>0</fame> + <controlslots>1</controlslots> <category>Summoned\Mound of Maggots</category> </npc> Index: horde_minion.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/horde_minion.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** horde_minion.xml 3 Jun 2004 19:09:17 -0000 1.1 --- horde_minion.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 37,40 **** --- 37,41 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>1</controlslots> <category>Summoned\Horde Minion</category> </npc> Index: dark_wolf.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/dark_wolf.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dark_wolf.xml 3 Jun 2004 19:09:17 -0000 1.1 --- dark_wolf.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 46,49 **** --- 46,50 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>1</controlslots> <category>Summoned\Dark Wolf</category> </npc> Index: skeletal_steed.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/skeletal_steed.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** skeletal_steed.xml 3 Jun 2004 19:09:17 -0000 1.1 --- skeletal_steed.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 13,16 **** --- 13,17 ---- <karma>0</karma> <fame>0</fame> + <controlslots>3</controlslots> <bindmenu>tame_menu,pet_menu</bindmenu> <category>Summoned\Skeletal Steed</category> Index: energy_vortex.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/energy_vortex.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** energy_vortex.xml 8 Jun 2004 20:06:09 -0000 1.5 --- energy_vortex.xml 9 Aug 2004 18:45:42 -0000 1.6 *************** *** 40,43 **** --- 40,44 ---- <tag name="res_energy" value="90,100" type="int" /> <!-- Misc. --> + <controlslots>1</controlslots> <category>Summoned\Energy Vortex</category> </npc> Index: tinkered_golem.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/tinkered_golem.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tinkered_golem.xml 3 Jun 2004 19:06:29 -0000 1.8 --- tinkered_golem.xml 9 Aug 2004 18:45:42 -0000 1.9 *************** *** 23,26 **** --- 23,27 ---- <anatomy>0</anatomy> <!-- Misc. --> + <controlslots>4</controlslots> <bindmenu>tame_menu,pet_menu</bindmenu> <category>Summoned\Golem (Tinkered)</category> Index: fire_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/fire_elemental.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fire_elemental.xml 3 Jun 2004 19:09:17 -0000 1.1 --- fire_elemental.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>4</controlslots> <category>Summoned\Fire Elemental</category> </npc> Index: air_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/air_elemental.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** air_elemental.xml 3 Jun 2004 19:09:17 -0000 1.1 --- air_elemental.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 37,40 **** --- 37,41 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>2</controlslots> <category>Summoned\Air Elemental</category> </npc> Index: vampire_bat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/vampire_bat.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** vampire_bat.xml 3 Jun 2004 19:09:17 -0000 1.1 --- vampire_bat.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>1</controlslots> <bindmenu>tame_menu,pet_menu</bindmenu> <category>Summoned\Vampire Bat</category> Index: death_adder.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/death_adder.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** death_adder.xml 3 Jun 2004 19:09:17 -0000 1.1 --- death_adder.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 37,40 **** --- 37,41 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>1</controlslots> <category>Summoned\Death Adder</category> </npc> Index: shadow_wisp.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/shadow_wisp.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shadow_wisp.xml 3 Jun 2004 19:09:17 -0000 1.1 --- shadow_wisp.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 39,42 **** --- 39,43 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>1</controlslots> <bindmenu>tame_menu,pet_menu</bindmenu> <category>Summoned\Shadow Wisp</category> Index: water_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/water_elemental.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** water_elemental.xml 3 Jun 2004 19:09:17 -0000 1.1 --- water_elemental.xml 9 Aug 2004 18:45:42 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- <!--<lootpacks></lootpacks>--> <!-- Misc. --> + <controlslots>3</controlslots> <category>Summoned\Water Elemental</category> </npc> Index: blade_spirit.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/summoned/blade_spirit.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** blade_spirit.xml 3 Jun 2004 19:06:29 -0000 1.9 --- blade_spirit.xml 9 Aug 2004 18:45:42 -0000 1.10 *************** *** 42,45 **** --- 42,46 ---- <tag name="res_energy" value="20,30" type="int" /> <!-- Misc. --> + <controlslots>1</controlslots> <category>Summoned\Blade Spirit</category> </npc> |
|
From: Richard M. <dr...@us...> - 2004-08-09 18:45:59
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30208/monsters/dragons Modified Files: dragon.xml drake.xml white_wyrm.xml Log Message: Controlslots Index: white_wyrm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/white_wyrm.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** white_wyrm.xml 7 Jun 2004 21:39:06 -0000 1.12 --- white_wyrm.xml 9 Aug 2004 18:45:42 -0000 1.13 *************** *** 39,42 **** --- 39,43 ---- <desc>Unlikely as it may seem, some dragons do not hold to the strict canons of their society. Though a drake criminal is rare, punishment must exist for such malcontents. Wyrms are forbidden from killing one another, and thus no death sentence exists, even for the most evil oftheir kind. It was once believed by the Elder Wyrms that the frozen wastes would either kill or forever weaken those draconians banished there. The contrary was, of course, the result. Known among their kind as Anflaustrailious, or the dispossessed that lack warmth, the dragons that now reside in the regions of cold are those, or descended from those, who were banished for crimes among their kind. The Draconians of the Frost are a cruel and savage branch of their race. They blame all creatures for their torment and seek out revenge on any in their path. Such is the terror inspired by these foul drakes that the Elder Wyrms have forever stricken banishment to the ice regions from their doctrine. What becomes of draconian criminals now is known only to dragon kind, and they are loath to share their secrets.</desc> <!-- Missing: Jewel, Level 4 Map --> + <controlslots>3</controlslots> <lootpacks>lootpack_filthy_rich;lootpack_filthy_rich;lootpack_filthy_rich;lootpack_average</lootpacks> <totame>963</totame> Index: drake.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/drake.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** drake.xml 7 Jun 2004 21:39:06 -0000 1.12 --- drake.xml 9 Aug 2004 18:45:42 -0000 1.13 *************** *** 35,38 **** --- 35,39 ---- <tag name="res_poison" value="20,30" type="int" /> <!-- Misc. --> + <controlslots>2</controlslots> <!-- Missing: 1-7CS, MNS, Potions, Reagents, Level 3 Map --> <lootpacks>lootpack_rich</lootpacks> Index: dragon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/dragons/dragon.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dragon.xml 7 Jun 2004 21:38:47 -0000 1.11 --- dragon.xml 9 Aug 2004 18:45:41 -0000 1.12 *************** *** 39,42 **** --- 39,43 ---- <desc>Dragons are a wise and ancient race. They are terrible indeed in their anger, but they are neither cruel nor rapacious in their own nature. Any who says otherwise speaks not the truth. It is true that dragons, like all other sapient peoples, have the power to choose, and that some, succumbing to malice or madness, have descended in wrath on helpless humans, and been put down in consequence. When a man dies beneath a dragon's claws, however, it is far more often the case that he has succumbed to his own greed, and gone foolishly seeking to rob the dragon of his fabled hoard.</desc> <!-- Missing: Jewel, Level 4 Map --> + <controlslots>3</controlslots> <lootpacks>lootpack_filthy_rich;lootpack_filthy_rich</lootpacks> <totame>939</totame> |
|
From: Richard M. <dr...@us...> - 2004-08-09 18:45:50
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/air In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30208/animals/air Modified Files: birds.xml chicken.xml eagle.xml Log Message: Controlslots Index: eagle.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/air/eagle.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** eagle.xml 6 Jun 2004 01:38:42 -0000 1.9 --- eagle.xml 9 Aug 2004 18:45:40 -0000 1.10 *************** *** 37,40 **** --- 37,41 ---- <anatomy>0</anatomy> <!-- Misc --> + <controlslots>1</controlslots> <totame>171</totame> <food>1</food> Index: chicken.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/air/chicken.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** chicken.xml 6 Jun 2004 01:38:42 -0000 1.8 --- chicken.xml 9 Aug 2004 18:45:40 -0000 1.9 *************** *** 36,39 **** --- 36,40 ---- <food>3</food> <carve>carve_chicken</carve> + <controlslots>1</controlslots> <bindmenu>tame_menu,pet_menu</bindmenu> <category>Animals\Birds\Chicken</category> *************** *** 62,65 **** --- 63,67 ---- <totame>250</totame> <!-- Misc --> + <controlslots>2</controlslots> <bindmenu>tame_menu,pet_menu</bindmenu> <category>Animals\Birds\Chicken (Strong)</category> Index: birds.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/air/birds.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** birds.xml 6 Jun 2004 01:38:42 -0000 1.9 --- birds.xml 9 Aug 2004 18:45:40 -0000 1.10 *************** *** 35,38 **** --- 35,39 ---- <tag name="res_physical" value="0,3" type="int" /> <!-- Misc. --> + <controlslots>1</controlslots> <totame>0</totame> <food>3</food> |
|
From: Richard M. <dr...@us...> - 2004-08-09 18:45:50
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30208/monsters/daemonic Modified Files: daemon.xml Log Message: Controlslots Index: daemon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/daemonic/daemon.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** daemon.xml 7 Jun 2004 21:38:00 -0000 1.13 --- daemon.xml 9 Aug 2004 18:45:41 -0000 1.14 *************** *** 41,44 **** --- 41,45 ---- <desc>No purer manifestation of primal evil exists than the hideous daemon, a denizen of the dark and infernal planes brought to these shores bythe most vile wizardries. Only the greatest of heroes have ever vanquished a daemon in single combat, and even a group of valiant warriors must be mighty indeed to survive an encounter with such a fiend.</desc> <!-- Missing: 1-7 scroll, level 4 map, medium necro scroll --> + <controlslots>5</controlslots> <lootpacks>lootpack_rich;lootpack_average</lootpacks> <carve>carve_demon</carve> |
|
From: Richard M. <dr...@us...> - 2004-08-09 18:23:30
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24129/magic Modified Files: circle5.py Log Message: Fix for summon creature Index: circle5.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** circle5.py 25 Jul 2004 22:59:08 -0000 1.12 --- circle5.py 9 Aug 2004 18:23:21 -0000 1.13 *************** *** 322,326 **** def cast(self, char, mode, args=[], target=None, item=None): ! if char.player and char.controlslots + 2 > 5: if char.socket: char.socket.clilocmessage(1049645) --- 322,326 ---- def cast(self, char, mode, args=[], target=None, item=None): ! if char.player and char.controlslots + 1 > 5: if char.socket: char.socket.clilocmessage(1049645) *************** *** 331,335 **** char.turnto(target) ! if char.player and char.controlslots + 2 > 5: if char.socket: char.socket.clilocmessage(1049645) --- 331,335 ---- char.turnto(target) ! if char.player and char.controlslots + 1 > 5: if char.socket: char.socket.clilocmessage(1049645) *************** *** 344,360 **** return ! npcid = random.choice( ['polar_bear', 'grizzly_bear', 'black_bear', ! 'brown_bear', 'horse_1', 'walrus', 'great_hart', ! 'hind', 'dog', 'boar', 'chicken', 'rabbit'] ) creature = wolfpack.addnpc(npcid, target) ! creature.tamed = 1 ! creature.addevent('speech.pets') ! creature.controlslots = 2 ! creature.owner = char ! creature.summontime = wolfpack.time.servertime() + int(char.skill[MAGERY] * 400) ! creature.summoned = 1 ! creature.ai = "Animal_Domestic" ! creature.soundeffect(0x215) def onLoad(): --- 344,363 ---- return ! npcid = random.choice( ['polar_bear', 'grizzly_bear', 'black_bear', ! 'brown_bear', 'horse_1', 'walrus', 'great_hart', ! 'hind', 'dog', 'boar', 'chicken', 'rabbit'] ) creature = wolfpack.addnpc(npcid, target) ! if creature.controlslots + char.controlslots > 5: ! creature.delete() ! char.socket.clilocmessage(1049645) ! else: ! creature.tamed = 1 ! creature.addevent('speech.pets') ! creature.owner = char ! creature.summontime = wolfpack.time.servertime() + int(char.skill[MAGERY] * 400) ! creature.summoned = 1 ! creature.ai = "Animal_Domestic" ! creature.soundeffect(0x215) def onLoad(): |
|
From: Richard M. <dr...@us...> - 2004-08-08 20:17:53
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12120 Modified Files: food.py Log Message: no animations on a mount. Index: food.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/food.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** food.py 19 Jul 2004 23:22:15 -0000 1.11 --- food.py 8 Aug 2004 20:17:45 -0000 1.12 *************** *** 2,6 **** import wolfpack import random ! from wolfpack.consts import ANIM_FIDGET3 from wolfpack.utilities import tobackpack from system import poison --- 2,6 ---- import wolfpack import random ! from wolfpack.consts import ANIM_FIDGET3, LAYER_MOUNT from wolfpack.utilities import tobackpack from system import poison *************** *** 45,49 **** # Fidget animation and munch munch sound char.soundeffect( random.choice([0x03a, 0x03b, 0x03c]), 1 ) ! char.action(ANIM_FIDGET3) return 1 --- 45,50 ---- # Fidget animation and munch munch sound char.soundeffect( random.choice([0x03a, 0x03b, 0x03c]), 1 ) ! if not char.itemonlayer( LAYER_MOUNT ): ! char.action(ANIM_FIDGET3) return 1 *************** *** 69,73 **** # Fidget animation and munch munch sound player.soundeffect( random.choice([0x03a, 0x03b, 0x03c]), 1 ) ! player.action(ANIM_FIDGET3) player.hunger += 1 --- 70,75 ---- # Fidget animation and munch munch sound player.soundeffect( random.choice([0x03a, 0x03b, 0x03c]), 1 ) ! if not player.itemonlayer( LAYER_MOUNT ): ! player.action(ANIM_FIDGET3) player.hunger += 1 |
|
From: Richard M. <dr...@us...> - 2004-08-08 17:55:40
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22952 Modified Files: import.py Log Message: Added spots to possibly support more recent worldsave data from Sphere. The option is disabled until a patch can be done. Index: import.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/import.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** import.py 21 Jul 2004 14:20:41 -0000 1.8 --- import.py 8 Aug 2004 17:55:31 -0000 1.9 *************** *** 57,61 **** gump.addBackground( id=0x2436, width=350, height=300 ) ! text = '<basefont color="#FEFEFE"><h3>Import</h3><br><basefont color="#FEFEFE">Enter the name of the worldfile you want to import below. But before clicking Import, choose the correct file format from the list. <!--You may also choose any other options you find suitable.-->' gump.addHtmlGump( x=20, y=20, width=310, height=200, html=text ) --- 57,61 ---- gump.addBackground( id=0x2436, width=350, height=300 ) ! text = '<basefont color="#FEFEFE"><h3>Import - <basefont color="#ff0000">Items Only</basefont></h3><br />Enter the name of the worldfile you want to import below. But before clicking Import, choose the correct file format from the list.</basefont>' gump.addHtmlGump( x=20, y=20, width=310, height=200, html=text ) *************** *** 74,77 **** --- 74,80 ---- gump.addText( x=55, y=125, text='Sphere 51a', hue=0x835 ) + #gump.addRadioButton( x=150, y=120, off=0x25f8, on=0x25fb, id=5 ) + #gump.addText( x=185, y=125, text='Sphere 55i', hue=0x835 ) + # InputField gump.addResizeGump( x=20, y=210, id=0xBB8, width=310, height=25 ) *************** *** 180,184 **** return ( count, warnings ) ! def parseSphere(file, map): itemid = -1 props = {} --- 183,230 ---- return ( count, warnings ) ! def parseSphere51a(file, map): ! itemid = -1 ! props = {} ! count = 0 ! warnings = '' ! ! while 1: ! line = file.readline() ! if not line: ! break ! line = line.strip() ! ! if line.startswith('[WORLDITEM ') and line.endswith(']'): ! itemid = int(line[11:len(line)-1], 16) ! elif itemid != -1 and "=" in line: ! (key, value) = line.split('=', 1) ! props[key.lower()] = value ! elif itemid != -1 and len(line) == 0: ! if props.has_key('p'): ! (x, y, z) = props['p'].split(',') ! x = int(x) ! y = int(y) ! z = int(z) ! if props.has_key('color'): ! color = int(props['color'], 16) ! else: ! color = 0 ! ! item = wolfpack.newitem(1) ! item.decay = 0 ! item.movable = 2 ! item.id = itemid ! item.color = color ! item.moveto( x, y, z, map ) ! item.update() ! count += 1 ! ! itemid = -1 ! props = {} ! ! return (count, warnings) ! ! def parseSphere55i(file, map): ! """ itemid = -1 props = {} *************** *** 221,224 **** --- 267,272 ---- return (count, warnings) + """ + pass """ *************** *** 363,368 **** elif format == 3: # Text ( count, warnings ) = parseTxt( file, char.pos.map ) ! elif format == 4: # Sphere ! (count, warnings) = parseSphere(file, char.pos.map) file.close() --- 411,418 ---- elif format == 3: # Text ( count, warnings ) = parseTxt( file, char.pos.map ) ! elif format == 4: # Sphere 51a ! (count, warnings) = parseSphere51a(file, char.pos.map) ! elif format == 5: # Sphere 55i ! (count, warnings) = parseSphere55i(file, char.pos.map) file.close() |
|
From: Correa <thi...@us...> - 2004-08-07 15:52:22
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9454 Modified Files: uobject.cpp Log Message: documentation fix. Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** uobject.cpp 27 Jul 2004 06:35:22 -0000 1.169 --- uobject.cpp 7 Aug 2004 15:52:12 -0000 1.170 *************** *** 499,503 **** } ! // Remove it from all in-range sockets void cUObject::removeFromView( bool clean ) { --- 499,505 ---- } ! /*! ! Remove it from all in-range sockets ! */ void cUObject::removeFromView( bool clean ) { *************** *** 529,533 **** } ! // Checks if the specified object is in range bool cUObject::inRange( cUObject* object, UINT32 range ) const { --- 531,537 ---- } ! /*! ! Checks if the specified object is in given range ! */ bool cUObject::inRange( cUObject* object, UINT32 range ) const { *************** *** 690,694 **** } ! // \property object.pos This string property contains a comma separated list of the names of the scripts that are assigned to this object. else if ( name == "eventlist" ) { --- 694,698 ---- } ! // \property object.eventlist This string property contains a comma separated list of the names of the scripts that are assigned to this object. else if ( name == "eventlist" ) { |
|
From: Correa <thi...@us...> - 2004-08-07 15:33:09
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6014/network Modified Files: uosocket.cpp Log Message: fix bug 208 ( new char doesn't get the events from players.xml ) Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.387 retrieving revision 1.388 diff -C2 -d -r1.387 -r1.388 *** uosocket.cpp 6 Aug 2004 22:27:03 -0000 1.387 --- uosocket.cpp 7 Aug 2004 15:32:59 -0000 1.388 *************** *** 841,845 **** if ( statSum > 80 || ( packet->strength() > 60 ) || ( packet->dexterity() > 60 ) || ( packet->intelligence() > 60 ) ) { ! log( QString( "Submitted invalid stats during char creation (%1,%2,%3).\n" ).arg( packet->strength() ).arg( packet->dexterity() ).arg( packet->intelligence() ) ); cancelCreate( tr( "Invalid Character stats" ) ) } --- 841,845 ---- if ( statSum > 80 || ( packet->strength() > 60 ) || ( packet->dexterity() > 60 ) || ( packet->intelligence() > 60 ) ) { ! log( tr( "Submitted invalid stats during char creation (%1,%2,%3).\n" ).arg( packet->strength() ).arg( packet->dexterity() ).arg( packet->intelligence() ) ); cancelCreate( tr( "Invalid Character stats" ) ) } *************** *** 848,852 **** if ( ( packet->skillId1() >= ALLSKILLS ) || ( packet->skillValue1() > 50 ) || ( packet->skillId2() >= ALLSKILLS ) || ( packet->skillValue2() > 50 ) || ( packet->skillId3() >= ALLSKILLS ) || ( packet->skillValue3() > 50 ) || ( packet->skillValue1() + packet->skillValue2() + packet->skillValue3() > 100 ) ) { ! log( QString( "Submitted invalid skills during char creation (%1=%2,%3=%4,%5=%6).\n" ).arg( packet->skillId1() ).arg( packet->skillValue1() ).arg( packet->skillId2() ).arg( packet->skillValue2() ).arg( packet->skillId3() ).arg( packet->skillValue3() ) ); cancelCreate( tr( "Invalid Character skills" ) ) } --- 848,852 ---- if ( ( packet->skillId1() >= ALLSKILLS ) || ( packet->skillValue1() > 50 ) || ( packet->skillId2() >= ALLSKILLS ) || ( packet->skillValue2() > 50 ) || ( packet->skillId3() >= ALLSKILLS ) || ( packet->skillValue3() > 50 ) || ( packet->skillValue1() + packet->skillValue2() + packet->skillValue3() > 100 ) ) { ! log( tr( "Submitted invalid skills during char creation (%1=%2,%3=%4,%5=%6).\n" ).arg( packet->skillId1() ).arg( packet->skillValue1() ).arg( packet->skillId2() ).arg( packet->skillValue2() ).arg( packet->skillId3() ).arg( packet->skillValue3() ) ); cancelCreate( tr( "Invalid Character skills" ) ) } *************** *** 855,859 **** if ( packet->hairStyle() && ( !isHair( packet->hairStyle() ) || !isHairColor( packet->hairColor() ) ) ) { ! log( QString( "Submitted wrong hair style (%1) or wrong hair color (%2) during char creation.\n" ).arg( packet->hairStyle() ).arg( packet->hairColor() ) ); cancelCreate( tr( "Invalid hair" ) ) } --- 855,859 ---- if ( packet->hairStyle() && ( !isHair( packet->hairStyle() ) || !isHairColor( packet->hairColor() ) ) ) { ! log( tr( "Submitted wrong hair style (%1) or wrong hair color (%2) during char creation.\n" ).arg( packet->hairStyle() ).arg( packet->hairColor() ) ); cancelCreate( tr( "Invalid hair" ) ) } *************** *** 862,866 **** if ( packet->beardStyle() && ( !isBeard( packet->beardStyle() ) || !isHairColor( packet->beardColor() ) ) ) { ! log( QString( "Submitted wrong beard style (%1) or wrong beard color (%2) during char creation.\n" ).arg( packet->beardStyle() ).arg( packet->beardColor() ) ); cancelCreate( tr( "Invalid beard" ) ) } --- 862,866 ---- if ( packet->beardStyle() && ( !isBeard( packet->beardStyle() ) || !isHairColor( packet->beardColor() ) ) ) { ! log( tr( "Submitted wrong beard style (%1) or wrong beard color (%2) during char creation.\n" ).arg( packet->beardStyle() ).arg( packet->beardColor() ) ); cancelCreate( tr( "Invalid beard" ) ) } *************** *** 869,873 **** if ( !isNormalColor( packet->shirtColor() ) || !isNormalColor( packet->pantsColor() ) ) { ! log( QString( "Submitted wrong shirt (%1) or pant (%2) color during char creation.\n" ).arg( packet->shirtColor() ).arg( packet->pantsColor() ) ); cancelCreate( tr( "Invalid shirt or pant color" ) ) } --- 869,873 ---- if ( !isNormalColor( packet->shirtColor() ) || !isNormalColor( packet->pantsColor() ) ) { ! log( tr( "Submitted wrong shirt (%1) or pant (%2) color during char creation.\n" ).arg( packet->shirtColor() ).arg( packet->pantsColor() ) ); cancelCreate( tr( "Invalid shirt or pant color" ) ) } *************** *** 878,882 **** if ( packet->startTown() >= startLocations.size() ) { ! log( QString( "Submitted wrong starting location (%1) during char creation.\n" ).arg( packet->startTown() ) ); cancelCreate( tr( "Invalid start location" ) ) } --- 878,882 ---- if ( packet->startTown() >= startLocations.size() ) { ! log( tr( "Submitted wrong starting location (%1) during char creation.\n" ).arg( packet->startTown() ) ); cancelCreate( tr( "Invalid start location" ) ) } *************** *** 885,889 **** if ( !isSkinColor( packet->skinColor() ) ) { ! log( QString( "Submitted a wrong skin color (%1) during char creation.\n" ).arg( packet->skinColor() ) ); cancelCreate( tr( "Invalid skin color" ) ) } --- 885,889 ---- if ( !isSkinColor( packet->skinColor() ) ) { ! log( tr( "Submitted a wrong skin color (%1) during char creation.\n" ).arg( packet->skinColor() ) ); cancelCreate( tr( "Invalid skin color" ) ) } *************** *** 892,914 **** P_PLAYER pChar = new cPlayer; pChar->Init(); - pChar->setGender( packet->gender() ); ! pChar->setName( packet->name() ); ! ! pChar->setSkin( packet->skinColor() ); ! pChar->setOrgSkin( packet->skinColor() ); ! ! pChar->setBody( ( packet->gender() == 1 ) ? 0x191 : 0x190 ); ! if ( packet->gender() == 1 ) { pChar->setBaseid( "player_female" ); } else { pChar->setBaseid( "player_male" ); } pChar->setOrgBody( pChar->body() ); --- 892,919 ---- P_PLAYER pChar = new cPlayer; pChar->Init(); pChar->setGender( packet->gender() ); ! const cElement* playerDefinition = 0; if ( packet->gender() == 1 ) { pChar->setBaseid( "player_female" ); + playerDefinition = Definitions::instance()->getDefinition( WPDT_NPC, "player_female" ); } else { pChar->setBaseid( "player_male" ); + playerDefinition = Definitions::instance()->getDefinition( WPDT_NPC, "player_male" ); } + if ( playerDefinition ) + pChar->applyDefinition( playerDefinition ); + + pChar->setName( packet->name() ); + + pChar->setSkin( packet->skinColor() ); + pChar->setOrgSkin( packet->skinColor() ); + + pChar->setBody( ( packet->gender() == 1 ) ? 0x191 : 0x190 ); + pChar->setOrgBody( pChar->body() ); |
|
From: Correa <thi...@us...> - 2004-08-07 15:33:08
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6014 Modified Files: player.cpp player.h Log Message: fix bug 208 ( new char doesn't get the events from players.xml ) Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -C2 -d -r1.114 -r1.115 *** player.cpp 4 Aug 2004 23:17:36 -0000 1.114 --- player.cpp 7 Aug 2004 15:32:59 -0000 1.115 *************** *** 1097,1105 **** } - void cPlayer::processNode( const cElement* Tag ) - { - return; - } - void cPlayer::setStamina( INT16 data, bool notify /* = true */ ) { --- 1097,1100 ---- Index: player.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.h,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** player.h 20 Jul 2004 11:35:37 -0000 1.50 --- player.h 7 Aug 2004 15:32:59 -0000 1.51 *************** *** 206,210 **** // interface implementation static void buildSqlString( QStringList& fields, QStringList& tables, QStringList& conditions ); - virtual void processNode( const cElement* Tag ); // Reference to a guild this character is in --- 206,209 ---- |
|
From: Correa <thi...@us...> - 2004-08-07 05:35:55
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20885 Modified Files: info.py Log Message: fixed problems with bool properities of chars. Index: info.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** info.py 3 Aug 2004 14:19:53 -0000 1.15 --- info.py 7 Aug 2004 05:35:47 -0000 1.16 *************** *** 22,25 **** --- 22,30 ---- from wolfpack import * + def str2bool( str ): + if str.upper() == "TRUE": + return True + return False + def info( socket, command, argstring ): #args = argstring.split(" ") *************** *** 202,206 **** gump.addText( 113, 360, "Position (x,y,z,map):", 0x834 ) gump.addResizeGump( 280, 360, 0xBB8, 215, 20 ) ! gump.addInputField( 284, 360, 200, 16, 0x834, 10, unicode( char.pos.x )+","+unicode( char.pos.y )+","+unicode( char.pos.z )+","+unicode( char.pos.map ) ) # 12 gump.addText( 113, 380, "Direction:", 0x834 ) --- 207,211 ---- gump.addText( 113, 360, "Position (x,y,z,map):", 0x834 ) gump.addResizeGump( 280, 360, 0xBB8, 215, 20 ) ! gump.addInputField( 284, 360, 200, 16, 0x834, 11, unicode( char.pos.x )+","+unicode( char.pos.y )+","+unicode( char.pos.z )+","+unicode( char.pos.map ) ) # 12 gump.addText( 113, 380, "Direction:", 0x834 ) *************** *** 383,396 **** gump.addResizeGump( 280, 220, 0xBB8, 215, 20 ) if char.hastag('notoriety'): ! gump.addInputField( 284, 200, 200, 16, 0x834, 42, unicode( char.gettag('notoriety') ) ) else: ! gump.addInputField( 284, 200, 200, 16, 0x834, 42, '' ) # 44 gump.addText( 113, 240, "Poisoned:", 0x834 ) gump.addResizeGump( 280, 240, 0xBB8, 215, 20 ) if char.hastag('poisoned'): ! gump.addInputField( 284, 200, 200, 16, 0x834, 42, unicode( char.gettag('poisoned') ) ) else: ! gump.addInputField( 284, 200, 200, 16, 0x834, 42, '' ) # 45 #gump.addText( 113, 260, ":", 0x834 ) --- 388,401 ---- gump.addResizeGump( 280, 220, 0xBB8, 215, 20 ) if char.hastag('notoriety'): ! gump.addInputField( 284, 200, 200, 16, 0x834, 43, unicode( char.gettag('notoriety') ) ) else: ! gump.addInputField( 284, 200, 200, 16, 0x834, 43, '' ) # 44 gump.addText( 113, 240, "Poisoned:", 0x834 ) gump.addResizeGump( 280, 240, 0xBB8, 215, 20 ) if char.hastag('poisoned'): ! gump.addInputField( 284, 200, 200, 16, 0x834, 44, unicode( char.gettag('poisoned') ) ) else: ! gump.addInputField( 284, 200, 200, 16, 0x834, 44, '' ) # 45 #gump.addText( 113, 260, ":", 0x834 ) *************** *** 570,574 **** char.direction = int( textentries[ key ] ) elif key == 13: ! char.invulnerable = int( textentries[ key ] ) elif key == 14: char.strength = int( textentries[ key ] ) --- 575,579 ---- char.direction = int( textentries[ key ] ) elif key == 13: ! char.invulnerable = str2bool( textentries[ key ] ) elif key == 14: char.strength = int( textentries[ key ] ) *************** *** 590,608 **** char.mana = int( textentries[ key ] ) elif key == 23: ! char.hidden = int( textentries[ key ] ) elif key == 24: ! char.dead = int( textentries[ key ] ) elif key == 25: ! char.polymorph = int( textentries[ key ] ) elif key == 26: ! char.incognito = int( textentries[ key ] ) elif key == 27: char.hunger = int( textentries[ key ] ) elif key == 28: ! char.war = int( textentries[ key ] ) elif key == 29: ! char.invisible = int( textentries[ key ] ) elif key == 30: ! char.frozen = int( textentries[ key ] ) elif key == 31: char.stealthedsteps = int( textentries[ key ] ) --- 595,613 ---- char.mana = int( textentries[ key ] ) elif key == 23: ! char.hidden = str2bool( textentries[ key ] ) elif key == 24: ! char.dead = str2bool( textentries[ key ] ) elif key == 25: ! char.polymorph = str2bool( textentries[ key ] ) elif key == 26: ! char.incognito = str2bool( textentries[ key ] ) elif key == 27: char.hunger = int( textentries[ key ] ) elif key == 28: ! char.war = str2bool( textentries[ key ] ) elif key == 29: ! char.invisible = str2bool( textentries[ key ] ) elif key == 30: ! char.frozen = str2bool( textentries[ key ] ) elif key == 31: char.stealthedsteps = int( textentries[ key ] ) |
|
From: Correa <thi...@us...> - 2004-08-07 04:03:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10742/magic Modified Files: spell.py utilities.py Log Message: fix for bug 190. ( cast command broken ) Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** spell.py 22 Jul 2004 17:22:06 -0000 1.12 --- spell.py 7 Aug 2004 04:02:53 -0000 1.13 *************** *** 107,115 **** # Casting from a scroll and no scroll was passed ! if mode == 1 and not item: return # Casting from a wand and no wand was passed ! if mode == 2 and not item: return --- 107,115 ---- # Casting from a scroll and no scroll was passed ! if mode == MODE_SCROLL and not item: return # Casting from a wand and no wand was passed ! if mode == MODE_WAND and not item: return *************** *** 126,130 **** # If we are using a spellbook to cast, check if we do have # the spell in our spellbook (0-based index) ! if not self.inherent and mode == 0 and not hasSpell(char, self.spellid - 1): char.message("You don't know the spell you want to cast.") return 0 --- 126,130 ---- # If we are using a spellbook to cast, check if we do have # the spell in our spellbook (0-based index) ! if not self.inherent and mode == MODE_BOOK and not hasSpell(char, self.spellid - 1): char.message("You don't know the spell you want to cast.") return 0 *************** *** 155,158 **** --- 155,160 ---- elif mode == MODE_WAND: source = 'wand (0x%x)' % item + elif mode == MODE_CMD: + source = 'command' char.log(LOG_MESSAGE, "Casting spell %u (%s) from %s.\n" % (self.spellid, self.__class__.__name__, source)) Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/utilities.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** utilities.py 20 Jul 2004 20:55:13 -0000 1.9 --- utilities.py 7 Aug 2004 04:02:53 -0000 1.10 *************** *** 44,47 **** --- 44,48 ---- MODE_SCROLL = 1 MODE_WAND = 2 + MODE_CMD = 3 # |
|
From: Correa <thi...@us...> - 2004-08-07 04:03:01
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10742/commands Modified Files: cast.py decoration.py Log Message: fix for bug 190. ( cast command broken ) Index: decoration.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/decoration.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** decoration.py 7 Aug 2004 00:28:22 -0000 1.8 --- decoration.py 7 Aug 2004 04:02:53 -0000 1.9 *************** *** 67,72 **** item.moveto( x, y, z, map ) item.movable = 3 # not movable - item.update() item.decay = 0 # no decay --- 67,72 ---- item.moveto( x, y, z, map ) item.movable = 3 # not movable item.decay = 0 # no decay + item.update() *************** *** 101,111 **** file.write("<decoration>\n") for id in self.maps[map]: ! tiledata = wolfpack.tiledata(id) ! file.write("""\t<!-- %s -->\n""" % tiledata["name"] ) ! file.write("""\t<item id="0x%x">\n""" % id ) for item in self.maps[map][id]: ! pos = item.pos ! file.write("""\t\t<pos x="%i" y="%i" z="%i" map="%i">\n""" % (pos.x, pos.y, pos.z, pos.map) ) ! file.write("\t</item>\n") file.write("</decoration>\n") file.close() --- 101,120 ---- file.write("<decoration>\n") for id in self.maps[map]: ! itemsbyhue = {} for item in self.maps[map][id]: ! if not itemsbyhue.has_key(item.color): ! itemsbyhue[item.color] = [] ! itemsbyhue[item.color].append(item) ! tiledata = wolfpack.tiledata(id) ! for hue in itemsbyhue: ! file.write("""\t<!-- %s -->\n""" % tiledata["name"] ) ! if hue != 0: ! file.write("""\t<item id="0x%x" hue="0x%x">\n""" % (id, hue) ) ! else: ! file.write("""\t<item id="0x%x">\n""" % id ) ! for item in itemsbyhue[hue]: ! pos = item.pos ! file.write("""\t\t<pos x="%i" y="%i" z="%i" map="%i">\n""" % (pos.x, pos.y, pos.z, pos.map) ) ! file.write("\t</item>\n") file.write("</decoration>\n") file.close() Index: cast.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/cast.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cast.py 15 Jul 2004 01:17:11 -0000 1.4 --- cast.py 7 Aug 2004 04:02:53 -0000 1.5 *************** *** 14,18 **** try: args = int( args ); ! castSpell( socket.player, args, 1 ) except: socket.sysmessage( "Usage: cast <spell-id>" ) --- 14,18 ---- try: args = int( args ); ! castSpell( socket.player, args, MODE_CMD ) except: socket.sysmessage( "Usage: cast <spell-id>" ) |
|
From: Correa <thi...@us...> - 2004-08-07 03:24:43
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4962 Modified Files: timing.cpp Log Message: fix for items decaying when they shouldn't Index: timing.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** timing.cpp 4 Aug 2004 23:17:37 -0000 1.9 --- timing.cpp 7 Aug 2004 03:24:12 -0000 1.10 *************** *** 107,111 **** for (sit = toRemove.begin(); sit != toRemove.end(); ++sit) { P_ITEM item = FindItemBySerial(*sit); ! if (item && item->isInWorld()) { item->remove(); // Auto removes from the decaylist } else { --- 107,111 ---- for (sit = toRemove.begin(); sit != toRemove.end(); ++sit) { P_ITEM item = FindItemBySerial(*sit); ! if (item && item->isInWorld() && !item->nodecay()) { item->remove(); // Auto removes from the decaylist } else { |
|
From: Correa <thi...@us...> - 2004-08-07 00:28:31
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13630/commands Modified Files: decoration.py wipe.py Log Message: fix Index: wipe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/wipe.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wipe.py 16 Jul 2004 07:09:27 -0000 1.3 --- wipe.py 7 Aug 2004 00:28:22 -0000 1.4 *************** *** 32,36 **** import string import wolfpack.gumps ! from wolfpack.gumps import cGump from wolfpack.utilities import * --- 32,36 ---- import string import wolfpack.gumps ! from wolfpack.gumps import WarningGump from wolfpack.utilities import * Index: decoration.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/decoration.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** decoration.py 20 Jul 2004 23:29:19 -0000 1.7 --- decoration.py 7 Aug 2004 00:28:22 -0000 1.8 *************** *** 120,125 **** if args == 'save': saveObject = DecorationSaveHandler(socket) ! socket.sysmessage("Sorting items") saveObject.sort() saveObject.save() --- 120,126 ---- if args == 'save': saveObject = DecorationSaveHandler(socket) ! socket.sysmessage("Sorting items, please wait...") saveObject.sort() + socket.sysmessage("Writting file...") saveObject.save() *************** *** 129,138 **** --- 130,143 ---- parser.setContentHandler(handler) if wolfpack.hasmap(0): + socket.sysmessage("Decorating map 0, please wait...") parser.parse("data/decoration.0.xml") if wolfpack.hasmap(1): + socket.sysmessage("Decorating map 1, please wait...") parser.parse("data/decoration.1.xml") if wolfpack.hasmap(2): + socket.sysmessage("Decorating map 2, please wait...") parser.parse("data/decoration.2.xml") if wolfpack.hasmap(3): + socket.sysmessage("Decorating map 2, please wait...") parser.parse("data/decoration.3.xml") |
|
From: Correa <thi...@us...> - 2004-08-06 22:27:13
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27900/network Modified Files: uosocket.cpp Log Message: added option to limit number of chars an account can hold( bugID: 152 ) Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.386 retrieving revision 1.387 diff -C2 -d -r1.386 -r1.387 *** uosocket.cpp 5 Aug 2004 01:29:04 -0000 1.386 --- uosocket.cpp 6 Aug 2004 22:27:03 -0000 1.387 *************** *** 568,572 **** charList.compile(); send( &charList ); ! // Ask the client for a viewrange cUOPacket packet( 0xc8, 2 ); --- 568,572 ---- charList.compile(); send( &charList ); ! #pragma fixme("Warning: Ugly ugly ugly! Fix me!") // Ask the client for a viewrange cUOPacket packet( 0xc8, 2 ); *************** *** 828,835 **** QValueVector<P_PLAYER> characters = _account->caracterList(); ! // If we have more than 5 characters ! if ( characters.size() >= 6 ) { ! cancelCreate( tr( "You already have more than 6 characters" ) ) } --- 828,836 ---- QValueVector<P_PLAYER> characters = _account->caracterList(); ! // If we have more than 6 characters ! const uint maxChars = QMIN(6, Config::instance()->maxCharsPerAccount() ); ! if ( characters.size() >= maxChars ) { ! cancelCreate( tr( "You already have more than %1 characters" ).arg(maxChars) ) } |
|
From: Correa <thi...@us...> - 2004-08-06 22:27:12
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27900 Modified Files: serverconfig.cpp serverconfig.h walking.cpp Log Message: added option to limit number of chars an account can hold( bugID: 152 ) Index: serverconfig.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** serverconfig.h 4 Aug 2004 23:17:36 -0000 1.1 --- serverconfig.h 6 Aug 2004 22:27:02 -0000 1.2 *************** *** 144,147 **** --- 144,148 ---- double tamedNpcMoveTime_; unsigned int showNpcTitles_; + unsigned char maxCharsPerAccount_; // AI *************** *** 273,276 **** --- 274,278 ---- QString accountsUsername() const; QString accountsName() const; + unsigned int maxCharsPerAccount() const; // Combat *************** *** 734,737 **** --- 736,744 ---- } + inline unsigned int cConfig::maxCharsPerAccount() const + { + return (unsigned int) maxCharsPerAccount_; + } + typedef SingletonHolder<cConfig> Config; Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** walking.cpp 4 Aug 2004 23:17:37 -0000 1.130 --- walking.cpp 6 Aug 2004 22:27:02 -0000 1.131 *************** *** 615,620 **** void cMovement::checkRunning( cUOSocket* socket, P_CHAR pChar, Q_UINT8 dir ) { - signed short tempshort; - // Don't regenerate stamina while running pChar->setRegenStaminaTime( Server::instance()->time() + floor( pChar->getStaminaRate() * 1000 ) ); --- 615,618 ---- Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** serverconfig.cpp 4 Aug 2004 23:17:36 -0000 1.1 --- serverconfig.cpp 6 Aug 2004 22:27:02 -0000 1.2 *************** *** 101,104 **** --- 101,105 ---- hashAccountPasswords_ = getBool( "Accounts", "Use MD5 Hashed Passwords", false, true ); convertUnhashedPasswords_ = getBool( "Accounts", "Automatically Hash Loaded Passwords", false, true ); + maxCharsPerAccount_ = QMIN(6, getNumber("Accounts", "Maximum Number of Characters", 6, true)); // AI *************** *** 356,360 **** static stGroupDoc group_doc[] = { ! {"AI", "This group configures the NPC AI."}, {"Accounts", "This group configures the account management."}, {"Database", "This group configures access to the worldsave database."}, {0, 0} }; --- 357,364 ---- static stGroupDoc group_doc[] = { ! {"AI", "This group configures the NPC AI."}, ! {"Accounts", "This group configures the account management."}, ! {"Database", "This group configures access to the worldsave database."}, ! {0, 0} }; *************** *** 385,389 **** static stEntryDoc entry_doc[] = { ! {"Accounts", "Database Driver", "Possible values are: sqlite, mysql"}, {0, 0, 0} }; --- 389,399 ---- static stEntryDoc entry_doc[] = { ! {"Accounts", "Auto Create", "If active login attempts with non-existing login names will create a new account automatically\n" ! "This is very usefull for new shards without account policy\n"}, ! {"Accounts", "Database Driver", "Possible values are: sqlite, mysql"}, ! {"Accounts", "Maximum Number of Characters", "Should not be more than 6, due to client restrictions"}, ! {"Accounts", "Use MD5 Hashed Passwords", "This will store hashed passwords, increasing password security."}, ! {"Accounts", "Automatically Hash Loaded Passwords", "If active, will convert older plain text passwords into MD5 hash"}, ! {0, 0, 0} }; |
|
From: Correa <thi...@us...> - 2004-08-06 22:27:12
|
Update of /cvsroot/wpdev/wolfpack/muls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27900/muls Modified Files: multiscache.cpp Log Message: added option to limit number of chars an account can hold( bugID: 152 ) Index: multiscache.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/muls/multiscache.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** multiscache.cpp 4 Aug 2004 23:17:38 -0000 1.4 --- multiscache.cpp 6 Aug 2004 22:27:03 -0000 1.5 *************** *** 192,196 **** QValueVector<multiItem_st> items; items.reserve( indexData.length / 12 ); - uint i = 0; multiFile.at( indexData.start ); --- 192,195 ---- *************** *** 198,202 **** multiStream.setByteOrder( QDataStream::LittleEndian ); ! for ( ; i < indexData.length / 12; ++i ) { multiItem_st item; --- 197,201 ---- multiStream.setByteOrder( QDataStream::LittleEndian ); ! for (int i = 0; i < indexData.length / 12; ++i ) { multiItem_st item; |
|
From: Richard M. <dr...@us...> - 2004-08-06 21:39:48
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19968 Modified Files: verinfo.h Log Message: Actually, I think I'll leave it at 12.9.8 until after the release. Index: verinfo.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/verinfo.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** verinfo.h 4 Aug 2004 22:51:16 -0000 1.39 --- verinfo.h 6 Aug 2004 21:39:35 -0000 1.40 *************** *** 36,40 **** inline const char* productVersion() { ! return "12.9.9cvs"; } --- 36,40 ---- inline const char* productVersion() { ! return "12.9.8"; } |
|
From: Klaus M. \(naddel_tdv\) <nad...@us...> - 2004-08-06 09:20:48
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23276/items Modified Files: system.xml Log Message: spawngems should not decay and only be movable by gm Index: system.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/system.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** system.xml 20 Jul 2004 23:35:35 -0000 1.8 --- system.xml 6 Aug 2004 09:20:39 -0000 1.9 *************** *** 31,34 **** --- 31,36 ---- <invisible /> <events>spawngem</events> + <nodecay /> + <movable>2</movable> </item> |
|
From: Richard M. <dr...@us...> - 2004-08-06 02:26:01
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5373 Modified Files: addtree.py Log Message: Removed the preview stuff, it only broke things. Index: addtree.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/addtree.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** addtree.py 3 Aug 2004 14:19:53 -0000 1.6 --- addtree.py 6 Aug 2004 02:25:43 -0000 1.7 *************** *** 26,73 **** # Please leave the grayed out indexes for future reference incase itemtarget works better with multiple items. - treeindex = ['cca','ccb','ccc','ccd','cd0','cd3','cd6','cda','cdd','ce0','ce3','ce6','cf8','cfe','d01', 'd94', 'd98', 'd9c', 'da0', 'da4', 'da8'] - jungletreeindex = [ 'jungle1', 'jungle2', 'jungle3', 'jungle4', 'jungle5', 'jungle6', 'jungle7' ] ! jungleindex = \ ! { ! 'jungle1': [ 'jungle1', [[0xd43, 0, 0, 0, 0]] ], ! 'jungle2': [ 'jungle2', [[0xd43, 0, 0, 0, 0]] ], ! 'jungle3': [ 'jungle3', [[0xd59, 0, 0, 0, 0]] ], ! 'jungle4': [ 'jungle4', [[0xd70, 0, 0, 0, 0]] ], ! 'jungle5': [ 'jungle5', [[0xd70, 0, 0, 0, 0]] ], ! 'jungle6': [ 'jungle6', [[0xd85, 0, 0, 0, 0]] ], ! 'jungle7': [ 'jungle7', [[0xd85, 0, 0, 0, 0]] ] ! } trees = \ { ! 'cca': [ 'cca', 'cce', [[0xcca, 0, 0, 0, 0]] ], ! 'ccb': [ 'ccb', 'cce', [[0xccb, 0, 0, 0, 0]] ], ! 'ccc': [ 'ccc', 'cce', [[0xccc, 0, 0, 0, 0]] ], ! 'ccd': [ 'ccd', 'cce', [[0xccd, 0, 0, 0, 0]] ], ! 'cd0': [ 'cd0', 'cd1', [[0xcd0, 0, 0, 0, 0]] ], ! 'cd3': [ 'cd3', 'cd4', [[0xcd3, 0, 0, 0, 0]] ], ! 'cd6': [ 'cd6', 'cd7', [[0xcd6, 0, 0, 0, 0]] ], ! 'cd8': [ 'cd8', 'cd0', [[0xcd8, 0, 0, 0, 0]] ], ! 'cda': [ 'cda', 'cdb', [[0xcda, 0, 0, 0, 0]] ], ! 'cdd': [ 'cdd', 'cde', [[0xcdd, 0, 0, 0, 0]] ], ! 'ce0': [ 'ce0', 'ce1', [[0xce0, 0, 0, 0, 0]] ], ! 'ce3': [ 'ce3', 'ce4', [[0xce3, 0, 0, 0, 0]] ], ! 'ce6': [ 'ce6', 'ce7', [[0xce6, 0, 0, 0, 0]] ], ! 'cf8': [ 'cf8', 'cf9', [[0xcf8, 0, 0, 0, 0]] ], # Cypress ! 'cfe': [ 'cfe', 'cff', [[0xcfe, 0, 0, 0, 0]] ], # Cypress ! 'd01': [ 'd01', 'd02', [[0xd01, 0, 0, 0, 0]] ], # Cypress ! 'd94': [ 'd94', 'd95', [[0xd94, 0, 0, 0, 0]] ], ! 'd98': [ 'd98', 'd99', [[0xd98, 0, 0, 0, 0]] ], ! 'd9c': [ 'd9c', 'd9d', [[0xd9c, 0, 0, 0, 0]] ], ! 'da0': [ 'da0', 'da1', [[0xda0, 0, 0, 0, 0]] ], ! 'da4': [ 'da4', 'da5', [[0xda4, 0, 0, 0, 0]] ], ! 'da8': [ 'da8', 'da9', [[0xda8, 0, 0, 0, 0]] ] } - yewindex = [ [0x12ba, 0, 0, 0, 0] ] - yewindex2 = [ [0x12b9, -1, 1, 0, 0] ] - TREE = 0 LEAVES = 1 --- 26,59 ---- # Please leave the grayed out indexes for future reference incase itemtarget works better with multiple items. jungletreeindex = [ 'jungle1', 'jungle2', 'jungle3', 'jungle4', 'jungle5', 'jungle6', 'jungle7' ] ! treeindex = ['cca','ccb','ccc','ccd','cd0','cd3','cd6','cda','cdd','ce0','ce3','ce6','cf8','cfe','d01', 'd94', 'd98', 'd9c', 'da0', 'da4', 'da8'] trees = \ { ! 'cca': [ 'cca', 'cce' ], ! 'ccb': [ 'ccb', 'cce' ], ! 'ccc': [ 'ccc', 'cce' ], ! 'ccd': [ 'ccd', 'cce' ], ! 'cd0': [ 'cd0', 'cd1' ], ! 'cd3': [ 'cd3', 'cd4' ], ! 'cd6': [ 'cd6', 'cd7' ], ! 'cd8': [ 'cd8', 'cd9' ], ! 'cda': [ 'cda', 'cdb' ], ! 'cdd': [ 'cdd', 'cde' ], ! 'ce0': [ 'ce0', 'ce1' ], ! 'ce3': [ 'ce3', 'ce4' ], ! 'ce6': [ 'ce6', 'ce7' ], ! 'cf8': [ 'cf8', 'cf9' ], # Cypress ! 'cfe': [ 'cfe', 'cff' ], # Cypress ! 'd01': [ 'd01', 'd02' ], # Cypress ! 'd94': [ 'd94', 'd95' ], ! 'd98': [ 'd98', 'd99' ], ! 'd9c': [ 'd9c', 'd9d' ], ! 'da0': [ 'da0', 'da1' ], ! 'da4': [ 'da4', 'da5' ], ! 'da8': [ 'da8', 'da9' ] } TREE = 0 LEAVES = 1 *************** *** 260,269 **** item = str( arguments.strip() ) if item == 'random': ! randomtrees = [ randint( 0, 2 ), randint( 0, 12 ), randint( 2, 12 ), randint( 0, 20 ), randint( 13, 15 ), randint( 16, 20 ) ] item = treeindex[ randomtrees[ randint( 0, 5 ) ] ] if trees[ item ]: if wolfpack.getdefinition( WPDT_ITEM, trees[item][TREE] ) and wolfpack.getdefinition( WPDT_ITEM, trees[item][LEAVES] ): socket.sysmessage( "Where do you want to place the tree '%s', '%s' ?" % ( trees[item][TREE], trees[item][LEAVES ]) ) ! socket.attachitemtarget( 'commands.addtree.createtree', trees[item][2], 0, 0, 0, [item] ) return elif item == 'yew': --- 246,255 ---- item = str( arguments.strip() ) if item == 'random': ! randomtrees = [ randint(0,2), randint(0,12), randint(2,12), randint(0,20), randint(13,15), randint(16,20) ] item = treeindex[ randomtrees[ randint( 0, 5 ) ] ] if trees[ item ]: if wolfpack.getdefinition( WPDT_ITEM, trees[item][TREE] ) and wolfpack.getdefinition( WPDT_ITEM, trees[item][LEAVES] ): socket.sysmessage( "Where do you want to place the tree '%s', '%s' ?" % ( trees[item][TREE], trees[item][LEAVES ]) ) ! socket.attachtarget( 'commands.addtree.createtree', [ item ] ) return elif item == 'yew': *************** *** 274,281 **** if wolfpack.getdefinition( WPDT_ITEM, trees[item][TREE] ) and wolfpack.getdefinition( WPDT_ITEM, trees[item][LEAVES] ): socket.sysmessage( "Where do you want to place the tree '%s', '%s' ?" % ( trees[item][TREE], trees[item][LEAVES]) ) ! socket.attachitemtarget( 'commands.addtree.createtree', [trees[item][2]], 0, 0, 0, [item] ) elif item in jungletreeindex and jungleindex[item]: ! socket.sysmessage( "Where do you want to place the jungle tree [%s]?" %(item) ) ! socket.attachitemtarget( 'commands.addtree.createjungletree', [jungleindex[item][1]], 0, 0, 0, [item] ) return else: --- 260,267 ---- if wolfpack.getdefinition( WPDT_ITEM, trees[item][TREE] ) and wolfpack.getdefinition( WPDT_ITEM, trees[item][LEAVES] ): socket.sysmessage( "Where do you want to place the tree '%s', '%s' ?" % ( trees[item][TREE], trees[item][LEAVES]) ) ! socket.attachtarget( 'commands.addtree.createtree', [ item ] ) elif item in jungletreeindex and jungleindex[item]: ! socket.sysmessage( "Where do you want to place the jungle tree [%s]?" %( item ) ) ! socket.attachtarget( 'commands.addtree.createjungletree', [ item ] ) return else: |
