fiddlerwoaroof/crawl - Change CVYS2M2XNT3GLAYJB2FJCYLONILJ35TPZTICJGYTGRBXHDMUXLVQC

Add miscellaneous minor cleanups.

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

Created by dolorous on January 24, 2009

CVYS2M2XNT3GLAYJB2FJCYLONILJ35TPZTICJGYTGRBXHDMUXLVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 897 [7.16817]

B:BD[5.954] → [6.8:56]

                && is_evil_item( you.inv[wpn] )

[5.954]

[5.1004]

                && is_evil_item(you.inv[wpn])

Replacement in crawl-ref/source/view.cc at line 931 [7.16817]

B:BD[8.8185] → [2.7:82]

∅:D[2.82] → [9.7:83]

∅:D[10.83] → [9.7:83]

B:BD[11.702] → [9.7:83]

∅:D[12.80] → [13.82:129]

∅:D[9.83] → [13.82:129]

B:BD[13.82] → [13.82:129]

        if (you.piety >= piety_breakpoint(2) && !player_under_penance() &&
            random2(you.piety / 15) + random2(4 + you.experience_level / 3)
              > random2(hd) + hd + random2(5))

[8.8185]

[11.768]

        if (you.piety >= piety_breakpoint(2) && !player_under_penance()
            && random2(you.piety / 15) + random2(4 + you.experience_level / 3)
                 > random2(hd) + hd + random2(5))

Replacement in crawl-ref/source/view.cc at line 937 [7.16817]

B:BD[14.123] → [14.123:197]

                && get_weapon_brand( *you.weapon() ) == SPWPN_ORC_SLAYING

[14.123]

[11.978]

                && get_weapon_brand(*you.weapon()) == SPWPN_ORC_SLAYING

Deletion in crawl-ref/source/religion.cc at line 1812 [7.804403]
B:BD[15.3926] → [16.4894:4926]
```
    bool see_follower = false;
```

Replacement in crawl-ref/source/religion.cc at line 1819 [7.804403]

∅:D[17.4638] → [16.5078:5148]

B:BD[16.5078] → [16.5078:5148]

B:BD[16.5148] → [17.4639:4806]

∅:D[17.4806] → [16.5235:5288]

B:BD[16.5235] → [16.5235:5288]

            see_follower = true;
        if (see_follower)
        {
            if (follower->is_named())
                whom = follower->name(DESC_PLAIN);
            else
                whom = "your " + follower->name(DESC_PLAIN);
        }
        else // cannot see who was blessed

[17.4638]

[16.5288]

            whom = follower->name(DESC_NOCAP_THE);
        else

Replacement in crawl-ref/source/monstuff.cc at line 568 [7.1396662]

B:BD[18.4907] → [19.3542:3627]

// Elyvilon will occasionally (5% chance) protect the life of
// one of your allies.

[18.4907]

[19.3627]

// Elyvilon will occasionally (5% chance) protect the life of one of
// your allies.

Replacement in crawl-ref/source/monstuff.cc at line 572 [7.1396662]

B:BD[19.3679] → [19.3679:3721]

    ASSERT(you.religion == GOD_ELYVILON);

[19.3679]

[20.2545]

    if (you.religion != GOD_ELYVILON)
        return (false);

Replacement in crawl-ref/source/monstuff.cc at line 576 [7.1396662]
B:BD[19.3771] → [21.2543:2589]
```
         && mons_holiness(monster) != MH_HOLY
```
[19.3771]
[19.3771]
```
            && mons_holiness(monster) != MH_HOLY
```

Replacement in crawl-ref/source/monstuff.cc at line 586 [7.1396662]

B:BD[21.2713] → [21.2713:2940]

    snprintf(info, INFO_SIZE, " protects %s%s from harm!%s",
             mons_is_unique(monster->type) ? "" : "your ",
             monster->name(DESC_PLAIN).c_str(),
             coinflip() ? "" : "  You feel responsible.");

[21.2713]

[21.2940]


    snprintf(info, INFO_SIZE, " protects %s from harm!%s",
             monster->name(DESC_NOCAP_THE).c_str(),
             coinflip() ? "" : " You feel responsible.");

Replacement in crawl-ref/source/monstuff.cc at line 601 [7.1396662]

B:BD[18.4985] → [19.4426:4468]

    ASSERT(you.religion != GOD_ELYVILON);

[18.4985]

    if (you.religion == GOD_ELYVILON)
        return (false);

Insertion in crawl-ref/source/monstuff.cc at line 650 [7.1396662]

[18.6305]

[22.3686]

static bool _yred_enslaves_soul(monsters *monster, killer_type killer)
{
    if (you.religion == GOD_YREDELEMNUL && mons_enslaved_body_and_soul(monster)
        && mons_near(monster) && killer != KILL_RESET
        && killer != KILL_DISMISSED)
    {
        yred_make_enslaved_soul(monster, player_under_penance());
        return (true);
    }
    return (false);
}

Replacement in crawl-ref/source/monstuff.cc at line 674 [7.1396662]

B:BD[19.4575] → [19.4575:4644]

    if (you.religion == GOD_ELYVILON && _ely_protects_ally(monster))

[19.4575]

[19.4644]

    if (_ely_protects_ally(monster))
        return (true);
    if (_ely_heals_monster(monster, killer, i))

Replacement in crawl-ref/source/monstuff.cc at line 679 [7.1396662]

B:BD[19.4668] → [19.4668:4748]

    if (you.religion != GOD_ELYVILON && _ely_heals_monster(monster, killer, i))

[19.4668]

[18.6442]

    // Yredelemnul special
    if (_yred_enslaves_soul(monster, killer))

Deletion in crawl-ref/source/monstuff.cc at line 722 [7.1396662]

B:BD[12.4669] → [23.6976:7276]

    }
    // Yredelemnul special
    if (you.religion == GOD_YREDELEMNUL && mons_enslaved_body_and_soul(monster)
        && mons_near(monster) && killer != KILL_RESET
        && killer != KILL_DISMISSED)
    {
        yred_make_enslaved_soul(monster, player_under_penance());
        return (true);

Replacement in crawl-ref/source/monstuff.cc at line 7702 [7.1396662]

B:BD[24.9809] → [4.2634:2707]

        // Don't worry about invisibility - you should be able to see if

[24.9809]

[4.2707]

        // Don't worry about invisibility.  You should be able to see if

Replacement in crawl-ref/source/monstuff.cc at line 7714 [7.1396662]

B:BD[25.309] → [26.7047:7161]

        // Even fire resistant monsters perish in lava, but inanimate monsters
        // can survive deep water.

[25.309]

[25.310]

        // Even fire resistant monsters perish in lava, but inanimate
        // monsters can survive deep water.

Replacement in crawl-ref/source/mon-util.cc at line 1973 [7.1699344]

B:BD[3.2886] → [3.2886:2944]

                              && mons_is_submerged(&mon);

[3.2886]

[24.11255]

                                     && mons_is_submerged(&mon);

Replacement in crawl-ref/source/mon-util.cc at line 3246 [7.1699344]
B:BD[7.1750104] → [7.1750104:1750124]
```
    switch(variant)
```
[7.1750104]
[7.1750124]
```
    switch (variant)
```

Replacement in crawl-ref/source/mon-util.cc at line 3541 [7.1699344]

B:BD[27.8214] → [27.8214:8346]

            // Can't use monster_habitable_grid because that'll return true
            // for non-water monsters in shallow water.

[27.8214]

[28.7063]

            // Can't use monster_habitable_grid() because that'll return
            // true for non-water monsters in shallow water.