fiddlerwoaroof/crawl - Change 2ED6A5MQQW2S74LJO3T23TRWWVYAAF2ZN6PXH7LRDK64RWKMOVLQC

Add yet more holy being-related cleanups.

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

Created by dolorous on October 30, 2008

2ED6A5MQQW2S74LJO3T23TRWWVYAAF2ZN6PXH7LRDK64RWKMOVLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells2.h at line 67 [3.562867]

[2.447]

                         bool force_hostile = false, bool permanent = false,

Replacement in crawl-ref/source/spells2.cc at line 1659 [3.569242]

B:BD[4.2082] → [2.1116:1176]

bool summon_holy_warrior(int pow, god_type god, bool quiet)

[4.2082]

[4.2212]

bool summon_holy_warrior(int pow, god_type god,
                         bool force_hostile, bool permanent,
                         bool quiet)

Replacement in crawl-ref/source/spells2.cc at line 1664 [3.569242]

B:BD[2.1245] → [2.1245:1372]

                                      std::min(2 + (random2(pow) / 4), 6),
                                      true, quiet);

[2.1245]

[2.1372]

                                      !permanent ?
                                          std::min(2 + (random2(pow) / 4), 6) :
                                          0,
                                      !force_hostile, quiet);

Replacement in crawl-ref/source/religion.cc at line 3546 [3.804403]
B:BD[5.2555] → [2.3819:3859]
```
    case 2: // summon holy beings (3/7)
```
[5.2555]
[6.159]
```
    case 2: // summon holy warriors (3/7)
```

Replacement in crawl-ref/source/religion.cc at line 3553 [3.804403]

B:BD[7.9397] → [2.3860:4069]

            if (create_monster(
                    mgen_data::hostile_at(
                            summon_any_holy_being(HOLY_BEING_RANDOM),
                            you.pos(), 0, 0, true, god)) != -1)

[7.9397]

[8.2594]

            if (summon_holy_warrior(you.experience_level * 20, god, true, true,
                                    true))

Replacement in crawl-ref/source/religion.cc at line 5236 [3.804403]

B:BD[9.3317] → [9.3317:3499]

        // followers (his daeva servants) indifferent, while leaving
        // your other followers (blessed with friendliness by his power,
        // but not his servants) alone.

[9.3317]

[10.2528]

        // followers (his daeva and angel servants) indifferent, while
        // leaving your other followers (blessed with friendliness by
        // his power, but not his servants) alone.