fiddlerwoaroof/crawl - Change 6IS5PYLNZTW2TGL3IDKGZEMJHTYTKLSPRD5QJGCW4PO25AU5STRAC

Add more miscellaneous minor cleanups.

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

Created by dolorous on January 24, 2009

6IS5PYLNZTW2TGL3IDKGZEMJHTYTKLSPRD5QJGCW4PO25AU5STRAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 684 [7.1396662]
∅:D[5.2636] → [6.2542:2568]
∅:D[8.4770] → [6.2542:2568]
∅:D[9.6480] → [6.2542:2568]
B:BD[10.3783] → [6.2542:2568]
B:BD[6.2568] → [11.2586:2587]
```
    bool convert = false;
```
Insertion in crawl-ref/source/monstuff.cc at line 690 [7.1396662]
[6.2712]
[6.2712]
```
        bool convert = false;
```
Deletion in crawl-ref/source/monstuff.cc at line 700 [7.1396662]
B:BD[6.3035] → [6.3035:3041]
```
    }
```

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

B:BD[6.3042] → [6.3042:3184]

B:BD[6.3184] → [4.3934:4008]

∅:D[4.4008] → [6.3265:3282]

B:BD[6.3265] → [6.3265:3282]

∅:D[12.2652] → [10.4102:4108]

∅:D[6.3282] → [10.4102:4108]

B:BD[10.4102] → [10.4102:4108]

    // Orcs may convert to Beogh under threat of death, either from you
    // or, less often, your followers.  In both cases, the checks are
    // made against your stats.  You're the potential messiah, after all.
    if (convert)
    {

[6.3042]

[10.4108]

        // Orcs may convert to Beogh under threat of death, either from
        // you or, less often, your followers.  In both cases, the
        // checks are made against your stats.  You're the potential
        // messiah, after all.
        if (convert)
        {

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

B:BD[10.4133] → [10.4133:4349]

        mprf(MSGCH_DIAGNOSTICS, "Death convert attempt on %s, HD: %d, "
             "your xl: %d",
             monster->name(DESC_PLAIN).c_str(),
             monster->hit_dice,
             you.experience_level);

[10.4133]

[10.4349]

            mprf(MSGCH_DIAGNOSTICS, "Death convert attempt on %s, HD: %d, "
                 "your xl: %d",
                 monster->name(DESC_PLAIN).c_str(),
                 monster->hit_dice,
                 you.experience_level);

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

B:BD[10.4356] → [3.2596:2650]

∅:D[3.2650] → [10.4392:4467]

∅:D[13.3266] → [10.4392:4467]

B:BD[10.4392] → [10.4392:4467]

B:BD[10.4467] → [2.2542:2610]

∅:D[2.2610] → [10.4535:4592]

B:BD[10.4535] → [10.4535:4592]

B:BD[10.4592] → [14.5763:5827]

∅:D[15.625] → [10.4632:4659]

∅:D[14.5827] → [10.4632:4659]

B:BD[10.4632] → [10.4632:4659]

        if (random2(you.piety) >= piety_breakpoint(0)
            && random2(you.experience_level) >= random2(monster->hit_dice)
            // Bias beaten-up-conversion towards the stronger orcs.
            && random2(monster->hit_dice) > 2)
        {
            beogh_convert_orc(monster, true, MON_KILL(killer));
            return (true);

[10.4356]

[10.4659]

            if (random2(you.piety) >= piety_breakpoint(0)
                && random2(you.experience_level) >= random2(monster->hit_dice)
                // Bias beaten-up-conversion towards the stronger orcs.
                && random2(monster->hit_dice) > 2)
            {
                beogh_convert_orc(monster, true, MON_KILL(killer));
                return (true);
            }