fiddlerwoaroof/crawl - Change U52YN2JQUGBRV434NNAKL3YXFLG3JDYBW3VV3HOIEJGGBFZRT6WQC

Clean up mutation removal handling.

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

Created by dolorous on April 25, 2008

U52YN2JQUGBRV434NNAKL3YXFLG3JDYBW3VV3HOIEJGGBFZRT6WQC

Dependencies

In channels

main

Change contents

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

B:BD[4.1261532] → [5.9361:9473]

bool delete_mutation(mutation_type which_mutation, bool force = false,
                     bool good = false);

[4.1261532]

[4.1261575]

bool delete_mutation(mutation_type which_mutation, bool prefer_good = false,
                     bool force_mutation = false);

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

B:BD[6.395280] → [5.9532:9716]

B:BD[5.9716] → [3.2558:2585]

B:BD[3.2612] → [3.2612:2638]

∅:D[3.2665] → [7.2558:2588]

B:BD[5.9716] → [7.2558:2588]

∅:D[7.2588] → [5.9716:9748]

B:BD[5.9716] → [5.9716:9748]

B:BD[5.9748] → [8.2558:2706]

∅:D[8.2706] → [5.9748:9810]

B:BD[5.9748] → [5.9748:9810]

B:BD[5.9810] → [8.2707:2753]

∅:D[8.2753] → [5.9810:9841]

B:BD[5.9810] → [5.9810:9841]

B:BD[5.9841] → [8.2754:2780]

∅:D[8.2780] → [5.9841:9863]

B:BD[5.9841] → [5.9841:9863]

B:BD[5.9863] → [8.2781:2830]

∅:D[8.2830] → [5.9863:9919]

B:BD[5.9863] → [5.9863:9919]

B:BD[5.9919] → [8.2831:3297]

∅:D[8.3297] → [5.10013:10064]

B:BD[5.10013] → [5.10013:10064]

B:BD[5.10064] → [8.3298:3348]

B:BD[8.3348] → [3.2666:2691]

∅:D[3.2691] → [8.3348:3373]

B:BD[8.3348] → [8.3348:3373]

B:BD[8.3373] → [3.2692:2747]

B:BD[3.2804] → [3.2804:2859]

B:BD[3.2887] → [3.2887:3054]

B:BD[3.3080] → [3.3080:3143]

∅:D[3.3143] → [5.10084:10105]

∅:D[8.3373] → [5.10084:10105]

B:BD[5.10084] → [5.10084:10105]

B:BD[5.10105] → [2.20503:20504]

∅:D[2.20504] → [5.10114:10158]

B:BD[5.10114] → [5.10114:10158]

static bool is_good_mutation( mutation_type which_mutation )
{
    switch (which_mutation)
    {
    case MUT_TOUGH_SKIN:
    case MUT_STRONG:
    case MUT_CLEVER:
    case MUT_AGILE:
    case MUT_GREEN_SCALES:
    case MUT_GREY_SCALES:
    case MUT_REPULSION_FIELD:
    case MUT_POISON_RESISTANCE:
    case MUT_HEAT_RESISTANCE:
    case MUT_COLD_RESISTANCE:
    case MUT_SHOCK_RESISTANCE:
    case MUT_REGENERATION:
    case MUT_SLOW_METABOLISM:
    case MUT_TELEPORT_CONTROL:
    case MUT_MAGIC_RESISTANCE:
    case MUT_FAST:
    case MUT_ACUTE_VISION:
    case MUT_TELEPORT_AT_WILL:
    case MUT_SPIT_POISON:
    case MUT_MAPPING:
    case MUT_BREATHE_FLAMES:
    case MUT_BLINK:
    case MUT_CLARITY:
    case MUT_MUTATION_RESISTANCE:
    case MUT_ROBUST:
    case MUT_TORMENT_RESISTANCE:
    case MUT_NEGATIVE_ENERGY_RESISTANCE:
    case MUT_SUMMON_MINOR_DEMONS:
    case MUT_SUMMON_DEMONS:
    case MUT_HURL_HELLFIRE:
    case MUT_CALL_TORMENT:
    case MUT_RAISE_DEAD:
    case MUT_CONTROL_DEMONS:
    case MUT_PANDEMONIUM:
    case MUT_DEATH_STRENGTH:
    case MUT_CHANNEL_HELL:
    case MUT_DRAIN_LIFE:
    case MUT_THROW_FLAMES:
    case MUT_THROW_FROST:
    case MUT_SMITE:
    case MUT_FANGS:
    case MUT_BREATHE_POISON:
    case MUT_STINGER:
    case MUT_BIG_WINGS:
    case MUT_SAPROVOROUS:
    case MUT_SHAGGY_FUR:
    case MUT_HIGH_MAGIC:
    case MUT_RED_SCALES:
    case MUT_NACREOUS_SCALES:
    case MUT_BLACK2_SCALES:
    case MUT_WHITE_SCALES:
    case MUT_BROWN_SCALES:
    case MUT_BLUE_SCALES:
    case MUT_PURPLE_SCALES:
    case MUT_SPECKLED_SCALES:
    case MUT_ORANGE_SCALES:
    case MUT_INDIGO_SCALES:
    case MUT_IRIDESCENT_SCALES:
    case MUT_PATTERNED_SCALES:
        return true;
    default:
        return false;
    }
}

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

B:BD[5.10807] → [5.10807:10881]

bool delete_mutation(mutation_type which_mutation, bool force, bool good)

[5.10807]

[4.1314615]

bool delete_mutation(mutation_type which_mutation, bool prefer_good,
                     bool force_mutation)

Replacement in crawl-ref/source/mutation.cc at line 2211 [4.1263003]
B:BD[4.1314662] → [9.389:404]
```
    if (!force
```
[4.1314662]
[2.22211]
```
    if (!force_mutation
```

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

B:BD[5.10944] → [5.10944:11020]

               || good && (!is_good_mutation(mutat) || one_chance_in(10)));

[5.10944]

[4.1315386]

               || prefer_good && (!mutation_defs[i].bad || one_chance_in(10)));