fiddlerwoaroof/crawl - Change IIFSJJPQOWU4HBDPD2KQZ2Z6OU5NZY74ORPWCIFTDBVXN7SSTZMQC

Consolidate the mutation-counting routines.

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

Created by dolorous on April 25, 2008

IIFSJJPQOWU4HBDPD2KQZ2Z6OU5NZY74ORPWCIFTDBVXN7SSTZMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 2900 [4.804403]

B:BD[3.2632] → [3.2632:2690]

    if (punishment < 2 && count_mutations() <= random2(3)

[3.2632]

[3.2690]

    if (punishment < 2 && how_mutated() <= random2(3)

Replacement in crawl-ref/source/religion.cc at line 2920 [4.804403]
B:BD[3.3089] → [3.3089:3132]
```
        if (success && !count_mutations())
```
[3.3089]
[3.3132]
```
        if (success && !how_mutated())
```
Deletion in crawl-ref/source/mutation.h at line 61 [4.1260415]
B:BD[4.1261576] → [5.9474:9530]
∅:D[5.9530] → [4.1261576:1261577]
B:BD[4.1261576] → [4.1261576:1261577]
```
// used by Zin (religion.cc)
int count_mutations(void);
```
Replacement in crawl-ref/source/mutation.h at line 81 [4.1260415]
B:BD[6.956] → [7.2545:2564]
```
int how_mutated();
```
[6.956]
[4.1262958]
```
int how_mutated(bool all = false, bool levels = false);
```
Replacement in crawl-ref/source/mutation.cc at line 54 [4.1263003]
B:BD[4.1264070] → [4.1264070:1264118]
```
int how_mutated(void);
char body_covered(void);
```
[4.1264070]
[4.1264167]
```
static char body_covered(void);
```
Replacement in crawl-ref/source/mutation.cc at line 1754 [4.1263003]
B:BD[4.1301824] → [6.1742:1785]
```
        if ( random2(15) < how_mutated() )
```
[4.1301824]
[6.1785]
```
        if ( random2(15) < how_mutated(false, true) )
```
Replacement in crawl-ref/source/mutation.cc at line 2167 [4.1263003]
B:BD[4.1313871] → [4.1313871:1313893]
```
int how_mutated(void)
```
[4.1313871]
[4.1313893]
```
int how_mutated(bool all, bool levels)
```
Replacement in crawl-ref/source/mutation.cc at line 2173 [4.1263003]
B:BD[4.1313951] → [4.1313951:1314018]
```
        if (you.mutation[i] && you.demon_pow[i] < you.mutation[i])
```
[4.1313951]
[4.1314018]
```
        if (you.mutation[i])
```

Replacement in crawl-ref/source/mutation.cc at line 2175 [4.1263003]

B:BD[4.1314028] → [4.1314028:1314070]

B:BD[4.1314070] → [2.22048:22190]

            // these allow for 14 levels:
            if (i == MUT_STRONG  || i == MUT_CLEVER || i == MUT_AGILE
                || i == MUT_WEAK || i == MUT_DOPEY  || i == MUT_CLUMSY)

[4.1314028]

[4.1314210]

            if (!all && you.demon_pow[i] < you.mutation[i])
                continue;
            if (levels)

Replacement in crawl-ref/source/mutation.cc at line 2180 [4.1263003]

B:BD[4.1314224] → [4.1314224:1314272]

                j += (you.mutation[i] / 5 + 1);

[4.1314224]

[4.1314272]

                // these allow for 14 levels:
                if (i == MUT_STRONG  || i == MUT_CLEVER || i == MUT_AGILE
                    || i == MUT_WEAK || i == MUT_DOPEY  || i == MUT_CLUMSY)
                {
                    j += (you.mutation[i] / 5 + 1);
                }
                else
                    j += you.mutation[i];

Replacement in crawl-ref/source/mutation.cc at line 2190 [4.1263003]
∅:D[2.22208] → [4.1314318:1314356]
B:BD[4.1314318] → [4.1314318:1314356]
```
                j += you.mutation[i];
```
[2.22208]
[4.1314370]
```
                j++;
```

Replacement in crawl-ref/source/mutation.cc at line 2195 [4.1263003]

B:BD[4.1314409] → [8.15039:15086]

    mprf(MSGCH_DIAGNOSTICS, "levels: %d", j );

[4.1314409]

[4.1314495]

    mprf(MSGCH_DIAGNOSTICS, "how_mutated(): all = %u, levels = %u, j = %d",
         all, levels, j);

Deletion in crawl-ref/source/mutation.cc at line 2202 [4.1263003]

B:BD[4.1314573] → [5.10597:10773]

B:BD[5.10773] → [2.22209:22210]

∅:D[2.22210] → [5.10786:10807]

B:BD[5.10786] → [5.10786:10807]

int count_mutations()
{
    int count = 0;
    for (int i = 0; i < NUM_MUTATIONS; i++)
        if (you.mutation[i] && you.demon_pow[i] < you.mutation[i])
            count++;
    return count;
}

Replacement in crawl-ref/source/mutation.cc at line 2373 [4.1263003]
B:BD[4.1319410] → [4.1319410:1319434]
```
char body_covered(void)
```
[4.1319410]
[4.1319434]
```
static char body_covered(void)
```

Replacement in crawl-ref/source/decks.cc at line 2039 [4.3987460]

B:BD[9.3177] → [7.3304:3358]

        switch ( count_mutations() ? random2(3) : 0 )

[9.3177]

[9.3315]

        switch ( how_mutated() ? random2(3) : 0 )

Replacement in crawl-ref/source/decks.cc at line 2055 [4.3987460]

B:BD[7.3640] → [7.3640:3694]

        switch ( count_mutations() ? random2(3) : 0 )

[7.3640]

[7.3694]

        switch ( how_mutated() ? random2(3) : 0 )

Deletion in crawl-ref/source/chardump.cc at line 1096 [4.4100336]

∅:D[10.6023] → [4.4120176:4120265]

B:BD[4.4120176] → [4.4120176:4120265]

B:BD[4.4120265] → [11.21062:21109]

B:BD[4.4120308] → [4.4120308:4120360]

    // Can't use how_mutated() here, as it doesn't count demonic powers
    int xz = 0;
    for (int xy = 0; xy < NUM_MUTATIONS; ++xy)
        if (you.mutation[xy] > 0)
            xz++;

Replacement in crawl-ref/source/chardump.cc at line 1097 [4.4100336]
B:BD[4.4120367] → [4.4120367:4120383]
```
    if (xz > 0)
```
[4.4120367]
[4.4120383]
```
    if (how_mutated(true, false))
```

Consolidate the mutation-counting routines.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 2900 [4.804403]

Replacement in crawl-ref/source/religion.cc at line 2920 [4.804403]

Deletion in crawl-ref/source/mutation.h at line 61 [4.1260415]

Replacement in crawl-ref/source/mutation.h at line 81 [4.1260415]

Replacement in crawl-ref/source/mutation.cc at line 54 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1754 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2167 [4.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2173 [4.1263003]