fiddlerwoaroof/crawl - Change BQ5QKUWLCYSBO4A7EWZN4FXPNSIAR6JPBAZE4PSV6XCUNTV53ERQC

FR #2011386:

When giving or deleting a random mutation you can now request that the mutation picked doesn't instantly kill the player. Xom code now uses this option, except for when the player is under penance from Xom or Xom is bored.

Improvements to the code that prevents Xom from accidently killing the player.

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

Created by zelgadis on December 14, 2008

BQ5QKUWLCYSBO4A7EWZN4FXPNSIAR6JPBAZE4PSV6XCUNTV53ERQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 1005 [5.3]

B:BD[4.441] → [4.441:513]

                if (mutate(RANDOM_GOOD_MUTATION, failMsg, false, true))

[4.441]

[4.513]

                if (mutate(RANDOM_GOOD_MUTATION, failMsg, false, true, false,
                           false, true))
                {

Insertion in crawl-ref/source/xom.cc at line 1009 [5.3]
[4.546]
[4.546]
```
                }
```

Deletion in crawl-ref/source/xom.cc at line 1057 [5.3]

B:BD[6.166] → [3.92:203]

            else
                // Make sure we don't directly kill the player.
                you.hp += 90;

Replacement in crawl-ref/source/xom.cc at line 1080 [5.3]

B:BD[6.1121] → [3.204:326]

            else
            {
                you.hp -= 90;
                you.hp  = std::max(1, you.hp);
            }

[6.1121]

[7.253]


            // Don't accidentally kill the player when doing a good
            // act.
            you.hp  = std::max(1, you.hp);

Replacement in crawl-ref/source/xom.cc at line 1231 [5.3]

B:BD[4.1092] → [4.1092:1167]

                    if (mutate(RANDOM_XOM_MUTATION, failMsg, false, true))

[4.1092]

[4.1167]

                    if (mutate(RANDOM_XOM_MUTATION, failMsg, false, true,
                               false, false, !nasty))
                    {

Insertion in crawl-ref/source/xom.cc at line 1235 [5.3]
[4.1204]
[4.1204]
```
                    }
```

Replacement in crawl-ref/source/xom.cc at line 1417 [5.3]

B:BD[8.4161] → [3.2237:2355]

    int orig_hp  = you.hp;
    int orig_str = you.strength;
    int orig_dex = you.dex;
    int orig_int = you.intel;

[8.4161]

[3.2355]

    const dungeon_feature_type orig_feat = grd(you.pos());
    const int orig_hp = you.hp;

Replacement in crawl-ref/source/xom.cc at line 1421 [5.3]

B:BD[3.2356] → [3.2356:2432]

    FixedVector<unsigned char, NUM_MUTATIONS> orig_mutation = you.mutation;

[3.2356]

[3.2432]

          char* stat_ptrs[3]  = {&you.strength, &you.intel, &you.dex};
    const char  orig_stats[3] = {*(stat_ptrs[0]), *(stat_ptrs[1]),
                                 *(stat_ptrs[2])};
    const FixedVector<unsigned char, NUM_MUTATIONS> orig_mutation
        = you.mutation;

Insertion in crawl-ref/source/xom.cc at line 1441 [5.3]
[3.2441]
[3.2441]
```
    bool already_oopsed = false;
```

Insertion in crawl-ref/source/xom.cc at line 1448 [5.3]

[3.2781]

        god_speaks(GOD_XOM, _get_xom_speech("resurrection").c_str());

Replacement in crawl-ref/source/xom.cc at line 1450 [5.3]

B:BD[3.2782] → [3.2782:2855]

        int changes = 0;
        for (int i = 0; i < NUM_MUTATIONS; i++)

[3.2782]

[3.2855]

        already_oopsed = true;
        if (you.hp <= 0)
            you.hp = orig_hp;
        mutation_type dex_muts[5] = {MUT_GREY2_SCALES, MUT_METALLIC_SCALES,
                                     MUT_YELLOW_SCALES, MUT_RED2_SCALES,
                                     MUT_STRONG_STIFF};
        for (int i = 0; i < 5; i++)

Replacement in crawl-ref/source/xom.cc at line 1461 [5.3]

B:BD[3.2865] → [3.2865:2945]

            if (orig_mutation[i] != you.mutation[i])
                changes++;

[3.2865]

[3.2945]

            mutation_type bad = dex_muts[i];
            while (you.dex <= 0 && you.mutation[bad] > orig_mutation[bad])
                delete_mutation(bad, true, true);
        }
        while(you.dex <= 0
              && you.mutation[MUT_FLEXIBLE_WEAK] <
                     orig_mutation[MUT_FLEXIBLE_WEAK])
        { 
            mutate(MUT_FLEXIBLE_WEAK, true, true, true);

Replacement in crawl-ref/source/xom.cc at line 1473 [5.3]

B:BD[3.2956] → [3.2956:2981]

        if (changes > 0)

[3.2956]

[3.2981]

        while (you.strength <= 0
               && you.mutation[MUT_FLEXIBLE_WEAK] >
                      orig_mutation[MUT_FLEXIBLE_WEAK])

Replacement in crawl-ref/source/xom.cc at line 1477 [5.3]

B:BD[3.2991] → [3.2991:3183]

            std::string str = "Xom undoes your latest mutation";
            if (changes > 1)
                str += "s";
            str += ".";
            god_speaks(GOD_XOM, str.c_str());

[3.2991]

[3.3183]

            delete_mutation(MUT_FLEXIBLE_WEAK, true, true);
        }
        while (you.strength <= 0
               && you.mutation[MUT_STRONG_STIFF] <
                      orig_mutation[MUT_STRONG_STIFF])
        {
            mutate(MUT_STRONG_STIFF, true, true, true);

Replacement in crawl-ref/source/xom.cc at line 1486 [5.3]

B:BD[3.3194] → [3.3194:3232]

        you.mutation = orig_mutation;

[3.3194]

[3.3232]

        mutation_type bad_muts[3]  = { MUT_WEAK, MUT_DOPEY, MUT_CLUMSY };
        mutation_type good_muts[3] = { MUT_STRONG, MUT_CLEVER, MUT_AGILE };

Replacement in crawl-ref/source/xom.cc at line 1489 [5.3]

B:BD[3.3233] → [3.3233:3364]

        you.hp       = orig_hp;
        you.strength = orig_str;
        you.dex      = orig_dex;
        you.intel    = orig_int;

[3.3233]

[3.3364]

        for (int i = 0; i < 3; i++)
        {
            while (*(stat_ptrs[i]) <= 0)
            {
                mutation_type good = good_muts[i];
                mutation_type bad  = bad_muts[i];
                if (you.mutation[bad] > orig_mutation[bad]
                    || you.mutation[good] < orig_mutation[good])
                {
                    mutate(good, true, true, true);
                }
                else
                {
                    *(stat_ptrs[i]) = orig_stats[i];
                    break;
                }
            }
        }

Insertion in crawl-ref/source/xom.cc at line 1511 [5.3]

[3.3556]

[5.27650]

    }
    // Or maybe Xom accidentally tossed you in deep water or lava.
    dungeon_feature_type feat = grd(you.pos());
    if (feat != orig_feat && !you.airborne()
        && (feat == DNGN_DEEP_WATER && !you.swimming()
            || feat == DNGN_LAVA && player_res_fire() <= 0))
    {
        if (!already_oopsed)
        {
            mpr("You die...");
            god_speaks(GOD_XOM,
                       _get_xom_speech("accidental homicide").c_str());
            god_speaks(GOD_XOM, _get_xom_speech("resurrection").c_str());
        }
        you.teleport(true);

Insertion in crawl-ref/source/ouch.cc at line 899 [9.1104358]
[3.6075]
[3.6075]
```
    // Is the player being killed by a direct act of Xom?
```

Replacement in crawl-ref/source/ouch.cc at line 904 [9.1104358]

B:BD[3.6226] → [3.6226:6395]

        if (aux == NULL || strstr(aux, "Xom") == NULL)
            death_type = KILLED_BY_XOM;
        // Xom should only cause death if the player is under penance or

[3.6226]

[3.6395]

        // Xom should only kill his worhsippers if they're under penance or

Replacement in crawl-ref/source/ouch.cc at line 906 [9.1104358]

B:BD[3.6420] → [3.6420:6522]

        if (!you.penance[GOD_XOM]
            && !(you.religion == GOD_XOM && you.gift_timeout == 0))

[3.6420]

[3.6522]

        if (you.religion == GOD_XOM && !you.penance[GOD_XOM]
            && you.gift_timeout > 0)

Insertion in crawl-ref/source/ouch.cc at line 911 [9.1104358]

[3.6562]

[9.1120477]


        // Also don't kill wizards testing Xom acts.
        if (crawl_state.prev_cmd == CMD_WIZARD)
            return;
        // Ensure some minimal informfullness about Xom's involvment.
        if (aux == NULL)
        {
            if (death_type != KILLED_BY_XOM)
                aux = "Xom";
        }
        else if(strstr(aux, "Xom") == NULL)
            death_type = KILLED_BY_XOM;

Replacement in crawl-ref/source/mutation.h at line 37 [9.1260415]

B:BD[10.2776] → [2.2476:2545]

            bool stat_gain_potion = false, bool demonspawn = false);

[10.2776]

[9.1261056]

            bool stat_gain_potion = false, bool demonspawn = false,
            bool non_fatal = false);

Replacement in crawl-ref/source/mutation.h at line 56 [9.1260415]

∅:D[11.2629] → [12.2616:2667]

B:BD[13.2667] → [12.2616:2667]

                     bool force_mutation = false);

[11.2629]

[9.1261575]

                     bool force_mutation = false, bool non_fatal = false);

Insertion in crawl-ref/source/mutation.cc at line 1615 [9.1263003]

[5.37643]

[14.395279]


static bool _is_deadly(mutation_type mutat, bool delete_mut)
{
    if (delete_mut)
    {
        // First handle non-stat related problems.
        if ( mutat == MUT_HEAT_RESISTANCE && grd(you.pos()) == DNGN_LAVA
             && player_res_fire() == 1 && !you.airborne() )
        {
            // Don't let player instantly fry to a crisp in lava.
            return (true);
        }
        // Swap things around to the same effect, but as if we were gaining
        // a mutation, or return early if deleting the mutation is never
        // a problem.
        switch(mutat)
        {
        case MUT_GREY2_SCALES:
        case MUT_METALLIC_SCALES:
        case MUT_YELLOW_SCALES:
        case MUT_RED2_SCALES:
        case MUT_WEAK:
        case MUT_DOPEY:
        case MUT_CLUMSY:
            return (false);
        case MUT_STRONG_STIFF:
            mutat = MUT_FLEXIBLE_WEAK;
            break;
        case MUT_FLEXIBLE_WEAK:
            mutat = MUT_STRONG_STIFF;
            break;
        case MUT_STRONG:
            mutat = MUT_WEAK;
            break;

Replacement in crawl-ref/source/mutation.cc at line 1654 [9.1263003]

B:BD[14.395280] → [15.2558:2635]

static bool accept_mutation(mutation_type mutat, bool ignore_rarity = false)

[14.395280]

[16.1150]

        case MUT_CLEVER:
            mutat = MUT_DOPEY;
            break;
        case MUT_AGILE:
            mutat = MUT_CLUMSY;
            break;
        default:
            break;
        }
    }
    unsigned char cur_level = you.mutation[mutat];
    char *stat_ptr = &you.dex; // Default for the scales.
    char  amnt     = 1;
    char  mod      = 0;
 
    switch(mutat)
    {
    case MUT_GREY2_SCALES:
        if (cur_level == 0 || cur_level == 2)
            amnt = 1;
        else
            amnt = 0;
        break;
    case MUT_METALLIC_SCALES:
        if (cur_level == 0)
            amnt = 2;
        else
            amnt = 1;
        break;
    case MUT_YELLOW_SCALES:
    case MUT_RED2_SCALES:
        if (cur_level == 0)
            amnt = 0;
        else
            amnt = 1;
        break;
    case MUT_FLEXIBLE_WEAK:
    case MUT_WEAK:
        stat_ptr = &you.strength;
        // Take might into account so we don't lower base strength below
        // one.
        if (you.duration[DUR_MIGHT])
            mod = -5;
        break;
    case MUT_DOPEY:
        stat_ptr = &you.intel;
    case MUT_STRONG_STIFF:
    case MUT_CLUMSY:
        stat_ptr = &you.dex;
        break;
    default:
        return (false);
    }
    return (amnt >= (*stat_ptr + mod));
}
static bool accept_mutation(mutation_type mutat, bool ignore_rarity = false,
                            bool non_fatal = false, bool delete_mut = false)

Insertion in crawl-ref/source/mutation.cc at line 1730 [9.1263003]

[17.4226]

[18.2558]

    if (delete_mut)
    {
        return (!non_fatal || !_is_deadly(mutat, delete_mut));
    }

Insertion in crawl-ref/source/mutation.cc at line 1738 [9.1263003]

[19.4459]

[18.2619]

    if (non_fatal && _is_deadly(mutat, delete_mut))
        return (false);

Replacement in crawl-ref/source/mutation.cc at line 1750 [9.1263003]
B:BD[19.4511] → [19.4511:4558]
```
static mutation_type get_random_xom_mutation()
```
[19.4511]
[19.4558]
```
static mutation_type get_random_xom_mutation(bool non_fatal = false)
```
Replacement in crawl-ref/source/mutation.cc at line 1774 [9.1263003]
B:BD[19.5256] → [18.2643:2680]
```
    while (!accept_mutation(mutat));
```
[19.5256]
[20.20507]
```
    while (!accept_mutation(mutat, false, non_fatal));
```

Replacement in crawl-ref/source/mutation.cc at line 1780 [9.1263003]

B:BD[19.5381] → [19.5381:5448]

                                         int preferred_multiplier)

[19.5381]

[19.5448]

                                         int preferred_multiplier,
                                         bool non_fatal = false)

Replacement in crawl-ref/source/mutation.cc at line 1791 [9.1263003]
B:BD[19.5690] → [19.5690:5732]
```
        if (!accept_mutation(curr, true))
```
[19.5690]
[19.5732]
```
        if (!accept_mutation(curr, true, non_fatal))
```

Insertion in crawl-ref/source/mutation.cc at line 1805 [9.1263003]

[19.6078]

}
static bool _is_random(mutation_type which_mutation)
{
    return (which_mutation == RANDOM_MUTATION
            || which_mutation == RANDOM_XOM_MUTATION
            || which_mutation == RANDOM_GOOD_MUTATION
            || which_mutation == RANDOM_BAD_MUTATION);

Replacement in crawl-ref/source/mutation.cc at line 1816 [9.1263003]

B:BD[21.2870] → [10.2816:2864]

B:BD[10.2864] → [2.2547:2599]

            bool force_mutation, bool god_gift,
            bool stat_gain_potion, bool demonspawn)

[21.2870]

[5.37740]

            bool force_mutation, bool god_gift, bool stat_gain_potion,
            bool demonspawn, bool non_fatal)

Insertion in crawl-ref/source/mutation.cc at line 1819 [9.1263003]
[5.37742]
[5.37775]
```
    ASSERT(!non_fatal || _is_random(which_mutation));
```

Replacement in crawl-ref/source/mutation.cc at line 1916 [9.1263003]

B:BD[16.1898] → [16.1898:1957]

                return (delete_mutation(RANDOM_MUTATION));

[16.1898]

[16.1957]

                return (delete_mutation(RANDOM_MUTATION, failMsg,
                                        force_mutation, non_fatal));

Replacement in crawl-ref/source/mutation.cc at line 1929 [9.1263003]
B:BD[22.40033] → [23.2666:2707]
```
        while (!accept_mutation(mutat));
```
[22.40033]
[9.1302579]
```
        while (!accept_mutation(mutat, false, non_fatal));
```

Replacement in crawl-ref/source/mutation.cc at line 1933 [9.1263003]

B:BD[5.37838] → [19.6082:6148]

        if ((mutat = get_random_xom_mutation()) == NUM_MUTATIONS)

[5.37838]

[24.18096]

        if ((mutat = get_random_xom_mutation(non_fatal)) == NUM_MUTATIONS)

Replacement in crawl-ref/source/mutation.cc at line 1938 [9.1263003]

B:BD[19.6241] → [19.6241:6312]

        if ((mutat = get_random_mutation(true, 500)) == NUM_MUTATIONS)

[19.6241]

[24.18125]

        mutat = get_random_mutation(true, 500, non_fatal);
        if (mutat == NUM_MUTATIONS)

Replacement in crawl-ref/source/mutation.cc at line 1944 [9.1263003]

B:BD[25.2616] → [25.2616:2688]

        if ((mutat = get_random_mutation(false, 500)) == NUM_MUTATIONS)

[25.2616]

[24.18154]

        mutat = get_random_mutation(false, 500, non_fatal);
        if (mutat == NUM_MUTATIONS)

Replacement in crawl-ref/source/mutation.cc at line 2350 [9.1263003]
∅:D[11.2696] → [12.2935:2977]
B:BD[13.2771] → [12.2935:2977]
```
                     bool force_mutation)
```
[11.2696]
[9.1314615]
```
                     bool force_mutation, bool non_fatal)
```
Insertion in crawl-ref/source/mutation.cc at line 2352 [9.1263003]
[9.1314617]
[16.2633]
```
    ASSERT(!non_fatal || _is_random(which_mutation));
```
Insertion in crawl-ref/source/mutation.cc at line 2384 [9.1263003]
[5.39833]
[26.4161]
```
               || !accept_mutation(mutat, true, non_fatal, true)
```
Insertion in crawl-ref/source/dat/database/godspeak.txt at line 354 [27.5538]
[3.6816]
[3.6816]
```
%%%%
Xom resurrection
```