Remove the last vestiges of hellfrost.

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

3 files changed, 21 insertions, 53 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index f2cc5d1827..c35558f809 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1395,7 +1395,6 @@ static beam_type _chaos_beam_flavour()
             10, BEAM_ACID,
             10, BEAM_HELLFIRE,
             10, BEAM_NAPALM,
-            10, BEAM_HELLFROST,
             10, BEAM_SLOW,
             10, BEAM_HASTE,
             10, BEAM_HEALING,
@@ -1574,7 +1573,6 @@ void bolt::apply_beam_conducts()
         switch (flavour)
         {
         case BEAM_HELLFIRE:
-        case BEAM_HELLFROST:
             did_god_conduct(DID_UNHOLY, 2 + random2(3), effect_known);
             break;
         default:
@@ -2352,32 +2350,6 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted,
         }
         break;
 
-    case BEAM_HELLFROST:
-        resist = mons_res_cold(monster);
-        if (resist > 2)
-        {
-            if (doFlavouredEffects)
-                simple_monster_message(monster, " appears unharmed.");
-
-            hurted = 0;
-        }
-        else if (resist > 0)
-        {
-            if (doFlavouredEffects)
-                simple_monster_message(monster, " partially resists.");
-
-            hurted /= 2;
-        }
-        else if (resist < 0)
-        {
-            if (doFlavouredEffects)
-                simple_monster_message(monster, " is frozen!");
-
-            hurted *= 12;       // hellfrost
-            hurted /= 10;
-        }
-        break;
-
     default:
         break;
     }
@@ -5580,7 +5552,6 @@ std::string beam_type_name(beam_type type)
     case BEAM_POTION_STEAM:
     case BEAM_STEAM: return("steam");
 
-    case BEAM_HELLFROST: return("hellfrost");
     case BEAM_ENERGY: return("energy");
     case BEAM_HOLY: return("holy power");
     case BEAM_FRAG: return("fragments");
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 951bf81c1d..7b8325b0ae 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -203,63 +203,62 @@ enum beam_type                  // beam[].flavour
     BEAM_HELLFIRE,
     BEAM_NAPALM,
     BEAM_STEAM,                   // 15
-    BEAM_HELLFROST,
     BEAM_ENERGY,
     BEAM_HOLY,
     BEAM_FRAG,
-    BEAM_LAVA,                    // 20
-    BEAM_ICE,
+    BEAM_LAVA,
+    BEAM_ICE,                     // 20
     BEAM_NUKE,
     BEAM_RANDOM,                  // currently translates into FIRE..ACID
     BEAM_CHAOS,
 
     // Enchantments
-    BEAM_FIRST_ENCHANTMENT = 25,  // 25
-    BEAM_SLOW = BEAM_FIRST_ENCHANTMENT,
-    BEAM_HASTE,
+    BEAM_SLOW,
+    BEAM_FIRST_ENCHANTMENT = BEAM_SLOW,
+    BEAM_HASTE,                   // 25
     BEAM_HEALING,
     BEAM_PARALYSIS,
     BEAM_CONFUSION,
-    BEAM_INVISIBILITY,            // 30
-    BEAM_DIGGING,
+    BEAM_INVISIBILITY,
+    BEAM_DIGGING,                 // 30
     BEAM_TELEPORT,
     BEAM_POLYMORPH,
     BEAM_CHARM,
-    BEAM_BANISH,                  // 35
-    BEAM_DEGENERATE,
+    BEAM_BANISH,
+    BEAM_DEGENERATE,              // 35
     BEAM_ENSLAVE_UNDEAD,
     BEAM_ENSLAVE_SOUL,
     BEAM_PAIN,
-    BEAM_DISPEL_UNDEAD,           // 40
-    BEAM_DISINTEGRATION,
+    BEAM_DISPEL_UNDEAD,
+    BEAM_DISINTEGRATION,          // 40
     BEAM_ENSLAVE_DEMON,
     BEAM_BLINK,
     BEAM_PETRIFY,
-    BEAM_BACKLIGHT,               // 45
-    BEAM_SLEEP,
+    BEAM_BACKLIGHT,
+    BEAM_SLEEP,                   // 45
     BEAM_LAST_ENCHANTMENT = BEAM_SLEEP,
 
     // new beams for evaporate
-    BEAM_POTION_STINKING_CLOUD,   // 47
+    BEAM_POTION_STINKING_CLOUD,
     BEAM_POTION_POISON,
     BEAM_POTION_MIASMA,
-    BEAM_POTION_STEAM,            // 50
-    BEAM_POTION_FIRE,
+    BEAM_POTION_STEAM,
+    BEAM_POTION_FIRE,             // 50
     BEAM_POTION_COLD,
     BEAM_POTION_BLACK_SMOKE,
     BEAM_POTION_GREY_SMOKE,
-    BEAM_POTION_BLUE_SMOKE,       // 55
-    BEAM_POTION_PURP_SMOKE,
+    BEAM_POTION_BLUE_SMOKE,
+    BEAM_POTION_PURP_SMOKE,       // 55
     BEAM_POTION_RANDOM,
 
     BEAM_LAST_REAL = BEAM_POTION_RANDOM,
 
     // For getting the visual effect of a beam.
-    BEAM_VISUAL,                // 58
+    BEAM_VISUAL,                  // 57
 
-    BEAM_TORMENT_DAMAGE,        // Pseudo-beam for damage flavour.
+    BEAM_TORMENT_DAMAGE,          // Pseudo-beam for damage flavour.
     BEAM_FIRST_PSEUDO = BEAM_TORMENT_DAMAGE,
-    BEAM_STEAL_FOOD,            // {60} Pseudo-beam for harpies stealing food.
+    BEAM_STEAL_FOOD,              // 59: Pseudo-beam for harpies stealing food.
 
     NUM_BEAMS
 };
@@ -3072,7 +3071,6 @@ enum zap_type
     ZAP_BREATHE_LIGHTNING,
     ZAP_PETRIFY,
     ZAP_ENSLAVE_SOUL,
-    ZAP_HELLFROST,
     ZAP_CHAOS,
     NUM_ZAPS
 };
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index d76302d155..9d280a6cfc 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -210,7 +210,6 @@ enum mon_resist_flags
     // Notes:
     // - negative energy is mostly handled via mons_res_negative_energy()
     // - acid is handled mostly by genus (jellies) plus non-living
-    // - asphyx-resistance replaces hellfrost resistance.
     MR_RES_ELEC          = (1<< 0),
     MR_RES_POISON        = (1<< 1),
     MR_RES_FIRE          = (1<< 2),