fiddlerwoaroof/crawl - Change PIGVTTBAQGNHOCX6IXJLGVVURBAT77SD6FQUVTTI5SFTV563GMZQC

Fixed Beogh being angered by killing a non-orc friendly with a beam (cbus).

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

Created by dshaligram on September 26, 2007

PIGVTTBAQGNHOCX6IXJLGVVURBAT77SD6FQUVTTI5SFTV563GMZQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1108 [4.569242]

B:BD[4.597658] → [5.153:324]

        if (mons_friendly( monster )
            && (you.religion != GOD_BEOGH // Beogh only cares about orcs
                || mons_species(monster->type) == MONS_ORC))

[4.597658]

[5.324]

        if (mons_friendly( monster ))

Replacement in crawl-ref/source/spells2.cc at line 1110 [4.569242]

∅:D[5.334] → [6.73:126]

B:BD[6.73] → [6.73:126]

            did_god_conduct( DID_ATTACK_FRIEND, 5 );

[5.334]

[5.335]

            did_god_conduct( DID_ATTACK_FRIEND, 5, monster );

Insertion in crawl-ref/source/religion.h at line 20 [4.800304]
[2.191]
[4.800589]
```
class actor;
```

Replacement in crawl-ref/source/religion.h at line 29 [4.800304]

B:BD[7.28860] → [8.163:221]

bool did_god_conduct(conduct_type thing_done, int pgain);

[7.28860]

[4.802230]

bool did_god_conduct(conduct_type thing_done, int pgain,
                     const actor *victim = NULL);

Deletion in crawl-ref/source/religion.h at line 57 [4.800304]
B:BD[7.29176] → [3.202:215]
```
class actor;
```

Replacement in crawl-ref/source/religion.cc at line 1119 [4.804403]

B:BD[9.181765] → [8.223:282]

bool did_god_conduct( conduct_type thing_done, int level )

[9.181765]

[4.836718]

bool did_god_conduct( conduct_type thing_done, int level, const actor *victim )

Replacement in crawl-ref/source/religion.cc at line 1183 [4.804403]

∅:D[10.481] → [9.182726:182794]

B:BD[9.182726] → [9.182726:182794]

B:BD[11.5781] → [11.5781:5805]

            piety_change = -level;
            penance = level * 3;
            ret = true;

[10.481]

[12.1292]

            if (you.religion != GOD_BEOGH ||
                (victim && mons_species(victim->id()) == MONS_ORC))
            {
                piety_change = -level;
                penance = level * 3;
                ret = true;
            }

Replacement in crawl-ref/source/player.cc at line 5519 [4.962854]

B:BD[13.6802] → [5.943:1118]

∅:D[5.1118] → [13.6835:6886]

B:BD[13.6835] → [13.6835:6886]

B:BD[13.6886] → [5.1119:1129]

        if (mons_friendly(mons)
            && (you.religion != GOD_BEOGH // Beogh only cares about orcs
                || ::mons_species(mons->type) == MONS_ORC))
        {
            did_god_conduct(DID_ATTACK_FRIEND, 5);
        }

[13.6802]

[13.6886]

        if (mons_friendly(mons))
            did_god_conduct(DID_ATTACK_FRIEND, 5, mons);

Replacement in crawl-ref/source/monstuff.cc at line 638 [4.1396662]

B:BD[4.1413145] → [9.413888:413967]

                did_god_conduct(DID_FRIEND_DIES, 1 + (monster->hit_dice / 2));

[4.1413145]

[4.1413220]

                did_god_conduct(DID_FRIEND_DIES, 1 + (monster->hit_dice / 2),
                                monster);

Replacement in crawl-ref/source/beam.cc at line 3551 [4.4128068]

B:BD[9.1247908] → [5.3445:3652]

∅:D[5.3652] → [9.1247950:1248011]

B:BD[9.1247950] → [9.1247950:1248011]

B:BD[9.1248011] → [5.3653:3671]

                if (mons_friendly( mon )
                     && (you.religion != GOD_BEOGH // Beogh only cares about orcs
                         || mons_species(mon->type) == MONS_ORC))
                {
                    did_god_conduct( DID_ATTACK_FRIEND, 5 );
                }

[9.1247908]

[9.1248011]

                if (mons_friendly( mon ))
                    did_god_conduct( DID_ATTACK_FRIEND, 5, mon );

Replacement in crawl-ref/source/beam.cc at line 3555 [4.4128068]

B:BD[9.1248065] → [9.1248065:1248136]

                    did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice );

[9.1248065]

[9.1248136]

                    did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, mon );

Replacement in crawl-ref/source/beam.cc at line 3694 [4.4128068]

B:BD[9.1249523] → [9.1249523:1249580]

                did_god_conduct( DID_ATTACK_FRIEND, 5 );

[9.1249523]

[9.1249580]

                did_god_conduct( DID_ATTACK_FRIEND, 5, mon );

Replacement in crawl-ref/source/beam.cc at line 3697 [4.4128068]

B:BD[9.1249630] → [9.1249630:1249697]

                did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice );

[9.1249630]

[4.4239223]

                did_god_conduct( DID_ATTACK_HOLY, mon->hit_dice, mon );