fiddlerwoaroof/crawl - Change OJM4PHYETFEMK43FQ4O2KFWL4TMZTSBAPAWMDST733S7SIXTU4RAC

Move the non-random part of mutation removal into its own function.

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

Created by dolorous on July 11, 2009

OJM4PHYETFEMK43FQ4O2KFWL4TMZTSBAPAWMDST733S7SIXTU4RAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 3408 [7.804403]

B:BD[6.2866] → [6.2866:2991]

        if ((you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU)
            && you.num_gifts[you.religion] == 0)

[6.2669]

[6.2991]

        if (you.num_gifts[you.religion] == 0)

Replacement in crawl-ref/source/religion.cc at line 3410 [7.804403]

B:BD[6.3001] → [3.2596:2681]

            simple_god_message( " will now bless your weapon at an altar... once.");

[6.3001]

[6.3085]

            if (you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU)
                simple_god_message(" will now bless your weapon at an altar... once.");

Deletion in crawl-ref/source/religion.cc at line 4117 [7.804403]
B:BD[8.2788] → [8.2788:2867]
```
            && (you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU)
```

Replacement in crawl-ref/source/religion.cc at line 4119 [7.804403]

∅:D[9.606] → [10.191876:191953]

∅:D[11.1709] → [10.191876:191953]

∅:D[8.2926] → [10.191876:191953]

∅:D[12.6634] → [10.191876:191953]

B:BD[10.191876] → [10.191876:191953]

            simple_god_message(" is no longer ready to bless your weapon.");

[8.2926]

[8.2927]

            if (you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU)
                simple_god_message(" is no longer ready to bless your weapon.");

Replacement in crawl-ref/source/religion.cc at line 6130 [7.804403]

B:BD[10.194243] → [13.3488:3545]

        mprf(MSGCH_GOD, "Your weapon shines brightly!");

[10.194243]

[13.3545]

        mpr("Your weapon shines brightly!", MSGCH_GOD);

Replacement in crawl-ref/source/mutation.cc at line 2315 [7.1263003]

B:BD[7.1314573] → [14.2631:2696]

B:BD[14.2696] → [5.3817:3911]

bool delete_mutation(mutation_type which_mutation, bool failMsg,
                     bool force_mutation, bool god_gift,
                     bool non_fatal)

[7.1313871]

[7.1314615]

static bool _delete_single_mutation_level(mutation_type mutat)

Deletion in crawl-ref/source/mutation.cc at line 2317 [7.1263003]

B:BD[7.1314617] → [15.10693:10748]

∅:D[15.10748] → [16.2633:2675]

B:BD[7.1314617] → [16.2633:2675]

B:BD[7.1314661] → [7.1314661:1314662]

B:BD[7.1314662] → [17.2921:2946]

∅:D[18.534] → [7.1314783:1314789]

∅:D[17.2946] → [7.1314783:1314789]

∅:D[19.22380] → [7.1314783:1314789]

B:BD[7.1314783] → [7.1314783:1314789]

B:BD[7.1314789] → [5.3912:3935]

∅:D[20.3141] → [17.3110:3120]

∅:D[21.3376] → [17.3110:3120]

∅:D[5.3935] → [17.3110:3120]

B:BD[17.3110] → [17.3110:3120]

B:BD[17.3120] → [5.3936:4278]

∅:D[5.4278] → [17.3216:3226]

∅:D[22.20137] → [17.3216:3226]

B:BD[17.3216] → [17.3216:3226]

∅:D[17.3226] → [7.1314861:1314868]

B:BD[7.1314861] → [7.1314861:1314868]

B:BD[7.1314868] → [23.2778:2820]

B:BD[23.2820] → [24.2612:2661]

B:BD[24.2661] → [25.2721:2821]

∅:D[16.2719] → [7.1314899:1314905]

∅:D[25.2821] → [7.1314899:1314905]

∅:D[23.2871] → [7.1314899:1314905]

B:BD[7.1314899] → [7.1314899:1314905]

B:BD[7.1314905] → [26.45546:45567]

∅:D[26.45567] → [7.1314916:1314926]

B:BD[7.1314916] → [7.1314916:1314926]

∅:D[16.2792] → [7.1314970:1315007]

B:BD[7.1314970] → [7.1314970:1315007]

B:BD[7.1315007] → [22.20138:20170]

B:BD[22.20170] → [26.45568:45969]

B:BD[26.45969] → [4.3434:3499]

∅:D[4.3499] → [26.46033:46533]

B:BD[26.46033] → [26.46033:46533]

∅:D[22.20170] → [7.1315037:1315047]

∅:D[26.46533] → [7.1315037:1315047]

B:BD[7.1315037] → [7.1315037:1315047]

∅:D[27.2630] → [7.1315386:1315393]

∅:D[28.2631] → [7.1315386:1315393]

∅:D[29.2904] → [7.1315386:1315393]

∅:D[23.2998] → [7.1315386:1315393]

∅:D[25.3082] → [7.1315386:1315393]

∅:D[12.11020] → [7.1315386:1315393]

B:BD[7.1315386] → [7.1315386:1315393]

    ASSERT(!non_fatal || _is_random(which_mutation));
    mutation_type mutat = which_mutation;
    if (!force_mutation)
    {
        if (!god_gift)
        {
            if (player_mutation_level(MUT_MUTATION_RESISTANCE) > 1
                && (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
                    || coinflip()))
            {
                if (failMsg)
                    mpr("You feel rather odd for a moment.", MSGCH_MUTATION);
                return (false);
            }
        }
    }
    if (which_mutation == RANDOM_MUTATION
        || which_mutation == RANDOM_XOM_MUTATION
        || which_mutation == RANDOM_GOOD_MUTATION
        || which_mutation == RANDOM_BAD_MUTATION)
    {
        while (true)
        {
            if (one_chance_in(1000))
                return (false);
            mutat = static_cast<mutation_type>(random2(NUM_MUTATIONS));
            if (you.mutation[mutat] == 0
                && mutat != MUT_STRONG
                && mutat != MUT_CLEVER
                && mutat != MUT_AGILE
                && mutat != MUT_WEAK
                && mutat != MUT_DOPEY
                && mutat != MUT_CLUMSY)
            {
                continue;
            }
            if (!_accept_mutation(mutat, true, non_fatal, true))
                continue;
            if (you.demon_pow[mutat] >= you.mutation[mutat])
                continue;
            const mutation_def& mdef = get_mutation_def(mutat);
            if (random2(10) >= mdef.rarity)
                continue;
            bool mismatch = (which_mutation == RANDOM_GOOD_MUTATION && mdef.bad)
                || (which_mutation == RANDOM_BAD_MUTATION && !mdef.bad);
            if (mismatch && !one_chance_in(10))
                continue;
            break;
        }
    }

Insertion in crawl-ref/source/mutation.cc at line 2386 [7.1263003]
[10.396312]
[22.20335]

Insertion in crawl-ref/source/mutation.cc at line 2389 [7.1263003]

[2.2833]

[7.1319409]


bool delete_mutation(mutation_type which_mutation, bool failMsg,
                     bool force_mutation, bool god_gift,
                     bool non_fatal)
{
    ASSERT(!non_fatal || _is_random(which_mutation));

Insertion in crawl-ref/source/mutation.cc at line 2396 [7.1263003]

[7.1319410]

[30.13015]

    mutation_type mutat = which_mutation;
    if (!force_mutation)
    {
        if (!god_gift)
        {
            if (player_mutation_level(MUT_MUTATION_RESISTANCE) > 1
                && (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3
                    || coinflip()))
            {
                if (failMsg)
                    mpr("You feel rather odd for a moment.", MSGCH_MUTATION);
                return (false);
            }
        }
    }
    if (which_mutation == RANDOM_MUTATION
        || which_mutation == RANDOM_XOM_MUTATION
        || which_mutation == RANDOM_GOOD_MUTATION
        || which_mutation == RANDOM_BAD_MUTATION)
    {
        while (true)
        {
            if (one_chance_in(1000))
                return (false);
            mutat = static_cast<mutation_type>(random2(NUM_MUTATIONS));
            if (you.mutation[mutat] == 0
                && mutat != MUT_STRONG
                && mutat != MUT_CLEVER
                && mutat != MUT_AGILE
                && mutat != MUT_WEAK
                && mutat != MUT_DOPEY
                && mutat != MUT_CLUMSY)
            {
                continue;
            }
            if (!_accept_mutation(mutat, true, non_fatal, true))
                continue;
            if (you.demon_pow[mutat] >= you.mutation[mutat])
                continue;
            const mutation_def& mdef = get_mutation_def(mutat);
            if (random2(10) >= mdef.rarity)
                continue;
            const bool mismatch =
                (which_mutation == RANDOM_GOOD_MUTATION && mdef.bad)
                    || (which_mutation == RANDOM_BAD_MUTATION && !mdef.bad);
            if (mismatch && !one_chance_in(10))
                continue;
            break;
        }
    }
    return (_delete_single_mutation_level(mutat));
}