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.h38
1 files changed, 28 insertions, 10 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 73dde6150e..e9094329bd 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -195,6 +195,24 @@ static monsterentry mondata[] = {
MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE
},
+
+// Use this to replace removed monsters, to retain save compatibility.
+// Please put it in #if (TAG_MAJOR_VERSION <= X), so they will go away
+// after save compat is broken.
+#define AXED_MON(id) \
+{ \
+ id, 'X', LIGHTRED, "removed "#id, \
+ M_NO_EXP_GAIN, \
+ MR_NO_FLAGS, \
+ 0, 10, MONS_PROGRAM_BUG, MONS_PROGRAM_BUG, MH_NONLIVING, -3, \
+ { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, \
+ { 0, 0, 0, 0 }, \
+ 0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, \
+ I_PLANT, HT_LAND, FL_NONE, 0, DEFAULT_ENERGY, \
+ MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE \
+},
+
+
// Real monsters begin here {dlb}:
// insects ('a')
@@ -2635,13 +2653,13 @@ static monsterentry mondata[] = {
},
{
- MONS_GUARDIAN_NAGA, 'N', LIGHTGREEN, "guardian naga",
+ MONS_GUARDIAN_SERPENT, 'N', LIGHTGREEN, "guardian serpent",
M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
MR_RES_POISON,
- 350, 10, MONS_NAGA, MONS_GUARDIAN_NAGA, MH_NATURAL, -6,
+ 350, 10, MONS_GUARDIAN_SERPENT, MONS_GUARDIAN_SERPENT, MH_NATURAL, -6,
{ {AT_HIT, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 3, 5, 0 },
- 6, 14, MST_GUARDIAN_NAGA, CE_MUTAGEN_RANDOM, Z_BIG, S_SHOUT,
+ 6, 14, MST_GUARDIAN_SERPENT, CE_MUTAGEN_RANDOM, Z_BIG, S_SHOUT,
I_HIGH, HT_LAND, FL_NONE, 15, DEFAULT_ENERGY,
MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE
},
@@ -2872,11 +2890,11 @@ static monsterentry mondata[] = {
},
{
- MONS_GREY_SNAKE, 'S', LIGHTGREY, "grey snake",
+ MONS_ANACONDA, 'S', LIGHTGREY, "anaconda",
M_COLD_BLOOD,
MR_NO_FLAGS,
- 600, 10, MONS_SNAKE, MONS_GREY_SNAKE, MH_NATURAL, -3,
- { {AT_BITE, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ 600, 10, MONS_SNAKE, MONS_ANACONDA, MH_NATURAL, -3,
+ { {AT_CONSTRICT, AF_CRUSH, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 11, 3, 5, 0 },
4, 16, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS,
I_INSECT, HT_LAND, FL_NONE, 18, DEFAULT_ENERGY,
@@ -4173,10 +4191,10 @@ static monsterentry mondata[] = {
{
MONS_STATUE, '8', LIGHTGREY, "statue",
- M_STATIONARY | M_SPEAKS,
+ M_STATIONARY | M_SPEAKS | M_ARCHER,
MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
0, 10, MONS_CLAY_GOLEM, MONS_STATUE, MH_NONLIVING, MAG_IMMUNE,
- { {AT_HIT, AF_WEAP_ONLY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { {AT_WEAP_ONLY, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 0, 0, 70 },
12, 1, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
I_HIGH, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
@@ -4584,7 +4602,7 @@ static monsterentry mondata[] = {
M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS
| M_ACTUAL_SPELLS | M_UNIQUE,
MR_RES_POISON,
- 350, 10, MONS_NAGA, MONS_GUARDIAN_NAGA, MH_NATURAL, -6,
+ 350, 10, MONS_GUARDIAN_SERPENT, MONS_GUARDIAN_SERPENT, MH_NATURAL, -6,
{ {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 14, 0, 0, 142 },
8, 18, MST_AIZUL, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SHOUT,
@@ -4849,7 +4867,7 @@ static monsterentry mondata[] = {
550, 15, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
{ {AT_HIT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 11, 0, 0, 90 },
- 0, 9, MST_GUARDIAN_NAGA, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
+ 0, 9, MST_GUARDIAN_SERPENT, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY,
MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
},