Revert radiance and refrigeration patches for the moment.

There's a couple of issues with these that were missed.

This reverts commits
 70c41610927b7f9adfc3a0fd6c72c7af6756427e
 dce44e60507ec723f3cf94cdeadc6762ee492786
 6525d257d208e990f5d62213adf6a062943e6626
 6d9b6f226847487b3fd9e2ff408d7c0f42361c93.

9 files changed, 13 insertions, 54 deletions

diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua
-Subproject 3a5124b6a7630ba5bb0226a20ae61561b06a7b0
+Subproject 9ca5e4ce20daff5a11d19132ada7936d3390680
diff --git a/crawl-ref/source/contrib/pcre b/crawl-ref/source/contrib/pcre
-Subproject c530f39e65b1cb4a9a18b4557a1ec46e1a78a81
+Subproject 27d0ec7ed9034beb3d2d7f0addd8812a8a1ba05
diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite
-Subproject 6316c9fe38d295b36773db1bfcb2e7c8971cbe0
+Subproject 44ae8d12a69ffa25c67568ca152379dd364afb2
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 3e4d95d4ba..fffe1dc4eb 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -47,7 +47,6 @@ static spell_type search_order_conj[] = {
     SPELL_STICKY_FLAME,
     SPELL_ISKENDERUNS_MYSTIC_BLAST,
 // 10
-    SPELL_OZOCUBUS_REFRIGERATION,
     SPELL_BOLT_OF_MAGMA,
     SPELL_ICE_BOLT,
     SPELL_BOLT_OF_FIRE,
@@ -57,8 +56,8 @@ static spell_type search_order_conj[] = {
     SPELL_VENOM_BOLT,
     SPELL_BOLT_OF_IRON,
     SPELL_STONE_ARROW,
-// 20
     SPELL_THROW_FLAME,
+// 20
     SPELL_THROW_FROST,
     SPELL_PAIN,
     SPELL_STING,
@@ -67,7 +66,6 @@ static spell_type search_order_conj[] = {
     SPELL_MAGIC_DART,
     SPELL_SLEEP,
     SPELL_BACKLIGHT,
-    SPELL_OLGREBS_TOXIC_RADIANCE,
     SPELL_NO_SPELL,                        // end search
 };
 
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index b014595b38..925c4fa46f 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -3492,8 +3492,6 @@ bool mons_has_smite_attack(const monsters *monster)
             || hspell_pass[i] == SPELL_SMITING
             || hspell_pass[i] == SPELL_HELLFIRE_BURST
             || hspell_pass[i] == SPELL_FIRE_STORM
-            || hspell_pass[i] == SPELL_OZOCUBUS_REFRIGERATION
-            || hspell_pass[i] == SPELL_OLGREBS_TOXIC_RADIANCE
             || hspell_pass[i] == SPELL_AIRSTRIKE)
         {
             return (true);
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 23387cf558..ef95a45c67 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -39,7 +39,6 @@ REVISION("$Rev$");
 #include "player.h"
 #include "religion.h"
 #include "spells1.h"
-#include "spells2.h"
 #include "spells3.h"
 #include "spl-cast.h"
 #include "spl-mis.h"
@@ -482,21 +481,6 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast,
         torment(monster_index(monster), monster->pos());
         return;
 
-    case SPELL_OZOCUBUS_REFRIGERATION:
-        if (!monsterNearby || mons_friendly(monster))
-            return;
-
-        cast_refrigeration(random2(12 * monster->hit_dice), true,
-                           monster->mindex());
-        return;
-
-    case SPELL_OLGREBS_TOXIC_RADIANCE:
-        if (!monsterNearby || mons_friendly(monster))
-            return;
-
-        cast_toxic_radiance(true);
-        return;
-
     case SPELL_SUMMON_GREATER_DEMON:
         if (_mons_abjured(monster, monsterNearby))
             return;
@@ -1174,8 +1158,6 @@ void setup_mons_cast(monsters *monster, bolt &pbolt,
     case SPELL_SUMMON_HORRIBLE_THINGS:
     case SPELL_HAUNT:
     case SPELL_SYMBOL_OF_TORMENT:
-    case SPELL_OZOCUBUS_REFRIGERATION:
-    case SPELL_OLGREBS_TOXIC_RADIANCE:
     case SPELL_SUMMON_GREATER_DEMON:
     case SPELL_CANTRIP:
     case SPELL_BERSERKER_RAGE:
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 896ebb8d87..cec9e6ce30 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -509,21 +509,9 @@ static std::string _describe_monsters(const counted_monster_list &list)
 // Poisonous light passes right through invisible players
 // and monsters, and so, they are unaffected by this spell --
 // assumes only you can cast this spell (or would want to).
-void cast_toxic_radiance(bool monster_cast)
+void cast_toxic_radiance()
 {
-    kill_category kc;
-
-    if (monster_cast)
-    {
-        mpr("Sickly green light fills the air!");
-        // Friendlies will never cast this.
-        kc = KC_OTHER;
-    }
-    else
-    {
-        mpr("You radiate a sickly green light!");
-        kc = KC_YOU;
-    }
+    mpr("You radiate a sickly green light!");
 
     you.flash_colour = GREEN;
     viewwindow(true, false);
@@ -555,9 +543,9 @@ void cast_toxic_radiance(bool monster_cast)
             if (!monster->has_ench(ENCH_INVIS))
             {
                 bool affected =
-                    poison_monster(monster, kc, 1, false, false);
+                    poison_monster(monster, KC_YOU, 1, false, false);
 
-                if (coinflip() && poison_monster(monster, kc, false, false))
+                if (coinflip() && poison_monster(monster, KC_YOU, false, false))
                     affected = true;
 
                 if (affected)
@@ -589,7 +577,7 @@ void cast_toxic_radiance(bool monster_cast)
     }
 }
 
-void cast_refrigeration(int pow, bool monster_cast, int caster)
+void cast_refrigeration(int pow)
 {
     mpr("The heat is drained from your surroundings.");
 
@@ -605,7 +593,7 @@ void cast_refrigeration(int pow, bool monster_cast, int caster)
     if (hurted > 0)
     {
         mpr("You feel very cold.");
-        ouch(hurted, caster, KILLED_BY_FREEZING);
+        ouch(hurted, NON_MONSTER, KILLED_BY_FREEZING);
 
         // Note: this used to be 12!... and it was also applied even if
         // the player didn't take damage from the cold, so we're being
@@ -646,10 +634,7 @@ void cast_refrigeration(int pow, bool monster_cast, int caster)
     // Set up the cold attack.
     bolt beam;
     beam.flavour = BEAM_COLD;
-    if (monster_cast)
-        beam.thrower = KILL_MON;
-    else
-        beam.thrower = KILL_YOU;
+    beam.thrower = KILL_YOU;
 
     for (int i = 0; i < MAX_MONSTERS; i++)
     {
@@ -661,10 +646,7 @@ void cast_refrigeration(int pow, bool monster_cast, int caster)
         {
             // Calculate damage and apply.
             int hurt = mons_adjust_flavoured(monster, beam, dam_dice.roll());
-            if (monster_cast)
-                monster->hurt(NULL, hurt, BEAM_COLD);
-            else
-                monster->hurt(&you, hurt, BEAM_COLD);
+            monster->hurt(&you, hurt, BEAM_COLD);
 
             // Cold-blooded creatures can be slowed.
             if (monster->alive()
diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index b1d26280fb..c1b1ff2c9f 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -23,9 +23,8 @@ bool vampiric_drain(int pow, const dist &vmove);
 int detect_creatures(int pow, bool telepathic = false);
 int detect_items(int pow);
 int detect_traps(int pow);
-void cast_refrigeration(int pow, bool monster_cast = false,
-                        int caster = NON_MONSTER);
-void cast_toxic_radiance(bool monster_cast = false);
+void cast_refrigeration(int pow);
+void cast_toxic_radiance(void);
 void drain_life(int pow);
 
 int fungal_bloom();
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 9e76c1df6f..c478d552d8 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -486,7 +486,7 @@
      -1, -1,
      0,
      NULL,
-     false,
+     true,
      false
 },
 
@@ -929,7 +929,7 @@
      -1, -1,
      0,
      NULL,
-     false,
+     true,
      false
 },