Bolt of Iron->Iron Shot, Ice Bolt->Fling Icicle

Based on FR 1801710

Bolt of Iron and Ice Bolt were both mechanically different from the other
"bolts" in that they didn't penetrate targets. In addition, Ice Bolt was
very easy to confuse with Bolt of Cold. So they got their names changed to
Iron Shot and Fling Icicle, respectively. This change is both external (in
the game output) and internal (how the code refers to the spells). This
commit also changes the names of the spells in the data files (ie. for
tiles) and the names of some data files themselves (tile images).
(See the file list.)

Note that Lemuel's comment about the concept (and tile art)of "bolt" not
fitting with the way the "bolt" spells behave is still valid, but that's
another issue. I think this stems from a confusion between lightning
"bolts" and crossbow "bolts."

Signed-off-by: Eino Keskitalo <evktalo@users.sourceforge.net>

17 files changed, 45 insertions, 45 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 19e2ee1ceb..e5d888dc96 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1764,7 +1764,7 @@ static bool _do_ability(const ability_def& abil)
             case 1: beam.range =  6; ztype = ZAP_FIREBALL;           break;
             case 2: beam.range = 10; ztype = ZAP_LIGHTNING;          break;
             case 3: beam.range =  5; ztype = ZAP_STICKY_FLAME;       break;
-            case 4: beam.range =  5; ztype = ZAP_IRON_BOLT;          break;
+            case 4: beam.range =  5; ztype = ZAP_IRON_SHOT;          break;
             case 5: beam.range =  6; ztype = ZAP_NEGATIVE_ENERGY;    break;
             case 6: beam.range = 20; ztype = ZAP_ORB_OF_ELECTRICITY; break;
             }
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 698bf189fa..0b4a8b2083 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -824,8 +824,8 @@ const zap_info zap_data[] = {
     },
 
     {
-        ZAP_IRON_BOLT,
-        "iron bolt",
+        ZAP_IRON_SHOT,
+        "iron shot",
         200,
         new calcdice_calculator<9, 15, 3, 4>,
         new tohit_calculator<7, 1, 15>,
@@ -1126,8 +1126,8 @@ const zap_info zap_data[] = {
     },
 
     {
-        ZAP_ICE_BOLT,
-        "bolt of ice",
+        ZAP_FLING_ICICLE,
+        "shard of ice",
         100,
         new calcdice_calculator<3, 10, 1, 2>,
         new tohit_calculator<9, 1, 12>,
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index b0b2f7b497..b1d4cae35b 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -63,9 +63,9 @@ Bolt of Inaccuracy
 
 This spell inflicts enormous damage upon any creature struck by the bolt of incandescent energy conjured into existence. Unfortunately, it is very difficult to aim and very rarely hits anything. Pity, that.
 %%%%
-Bolt of Iron
+Iron Shot
 
-This spell hurls a large and heavy metal bolt at the caster's foes.
+This spell hurls a large and heavy metal bolt at the caster's foe.
 %%%%
 Bolt of Magma
 
@@ -286,9 +286,9 @@ Hellfire
 
 This spell should only be available from Dispater's staff. So how are you reading this?
 %%%%
-Ice Bolt
+Fling Icicle
 
-This spell throws forth a chunk of ice. It is particularly effective against those creatures not immune to the effects of freezing. But as most of its destructive potential comes from strong impact and cutting edges, even cold-resistant creatures are notably affected.
+This spell throws forth a shard of ice. It is particularly effective against those creatures not immune to the effects of freezing. But as most of its destructive potential comes from strong impact and cutting edges, even cold-resistant creatures are notably affected.
 %%%%
 Ice Form
 
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 25f4f28038..c5f9475ee7 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1631,7 +1631,7 @@ static bool _damaging_card(card_type card, int power, deck_rarity_type rarity)
     dist target;
     zap_type ztype = ZAP_DEBUGGING_RAY;
     const zap_type firezaps[3]   = { ZAP_FLAME, ZAP_STICKY_FLAME, ZAP_FIRE };
-    const zap_type frostzaps[3]  = { ZAP_FROST, ZAP_ICE_BOLT, ZAP_COLD };
+    const zap_type frostzaps[3]  = { ZAP_FROST, ZAP_FLING_ICICLE, ZAP_COLD };
     const zap_type hammerzaps[3] = { ZAP_STRIKING, ZAP_STONE_ARROW,
                                      ZAP_CRYSTAL_SPEAR };
     const zap_type venomzaps[3]  = { ZAP_STING, ZAP_VENOM_BOLT,
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 921aef7dcf..d569fc6291 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2803,7 +2803,7 @@ enum spell_type
     SPELL_FIRE_BRAND,
     SPELL_FREEZING_AURA,               //   90
     SPELL_LETHAL_INFUSION,
-    SPELL_BOLT_OF_IRON,
+    SPELL_IRON_SHOT,
     SPELL_STONE_ARROW,
     SPELL_STONEMAIL,
     SPELL_SHOCK,                       //   95
@@ -2833,7 +2833,7 @@ enum spell_type
     SPELL_DEATH_CHANNEL,
     SPELL_SYMBOL_OF_TORMENT,           //  120
     SPELL_DEFLECT_MISSILES,
-    SPELL_ICE_BOLT,
+    SPELL_FLING_ICICLE,
     SPELL_ICE_STORM,
     SPELL_AIRSTRIKE,
     SPELL_SHADOW_CREATURES,            //  125
@@ -3118,7 +3118,7 @@ enum zap_type
     ZAP_DEGENERATION,
     ZAP_STING,
     ZAP_HELLFIRE,
-    ZAP_IRON_BOLT,
+    ZAP_IRON_SHOT,
     ZAP_STRIKING,
     ZAP_STONE_ARROW,
     ZAP_ELECTRICITY,
@@ -3137,7 +3137,7 @@ enum zap_type
     ZAP_BREATHE_STEAM,
     ZAP_CONTROL_DEMON,
     ZAP_ORB_OF_FRAGMENTATION,
-    ZAP_ICE_BOLT,
+    ZAP_FLING_ICICLE,
     ZAP_ICE_STORM,
     ZAP_BACKLIGHT,
     ZAP_SLEEP,
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 7548436fbb..f6399bd8a7 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2059,7 +2059,7 @@ static inline int get_resistible_fraction(beam_type flavour)
 {
     switch (flavour)
     {
-    // Assume ice storm and ice bolt are mostly solid.
+    // Assume ice storm and fling icicle are mostly solid.
     case BEAM_ICE:
         return (25);
 
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 99510133f4..a27c18254c 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -47,13 +47,13 @@ static spell_type search_order_conj[] = {
     SPELL_ISKENDERUNS_MYSTIC_BLAST,
 // 10
     SPELL_BOLT_OF_MAGMA,
-    SPELL_ICE_BOLT,
+    SPELL_FLING_ICICLE,
     SPELL_BOLT_OF_FIRE,
     SPELL_BOLT_OF_COLD,
     SPELL_FIREBALL,
     SPELL_DELAYED_FIREBALL,
     SPELL_VENOM_BOLT,
-    SPELL_BOLT_OF_IRON,
+    SPELL_IRON_SHOT,
     SPELL_STONE_ARROW,
     SPELL_THROW_FLAME,
 // 20
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 0d4cb0a883..88a1612db7 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -69,7 +69,7 @@
        SPELL_PARALYSE,
        SPELL_SUMMON_GREATER_DEMON,
        SPELL_ANIMATE_DEAD,
-       SPELL_BOLT_OF_IRON,
+       SPELL_IRON_SHOT,
        SPELL_TELEPORT_SELF
       }
     },
@@ -102,7 +102,7 @@
        SPELL_BOLT_OF_COLD,
        SPELL_INVISIBILITY,
        SPELL_ANIMATE_DEAD,
-       SPELL_BOLT_OF_IRON,
+       SPELL_IRON_SHOT,
        SPELL_INVISIBILITY
       }
     },
@@ -429,7 +429,7 @@
     {  MST_YNOXINUL,
       {
        SPELL_NO_SPELL,
-       SPELL_BOLT_OF_IRON,
+       SPELL_IRON_SHOT,
        SPELL_SUMMON_UFETUBUS,
        SPELL_NO_SPELL,
        SPELL_SUMMON_UFETUBUS,
@@ -607,7 +607,7 @@
        SPELL_LIGHTNING_BOLT,
        SPELL_LEHUDIBS_CRYSTAL_SPEAR,
        SPELL_BLINK,
-       SPELL_BOLT_OF_IRON,
+       SPELL_IRON_SHOT,
        SPELL_POISON_ARROW,
        SPELL_TELEPORT_SELF
       }
@@ -959,7 +959,7 @@
     {  MST_ICE_STATUE,
       {
        SPELL_BOLT_OF_COLD,
-       SPELL_ICE_BOLT,
+       SPELL_FLING_ICICLE,
        SPELL_NO_SPELL,
        SPELL_FREEZING_CLOUD,
        SPELL_SUMMON_ICE_BEAST,
@@ -1001,7 +1001,7 @@
     { MST_ROXANNE,
       {
        SPELL_LEHUDIBS_CRYSTAL_SPEAR,
-       SPELL_BOLT_OF_IRON,
+       SPELL_IRON_SHOT,
        SPELL_BLINK_OTHER,
        SPELL_BOLT_OF_MAGMA,
        SPELL_ISKENDERUNS_MYSTIC_BLAST,
@@ -1135,7 +1135,7 @@
     {  MST_DISPATER,
       {
        SPELL_SUMMON_GREATER_DEMON,
-       SPELL_BOLT_OF_IRON,
+       SPELL_IRON_SHOT,
        SPELL_SUMMON_DEMON,
        SPELL_LIGHTNING_BOLT,
        SPELL_HELLFIRE,
@@ -1201,7 +1201,7 @@
     {  MST_CEREBOV,
       {
        SPELL_FIRE_STORM,
-       SPELL_BOLT_OF_IRON,
+       SPELL_IRON_SHOT,
        SPELL_HASTE,
        SPELL_HASTE,
        SPELL_SUMMON_GREATER_DEMON,
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index e132fab778..7fa99c9ff3 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1670,7 +1670,7 @@ int exper_value(const monsters *monster)
             case SPELL_SUMMON_GREATER_DEMON:
             case SPELL_BANISHMENT:
             case SPELL_LEHUDIBS_CRYSTAL_SPEAR:
-            case SPELL_BOLT_OF_IRON:
+            case SPELL_IRON_SHOT:
             case SPELL_TELEPORT_SELF:
             case SPELL_TELEPORT_OTHER:
             case SPELL_PORKALATOR:
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index d336af52f2..7d16255e7f 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -1959,8 +1959,8 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
         beam.is_beam  = true;
         break;
 
-    case SPELL_ICE_BOLT:
-        beam.name     = "bolt of ice";
+    case SPELL_FLING_ICICLE:
+        beam.name     = "shard of ice";
         beam.damage   = dice_def( 3, 8 + power / 11 );
         beam.colour   = WHITE;
         beam.flavour  = BEAM_ICE;
@@ -2147,9 +2147,9 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
         beam.flavour  = BEAM_POISON;
         break;
 
-    case SPELL_BOLT_OF_IRON:
+    case SPELL_IRON_SHOT:
         beam.colour   = LIGHTCYAN;
-        beam.name     = "iron bolt";
+        beam.name     = "iron shot";
         beam.damage   = dice_def( 3, 8 + (power / 9) );
         beam.hit      = 20 + (power / 25);
         beam.type     = dchar_glyph(DCHAR_FIRED_MISSILE);
diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt
index be9e60fe2f..00453962c7 100644
--- a/crawl-ref/source/rltiles/dc-spells.txt
+++ b/crawl-ref/source/rltiles/dc-spells.txt
@@ -38,7 +38,7 @@ detect_secret_doors DETECT_SECRET_DOORS
 detect_traps DETECT_TRAPS
 
 %sdir spells/earth
-bolt_of_iron BOLT_OF_IRON
+iron_shot IRON_SHOT
 dig DIG
 lees_rapid_deconstruction LEES_RAPID_DECONSTRUCTION
 lehudibs_crystal_spear LEHUDIBS_CRYSTAL_SPEAR
@@ -94,7 +94,7 @@ ensorcelled_hibernation ENSORCELLED_HIBERNATION
 freeze FREEZE
 freezing_aura FREEZING_AURA
 freezing_cloud FREEZING_CLOUD
-ice_bolt ICE_BOLT
+fling_icicle FLING_ICICLE
 ice_form ICE_FORM
 ice_storm ICE_STORM
 metabolic_englaciation METABOLIC_ENGLACIATION
diff --git a/crawl-ref/source/rltiles/spells/earth/bolt_of_iron.png b/crawl-ref/source/rltiles/spells/earth/iron_shot.png
index 151532277b..151532277b 100644
--- a/crawl-ref/source/rltiles/spells/earth/bolt_of_iron.png
+++ b/crawl-ref/source/rltiles/spells/earth/iron_shot.png
diff --git a/crawl-ref/source/rltiles/spells/ice/ice_bolt.png b/crawl-ref/source/rltiles/spells/ice/fling_icicle.png
index ac5b432032..ac5b432032 100644
--- a/crawl-ref/source/rltiles/spells/ice/ice_bolt.png
+++ b/crawl-ref/source/rltiles/spells/ice/fling_icicle.png
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 6facda5e46..869d872b94 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -125,7 +125,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
     {SPELL_FREEZE,
      SPELL_THROW_FROST,
      SPELL_OZOCUBUS_ARMOUR,
-     SPELL_ICE_BOLT,
+     SPELL_FLING_ICICLE,
      SPELL_SUMMON_ICE_BEAST,
      SPELL_FREEZING_CLOUD,
      SPELL_NO_SPELL,
@@ -445,7 +445,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
     {SPELL_MAXWELLS_SILVER_HAMMER,
      SPELL_DIG,
      SPELL_STATUE_FORM,
-     SPELL_BOLT_OF_IRON,
+     SPELL_IRON_SHOT,
      SPELL_SHATTER,
      SPELL_NO_SPELL,
      SPELL_NO_SPELL,
@@ -467,7 +467,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
     {SPELL_ANIMATE_DEAD,
      SPELL_TELEPORT_OTHER,
      SPELL_VENOM_BOLT,
-     SPELL_BOLT_OF_IRON,
+     SPELL_IRON_SHOT,
      SPELL_INVISIBILITY,
      SPELL_MASS_CONFUSION,
      SPELL_POISONOUS_CLOUD,
@@ -643,7 +643,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
 
     // 53 - Rod of destruction (ice)
     {SPELL_THROW_FROST,
-     SPELL_ICE_BOLT,
+     SPELL_FLING_ICICLE,
      SPELL_FREEZING_CLOUD,
      SPELL_NO_SPELL,
      SPELL_NO_SPELL,
@@ -654,7 +654,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
 
     // 54 - Rod of destruction (lightning, iron, fireball)
     {SPELL_LIGHTNING_BOLT,
-     SPELL_BOLT_OF_IRON,
+     SPELL_IRON_SHOT,
      SPELL_FIREBALL,
      SPELL_NO_SPELL,
      SPELL_NO_SPELL,
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 61af644b42..f536bea3f1 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1416,8 +1416,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_BOLT_OF_IRON:
-        if (!zapping(ZAP_IRON_BOLT, powc, beam, true))
+    case SPELL_IRON_SHOT:
+        if (!zapping(ZAP_IRON_SHOT, powc, beam, true))
             return (SPRET_ABORT);
         break;
 
@@ -1481,8 +1481,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_ICE_BOLT:
-        if (!zapping(ZAP_ICE_BOLT, powc, beam, true))
+    case SPELL_FLING_ICICLE:
+        if (!zapping(ZAP_FLING_ICICLE, powc, beam, true))
             return (SPRET_ABORT);
         break;
 
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index c478d552d8..16b519d997 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -1273,7 +1273,7 @@
 },
 
 {
-    SPELL_BOLT_OF_IRON, "Bolt of Iron",
+    SPELL_IRON_SHOT, "Iron Shot",
      SPTYP_CONJURATION | SPTYP_EARTH,
      SPFLAG_DIR_OR_TARGET,
      6,
@@ -1663,7 +1663,7 @@
 },
 
 {
-    SPELL_ICE_BOLT, "Ice Bolt",
+    SPELL_FLING_ICICLE, "Fling Icicle",
      SPTYP_CONJURATION | SPTYP_ICE,
      SPFLAG_DIR_OR_TARGET,
      4,
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 85e553361c..f8e5638177 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2766,7 +2766,7 @@ int tileidx_spell(spell_type spell)
     case SPELL_DIG:                      return TILEG_DIG;
     case SPELL_BOLT_OF_MAGMA:            return TILEG_BOLT_OF_MAGMA;
     case SPELL_FRAGMENTATION:            return TILEG_LEES_RAPID_DECONSTRUCTION;
-    case SPELL_BOLT_OF_IRON:             return TILEG_BOLT_OF_IRON;
+    case SPELL_IRON_SHOT:                return TILEG_IRON_SHOT;
     case SPELL_LEHUDIBS_CRYSTAL_SPEAR:   return TILEG_LEHUDIBS_CRYSTAL_SPEAR;
     case SPELL_SHATTER:                  return TILEG_SHATTER;
 
@@ -2790,7 +2790,7 @@ int tileidx_spell(spell_type spell)
     case SPELL_FREEZING_AURA:            return TILEG_FREEZING_AURA;
     case SPELL_SLEEP:                    return TILEG_ENSORCELLED_HIBERNATION;
     case SPELL_OZOCUBUS_ARMOUR:          return TILEG_OZOCUBUS_ARMOUR;
-    case SPELL_ICE_BOLT:                 return TILEG_ICE_BOLT;
+    case SPELL_FLING_ICICLE:             return TILEG_FLING_ICICLE;
     case SPELL_CONDENSATION_SHIELD:      return TILEG_CONDENSATION_SHIELD;
     case SPELL_OZOCUBUS_REFRIGERATION:   return TILEG_OZOCUBUS_REFRIGERATION;
     case SPELL_BOLT_OF_COLD:             return TILEG_BOLT_OF_COLD;