fiddlerwoaroof/crawl - Change IFYZSFWJRTV6JM46H6U4CMTQX46VT562EAM64Y6UYU3F6RDWRRYQC

* Add stair repelling as a bad Xom effect.

Experimentally make tension increase the odds for good effects.

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

Created by j-p-e-g on April 13, 2009

IFYZSFWJRTV6JM46H6U4CMTQX46VT562EAM64Y6UYU3F6RDWRRYQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.h at line 29 [7.3]
B:BD[7.710] → [7.710:730]
```
bool xom_is_nice();
```
[7.710]
[8.3]
```
bool xom_is_nice(int tension = -1);
```

Replacement in crawl-ref/source/xom.h at line 35 [7.3]

B:BD[7.841] → [8.114:159]

    xom_acts(xom_is_nice(), sever, tension);

[7.841]

[7.877]

    xom_acts(xom_is_nice(tension), sever, tension);

Replacement in crawl-ref/source/xom.cc at line 167 [10.3]
∅:D[8.464] → [9.753:772]
B:BD[9.753] → [9.753:772]
```
bool xom_is_nice()
```
[8.464]
[9.772]
```
bool xom_is_nice(int tension)
```

Replacement in crawl-ref/source/xom.cc at line 175 [10.3]

B:BD[11.280] → [12.434:510]

        return (you.gift_timeout > 0 && you.piety >= random2(MAX_PIETY+1));

[11.280]

[13.11]

        if (you.gift_timeout == 0)
            return (false);
        // At high tension Xom is more likely to be nice.
        int tension_bonus = (tension <= 0 ? 0 : random2(tension));
        // Whether Xom is nice depends largely on his mood (== piety).
        return (x_chance_in_y(you.piety + tension_bonus, MAX_PIETY + 1));

Insertion in crawl-ref/source/xom.cc at line 1420 [10.3]
[14.4272]
[14.4272]
```
        const int num_tries = random2(4) + 1;
```

Replacement in crawl-ref/source/xom.cc at line 1423 [10.3]

B:BD[14.4327] → [14.4327:4464]

        snprintf(mut_buf, sizeof(mut_buf), "XOM: give %s mutations",
                 good  || !_xom_feels_nasty() ? "good" : "random");

[14.4327]

[14.4464]

        snprintf(mut_buf, sizeof(mut_buf), "XOM: give %s mutation%s",
                 good ? "good" : "random", num_tries > 1 ? "s" : "");

Replacement in crawl-ref/source/xom.cc at line 1435 [10.3]
B:BD[15.3884] → [15.3884:3930]
```
        for (int i = random2(4); i >= 0; --i)
```
[15.3884]
[15.3930]
```
        for (int i = num_tries; i > 0; --i)
```

Insertion in crawl-ref/source/xom.cc at line 1502 [10.3]

[15.5333]

    // Make sure there's at least one enemy within the lightning radius.
    bool found_hostile = false;
    for (radius_iterator ri(you.pos(), 2, true, true, true); ri; ++ri)
    {
        if (monsters* mon = monster_at(*ri))
        {
            if (!mons_wont_attack(mon))
            {
                found_hostile = true;
                break;
            }
        }
    }
    // No hostiles within radius.
    if (!found_hostile)
        return (false);
    bool protection = false;

Insertion in crawl-ref/source/xom.cc at line 1522 [10.3]
[15.5365]
[15.5365]
```
    {
```
Insertion in crawl-ref/source/xom.cc at line 1524 [10.3]
[15.5426]
[15.5426]
```
        protection = true;
    }
```

Replacement in crawl-ref/source/xom.cc at line 1559 [10.3]

B:BD[14.4878] → [14.4878:4950]

    take_note(Note(NOTE_MESSAGE, 0, 0, "XOM: divine lightning"), true);

[14.4878]

[14.4950]

    static char lightning_buf[80];
    snprintf(lightning_buf, sizeof(lightning_buf),
             "XOM: divine lightning%s", protection ? " (protected)" : "");
    take_note(Note(NOTE_MESSAGE, 0, 0, lightning_buf), true);

Replacement in crawl-ref/source/xom.cc at line 2141 [10.3]

∅:D[6.679] → [14.5907:5961]

B:BD[14.5907] → [14.5907:5961]

B:BD[14.5961] → [6.680:742]

             loss, (stat == STAT_STRENGTH  ? " Str" :
                    stat == STAT_DEXTERITY ? " Dex" : "Int"),

[6.679]

[6.742]

             loss, (stat == STAT_STRENGTH  ? "Str" :
                    stat == STAT_DEXTERITY ? "Dex" : "Int"),

Insertion in crawl-ref/source/xom.cc at line 2231 [10.3]

[16.4395]


static bool _move_stair(coord_def stair_pos, bool away)
{
    dungeon_feature_type feat = grd(stair_pos);
    ASSERT(grid_stair_direction(feat) != CMD_NO_CMD);
    coord_def begin, towards;
    bool stairs_moved = false;
    if (away)
    {
        // If the staircase starts out under the player first shove it onto
        // a neighbouring grid.
        if (stair_pos == you.pos())
        {
            coord_def new_pos(stair_pos);
            int adj_count = 0;
            for (adjacent_iterator ai(stair_pos); ai; ++ai)
                if (grid_stair_direction(grd(*ai)) == CMD_NO_CMD
                    && one_chance_in(++adj_count))
                {
                    new_pos = *ai;
                }
            if (new_pos == stair_pos)
                return (false);
            if (!slide_feature_over(stair_pos, new_pos))
                return (false);

Insertion in crawl-ref/source/xom.cc at line 2261 [10.3]

[16.4396]

            stair_pos = new_pos;
            stairs_moved = true;
        }
        begin   = you.pos();
        towards = stair_pos;
    }
    else
    {
        // Can't move towards player if it's already adjacent.
        if (adjacent(you.pos(), stair_pos))
            return (false);
        begin   = stair_pos;
        towards = you.pos();
    }
    ray_def ray;
    if (!find_ray(begin, towards, true, ray, 0, true))
    {
        mpr("Couldn't find ray between player and stairs.", MSGCH_ERROR);
        return (stairs_moved);
    }
    // Don't start off under the player.
    if (away)
        ray.advance();
    bool found_stairs = false;
    int  past_stairs  = 0;
    while (in_bounds(ray.pos()) && see_grid(ray.pos())
           && !grid_is_solid(ray.pos()) && ray.pos() != you.pos())
    {
        if (ray.pos() == stair_pos)
            found_stairs = true;
        if (found_stairs)
            past_stairs++;
        ray.advance();
    }
    past_stairs--;
    if (!away && grid_is_solid(ray.pos()))
    {
        // Transparent wall between stair and player.
        return (stairs_moved);
    }
    if (away && !found_stairs)
    {
        if (grid_is_solid(ray.pos()))
        {
            // Transparent wall between stair and player.
            return (stairs_moved);
        }
        mpr("Ray didn't cross stairs.", MSGCH_ERROR);
    }
    if (away && past_stairs <= 0)
    {
        // Stairs already at edge, can't move further away.
        return (stairs_moved);
    }
    if (!in_bounds(ray.pos()) || ray.pos() == you.pos())
        ray.regress();
    while (!see_grid(ray.pos()) || grd(ray.pos()) != DNGN_FLOOR)
    {
        ray.regress();
        if (!in_bounds(ray.pos()) || ray.pos() == you.pos()
            || ray.pos() == stair_pos)
        {
            // No squares in path are a plain floor.
            return (stairs_moved);
        }
    }
    ASSERT(stair_pos != ray.pos());
    std::string stair_str =
        feature_description(stair_pos, false, DESC_CAP_THE, false);
    mprf("%s slides %s you!", stair_str.c_str(),
         away ? "away from" : "towards");
    // Animate stair moving.
    const feature_def &feat_def = get_feature_def(feat);
    bolt beam;
    beam.range   = INFINITE_DISTANCE;
    beam.flavour = BEAM_VISUAL;
    beam.type    = feat_def.symbol;
    beam.colour  = feat_def.colour;
    beam.source  = stair_pos;
    beam.target  = ray.pos();
    beam.name    = "STAIR BEAM";
    beam.draw_delay = 50; // Make beam animation slower than normal.
    beam.aimed_at_spot = true;
    beam.fire();
    // Clear out "missile trails"
    viewwindow(true, false);
    if (!swap_features(stair_pos, ray.pos(), false, false))
    {
        mprf(MSGCH_ERROR, "_move_stair(): failed to move %s",
             stair_str.c_str());
        return (stairs_moved);
    }
    return (true);
}
static bool _repel_stairs()
{
    // Repeating the effect while it's still active is boring.
    if (you.duration[DUR_REPEL_STAIRS_MOVE]
        || you.duration[DUR_REPEL_STAIRS_CLIMB])
    {
        return (false);
    }
    std::vector<coord_def> stairs_avail;
    for (radius_iterator ri(you.pos(), LOS_RADIUS, false, true); ri; ++ri)
    {
        dungeon_feature_type feat = grd(*ri);
        if (grid_stair_direction(feat) != CMD_NO_CMD
            && feat != DNGN_ENTER_SHOP)
        {
            stairs_avail.push_back(*ri);
        }
    }
    // Should only happen if there are stairs in view.
    if (stairs_avail.empty())
    {
        mpr("No stairs found!");
        return (false);
    }
    god_speaks(GOD_XOM,
               _get_xom_speech("repel stairs").c_str());
    you.duration[DUR_REPEL_STAIRS_MOVE] = 1000;
    if (one_chance_in(5)
        || grid_stair_direction(grd(you.pos())) != CMD_NO_CMD
           && grd(you.pos()) != DNGN_ENTER_SHOP)
    {
        you.duration[DUR_REPEL_STAIRS_CLIMB] = 500;
    }
    std::random_shuffle(stairs_avail.begin(), stairs_avail.end());
    int count_moved = 0;
    for (unsigned int i = 0; i < stairs_avail.size(); i++)
        if (_move_stair(stairs_avail[i], true))
            count_moved++;
    if (!count_moved)
    {
        if (one_chance_in(8))
            mpr("Nothing appears to happen... Ominous!");
        else
            canned_msg(MSG_NOTHING_HAPPENS);
    }
#ifdef NOTE_DEBUG_XOM
    take_note(Note(NOTE_MESSAGE, 0, 0, "XOM: repel stairs"), true);
#endif
    return (true);
}

Replacement in crawl-ref/source/xom.cc at line 2470 [10.3]

B:BD[14.6654] → [14.6654:6775]

            snprintf(torment_buf, sizeof(torment_buf), "XOM: torment (%d/%d)",
                     you.hp, you.hp_max);

[14.6654]

[14.6775]

            snprintf(torment_buf, sizeof(torment_buf),
                     "XOM: torment (%d/%d hp)", you.hp, you.hp_max);

Insertion in crawl-ref/source/xom.cc at line 2626 [10.3]

[17.4906]

[18.2191]

        else if ((!nasty || tension > 0) && x_chance_in_y(11, sever))
        {
            done = _repel_stairs();
            badness = (you.duration[DUR_REPEL_STAIRS_CLIMB] ? 3 : 2);
        }

Replacement in crawl-ref/source/xom.cc at line 2632 [10.3]
∅:D[18.2264] → [19.494:552]
B:BD[19.494] → [19.494:552]
```
        else if (tension > 0 && x_chance_in_y(11, sever))
```
[18.2264]
[17.4907]
```
        else if (tension > 0 && x_chance_in_y(12, sever))
```
Replacement in crawl-ref/source/xom.cc at line 2637 [10.3]
∅:D[17.4982] → [20.6981:7024]
B:BD[20.6981] → [20.6981:7024]
```
        else if (x_chance_in_y(12, sever))
```
[17.4982]
[17.4983]
```
        else if (x_chance_in_y(13, sever))
```
Replacement in crawl-ref/source/xom.cc at line 2642 [10.3]
∅:D[17.5058] → [20.7025:7068]
B:BD[10.24903] → [20.7025:7068]
```
        else if (x_chance_in_y(13, sever))
```
[17.5058]
[17.5059]
```
        else if (x_chance_in_y(14, sever))
```
Replacement in crawl-ref/source/xom.cc at line 2647 [10.3]
∅:D[17.5118] → [21.531:574]
B:BD[10.26044] → [21.531:574]
```
        else if (x_chance_in_y(14, sever))
```
[17.5118]
[10.26083]
```
        else if (x_chance_in_y(15, sever))
```

Replacement in crawl-ref/source/xom.cc at line 2874 [10.3]

B:BD[22.2433] → [23.1526:1566]

    if (niceness && !one_chance_in(20))

[22.2433]

[10.27480]

#ifdef DEBUG_XOM
    static char xom_buf[100];
    snprintf(xom_buf, sizeof(xom_buf), "xom_acts(%s, %d, %d), mood: %d",
             (niceness ? "true" : "false"), sever, tension, you.piety);
    take_note(Note(NOTE_MESSAGE, 0, 0, xom_buf), true);
#endif
    if (niceness && !one_chance_in(15))

Insertion in crawl-ref/source/xom.cc at line 2889 [10.3]

[10.27580]

#ifdef NOTE_DEBUG_XOM
        if (_xom_is_bored())
            take_note(Note(NOTE_MESSAGE, 0, 0, "XOM is BORED!"), true);
#ifdef DEBUG_XOM
        else if (niceness)
        {
            take_note(Note(NOTE_MESSAGE, 0, 0, "good act randomly turned bad"),
                      true);
        }
#endif
#endif

Replacement in crawl-ref/source/terrain.cc at line 886 [26.26938]

B:BD[24.6541] → [25.452:522]

        for (radius_iterator ri(src, 1, true, false, true); ri; ++ri)

[24.6541]

[24.6566]

        for (adjacent_iterator ai(src); ai; ++ai)

Replacement in crawl-ref/source/terrain.cc at line 888 [26.26938]

B:BD[24.6576] → [24.6576:6635]

            if (_ok_dest_grid(orig_actor, orig_feat, *ri))

[24.6576]

[24.6635]

            if (_ok_dest_grid(orig_actor, orig_feat, *ai)
                && one_chance_in(++squares))

Replacement in crawl-ref/source/terrain.cc at line 891 [26.26938]

B:BD[24.6649] → [24.6649:6736]

                if (one_chance_in(++squares))
                    prefered_dest = *ri;

[24.6649]

[24.6736]

                prefered_dest = *ai;

Insertion in crawl-ref/source/stuff.cc at line 406 [29.224557]
[27.946]
[28.16992]
```
    {
```
Insertion in crawl-ref/source/stuff.cc at line 410 [29.224557]
[28.17108]
[28.17108]
```
    }
```

Insertion in crawl-ref/source/player.cc at line 337 [29.962854]

[24.10974]


        // When the effect is still strong, the chance to actually catch
        // a stair is smaller. (Assuming the duration starts out at 1000.)
        const int dur = std::max(0, you.duration[DUR_REPEL_STAIRS_MOVE] - 700);
        pct += dur/10;

Insertion in crawl-ref/source/player.cc at line 354 [29.962854]

[24.11468]


                if (player_in_a_dangerous_place() && one_chance_in(5))
                    xom_is_stimulated(32);

Replacement in crawl-ref/source/output.cc at line 1947 [29.1088282]

B:BD[30.54741] → [31.7467:7503]

    if (you.religion != GOD_NO_GOD)

[30.54741]

[32.2553]

    if (you.religion == GOD_XOM)
    {
        snprintf(god_colour_tag, sizeof god_colour_tag, "<%s>",
                 colour_to_str(god_colour(you.religion)).c_str());
        if (you.gift_timeout == 0)
            godpowers += " - BORED";
        else if (you.gift_timeout == 1)
            godpowers += " - getting BORED";
    }
    else if (you.religion != GOD_NO_GOD)

Replacement in crawl-ref/source/monstuff.h at line 121 [29.1390580]
B:BD[29.1393152] → [33.4510:4549]
```
bool monster_blink(monsters *monster);
```
[29.1393152]
[29.1393198]
```
bool monster_blink(monsters *monster, bool quiet = false);
```
Replacement in crawl-ref/source/monstuff.cc at line 2204 [29.1396662]
B:BD[29.1428841] → [34.4723:4761]
```
bool monster_blink(monsters *monster)
```
[29.1428841]
[34.4761]
```
bool monster_blink(monsters *monster, bool quiet)
```
Insertion in crawl-ref/source/monstuff.cc at line 2210 [29.1396662]
[34.4963]
[35.2636]
```
    if (!quiet)
        simple_monster_message(monster, " blinks!");
```
Deletion in crawl-ref/source/monstuff.cc at line 5633 [29.1396662]
∅:D[36.3565] → [29.1476518:1476585]
B:BD[29.1476518] → [29.1476518:1476585]
```
        {
            simple_monster_message(monster, " blinks.");
```
Deletion in crawl-ref/source/monstuff.cc at line 5634 [29.1396662]
∅:D[3.2442] → [29.1476621:1476631]
B:BD[29.1476621] → [29.1476621:1476631]
```
        }
```
Deletion in crawl-ref/source/monstuff.cc at line 6014 [29.1396662]
B:BD[29.1484727] → [37.7431:7492]
```
                simple_monster_message(monster, " blinks!");
```
Deletion in crawl-ref/source/monstuff.cc at line 6604 [29.1396662]
∅:D[38.11911] → [39.10950:10951]
B:BD[39.10950] → [39.10950:10951]
∅:D[39.10951] → [40.428402:428463]
B:BD[40.428402] → [40.428402:428463]
```
                simple_monster_message(monster, " blinks!");
```

Insertion in crawl-ref/source/misc.cc at line 1638 [29.1933596]

[24.12073]

    // When the effect is still strong, the chance to actually catch a stair
    // is smaller. (Assuming the duration starts out at 500.)
    const int dur = std::max(0, you.duration[DUR_REPEL_STAIRS_CLIMB] - 200);
    pct += dur/20;

Replacement in crawl-ref/source/itemprop.h at line 677 [40.641567]

∅:D[41.3194] → [42.4289:4352]

∅:D[43.3632] → [42.4289:4352]

B:BD[44.3021] → [42.4289:4352]

bool is_enchantable_weapon(const item_def &wpn, bool uncurse);

[41.3194]

[45.2943]

bool is_enchantable_weapon(const item_def &wpn, bool uncurse,
                           bool first = true);

Insertion in crawl-ref/source/itemprop.cc at line 486 [40.646661]

[46.6573]


    if (!quiet)
    {
        mprf("Your %s glows black for a moment.",
             item.name(DESC_PLAIN).c_str());
        // If we get the message, we know the item is cursed now.
        item.flags |= ISFLAG_KNOW_CURSE;
    }
    item.flags |= ISFLAG_CURSED;

Deletion in crawl-ref/source/itemprop.cc at line 522 [40.646661]
B:BD[46.6620] → [46.6620:6738]
B:BD[46.6738] → [47.5989:6097]
∅:D[47.6097] → [7.14612:14618]
∅:D[46.6738] → [7.14612:14618]
B:BD[7.14612] → [7.14612:14618]
B:BD[7.14618] → [48.27386:27387]
∅:D[49.3875] → [40.665989:666022]
∅:D[7.14619] → [40.665989:666022]
∅:D[48.27387] → [40.665989:666022]
B:BD[40.665989] → [40.665989:666022]
```
    if (!quiet)
    {
        mprf("Your %s glows black for a moment.",
             item.name(DESC_PLAIN).c_str());
        // If we get the message, we know the item is cursed now.
        item.flags |= ISFLAG_KNOW_CURSE;
    }
    item.flags |= ISFLAG_CURSED;
```
Replacement in crawl-ref/source/itemprop.cc at line 1392 [40.646661]
∅:D[41.3607] → [42.4355:4417]
B:BD[42.4355] → [42.4355:4417]
```
bool is_enchantable_weapon(const item_def &wpn, bool uncurse)
```
[41.3607]
[42.4417]
```
bool is_enchantable_weapon(const item_def &wpn, bool uncurse, bool first)
```

Replacement in crawl-ref/source/itemprop.cc at line 1402 [40.646661]

B:BD[50.2722] → [50.2722:2798]

            || wpn.plus >= MAX_WPN_ENCHANT && wpn.plus2 >= MAX_WPN_ENCHANT)

[50.2722]

[50.2798]

            || first && wpn.plus >= MAX_WPN_ENCHANT
            || !first && wpn.plus2 >= MAX_WPN_ENCHANT)

Insertion in crawl-ref/source/item_use.cc at line 4384 [29.2781507]
[29.2851761]
[51.3486]
```
    bool to_hit = (which_stat == ENCHANT_TO_HIT);
```
Replacement in crawl-ref/source/item_use.cc at line 4387 [29.2781507]
∅:D[51.3527] → [42.5580:5623]
B:BD[42.5580] → [42.5580:5623]
```
    if (!is_enchantable_weapon(wpn, true))
```
[51.3527]
[29.2852020]
```
    if (!is_enchantable_weapon(wpn, true, to_hit))
```
Insertion in crawl-ref/source/item_use.cc at line 4399 [29.2781507]
[42.5757]
[29.2852238]
```
    {
```
Insertion in crawl-ref/source/item_use.cc at line 4401 [29.2781507]
[29.2852275]
[29.2852668]
```
        to_hit     = true;
    }
```

Replacement in crawl-ref/source/item_use.cc at line 4404 [29.2781507]

B:BD[29.2852669] → [42.5758:5892]

    int enchant_level = (which_stat == ENCHANT_TO_HIT) ? wpn.plus
                                                       : wpn.plus2;

[29.2852669]

[29.2852765]

    int enchant_level = (to_hit ? wpn.plus
                                : wpn.plus2);

Replacement in crawl-ref/source/item_use.cc at line 4408 [29.2781507]

B:BD[42.5942] → [42.5942:5985]

B:BD[42.5985] → [52.10365:10431]

    if (!is_enchantable_weapon(wpn, false)
        || enchant_level >= 4 && x_chance_in_y(enchant_level, 9))

[42.5942]

[29.2852867]

    if (!is_enchantable_weapon(wpn, false, to_hit)
        || enchant_level >= 4 && x_chance_in_y(enchant_level, MAX_WPN_ENCHANT))

Insertion in crawl-ref/source/item_use.cc at line 4427 [29.2781507]

[29.2853391]

            // Xom thinks it's funny if enchantment is possible but fails.
            if (is_enchantable_weapon(wpn, false, to_hit))
                xom_is_stimulated(32);

Replacement in crawl-ref/source/item_use.cc at line 4440 [29.2781507]
B:BD[29.2853679] → [42.6306:6348]
```
        if (which_stat == ENCHANT_TO_HIT)
```
[29.2853679]
[29.2853721]
```
        if (to_hit)
```
Deletion in crawl-ref/source/item_use.cc at line 4469 [29.2781507]
B:BD[29.2854436] → [10.50642:50669]
```
    xom_is_stimulated(16);
```

Insertion in crawl-ref/source/item_use.cc at line 4550 [29.2781507]

[4.3940]

[42.7177]


            // Xom thinks it's funny if enchantment is possible but fails.
            if (is_enchantable_armour(arm, false))
                xom_is_stimulated(32);

Deletion in crawl-ref/source/item_use.cc at line 4572 [29.2781507]
∅:D[53.4665] → [10.50670:50697]
B:BD[29.2857271] → [10.50670:50697]
```
    xom_is_stimulated(16);
```

Insertion in crawl-ref/source/item_use.cc at line 4991 [29.2781507]

[54.2765]


            if (wpn.base_type != OBJ_WEAPONS && wpn.base_type != OBJ_MISSILES
                || !is_cursed
                   && !is_enchantable_weapon(wpn, true, true)
                   && !is_enchantable_weapon(wpn, true, false))
            {
                canned_msg(MSG_NOTHING_HAPPENS);
                id_the_scroll = false;
                break;
            }
            // It's a weapon or stack of missiles that is not an artefact
            // and not fully enchanted, or at least needs to be uncursed.

Replacement in crawl-ref/source/item_use.cc at line 5007 [29.2781507]

B:BD[55.17997] → [54.2886:3022]

            if (wpn.base_type == OBJ_WEAPONS)
            {
                mprf("%s glows bright yellow for a while.", iname.c_str());

[55.17997]

[29.2864830]

            // Uncursing is always possible.
            bool success = is_cursed;
            if (_handle_enchant_weapon(ENCHANT_TO_HIT, true))
                success = true;

Replacement in crawl-ref/source/item_use.cc at line 5012 [29.2781507]

B:BD[29.2864831] → [4.4102:4164]

                _handle_enchant_weapon(ENCHANT_TO_HIT, true);

[29.2864831]

[29.2864887]

            if (is_enchantable_weapon(wpn, true, true) && coinflip()
                && _handle_enchant_weapon(ENCHANT_TO_HIT, true))
            {
                success = true;
            }

Replacement in crawl-ref/source/item_use.cc at line 5018 [29.2781507]

B:BD[29.2864888] → [54.3023:3055]

B:BD[54.3055] → [4.4165:4231]

                if (coinflip())
                    _handle_enchant_weapon(ENCHANT_TO_HIT, true);

[29.2864888]

[29.2864980]

            // Only weapons use the second stat.
            if (wpn.base_type == OBJ_WEAPONS)
            {
                if (_handle_enchant_weapon(ENCHANT_TO_DAM, true))
                    success = true;

Replacement in crawl-ref/source/item_use.cc at line 5024 [29.2781507]

B:BD[29.2864981] → [4.4232:4294]

                _handle_enchant_weapon(ENCHANT_TO_DAM, true);

[29.2864981]

[54.3124]

                if (is_enchantable_weapon(wpn, true, false) && coinflip()
                    && _handle_enchant_weapon(ENCHANT_TO_DAM, true))
                {
                    success = true;
                }
            }

Replacement in crawl-ref/source/item_use.cc at line 5031 [29.2781507]

B:BD[54.3125] → [54.3125:3157]

B:BD[54.3157] → [4.4295:4361]

                if (coinflip())
                    _handle_enchant_weapon(ENCHANT_TO_DAM, true);

[54.3125]

[4.4361]

            if (is_cursed)
                do_uncurse_item(wpn);

Replacement in crawl-ref/source/item_use.cc at line 5034 [29.2781507]

B:BD[4.4362] → [4.4362:4435]

∅:D[4.4435] → [54.3225:3291]

B:BD[54.3225] → [54.3225:3291]

                if (is_cursed)
                    do_uncurse_item(wpn);
            }
            else if (wpn.base_type == OBJ_MISSILES)

[4.4362]

[54.3291]

            if (success)

Replacement in crawl-ref/source/item_use.cc at line 5038 [29.2781507]

B:BD[54.3432] → [54.3432:3433]

B:BD[54.3433] → [4.4436:4498]

∅:D[4.4498] → [54.3497:3530]

B:BD[54.3497] → [54.3497:3530]

B:BD[54.3530] → [4.4499:4639]


                _handle_enchant_weapon(ENCHANT_TO_HIT, true);
                if (coinflip())
                    _handle_enchant_weapon(ENCHANT_TO_HIT, true);
                if (is_cursed)
                    do_uncurse_item(wpn);

[54.3432]

[54.3598]

            }
            else
            {
                canned_msg(MSG_NOTHING_HAPPENS);
                id_the_scroll = false;

Replacement in crawl-ref/source/files.cc at line 1374 [29.3084589]

B:BD[24.13131] → [24.13131:13304]

                && grid_stair_direction(stair_taken) != CMD_NO_CMD
                && coinflip()
                && slide_feature_over(you.pos(), coord_def(-1, -1), false))

[24.13131]

[24.13304]

                && grid_stair_direction(stair_taken) != CMD_NO_CMD)

Replacement in crawl-ref/source/files.cc at line 1381 [29.3084589]

B:BD[24.13544] → [24.13544:13678]

                mprf("%s slides away from you right after you %s through it!",
                     stair_str.c_str(), verb.c_str());

[24.13544]

[24.13678]

                if (coinflip()
                    && slide_feature_over(you.pos(), coord_def(-1, -1), false))
                {
                    mprf("%s slides away from you right after you %s through "
                         "it!", stair_str.c_str(), verb.c_str());
                }
                if (coinflip())
                {
                    // Stairs stop fleeing from you now you actually caught one.
                    mprf("%s settles down.", stair_str.c_str(), verb.c_str());
                    you.duration[DUR_REPEL_STAIRS_MOVE]  = 0;
                    you.duration[DUR_REPEL_STAIRS_CLIMB] = 0;
                }

Deletion in crawl-ref/source/files.cc at line 1397 [29.3084589]

B:BD[24.13702] → [24.13702:13880]


        // Stairs running from you is done now that you actually caught one.
        you.duration[DUR_REPEL_STAIRS_MOVE]  = 0;
        you.duration[DUR_REPEL_STAIRS_CLIMB] = 0;

Insertion in crawl-ref/source/fight.cc at line 69 [29.3140790]
[6.5654]
[6.5654]
```
#define NOTE_DEBUG_CHAOS_EFFECTS
```

Replacement in crawl-ref/source/fight.cc at line 2938 [29.3140790]

B:BD[56.9429] → [56.9429:9535]

            if (defender->holiness() != MH_NONLIVING
                && defender->holiness() != MH_PLANT)

[56.9429]

[56.9535]

            if (defender->holiness() == MH_NONLIVING
                || defender->holiness() == MH_PLANT)

Replacement in crawl-ref/source/effects.cc at line 3204 [29.3382105]
B:BD[57.12008] → [57.12008:12052]
```
    // we take off about .5 points per turn
```
[57.12008]
[57.12052]
```
    // We take off about .5 points per turn.
```

Replacement in crawl-ref/source/effects.cc at line 3208 [29.3382105]

B:BD[57.12163] → [58.6250:6373]

    // only punish if contamination caused by mutagenic randarts
    // (haste and invisibility already penalized earlier)

[57.12163]

[58.6373]

    // Only punish if contamination caused by mutagenic randarts.
    // (Haste and invisibility already penalized earlier.)

Replacement in crawl-ref/source/effects.cc at line 3212 [29.3382105]
B:BD[57.12211] → [57.12211:12263]
```
    // only check for badness once every other turn
```
[57.12211]
[57.12263]
```
    // Only check for badness once every other turn.
```

Replacement in crawl-ref/source/effects.cc at line 3258 [29.3382105]

B:BD[57.14264] → [57.14264:14326]

            // we want to warp the player, not do good stuff!

[57.14264]

[57.14326]

            // We want to warp the player, not do good stuff!

Replacement in crawl-ref/source/delay.cc at line 1193 [29.3963459]

B:BD[59.9535] → [60.51547:51607]

                if (!shift_monster(m) && !monster_blink(m))

[59.9535]

[61.14344]

                if (!shift_monster(m) && !monster_blink(m, true))

Replacement in crawl-ref/source/decks.cc at line 1688 [29.3987460]
B:BD[24.17663] → [24.17663:17715]
```
        you.duration[DUR_REPEL_STAIRS_MOVE] = 1000;
```
[24.17663]
[24.17715]
```
        you.duration[DUR_REPEL_STAIRS_MOVE]  = 1000;
```

Replacement in crawl-ref/source/decks.cc at line 1690 [29.3987460]

B:BD[24.17724] → [24.17724:17777]

        you.duration[DUR_REPEL_STAIRS_CLIMB] = 1000;

[24.17724]

[24.17777]

        you.duration[DUR_REPEL_STAIRS_CLIMB] =  500; // more annoying

Insertion in crawl-ref/source/dat/database/godspeak.txt at line 380 [64.5538]

[62.3786]

[63.6339]

%%%%
Xom repel stairs
Xom alters the dungeon around you.
Xom changes the scenery.
Xom pokes at a staircase.
"Tag, you're it!"

Insertion in crawl-ref/source/chardump.cc at line 59 [29.4100336]
[65.540543]
[40.1207485]
```
#include "xom.h"
```

Insertion in crawl-ref/source/chardump.cc at line 653 [29.4100336]

[2.3157]

[29.4111136]

        }
        else
        {
            if (par.se)
                text += "You were ";
            else
                text += "You are ";
            text += describe_xom_favour(false);
            text += "\n";

Replacement in crawl-ref/docs/changes.stone_soup at line 118 [67.210753]
B:BD[66.6289] → [12.4049:4098]
```
* Potions of magic no longer increase max. mana.
```
[66.6289]
[68.3434]
```
* Potions of magic no longer increase max. magic points.
```

Replacement in crawl-ref/docs/changes.stone_soup at line 150 [67.210753]

B:BD[69.8466] → [5.3145:3220]

* Can see card descriptions when using Nemelex' Triple Draw or Stack Five.

[69.8466]

[66.8062]

* Offer card descriptions when using Nemelex' Triple Draw or Stack Five.

* Add stair repelling as a bad Xom effect.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.h at line 29 [7.3]

Replacement in crawl-ref/source/xom.h at line 35 [7.3]

Replacement in crawl-ref/source/xom.cc at line 167 [10.3]

Replacement in crawl-ref/source/xom.cc at line 175 [10.3]

Insertion in crawl-ref/source/xom.cc at line 1420 [10.3]

Replacement in crawl-ref/source/xom.cc at line 1423 [10.3]

Replacement in crawl-ref/source/xom.cc at line 1435 [10.3]

Insertion in crawl-ref/source/xom.cc at line 1502 [10.3]

Insertion in crawl-ref/source/xom.cc at line 1522 [10.3]

Insertion in crawl-ref/source/xom.cc at line 1524 [10.3]

Replacement in crawl-ref/source/xom.cc at line 1559 [10.3]

Replacement in crawl-ref/source/xom.cc at line 2141 [10.3]

Insertion in crawl-ref/source/xom.cc at line 2231 [10.3]

Insertion in crawl-ref/source/xom.cc at line 2261 [10.3]

Replacement in crawl-ref/source/xom.cc at line 2470 [10.3]

Insertion in crawl-ref/source/xom.cc at line 2626 [10.3]

Replacement in crawl-ref/source/xom.cc at line 2632 [10.3]

Replacement in crawl-ref/source/xom.cc at line 2637 [10.3]

Replacement in crawl-ref/source/xom.cc at line 2642 [10.3]

Replacement in crawl-ref/source/xom.cc at line 2647 [10.3]

Replacement in crawl-ref/source/xom.cc at line 2874 [10.3]

Insertion in crawl-ref/source/xom.cc at line 2889 [10.3]

Replacement in crawl-ref/source/terrain.cc at line 886 [26.26938]

Replacement in crawl-ref/source/terrain.cc at line 888 [26.26938]

Replacement in crawl-ref/source/terrain.cc at line 891 [26.26938]

Insertion in crawl-ref/source/stuff.cc at line 406 [29.224557]

Insertion in crawl-ref/source/stuff.cc at line 410 [29.224557]

Insertion in crawl-ref/source/player.cc at line 337 [29.962854]

Insertion in crawl-ref/source/player.cc at line 354 [29.962854]

Replacement in crawl-ref/source/output.cc at line 1947 [29.1088282]

Replacement in crawl-ref/source/monstuff.h at line 121 [29.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 2204 [29.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 2210 [29.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 5633 [29.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 5634 [29.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 6014 [29.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 6604 [29.1396662]

Insertion in crawl-ref/source/misc.cc at line 1638 [29.1933596]

Replacement in crawl-ref/source/itemprop.h at line 677 [40.641567]

Insertion in crawl-ref/source/itemprop.cc at line 486 [40.646661]

Deletion in crawl-ref/source/itemprop.cc at line 522 [40.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1392 [40.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1402 [40.646661]

Insertion in crawl-ref/source/item_use.cc at line 4384 [29.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4387 [29.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4399 [29.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4401 [29.2781507]