Mark a few more monsters as non-evil, since they're fighting types that

use no evil spells: hill giants, ettins, cyclopes, stone giants, titans, 
deep trolls, Snorg, Polyphemus, and Tiamat.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3883 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 10 insertions, 11 deletions

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 551fb24df7..fb2aa93b98 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1636,7 +1636,7 @@
 // cyclops and giants ('C')
 {
     MONS_HILL_GIANT, 'C', LIGHTRED, "hill giant",
-    M_WARM_BLOOD | M_EVIL | M_SPEAKS,
+    M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
     1600, 10, MONS_HILL_GIANT, MONS_HILL_GIANT, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -1647,7 +1647,7 @@
 
 {
     MONS_ETTIN, 'C', BROWN, "ettin",
-    M_WARM_BLOOD | M_TWOWEAPON | M_EVIL | M_SPEAKS,
+    M_WARM_BLOOD | M_TWOWEAPON | M_SPEAKS,
     MR_NO_FLAGS,
     0, 10, MONS_HILL_GIANT, MONS_ETTIN, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 18}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK },
@@ -1658,7 +1658,7 @@
 
 {
     MONS_CYCLOPS, 'C', YELLOW, "cyclops",
-    M_WARM_BLOOD | M_EVIL | M_SPEAKS,
+    M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
     2500, 10, MONS_HILL_GIANT, MONS_CYCLOPS, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -1693,7 +1693,7 @@
 
 {
     MONS_STONE_GIANT, 'C', LIGHTGREY, "stone giant",
-    M_WARM_BLOOD | M_EVIL | M_SPEAKS,
+    M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
     3000, 10, MONS_HILL_GIANT, MONS_STONE_GIANT, MH_NATURAL, -4,
     { {AT_HIT, AF_PLAIN, 45}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -1704,8 +1704,7 @@
 
 {
     MONS_TITAN, 'C', MAGENTA, "titan",
-    M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SENSE_INVIS | M_EVIL
-        | M_SPEAKS,
+    M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SENSE_INVIS | M_SPEAKS,
     mrd(MR_RES_ELEC, 2),
     3500, 12, MONS_HILL_GIANT, MONS_TITAN, MH_NATURAL, -7,
     { {AT_HIT, AF_PLAIN, 55}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -2543,7 +2542,7 @@
 
 {
     MONS_DEEP_TROLL, 'T', YELLOW, "deep troll",
-    M_WARM_BLOOD | M_SENSE_INVIS | M_EVIL | M_SPEAKS,
+    M_WARM_BLOOD | M_SENSE_INVIS | M_SPEAKS,
     MR_NO_FLAGS,
     1500, 12, MONS_TROLL, MONS_DEEP_TROLL, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 27}, {AT_CLAW, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 20}, AT_NO_ATK },
@@ -3179,7 +3178,7 @@
     0, 10, MONS_RED_DEVIL, MONS_RED_DEVIL, MH_DEMONIC, -7,
     { {AT_HIT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
-    10, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
+    10, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
@@ -3763,7 +3762,7 @@
 
 {
     MONS_SNORG, 'T', GREEN, "Snorg",
-    M_WARM_BLOOD | M_SPEAKS | M_EVIL | M_UNIQUE,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
     MR_NO_FLAGS,
     0, 20, MONS_TROLL, MONS_TROLL, MH_NATURAL, -6,
     { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK },
@@ -3774,7 +3773,7 @@
 
 {
     MONS_POLYPHEMUS, 'C', GREEN, "Polyphemus",
-    M_WARM_BLOOD | M_EVIL | M_UNIQUE | M_SPEAKS,
+    M_WARM_BLOOD | M_UNIQUE | M_SPEAKS,
     MR_NO_FLAGS,
     2500, 10, MONS_HILL_GIANT, MONS_CYCLOPS, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 35}, {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK },
@@ -3810,7 +3809,7 @@
 
 {
     MONS_TIAMAT, 'd', MAGENTA, "Tiamat",
-    M_SEE_INVIS | M_EVIL | M_UNIQUE | M_FLIES | M_COLD_BLOOD | M_SPEAKS,
+    M_SEE_INVIS | 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},