summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-data.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/mon-data.h')
-rw-r--r--crawl-ref/source/mon-data.h140
1 files changed, 82 insertions, 58 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index c9f8f8d90d..ec6b912be0 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -215,19 +215,7 @@ static monsterentry mondata[] = {
// Real monsters begin here {dlb}:
-// insects ('a')
-{
- MONS_GIANT_COCKROACH, 'a', BROWN, "giant cockroach",
- M_NO_SKELETON,
- MR_NO_FLAGS,
- 250, 10, MONS_GIANT_COCKROACH, MONS_GIANT_COCKROACH, MH_NATURAL, -1,
- { {AT_BITE, AF_PLAIN, 2}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
- { 1, 3, 4, 0 },
- 3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT,
- I_INSECT, HT_LAND, FL_NONE, 12, DEFAULT_ENERGY,
- MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY
-},
-
+// ants ('a')
{
MONS_GIANT_ANT, 'a', RED, "giant ant",
M_NO_SKELETON,
@@ -241,6 +229,18 @@ static monsterentry mondata[] = {
},
{
+ MONS_QUEEN_ANT, 'a', LIGHTRED, "queen ant",
+ M_NO_SKELETON | M_NO_FLAGS,
+ MR_VUL_POISON,
+ 1200, 10, MONS_GIANT_ANT, MONS_QUEEN_ANT, MH_NATURAL, -3,
+ { {AT_STING, AF_POISON_NASTY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { 13, 3, 5, 0 },
+ 14, 3, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT,
+ I_INSECT, HT_LAND, FL_NONE, 7, DEFAULT_ENERGY,
+ MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL
+},
+
+{
MONS_SOLDIER_ANT, 'a', LIGHTGREY, "soldier ant",
M_NO_SKELETON,
MR_VUL_POISON,
@@ -941,7 +941,19 @@ static monsterentry mondata[] = {
// killer bees ('k')
{
- MONS_KILLER_BEE, 'k', YELLOW, "killer bee",
+ MONS_QUEEN_BEE, 'k', YELLOW, "queen bee",
+ M_NO_SKELETON,
+ MR_VUL_POISON,
+ 200, 14, MONS_KILLER_BEE, MONS_QUEEN_BEE, MH_NATURAL, -3,
+ { {AT_STING, AF_POISON_NASTY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { 7, 3, 5, 0 },
+ 10, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT,
+ I_INSECT, HT_LAND, FL_FLY, 10, DEFAULT_ENERGY,
+ MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE
+},
+
+{
+ MONS_KILLER_BEE, 'k', BROWN, "killer bee",
M_NO_SKELETON,
MR_VUL_POISON,
150, 11, MONS_KILLER_BEE, MONS_KILLER_BEE, MH_NATURAL, -3,
@@ -1097,7 +1109,7 @@ static monsterentry mondata[] = {
{
MONS_MERFOLK, 'm', LIGHTBLUE, "merfolk",
M_WARM_BLOOD | M_SPEAKS,
- MR_RES_POISON | MR_RES_COLD,
+ MR_NO_FLAGS,
500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 9, 2, 4, 0 },
@@ -1109,7 +1121,7 @@ static monsterentry mondata[] = {
{
MONS_MERMAID, 'm', CYAN, "mermaid",
M_SPELLCASTER | M_WARM_BLOOD | M_SPEAKS,
- MR_RES_POISON | MR_RES_COLD,
+ MR_NO_FLAGS,
500, 10, MONS_MERMAID, MONS_MERMAID, MH_NATURAL, -5,
{ {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 2, 3, 0 },
@@ -1121,7 +1133,7 @@ static monsterentry mondata[] = {
{
MONS_SIREN, 'm', LIGHTCYAN, "siren",
M_SPELLCASTER | M_WARM_BLOOD | M_SPEAKS,
- MR_RES_POISON | MR_RES_COLD,
+ MR_NO_FLAGS,
500, 12, MONS_MERMAID, MONS_SIREN, MH_NATURAL, -7,
{ {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 2, 3, 0 },
@@ -1393,7 +1405,19 @@ static monsterentry mondata[] = {
MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE
},
-// spiders and scorpions ('s')
+// spiders and insects ('s')
+{
+ MONS_GIANT_COCKROACH, 's', BROWN, "giant cockroach",
+ M_NO_SKELETON,
+ MR_NO_FLAGS,
+ 250, 10, MONS_GIANT_COCKROACH, MONS_GIANT_COCKROACH, MH_NATURAL, -1,
+ { {AT_BITE, AF_PLAIN, 2}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { 1, 3, 4, 0 },
+ 3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT,
+ I_INSECT, HT_LAND, FL_NONE, 12, DEFAULT_ENERGY,
+ MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY
+},
+
{
MONS_GIANT_MITE, 's', LIGHTRED, "giant mite",
M_NO_SKELETON,
@@ -1431,7 +1455,7 @@ static monsterentry mondata[] = {
},
{
- MONS_WOLF_SPIDER, 's', BROWN, "wolf spider",
+ MONS_WOLF_SPIDER, 's', WHITE, "wolf spider",
M_NO_SKELETON,
MR_VUL_POISON,
800, 10, MONS_WOLF_SPIDER, MONS_WOLF_SPIDER, MH_NATURAL, -3,
@@ -1443,7 +1467,7 @@ static monsterentry mondata[] = {
},
{
- MONS_TRAPDOOR_SPIDER, 's', BROWN, "trapdoor spider",
+ MONS_TRAPDOOR_SPIDER, 's', LIGHTCYAN, "trapdoor spider",
M_NO_SKELETON,
MR_VUL_POISON,
800, 10, MONS_TRAPDOOR_SPIDER, MONS_TRAPDOOR_SPIDER, MH_NATURAL, -3,
@@ -1466,19 +1490,6 @@ static monsterentry mondata[] = {
MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY
},
-// minotaur ('t')
-{
- MONS_MINOTAUR, 't', RED, "minotaur",
- M_FIGHTER | M_WARM_BLOOD | M_SPEAKS,
- MR_NO_FLAGS,
- 1500, 10, MONS_MINOTAUR, MONS_MINOTAUR, MH_NATURAL, -3,
- { {AT_HIT, AF_PLAIN, 35}, {AT_GORE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
- { 13, 3, 5, 0 },
- 5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BELLOW,
- I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
- MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
-},
-
// ugly things ('u')
{
MONS_UGLY_THING, 'u', BLACK, "ugly thing",
@@ -2366,6 +2377,18 @@ static monsterentry mondata[] = {
},
{
+ MONS_MINOTAUR, 'H', LIGHTRED, "minotaur",
+ M_FIGHTER | M_WARM_BLOOD | M_SPEAKS,
+ MR_NO_FLAGS,
+ 1500, 10, MONS_MINOTAUR, MONS_MINOTAUR, MH_NATURAL, -3,
+ { {AT_HIT, AF_PLAIN, 35}, {AT_GORE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
+ { 13, 3, 5, 0 },
+ 5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BELLOW,
+ I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
+ MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
+{
MONS_GRIFFON, 'H', YELLOW, "griffon",
M_WARM_BLOOD,
MR_NO_FLAGS,
@@ -2777,31 +2800,6 @@ static monsterentry mondata[] = {
MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG
},
-// queen insects ('Q')
-{
- MONS_QUEEN_BEE, 'Q', YELLOW, "queen bee",
- M_NO_SKELETON,
- MR_VUL_POISON,
- 200, 14, MONS_KILLER_BEE, MONS_QUEEN_BEE, MH_NATURAL, -3,
- { {AT_STING, AF_POISON_NASTY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
- { 7, 3, 5, 0 },
- 10, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT,
- I_INSECT, HT_LAND, FL_FLY, 10, DEFAULT_ENERGY,
- MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE
-},
-
-{
- MONS_QUEEN_ANT, 'Q', LIGHTGREY, "queen ant",
- M_NO_SKELETON | M_NO_FLAGS,
- MR_VUL_POISON,
- 1200, 10, MONS_GIANT_ANT, MONS_QUEEN_ANT, MH_NATURAL, -3,
- { {AT_STING, AF_POISON_NASTY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
- { 13, 3, 5, 0 },
- 14, 3, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT,
- I_INSECT, HT_LAND, FL_NONE, 7, DEFAULT_ENERGY,
- MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL
-},
-
// rakshasas ('R')
{
MONS_RAKSHASA, 'R', YELLOW, "rakshasa",
@@ -4686,6 +4684,32 @@ static monsterentry mondata[] = {
},
{
+ MONS_MARA, 'R', LIGHTRED, "Mara",
+ M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_SPEAKS | M_UNIQUE,
+ MR_RES_POISON | MR_RES_ELEC,
+ 0, 20, MONS_RAKSHASA, MONS_RAKSHASA, MH_DEMONIC, -8,
+ { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { 20, 0, 0, 140 },
+ 10, 14, MST_MARA, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
+ I_HIGH, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
+ MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
+// Illusions of Mara. Only two ever exist at the one time; identical stats to
+// Mara.
+{
+ MONS_MARA_FAKE, 'R', LIGHTRED, "Mara",
+ M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_SPEAKS,
+ MR_RES_POISON | MR_RES_ELEC,
+ 0, 20, MONS_RAKSHASA_FAKE, MONS_RAKSHASA_FAKE, MH_DEMONIC, MAG_IMMUNE,
+ { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { 20, 0, 0, 140 },
+ 10, 14, MST_MARA_FAKE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
+ I_HIGH, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
+ MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
+{
// Snorg can go berserk.
MONS_SNORG, 'T', LIGHTGREEN, "Snorg",
M_UNIQUE | M_WARM_BLOOD | M_SPEAKS,
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-16 01:03:51 +0000