fiddlerwoaroof/crawl - Change ERS7DYNAVCC7QUVG5FXJJRONYESLZU22CQGKCA5HLLLG6DMXYRLQC

Partial implementation of FR #2011386: Xom shouldn't directly kill the player

unless he's being nasty (the player is under penance from Xom or Xom is bored). I've put checks into _xom_is_good() and _xom_is_bad() to avoid this as much as possible, and as a safety-net changed ouch() to return early if the player dies from a Xom effect when Xom wasn't being nasty so that xom_acts() can then fix things up (this causes Xom to give a message from "Xom accidental homicide" in dat/database/godspeak.txt)

Next up will be an addition to mutate() so you can request random mutations be non-lethal, which should take care of all known situations where ouch() returns early due to Xom making a mistake.

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

Created by zelgadis on December 14, 2008

ERS7DYNAVCC7QUVG5FXJJRONYESLZU22CQGKCA5HLLLG6DMXYRLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 713 [3.3]

[3.11888]

[4.6]


    // Did Xom (already) kill the player?
    if (you.hp <= 0)
        return (true);

Insertion in crawl-ref/source/xom.cc at line 1054 [3.3]

[5.166]

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

Insertion in crawl-ref/source/xom.cc at line 1080 [3.3]

[5.1121]

[6.253]

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

Insertion in crawl-ref/source/xom.cc at line 1097 [3.3]

[4.9]

[7.169]

    // Xom will only directly kill you with a bad effect if you're under
    // penance from him or he's bored.
    const bool nasty = you.penance[GOD_XOM]
                       || (you.religion == GOD_XOM && you.gift_timeout == 0);

Insertion in crawl-ref/source/xom.cc at line 1106 [3.3]

[3.19790]

[8.431]

        // Did Xom kill the player?
        if (you.hp <= 0)
            return (true);

Replacement in crawl-ref/source/xom.cc at line 1119 [3.3]

B:BD[3.20422] → [8.469:511]

        else if (x_chance_in_y(4, sever))

[3.20422]

[3.20460]

        else if (x_chance_in_y(4, sever) && (nasty || you.hp > 12))

Replacement in crawl-ref/source/xom.cc at line 1130 [3.3]

B:BD[3.21091] → [9.1748:1820]

            god_speaks(GOD_XOM, _get_xom_speech("lose stats").c_str());

[3.21091]

[6.325]

            stat_type stat = STAT_RANDOM;
            int       max  = 3;

Replacement in crawl-ref/source/xom.cc at line 1133 [3.3]

∅:D[6.326] → [10.3:113]

B:BD[3.21495] → [10.3:113]

            lose_stat(STAT_RANDOM, 1 + random2(3), true,
                      "the capriciousness of Xom" );

[6.326]

[6.327]

            // Don't kill the player unless Xom is being nasty.
            if (!nasty)
            {
                // Make sure not to lower strength so much that the player
                // will die once might wears off.
                char      vals[3] =
                    {you.strength - (you.duration[DUR_MIGHT] ? 5 : 0),
                     you.dex, you.intel};
                stat_type types[3] = {STAT_STRENGTH, STAT_DEXTERITY,
                                      STAT_INTELLIGENCE};
                int count = 0;
                for (int i = 0; i < 3; i++)
                {
                    int val = vals[i];
                    if (val > 1 && one_chance_in(++count))
                    {
                        stat = types[i];
                        max  = val - 1;
                    }
                }
                if (count == 0)
                    continue;
            }
            god_speaks(GOD_XOM, _get_xom_speech("lose stats").c_str());
            lose_stat(stat, 1 + random2(max), true, "the vengeance of Xom" );

Replacement in crawl-ref/source/xom.cc at line 1164 [3.3]

B:BD[3.21605] → [8.555:597]

        else if (x_chance_in_y(6, sever))

[3.21605]

[3.21643]

        else if (x_chance_in_y(6, sever) && (nasty || you.hp > 25))

Replacement in crawl-ref/source/xom.cc at line 1294 [3.3]

B:BD[3.24503] → [11.78:122]

                if (player_prot_life() < 3)

[3.24503]

[11.122]

                if (player_prot_life() < 3 && (nasty || you.experience > 0))

Replacement in crawl-ref/source/xom.cc at line 1299 [3.3]

B:BD[3.24605] → [11.191:235]

                    if (random2(sever) > 3)

[3.24605]

[11.235]

                    if (random2(sever) > 3 && (nasty || you.experience > 0))

Replacement in crawl-ref/source/xom.cc at line 1301 [3.3]

B:BD[11.272] → [11.272:316]

                    if (random2(sever) > 3)

[11.272]

[11.316]

                    if (random2(sever) > 3 && (nasty || you.experience > 0))

Replacement in crawl-ref/source/xom.cc at line 1360 [3.3]

B:BD[3.26044] → [2.7128:7171]

        else if (x_chance_in_y(14, sever))

[3.26044]

[3.26083]

        else if (x_chance_in_y(14, sever) && (nasty || you.hp > 30))

Insertion in crawl-ref/source/xom.cc at line 1415 [3.3]

[12.4161]

[13.152]

    int orig_hp  = you.hp;
    int orig_str = you.strength;
    int orig_dex = you.dex;
    int orig_int = you.intel;
    FixedVector<unsigned char, NUM_MUTATIONS> orig_mutation = you.mutation;

Insertion in crawl-ref/source/xom.cc at line 1433 [3.3]

[3.27650]

    }
    if (you.hp <= 0 || you.strength <= 0 || you.dex <= 0 || you.intel <= 0)
    {
        // ouch() returned early because the player died from the Xom effect
        // even though neither is the player under penance nor is Xom bored.
        mpr("You die...");
        god_speaks(GOD_XOM, _get_xom_speech("accidental homicide").c_str());
        int changes = 0;
        for (int i = 0; i < NUM_MUTATIONS; i++)
        {
            if (orig_mutation[i] != you.mutation[i])
                changes++;
        }
        if (changes > 0)
        {
            std::string str = "Xom undoes your latest mutation";
            if (changes > 1)
                str += "s";
            str += ".";
            god_speaks(GOD_XOM, str.c_str());
        }
        you.mutation = orig_mutation;
        you.hp       = orig_hp;
        you.strength = orig_str;
        you.dex      = orig_dex;
        you.intel    = orig_int;
        you.max_strength = std::max(you.max_strength, you.strength);
        you.max_intel    = std::max(you.max_intel, you.intel);
        you.max_dex      = std::max(you.max_dex, you.dex);

Insertion in crawl-ref/source/ouch.cc at line 897 [15.1104358]

[14.1233]

[15.1120477]

    }
    if (crawl_state.is_god_acting()
        && crawl_state.which_god_acting() == GOD_XOM
        && crawl_state.other_gods_acting().size() == 0)
    {
        if (aux == NULL || strstr(aux, "Xom") == NULL)
            death_type = KILLED_BY_XOM;
        // Xom should only cause death if the player is under penance or
        // Xom is bored.
        if (!you.penance[GOD_XOM]
            && !(you.religion == GOD_XOM && you.gift_timeout == 0))
        {
            return;
        }

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 351 [17.5538]
[16.7685]
[16.7685]
```
Xom accidental homicide
"Oops, I didn't mean to do *that*!"
Xom brings you back to life.
%%%%
```