fiddlerwoaroof/crawl - Change TSPOOME2RL5I6RTV4BYTXDNMCOLWTE7BKDN3UBZYYU55LL2MQ6WQC

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>

Created by abrahamwl on October 28, 2009

TSPOOME2RL5I6RTV4BYTXDNMCOLWTE7BKDN3UBZYYU55LL2MQ6WQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilepick.cc at line 2769 [3.96318]

B:BD[2.2078] → [2.2078:2146]

    case SPELL_BOLT_OF_IRON:             return TILEG_BOLT_OF_IRON;

[2.2078]

[2.2146]

    case SPELL_IRON_SHOT:                return TILEG_IRON_SHOT;

Replacement in crawl-ref/source/tilepick.cc at line 2793 [3.96318]

B:BD[2.3472] → [2.3472:3536]

    case SPELL_ICE_BOLT:                 return TILEG_ICE_BOLT;

[2.3472]

[2.3536]

    case SPELL_FLING_ICICLE:             return TILEG_FLING_ICICLE;

Replacement in crawl-ref/source/spl-data.h at line 1276 [4.268152]
B:BD[4.283752] → [4.283752:283792]
```
    SPELL_BOLT_OF_IRON, "Bolt of Iron",
```
[4.283674]
[4.283792]
```
    SPELL_IRON_SHOT, "Iron Shot",
```
Replacement in crawl-ref/source/spl-data.h at line 1666 [4.268152]
B:BD[4.286817] → [4.286817:286849]
```
    SPELL_ICE_BOLT, "Ice Bolt",
```
[4.286710]
[4.286849]
```
    SPELL_FLING_ICICLE, "Fling Icicle",
```

Replacement in crawl-ref/source/spl-cast.cc at line 1419 [4.293070]

B:BD[4.320947] → [5.2182:2266]

    case SPELL_BOLT_OF_IRON:
        if (!zapping(ZAP_IRON_BOLT, powc, beam, true))

[4.320947]

[6.1172]

    case SPELL_IRON_SHOT:
        if (!zapping(ZAP_IRON_SHOT, powc, beam, true))

Replacement in crawl-ref/source/spl-cast.cc at line 1484 [4.293070]

B:BD[4.322903] → [5.3587:3666]

    case SPELL_ICE_BOLT:
        if (!zapping(ZAP_ICE_BOLT, powc, beam, true))

[4.322903]

[5.3804]

    case SPELL_FLING_ICICLE:
        if (!zapping(ZAP_FLING_ICICLE, powc, beam, true))

Replacement in crawl-ref/source/spl-book.cc at line 128 [4.397614]
B:BD[4.400077] → [4.400077:400098]
```
     SPELL_ICE_BOLT,
```
[4.400077]
[4.400098]
```
     SPELL_FLING_ICICLE,
```
Replacement in crawl-ref/source/spl-book.cc at line 448 [4.397614]
B:BD[4.409391] → [4.409391:409416]
```
     SPELL_BOLT_OF_IRON,
```
[4.409391]
[4.409446]
```
     SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/spl-book.cc at line 470 [4.397614]
B:BD[4.410057] → [4.410057:410082]
```
     SPELL_BOLT_OF_IRON,
```
[4.410057]
[4.410082]
```
     SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/spl-book.cc at line 646 [4.397614]
∅:D[7.1527] → [4.412506:412527]
B:BD[4.412506] → [4.412506:412527]
```
     SPELL_ICE_BOLT,
```
[7.1527]
[4.412527]
```
     SPELL_FLING_ICICLE,
```
Replacement in crawl-ref/source/spl-book.cc at line 657 [4.397614]
B:BD[8.434] → [8.434:459]
```
     SPELL_BOLT_OF_IRON,
```
[8.434]
[4.412733]
```
     SPELL_IRON_SHOT,
```
File move: ice_bolt.png → fling_icicle.png
BF:BFD[9.50031] → [9.54087:54130]
BF:BF[9.54130] → [9.53504:53504]
[9.50031]
[9.53504]
File move: bolt_of_iron.png → iron_shot.png
BF:BFD[9.77837] → [9.85116:85163]
BF:BF[9.85163] → [9.84689:84689]
[9.77837]
[9.84689]
Replacement in crawl-ref/source/rltiles/dc-spells.txt at line 41 [9.111604]
B:BD[9.112691] → [9.112691:112717]
```
bolt_of_iron BOLT_OF_IRON
```
[9.112691]
[9.112717]
```
iron_shot IRON_SHOT
```
Replacement in crawl-ref/source/rltiles/dc-spells.txt at line 97 [9.111604]
B:BD[9.114086] → [9.114086:114104]
```
ice_bolt ICE_BOLT
```
[9.114086]
[9.114104]
```
fling_icicle FLING_ICICLE
```
Replacement in crawl-ref/source/mstuff2.cc at line 1962 [4.1340842]
B:BD[4.1379159] → [10.19963:19988]
B:BD[10.19988] → [11.10755:10794]
```
    case SPELL_ICE_BOLT:
        beam.name     = "bolt of ice";
```
[4.1379159]
[11.10822]
```
    case SPELL_FLING_ICICLE:
        beam.name     = "shard of ice";
```
Replacement in crawl-ref/source/mstuff2.cc at line 2150 [4.1340842]
B:BD[4.1385873] → [10.21092:21121]
```
    case SPELL_BOLT_OF_IRON:
```
[4.1385873]
[11.17168]
```
    case SPELL_IRON_SHOT:
```
Replacement in crawl-ref/source/mstuff2.cc at line 2152 [4.1340842]
B:BD[11.17203] → [11.17203:17240]
```
        beam.name     = "iron bolt";
```
[11.17203]
[11.17268]
```
        beam.name     = "iron shot";
```
Replacement in crawl-ref/source/mon-util.cc at line 1673 [4.1699344]
B:BD[10.31349] → [10.31349:31386]
```
            case SPELL_BOLT_OF_IRON:
```
[10.31349]
[10.31386]
```
            case SPELL_IRON_SHOT:
```
Replacement in crawl-ref/source/mon-spll.h at line 72 [4.1750895]
B:BD[10.34517] → [10.34517:34544]
```
       SPELL_BOLT_OF_IRON,
```
[10.34517]
[12.8623]
```
       SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/mon-spll.h at line 105 [4.1750895]
B:BD[10.35041] → [10.35041:35068]
```
       SPELL_BOLT_OF_IRON,
```
[10.35041]
[12.8728]
```
       SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/mon-spll.h at line 432 [4.1750895]
B:BD[10.39501] → [10.39501:39528]
```
       SPELL_BOLT_OF_IRON,
```
[10.39501]
[10.39528]
```
       SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/mon-spll.h at line 610 [4.1750895]
B:BD[10.43585] → [10.43585:43612]
```
       SPELL_BOLT_OF_IRON,
```
[10.43585]
[10.43612]
```
       SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/mon-spll.h at line 962 [4.1750895]
B:BD[13.7500] → [13.7500:7523]
```
       SPELL_ICE_BOLT,
```
[13.7500]
[13.7523]
```
       SPELL_FLING_ICICLE,
```
Replacement in crawl-ref/source/mon-spll.h at line 1004 [4.1750895]
B:BD[13.7805] → [13.7805:7832]
```
       SPELL_BOLT_OF_IRON,
```
[13.7805]
[14.3206]
```
       SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/mon-spll.h at line 1138 [4.1750895]
B:BD[13.9003] → [13.9003:9030]
```
       SPELL_BOLT_OF_IRON,
```
[13.9003]
[13.9030]
```
       SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/mon-spll.h at line 1204 [4.1750895]
B:BD[13.10202] → [13.10202:10229]
```
       SPELL_BOLT_OF_IRON,
```
[13.10202]
[13.10229]
```
       SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/ghost.cc at line 50 [15.9890]
B:BD[15.10701] → [15.10701:10721]
```
    SPELL_ICE_BOLT,
```
[15.10701]
[15.10721]
```
    SPELL_FLING_ICICLE,
```
Replacement in crawl-ref/source/ghost.cc at line 56 [15.9890]
B:BD[15.10839] → [15.10839:10863]
```
    SPELL_BOLT_OF_IRON,
```
[15.10839]
[15.10863]
```
    SPELL_IRON_SHOT,
```

Replacement in crawl-ref/source/fight.cc at line 2062 [4.3140790]

B:BD[16.5890] → [17.2812:2867]

    // Assume ice storm and ice bolt are mostly solid.

[16.5890]

[17.2867]

    // Assume ice storm and fling icicle are mostly solid.

Replacement in crawl-ref/source/enum.h at line 2806 [4.3287960]
B:BD[4.3365576] → [4.3365576:3365600]
```
    SPELL_BOLT_OF_IRON,
```
[4.3365559]
[4.3365600]
```
    SPELL_IRON_SHOT,
```
Replacement in crawl-ref/source/enum.h at line 2836 [4.3287960]
B:BD[4.3366512] → [4.3366512:3366532]
```
    SPELL_ICE_BOLT,
```
[4.3366465]
[4.3366532]
```
    SPELL_FLING_ICICLE,
```
Replacement in crawl-ref/source/enum.h at line 3121 [4.3287960]
B:BD[18.4985] → [18.4985:5004]
```
    ZAP_IRON_BOLT,
```
[18.4985]
[18.5004]
```
    ZAP_IRON_SHOT,
```
Replacement in crawl-ref/source/enum.h at line 3140 [4.3287960]
B:BD[18.5409] → [18.5409:5427]
```
    ZAP_ICE_BOLT,
```
[18.5409]
[18.5427]
```
    ZAP_FLING_ICICLE,
```

Replacement in crawl-ref/source/decks.cc at line 1634 [4.3987460]

B:BD[19.59497] → [19.59497:59571]

    const zap_type frostzaps[3]  = { ZAP_FROST, ZAP_ICE_BOLT, ZAP_COLD };

[19.59497]

[20.776]

    const zap_type frostzaps[3]  = { ZAP_FROST, ZAP_FLING_ICICLE, ZAP_COLD };

Replacement in crawl-ref/source/dat/descript/spells.txt at line 66 [21.2853]
B:BD[21.5804] → [21.5804:5817]
```
Bolt of Iron
```
[21.5804]
[21.5817]
```
Iron Shot
```

Replacement in crawl-ref/source/dat/descript/spells.txt at line 68 [21.2853]

B:BD[21.5818] → [22.4094:4162]

This spell hurls a large and heavy metal bolt at the caster's foes.

[21.5818]

[21.5887]

This spell hurls a large and heavy metal bolt at the caster's foe.

Replacement in crawl-ref/source/dat/descript/spells.txt at line 289 [21.2853]
B:BD[21.14900] → [21.14900:14909]
```
Ice Bolt
```
[21.14900]
[21.14909]
```
Fling Icicle
```

Replacement in crawl-ref/source/dat/descript/spells.txt at line 291 [21.2853]

B:BD[21.14910] → [22.8924:9193]

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.

[21.14910]

[21.15182]

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.

Replacement in crawl-ref/source/beam.cc at line 827 [4.4128068]
B:BD[23.17757] → [23.17757:17801]
```
        ZAP_IRON_BOLT,
        "iron bolt",
```
[23.17757]
[23.17801]
```
        ZAP_IRON_SHOT,
        "iron shot",
```

Replacement in crawl-ref/source/beam.cc at line 1129 [4.4128068]

B:BD[23.22953] → [23.22953:22998]

        ZAP_ICE_BOLT,
        "bolt of ice",

[23.22953]

[23.22998]

        ZAP_FLING_ICICLE,
        "shard of ice",

Replacement in crawl-ref/source/abl-show.cc at line 1767 [4.4494389]

B:BD[24.10995] → [24.10995:11071]

            case 4: beam.range =  5; ztype = ZAP_IRON_BOLT;          break;

[24.10995]

[24.11071]

            case 4: beam.range =  5; ztype = ZAP_IRON_SHOT;          break;

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

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilepick.cc at line 2769 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 2793 [3.96318]

Replacement in crawl-ref/source/spl-data.h at line 1276 [4.268152]

Replacement in crawl-ref/source/spl-data.h at line 1666 [4.268152]

Replacement in crawl-ref/source/spl-cast.cc at line 1419 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1484 [4.293070]

Replacement in crawl-ref/source/spl-book.cc at line 128 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 448 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 470 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 646 [4.397614]

Replacement in crawl-ref/source/spl-book.cc at line 657 [4.397614]

File move: ice_bolt.png → fling_icicle.png

File move: bolt_of_iron.png → iron_shot.png

Replacement in crawl-ref/source/rltiles/dc-spells.txt at line 41 [9.111604]

Replacement in crawl-ref/source/rltiles/dc-spells.txt at line 97 [9.111604]

Replacement in crawl-ref/source/mstuff2.cc at line 1962 [4.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2150 [4.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2152 [4.1340842]

Replacement in crawl-ref/source/mon-util.cc at line 1673 [4.1699344]

Replacement in crawl-ref/source/mon-spll.h at line 72 [4.1750895]

Replacement in crawl-ref/source/mon-spll.h at line 105 [4.1750895]

Replacement in crawl-ref/source/mon-spll.h at line 432 [4.1750895]

Replacement in crawl-ref/source/mon-spll.h at line 610 [4.1750895]

Replacement in crawl-ref/source/mon-spll.h at line 962 [4.1750895]

Replacement in crawl-ref/source/mon-spll.h at line 1004 [4.1750895]

Replacement in crawl-ref/source/mon-spll.h at line 1138 [4.1750895]

Replacement in crawl-ref/source/mon-spll.h at line 1204 [4.1750895]

Replacement in crawl-ref/source/ghost.cc at line 50 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 56 [15.9890]

Replacement in crawl-ref/source/fight.cc at line 2062 [4.3140790]

Replacement in crawl-ref/source/enum.h at line 2806 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 2836 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 3121 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 3140 [4.3287960]

Replacement in crawl-ref/source/decks.cc at line 1634 [4.3987460]

Replacement in crawl-ref/source/dat/descript/spells.txt at line 66 [21.2853]

Replacement in crawl-ref/source/dat/descript/spells.txt at line 68 [21.2853]

Replacement in crawl-ref/source/dat/descript/spells.txt at line 289 [21.2853]

Replacement in crawl-ref/source/dat/descript/spells.txt at line 291 [21.2853]

Replacement in crawl-ref/source/beam.cc at line 827 [4.4128068]

Replacement in crawl-ref/source/beam.cc at line 1129 [4.4128068]

Replacement in crawl-ref/source/abl-show.cc at line 1767 [4.4494389]