fiddlerwoaroof/crawl - Change LDNLHHR25F4EK4WFK2LKPOI3HPS22RRZUZT6JHJME3QZI545P6HQC

Don't use invisibility items when pointless

Since the game won't let you waste (known) scrolls or wand charges of teleportation if it's known that you can't teleport (you're wearing an identified artefact which prevents teleportation) do something similar for invisiblity: if you're haloed because of worshipping TSO then refuse to use known wands or potions of invisibility, and if you're glowing from magical contamination then prompt before usage (since the glow might wear off before the invisibility).

Also: 1) add some informational messages about the interaction of invisibility and being backlit, 2) if you use-identify invisibility while haloed then just print a message, but don't actually get the invisibility duration.

Created by Matthew Cline on October 24, 2009

LDNLHHR25F4EK4WFK2LKPOI3HPS22RRZUZT6JHJME3QZI545P6HQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.cc at line 5182 [5.962854]

[3.7964]

[4.5027]


        if (new_level == 0 && you.duration[DUR_INVIS] && !you.backlit())
        {
            mpr("You fade completely from view now that you are no longer "
                "glowing from magical contamination.");
        }

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

[6.2855]

[7.6059]

}
static bool _dont_use_invis()
{
    if (!you.backlit())
        return (false);
    if (you.haloed())
    {
        mpr("You can't turn invisible.");
        return (true);
    }
    else if (get_contamination_level() > 0
             && !yesno("Invisibility will do you no good right now; "
                       "use anyways?"))
    {
        return (true);
    }
    return (false);

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

B:BD[2.3510] → [2.3510:3672]

    if (alreadyknown && wand.sub_type == WAND_TELEPORTATION
        && zap_wand.target == you.pos()
        && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false))

[2.3510]

[2.3672]

    if (alreadyknown && zap_wand.target == you.pos())

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

B:BD[2.3678] → [2.3678:3725]

∅:D[2.3725] → [5.2842418:2842434]

B:BD[5.2842418] → [5.2842418:2842434]

        mpr("You cannot teleport right now.");
        return;

[2.3678]

[5.2842434]

        if (wand.sub_type == WAND_TELEPORTATION
            && scan_artefacts(ARTP_PREVENT_TELEPORTATION, false))
        {
            mpr("You cannot teleport right now.");
            return;
        }
        else if (wand.sub_type == WAND_INVISIBILITY
                 && _dont_use_invis())
        {
            return;
        }

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

[8.3946]

        return;
    }
    if (alreadyknown && potion.sub_type == POT_INVISIBILITY
        && _dont_use_invis())
    {

Replacement in crawl-ref/source/it_use2.cc at line 299 [5.2904329]

B:BD[5.2909011] → [9.9450:9519]

B:BD[9.9519] → [10.3141:3219]

        mpr(!you.duration[DUR_INVIS] ? "You fade into invisibility!"
                                     : "You fade further into invisibility.",

[5.2909011]

[10.3219]

        if (you.haloed())
        {
            // You can't turn invisible while haloed, but identify the
            // effect anyways.
            mpr("You briefly turn translucent.");
            // And also cancel backlight (for whatever good that will
            // do).
            you.duration[DUR_BACKLIGHT] = 0;
            return (true);
        }
        if (get_contamination_level() > 0)
        {
            mprf(MSGCH_DURATION,
                 "You become %stransparent, but the glow from your "
                 "magical contamination prevents you from becoming "
                 "completely invisible.",
                 you.duration[DUR_INVIS] ? "further " : "");
        }
        else
        {
            mpr(!you.duration[DUR_INVIS] ? "You fade into invisibility!"
                                       : "You fade further into invisibility.",

Insertion in crawl-ref/source/it_use2.cc at line 324 [5.2904329]
[10.3248]
[5.2909131]
```
        }
```
Deletion in crawl-ref/source/it_use2.cc at line 337 [5.2904329]
∅:D[11.13270] → [12.1474:1475]
B:BD[5.2909374] → [12.1474:1475]
B:BD[12.1475] → [11.13271:13312]
```
        you.duration[DUR_BACKLIGHT] = 0;
```