NetHack-- 3.1.3 Patch (Fixed, 02/03)
Chris Herborth
Archive-name: NetHack--/part02
Here is the fixed version of the NetHack-- 3.1.3 Patch. Use this
instead of the compressed tar version that I posted a few days ago.
Sorry for the confusion.
NetHack-- is an unauthorised expansion to NetHack. This patch will turn
your NetHack 3.1.3 source code into NetHack-- 3.1.3.
Binary versions are available for the Atari ST/TT/Falcon030, OS/2 2.x,
and DOS (386 or better); check your favourite ftp sites.
-------- 8< -------
#!/bin/sh
# this is NH31C--.02 (part 2 of NetHack--)
# do not concatenate these parts, unpack them in order with /bin/sh
# file NH31C--.Patch continued
#
if test ! -r _shar_seq_.tmp; then
echo 'Please unpack part 1 first!'
exit 1
fi
(read Scheck
if test "$Scheck" != 2; then
echo Please unpack part "$Scheck" next!
exit 1
else
exit 0
fi
) < _shar_seq_.tmp || exit 1
if test ! -f _shar_wnt_.tmp; then
echo 'x - still skipping NH31C--.Patch'
else
echo 'x - continuing file NH31C--.Patch'
sed 's/^X//' << 'SHAR_EOF' >> 'NH31C--.Patch' &&
X M1_BREATHLESS | M1_AMORPHOUS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD |
X M1_MINDLESS | M1_ACID | M1_OMNIVORE, M2_HOSTILE | M2_NEUTER,
X 0, C(BROWN) },
X+ { "The Jelly That Ate Cleveland", S_JELLY, 11, 3, 8, 20, 0,
X+ (G_UNIQ | G_NOCORPSE | 2),
X+ { { AT_ENGL, AD_ACID, 4, 6 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 20, 0, MS_SILENT, MZ_MEDIUM, MR_ACID | MR_STONE, 0,
X+ M1_BREATHLESS | M1_AMORPHOUS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD |
X+ M1_MINDLESS | M1_ACID | M1_OMNIVORE, M2_NOPOLY | M2_HOSTILE | M2_NEUTER |
X+ M2_PNAME | M2_PRINCE, 0, C(HI_LORD) },
X /* kobolds */
X { "kobold", S_KOBOLD, 0, 6, MARM(10,7), 0, -2, (G_GENO | 1),
X { { AT_WEAP, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK,
X***************
X*** 410,421 ****
X--- 659,707 ----
X NO_ATTK, NO_ATTK, NO_ATTK },
X 450, 150, 0, MS_ORC, MZ_SMALL, MR_POISON, 0,
X M1_HUMANOID | M1_POIS, M2_HOSTILE | M2_MAGIC, 0, C(HI_ZAP) },
X+ { "kobold cheiftan", S_KOBOLD, 5, 4, MARM(10,5), 0, -4, (G_GENO | 1),
X+ { { AT_WEAP, AD_PHYS, 2, 4 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 500, 200, 0, MS_ORC, MZ_SMALL, MR_POISON, 0,
X+ M1_HUMANOID | M1_POIS,
X+ M2_HOSTILE | M2_LORD | M2_MALE | M2_COLLECT, 0, C(HI_LORD) },
X+ { "Kroo the Kobold King", S_KOBOLD, 7, 4, MARM(10,5), 0, -4,
X+ (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_WEAP, AD_PHYS, 2, 6 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 500, 200, 0, MS_ORC, MZ_SMALL, MR_POISON, 0,
X+ M1_HUMANOID | M1_POIS,
X+ M2_HOSTILE | M2_PRINCE | M2_MALE | M2_COLLECT | M2_NOPOLY |
X+ M2_PNAME | M2_STALK, 0, C(HI_LORD) },
X+ { "Krooella the Kobold Queen", S_KOBOLD, 7, 4, MARM(10,5), 0, -4,
X+ (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_WEAP, AD_CLRC, 0, 0 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 500, 200, 0, MS_ORC, MZ_SMALL, MR_POISON, 0,
X+ M1_HUMANOID | M1_POIS,
X+ M2_HOSTILE | M2_PRINCE | M2_FEMALE | M2_COLLECT | M2_NOPOLY |
X+ M2_PNAME | M2_STALK, 0, C(HI_LORD) },
X /* leprechauns */
X { "leprechaun", S_LEPRECHAUN, 5, 15, 8, 20, 0, (G_GENO | 4),
X { { AT_CLAW, AD_SGLD, 1, 2 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X 60, 30, 0, MS_LAUGH, MZ_TINY, 0, 0,
X M1_HUMANOID | M1_TPORT, M2_HOSTILE | M2_GREEDY, 0, C(GREEN) },
X+ { "leprechaun elder", S_LEPRECHAUN, 7, 25, 8, 20, 0, (G_GENO | 2),
X+ { { AT_CLAW, AD_SGLD, 1, 2 }, { AT_MAGC, AD_SPEL, 0, 0 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 60, 30, 0, MS_LAUGH, MZ_TINY, 0, 0,
X+ M1_HUMANOID | M1_TPORT, M2_HOSTILE | M2_GREEDY, 0, C(GREEN) },
X+ /* Was called Croesus in NetHack--; we have a real Croesus now. */
X+ { "O'Brien", S_LEPRECHAUN, 12, 48, 3, 20, 0,
X+ (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_SGLD, 1, 2 }, { AT_MAGC, AD_SPEL, 0, 0 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 60, 30, 0, MS_LAUGH, MZ_TINY, 0, 0,
X+ M1_HUMANOID | M1_TPORT,
X+ M2_HOSTILE | M2_GREEDY | M2_NOPOLY | M2_PRINCE | M2_PNAME | M2_MALE |
X+ M2_STALK | M2_MAGIC | M2_JEWELS | M2_COLLECT,
X+ 0, C(HI_LORD) },
X /* mimics */
X { "small mimic", S_MIMIC, 7, 3, 7, 0, 0, (G_GENO | 2),
X { { AT_CLAW, AD_PHYS, 3, 4 }, NO_ATTK, NO_ATTK,
X***************
X*** 457,462 ****
X--- 743,755 ----
X 600, 300, 0, MS_SEDUCE, MZ_HUMAN,
X 0, 0, M1_HUMANOID | M1_TPORT, M2_HOSTILE | M2_FEMALE | M2_COLLECT,
X 0, C(BROWN) },
X+ { "Aphrodite", S_NYMPH, 9, 15, 9, 20, 0, (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_SITM, 0, 0 }, { AT_CLAW, AD_SEDU, 0, 0 },
X+ { AT_MAGC, AD_SPEL, 0, 0 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 600, 300, 0, MS_SEDUCE, MZ_HUMAN,
X+ 0, 0, M1_HUMANOID | M1_TPORT,
X+ M2_HOSTILE | M2_FEMALE | M2_COLLECT | M2_NOPOLY | M2_PNAME,
X+ 0, C(HI_LORD) },
X /* orcs */
X { "goblin", S_ORC, 0, 6, MARM(10,6), 0, -3, (G_GENO | 2),
X { { AT_WEAP, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK,
X***************
X*** 468,473 ****
X--- 761,771 ----
X NO_ATTK, NO_ATTK, NO_ATTK },
X 1000, 200, 0, MS_ORC, MZ_HUMAN, 0, 0,
X M1_HUMANOID, M2_ORC | M2_STRONG | M2_COLLECT, 0, C(BROWN) },
X+ { "goblin thief", S_ORC, 2, 6, MARM(10,6), 0, -3, (G_GENO | 1),
X+ { { AT_WEAP, AD_PHYS, 1, 4 }, { AT_CLAW, AD_SITM, 0, 0 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 400, 100, 0, MS_ORC, MZ_SMALL, 0, 0,
X+ M1_HUMANOID, M2_ORC | M2_COLLECT | M2_MAGIC, 0, C(GRAY) },
X /* "orc" for zombie corpses only; they don't get created at random */
X { "orc", S_ORC, 1, 9, MARM(10,6), 0, -3, (G_GENO | G_NOGEN | G_LGROUP),
X { { AT_WEAP, AD_PHYS, 1, 8 }, NO_ATTK, NO_ATTK,
X***************
X*** 475,480 ****
X--- 773,783 ----
X 850, 150, 0, MS_ORC, MZ_HUMAN, 0, 0, M1_HUMANOID,
X M2_ORC | M2_HOSTILE | M2_STRONG | M2_GREEDY | M2_JEWELS | M2_COLLECT,
X 0, C(RED) },
X+ { "goblin shaman", S_ORC, 3, 6, MARM(10,6), 0, -3, (G_GENO | 2),
X+ { { AT_WEAP, AD_PHYS, 1, 4 }, { AT_MAGC, AD_SPEL, 0, 0 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 400, 100, 0, MS_ORC, MZ_SMALL, 0, 0,
X+ M1_HUMANOID, M2_ORC | M2_COLLECT | M2_MAGIC, 0, C(GRAY) },
X { "hill orc", S_ORC, 2, 9, MARM(10,6), 0, -4, (G_GENO | G_LGROUP | 2),
X { { AT_WEAP, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 505,510 ****
X--- 808,821 ----
X 1350, 350, 0, MS_ORC, MZ_HUMAN, 0, 0, M1_HUMANOID,
X M2_ORC | M2_HOSTILE | M2_STRONG | M2_GREEDY | M2_JEWELS | M2_COLLECT,
X 0, C(HI_LORD) },
X+ { "Grund the Orc King", S_ORC, 9, 5, MARM(10,4), 0, -5,
X+ (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_WEAP, AD_PHYS, 2, 8 }, { AT_WEAP, AD_PHYS, 2, 8 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1350, 350, 0, MS_ORC, MZ_HUMAN, 0, 0, M1_HUMANOID,
X+ M2_ORC | M2_HOSTILE | M2_STRONG | M2_GREEDY | M2_JEWELS | M2_COLLECT |
X+ M2_NOPOLY | M2_PNAME | M2_LORD | M2_STALK,
X+ 0, C(HI_LORD) },
X /* piercers */
X { "rock piercer", S_PIERCER, 3, 1, 3, 0, 0, (G_GENO | 4),
X { { AT_BITE, AD_PHYS, 2, 6 }, NO_ATTK, NO_ATTK,
X***************
X*** 518,523 ****
X--- 829,840 ----
X 400, 300, 0, MS_SILENT, MZ_MEDIUM, 0, 0,
X M1_CLING | M1_HIDE | M1_ANIMAL | M1_NOEYES | M1_NOLIMBS |
X M1_CARNIVORE, M2_HOSTILE, 0, C(CYAN) },
X+ { "glass piercer", S_PIERCER, 8, 1, 0, 0, 0, (G_GENO | 1),
X+ { { AT_BITE, AD_SLOW, 3, 8 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 400, 300, 0, MS_SILENT, MZ_MEDIUM, 0, 0,
X+ M1_CLING | M1_HIDE | M1_ANIMAL | M1_NOEYES | M1_NOLIMBS |
X+ M1_CARNIVORE, M2_HOSTILE, 0, C(WHITE) },
X /* quadrupeds (generic) */
X { "rothe", S_QUADRUPED, 2, 9, 7, 0, 0, (G_GENO | G_SGROUP | 4),
X { { AT_CLAW, AD_PHYS, 1, 3 }, { AT_BITE, AD_PHYS, 1, 3 },
X***************
X*** 530,535 ****
X--- 847,878 ----
X 2500, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X M1_ANIMAL | M1_THICK_HIDE | M1_NOHANDS | M1_CARNIVORE,
X M2_HOSTILE | M2_STRONG, 0, C(GRAY) },
X+ { "Jumbo the Elephant", S_QUADRUPED, 15, 9, 0, 0, 2,
X+ (G_UNIQ | G_NOGEN | G_NOCORPSE | 1),
X+ { { AT_BUTT, AD_PHYS, 5, 12 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 2500, 1500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_ANIMAL | M1_THICK_HIDE | M1_NOHANDS | M1_CARNIVORE,
X+ M2_HOSTILE | M2_STRONG | M2_NOPOLY | M2_PNAME | M2_PRINCE,
X+ 0, C(HI_LORD) },
X+ { "scramper", S_QUADRUPED, 3, 9, 7, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_CLAW, AD_PHYS, 1, 3 }, { AT_CLAW, AD_PHYS, 1, 3 },
X+ { AT_BITE, AD_LEGS, 1, 8 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 100, 100, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X+ M2_HOSTILE, 0, C(GRAY) },
X+ { "mangler", S_QUADRUPED, 4, 9, 7, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_CLAW, AD_PHYS, 1, 8 }, { AT_CLAW, AD_PHYS, 1, 8 },
X+ { AT_BITE, AD_DISE, 1, 12 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 100, 100, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X+ M2_HOSTILE, 0, C(GRAY) },
X+ { "berator", S_QUADRUPED, 5, 9, 7, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_CLAW, AD_PHYS, 1, 8 }, { AT_CLAW, AD_PHYS, 1, 8 },
X+ { AT_BITE, AD_DISE, 1, 12 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 100, 100, 0, MS_CUSS, MZ_LARGE, 0, 0,
X+ M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X+ M2_HOSTILE, 0, C(GRAY) },
X { "leocrotta", S_QUADRUPED, 6, 18, 4, 10, 0, (G_GENO | 2),
X { { AT_CLAW, AD_PHYS, 2, 6 }, { AT_BITE, AD_PHYS, 2, 6 },
X { AT_CLAW, AD_PHYS, 2, 6 }, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 542,547 ****
X--- 885,896 ----
X 2500, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X M1_CLING | M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X M2_HOSTILE | M2_STRONG, 0, C(CYAN) },
X+ { "bogwumpus", S_QUADRUPED, 10, 3, 2, 10, 0, (G_GENO | 1),
X+ { { AT_BITE, AD_PHYS, 5, 6 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 2500, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_CLING | M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X+ M2_HOSTILE | M2_STRONG, 0, C(CYAN) },
X { "titanothere", S_QUADRUPED, 12, 12, 6, 0, 0, (G_GENO | 2),
X { { AT_CLAW, AD_PHYS, 2, 8 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 555,566 ****
X--- 904,927 ----
X M1_ANIMAL | M1_THICK_HIDE | M1_NOHANDS | M1_HERBIVORE,
X M2_HOSTILE | M2_STRONG, 0, C(GRAY) },
X /* rodents */
X+ { "rabbit", S_RODENT, 0, 12, 8, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_BITE, AD_PHYS, 1, 2 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 20, 12, 0, MS_SILENT, MZ_TINY, 0, 0,
X+ M1_ANIMAL | M1_NOHANDS | M1_HERBIVORE,
X+ M2_PEACEFUL, 0, C(BROWN) },
X { "sewer rat", S_RODENT, 0, 12, 7, 0, 0, (G_GENO | G_SGROUP | 1),
X { { AT_BITE, AD_PHYS, 1, 3 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X 20, 12, 0, MS_SQEEK, MZ_TINY, 0, 0,
X M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X M2_HOSTILE, 0, C(BROWN) },
X+ { "black rat", S_RODENT, 1, 12, 7, 0, 0, (G_GENO | G_LGROUP | 1),
X+ { { AT_BITE, AD_PHYS, 1, 3 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 20, 12, 0, MS_SQEEK, MZ_TINY, 0, 0,
X+ M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X+ M2_HOSTILE, 0, C(BLACK) },
X { "giant rat", S_RODENT, 1, 10, 7, 0, 0, (G_GENO | G_SGROUP | 2),
X { { AT_BITE, AD_PHYS, 1, 3 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 585,590 ****
X--- 946,984 ----
X 30, 30, 0, MS_SILENT, MZ_SMALL, 0, 0,
X M1_TUNNEL | M1_ANIMAL | M1_NOHANDS | M1_METALLIVORE,
X M2_HOSTILE | M2_GREEDY | M2_JEWELS | M2_COLLECT, 0, C(GRAY) },
X+ { "killer rabbit", S_RODENT, 3, 12, 6, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_BITE, AD_PHYS, 2, 4 }, { AT_BITE, AD_PHYS, 2, 4 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 20, 12, 0, MS_ROAR, MZ_TINY, 0, 0,
X+ M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X+ M2_HOSTILE, 0, C(BROWN) },
X+ { "hellrat", S_RODENT, 7, 10, 7, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_BITE, AD_PHYS, 1, 12 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 30, 5, 0, MS_SQEEK, MZ_TINY, MR_FIRE, MR_FIRE,
X+ M1_ANIMAL | M1_NOHANDS | M1_POIS | M1_CARNIVORE,
X+ M2_HOSTILE, 0, C(RED) },
X+ { "vampire bunny", S_RODENT, 5, 12, 6, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_BITE, AD_PHYS, 1, 4 }, { AT_BITE, AD_DRST, 0, 0 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 20, 12, 0, MS_SILENT, MZ_TINY, MR_SLEEP | MR_POISON, 0,
X+ M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE | M1_BREATHLESS | M1_REGEN | M1_POIS,
X+ M2_HOSTILE | M2_UNDEAD, 0, C(BLACK) },
X+ { "Energizer Bunny", S_RODENT, 5, 12, 6, 0, 0, (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_BITE, AD_PHYS, 1, 6 }, { AT_TUCH, AD_ELEC, 2, 4 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 20, 12, 0, MS_SILENT, MZ_SMALL, MR_SLEEP | MR_POISON | MR_ELEC, 0,
X+ M1_ANIMAL | M1_NOHANDS | M1_BREATHLESS | M1_REGEN,
X+ M2_PEACEFUL | M2_STALK | M2_PNAME | M2_NOPOLY, 0, C(GRAY) },
X+ { "Bugs Bunny", S_RODENT, 10, 20, 4, 0, 0, (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_TUCH, AD_CONF, 0, 0 }, { AT_TUCH, AD_STUN, 0, 0 },
X+ { AT_TUCH, AD_SGLD, 0, 0 }, { AT_TUCH, AD_SITM, 0, 0 },
X+ { AT_WEAP, AD_PHYS, 1, 6 }, NO_ATTK },
X+ WT_HUMAN, 250, 0, MS_LAUGH, MZ_HUMAN, MR_SLEEP | MR_POISON | MR_STONE, 0,
X+ M1_HUMANOID | M1_REGEN | M1_TUNNEL,
X+ M2_PEACEFUL | M2_STALK | M2_PNAME | M2_NOPOLY | M2_MALE |
X+ M2_COLLECT | M2_MAGIC,
X+ 0, C(GRAY) },
X /* spiders and scorpions */
X { "cave spider", S_SPIDER, 1, 12, 3, 0, 0, (G_GENO | G_SGROUP | 2),
X { { AT_BITE, AD_PHYS, 1, 2 }, NO_ATTK, NO_ATTK,
X***************
X*** 592,597 ****
X--- 986,997 ----
X 50, 50, 0, MS_SILENT, MZ_TINY, MR_POISON, MR_POISON,
X M1_CONCEAL | M1_ANIMAL | M1_NOHANDS | M1_OVIPAROUS | M1_CARNIVORE,
X M2_HOSTILE, 0, C(GRAY) },
X+ { "recluse spider", S_SPIDER, 3, 12, 3, 0, 0, (G_GENO | G_SGROUP | 2),
X+ { { AT_BITE, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 50, 0, MS_SILENT, MZ_TINY, MR_POISON, MR_POISON,
X+ M1_CONCEAL | M1_ANIMAL | M1_NOHANDS | M1_OVIPAROUS | M1_CARNIVORE,
X+ M2_HOSTILE, 0, C(GRAY) },
X { "giant spider", S_SPIDER, 5, 15, 4, 0, 0, (G_GENO | 1),
X { { AT_BITE, AD_DRST, 2, 4 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 604,609 ****
X--- 1004,1021 ----
X 50, 100, 0, MS_SILENT, MZ_SMALL, MR_POISON, MR_POISON,
X M1_CONCEAL | M1_ANIMAL | M1_NOHANDS | M1_OVIPAROUS | M1_POIS |
X M1_CARNIVORE, M2_HOSTILE, 0, C(RED) },
X+ { "giant scorpion", S_SPIDER, 8, 15, 3, 0, 0, (G_GENO | 2),
X+ { { AT_CLAW, AD_PHYS, 1, 2 }, { AT_CLAW, AD_PHYS, 1, 2 },
X+ { AT_STNG, AD_DRST, 1, 8 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 100, 0, MS_SILENT, MZ_LARGE, MR_POISON, MR_POISON,
X+ M1_CONCEAL | M1_ANIMAL | M1_NOHANDS | M1_OVIPAROUS | M1_POIS |
X+ M1_CARNIVORE, M2_HOSTILE, 0, C(RED) },
X+ { "Girtab", S_SPIDER, 15, 15, 3, 0, 0, (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X+ { AT_STNG, AD_DRST, 1, 12 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 100, 100, 0, MS_SILENT, MZ_HUGE, MR_POISON, MR_POISON,
X+ M1_CONCEAL | M1_ANIMAL | M1_NOHANDS | M1_OVIPAROUS | M1_POIS |
X+ M1_CARNIVORE, M2_HOSTILE | M2_NOPOLY | M2_PNAME | M2_NEUTER, 0, C(RED) },
X /* trappers, lurkers, &c. */
X { "lurker above", S_TRAPPER, 10, 3, 3, 0, 0, (G_GENO | 2),
X { { AT_ENGL, AD_DGST, 1, 8 }, NO_ATTK, NO_ATTK,
X***************
X*** 636,641 ****
X--- 1048,1059 ----
X 1300, 300, 0, MS_NEIGH, MZ_LARGE,
X MR_POISON, MR_POISON, M1_NOHANDS | M1_HERBIVORE,
X M2_WANDER | M2_STRONG | M2_JEWELS, 0, C(BLACK) },
X+ { "nightmare", S_UNICORN, 8, 24, 2, 70, -7, (G_GENO | 1),
X+ { { AT_BUTT, AD_PHYS, 1, 12 }, { AT_KICK, AD_PHYS, 1, 8 },
X+ { AT_BREA, AD_FIRE, 1, 4 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1300, 300, 0, MS_NEIGH, MZ_LARGE,
X+ MR_POISON, MR_POISON, M1_NOHANDS | M1_HERBIVORE,
X+ M2_WANDER | M2_STRONG | M2_JEWELS, 0, C(BLACK) },
X /* vortices */
X { "fog cloud", S_VORTEX, 3, 1, 0, 0, 0, (G_GENO | G_NOCORPSE | 2),
X { { AT_ENGL, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK,
X***************
X*** 685,690 ****
X--- 1103,1136 ----
X M1_FLY | M1_BREATHLESS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD |
X M1_MINDLESS | M1_UNSOLID, M2_HOSTILE | M2_NEUTER, 0, C(YELLOW) },
X /* worms */
X+ { "maggot", S_WORM, 0, 12, 3, 0, 0, ( G_GENO | G_SGROUP | 2),
X+ { { AT_BITE, AD_PHYS, 1, 2 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 50, 0, MS_SILENT, MZ_TINY, 0, 0,
X+ M1_ANIMAL | M1_SLITHY | M1_NOLIMBS | M1_CARNIVORE | M1_POIS |
X+ M1_CONCEAL | M1_OVIPAROUS,
X+ M2_HOSTILE, 0, C(WHITE) },
X+ { "rot worm", S_WORM, 1, 12, 3, 0, 0, ( G_GENO | G_SGROUP | 2),
X+ { { AT_BITE, AD_PHYS, 1, 2 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 50, 0, MS_SILENT, MZ_TINY, 0, 0,
X+ M1_ANIMAL | M1_SLITHY | M1_NOLIMBS | M1_CARNIVORE | M1_POIS |
X+ M1_CONCEAL | M1_OVIPAROUS,
X+ M2_HOSTILE, 0, C(BROWN) },
X+ { "acid worm", S_WORM, 2, 12, 3, 0, 0, ( G_GENO | G_LGROUP | 2),
X+ { { AT_BITE, AD_PHYS, 1, 2 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 50, 0, MS_SILENT, MZ_TINY, 0, 0,
X+ M1_ANIMAL | M1_SLITHY | M1_NOLIMBS | M1_CARNIVORE | M1_POIS |
X+ M1_ACID | M1_CONCEAL | M1_OVIPAROUS,
X+ M2_HOSTILE, 0, C(BROWN) },
X+ { "tunnel worm", S_WORM, 4, 12, 3, 0, 0, ( G_GENO | 1),
X+ { { AT_BITE, AD_PHYS, 1, 2 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 50, 0, MS_SILENT, MZ_TINY, 0, 0,
X+ M1_ANIMAL | M1_SLITHY | M1_NOLIMBS | M1_CARNIVORE | M1_POIS |
X+ M1_OVIPAROUS | M1_TUNNEL | M1_THICK_HIDE,
X+ M2_HOSTILE, 0, C(BROWN) },
X { "baby long worm", S_WORM, 8, 3, 5, 0, 0, G_GENO,
X { { AT_BITE, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 723,728 ****
X--- 1169,1193 ----
X NO_ATTK, NO_ATTK, NO_ATTK },
X 15, 10, 0, MS_BUZZ, MZ_TINY, MR_ELEC | MR_POISON, 0,
X M1_ANIMAL, M2_HOSTILE, 0, C(MAGENTA) },
X+ { "arc bug", S_XAN, 2, 12, 9, 0, 0,
X+ (G_GENO | G_SGROUP | G_NOCORPSE | 2),
X+ { { AT_BITE, AD_ELEC, 1, 4 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 15, 10, 0, MS_BUZZ, MZ_TINY, MR_ELEC | MR_POISON, 0,
X+ M1_ANIMAL, M2_HOSTILE, 0, C(MAGENTA) },
X+ /* or should it be SPARC bug? :-) */
X+ { "spark bug", S_XAN, 4, 12, 9, 0, 0,
X+ (G_GENO | G_LGROUP | G_NOCORPSE | 2),
X+ { { AT_BITE, AD_ELEC, 1, 5 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 15, 10, 0, MS_BUZZ, MZ_TINY, MR_ELEC | MR_POISON, 0,
X+ M1_ANIMAL, M2_HOSTILE, 0, C(MAGENTA) },
X+ { "lightning bug", S_XAN, 6, 12, 9, 0, 0,
X+ (G_GENO | G_LGROUP | G_NOCORPSE | 2),
X+ { { AT_BITE, AD_ELEC, 1, 8 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 15, 10, 0, MS_BUZZ, MZ_TINY, MR_ELEC | MR_POISON, 0,
X+ M1_ANIMAL, M2_HOSTILE, 0, C(MAGENTA) },
X { "xan", S_XAN, 7, 18, -4, 0, 0, (G_GENO | 3),
X { { AT_STNG, AD_LEGS, 1, 4 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 792,809 ****
X--- 1257,1292 ----
X 20, 20, 0, MS_SQEEK, MZ_TINY, 0, 0,
X M1_FLY | M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X M2_WANDER, 0, C(BROWN) },
X+ { "rhumbat", S_BAT, 1, 25, 6, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_BITE, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 20, 20, 0, MS_SQEEK, MZ_TINY, 0, 0,
X+ M1_FLY | M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X+ M2_WANDER, 0, C(BROWN) },
X { "giant bat", S_BAT, 2, 22, 7, 0, 0, (G_GENO | 2),
X { { AT_BITE, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X 30, 30, 0, MS_SQEEK, MZ_MEDIUM, 0, 0,
X M1_FLY | M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X M2_WANDER | M2_HOSTILE, 0, C(RED) },
X+ { "mongbat", S_BAT, 3, 25, 6, 0, 0, (G_GENO | 1),
X+ { { AT_BITE, AD_PHYS, 1, 10 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 30, 30, 0, MS_SQEEK, MZ_SMALL, 0, 0,
X+ M1_FLY | M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE,
X+ M2_WANDER | M2_HOSTILE, 0, C(RED) },
X { "vampire bat", S_BAT, 5, 20, 6, 0, 0, (G_GENO | 2),
X { { AT_BITE, AD_PHYS, 1, 6 }, { AT_BITE, AD_DRST, 0, 0 },
X NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X 30, 20, 0, MS_SQEEK, MZ_TINY, MR_SLEEP | MR_POISON, 0,
X M1_FLY | M1_BREATHLESS | M1_ANIMAL | M1_NOHANDS | M1_POIS | M1_REGEN,
X M2_UNDEAD | M2_HOSTILE, 0, C(BLACK) },
X+ { "hellbat", S_BAT, 8, 36, 6, 0, 0, (G_GENO | 1),
X+ { { AT_BITE, AD_PHYS, 1, 12 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 30, 20, 0, MS_SQEEK, MZ_TINY, MR_FIRE, 0,
X+ M1_FLY | M1_ANIMAL | M1_NOHANDS,
X+ M2_HOSTILE | M2_WANDER, 0, C(RED) },
X /* Centaurs */
X { "plains centaur", S_CENTAUR, 4, 18, 4, 0, 0, (G_GENO | 1),
X { { AT_WEAP, AD_PHYS, 1, 6 }, { AT_KICK, AD_PHYS, 1, 6 },
X***************
X*** 820,825 ****
X--- 1303,1327 ----
X { AT_KICK, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK, NO_ATTK },
X 2550, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X M1_HUMANOID, M2_STRONG | M2_GREEDY | M2_COLLECT, 0, C(CYAN) },
X+ { "centaur shaman", S_CENTAUR, 6, 20, 2, 10, -3, (G_GENO | 1),
X+ { { AT_MAGC, AD_SPEL, 1, 10 }, { AT_KICK, AD_PHYS, 1, 6 },
X+ { AT_KICK, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 2550, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_HUMANOID, M2_STRONG | M2_GREEDY | M2_COLLECT, 0, C(BROWN) },
X+ { "centaur chieftan", S_CENTAUR, 8, 20, 2, 10, -3, (G_GENO | 1),
X+ { { AT_WEAP, AD_PHYS, 1, 10 }, { AT_KICK, AD_PHYS, 1, 6 },
X+ { AT_KICK, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 2550, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_HUMANOID, M2_STRONG | M2_GREEDY | M2_COLLECT | M2_LORD, 0, C(BROWN) },
X+ { "Silva the Centaur King", S_CENTAUR, 13, 20, 2, 10, -3,
X+ (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_WEAP, AD_PHYS, 1, 12 }, { AT_KICK, AD_PHYS, 1, 6 },
X+ { AT_KICK, AD_PHYS, 1, 6 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 2550, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_HUMANOID,
X+ M2_STRONG | M2_GREEDY | M2_COLLECT | M2_PRINCE | M2_NOPOLY | M2_MALE |
X+ M2_PNAME | M2_STALK,
X+ 0, C(HI_LORD) },
X /* Dragons. The order of the dragons is VERY IMPORTANT. Quite a few
X pieces of code depend on gray being first and yellow being last.
X The code also depends on the *order* being the same as that for
X***************
X*** 935,950 ****
X M1_CARNIVORE | M1_POIS,
X M2_HOSTILE | M2_STRONG | M2_NASTY | M2_GREEDY | M2_JEWELS | M2_MAGIC,
X 0, C(GREEN) },
X! { "yellow dragon", S_DRAGON, 15, 9, -1, 20, 7, (G_GENO | 1),
X! { { AT_BREA, AD_ACID, 4, 6 }, { AT_BITE, AD_PHYS, 3, 8 },
X { AT_CLAW, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X NO_ATTK, NO_ATTK },
X WT_DRAGON, 1500, 0, MS_ROAR, MZ_GIGANTIC,
X! MR_ACID | MR_STONE, MR_STONE,
X M1_FLY | M1_THICK_HIDE | M1_NOHANDS | M1_SEE_INVIS | M1_OVIPAROUS |
X M1_CARNIVORE | M1_ACID,
X! M2_HOSTILE | M2_STRONG | M2_NASTY | M2_GREEDY | M2_JEWELS | M2_MAGIC,
X! 0, C(YELLOW) },
X /* Elementals */
X { "air elemental", S_ELEMENTAL, 8, 36, 2, 30, 0, (G_NOCORPSE | 1),
X { { AT_ENGL, AD_PHYS, 2, 10 }, NO_ATTK, NO_ATTK,
X--- 1437,1474 ----
X M1_CARNIVORE | M1_POIS,
X M2_HOSTILE | M2_STRONG | M2_NASTY | M2_GREEDY | M2_JEWELS | M2_MAGIC,
X 0, C(GREEN) },
X! { "yellow dragon", S_DRAGON, 15, 9, -1, 20, 7, (G_GENO | 1),
X! { { AT_BREA, AD_ACID, 4, 6 }, { AT_BITE, AD_PHYS, 3, 8 },
X! { AT_CLAW, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X! NO_ATTK, NO_ATTK },
X! WT_DRAGON, 1500, 0, MS_ROAR, MZ_GIGANTIC,
X! MR_ACID | MR_STONE, MR_STONE,
X! M1_FLY | M1_THICK_HIDE | M1_NOHANDS | M1_SEE_INVIS | M1_OVIPAROUS |
X! M1_CARNIVORE | M1_ACID,
X! M2_HOSTILE | M2_STRONG | M2_NASTY | M2_GREEDY | M2_JEWELS | M2_MAGIC,
X! 0, C(YELLOW) },
X! { "undead dragon", S_DRAGON, 13, 9, -1, 20, -6, (G_GENO | 1),
X! { { AT_BREA, AD_DISN, 4, 10 }, { AT_BITE, AD_PHYS, 3, 8 },
X { AT_CLAW, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X NO_ATTK, NO_ATTK },
X WT_DRAGON, 1500, 0, MS_ROAR, MZ_GIGANTIC,
X! MR_DISINT, 0,
X! M1_FLY | M1_THICK_HIDE | M1_NOHANDS | M1_SEE_INVIS | M1_OVIPAROUS |
X! M1_CARNIVORE,
X! M2_HOSTILE | M2_STRONG | M2_NASTY | M2_GREEDY | M2_JEWELS | M2_MAGIC |
X! M2_UNDEAD,
X! 0, C(WHITE) },
X! { "Tiamat", S_DRAGON, 90, 9, -1, 20, 7, (G_UNIQ | G_NOCORPSE | 1),
X! { { AT_BREA, AD_FIRE, 6, 6 }, { AT_BREA, AD_DRST, 4, 6 },
X! { AT_BREA, AD_ELEC, 4, 6 }, { AT_BREA, AD_SLEE, 4, 6 },
X! { AT_BITE, AD_PHYS, 6, 10 }, NO_ATTK },
X! WT_DRAGON, 1500, 0, MS_ROAR, MZ_GIGANTIC,
X! MR_FIRE | MR_ELEC | MR_SLEEP, MR_FIRE,
X M1_FLY | M1_THICK_HIDE | M1_NOHANDS | M1_SEE_INVIS | M1_OVIPAROUS |
X M1_CARNIVORE | M1_ACID,
X! M2_HOSTILE | M2_STRONG | M2_NASTY | M2_GREEDY | M2_JEWELS | M2_MAGIC |
X! M2_NOPOLY | M2_PNAME | M2_STALK,
X! 0, C(HI_LORD) },
X /* Elementals */
X { "air elemental", S_ELEMENTAL, 8, 36, 2, 30, 0, (G_NOCORPSE | 1),
X { { AT_ENGL, AD_PHYS, 2, 10 }, NO_ATTK, NO_ATTK,
X***************
X*** 1005,1010 ****
X--- 1529,1558 ----
X M1_BREATHLESS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD | M1_MINDLESS |
X M1_OMNIVORE,
X M2_HOSTILE | M2_NEUTER, 0, C(RED) },
X+ { "black mold", S_FUNGUS, 1, 0, 9, 0, 0, (G_GENO | 1),
X+ { { AT_NONE, AD_COLD, 0, 4 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 30, 0, MS_SILENT, MZ_SMALL,
X+ MR_COLD | MR_POISON, MR_COLD | MR_POISON,
X+ M1_BREATHLESS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD | M1_MINDLESS |
X+ M1_OMNIVORE,
X+ M2_HOSTILE | M2_NEUTER, 0, C(BLACK) },
X+ { "disgusting mold", S_FUNGUS, 5, 0, 9, 0, 0, (G_GENO | 1),
X+ { { AT_TUCH, AD_DRCO, 3, 4 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 30, 0, MS_SILENT, MZ_SMALL,
X+ MR_POISON, MR_POISON,
X+ M1_BREATHLESS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD | M1_MINDLESS |
X+ M1_OMNIVORE | M1_ACID | M1_OMNIVORE,
X+ M2_HOSTILE | M2_NEUTER, 0, C(BLACK) },
X+ { "creeping mold", S_FUNGUS, 6, 1, 9, 0, 0, (G_GENO | 1),
X+ { { AT_ENGL, AD_ACID, 1, 4 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 50, 30, 0, MS_SILENT, MZ_SMALL,
X+ MR_POISON, MR_POISON,
X+ M1_BREATHLESS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD | M1_MINDLESS |
X+ M1_OMNIVORE | M1_ACID | M1_OMNIVORE,
X+ M2_HOSTILE | M2_NEUTER, 0, C(BLACK) },
X { "shrieker", S_FUNGUS, 3, 1, 7, 0, 0, (G_GENO | 1),
X { NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X 100, 100, 0, MS_SHRIEK, MZ_SMALL, MR_POISON, MR_POISON,
X***************
X*** 1023,1028 ****
X--- 1571,1581 ----
X NO_ATTK, NO_ATTK, NO_ATTK },
X 650, 100, 0, MS_ORC, MZ_SMALL, 0, 0,
X M1_HUMANOID, M2_COLLECT, 0, C(BROWN) },
X+ { "gnome thief", S_GNOME, 1, 6, MARM(10,5), 4, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_WEAP, AD_PHYS, 1, 6 }, { AT_TUCH, AD_SGLD, 0, 0 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 650, 100, 0, MS_ORC, MZ_SMALL, 0, 0,
X+ M1_HUMANOID, M2_COLLECT | M2_GREEDY, 0, C(BROWN) },
X { "gnome lord", S_GNOME, 3, 8, MARM(10,4), 4, 0, (G_GENO | 2),
X { { AT_WEAP, AD_PHYS, 1, 8 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1099,1104 ****
X--- 1652,1665 ----
X 1700, 500, 0, MS_GRUNT, MZ_HUGE, 0, 0,
X M1_ANIMAL | M1_HUMANOID | M1_CARNIVORE,
X M2_HOSTILE | M2_STRONG | M2_NASTY | M2_COLLECT, 0, C(BROWN) },
X+ /* need a "small shrimp" for the ';' class... */
X+ { "large giant", S_GIANT, 16, 18, -3, 70, -7, (G_GENO | 1),
X+ { { AT_WEAP, AD_PHYS, 3, 8 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 2250, 750, 0, MS_SILENT, MZ_HUGE, 0, 0,
X+ M1_SWIM | M1_HUMANOID,
X+ M2_GIANT | M2_STRONG | M2_ROCKTHROW | M2_NASTY | M2_COLLECT |
X+ M2_JEWELS, 0, C(RED) },
X { "titan", S_GIANT, 16, 18, -3, 70, 9, 1,
X { { AT_WEAP, AD_PHYS, 2, 8 }, { AT_MAGC, AD_SPEL, 0, 0 },
X NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1156,1161 ****
X--- 1717,1728 ----
X WT_HUMAN, 200, 0, MS_ARREST, MZ_HUMAN, 0, 0, M1_HUMANOID,
X M2_HUMAN | M2_WANDER | M2_HOSTILE | M2_STRONG | M2_MALE | M2_COLLECT,
X 0, C(HI_LORD) },
X+ { "Kop Kommisioner", S_KOP, 8, 12, MARM(10,4), 20, 12, (G_GENO | G_NOGEN),
X+ { { AT_WEAP, AD_PHYS, 2, 8 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 200, 0, MS_ARREST, MZ_HUMAN, 0, 0, M1_HUMANOID,
X+ M2_HUMAN | M2_WANDER | M2_HOSTILE | M2_STRONG | M2_MALE | M2_COLLECT,
X+ 0, C(HI_LORD) },
X #endif
X /* Liches */
X { "lich", S_LICH, 11, 6, 0, 30, -9, (G_GENO | 1),
X***************
X*** 1230,1235 ****
X--- 1797,1810 ----
X M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID | M1_POIS,
X M2_UNDEAD | M2_HOSTILE | M2_GIANT | M2_STRONG | M2_JEWELS,
X 0, C(CYAN) },
X+ { "The Mummy", S_MUMMY, 13, 14, 4, 30, -7, (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_PHYS, 3, 4 }, { AT_CLAW, AD_PHYS, 3, 4 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 200, 0, MS_SILENT, MZ_HUMAN,
X+ MR_COLD | MR_SLEEP | MR_POISON, 0,
X+ M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID | M1_POIS,
X+ M2_UNDEAD | M2_HOSTILE | M2_PNAME | M2_STALK | M2_STRONG | M2_NOPOLY,
X+ 0, C(GRAY) },
X /* Nagas */
X { "red naga hatchling", S_NAGA, 3, 10, 6, 0, 0, G_GENO,
X { { AT_BITE, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK,
X***************
X*** 1237,1242 ****
X--- 1812,1823 ----
X 500, 100, 0, MS_MUMBLE, MZ_LARGE,
X MR_FIRE | MR_POISON, MR_FIRE | MR_POISON,
X M1_NOLIMBS | M1_SLITHY | M1_THICK_HIDE, M2_STRONG, 0, C(RED) },
X+ { "blue naga hatchling", S_NAGA, 3, 10, 6, 0, 0, G_GENO,
X+ { { AT_BITE, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 500, 100, 0, MS_MUMBLE, MZ_LARGE,
X+ MR_ELEC | MR_POISON, MR_ELEC | MR_POISON,
X+ M1_NOLIMBS | M1_SLITHY | M1_THICK_HIDE, M2_STRONG, 0, C(BLUE) },
X { "black naga hatchling", S_NAGA, 3, 10, 6, 0, 0, G_GENO,
X { { AT_BITE, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1260,1265 ****
X--- 1841,1853 ----
X MR_FIRE | MR_POISON, MR_FIRE | MR_POISON,
X M1_NOLIMBS | M1_SLITHY | M1_THICK_HIDE | M1_OVIPAROUS,
X M2_STRONG, 0, C(RED) },
X+ { "blue naga", S_NAGA, 6, 12, 4, 0, 4, (G_GENO | 1),
X+ { { AT_BITE, AD_PHYS, 2, 4 }, { AT_BREA, AD_ELEC, 2, 6 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 2600, 400, 0, MS_MUMBLE, MZ_HUGE,
X+ MR_ELEC | MR_POISON, MR_ELEC | MR_POISON,
X+ M1_NOLIMBS | M1_SLITHY | M1_THICK_HIDE | M1_OVIPAROUS,
X+ M2_STRONG, 0, C(BLUE) },
X { "black naga", S_NAGA, 8, 14, 2, 10, 4, (G_GENO | 1),
X { { AT_BITE, AD_PHYS, 2, 6 }, { AT_SPIT, AD_ACID, 0, 0 },
X NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1292,1297 ****
X--- 1880,1891 ----
X 1700, 700, 0, MS_GRUNT, MZ_LARGE, 0, 0, M1_HUMANOID,
X M2_STRONG | M2_LORD | M2_MALE | M2_GREEDY | M2_JEWELS | M2_COLLECT,
X 0, C(RED) },
X+ { "ogre magi", S_OGRE, 7, 12, 3, 30, -5, (G_GENO | 1),
X+ { { AT_WEAP, AD_PHYS, 2, 6 }, { AT_MAGC, AD_SPEL, 0, 0 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1700, 700, 0, MS_GRUNT, MZ_LARGE, 0, 0, M1_HUMANOID,
X+ M2_STRONG | M2_LORD | M2_MALE | M2_GREEDY | M2_JEWELS | M2_COLLECT,
X+ 0, C(RED) },
X { "ogre king", S_OGRE, 7, 14, 4, 60, -7, (G_GENO | 2),
X { { AT_WEAP, AD_PHYS, 3, 5 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1326,1337 ****
X--- 1920,1945 ----
X M1_BREATHLESS | M1_AMORPHOUS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD |
X M1_MINDLESS | M1_OMNIVORE | M1_ACID,
X M2_HOSTILE | M2_NEUTER, 0, C(BLACK) },
X+ { "tapioca pudding", S_PUDDING, 14, 6, 6, 0, 0, (G_GENO | 1),
X+ { { AT_BITE, AD_RUST, 6, 8 }, { AT_NONE, AD_RUST, 0, 0 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 900, 250, 0, MS_SILENT, MZ_LARGE,
X+ MR_COLD | MR_ELEC | MR_POISON | MR_ACID | MR_STONE,
X+ MR_COLD | MR_ELEC | MR_POISON,
X+ M1_BREATHLESS | M1_AMORPHOUS | M1_NOEYES | M1_NOLIMBS | M1_NOHEAD |
X+ M1_MINDLESS | M1_OMNIVORE | M1_ACID,
X+ M2_HOSTILE | M2_NEUTER, 0, C(WHITE) },
X /* Quantum Mechanics */
X { "quantum mechanic", S_QUANTMECH, 7, 12, 3, 10, 0, (G_GENO | 3),
X { { AT_CLAW, AD_TLPT, 1, 4 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X WT_HUMAN, 20, 0, MS_HUMANOID, MZ_HUMAN, MR_POISON, 0,
X M1_HUMANOID | M1_POIS | M1_TPORT, M2_HOSTILE, 0, C(CYAN) },
X+ { "auto mechanic", S_QUANTMECH, 9, 12, 3, 10, 0, (G_GENO | 1),
X+ { { AT_CLAW, AD_TLPT, 1, 8 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 20, 0, MS_HUMANOID, MZ_HUMAN, 0, 0,
X+ M1_HUMANOID | M1_POIS | M1_TPORT, M2_HOSTILE, 0, C(BROWN) },
X /* Rust Monster */
X { "rust monster", S_RUSTMONST, 5, 18, 2, 0, 0, (G_GENO | 2),
X { { AT_TUCH, AD_RUST, 0, 0 }, { AT_TUCH, AD_RUST, 0, 0 },
X***************
X*** 1339,1344 ****
X--- 1947,1958 ----
X 1000, 250, 0, MS_SILENT, MZ_MEDIUM, 0, 0,
X M1_SWIM | M1_ANIMAL | M1_NOHANDS | M1_METALLIVORE, M2_HOSTILE,
X 0, C(BROWN) },
X+ { "giant rust monster", S_RUSTMONST, 9, 18, 2, 0, 0, (G_GENO | 1),
X+ { { AT_TUCH, AD_RUST, 0, 0 }, { AT_TUCH, AD_RUST, 0, 0 },
X+ { AT_NONE, AD_RUST, 0, 0 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1000, 250, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_SWIM | M1_ANIMAL | M1_NOHANDS | M1_METALLIVORE, M2_HOSTILE,
X+ 0, C(BROWN) },
X /* Snakes */
X { "garter snake", S_SNAKE, 1, 8, 8, 0, 0, (G_LGROUP | G_GENO | 1),
X { { AT_BITE, AD_PHYS, 1, 2 }, NO_ATTK, NO_ATTK,
X***************
X*** 1359,1364 ****
X--- 1973,1992 ----
X 150, 80, 0, MS_HISS, MZ_SMALL, MR_POISON, MR_POISON,
X M1_SWIM | M1_CONCEAL | M1_NOLIMBS | M1_ANIMAL | M1_SLITHY | M1_POIS |
X M1_CARNIVORE | M1_OVIPAROUS, M2_HOSTILE, 0, C(RED) },
X+ { "asp", S_SNAKE, 5, 20, 2, 0, 0, (G_GENO | 1),
X+ { { AT_BITE, AD_DRST, 1, 4 }, { AT_BITE, AD_DRST, 1, 4 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 100, 60, 0, MS_HISS, MZ_MEDIUM,
X+ MR_POISON, MR_POISON,
X+ M1_SWIM | M1_CONCEAL | M1_NOLIMBS | M1_ANIMAL | M1_SLITHY | M1_POIS |
X+ M1_CARNIVORE | M1_OVIPAROUS, M2_HOSTILE, 0, C(BROWN) },
X+ { "asphyx", S_SNAKE, 5, 20, 2, 0, 0, (G_GENO | 1),
X+ { { AT_BITE, AD_STON, 1, 4 }, { AT_BITE, AD_DRST, 1, 4 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 250, 100, 0, MS_HISS, MZ_MEDIUM,
X+ MR_POISON, MR_POISON,
X+ M1_SWIM | M1_CONCEAL | M1_NOLIMBS | M1_ANIMAL | M1_SLITHY | M1_POIS |
X+ M1_CARNIVORE | M1_OVIPAROUS, M2_HOSTILE, 0, C(BLUE) },
X { "pit viper", S_SNAKE, 6, 15, 2, 0, 0, (G_GENO | 1),
X { { AT_BITE, AD_DRST, 1, 4 }, { AT_BITE, AD_DRST, 1, 4 },
X NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1398,1403 ****
X--- 2026,2037 ----
X 1200, 300, 0, MS_GRUNT, MZ_LARGE, 0, 0,
X M1_HUMANOID | M1_REGEN | M1_CARNIVORE,
X M2_STRONG | M2_STALK | M2_HOSTILE | M2_COLLECT, 0, C(CYAN) },
X+ { "black troll", S_TROLL, 11, 12, 0, 0, -3, (G_GENO | 1),
X+ { { AT_CLAW, AD_PHYS, 2, 8 }, { AT_WEAP, AD_PHYS, 3, 6 },
X+ { AT_BITE, AD_PHYS, 2, 6 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1200, 300, 0, MS_GRUNT, MZ_LARGE, 0, 0,
X+ M1_HUMANOID | M1_REGEN | M1_CARNIVORE,
X+ M2_STRONG | M2_STALK | M2_HOSTILE | M2_COLLECT, 0, C(BLACK) },
X { "water troll", S_TROLL, 11, 14, 4, 40, -3, (G_NOGEN | G_GENO),
X { { AT_CLAW, AD_PHYS, 2, 8 }, { AT_CLAW, AD_PHYS, 2, 8 },
X { AT_BITE, AD_PHYS, 2, 6 }, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1417,1422 ****
X--- 2051,2070 ----
X NO_ATTK, NO_ATTK },
X 1200, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X M1_TUNNEL | M1_CARNIVORE, M2_STRONG, 0, C(BROWN) },
X+ { "hulk", S_UMBER, 13, 6, 2, 25, 0, (G_GENO | 2),
X+ { { AT_CLAW, AD_PHYS, 3, 4 }, { AT_CLAW, AD_PHYS, 3, 4 },
X+ { AT_BITE, AD_PHYS, 2, 5 }, { AT_GAZE, AD_CONF, 0, 0 },
X+ NO_ATTK, NO_ATTK },
X+ 1200, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_CARNIVORE, M2_STRONG | M2_GREEDY, 0, C(GRAY) },
X+ { "the Incredible Hulk", S_UMBER, 16, 6, 2, 25, 0, (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_PHYS, 3, 4 }, { AT_CLAW, AD_PHYS, 3, 4 },
X+ { AT_BITE, AD_PHYS, 2, 5 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK },
X+ 1200, 500, 0, MS_SILENT, MZ_LARGE, 0, 0,
X+ M1_CARNIVORE | M1_REGEN,
X+ M2_STRONG | M2_PNAME | M2_NOPOLY | M2_STALK,
X+ 0, C(GREEN) },
X /* Vampires */
X { "vampire", S_VAMPIRE, 10, 12, 1, 25, -8, (G_GENO | 1),
X { { AT_CLAW, AD_PHYS, 1, 6 }, { AT_BITE, AD_DRLI, 1, 6 },
X***************
X*** 1488,1493 ****
X--- 2136,2147 ----
X 1600, 700, 0, MS_GROWL, MZ_LARGE, MR_COLD, MR_COLD,
X M1_ANIMAL | M1_HUMANOID | M1_CARNIVORE,
X M2_HOSTILE | M2_STRONG, 0, C(WHITE) },
X+ { "Yuval", S_YETI, 5, 15, 6, 0, 0, (G_UNIQ | G_NOGEN | G_NOCORPSE),
X+ { { AT_WEAP, AD_PHYS, 1, 12 }, { AT_MAGC, AD_CLRC, 0, 0 },
X+ { AT_BITE, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1100, 500, 0, MS_GROWL, MZ_LARGE, MR_COLD, MR_COLD,
X+ M1_ANIMAL | M1_HUMANOID | M1_CARNIVORE,
X+ M2_STRONG | M2_NOPOLY | M2_PNAME | M2_PRINCE | M2_HOSTILE, 0, C(GRAY) },
X { "carnivorous ape", S_YETI, 6, 12, 6, 0, 0, (G_GENO | 1),
X { { AT_CLAW, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X { AT_HUGS, AD_PHYS, 1, 8 }, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1500,1505 ****
X--- 2154,2177 ----
X 1550, 750, 0, MS_GROWL, MZ_LARGE, 0, 0,
X M1_ANIMAL | M1_HUMANOID | M1_SEE_INVIS | M1_OMNIVORE,
X M2_STRONG, 0, C(GRAY) },
X+ { "cave ape", S_YETI, 8, 12, 6, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { { AT_CLAW, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X+ { AT_HUGS, AD_PHYS, 1, 8 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1100, 500, 0, MS_GROWL, MZ_LARGE, 0, 0,
X+ M1_ANIMAL | M1_HUMANOID | M1_CARNIVORE,
X+ M2_STRONG, 0, C(GRAY) },
X+ { "J.R. `Bob' Dobbs", S_YETI, 15, 15, MARM(10,2), 25, 0,
X+ (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_PHYS, 1, 6 }, { AT_CLAW, AD_PHYS, 1, 6 },
X+ { AT_BITE, AD_PHYS, 1, 4 }, { AT_GAZE, AD_CONF, 0, 0 },
X+ { AT_TUCH, AD_SGLD, 0, 0 }, { AT_TUCH, AD_SITM, 0, 0 } },
X+ WT_HUMAN, 700, 0, MS_LAUGH, MZ_HUMAN, MR_SLEEP | MR_POISON | MR_STONE,
X+ MR_SLEEP | MR_POISON | MR_STONE,
X+ M1_TUNNEL | M1_NEEDPICK | M1_CONCEAL | M1_HUMANOID | M1_OMNIVORE |
X+ M1_SWIM | M1_REGEN | M1_SEE_INVIS | M1_TPORT,
X+ M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG | M2_PNAME | M2_PRINCE |
X+ M2_MALE | M2_WANDER | M2_GREEDY | M2_COLLECT | M2_MAGIC,
X+ 0, C(HI_LORD) },
X /* Zombies */
X { "kobold zombie", S_ZOMBIE, 0, 6, 10, 0, -2, (G_GENO | G_NOCORPSE | 1),
X { { AT_CLAW, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK,
X***************
X*** 1539,1544 ****
X--- 2211,2234 ----
X MR_COLD | MR_SLEEP | MR_POISON, 0,
X M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID,
X M2_UNDEAD | M2_STALK | M2_HOSTILE, 0, C(HI_DOMESTIC) },
X+ { "ghoul", S_ZOMBIE, 5, 6, 8, 0, -3,
X+ (G_GENO | G_SGROUP | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_SLEE, 1, 8 }, { AT_CLAW, AD_SLEE, 1, 8 },
X+ { AT_BITE, AD_DISE, 1, 4 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 200, 0, MS_GROWL, MZ_HUMAN,
X+ MR_COLD | MR_SLEEP | MR_POISON, 0,
X+ M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID,
X+ M2_UNDEAD | M2_STALK | M2_HOSTILE, 0, C(GRAY) },
X+ { "ghast", S_ZOMBIE, 5, 6, 8, 0, -3,
X+ (G_GENO | G_SGROUP | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_DCAY, 1, 8 }, { AT_CLAW, AD_DCAY, 1, 8 },
X+ { AT_BITE, AD_DISE, 1, 4 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 200, 0, MS_GROWL, MZ_HUMAN,
X+ MR_COLD | MR_SLEEP | MR_POISON, 0,
X+ M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID,
X+ M2_UNDEAD | M2_STALK | M2_HOSTILE, 0, C(GRAY) },
X { "ettin zombie", S_ZOMBIE, 6, 8, 6, 0, -4, (G_GENO | G_NOCORPSE | 1),
X { { AT_CLAW, AD_PHYS, 1, 10 }, { AT_CLAW, AD_PHYS, 1, 10 },
X NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1546,1551 ****
X--- 2236,2249 ----
X MR_COLD | MR_SLEEP | MR_POISON, 0,
X M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID,
X M2_UNDEAD | M2_STALK | M2_HOSTILE | M2_STRONG, 0, C(BLUE) },
X+ /* zombi is not a spelling mistake... leave it be */
X+ { "juju zombi", S_ZOMBIE, 7, 8, 6, 0, -4, (G_GENO | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_PHYS, 1, 12 }, { AT_CLAW, AD_PHYS, 1, 12 },
X+ { AT_HUGS, AD_PHYS, 2, 4 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1700, 250, 0, MS_SILENT, MZ_LARGE,
X+ MR_COLD | MR_SLEEP | MR_POISON, 0,
X+ M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID,
X+ M2_UNDEAD | M2_STALK | M2_HOSTILE | M2_STRONG, 0, C(BLUE) },
X { "giant zombie", S_ZOMBIE, 8, 8, 6, 0, -4, (G_GENO | G_NOCORPSE | 1),
X { { AT_CLAW, AD_PHYS, 2, 8 }, { AT_CLAW, AD_PHYS, 2, 8 },
X NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1617,1622 ****
X--- 2315,2327 ----
X MR_FIRE | MR_COLD | MR_ELEC | MR_SLEEP | MR_POISON, 0,
X M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID | M1_THICK_HIDE | M1_POIS,
X M2_HOSTILE | M2_STRONG | M2_COLLECT, 0, C(HI_METAL) },
X+ { "mist golem", S_GOLEM, 18, 6, -5, 60, 0, (G_GENO | G_NOCORPSE | 1),
X+ { { AT_CLAW, AD_PHYS, 4, 10 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 2000, 0, 0, MS_SILENT, MZ_LARGE,
X+ MR_FIRE | MR_COLD | MR_ELEC | MR_SLEEP | MR_POISON, 0,
X+ M1_BREATHLESS | M1_MINDLESS | M1_HUMANOID | M1_THICK_HIDE | M1_POIS,
X+ M2_HOSTILE | M2_STRONG | M2_COLLECT, 0, C(GRAY) },
X /* Humans */
X { "human", S_HUMAN, 0, 12, 10, 0, 0, G_NOGEN, /* for corpses */
X { {AT_WEAP, AD_PHYS, 1, 6}, NO_ATTK, NO_ATTK,
X***************
X*** 1670,1675 ****
X--- 2375,2396 ----
X M1_HUMANOID | M1_OMNIVORE,
X M2_ELF | M2_STRONG | M2_LORD | M2_MALE | M2_COLLECT,
X 0, C(BRIGHT_BLUE) },
X+ { "elven mage", S_HUMAN, 8, 12, MARM(10,5), 20, -9,
X+ (G_GENO | G_SGROUP | 2),
X+ { { AT_WEAP, AD_PHYS, 2, 4 }, { AT_MAGC, AD_SPEL, 0, 0 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_ELF, 350, 0, MS_HUMANOID, MZ_HUMAN, MR_SLEEP, MR_SLEEP,
X+ M1_HUMANOID | M1_OMNIVORE,
X+ M2_ELF | M2_STRONG | M2_LORD | M2_MALE | M2_COLLECT,
X+ 0, C(BRIGHT_BLUE) },
X+ { "elven priest", S_HUMAN, 8, 12, MARM(10,5), 20, -9,
X+ (G_GENO | G_SGROUP | 2),
X+ { { AT_WEAP, AD_PHYS, 2, 4 }, { AT_MAGC, AD_CLRC, 0, 0 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_ELF, 350, 0, MS_HUMANOID, MZ_HUMAN, MR_SLEEP, MR_SLEEP,
X+ M1_HUMANOID | M1_OMNIVORE,
X+ M2_ELF | M2_STRONG | M2_LORD | M2_MALE | M2_COLLECT,
X+ 0, C(BRIGHT_BLUE) },
X { "Elvenking", S_HUMAN, 9, 12, MARM(10,5), 25, -10, (G_GENO | 1),
X { { AT_WEAP, AD_PHYS, 2, 4 }, { AT_WEAP, AD_PHYS, 2, 4},
X NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1677,1682 ****
X--- 2398,2424 ----
X MR_SLEEP, MR_SLEEP, M1_HUMANOID | M1_OMNIVORE,
X M2_ELF | M2_STRONG | M2_PRINCE | M2_MALE | M2_COLLECT, 0,
X C(HI_LORD) },
X+ { "bandit", S_HUMAN, 4, 12, 10, 0, 0, (G_GENO | G_SGROUP | 1),
X+ { {AT_WEAP, AD_PHYS, 1, 8}, {AT_TUCH, AD_SGLD, 0, 0}, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_HUMANOID, MZ_HUMAN, 0, 0,
X+ M1_HUMANOID | M1_OMNIVORE,
X+ M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG | M2_COLLECT | M2_GREEDY,
X+ 0, C(GRAY) },
X+ { "evil mage", S_HUMAN, 6, 12, 10, 0, -7, (G_GENO | G_SGROUP | 2),
X+ { {AT_WEAP, AD_PHYS, 1, 4}, {AT_MAGC, AD_SPEL, 0, 0}, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_HUMANOID, MZ_HUMAN, 0, 0,
X+ M1_HUMANOID | M1_OMNIVORE,
X+ M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG | M2_COLLECT | M2_GREEDY,
X+ 0, C(GRAY) },
X+ { "evil priest", S_HUMAN, 6, 12, 10, 0, -7, (G_GENO | G_SGROUP | 2),
X+ { {AT_WEAP, AD_PHYS, 1, 4}, {AT_MAGC, AD_CLRC, 0, 0}, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_HUMANOID, MZ_HUMAN, 0, 0,
X+ M1_HUMANOID | M1_OMNIVORE,
X+ M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG | M2_COLLECT | M2_GREEDY,
X+ 0, C(GRAY) },
X { "nurse", S_HUMAN, 11, 6, 0, 0, 0, (G_GENO | 3),
X { { AT_CLAW, AD_HEAL, 2, 6 }, NO_ATTK, NO_ATTK,
X NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 1769,1774 ****
X--- 2511,2523 ----
X 0, 0, M1_HUMANOID | M1_OMNIVORE,
X M2_NOPOLY | M2_HUMAN | M2_MERC | M2_STALK | M2_HOSTILE | M2_STRONG |
X M2_COLLECT, 0, C(BLUE) },
X+ { "general", S_HUMAN, 12, 4, MARM(10,-3), 15, -5, (G_GENO | 1),
X+ { { AT_WEAP, AD_PHYS, 4, 4 }, { AT_WEAP, AD_PHYS, 4, 4 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_SOLDIER, MZ_HUMAN,
X+ 0, 0, M1_HUMANOID | M1_OMNIVORE,
X+ M2_NOPOLY | M2_HUMAN | M2_MERC | M2_STALK | M2_HOSTILE | M2_STRONG |
X+ M2_COLLECT, 0, C(BLUE) },
X #endif
X /*
X * Keep these separate - some of the mkroom code assumes that all
X***************
X*** 1788,1793 ****
X--- 2537,2572 ----
X 0, 0, M1_HUMANOID | M1_OMNIVORE,
X M2_NOPOLY | M2_HUMAN | M2_MERC | M2_STALK | M2_PEACEFUL | M2_STRONG |
X M2_COLLECT, 0, C(GREEN) },
X+ { "Morgan La Fey", S_HUMAN, 14, 12, 10, 0, -7, (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_WEAP, AD_PHYS, 1, 8 }, { AT_MAGC, AD_SPEL, 0, 0 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_SOLDIER, MZ_HUMAN,
X+ 0, 0, M1_HUMANOID | M1_OMNIVORE,
X+ M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG |
X+ M2_COLLECT | M2_FEMALE | M2_PRINCE | M2_PNAME, 0, C(HI_LORD) },
X+ { "Tom", S_HUMAN, 16, 12, 10, 0, 0, (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_WEAP, AD_PHYS, 1, 8 }, { AT_MAGC, AD_SPEL, 0, 0 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_SOLDIER, MZ_HUMAN,
X+ 0, 0, M1_HUMANOID | M1_OMNIVORE,
X+ M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG | M2_STALK |
X+ M2_COLLECT | M2_MALE | M2_PRINCE | M2_PNAME, 0, C(HI_LORD) },
X+ { "Butch", S_HUMAN, 16, 4, MARM(10,-3), 15, -4,
X+ (G_UNIQ | G_NOCORPSE | G_NOGEN),
X+ { { AT_WEAP, AD_PHYS, 4, 8 }, { AT_WEAP, AD_PHYS, 4, 8 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_SOLDIER, MZ_HUMAN,
X+ 0, 0, M1_HUMANOID | M1_OMNIVORE,
X+ M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG | M2_STALK |
X+ M2_COLLECT | M2_MALE | M2_PRINCE | M2_PNAME, 0, C(HI_LORD) },
X+ { "Mordred", S_HUMAN, 16, 4, MARM(10,-3), 15, -4,
X+ (G_UNIQ | G_NOCORPSE | 1),
X+ { { AT_WEAP, AD_PHYS, 4, 4 }, { AT_WEAP, AD_PHYS, 4, 4 },
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_SOLDIER, MZ_HUMAN,
X+ 0, 0, M1_HUMANOID | M1_OMNIVORE,
X+ M2_NOPOLY | M2_HUMAN | M2_HOSTILE | M2_STRONG | M2_STALK |
X+ M2_COLLECT | M2_MALE | M2_PRINCE | M2_PNAME, 0, C(HI_LORD) },
X { "Medusa", S_HUMAN, 20, 12, 2, 50, -15, G_NOGEN | G_UNIQ,
X { { AT_CLAW, AD_PHYS, 1, 8 }, { AT_GAZE, AD_STON, 0, 0 },
X { AT_BITE, AD_DRST, 1, 6 }, { AT_WEAP, AD_PHYS, 2, 4 },
X***************
X*** 1922,1927 ****
X--- 2701,2714 ----
X WT_HUMAN, 400, 0, MS_SILENT, MZ_LARGE,
X MR_FIRE | MR_POISON, 0, M1_POIS,
X M2_DEMON | M2_STALK | M2_HOSTILE | M2_NASTY, 0, C(RED) },
X+ { "bearded devil", S_DEMON, 8, 9, -5, 50, -9,
X+ (G_HELL | G_NOCORPSE | 2),
X+ { { AT_WEAP, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X+ { AT_BITE, AD_PHYS, 2, 3 }, { AT_BITE, AD_PHYS, 1, 3 },
X+ NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_SILENT, MZ_MEDIUM,
X+ MR_FIRE | MR_POISON, 0, M1_POIS | M1_THICK_HIDE,
X+ M2_DEMON | M2_STALK | M2_HOSTILE | M2_NASTY, 0, C(RED) },
X { "hezrou", S_DEMON, 9, 6, -2, 55, -10,
X (G_HELL | G_NOCORPSE | G_SGROUP | 2),
X { { AT_CLAW, AD_PHYS, 1, 3 }, { AT_CLAW, AD_PHYS, 1, 3 },
X***************
X*** 1937,1942 ****
X--- 2724,2737 ----
X MR_FIRE | MR_POISON, 0, M1_POIS,
X M2_DEMON | M2_STALK | M2_HOSTILE | M2_NASTY | M2_COLLECT,
X 0, C(GRAY) },
X+ { "demon", S_DEMON, 10, 12, -4, 30, -9,
X+ (G_HELL | G_NOCORPSE | 3),
X+ { { AT_WEAP, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X+ { AT_BITE, AD_PHYS, 1, 4 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_SILENT, MZ_LARGE,
X+ MR_FIRE | MR_POISON, 0, M1_POIS,
X+ M2_DEMON | M2_STALK | M2_HOSTILE | M2_NASTY | M2_COLLECT,
X+ 0, C(RED) },
X { "ice devil", S_DEMON, 11, 6, -4, 55, -12, (G_HELL | G_NOCORPSE | 2),
X { { AT_CLAW, AD_PHYS, 1, 4 }, { AT_CLAW, AD_PHYS, 1, 4 },
X { AT_BITE, AD_PHYS, 2, 4 }, { AT_STNG, AD_COLD, 3, 4 },
X***************
X*** 1951,1956 ****
X--- 2746,2757 ----
X WT_HUMAN, 400, 0, MS_SILENT, MZ_LARGE,
X MR_FIRE | MR_POISON, 0, M1_HUMANOID | M1_POIS,
X M2_DEMON | M2_STALK | M2_HOSTILE | M2_NASTY, 0, C(RED) },
X+ { "nycadaemon", S_DEMON, 12, 6, -3, 65, -11, (G_HELL | G_NOCORPSE | 2),
X+ { { AT_WEAP, AD_PHYS, 4, 2 }, { AT_WEAP, AD_PHYS, 4, 2 },
X+ { AT_MAGC, AD_SPEL, 0, 0 }, NO_ATTK, NO_ATTK, NO_ATTK },
X+ WT_HUMAN, 400, 0, MS_GROWL, MZ_LARGE,
X+ MR_FIRE | MR_POISON, 0, M1_HUMANOID | M1_POIS | M1_SEE_INVIS,
X+ M2_DEMON | M2_STALK | M2_HOSTILE | M2_NASTY | M2_COLLECT, 0, C(RED) },
X { "pit fiend", S_DEMON, 13, 6, -3, 65, -13, (G_HELL | G_NOCORPSE | 2),
X { { AT_WEAP, AD_PHYS, 4, 2 }, { AT_WEAP, AD_PHYS, 4, 2 },
X { AT_HUGS, AD_PHYS, 2, 4 }, NO_ATTK, NO_ATTK, NO_ATTK },
X***************
X*** 2082,2087 ****
X--- 2883,2906 ----
X 1500, 400, 0, MS_DJINNI, MZ_HUMAN, MR_POISON | MR_STONE, 0,
X M1_HUMANOID | M1_FLY | M1_POIS,
X M2_NOPOLY | M2_STALK | M2_COLLECT, 0, C(YELLOW) },
X+ { "efreeti", S_DEMON, 7, 12, 4, 30, 0, (G_NOGEN | G_NOCORPSE),
X+ { { AT_WEAP, AD_PHYS, 2, 8 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1500, 400, 0, MS_DJINNI, MZ_HUMAN, MR_POISON | MR_FIRE, 0,
X+ M1_HUMANOID | M1_POIS | M1_FLY,
X+ M2_NOPOLY | M2_STALK | M2_COLLECT, 0, C(RED) },
X+ { "marid", S_DEMON, 7, 12, 4, 30, 0, (G_NOGEN | G_NOCORPSE),
X+ { { AT_WEAP, AD_PHYS, 2, 8 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1500, 400, 0, MS_DJINNI, MZ_HUMAN, MR_POISON, 0,
X+ M1_HUMANOID | M1_POIS | M1_FLY,
X+ M2_NOPOLY | M2_STALK | M2_COLLECT, 0, C(CYAN) },
X+ { "dao", S_DEMON, 7, 12, 4, 30, 0, (G_NOGEN | G_NOCORPSE),
X+ { { AT_WEAP, AD_PHYS, 2, 8 }, NO_ATTK, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK },
X+ 1500, 400, 0, MS_DJINNI, MZ_HUMAN, MR_POISON, 0,
X+ M1_HUMANOID | M1_POIS | M1_FLY,
X+ M2_NOPOLY | M2_STALK | M2_COLLECT, 0, C(GRAY) },
X /* sea monsters */
X { "giant eel", S_EEL, 5, 9, -1, 0, 0, (G_GENO | G_NOGEN),
X { { AT_BITE, AD_PHYS, 3, 6 }, { AT_TUCH, AD_WRAP, 0, 0 },
X***************
X*** 2095,2100 ****
X--- 2914,2926 ----
X 200, 250, 0, MS_SILENT, MZ_HUGE, MR_ELEC, MR_ELEC,
X M1_SWIM | M1_AMPHIBIOUS | M1_ANIMAL | M1_SLITHY | M1_NOLIMBS |
X M1_CARNIVORE | M1_OVIPAROUS, M2_HOSTILE, 0, C(BLUE) },
X+ { "shark", S_EEL, 10, 10, -3, 0, 0, (G_GENO | G_NOGEN),
X+ { { AT_BITE, AD_PHYS, 6, 8 }, NO_ATTK,
X+ NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK },
X+ 200, 250, 0, MS_SILENT, MZ_HUGE,
X+ 0, 0, M1_SWIM | M1_AMPHIBIOUS | M1_ANIMAL |
X+ M1_NOLIMBS | M1_CARNIVORE, M2_NOPOLY | M2_HOSTILE,
X+ 0, C(GRAY) },
X { "kraken", S_EEL, 20, 3, 6, 0, -3, (G_GENO | G_NOGEN),
X { { AT_CLAW, AD_PHYS, 2, 4 }, { AT_CLAW, AD_PHYS, 2, 4 },
X { AT_HUGS, AD_WRAP, 2, 6 }, { AT_BITE, AD_PHYS, 5, 4 },
SHAR_EOF
true || echo 'restore of NH31C--.Patch failed'
fi
echo 'End of NetHack-- part 2'
echo 'File NH31C--.Patch is continued in part 3'
echo 3 > _shar_seq_.tmp
exit 0
--
-------------------========================================-------------------
cher...@semprini.tdkcs.waterloo.on.ca
Chris Herborth