summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2010-01-12 13:24:40 +0100
committerAdam Borowski <kilobyte@angband.pl>2010-01-12 13:36:09 +0100
commit082e5d6cf970a077687b2aff2ffee5eb69479086 (patch)
tree2e6b36557aeb160ea8b35992536df9d5384c8e13 /crawl-ref/source/item_use.cc
parent1c8e80d2d8c27493312916af3e05762c0bc07540 (diff)
downloadcrawl-ref-082e5d6cf970a077687b2aff2ffee5eb69479086.tar.gz
crawl-ref-082e5d6cf970a077687b2aff2ffee5eb69479086.zip
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.
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc9
1 files changed, 1 insertions, 8 deletions
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;