fiddlerwoaroof/crawl - Change IF72CZJ4EP6QNVWNDOI7WLLGLFCLA64MZYXVMRVOLMYGCTGDNREAC

Make Beogh prefer to bless priestly monsters as well as named monsters.

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

Created by dolorous on November 4, 2008

IF72CZJ4EP6QNVWNDOI7WLLGLFCLA64MZYXVMRVOLMYGCTGDNREAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1558 [5.804403]

B:BD[3.10406] → [4.2763:2918]

        // Choose a random follower in LOS, preferably a named one (10% chance).
        follower = choose_random_nearby_monster(0, suitable, true, true);

[3.10406]

[6.3111]

        // Choose a random follower in LOS, preferably a named one, or a
        // priestly one for Beogh (10% chance).
        follower = choose_random_nearby_monster(0, suitable, true, true,
                                                god == GOD_BEOGH);

Replacement in crawl-ref/source/religion.cc at line 1569 [5.804403]

B:BD[4.3045] → [4.3045:3124]

            follower = choose_random_nearby_monster(0, suitable, false, true);

[4.3045]

[3.10853]

            follower = choose_random_nearby_monster(0, suitable, false, true,
                                                    god == GOD_BEOGH);

Replacement in crawl-ref/source/religion.cc at line 1578 [5.804403]

B:BD[4.3301] → [4.3301:3451]

                follower = choose_random_monster_on_level(0, suitable,
                                                          false, false, true);

[4.3301]

[4.3451]

                follower = choose_random_monster_on_level(0, suitable, false,
                                                          false, true,
                                                          god == GOD_BEOGH);

Replacement in crawl-ref/source/monstuff.h at line 146 [5.1390580]
B:BD[7.5011] → [7.5011:5035]
```
    choose_any_monster,
```
[7.5011]
[7.5035]
```
        choose_any_monster,
```
Replacement in crawl-ref/source/monstuff.h at line 148 [5.1390580]
B:BD[7.5061] → [7.5061:5093]
```
    bool prefer_named = false);
```
[7.5061]
[4.5384]
```
    bool prefer_named = false, bool prefer_priest = false);
```
Replacement in crawl-ref/source/monstuff.h at line 153 [5.1390580]
B:BD[7.5196] → [7.5196:5220]
```
    choose_any_monster,
```
[7.5196]
[7.5220]
```
        choose_any_monster,
```
Replacement in crawl-ref/source/monstuff.h at line 155 [5.1390580]
B:BD[7.5268] → [7.5268:5300]
```
    bool prefer_named = false);
```
[7.5268]
[8.3313]
```
    bool prefer_named = false, bool prefer_priest = false);
```

Insertion in crawl-ref/source/monstuff.cc at line 3490 [5.1396662]

[9.3747]

[7.5539]

// If prefer_priest is true, priestly monsters (including uniques) are
// twice as likely to get chosen compared to non-priestly ones.

Replacement in crawl-ref/source/monstuff.cc at line 3494 [5.1396662]

B:BD[7.5668] → [7.5668:5741]

                                       bool in_sight, bool prefer_named)

[7.5668]

[8.3746]

                                       bool in_sight, bool prefer_named,
                                       bool prefer_priest)

Replacement in crawl-ref/source/monstuff.cc at line 3498 [5.1396662]

B:BD[4.5786] → [4.5786:5843]

                                          prefer_named);

[4.5786]

[4.5843]

                                          prefer_named, prefer_priest);

Replacement in crawl-ref/source/monstuff.cc at line 3504 [5.1396662]

B:BD[7.5945] → [7.5945:6005]

                                         bool prefer_named)

[7.5945]

[4.6085]

                                         bool prefer_named, bool prefer_priest)

Replacement in crawl-ref/source/monstuff.cc at line 3531 [5.1396662]

B:BD[2.47578] → [2.47578:47712]

                // Named monsters have doubled chances.
                int mon_weight = ((prefer_named && mon->is_named()) ? 2 : 1);

[2.47578]

[2.47712]

                // Named or priestly monsters have doubled chances.
                int mon_weight = 1;
                if ((prefer_named && mon->is_named())
                    || (prefer_priest && mons_class_flag(mon->type, M_PRIEST)))
                {
                    mon_weight++;
                }