fiddlerwoaroof/crawl - Change TPJYUAKSEZMCCCJANJ5EQ7F67QVTPFEOWBD7WYK33NLRN657Y5VQC

Xom again:

tweak values for tension and amusement
Xom only laughs about "funny" deaths
gift_timeout rerolling after a bad act depends on its severity
replace the blink effect with position swapping

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

Created by j-p-e-g on March 28, 2009

TPJYUAKSEZMCCCJANJ5EQ7F67QVTPFEOWBD7WYK33NLRN657Y5VQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.h at line 38 [11.3]
B:BD[9.120] → [10.3:29]
```
void xom_death_message();
```
[9.120]
[11.923]
```
void xom_death_message(const kill_method_type killed_by);
```
Insertion in crawl-ref/source/xom.cc at line 17 [13.3]
[12.27]
[13.226]
```
#include "delay.h"
```
Insertion in crawl-ref/source/xom.cc at line 42 [13.3]
[14.26]
[13.537]
```
#include "traps.h"
```
Replacement in crawl-ref/source/xom.cc at line 180 [13.3]
∅:D[15.520] → [11.1971:2018]
B:BD[11.1971] → [11.1971:2018]
```
#if DEBUG_RELIGION || DEBUG_GIFTS || DEBUG_XOM
```
[15.520]
[11.2018]
```
#if defined(DEBUG_RELIGION) || defined(DEBUG_GIFTS) || defined(DEBUG_XOM)
```

Replacement in crawl-ref/source/xom.cc at line 245 [13.3]

B:BD[16.340] → [16.340:498]

B:BD[16.709] → [16.709:967]

        if (_xom_is_bored())
            xom_acts(abs(you.piety - MAX_PIETY/2));
        else
        {
            const int tension = get_tension(GOD_XOM);
            const int chance = (tension ==  0 ? 1 :
                                tension <=  5 ? 2 :
                                tension <= 10 ? 3 :
                                tension <= 20 ? 4
                                              : 5);

[16.340]

[16.967]

        const int tension = get_tension(GOD_XOM);
        const int chance = (tension ==  0 ? 1 :
                            tension <=  5 ? 2 :
                            tension <= 10 ? 3 :
                            tension <= 20 ? 4
                                          : 5);

Replacement in crawl-ref/source/xom.cc at line 252 [13.3]

B:BD[16.968] → [16.968:1010]

B:BD[16.1010] → [15.713:778]

            if (x_chance_in_y(chance, 5))
                xom_acts(abs(you.piety - MAX_PIETY/2), tension);

[16.968]

[16.1066]

        // During tension, Xom may briefly forget about being bored.
        if (_xom_is_bored() && x_chance_in_y(chance-1, 4))
        {
            you.gift_timeout += random2(chance*20);
#if defined(DEBUG_RELIGION) || defined(DEBUG_XOM)
            mprf(MSGCH_DIAGNOSTICS,
                 "tension %d (chance: %d) -> increase interest to %d",
                 tension, chance, you.gift_timeout);
#endif

Insertion in crawl-ref/source/xom.cc at line 262 [13.3]

[16.1076]


        if (x_chance_in_y(chance, 5))
            xom_acts(abs(you.piety - MAX_PIETY/2), tension);

Replacement in crawl-ref/source/xom.cc at line 304 [13.3]
∅:D[17.66] → [11.3278:3331]
B:BD[13.4579] → [11.3278:3331]
```
#if DEBUG_DIAGNOSTICS || DEBUG_RELIGION || DEBUG_XOM
```
[17.66]
[13.4601]
```
#if defined(DEBUG_DIAGNOSTICS) || defined(DEBUG_RELIGION) || defined(DEBUG_XOM)
```

Replacement in crawl-ref/source/xom.cc at line 1010 [13.3]

B:BD[18.2150] → [18.2150:2203]

// Blink every monster on this level and the player.

[18.2150]

[18.2203]

static void _confuse_monster(monsters mons, int sever)
{
//     monsters& mons(*mon);
    if (!mons_class_is_confusable(mons.type))
        return;
    const bool was_confused = mons.confused();
    if (mons.add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_FRIENDLY,
                                  random2(sever))))
    {
        if (was_confused)
            simple_monster_message(&mons, " looks rather more confused.");
        else
            simple_monster_message(&mons, " looks rather confused.");
    }
}
static bool _swap_monsters(monsters *m1, monsters *m2)
{
    monsters& mon1(*m1);
    monsters& mon2(*m2);
    const bool mon1_caught = mons_is_caught(&mon1);
    const bool mon2_caught = mons_is_caught(&mon2);
    const coord_def mon1_pos = mon1.pos();
    const coord_def mon2_pos = mon2.pos();
    if (!mon2.is_habitable(mon1_pos) || !mon1.is_habitable(mon2_pos))
        return (false);
    // Make submerged monsters unsubmerge.
    mon1.del_ench(ENCH_SUBMERGED);
    mon2.del_ench(ENCH_SUBMERGED);
    mgrd(mon1_pos) = mon2.mindex();
    mon1.moveto(mon2_pos);
    mgrd(mon2_pos) = mon1.mindex();
    mon2.moveto(mon1_pos);
    if (mon1_caught && !mon2_caught)
    {
        check_net_will_hold_monster(&mon2);
        mon1.del_ench(ENCH_HELD, true);
    }
    else if (mon2_caught && !mon1_caught)
    {
        check_net_will_hold_monster(&mon1);
        mon2.del_ench(ENCH_HELD, true);
    }
    return (true);
}
// Swap places with a random monster and, depending on severity, also
// between monsters. This can be pretty bad if there are a lot of hostile
// monsters around.

Replacement in crawl-ref/source/xom.cc at line 1071 [13.3]

B:BD[18.2250] → [18.2250:2372]

    bool rc = false;
    // Every now and then, Xom also confuses them all.
    const bool confusem = one_chance_in(10);

[18.2250]

[18.2372]

    if (player_stair_delay())
        return (false);

Replacement in crawl-ref/source/xom.cc at line 1074 [13.3]

B:BD[18.2373] → [19.71:156]

    // Not just every monster in sight - oh no.  Every monster on this
    // level!

[18.2373]

[18.2458]

    std::vector<monsters *> mons;

Replacement in crawl-ref/source/xom.cc at line 1077 [13.3]

B:BD[18.2512] → [18.2512:2550]

        monsters* monster = &menv[i];

[18.2512]

[18.2550]

        monsters* m = &menv[i];
        if (!m->alive())
            continue;

Replacement in crawl-ref/source/xom.cc at line 1082 [13.3]
B:BD[18.2551] → [18.2551:2582]
```
        if (!monster->alive())
```
[18.2551]
[18.2582]
```
        if (!see_grid(m->pos()))
```

Insertion in crawl-ref/source/xom.cc at line 1084 [13.3]

[18.2604]


        mons.push_back(m);
    }
    if (mons.empty())
        return (false);

Replacement in crawl-ref/source/xom.cc at line 1090 [13.3]

B:BD[18.2605] → [18.2605:2641]

        if (monster_blink(monster))

[18.2605]

[18.2641]

    god_speaks(GOD_XOM, _get_xom_speech("rearrange the pieces").c_str());
    const int num_mons = mons.size();
    // Swap places with a random monster.
    monsters *mon = mons[random2(num_mons)];
    swap_with_monster(mon);
    // Occasionally confuse said monster.
    if (one_chance_in(5))
        _confuse_monster(*mon, sever);
    if (num_mons > 1 && x_chance_in_y(sever,70))
    {
        bool did_message = false;
        const int max_repeats = std::min(num_mons/2, 8);
        const int repeats     = std::min(random2(sever/10)+1, max_repeats);
        for (int i = 0; i < repeats; ++i)

Replacement in crawl-ref/source/xom.cc at line 1109 [13.3]

B:BD[18.2651] → [18.2651:2826]

            // Only give a message once.
            if (!rc)
                god_speaks(GOD_XOM,
                           _get_xom_speech("rearrange the pieces").c_str());

[18.2651]

[18.2826]

            const int mon1 = random2(num_mons);
            int mon2 = mon1;
            while (mon1 == mon2)
                mon2 = random2(num_mons);

Replacement in crawl-ref/source/xom.cc at line 1114 [13.3]
B:BD[18.2827] → [18.2827:2853]
```
            if (confusem)
```
[18.2827]
[18.2853]
```
            if (_swap_monsters(mons[mon1], mons[mon2]))
```

Replacement in crawl-ref/source/xom.cc at line 1116 [13.3]

B:BD[18.2867] → [18.2867:3136]

                if (mons_class_is_confusable(monster->type)
                    && monster->add_ench(mon_enchant(ENCH_CONFUSION, 0,
                                                     KC_FRIENDLY,
                                                     random2(sever))))

[18.2867]

[18.3136]

                if (!did_message)

Replacement in crawl-ref/source/xom.cc at line 1118 [13.3]

B:BD[18.3154] → [18.3154:3234]

                    simple_monster_message(monster, " looks rather confused.");

[18.3154]

[18.3234]

                    mpr("Some monsters swap places.");
                    did_message = true;

Insertion in crawl-ref/source/xom.cc at line 1121 [13.3]

[18.3252]

                if (one_chance_in(5))
                    _confuse_monster(*mons[mon1], sever);
                if (one_chance_in(5))
                    _confuse_monster(*mons[mon2], sever);

Deletion in crawl-ref/source/xom.cc at line 1126 [13.3]
B:BD[18.3266] → [18.3266:3289]
```
            rc = true;
```
Replacement in crawl-ref/source/xom.cc at line 1128 [13.3]
∅:D[18.3296] → [20.4076:4077]
B:BD[21.1292] → [20.4076:4077]
B:BD[20.4077] → [19.157:264]
∅:D[19.264] → [18.3404:3463]
B:BD[18.3404] → [18.3404:3463]
```
    // If Xom blinked at least one monster, blink the player, too, and
    // then consider this act done.
    if (rc)
        random_blink(false);
    return (rc);
```
[18.3296]
[18.3463]
```
    return (true);
```
Insertion in crawl-ref/source/xom.cc at line 1163 [13.3]
[18.4192]
[18.4192]
```
// Summons a permanent ally.
```

Insertion in crawl-ref/source/xom.cc at line 1263 [13.3]

[20.4704]

[15.779]

        // There are a lot less non-tension spells than tension ones,
        // so use them more rarely.

Replacement in crawl-ref/source/xom.cc at line 1286 [13.3]

B:BD[22.1307] → [15.825:888]

    else if (random2(tension) < 15 && x_chance_in_y(9, sever))

[22.1307]

[13.16581]

    else if (tension > 0 && x_chance_in_y(9, sever))
        done = _xom_rearrange_pieces(sever);
    else if (random2(tension) < 15 && x_chance_in_y(10, sever))

Deletion in crawl-ref/source/xom.cc at line 1293 [13.3]

B:BD[13.16645] → [23.3229:3303]

B:BD[23.3303] → [18.6547:6592]

    else if (x_chance_in_y(10, sever) && (you.level_type != LEVEL_ABYSS))
        done = _xom_rearrange_pieces(sever);

Replacement in crawl-ref/source/xom.cc at line 1312 [13.3]

B:BD[24.207] → [24.207:263]

        if (vitrify_area(random2avg(sever / 2, 3) + 1))

[24.207]

[24.263]

        if (vitrify_area(random2avg(sever/4,2) + 1))

Insertion in crawl-ref/source/xom.cc at line 1394 [13.3]
[14.1424]
[14.1424]
```
    {
```
Insertion in crawl-ref/source/xom.cc at line 1397 [13.3]
[14.1559]
[14.1559]
```
    }
```

Insertion in crawl-ref/source/xom.cc at line 1937 [13.3]

[25.989]

[13.19766]

    // Rough estimate of how bad a Xom effect hits the player,
    // scaled between 1 (harmless) and 5 (disastrous).
    int badness = 1;

Insertion in crawl-ref/source/xom.cc at line 1957 [13.3]
[26.554]
[22.6328]
```
        {
```
Insertion in crawl-ref/source/xom.cc at line 1959 [13.3]
[22.6366]
[27.375]
```
            badness = 2;
        }
```
Insertion in crawl-ref/source/xom.cc at line 1964 [13.3]
[14.11895]
[13.22191]
```
            badness = 2;
```

Insertion in crawl-ref/source/xom.cc at line 1981 [13.3]

[28.1048]

[23.5759]

            badness = player_in_a_dangerous_place() ? 3 : 1;

Insertion in crawl-ref/source/xom.cc at line 1985 [13.3]
[23.5836]
[22.6474]
```
        {
```
Insertion in crawl-ref/source/xom.cc at line 1987 [13.3]
[22.6530]
[16.2025]
```
            badness = 2 + coinflip();
        }
```
Insertion in crawl-ref/source/xom.cc at line 1990 [13.3]
[16.2092]
[29.231]
```
        {
```
Insertion in crawl-ref/source/xom.cc at line 1992 [13.3]
[29.278]
[23.5890]
```
            badness = 3;
        }
```
Insertion in crawl-ref/source/xom.cc at line 1995 [13.3]
[23.5933]
[22.6578]
```
        {
```
Insertion in crawl-ref/source/xom.cc at line 1997 [13.3]
[22.6635]
[30.2191]
```
            badness = 3;
        }
```
Insertion in crawl-ref/source/xom.cc at line 2001 [13.3]
[31.552]
[22.6636]
```
        {
```

Insertion in crawl-ref/source/xom.cc at line 2003 [13.3]

[22.6692]

[23.6981]

            badness = (random2(tension) > 5 ? 2 : 1);
        }

Insertion in crawl-ref/source/xom.cc at line 2006 [13.3]
[23.7024]
[22.6693]
```
        {
```

Insertion in crawl-ref/source/xom.cc at line 2008 [13.3]

[22.6749]

[23.7025]

            badness = (random2(tension) > 5 ? 3 : 2);
        }

Insertion in crawl-ref/source/xom.cc at line 2011 [13.3]
[23.7068]
[22.6750]
```
        {
```
Insertion in crawl-ref/source/xom.cc at line 2013 [13.3]
[22.6798]
[27.531]
```
            badness = 3 + coinflip();
        }
```
Insertion in crawl-ref/source/xom.cc at line 2018 [13.3]
[14.11932]
[13.26588]
```
            badness = 4 + coinflip();
```

Replacement in crawl-ref/source/xom.cc at line 2021 [13.3]

B:BD[13.26623] → [32.4:43]

        else if (one_chance_in(sever))

[13.26623]

[13.26698]

        else if (one_chance_in(sever) && you.level_type != LEVEL_ABYSS)

Replacement in crawl-ref/source/xom.cc at line 2023 [13.3]

B:BD[13.26708] → [32.44:181]

B:BD[17.470] → [32.182:233]

B:BD[17.472] → [32.234:277]

            if (you.level_type != LEVEL_ABYSS)
            {
                god_speaks(GOD_XOM, _get_xom_speech("banishment").c_str());
                banished(DNGN_ENTER_ABYSS, "Xom");
                done = true;
            }

[13.26708]

[13.27177]

            god_speaks(GOD_XOM, _get_xom_speech("banishment").c_str());
            banished(DNGN_ENTER_ABYSS, "Xom");
            badness = 5;
            done = true;

Insertion in crawl-ref/source/xom.cc at line 2030 [13.3]

[25.991]

[13.27194]

    // If we got here because Xom was bored, reset gift timeout according
    // to the badness of the effect.
    if (done && _xom_is_bored())
    {
        const int interest = random2avg(badness*60, 2);
        you.gift_timeout   = std::min(interest, 255);
#if defined(DEBUG_RELIGION) || defined(DEBUG_XOM)
        mprf(MSGCH_DIAGNOSTICS, "badness: %d, new interest: %d",
             badness, you.gift_timeout);
#endif
    }

Replacement in crawl-ref/source/xom.cc at line 2173 [13.3]

B:BD[13.27258] → [11.3392:3445]

B:BD[11.3445] → [2.4:79]

∅:D[2.79] → [13.27355:27411]

B:BD[13.27355] → [13.27355:27411]

#if DEBUG_DIAGNOSTICS || DEBUG_RELIGION || DEBUG_XOM
    mprf(MSGCH_DIAGNOSTICS, "xom_acts(%u, %d); piety: %u, interest: %u\n",
         niceness, sever, you.piety, you.gift_timeout);

[13.27258]

[13.27411]

#if defined(DEBUG_DIAGNOSTICS) || defined(DEBUG_RELIGION) || defined(DEBUG_XOM)
    mprf(MSGCH_DIAGNOSTICS, "xom_acts(%u, %d, %d); piety: %u, interest: %u\n",
            niceness, sever, tension, you.piety, you.gift_timeout);

Replacement in crawl-ref/source/xom.cc at line 2228 [13.3]

B:BD[31.691] → [31.691:740]

#if DEBUG_RELIGION || DEBUG_XOM || DEBUG_TENSION

[31.691]

[33.4]

#if defined(DEBUG_RELIGION) || defined(DEBUG_XOM) || defined(DEBUG_TENSION)

Deletion in crawl-ref/source/xom.cc at line 2250 [13.3]

B:BD[13.27650] → [15.1064:1221]


        // If we got here because Xom was bored, reset gift timeout.
        if (_xom_is_bored())
            you.gift_timeout = random2(40) + random2(40);

Replacement in crawl-ref/source/xom.cc at line 2368 [13.3]

B:BD[10.718] → [10.718:743]

void xom_death_message()

[10.718]

[10.743]

static bool _death_is_funny(const kill_method_type killed_by)
{
    switch (killed_by)
    {
    // The less original deaths are boring.
    case KILLED_BY_MONSTER:
    case KILLED_BY_BEAM:
    case KILLED_BY_CLOUD:
    case KILLED_BY_FREEZING:
    case KILLED_BY_BURNING:
    case KILLED_BY_SELF_AIMED:
    case KILLED_BY_SOMETHING:
        return (false);
    default:
        // All others are fun (says Xom).
        return (true);
    }
}
void xom_death_message(const kill_method_type killed_by)

Replacement in crawl-ref/source/xom.cc at line 2392 [13.3]

B:BD[7.98] → [7.98:160]

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

[7.98]

[13.27718]

    if (_death_is_funny(killed_by) || you.hp < -1 * random2(10))
        god_speaks(GOD_XOM, _get_xom_speech("laughter").c_str());

Deletion in crawl-ref/source/ouch.cc at line 1082 [35.1104358]
B:BD[34.2718] → [34.2718:2728]
```
        {
```
Deletion in crawl-ref/source/ouch.cc at line 1083 [35.1104358]
∅:D[36.2862] → [34.2844:2854]
B:BD[34.2844] → [34.2844:2854]
```
        }
```
Replacement in crawl-ref/source/ouch.cc at line 1148 [35.1104358]
B:BD[35.1130235] → [10.4925:4954]
```
        xom_death_message();
```
[35.1130235]
[10.4954]
```
        xom_death_message((kill_method_type) se.death_type);
```

Replacement in crawl-ref/source/newgame.cc at line 5023 [35.1132300]

B:BD[37.10168] → [37.10168:10226]

            you.gift_timeout = random2(40) + random2(40);

[37.10168]

[38.7113]

            you.gift_timeout = std::max(5, random2(40) + random2(40));

Replacement in crawl-ref/source/mon-util.cc at line 5721 [35.1699344]
B:BD[39.2970] → [39.2970:3003]
```
            add_ench(ENCH_SLOW);
```
[39.2970]
[39.3003]
```
            slow_down(this, strength);
```
Replacement in crawl-ref/source/misc.h at line 119 [35.1928926]
∅:D[40.2635] → [41.10009:10010]
∅:D[42.2655] → [41.10009:10010]
∅:D[43.2852] → [41.10009:10010]
∅:D[44.2864] → [41.10009:10010]
∅:D[45.2879] → [41.10009:10010]
∅:D[46.3084] → [41.10009:10010]
∅:D[47.5204] → [41.10009:10010]
∅:D[48.5582] → [41.10009:10010]
∅:D[49.8892] → [41.10009:10010]
B:BD[41.10009] → [41.10009:10010]
[45.2879]
[35.1933556]
```
void swap_with_monster(monsters *mon_to_swap);
```

Insertion in crawl-ref/source/misc.cc at line 3112 [35.1933596]

[44.3469]

}
// Make the player swap positions with a given monster.
void swap_with_monster(monsters *mon_to_swap)
{
    monsters& mon(*mon_to_swap);
    ASSERT(mon.alive());
    const coord_def newpos = mon.pos();
    // Be nice: no swapping into uninhabitable environments.
    if (!you.is_habitable(newpos) || !mon.is_habitable(you.pos()))
    {
        mpr("You spin around.");
        return;
    }
    const bool mon_caught = mons_is_caught(&mon);
    const bool you_caught = you.attribute[ATTR_HELD];
    // If it was submerged, it surfaces first.
    mon.del_ench(ENCH_SUBMERGED);
    mprf("You swap places with %s.", mon.name(DESC_NOCAP_THE).c_str());
    // Pick the monster up.
    mgrd(newpos) = NON_MONSTER;
    mon.moveto(you.pos());
    // Plunk it down.
    mgrd(mon.pos()) = mon_to_swap->mindex();
    if (you_caught)
    {
        check_net_will_hold_monster(&mon);
        if (!mon_caught)
            you.attribute[ATTR_HELD] = 0;
    }
    // Move you to its previous location.
    move_player_to_grid(newpos, false, true, true, false);
    if (mon_caught)
    {
        if (you.body_size(PSIZE_BODY) >= SIZE_GIANT)
        {
            mpr("The net rips apart!");
            you.attribute[ATTR_HELD] = 0;
            int net = get_trapping_net(you.pos());
            if (net != NON_ITEM)
                destroy_item(net);
        }
        else
        {
            you.attribute[ATTR_HELD] = 10;
            mpr("You become entangled in the net!");
            // Xom thinks this is hilarious if you trap yourself this way.
            if (you_caught)
                xom_is_stimulated(16);
            else
                xom_is_stimulated(255);
        }
        if (!you_caught)
            mon.del_ench(ENCH_HELD, true);
    }

Replacement in crawl-ref/source/item_use.cc at line 728 [35.2781507]

B:BD[11.14771] → [50.3696:3739]

                    xom_is_stimulated(32);

[11.14771]

[35.2795081]

                {
                    // Xom loves when you ID a distortion weapon this way,
                    // and even more so if he gifted the weapon himself.
                    god_type god;
                    if (origin_is_god_gift(item, &god) && god == GOD_XOM)
                        xom_is_stimulated(255);
                    else
                        xom_is_stimulated(128);
                }

Replacement in crawl-ref/source/item_use.cc at line 759 [35.2781507]

B:BD[35.2796400] → [51.23376:23456]

∅:D[51.23456] → [11.15051:15146]

B:BD[11.15051] → [11.15051:15146]

            if (known_cursed || was_known && special == SPWPN_SCYTHE_OF_CURSES)
                xom_is_stimulated(32);
            else
                xom_is_stimulated(64);

[35.2796400]

[13.49457]

            int amusement = 16;
            if (!known_cursed
                && !(was_known && special == SPWPN_SCYTHE_OF_CURSES))
            {
                amusement *= 2;
                god_type god;
                if (origin_is_god_gift(item, &god) && god == GOD_XOM)
                    amusement *= 2;
            }
            const int wpn_skill = weapon_skill(item.base_type, item.sub_type);
            if (wpn_skill != SK_FIGHTING && you.skills[wpn_skill] == 0)
                amusement *= 2;
            xom_is_stimulated(amusement);

Replacement in crawl-ref/source/item_use.cc at line 3321 [35.2781507]

B:BD[11.15412] → [11.15412:15535]

        if (known_cursed || known_bad)
            xom_is_stimulated(64);
        else
            xom_is_stimulated(128);

[11.15412]

[52.80676]

        int amusement = 32;
        if (!known_cursed && !known_bad)
        {
            amusement *= 2;
            god_type god;
            if (origin_is_god_gift(item, &god) && god == GOD_XOM)
                amusement *= 2;
        }
        xom_is_stimulated(amusement);

Insertion in crawl-ref/source/item_use.cc at line 4852 [35.2781507]
[35.2860533]
[53.8039]
```
    bool bad_effect = false; // for Xom: result is bad (or at least dangerous)
```
Insertion in crawl-ref/source/item_use.cc at line 4946 [35.2781507]
[54.5311]
[35.2862701]
```
        bad_effect = true;
```
Insertion in crawl-ref/source/item_use.cc at line 4957 [35.2781507]
[55.2976]
[35.2863573]
```
        bad_effect = true;
```
Insertion in crawl-ref/source/item_use.cc at line 4974 [35.2781507]
[56.37154]
[35.2864162]
```
            bad_effect = true;
```
Insertion in crawl-ref/source/item_use.cc at line 5099 [35.2781507]
[56.37452]
[35.2867762]
```
        bad_effect = true;
```

Replacement in crawl-ref/source/item_use.cc at line 5155 [35.2781507]

B:BD[57.8078] → [57.8078:8117]

∅:D[57.8117] → [58.539:571]

B:BD[13.51010] → [58.539:571]

        // dangerous monster nearby...
        xom_is_stimulated(255);

[57.8078]

[13.51042]

        // dangerous monster nearby... (though not as much as potions
        // since there are no *really* bad scrolls, merely useless ones).
        xom_is_stimulated(bad_effect ? 128 : 64);

Replacement in crawl-ref/source/item_use.cc at line 5290 [35.2781507]
B:BD[13.51323] → [58.572:604]
```
        xom_is_stimulated(255);
```
[13.51323]
[13.51355]
```
        xom_is_stimulated(128);
```

Replacement in crawl-ref/source/hiscores.cc at line 764 [35.2987663]

B:BD[59.2815] → [4.2856:2987]

         || death_type == KILLED_BY_BEAM
         || death_type == KILLED_BY_SPORE
         || death_type == KILLED_BY_REFLECTION)

[59.2815]

[60.5690]

            || death_type == KILLED_BY_BEAM
            || death_type == KILLED_BY_SPORE
            || death_type == KILLED_BY_REFLECTION)

Replacement in crawl-ref/source/hiscores.cc at line 1113 [35.2987663]

B:BD[61.830136] → [61.830136:830226]

           (final_hp > -22) ? "Demolished" :
                              "Annihilated";

[61.830136]

[61.830226]

           (final_hp > -22) ? "Demolished"
                            : "Annihilated";

Replacement in crawl-ref/source/effects.cc at line 2273 [35.3382105]

B:BD[62.3826] → [63.8653:8727]

    for ( radius_iterator ri(you.pos(), radius, false, false); ri; ++ri )

[62.3826]

[63.8727]

    for (radius_iterator ri(you.pos(), radius, false, false); ri; ++ri)

Replacement in crawl-ref/source/effects.cc at line 2281 [35.3382105]

B:BD[64.9980] → [63.8914:9007]

            grd(*ri)
                = static_cast<dungeon_feature_type>(grid + clear_plus);

[64.9980]

[65.7872]

            grd(*ri) = static_cast<dungeon_feature_type>(grid + clear_plus);

Replacement in crawl-ref/source/describe.cc at line 84 [35.3736416]

B:BD[66.2992] → [66.2992:3050]

   std::string desc = get_linebreak_string(_desc, width);

[66.2992]

[35.3738366]

    std::string desc = get_linebreak_string(_desc, width);

Replacement in crawl-ref/source/describe.cc at line 86 [35.3736416]

B:BD[35.3738367] → [66.3051:3160]

   int count = 0;
   for (int i = 0, size = desc.size(); i < size; i++)
   {
       const char ch = desc[i];

[35.3738367]

[66.3160]

    int count = 0;
    for (int i = 0, size = desc.size(); i < size; i++)
    {
        const char ch = desc[i];

Replacement in crawl-ref/source/describe.cc at line 91 [35.3736416]

B:BD[66.3161] → [66.3161:3222]

       if (ch == '\n' || ch == '$')
           count++;
   }

[66.3161]

[66.3222]

        if (ch == '\n' || ch == '$')
            count++;
    }

Replacement in crawl-ref/source/describe.cc at line 95 [35.3736416]
B:BD[66.3223] → [66.3223:3239]
```
  return count;
```
[66.3223]
[66.3239]
```
    return count;
```
Replacement in crawl-ref/source/delay.h at line 71 [35.3962990]
B:BD[67.3150] → [68.13669:13740]
∅:D[68.13740] → [69.2664:2700]
B:BD[70.1441] → [69.2664:2700]
∅:D[70.1441] → [35.3963390:3963417]
∅:D[69.2700] → [35.3963390:3963417]
∅:D[71.3077] → [35.3963390:3963417]
B:BD[35.3963390] → [35.3963390:3963417]
```
bool you_are_delayed( void );
delay_type current_delay_action( void );
int check_recital_audience( void );
void handle_delay( void );
```
[67.3150]
[61.992939]
```
bool you_are_delayed();
delay_type current_delay_action();
int check_recital_audience();
void handle_delay();
```
Replacement in crawl-ref/source/delay.h at line 78 [35.3962990]
∅:D[72.4980] → [68.13741:13774]
B:BD[73.359] → [68.13741:13774]
```
bool is_vampire_feeding( void );
```
[72.4980]
[70.1442]
```
bool is_vampire_feeding();
bool player_stair_delay();
```

Insertion in crawl-ref/source/delay.cc at line 677 [35.3963459]

[68.15062]

}
bool player_stair_delay()
{
    if (!you_are_delayed())
        return (false);
    const delay_queue_item &delay = you.delay_queue.front();
    return (delay.type == DELAY_ASCENDING_STAIRS
            || delay.type == DELAY_DESCENDING_STAIRS);

Insertion in crawl-ref/source/delay.cc at line 1551 [35.3963459]
[52.84987]
[11.20868]
```
        int amusement = 32;
```

Replacement in crawl-ref/source/delay.cc at line 1555 [35.3963459]

B:BD[6.2968] → [6.2968:3043]

        const int cloak_mult = (get_armour_slot(arm) == EQ_CLOAK) ? 2 : 1;

[6.2968]

[11.21034]

        if (get_armour_slot(arm) == EQ_CLOAK)
            amusement *= 2;
        if (!known_cursed)
        {
            amusement *= 2;
            god_type god;
            if (origin_is_god_gift(arm, &god) && god == GOD_XOM)
                amusement *= 2;
        }

Replacement in crawl-ref/source/delay.cc at line 1567 [35.3963459]

B:BD[11.21035] → [6.3044:3114]

        xom_is_stimulated(32 * cloak_mult * (!known_cursed ? 2 : 1));

[11.21035]

[52.84987]

        xom_is_stimulated(amusement);

Replacement in crawl-ref/source/delay.cc at line 1782 [35.3963459]

B:BD[74.2723] → [75.25557:25697]

    if (ai == AI_SEE_MONSTER && (curr == DELAY_ASCENDING_STAIRS
                                 || curr == DELAY_DESCENDING_STAIRS))
    {

[74.2723]

[76.40728]

    if (ai == AI_SEE_MONSTER && player_stair_delay())

Deletion in crawl-ref/source/delay.cc at line 1784 [35.3963459]
∅:D[76.40752] → [75.25698:25704]
B:BD[74.2815] → [75.25698:25704]
```
    }
```

Replacement in crawl-ref/source/decks.cc at line 944 [35.3987460]

B:BD[15.7483] → [8.2753:2816]

        data << "<w>" << name << "</w>" << EOL << desc << EOL;

[15.7483]

[77.10358]

        data << "<w>" << name << "</w>\n"
             << get_linebreak_string(desc, get_number_of_cols())
#ifdef USE_TILE
    // For some reason we need another linebreak here, for the tiles version.
             << EOL
#endif
             << EOL;

Replacement in crawl-ref/source/decks.cc at line 1431 [35.3987460]

B:BD[78.1339] → [78.1339:1345]

B:BD[78.1345] → [79.9261:9342]

B:BD[79.9342] → [80.2743:2958]

B:BD[80.2958] → [81.2744:2946]

∅:D[81.2946] → [78.1446:1447]

∅:D[82.4319] → [78.1446:1447]

∅:D[79.9342] → [78.1446:1447]

B:BD[78.1446] → [78.1446:1447]

B:BD[78.1447] → [75.26373:26405]

∅:D[75.26405] → [79.9343:9379]

B:BD[78.1478] → [79.9343:9379]

B:BD[78.1521] → [83.97095:97126]

∅:D[83.97126] → [78.1575:1576]

B:BD[78.1575] → [78.1575:1576]

B:BD[78.1576] → [84.2679:2705]

B:BD[84.2705] → [5.2906:2955]

∅:D[5.2955] → [81.2947:2948]

B:BD[79.9434] → [81.2947:2948]

B:BD[78.1644] → [82.4346:4559]

B:BD[82.4559] → [81.2949:3012]

∅:D[81.3012] → [82.4560:4756]

B:BD[78.1717] → [82.4560:4756]

B:BD[82.4756] → [85.51820:51875]

∅:D[85.51875] → [82.4822:5047]

B:BD[82.4822] → [82.4822:5047]

B:BD[82.5047] → [86.2803:3023]

∅:D[86.3023] → [82.5047:5148]

B:BD[82.5047] → [82.5047:5148]

∅:D[82.5148] → [78.1717:1723]

B:BD[78.1717] → [78.1717:1723]

    {
        monsters& mon(*mon_to_swap);
        const coord_def newpos = mon.pos();
        // Be nice: no swapping into uninhabitable environments.
        if (!you.is_habitable(newpos) || !mon.is_habitable(you.pos()))
        {
            mpr("You spin around.");
            return;
        }
        const bool mon_caught = mons_is_caught(&mon);
        const bool you_caught = you.attribute[ATTR_HELD];
        // If it was submerged, it surfaces first.
        mon.del_ench(ENCH_SUBMERGED);
        // Pick the monster up.
        mgrd(newpos) = NON_MONSTER;
        mon.moveto(you.pos());
        // Plunk it down.
        mgrd(mon.pos()) = mon_to_swap->mindex();
        if (you_caught)
        {
            check_net_will_hold_monster(&mon);
            if (!mon_caught)
                you.attribute[ATTR_HELD] = 0;
        }
        // Move you to its previous location.
        move_player_to_grid(newpos, false, true, true, false);
        if (mon_caught)
        {
            if (you.body_size(PSIZE_BODY) >= SIZE_GIANT)
            {
                mpr("The net rips apart!");
                you.attribute[ATTR_HELD] = 0;
                int net = get_trapping_net(you.pos());
                if (net != NON_ITEM)
                    destroy_item(net);
            }
            else
            {
                you.attribute[ATTR_HELD] = 10;
                mpr("You become entangled in the net!");
                // Xom thinks this is hilarious if you trap yourself this way.
                if (you_caught)
                    xom_is_stimulated(16);
                else
                    xom_is_stimulated(255);
            }
            if (!you_caught)
                mon.del_ench(ENCH_HELD, true);
        }
    }

[78.1339]

[87.17748]

        swap_with_monster(mon_to_swap);

Replacement in crawl-ref/source/beam.cc at line 4830 [35.4128068]

B:BD[88.60829] → [88.60829:60882]

        // try to remove haste, if monster is hasted

[88.60829]

[3.3971]

        // Try to remove haste, if monster is hasted.

Replacement in crawl-ref/source/beam.cc at line 4838 [35.4128068]
B:BD[88.61094] → [88.61094:61125]
```
        // not hasted, slow it
```
[88.61094]
[88.61125]
```
        // Not hasted, slow it.
```

Xom again:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.h at line 38 [11.3]

Insertion in crawl-ref/source/xom.cc at line 17 [13.3]

Insertion in crawl-ref/source/xom.cc at line 42 [13.3]

Replacement in crawl-ref/source/xom.cc at line 180 [13.3]

Replacement in crawl-ref/source/xom.cc at line 245 [13.3]

Replacement in crawl-ref/source/xom.cc at line 252 [13.3]

Insertion in crawl-ref/source/xom.cc at line 262 [13.3]

Replacement in crawl-ref/source/xom.cc at line 304 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1010 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1071 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1074 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1077 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1082 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1084 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1090 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1109 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1114 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1116 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1118 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1121 [13.3]

Deletion in crawl-ref/source/xom.cc at line 1126 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1128 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1163 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1263 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1286 [13.3]

Deletion in crawl-ref/source/xom.cc at line 1293 [13.3]

Replacement in crawl-ref/source/xom.cc at line 1312 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1394 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1397 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1937 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1957 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1959 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1964 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1981 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1985 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1987 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1990 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1992 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1995 [13.3]

Insertion in crawl-ref/source/xom.cc at line 1997 [13.3]

Insertion in crawl-ref/source/xom.cc at line 2001 [13.3]

Insertion in crawl-ref/source/xom.cc at line 2003 [13.3]

Insertion in crawl-ref/source/xom.cc at line 2006 [13.3]

Insertion in crawl-ref/source/xom.cc at line 2008 [13.3]

Insertion in crawl-ref/source/xom.cc at line 2011 [13.3]

Insertion in crawl-ref/source/xom.cc at line 2013 [13.3]

Insertion in crawl-ref/source/xom.cc at line 2018 [13.3]

Replacement in crawl-ref/source/xom.cc at line 2021 [13.3]

Replacement in crawl-ref/source/xom.cc at line 2023 [13.3]

Insertion in crawl-ref/source/xom.cc at line 2030 [13.3]

Replacement in crawl-ref/source/xom.cc at line 2173 [13.3]

Replacement in crawl-ref/source/xom.cc at line 2228 [13.3]

Deletion in crawl-ref/source/xom.cc at line 2250 [13.3]

Replacement in crawl-ref/source/xom.cc at line 2368 [13.3]

Replacement in crawl-ref/source/xom.cc at line 2392 [13.3]

Deletion in crawl-ref/source/ouch.cc at line 1082 [35.1104358]

Deletion in crawl-ref/source/ouch.cc at line 1083 [35.1104358]

Replacement in crawl-ref/source/ouch.cc at line 1148 [35.1104358]

Replacement in crawl-ref/source/newgame.cc at line 5023 [35.1132300]

Replacement in crawl-ref/source/mon-util.cc at line 5721 [35.1699344]

Replacement in crawl-ref/source/misc.h at line 119 [35.1928926]

Insertion in crawl-ref/source/misc.cc at line 3112 [35.1933596]

Replacement in crawl-ref/source/item_use.cc at line 728 [35.2781507]

Replacement in crawl-ref/source/item_use.cc at line 759 [35.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3321 [35.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4852 [35.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4946 [35.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4957 [35.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4974 [35.2781507]

Insertion in crawl-ref/source/item_use.cc at line 5099 [35.2781507]

Replacement in crawl-ref/source/item_use.cc at line 5155 [35.2781507]

Replacement in crawl-ref/source/item_use.cc at line 5290 [35.2781507]

Replacement in crawl-ref/source/hiscores.cc at line 764 [35.2987663]

Replacement in crawl-ref/source/hiscores.cc at line 1113 [35.2987663]

Replacement in crawl-ref/source/effects.cc at line 2273 [35.3382105]

Replacement in crawl-ref/source/effects.cc at line 2281 [35.3382105]