Orbs of fire are no longer silenceable.

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

2 files changed, 20 insertions, 2 deletions

diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index a31158bf59..8a9e69a612 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -143,7 +143,7 @@ void ghost_demon::init_random_demon()
     // demons, like ghosts, automatically get poison res. and life prot.
 
     // resist electricity:
-    values[ GVAL_RES_ELEC ] = (!one_chance_in(3) ? 1 : 0);
+    values[ GVAL_RES_ELEC ] = !one_chance_in(3);
 
     // HTH damage:
     values[ GVAL_DAMAGE ] = 20 + roll_dice( 2, 20 );
@@ -167,7 +167,7 @@ void ghost_demon::init_random_demon()
     // is demon a spellcaster?
     // upped from one_chance_in(3)... spellcasters are more interesting
     // and I expect named demons to typically have a trick or two -- bwr
-    values[GVAL_DEMONLORD_SPELLCASTER] = (one_chance_in(10) ? 0 : 1);
+    values[GVAL_DEMONLORD_SPELLCASTER] = !one_chance_in(10);
 
     // does demon fly? (0 = no, 1 = fly, 2 = levitate)
     values[GVAL_DEMONLORD_FLY] = (one_chance_in(3) ? 0 : 
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index ce99726259..c72bc762e5 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -2843,6 +2843,19 @@ static bool is_emergency_spell(const monster_spells &msp, int spell)
     return (msp[5] == spell);
 }
 
+static const char *orb_of_fire_glow()
+{
+    static const char *orb_glows[] =
+    {
+        " glows yellow.",
+        " glows bright magenta.",
+        " glows deep purple.",       // Smoke on the Water
+        " glows red.",
+        " emits a lurid red light.",
+    };
+    return RANDOM_ELEMENT(orb_glows);
+}
+
 static bool mons_announce_cast(monsters *monster, bool nearby,
                                spell_type spell_cast,
                                spell_type draco_breath)
@@ -2987,6 +3000,11 @@ static bool mons_announce_cast(monsters *monster, bool nearby,
                 simple_monster_message(monster, " spits poison.",
                                        MSGCH_MONSTER_SPELL);
                 break;
+
+            case MONS_ORB_OF_FIRE:
+                simple_monster_message(monster, orb_of_fire_glow(),
+                                       MSGCH_MONSTER_SPELL);
+                break;
             }
         }
     }