fiddlerwoaroof/crawl - Change AQ36MO7VNGSGQ5KK7JCQA2WEHUELAFLSU2QBUWROVJFOTPMGFGMQC

[1809728] Fixed bug where you could get multiple levels of a single-level mutation (such as torment resistance).

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

Created by dshaligram on October 11, 2007

AQ36MO7VNGSGQ5KK7JCQA2WEHUELAFLSU2QBUWROVJFOTPMGFGMQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mutation.h at line 20 [4.1260415]

[4.1260691]

struct mutation_def
{
    mutation_type mutation;
    short         rarity;    // Rarity of the mutation.
    short         levels;    // The number of levels of the mutation.
};

Insertion in crawl-ref/source/mutation.h at line 80 [4.1260415]
[4.1262959]
[4.1262959]
```
#ifdef DEBUG_DIAGNOSTICS
void sanity_check_mutation_defs();
```
Insertion in crawl-ref/source/mutation.h at line 83 [4.1260415]
[4.1262966]
```
#endif
```

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

∅:D[2.606] → [5.195:377]

B:BD[5.195] → [5.195:377]

B:BD[5.377] → [2.607:667]

    "You cover the ground very slowly.",    // 10*14/10 = 14
    "You cover the ground rather slowly.",  //  8*14/10 = 11
    "You cover the ground rather quickly.", //  7*14/10 = 9
    "You cover the ground quickly."         //  6*14/10 = 8

[2.606]

[6.372]

    "You cover ground very slowly.",    // 10*14/10 = 14
    "You cover ground rather slowly.",  //  8*14/10 = 11
    "You cover ground rather quickly.", //  7*14/10 = 9
    "You cover ground quickly."         //  6*14/10 = 8

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

B:BD[4.1267136] → [4.1267136:1267261]

    {"You cover the ground quickly.", "You cover the ground very quickly.",
     "You cover the ground extremely quickly."},

[4.1267136]

[4.1267261]

    {"You cover ground quickly.", "You cover ground very quickly.",
     "You cover ground extremely quickly."},

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

B:BD[4.1291205] → [4.1291205:1291760]

/*
   Chance out of 10 that mutation will be given/removed randomly. 0 means never.
 */
const char mutation_rarity[] = {
    10,                         // tough skin
    8,                          // str
    8,                          // int
    8,                          // dex
    2,                          // gr scales
    1,                          // bl scales
    2,                          // grey scales
    1,                          // bone
    1,                          // repuls field
    4,                          // res poison

[4.1291205]

[4.1291760]

static const mutation_def mutation_defs[] = {
    { MUT_TOUGH_SKIN, 10, 3 },
    { MUT_STRONG, 8, 14 },
    { MUT_CLEVER, 8, 14 },
    { MUT_AGILE, 8,  14 },
    { MUT_GREEN_SCALES, 2, 3 },
    { MUT_BLACK_SCALES, 1, 3 },
    { MUT_GREY_SCALES, 2, 3 },
    { MUT_BONEY_PLATES, 1, 3 },
    { MUT_REPULSION_FIELD, 1, 3 },
    { MUT_POISON_RESISTANCE, 4, 1 },

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

B:BD[4.1291766] → [4.1291766:1292192]

    5,                          // carn
    5,                          // herb
    4,                          // res fire
    4,                          // res cold
    2,                          // res elec
    3,                          // regen
    10,                         // fast meta
    7,                          // slow meta
    10,                         // abil loss
    10,                         // ""

[4.1291766]

[4.1292192]

    { MUT_CARNIVOROUS, 5, 3 },
    { MUT_HERBIVOROUS, 5, 3 },
    { MUT_HEAT_RESISTANCE, 4, 3 },
    { MUT_COLD_RESISTANCE, 4, 3 },
    { MUT_SHOCK_RESISTANCE, 2, 1 },
    { MUT_REGENERATION, 3, 3 },
    { MUT_FAST_METABOLISM, 10, 3 },
    { MUT_SLOW_METABOLISM, 7, 3 },
    { MUT_WEAK, 10,  14 },
    { MUT_DOPEY, 10, 14 },

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

B:BD[4.1292198] → [4.1292198:1292649]

    10,                         // ""
    2,                          // tele control
    3,                          // teleport
    5,                          // res magic
    1,                          // run
    2,                          // see invis
    8,                          // deformation
    2,                          // teleport at will
    8,                          // spit poison
    3,                          // sense surr

[4.1292198]

[4.1292649]

    { MUT_CLUMSY, 10, 14 },
    { MUT_TELEPORT_CONTROL, 2, 1 },
    { MUT_TELEPORT, 3, 3 },
    { MUT_MAGIC_RESISTANCE, 5, 3 },
    { MUT_FAST, 1, 3 },
    { MUT_ACUTE_VISION, 2, 1 },
    { MUT_DEFORMED, 8, 3 },
    { MUT_TELEPORT_AT_WILL, 2, 3 },
    { MUT_SPIT_POISON, 8, 3 },
    { MUT_MAPPING, 3, 3 },

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

B:BD[4.1292655] → [4.1292655:1293152]

    4,                          // breathe fire
    3,                          // blink
    7,                          // horns
    10,                         // strong/stiff muscles
    10,                         // weak/loose muscles
    6,                          // forgetfulness
    6,                          // clarity (as the amulet)
    7,                          // berserk/temper
    10,                         // deterioration
    10,                         // blurred vision

[4.1292655]

[4.1293152]

    { MUT_BREATHE_FLAMES, 4, 3 },
    { MUT_BLINK, 3, 3 },
    { MUT_HORNS, 7, 3 },
    { MUT_STRONG_STIFF, 10, 3 },
    { MUT_FLEXIBLE_WEAK, 10, 3 },
    { MUT_LOST, 6, 3 },
    { MUT_CLARITY, 6, 1 },
    { MUT_BERSERK, 7, 3 },
    { MUT_DETERIORATION, 10, 3 },
    { MUT_BLURRY_VISION, 10, 3 },

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

B:BD[4.1293158] → [4.1293158:1293292]

    4,                          // resist mutation
    10,                         // frail
    5,                          // robust

[4.1293158]

[4.1293292]

    { MUT_MUTATION_RESISTANCE, 4, 3 },
    { MUT_FRAIL, 10, 3 },
    { MUT_ROBUST, 5, 3 },

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

B:BD[4.1293330] → [4.1293330:1293379]

[4.1293330]

[4.1293379]

    { MUT_TORMENT_RESISTANCE, 0, 1 },
    { MUT_NEGATIVE_ENERGY_RESISTANCE, 0, 3 },
    { MUT_SUMMON_MINOR_DEMONS, 0, 1 },
    { MUT_SUMMON_DEMONS, 0, 1 },
    { MUT_HURL_HELLFIRE, 0, 1 },
    { MUT_CALL_TORMENT, 0, 1 },
    { MUT_RAISE_DEAD, 0, 1 },

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

B:BD[4.1293385] → [4.1293385:1293532]

    0,
    0,
    0,
    0,
    0,
    0,
    0,
    0,
    2,                          //jmf: claws
    1,                          //jmf: hooves

[4.1293385]

[4.1293532]

    { MUT_CONTROL_DEMONS, 0, 1 },
    { MUT_PANDEMONIUM, 0, 1 },
    { MUT_DEATH_STRENGTH, 0, 1 },
    { MUT_CHANNEL_HELL, 0, 1 },
    { MUT_DRAIN_LIFE, 0, 1 },
    { MUT_THROW_FLAMES, 0, 1 },
    { MUT_THROW_FROST, 0, 1 },
    { MUT_SMITE, 0, 1 },
    { MUT_CLAWS, 2, 3 },
    { MUT_HOOVES, 1, 1 },

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

B:BD[4.1293538] → [3.251:292]

∅:D[3.292] → [4.1293538:1293601]

∅:D[7.10253] → [4.1293538:1293601]

B:BD[4.1293538] → [4.1293538:1293601]

    1,                          // fangs
    0,
    0,
    0,
    0,
    0,
    0,
    0,
    0,
    0,

[4.1293538]

[4.1293608]

    { MUT_FANGS, 1, 3 },
    { MUT_BREATHE_POISON, 0, 1 },
    { MUT_STINGER, 0, 3 },
    { MUT_BIG_WINGS, 0, 3 },
    { MUT_BLUE_MARKS, 0, 3 },
    { MUT_GREEN_MARKS, 0, 3 },
    // Four placeholders:
    { RANDOM_MUTATION, 0, 3 },
    { RANDOM_MUTATION, 0, 3 },
    { RANDOM_MUTATION, 0, 3 },
    { RANDOM_MUTATION, 0, 3 },

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

B:BD[4.1293614] → [4.1293614:1294086]

    2,                          // red scales
    1,                          // nac scales
    2,                          // r-grey scales
    1,                          // metal scales
    2,                          // black scales
    2,                          // wh scales
    2,                          // yel scales
    2,                          // brown scales
    2,                          // blue scales
    2,                          // purple scales

[4.1293614]

[4.1294086]

    { MUT_RED_SCALES, 2, 3 },
    { MUT_NACREOUS_SCALES, 1, 3 },
    { MUT_GREY2_SCALES, 2, 3 },
    { MUT_METALLIC_SCALES, 1, 3 },
    { MUT_BLACK2_SCALES, 2, 3 },
    { MUT_WHITE_SCALES, 2, 3 },
    { MUT_YELLOW_SCALES, 2, 3 },
    { MUT_BROWN_SCALES, 2, 3 },
    { MUT_BLUE_SCALES, 2, 3 },
    { MUT_PURPLE_SCALES, 2, 3 },

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

B:BD[4.1294092] → [4.1294092:1294527]

    2,                          // speckled scales
    2,                          // orange scales
    2,                          // indigo scales
    1,                          // kn red scales
    1,                          // irid scales
    1,                          // pattern scales
    0,                          //
    0,                          //
    0,                          //
    0                           //

[4.1294092]

[4.1294527]

    { MUT_SPECKLED_SCALES, 2, 3 },
    { MUT_ORANGE_SCALES, 2, 3 },
    { MUT_INDIGO_SCALES, 2, 3 },
    { MUT_RED2_SCALES, 1, 3 },
    { MUT_IRIDESCENT_SCALES, 1, 3 },
    { MUT_PATTERNED_SCALES, 1, 3 },

Insertion in crawl-ref/source/mutation.cc at line 907 [4.1263003]

[4.1294530]


#ifdef DEBUG_DIAGNOSTICS
void sanity_check_mutation_defs()
{
    ASSERT(ARRAYSIZE(mutation_defs) == NUM_MUTATIONS);
    for (unsigned i = 0; i < ARRAYSIZE(mutation_defs); ++i)
    {
        const mutation_def &mdef(mutation_defs[i]);
        ASSERT(mdef.mutation == static_cast<mutation_type>(i)
               || mdef.mutation == RANDOM_MUTATION);
    }
}
#endif

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

B:BD[4.1300430] → [8.36508:36573]

    int amusement = 16 * (11 - mutation_rarity[which_mutation]);

[4.1300430]

[4.1300538]

    int amusement = 16 * (11 - mutation_defs[which_mutation].rarity);

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

B:BD[9.1152] → [9.1152:1396]

    int limit = 3;
    if ( mutat == MUT_STRONG || mutat == MUT_CLEVER ||
         mutat == MUT_AGILE || mutat == MUT_WEAK ||
         mutat == MUT_DOPEY || mutat == MUT_CLUMSY )
        limit = 14;
    
    if ( you.mutation[mutat] >= limit )

[9.1152]

[9.1396]

    if ( you.mutation[mutat] >= mutation_defs[mutat].levels )

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

B:BD[9.1423] → [9.1423:1493]

    const int rarity = mutation_rarity[mutat] + you.demon_pow[mutat];

[9.1423]

[9.1493]

    const int rarity = mutation_defs[mutat].rarity + you.demon_pow[mutat];

Replacement in crawl-ref/source/mutation.cc at line 1810 [4.1263003]
∅:D[8.39833] → [4.1315266:1315322]
B:BD[4.1315266] → [4.1315266:1315322]
```
               || random2(10) >= mutation_rarity[mutat]
```
[8.39833]
[4.1315322]
```
               || random2(10) >= mutation_defs[mutat].rarity
```
Insertion in crawl-ref/source/acr.cc at line 3424 [4.4397395]
[10.6938]
[10.6938]
```
    sanity_check_mutation_defs();
```