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.h39
1 files changed, 19 insertions, 20 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index c0cc38e97f..5a84ccbebe 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -256,7 +256,7 @@
// now store the draconian subspecies in the high byte of mon->number
// for those listed as species MONS_DRACONIAN.
MONS_DRACONIAN, 'd', BROWN, "draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_COLD_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -1,
{ {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -267,7 +267,7 @@
{
MONS_BLACK_DRACONIAN, 'd', BLUE, "black draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_COLD_BLOOD | M_SPEAKS,
MR_RES_ELEC,
900, 10, MONS_DRACONIAN, MONS_BLACK_DRACONIAN, MH_NATURAL, -2,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -278,7 +278,7 @@
{
MONS_YELLOW_DRACONIAN, 'd', YELLOW, "yellow draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,
+ M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,
MR_RES_ACID,
900, 10, MONS_DRACONIAN, MONS_YELLOW_DRACONIAN, MH_NATURAL, -2,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -289,7 +289,7 @@
{
MONS_PALE_DRACONIAN, 'd', LIGHTGREY, "pale draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_COLD_BLOOD | M_SPEAKS,
MR_RES_STEAM,
900, 10, MONS_DRACONIAN, MONS_PALE_DRACONIAN, MH_NATURAL, -2,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -300,7 +300,7 @@
{
MONS_GREEN_DRACONIAN, 'd', GREEN, "green draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_COLD_BLOOD | M_SPEAKS,
MR_RES_POISON,
900, 10, MONS_DRACONIAN, MONS_GREEN_DRACONIAN, MH_NATURAL, -2,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -311,7 +311,7 @@
{
MONS_PURPLE_DRACONIAN, 'd', MAGENTA, "purple draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_COLD_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
900, 10, MONS_DRACONIAN, MONS_PURPLE_DRACONIAN, MH_NATURAL, -2,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -322,7 +322,7 @@
{
MONS_RED_DRACONIAN, 'd', RED, "red draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,
+ M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,
MR_RES_FIRE,
900, 10, MONS_DRACONIAN, MONS_RED_DRACONIAN, MH_NATURAL, -2,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -333,7 +333,7 @@
{
MONS_WHITE_DRACONIAN, 'd', WHITE, "white draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,
+ M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SPEAKS,
MR_RES_COLD,
900, 10, MONS_DRACONIAN, MONS_WHITE_DRACONIAN, MH_NATURAL, -2,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -344,7 +344,7 @@
{
MONS_MOTTLED_DRACONIAN, 'd', LIGHTMAGENTA, "mottled draconian",
- M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_COLD_BLOOD | M_SPEAKS,
MR_RES_FIRE | MR_RES_STICKY_FLAME,
900, 10, MONS_DRACONIAN, MONS_MOTTLED_DRACONIAN, MH_NATURAL, -2,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -355,7 +355,7 @@
{
MONS_DRACONIAN_CALLER, 'd', BROWN, "draconian caller",
- M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -366,7 +366,7 @@
{
MONS_DRACONIAN_MONK, 'd', BLUE, "draconian monk",
- M_FIGHTER | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_FIGHTER | M_COLD_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 35}, {AT_HIT, AF_PLAIN, 20},
@@ -378,7 +378,7 @@
{
MONS_DRACONIAN_ZEALOT, 'd', LIGHTGREEN, "draconian zealot",
- M_SPELLCASTER | M_HUMANOID | M_PRIEST | M_COLD_BLOOD | M_EVIL | M_SPEAKS,
+ M_SPELLCASTER | M_PRIEST | M_COLD_BLOOD | M_EVIL | M_SPEAKS,
MR_NO_FLAGS,
900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -389,7 +389,7 @@
{
MONS_DRACONIAN_SHIFTER, 'd', LIGHTCYAN, "draconian shifter",
- M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4,
{ {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -400,7 +400,7 @@
{
MONS_DRACONIAN_ANNIHILATOR, 'd', LIGHTBLUE, "draconian annihilator",
- M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_SPEAKS,
+ M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4,
{ {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -411,7 +411,7 @@
{
MONS_DRACONIAN_KNIGHT, 'd', CYAN, "draconian knight",
- M_SPELLCASTER | M_HUMANOID | M_FIGHTER | M_COLD_BLOOD | M_SPEAKS,
+ M_SPELLCASTER | M_FIGHTER | M_COLD_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4,
{ {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
@@ -422,7 +422,7 @@
{
MONS_DRACONIAN_SCORCHER, 'd', LIGHTRED, "draconian scorcher",
- M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_COLD_BLOOD | M_EVIL
+ M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_EVIL
| M_SPEAKS,
MR_RES_FIRE | MR_RES_HELLFIRE,
900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4,
@@ -939,7 +939,7 @@
// merfolk ('m')
{
MONS_MERFOLK, 'm', LIGHTBLUE, "merfolk fighter",
- M_HUMANOID | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,
+ M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,
MR_RES_POISON | MR_RES_COLD,
500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -950,7 +950,7 @@
{
MONS_MERMAID, 'm', LIGHTCYAN, "mermaid",
- M_SPELLCASTER | M_HUMANOID | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,
+ M_SPELLCASTER | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,
MR_RES_POISON | MR_RES_COLD,
500, 10, MONS_MERMAID, MONS_MERMAID, MH_NATURAL, -5,
{ {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -3805,8 +3805,7 @@
{
MONS_TIAMAT, 'd', MAGENTA, "Tiamat",
- M_HUMANOID | M_SEE_INVIS | M_EVIL | M_UNIQUE | M_FLIES | M_COLD_BLOOD
- | M_SPEAKS,
+ M_SEE_INVIS | M_EVIL | M_UNIQUE | M_FLIES | M_COLD_BLOOD | M_SPEAKS,
MR_RES_POISON,
0, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -5,
{ {AT_HIT, AF_PLAIN, 35}, {AT_TAIL_SLAP, AF_PLAIN, 25},
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-14 02:56:15 +0000