fiddlerwoaroof/crawl - Change UEEDQIFBOUZOXHCWGSEBED4Z3SYGN3DVHOVRJYQVWQQ6BIDLWAQAC

Add more mutation-related cleanups. Among these, revert

can_safely_mutate() to a check whether or not the player can mutate without decomposing. Since both Zin and Xom force their mutations, and doing so ignores the "mutation resistance" mutations, checking for the latter is redundant.

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

Created by dolorous on April 25, 2008

UEEDQIFBOUZOXHCWGSEBED4Z3SYGN3DVHOVRJYQVWQQ6BIDLWAQAC

Dependencies

In channels

main

Change contents

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

B:BD[5.375308] → [6.4229:4284]

                    give_bad_mutation(false, failMsg);

[5.375308]

[5.375364]

                    give_bad_mutation(failMsg);

Replacement in crawl-ref/source/mutation.h at line 72 [5.1260415]

B:BD[5.1262650] → [5.1262650:1262725]

bool give_bad_mutation( bool forceMutation = false, bool failMsg = true );

[5.1262650]

[5.1262725]

bool give_bad_mutation( bool failMsg = true, bool force_mutation = false );

Replacement in crawl-ref/source/mutation.cc at line 1042 [5.1263003]

B:BD[7.2660] → [8.2589:2632]

B:BD[8.2632] → [2.2554:2899]

// Is there any sense in trying to mutate?
//
// Avoid the following cases:
//     * undead players who can decompose (potentially lethal)
//     * players with the full mutation resistance mutation (useless)
//
// Don't avoid the following cases:
//     * players with amulets of resist mutation (sometimes fails)
//     * players who resist mutation due to high Zin piety (same reason)

[7.2660]

// Can the player mutate without decomposing?

Replacement in crawl-ref/source/mutation.cc at line 1045 [5.1263003]
B:BD[7.2687] → [3.2557:2585]
```
    return ((!you.is_undead
```
[7.2687]
[8.2730]
```
    return (!you.is_undead
```

Replacement in crawl-ref/source/mutation.cc at line 1047 [5.1263003]

B:BD[8.2778] → [3.2586:2639]

B:BD[3.2702] → [3.2702:2771]

                && you.hunger_state == HS_ENGORGED))
            && player_mutation_level(MUT_MUTATION_RESISTANCE) != 3);

[8.2778]

[9.19875]

                && you.hunger_state == HS_ENGORGED));

Replacement in crawl-ref/source/mutation.cc at line 1659 [5.1263003]

∅:D[10.6081] → [11.1577:1654]

B:BD[11.1577] → [11.1577:1654]

∅:D[11.1654] → [12.37711:37740]

B:BD[12.37711] → [12.37711:37740]

bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
            bool demonspawn)

[10.6081]

[12.37740]

bool mutate(mutation_type which_mutation, bool failMsg,
            bool force_mutation, bool demonspawn)

Replacement in crawl-ref/source/mutation.cc at line 2197 [5.1263003]

B:BD[5.1314662] → [4.2799:2823]

∅:D[4.2823] → [9.22211:22380]

B:BD[13.404] → [9.22211:22380]

    if (!force_mutation
        && ( player_mutation_level(MUT_MUTATION_RESISTANCE) > 1
             && (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
                 || coinflip()) ) )

[5.1314662]

[5.1314783]

    if (!force_mutation)

Replacement in crawl-ref/source/mutation.cc at line 2199 [5.1263003]

B:BD[5.1314789] → [14.437:503]

∅:D[14.503] → [5.1314839:1314861]

B:BD[5.1314839] → [5.1314839:1314861]

        mpr("You feel rather odd for a moment.", MSGCH_MUTATION);
        return false;

[5.1314789]

[5.1314861]

        if (player_mutation_level(MUT_MUTATION_RESISTANCE) > 1
            && (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
                || coinflip()))
        {
            mpr("You feel rather odd for a moment.", MSGCH_MUTATION);
            return false;
        }

Replacement in crawl-ref/source/mutation.cc at line 2772 [5.1263003]
B:BD[5.1333442] → [5.1333442:1333499]
```
bool give_bad_mutation(bool forceMutation, bool failMsg)
```
[5.1333335]
[5.1333499]
```
bool give_bad_mutation(bool failMsg, bool force_mutation)
```
Replacement in crawl-ref/source/mutation.cc at line 2774 [5.1263003]
B:BD[5.1333501] → [11.3528:3561]
```
    mutation_type which_bad_one;
```
[5.1333501]
[5.1333595]
```
    mutation_type mutat;
```

Replacement in crawl-ref/source/mutation.cc at line 2776 [5.1263003]

B:BD[5.1333596] → [11.3562:3601]

∅:D[11.3601] → [5.1333625:1334078]

B:BD[5.1333625] → [5.1333625:1334078]

B:BD[5.1334078] → [15.1849:1903]

∅:D[15.1903] → [5.1334130:1334303]

B:BD[5.1334130] → [5.1334130:1334303]

    const int temp_rand = random2(12);
    which_bad_one = ((temp_rand >= 11) ? MUT_CARNIVOROUS :
                     (temp_rand == 10) ? MUT_HERBIVOROUS :
                     (temp_rand ==  9) ? MUT_FAST_METABOLISM :
                     (temp_rand ==  8) ? MUT_WEAK :
                     (temp_rand ==  7) ? MUT_DOPEY :
                     (temp_rand ==  6) ? MUT_CLUMSY :
                     (temp_rand ==  5) ? MUT_TELEPORT :
                     (temp_rand ==  4) ? MUT_DEFORMED :
                     (temp_rand ==  3) ? MUT_SCREAM :
                     (temp_rand ==  2) ? MUT_DETERIORATION :
                     (temp_rand ==  1) ? MUT_BLURRY_VISION
                                       : MUT_FRAIL);

[5.1333596]

[5.1334303]

    switch (random2(12))
    {
    case 0: mutat = MUT_CARNIVOROUS; break;
    case 1: mutat = MUT_HERBIVOROUS; break;
    case 2: mutat = MUT_FAST; break;
    case 3: mutat = MUT_WEAK; break;
    case 4: mutat = MUT_DOPEY; break;
    case 5: mutat = MUT_CLUMSY; break;
    case 6: mutat = MUT_TELEPORT; break;
    case 7: mutat = MUT_DEFORMED; break;
    case 8: mutat = MUT_SCREAM; break;
    case 9: mutat = MUT_DETERIORATION; break;
    case 10: mutat = MUT_BLURRY_VISION; break;
    case 11: mutat = MUT_FRAIL; break;
    }

Replacement in crawl-ref/source/mutation.cc at line 2792 [5.1263003]

B:BD[5.1334304] → [16.40077:40148]

    const bool result = mutate(which_bad_one, failMsg, forceMutation);

[5.1334304]

[16.40148]

    const bool result = mutate(mutat, failMsg, force_mutation);

Replacement in crawl-ref/source/effects.cc at line 2503 [5.3382105]

B:BD[17.14418] → [17.14418:14465]

                give_bad_mutation(coinflip());

[17.14418]

[17.14465]

                give_bad_mutation(true, coinflip());