From 322904f753ddeaf5217d2a03ed67052279ed5bab Mon Sep 17 00:00:00 2001
From: David Ploog <dploog@users.sourceforge.net>
Date: Sun, 4 Oct 2009 04:51:27 +0200
Subject: Demon changes (Jude Brown).

Hellwing was 3, is 4. Smoke Demon was 4, is 3. Hellion was 3, is 2.
Ynoxinuals was cyan, is lightcyan.
Tormentors have torment as misc spell, not just as unused escape spell.
---
 crawl-ref/source/mon-data.h | 51 +++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'crawl-ref/source/mon-data.h')

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index c719c8bb27..9eeb21166f 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -3381,6 +3381,17 @@ static monsterentry mondata[] = {
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_SMALL
 },
 
+{
+    MONS_HELLWING, '4', LIGHTGREY, "hellwing",
+    M_SPELLCASTER | M_FLIES | M_EVIL,
+    MR_RES_POISON,
+    0, 12, MONS_HELLWING, MONS_HELLWING, MH_DEMONIC, -6,
+    { {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK },
+    { 7, 4, 5, 0 },
+    8, 10, MST_HELLWING, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_NORMAL,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE
+},
+
 // randomly created
 {
     MONS_BEAST, '4', BROWN, "beast",
@@ -3393,8 +3404,9 @@ static monsterentry mondata[] = {
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE
 },
 
+// middle demons ('3')
 {
-    MONS_SMOKE_DEMON, '4', LIGHTGREY, "smoke demon",
+    MONS_SMOKE_DEMON, '3', LIGHTGREY, "smoke demon",
     M_SPELLCASTER | M_FLIES | M_EVIL | M_INSUBSTANTIAL,
     MR_RES_POISON | mrd(MR_RES_FIRE, 2) | MR_RES_STICKY_FLAME,
     0, 12, MONS_SMOKE_DEMON, MONS_SMOKE_DEMON, MH_DEMONIC, -6,
@@ -3405,18 +3417,6 @@ static monsterentry mondata[] = {
     HT_LAND, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_SMALL
 },
 
-// middle demons ('3')
-{
-    MONS_HELLION, '3', ETC_FIRE, "hellion",
-    M_SPELLCASTER | M_EVIL | M_GLOWS,
-    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD,
-    0, 11, MONS_HELLION, MONS_HELLION, MH_DEMONIC, -7,
-    { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
-    { 7, 3, 5, 0 },
-    5, 10, MST_BURNING_DEVIL, CE_NOCORPSE, Z_NOZOMBIE, S_SCREAM, I_HIGH,
-    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_MEDIUM
-},
-
 {
     MONS_TORMENTOR, '3', YELLOW, "tormentor",
     M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL,
@@ -3474,18 +3474,7 @@ static monsterentry mondata[] = {
 },
 
 {
-    MONS_HELLWING, '3', LIGHTGREY, "hellwing",
-    M_SPELLCASTER | M_FLIES | M_EVIL,
-    MR_RES_POISON,
-    0, 12, MONS_HELLWING, MONS_HELLWING, MH_DEMONIC, -6,
-    { {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK },
-    { 7, 4, 5, 0 },
-    8, 10, MST_HELLWING, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_NORMAL,
-    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE
-},
-
-{
-    MONS_YNOXINUL, '3', CYAN, "ynoxinul",
+    MONS_YNOXINUL, '3', LIGHTCYAN, "ynoxinul",
     M_SPELLCASTER | M_FLIES | M_SENSE_INVIS | M_EVIL,
     MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD,
     0, 12, MONS_YNOXINUL, MONS_YNOXINUL, MH_DEMONIC, -6,
@@ -3529,6 +3518,17 @@ static monsterentry mondata[] = {
 },
 
 // reaper etc. ('2')
+{
+    MONS_HELLION, '2', ETC_FIRE, "hellion",
+    M_SPELLCASTER | M_EVIL | M_GLOWS,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD,
+    0, 11, MONS_HELLION, MONS_HELLION, MH_DEMONIC, -7,
+    { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+    { 7, 3, 5, 0 },
+    5, 10, MST_BURNING_DEVIL, CE_NOCORPSE, Z_NOZOMBIE, S_SCREAM, I_HIGH,
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_MEDIUM
+},
+
 {
     MONS_SUN_DEMON, '2', YELLOW, "sun demon",
     M_SENSE_INVIS | M_LEVITATE | M_EVIL,
@@ -3688,6 +3688,7 @@ static monsterentry mondata[] = {
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE
 },
 
+
 // non-living creatures
 // golems ('8')
 {
-- 
cgit v1.2.3-54-g00ecf