Make Nessos more dangerous (and thus, more interesting). Still needs

speech.


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

5 files changed, 23 insertions, 9 deletions

diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 20df74f463..166ea06a1f 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3245,7 +3245,7 @@ static monster_type _choose_unique_by_depth(int step)
         break;
     case 2: // depth <= 9
         ret = random_choose(MONS_BLORK_THE_ORC, MONS_EDMUND, MONS_PSYCHE,
-                            MONS_EROLCHA, MONS_PRINCE_RIBBIT, MONS_NESSOS, -1);
+                            MONS_EROLCHA, MONS_PRINCE_RIBBIT, -1);
         break;
     case 3: // depth <= 13
         ret = random_choose(MONS_PSYCHE, MONS_EROLCHA, MONS_DONALD, MONS_URUG,
@@ -3255,14 +3255,14 @@ static monster_type _choose_unique_by_depth(int step)
         ret = random_choose(MONS_URUG, MONS_MICHAEL, MONS_JOSEPH, MONS_SNORG,
                             MONS_ERICA, MONS_JOSEPHINE, MONS_HAROLD,
                             MONS_NORBERT, MONS_JOZEF, MONS_AZRAEL,
-                            MONS_EUSTACHIO, MONS_SONJA, -1);
+                            MONS_EUSTACHIO, MONS_SONJA, MONS_NESSOS, -1);
         break;
     case 5: // depth <= 19
         ret = random_choose(MONS_SNORG, MONS_ERICA, MONS_JOSEPHINE,
                             MONS_HAROLD, MONS_NORBERT, MONS_JOZEF, MONS_AGNES,
                             MONS_MAUD, MONS_LOUISE, MONS_FRANCIS, MONS_FRANCES,
                             MONS_AZRAEL, MONS_EUSTACHIO, MONS_NERGALLE,
-                            MONS_SONJA, -1);
+                            MONS_SONJA, MONS_NESSOS, -1);
         break;
     case 6: // depth > 19
     default:
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index b8ae8f80f4..0be4723c71 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2211,7 +2211,8 @@ enum mon_spellbook_type
     MST_SONJA,
     MST_EUSTACHIO,
     MST_ILSUIW,
-    MST_PRINCE_RIBBIT,
+    MST_PRINCE_RIBBIT,                 // 145
+    MST_NESSOS,
     MST_GERYON = 150,
     MST_DISPATER,
     MST_ASMODEUS,
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 714c614e1d..008798f028 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -3434,10 +3434,11 @@ static item_make_species_type _give_weapon(monsters *mon, int level,
         item_race      = MAKE_ITEM_NO_RACE;
         item.base_type = OBJ_WEAPONS;
         item.sub_type  = WPN_LONGBOW;
-        item.colour    = DARKGREY;
-        force_item     = true;
+        item.special   = SPWPN_FLAME;
         item.plus     += 1 + random2(3);
         item.plus2    += 1 + random2(3);
+        item.colour    = DARKGREY;
+        force_item     = true;
         break;
 
     case MONS_YAKTAUR:
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index a14bc94857..766bd8db70 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -3879,12 +3879,13 @@ static monsterentry mondata[] = {
 // non-human uniques
 {
     MONS_NESSOS, 'c', DARKGREY, "Nessos",
-    M_UNIQUE | M_WARM_BLOOD | M_EVIL | M_SPEAKS,
+    M_UNIQUE | M_WARM_BLOOD  | M_SPELLCASTER | M_ACTUAL_SPELLS | M_EVIL
+        | M_SPEAKS,
     MR_NO_FLAGS,
     1500, 10, MONS_CENTAUR, MONS_CENTAUR, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
-    3, 7, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, I_NORMAL,
+    3, 7, MST_NESSOS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, I_NORMAL,
     HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index ad4783c30d..03a5e55b3e 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -1010,7 +1010,7 @@
 
     { MST_ILSUIW,
       {
-       SPELL_THROW_FROST, // was: SPELL_CONFUSED
+       SPELL_THROW_FROST, // was: SPELL_CONFUSED (jpeg)
        SPELL_SLOW,
        SPELL_INVISIBILITY,
        SPELL_BLINK,
@@ -1030,6 +1030,17 @@
       }
     },
 
+    {  MST_NESSOS,
+      {
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL,
+       SPELL_HASTE,
+       SPELL_ANIMATE_DEAD,
+       SPELL_NO_SPELL,
+       SPELL_NO_SPELL
+      }
+    },
+
     {  MST_GERYON,
       {
        SPELL_SUMMON_BEAST,