Remove electric missiles.

The launcher brand is still there, currently on the storm bow and 1/5 of
branded (ie, 1/3 of them) randart crossbows.

5 files changed, 6 insertions, 15 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 83524b08da..2738ef0df1 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1043,8 +1043,6 @@ static std::string _describe_ammo(const item_def &item)
         case SPMSL_FROST:
             description += "It turns into a bolt of frost.";
             break;
-        case SPMSL_ELECTRIC:
-            description += "The electricity stored in it may find a path to the ground.";
             break;
         case SPMSL_CHAOS:
             if (bolt_name.empty())
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 49ec152e8f..bcd3e0f29c 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2126,8 +2126,7 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item,
     const bool reaping      = (bow_brand  == SPWPN_REAPING
                                || ammo_brand == SPMSL_REAPING)
                               && bow_brand != SPWPN_HOLY_WRATH;
-    const bool charged      = bow_brand  == SPWPN_ELECTROCUTION
-                                || ammo_brand == SPMSL_ELECTRIC;
+    const bool charged      = bow_brand  == SPWPN_ELECTROCUTION;
     const bool blessed      = bow_brand == SPWPN_HOLY_WRATH
                               && ammo_brand != SPMSL_REAPING;
 
@@ -2275,12 +2274,6 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item,
         ammo_name = "silvery " + ammo_name;
     }
 
-    if (charged && ammo.special != SPMSL_ELECTRIC)
-    {
-        beam.name = "charged " + beam.name;
-        ammo_name = "charged " + ammo_name;
-    }
-
     if (blessed)
     {
         beam.name = "blessed " + beam.name;
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index f4e01a5fe2..9106d94f7e 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1213,9 +1213,6 @@ std::string item_def::name_aux(description_level_type desc,
             case SPMSL_DISPERSAL:
                 buff << ((terse) ? " (disperse)" : " of dispersal");
                 break;
-            case SPMSL_ELECTRIC:
-                buff << ((terse) ? " (shock)" : " of electricity");
-                break;
 
             default:
                 buff << " (buggy)";
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index a079cc9368..e77eabf3d0 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -1,6 +1,8 @@
 #ifndef ITEMPROP_ENUM_H
 #define ITEMPROP_ENUM_H
 
+#include "tags.h"
+
 enum armour_type
 {
     ARM_ROBE,                    //    0
@@ -355,7 +357,9 @@ enum special_missile_type // to separate from weapons in general {dlb}
     SPMSL_EXPLODING,                   //   10
     SPMSL_STEEL,
     SPMSL_SILVER,
-    SPMSL_ELECTRIC,
+#if TAG_MAJOR_VERSION == 16
+    SPMSL_ELECTRIC, // removed
+#endif
     SPMSL_PARALYSIS,                   // paralysis, needle only from here in
     SPMSL_SLOW,                        // makes slow
     SPMSL_SLEEP,                       // sleep
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 45b4f90a1f..964141dfaa 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1193,7 +1193,6 @@ unsigned int item_value( item_def item, bool ident )
 
             case SPMSL_FLAME:
             case SPMSL_FROST:
-            case SPMSL_ELECTRIC:
                 valued *= 25;
                 break;