fiddlerwoaroof/crawl - Change DTOROKIMAOTTZ42ZYBWV6BBABEFW64G33UXGW334TXIG3W3MBTEAC

Re-enable batform when drawing the Metamorphosis card but add a

fail-safe mechanism for any transformation to abort if it would cause death by stat loss. (For other transformations this could happen because of the auto-removal of statboosting equipment.) Note that the Flight card already has a chance of turning you into a bat (or a spider). Of course the same applies here, as well as when casting spells.

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

Created by j-p-e-g on June 13, 2008

DTOROKIMAOTTZ42ZYBWV6BBABEFW64G33UXGW334TXIG3W3MBTEAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.h at line 52 [6.142596]

B:BD[5.214] → [5.214:361]

                                    int str_loss = 0, int dex_loss = 0,
                                    int int_loss = 0, bool quiet = false);

[5.214]

[7.96440]

                                    bool quiet = false, int str_loss = 0,
                                    int dex_loss = 0, int int_loss = 0);

Replacement in crawl-ref/source/transfor.h at line 60 [6.142596]

B:BD[6.143604] → [2.131:189]

bool transform(int pow, transformation_type which_trans);

[6.143604]

[6.143647]

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

Replacement in crawl-ref/source/transfor.cc at line 131 [6.143977]

B:BD[6.146010] → [8.1249:1328]

static bool check_for_cursed_equipment(const std::set<equipment_type> &remove)

[6.146010]

[6.146090]

static bool check_for_cursed_equipment(const std::set<equipment_type> &remove,
                                       bool quiet = false)

Replacement in crawl-ref/source/transfor.cc at line 143 [6.143977]

B:BD[6.146290] → [6.146290:146402]

            mpr( "Your cursed equipment won't allow you to complete the "
                 "transformation." );

[6.146290]

[6.146402]

            if (!quiet)
            {
                mpr( "Your cursed equipment won't allow you to complete the "
                     "transformation." );
            }

Replacement in crawl-ref/source/transfor.cc at line 161 [6.143977]

B:BD[5.2503] → [5.2503:2629]

                                    int str_loss, int dex_loss, int int_loss,
                                    bool quiet)

[5.2503]

[5.2629]

                                    bool quiet, int str_loss, int dex_loss,
                                    int int_loss)

Insertion in crawl-ref/source/transfor.cc at line 176 [6.143977]

[4.1221]

[5.2769]

    if (prop_str >= you.strength || prop_int >= you.intel
        || prop_dex >= you.dex)
    {
        if (!quiet)
        {
            mpr("This transformation would result in fatal stat loss!",
                MSGCH_WARN);
        }
        return (true);
    }

Replacement in crawl-ref/source/transfor.cc at line 272 [6.143977]

B:BD[7.97062] → [2.191:248]

bool transform(int pow, transformation_type which_trans)

[7.97062]

[6.146578]

// Transforms you into the specified form. If quiet is true, fails silently
// (if it fails).
bool transform(int pow, transformation_type which_trans, bool quiet)

Replacement in crawl-ref/source/transfor.cc at line 285 [6.143977]

B:BD[6.147093] → [6.147093:147170]

        mpr("You cannot transform out of your normal form while in water.");

[6.147093]

[6.147170]

        if (!quiet)
            mpr("You cannot transform out of your normal form while in water.");

Replacement in crawl-ref/source/transfor.cc at line 295 [6.143977]

B:BD[6.147401] → [6.147401:147466]

            mpr( "You extend your transformation's duration." );

[6.147401]

[6.147466]

            mpr("You extend your transformation's duration.");

Replacement in crawl-ref/source/transfor.cc at line 305 [6.143977]

B:BD[6.147702] → [6.147702:147775]

            mpr( "You cannot extend your transformation any further!" );

[6.147702]

[6.147775]

            if (!quiet)
                mpr("You cannot extend your transformation any further!");

Replacement in crawl-ref/source/transfor.cc at line 318 [6.143977]

B:BD[6.147930] → [6.147930:148001]

        mpr("Your unliving flesh cannot be transformed in this way.");

[6.147930]

[6.148001]

        if (!quiet)
            mpr("Your unliving flesh cannot be transformed in this way.");

Replacement in crawl-ref/source/transfor.cc at line 344 [6.143977]

∅:D[9.277] → [6.148480:148533]

∅:D[10.354] → [6.148480:148533]

B:BD[6.148480] → [6.148480:148533]

        if (check_for_cursed_equipment( rem_stuff ))

[6.148480]

[6.148533]

        if (check_for_cursed_equipment(rem_stuff, quiet))
            return (false);
        // Check in case we'll auto-remove stat boosting equipment.
        if (check_transformation_stat_loss(rem_stuff, quiet))

Replacement in crawl-ref/source/transfor.cc at line 368 [6.143977]

B:BD[11.252] → [5.4780:4831]

        if (check_for_cursed_equipment(rem_stuff))

[11.252]

[5.4831]

        if (check_for_cursed_equipment(rem_stuff, quiet))

Replacement in crawl-ref/source/transfor.cc at line 371 [6.143977]

B:BD[9.279] → [5.4860:4934]

        if (check_transformation_stat_loss(rem_stuff, 5)) // Str loss = 5

[9.279]

[5.4934]

        if (check_transformation_stat_loss(rem_stuff, quiet, 5)) // Str loss = 5

Replacement in crawl-ref/source/transfor.cc at line 396 [6.143977]

B:BD[6.149160] → [12.167:220]

        if (check_for_cursed_equipment( rem_stuff ))

[9.352]

[5.5003]

        if (check_for_cursed_equipment(rem_stuff, quiet))
            return (false);
        // Check in case we'll auto-remove stat boosting equipment.
        if (check_transformation_stat_loss(rem_stuff, quiet))

Replacement in crawl-ref/source/transfor.cc at line 403 [6.143977]
∅:D[9.354] → [12.259:322]
B:BD[12.259] → [12.259:322]
```
        mpr( "You turn into a creature of crystalline ice." );
```
[9.354]
[6.149202]
```
        mpr("You turn into a creature of crystalline ice.");
```

Replacement in crawl-ref/source/transfor.cc at line 416 [6.143977]

B:BD[6.149592] → [6.149592:149657]

            mpr( "Your new body merges with your icy armour." );

[6.149592]

[6.149657]

            mpr("Your new body merges with your icy armour.");

Insertion in crawl-ref/source/transfor.cc at line 429 [6.143977]

[6.149956]

            return (false);
        // Check in case we'll auto-remove stat boosting equipment.
        if (check_transformation_stat_loss(rem_stuff, quiet))

Replacement in crawl-ref/source/transfor.cc at line 446 [6.143977]

B:BD[12.493] → [12.493:546]

        if (check_for_cursed_equipment( rem_stuff ))

[6.150423]

[5.5032]

        if (check_for_cursed_equipment(rem_stuff, quiet))

Replacement in crawl-ref/source/transfor.cc at line 449 [6.143977]

B:BD[5.5061] → [5.5061:5138]

        if (check_transformation_stat_loss(rem_stuff, 0, 2)) // Dex loss = 2

[5.5061]

[5.5138]

        if (check_transformation_stat_loss(rem_stuff, quiet, 0, 2)) // Dex loss = 2

Replacement in crawl-ref/source/transfor.cc at line 453 [6.143977]

B:BD[6.150474] → [6.150474:150529]

            mpr( "Look, a garden gnome.  How cute!" );

[6.150474]

[6.150529]

            mpr("Look, a garden gnome.  How cute!");

Replacement in crawl-ref/source/transfor.cc at line 455 [6.143977]

B:BD[6.150596] → [6.150596:150673]

            mpr( "You inwardly fear your resemblance to a lawn ornament." );

[6.150596]

[6.150673]

            mpr("You inwardly fear your resemblance to a lawn ornament.");

Replacement in crawl-ref/source/transfor.cc at line 457 [6.143977]

B:BD[6.150686] → [6.150686:150754]

            mpr( "You turn into a living statue of rough stone." );

[6.150686]

[6.150754]

            mpr("You turn into a living statue of rough stone.");

Replacement in crawl-ref/source/transfor.cc at line 475 [6.143977]

B:BD[6.151537] → [6.151537:151604]

            mpr( "Your new body merges with your stone armour." );

[6.151537]

[6.151604]

            mpr("Your new body merges with your stone armour.");

Replacement in crawl-ref/source/transfor.cc at line 482 [6.143977]

B:BD[6.151767] → [12.574:653]

        if (check_for_cursed_equipment( rem_stuff ))
            return false;

[6.151767]

[12.653]

        if (check_for_cursed_equipment(rem_stuff, quiet))
            return (false);
        // Check in case we'll auto-remove stat boosting equipment.
        if (check_transformation_stat_loss(rem_stuff, quiet))
            return (false);

Replacement in crawl-ref/source/transfor.cc at line 529 [6.143977]

B:BD[6.152641] → [6.152641:152751]

            mpr( "The transformation conflicts with an enchantment "
                 "already in effect." );

[6.152641]

[6.152751]

            if (!quiet)
            {
                mpr( "The transformation conflicts with an enchantment "
                     "already in effect." );
            }

Replacement in crawl-ref/source/transfor.cc at line 543 [6.143977]

B:BD[6.152949] → [6.152949:153010]

            mpr( "You stop regenerating.", MSGCH_DURATION );

[6.152949]

[6.153010]

            mpr("You stop regenerating.", MSGCH_DURATION);

Insertion in crawl-ref/source/transfor.cc at line 569 [6.143977]

[12.861]


        // Check in case we'll auto-remove stat boosting equipment.
        if (check_transformation_stat_loss(rem_stuff, quiet))
            return (false);

Replacement in crawl-ref/source/transfor.cc at line 576 [6.143977]
B:BD[6.153883] → [6.153883:153921]
```
        mpr( "You feel diffuse..." );
```
[6.153883]
[6.153921]
```
        mpr("You feel diffuse...");
```

Replacement in crawl-ref/source/transfor.cc at line 604 [6.143977]

B:BD[6.154390] → [12.940:993]

        if (check_for_cursed_equipment( rem_stuff ))

[6.154390]

[12.993]

        if (check_for_cursed_equipment(rem_stuff, quiet))

Insertion in crawl-ref/source/transfor.cc at line 607 [6.143977]

[12.1020]

[6.154390]

        // Check in case we'll auto-remove stat boosting equipment.
        if (check_transformation_stat_loss(rem_stuff, quiet))
            return (false);

Replacement in crawl-ref/source/transfor.cc at line 612 [6.143977]

B:BD[6.154453] → [6.154453:154514]

        mpr( "You transform into a huge demonic serpent!" );

[6.154453]

[6.154514]

        mpr("You transform into a huge demonic serpent!");

Replacement in crawl-ref/source/decks.cc at line 1468 [6.3987460]

∅:D[13.10079] → [14.3126:3256]

B:BD[14.3126] → [14.3126:3256]

    if ( power_level == 0 )
        transform(random2(power/4), coinflip() ? TRAN_SPIDER : TRAN_BAT);
    if ( power_level >= 1 )

[13.10079]

[14.3256]

    // Assume something _will_ happen.
    bool success = true;
    if (power_level == 0)
    {
        if (!transform(random2(power/4), coinflip() ? TRAN_SPIDER : TRAN_BAT,
                       true))
        {
            // Oops, something went wrong here (either because of cursed
            // equipment or the possibility of stat loss).
            success = false;
        }
    }
    else if (power_level >= 1)

Replacement in crawl-ref/source/decks.cc at line 1486 [6.3987460]
B:BD[14.3346] → [14.3346:3374]
```
    if ( power_level == 2 )
```
[14.3346]
[14.3374]
```
    if (power_level == 2) // Stacks with the above.
```
Replacement in crawl-ref/source/decks.cc at line 1499 [6.3987460]
B:BD[15.20021] → [14.3756:3798]
```
    if ( one_chance_in(4 - power_level) )
```
[15.20021]
[14.3798]
```
    if (one_chance_in(4 - power_level))
```
Insertion in crawl-ref/source/decks.cc at line 1501 [6.3987460]
[14.3857]
[15.20021]
```
    else if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
```

Deletion in crawl-ref/source/decks.cc at line 1699 [6.3987460]

B:BD[6.4000356] → [3.26433:26612]

// Doesn't allow transformation into bat.
// The sudden stat drain of Str-5 would be fatal to some characters!
// XXX: Maybe we could allow it if it would be non-fatal, at least.

Replacement in crawl-ref/source/decks.cc at line 1709 [6.3987460]

B:BD[15.21879] → [16.429:488]

        trans = coinflip() ? TRAN_SPIDER : TRAN_ICE_BEAST;

[15.21879]

[13.10084]

    {
        trans = one_chance_in(3) ? TRAN_SPIDER :
                coinflip()       ? TRAN_ICE_BEAST
                                 : TRAN_BAT;
    }

Replacement in crawl-ref/source/decks.cc at line 1715 [6.3987460]
∅:D[16.488] → [15.21942:21982]
∅:D[17.5949] → [15.21942:21982]
∅:D[13.10085] → [15.21942:21982]
∅:D[11.25472] → [15.21942:21982]
∅:D[18.60184] → [15.21942:21982]
B:BD[15.21942] → [15.21942:21982]
```
    transform(random2(power/4), trans);
```
[13.10085]
[15.21982]
```
    // Might fail, e.g. because of cursed equipment or potential death by
    // stat loss. Aren't we being nice?
    if (!transform(random2(power/4), trans, true))
        canned_msg(MSG_NOTHING_HAPPENS);
```