fiddlerwoaroof/crawl - Change B6X2JQ6LF5EEDKFOXKX4RQYH6GW3LXB5E4WTIUVHSXTO4TIZA24QC

Add a few last Beogh-related cleanups. As part of this, move the check

for an orcish follower into its own function, so that it can eventually be used for blessing followers.

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

Created by dolorous on March 18, 2008

B6X2JQ6LF5EEDKFOXKX4RQYH6GW3LXB5E4WTIUVHSXTO4TIZA24QC

Dependencies

In channels

main

Change contents

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

B:BD[5.3409] → [6.394:414]

∅:D[6.414] → [5.3505:3550]

B:BD[5.3505] → [5.3505:3550]

B:BD[5.3600] → [5.3600:3650]

    else if (is_orc
             && !(you.religion == GOD_BEOGH)
             && monster->attitude == ATT_FRIENDLY

[5.3409]

[8.323]

    else if (you.religion != GOD_BEOGH
             && is_orcish_follower(monster)

Deletion in crawl-ref/source/view.cc at line 846 [7.16817]
∅:D[8.380] → [5.3704:3751]
B:BD[5.3704] → [5.3704:3751]
```
             && (monster->flags & MF_GOD_GIFT)
```
Insertion in crawl-ref/source/religion.h at line 72 [7.800304]
[9.261]
[10.397]
```
bool is_orcish_follower(const monsters* mon);
```

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

B:BD[11.2788] → [11.2788:2875]

B:BD[11.2875] → [12.2620:2670]

        if (monster->type != -1
            && mons_species(monster->type) == MONS_ORC
            && monster->attitude == ATT_FRIENDLY)

[11.2788]

[11.2978]

        if (monster->type != -1 && is_orcish_follower(monster))

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

B:BD[13.3051] → [13.3051:3115]

B:BD[13.3115] → [4.2509:2571]

                    if (mons_species(monster->type) == MONS_ORC
                        && monster->attitude == ATT_FRIENDLY)

[13.3051]

[14.2665]

                    if (is_orcish_follower(monster))

Insertion in crawl-ref/source/religion.cc at line 3375 [7.804403]

[10.3290]

[15.4128]

bool is_orcish_follower(const monsters* mon)
{
    return (mons_species(mon->type) == MONS_ORC
        && mon->attitude == ATT_FRIENDLY);
}

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

B:BD[3.2853] → [3.2853:2979]

            if (mons_species(mon->type) == MONS_ORC && mons_friendly(mon)
                && !one_chance_in(3))
            {

[3.2853]

[3.2979]

            if (is_orcish_follower(mon) && !one_chance_in(3))

Deletion in crawl-ref/source/monstuff.cc at line 487 [7.1396662]
B:BD[3.3011] → [3.3011:3025]
```
            }
```

Replacement in crawl-ref/source/beam.cc at line 3782 [7.4128068]

B:BD[16.1575] → [16.1575:1656]

B:BD[16.1656] → [2.2837:2921]

                    && mon->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC
                    && !player_under_penance() && you.piety >= piety_breakpoint(2))

[16.1575]

[16.1723]

                    && mon->behaviour == BEH_SLEEP && !player_under_penance()
                    && you.piety >= piety_breakpoint(2) && mons_near(mon))

Replacement in crawl-ref/source/beam.cc at line 3952 [7.4128068]

B:BD[16.1953] → [16.1953:2091]

B:BD[16.2091] → [2.2922:2971]

            && mon->behaviour == BEH_SLEEP && you.species == SP_HILL_ORC
            && YOU_KILL(beam.thrower) && !player_under_penance()
            && you.piety >= piety_breakpoint(2))

[16.1953]

[16.2123]

            && mon->behaviour == BEH_SLEEP && YOU_KILL(beam.thrower)
            && !player_under_penance() && you.piety >= piety_breakpoint(2)
            && mons_near(mon))