fiddlerwoaroof/crawl - Change PIBNVCEVSIEQ25EYX7IZ3YEXDSOCTLUWRVFT3AUDESGZC7N3XIXQC

Fix 2726622: untransforming not prompting for safe-inscribed equipment

Also, when transforming voluntarily (i.e. not via Xom or by drawing a card) you get prompted for the loss of safe-inscribed equipment. If you opt out, it costs neither turn nor mana. There's an edge case when you change from one transformation to another one: if that fails for whatever reason you lose the turn (due to untransforming) and the spell fizzles (including mana loss).

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

Created by j-p-e-g on April 6, 2009

PIBNVCEVSIEQ25EYX7IZ3YEXDSOCTLUWRVFT3AUDESGZC7N3XIXQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.h at line 33 [4.142596]
B:BD[4.143117] → [4.143117:143141]
```
void untransform(void);
```
[4.142901]
[4.143142]
```
void untransform(bool skip_wielding = false);
```

Replacement in crawl-ref/source/transfor.h at line 41 [4.142596]

B:BD[4.143387] → [3.3505:3582]

bool transform(int pow, transformation_type which_trans, bool quiet = false,

[4.143387]

[3.3582]

bool transform(int pow, transformation_type which_trans, bool force = false,

Insertion in crawl-ref/source/transfor.cc at line 20 [4.143977]
[5.214]
[4.144414]
```
#include "invent.h"
```
Insertion in crawl-ref/source/transfor.cc at line 30 [4.143977]
[4.144535]
[4.144535]
```
#include "state.h"
```

Insertion in crawl-ref/source/transfor.cc at line 419 [4.143977]

[6.4623]

[7.96615]

// Returns true if the player got prompted by an inscription warning and
// chose to opt out.
bool _check_transformation_inscription_warning(
            const std::set<equipment_type> &remove)
{
    // Check over all items to be removed or melded.
    std::set<equipment_type>::const_iterator iter;
    for (iter = remove.begin(); iter != remove.end(); ++iter)
    {
        equipment_type e = *iter;
        if (you.equip[e] == -1)
            continue;
        const item_def& item = you.inv[you.equip[e]];
        operation_types op = OPER_WEAR;
        if (e == EQ_WEAPON)
            op = OPER_WIELD;
        else if (item.base_type == OBJ_JEWELLERY)
            op = OPER_PUTON;
        if (!check_old_item_warning(item, op))
            return (true);
    }
    return (false);
}

Replacement in crawl-ref/source/transfor.cc at line 479 [4.143977]

B:BD[7.97062] → [8.1073:1149]

// Transforms you into the specified form. If quiet is true, fails silently

[7.97062]

[3.3813]

static bool _abort_or_fizzle()
{
    if (you.turn_is_over)
    {
        canned_msg(MSG_SPELL_FIZZLES);
        return (true); // pay the necessary costs
    }
    return (false); // SPRET_ABORT
}
// Transforms you into the specified form. If force is true, checks for
// inscription warnings are skipped, and the transformation fails silently

Replacement in crawl-ref/source/transfor.cc at line 493 [4.143977]

B:BD[3.3955] → [3.3955:4024]

bool transform(int pow, transformation_type which_trans, bool quiet,

[3.3955]

[3.4024]

bool transform(int pow, transformation_type which_trans, bool force,

Insertion in crawl-ref/source/transfor.cc at line 496 [4.143977]
[4.146580]
[4.146580]
```
    if (!force && crawl_state.is_god_acting())
        force = true;
```
Replacement in crawl-ref/source/transfor.cc at line 508 [4.143977]
∅:D[9.6879] → [8.1237:1257]
B:BD[4.147093] → [8.1237:1257]
```
        if (!quiet)
```
[9.6879]
[8.1257]
```
        if (!force)
```
Replacement in crawl-ref/source/transfor.cc at line 532 [4.143977]
B:BD[4.147702] → [8.1403:1427]
```
            if (!quiet)
```
[4.147702]
[8.1427]
```
            if (!force)
```

Insertion in crawl-ref/source/transfor.cc at line 538 [4.143977]

[4.147820]

[3.4118]

    // The actual transformation may still fail later (e.g. due to cursed
    // equipment). In any case, untransforming costs us a turn but nothing
    // else (as does the "End Transformation" ability).

Replacement in crawl-ref/source/transfor.cc at line 542 [4.143977]

∅:D[3.4190] → [4.147877:147900]

B:BD[4.147877] → [4.147877:147900]

        untransform();

[3.4190]

[4.147900]

    {
        bool skip_wielding = false;
        switch (which_trans)
        {
        case TRAN_STATUE:
        case TRAN_LICH:
            break;
        default:
            skip_wielding = true;
            break;
        }
        // Skip wielding weapon if it gets unwielded again right away.
        untransform(skip_wielding);
    }

Replacement in crawl-ref/source/transfor.cc at line 562 [4.143977]
B:BD[4.147930] → [8.1503:1523]
```
        if (!quiet)
```
[4.147930]
[8.1523]
```
        if (!force)
```
Replacement in crawl-ref/source/transfor.cc at line 564 [4.143977]
∅:D[8.1598] → [4.148001:148025]
B:BD[4.148001] → [4.148001:148025]
```
        return (false);
```
[8.1598]
[4.148025]
```
        return (_abort_or_fizzle());
```
Replacement in crawl-ref/source/transfor.cc at line 569 [4.143977]
B:BD[10.407] → [9.7008:7028]
```
        if (!quiet)
```
[10.407]
[9.7028]
```
        if (!force)
```
Replacement in crawl-ref/source/transfor.cc at line 574 [4.143977]
∅:D[2.354] → [9.7162:7186]
B:BD[9.7162] → [9.7162:7186]
```
        return (false);
```
[2.354]
[10.448]
```
        return (_abort_or_fizzle());
```

Replacement in crawl-ref/source/transfor.cc at line 579 [4.143977]

∅:D[2.356] → [9.7271:7363]

B:BD[9.7271] → [9.7271:7363]

    if (_check_for_cursed_equipment(rem_stuff, which_trans, quiet))
        return (false);

[2.356]

[4.148324]

    if (_check_for_cursed_equipment(rem_stuff, which_trans, force))
        return (_abort_or_fizzle());

Replacement in crawl-ref/source/transfor.cc at line 668 [4.143977]

B:BD[4.149203] → [9.10711:10768]

    if (check_transformation_stat_loss(rem_stuff, quiet,

[4.149203]

[3.4232]

    if (check_transformation_stat_loss(rem_stuff, force,

Replacement in crawl-ref/source/transfor.cc at line 671 [4.143977]
B:BD[9.10851] → [9.10851:10875]
```
        return (false);
```
[9.10851]
[9.10875]
```
        return (_abort_or_fizzle());
```

Insertion in crawl-ref/source/transfor.cc at line 677 [4.143977]

[3.4399]

[4.149242]


    if (!force && _check_transformation_inscription_warning(rem_stuff))
        return (_abort_or_fizzle());

Replacement in crawl-ref/source/transfor.cc at line 782 [4.143977]
B:BD[4.155068] → [4.155068:155091]
```
void untransform(void)
```
[4.155068]
[4.155091]
```
void untransform(bool skip_wielding)
```
Deletion in crawl-ref/source/transfor.cc at line 842 [4.143977]
B:BD[11.79] → [12.443:444]
Deletion in crawl-ref/source/transfor.cc at line 853 [4.143977]
B:BD[11.117] → [12.523:524]

Replacement in crawl-ref/source/transfor.cc at line 907 [4.143977]

B:BD[13.233] → [14.233:281]

    handle_interrupted_swap(true, false, true);

[13.233]

[15.236]

    if (!skip_wielding)
        handle_interrupted_swap(true, false, true);
    you.turn_is_over = true;

Replacement in crawl-ref/source/spl-cast.cc at line 1776 [4.293070]
B:BD[16.476] → [16.476:519]
```
            canned_msg(MSG_SPELL_FIZZLES);
```
[16.476]
[4.333406]
```
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1781 [4.293070]
B:BD[16.563] → [16.563:606]
```
            canned_msg(MSG_SPELL_FIZZLES);
```
[16.563]
[4.333720]
```
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1786 [4.293070]
B:BD[16.650] → [16.650:693]
```
            canned_msg(MSG_SPELL_FIZZLES);
```
[16.650]
[4.333920]
```
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1791 [4.293070]
B:BD[16.740] → [16.740:783]
```
            canned_msg(MSG_SPELL_FIZZLES);
```
[16.740]
[4.334006]
```
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1796 [4.293070]
B:BD[16.827] → [16.827:870]
```
            canned_msg(MSG_SPELL_FIZZLES);
```
[16.827]
[4.334084]
```
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/spl-cast.cc at line 1801 [4.293070]
B:BD[16.996] → [16.996:1039]
```
            canned_msg(MSG_SPELL_FIZZLES);
```
[16.912]
[4.334237]
```
            return (SPRET_ABORT);
```
Replacement in crawl-ref/source/item_use.cc at line 327 [4.2781507]
B:BD[17.911] → [6.7850:7875]
```
    // Wield the weapon.
```
[17.911]
[18.3343]
```
    // Make sure that wielding the weapon won't kill the player.
```
Replacement in crawl-ref/source/item_use.cc at line 337 [4.2781507]
B:BD[4.2788464] → [4.2788464:2788514]
```
    // any oddness on wielding taken care of here
```
[4.2787610]
[19.365362]
```
    // Any oddness on wielding taken care of here.
```
Replacement in crawl-ref/source/item_use.cc at line 3463 [4.2781507]
B:BD[20.5065] → [6.8033:8061]
```
    // Put on the new ring.
```
[20.5065]
[17.3535]
```
    // Check that the new ring won't kill us.
```
Insertion in crawl-ref/source/item_use.cc at line 3467 [4.2781507]
[20.5067]
[7.754180]
```
    // Put on the new ring.
```

Replacement in crawl-ref/source/delay.cc at line 595 [4.3963459]

B:BD[21.6019] → [21.6019:6072]

            start_delay(DELAY_WEAPON_SWAP, 1, weap);

[21.6019]

[21.6072]

            if (weap == -1 || check_warning_inscriptions(you.inv[weap], OPER_WIELD))
                start_delay(DELAY_WEAPON_SWAP, 1, weap);

Replacement in crawl-ref/source/delay.cc at line 608 [4.3963459]

B:BD[21.6474] → [21.6474:6527]

            start_delay(DELAY_WEAPON_SWAP, 1, weap);

[21.6474]

[21.6527]

            if (weap == -1 || check_warning_inscriptions(you.inv[weap], OPER_WIELD))
                start_delay(DELAY_WEAPON_SWAP, 1, weap);

Deletion in crawl-ref/source/delay.cc at line 624 [4.3963459]
B:BD[21.6793] → [21.6793:6838]
```
    weapon_switch(weap);
    print_stats();
```

Insertion in crawl-ref/source/delay.cc at line 625 [4.3963459]

[21.6839]

    if (weap == -1 || check_warning_inscriptions(you.inv[weap], OPER_WIELD))
    {
        weapon_switch(weap);
        print_stats();
    }

Fix 2726622: untransforming not prompting for safe-inscribed equipment

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/transfor.h at line 33 [4.142596]

Replacement in crawl-ref/source/transfor.h at line 41 [4.142596]

Insertion in crawl-ref/source/transfor.cc at line 20 [4.143977]

Insertion in crawl-ref/source/transfor.cc at line 30 [4.143977]

Insertion in crawl-ref/source/transfor.cc at line 419 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 479 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 493 [4.143977]

Insertion in crawl-ref/source/transfor.cc at line 496 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 508 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 532 [4.143977]

Insertion in crawl-ref/source/transfor.cc at line 538 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 542 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 562 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 564 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 569 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 574 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 579 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 668 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 671 [4.143977]

Insertion in crawl-ref/source/transfor.cc at line 677 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 782 [4.143977]

Deletion in crawl-ref/source/transfor.cc at line 842 [4.143977]

Deletion in crawl-ref/source/transfor.cc at line 853 [4.143977]

Replacement in crawl-ref/source/transfor.cc at line 907 [4.143977]

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

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

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

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

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

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

Replacement in crawl-ref/source/item_use.cc at line 327 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 337 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3463 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3467 [4.2781507]

Replacement in crawl-ref/source/delay.cc at line 595 [4.3963459]

Replacement in crawl-ref/source/delay.cc at line 608 [4.3963459]

Deletion in crawl-ref/source/delay.cc at line 624 [4.3963459]

Insertion in crawl-ref/source/delay.cc at line 625 [4.3963459]