fiddlerwoaroof/crawl - Change XM4DDV26SBMFDCHSFKIOPWCFDKFHBFA3VDEDRZWXZSXHXOII762AC

FR 2819565: Abort when trying to read a known ?blinking or ?teleportation

        or when zapping a known &#x2f;teleportation at yourself if you know 
        you have a -TELE artefact equipped.
        In the same situation, prompt when trying to evoke Blink or
        cast one of the teleportation spells, in case the player
        insists on training Evoc&#x2f;Spellcasting&#x2f;Translocations that way.

Also, automatically update the autoinscriptions when tweaking artefact properties in wizard mode.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10532 c06c8d41-db1a-0410-9941-cceddc491573

Created by j-p-e-g on August 13, 2009

XM4DDV26SBMFDCHSFKIOPWCFDKFHBFA3VDEDRZWXZSXHXOII762AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 282 [5.293070]

B:BD[3.1424] → [4.2092:2114]

        if (!viewing)

[3.1424]

[4.2114]


        // If an equipped artefact prevents teleportation, the following spells
        // cannot be cast.
        if ((spell == SPELL_BLINK || spell == SPELL_CONTROLLED_BLINK
                 || spell == SPELL_TELEPORT_SELF)
             && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false))
        {
            grey = true;
        }
        else if (!viewing)

Insertion in crawl-ref/source/spl-cast.cc at line 1140 [5.293070]

[6.129613]

[7.560]

    if ((spell == SPELL_BLINK || spell == SPELL_CONTROLLED_BLINK
           || spell == SPELL_TELEPORT_SELF)
        && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false)
        && !yesno("You cannot teleport right now. Cast anyway?", true, 'n'))
    {
        return (SPRET_ABORT);
    }

Replacement in crawl-ref/source/item_use.cc at line 3935 [5.2781507]

B:BD[8.2983] → [8.2983:3037]

        _wand_range(type_zapped) : _max_wand_range();

[8.2983]

[5.2842242]

                        _wand_range(type_zapped) : _max_wand_range();

Insertion in crawl-ref/source/item_use.cc at line 3943 [5.2781507]

[5.2842418]

        return;
    }
    if (alreadyknown && wand.sub_type == WAND_TELEPORTATION
        && zap_wand.target == you.pos()
        && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false))
    {
        mpr("You cannot teleport right now.");

Insertion in crawl-ref/source/item_use.cc at line 4849 [5.2781507]

[9.7835]

[10.15989]

    const bool alreadyknown = item_type_known(scroll);
    if (alreadyknown
        && (which_scroll == SCR_BLINKING || which_scroll == SCR_TELEPORTATION)
        && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false))
    {
        mpr("You cannot teleport right now.");
        return;
    }

Replacement in crawl-ref/source/item_use.cc at line 4866 [5.2781507]

B:BD[11.50699] → [12.3345:3400]

B:BD[12.3400] → [9.7941:8002]

    const bool alreadyknown = item_type_known(scroll);
    const bool dangerous    = player_in_a_dangerous_place();

[11.50699]

[5.2860127]

    const bool dangerous = player_in_a_dangerous_place();

Insertion in crawl-ref/source/debug.cc at line 1819 [5.4016436]

[13.7899]


    if (Options.autoinscribe_artefacts)
        item.inscription = artefact_auto_inscription(item);

Replacement in crawl-ref/source/debug.cc at line 2083 [5.4016436]
∅:D[14.37684] → [15.6584:6624]
B:BD[15.6584] → [15.6584:6624]
B:BD[15.6624] → [14.37685:37753]
∅:D[14.37753] → [15.6691:6697]
B:BD[15.6691] → [15.6691:6697]
```
    {
        add_autoinscription(item,
                            artefact_auto_inscription(you.inv[i]));
    }
```
[14.37684]
[15.6697]
```
        add_autoinscription(item, artefact_auto_inscription(you.inv[i]));
```

Insertion in crawl-ref/source/abl-show.cc at line 1086 [5.4494389]

[2.7431]

        }
        return (true);
    case ABIL_EVOKE_BLINK:
        if (scan_artefacts(ARTP_PREVENT_TELEPORTATION, false))
        {
            return (yesno("You cannot teleport right now. Try anyway?",
                          true, 'n'));