summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilepick.cc
diff options
context:
space:
mode:
authorabrahamwl <abrahamwl@gmail.com>2009-10-28 15:35:19 -0700
committerEino Keskitalo <evktalo@users.sourceforge.net>2009-10-29 23:08:14 +0200
commit44f905e5371d4013c9f2e3dfff569076e657040a (patch)
tree9f4a6ae2f910019e6ffbbd5c9cd24c07fc50a6e1 /crawl-ref/source/tilepick.cc
parent1a22a6c5f2cfb0ddf0ff713689c953ea86ff055c (diff)
downloadcrawl-ref-44f905e5371d4013c9f2e3dfff569076e657040a.tar.gz
crawl-ref-44f905e5371d4013c9f2e3dfff569076e657040a.zip
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>
Diffstat (limited to 'crawl-ref/source/tilepick.cc')
-rw-r--r--crawl-ref/source/tilepick.cc4
1 files changed, 2 insertions, 2 deletions
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;