fiddlerwoaroof/crawl - Change ZVD3ZBLCAH5MZLGYN4FQOQKHNM453N6P3BZ3KYAQMWCZTEHQK65QC

Make Beogh accept kills from zombies raised by orc high priests, as he

already does with demons summoned by orc high priests.

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

Created by dolorous on February 28, 2009

ZVD3ZBLCAH5MZLGYN4FQOQKHNM453N6P3BZ3KYAQMWCZTEHQK65QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 2798 [5.804403]
[4.3736]
[4.3736]
```
            case GOD_BEOGH:
```
Insertion in crawl-ref/source/religion.cc at line 2855 [5.804403]
[6.14751]
[6.14751]
```
            case GOD_BEOGH:
```

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

B:BD[5.1413593] → [4.5501:5576]

                if (targ_holy == MH_NATURAL && attacker_holy == MH_UNDEAD)

[5.1413593]

[5.1413655]

                if (you.religion == GOD_SHINING_ONE
                    || you.religion == GOD_YREDELEMNUL
                    || you.religion == GOD_KIKUBAAQUDGHA
                    || you.religion == GOD_VEHUMET
                    || you.religion == GOD_MAKHLEB
                    || you.religion == GOD_LUGONU
                    || !anon && mons_is_god_gift(&menv[killer_index]))

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

B:BD[5.1413673] → [4.5577:5653]

B:BD[4.5653] → [3.2641:2721]

∅:D[3.2721] → [4.5732:5988]

B:BD[4.5732] → [4.5732:5988]

                    // Yes, this is a hack, but it makes sure that confused
                    // monsters doing the kill are not referred to as "slaves",
                    // and I think it's okay that Yredelemnul ignores kills
                    // done by confused monsters as opposed to enslaved or
                    // friendly ones. (jpeg)
                    if (mons_friendly(&menv[killer_index]))

[5.1413673]

[7.13860]

                    if (targ_holy == MH_NATURAL && attacker_holy == MH_UNDEAD)

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

B:BD[7.13882] → [4.5989:6102]

∅:D[4.6102] → [7.14453:14517]

B:BD[7.14453] → [7.14453:14517]

B:BD[7.14517] → [4.6103:6280]

∅:D[4.6280] → [7.14714:14778]

B:BD[7.14714] → [7.14714:14778]

                        notice |=
                            did_god_conduct(DID_LIVING_KILLED_BY_UNDEAD_SLAVE,
                                            monster->hit_dice);
                    }
                    else
                    {
                        notice |=
                            did_god_conduct(DID_LIVING_KILLED_BY_SERVANT,
                                            monster->hit_dice);

[7.13882]

[7.14804]

                        // Yes, this is a hack, but it makes sure that
                        // confused monsters doing kills are not
                        // referred to as "slaves", and I think it's
                        // okay that Yredelemnul ignores kills done by
                        // confused monsters as opposed to enslaved or
                        // friendly ones. (jpeg)
                        if (mons_friendly(&menv[killer_index]))
                        {
                            notice |= did_god_conduct(
                                          DID_LIVING_KILLED_BY_UNDEAD_SLAVE,
                                          monster->hit_dice);
                        }
                        else
                        {
                            notice |= did_god_conduct(
                                          DID_LIVING_KILLED_BY_SERVANT,
                                          monster->hit_dice);
                        }

Deletion in crawl-ref/source/monstuff.cc at line 1472 [5.1396662]
∅:D[7.14826] → [5.1413919:1413937]
∅:D[8.414400] → [5.1413919:1413937]
B:BD[5.1413919] → [5.1413919:1413937]
B:BD[5.1413937] → [9.2569:2682]
∅:D[9.2682] → [10.73:129]
B:BD[8.414454] → [10.73:129]
B:BD[10.129] → [9.2683:2738]
B:BD[9.2738] → [11.75590:75666]
∅:D[10.197] → [5.1413958:1413976]
∅:D[12.2890] → [5.1413958:1413976]
∅:D[13.2997] → [5.1413958:1413976]
∅:D[14.7588] → [5.1413958:1413976]
∅:D[15.12992] → [5.1413958:1413976]
∅:D[11.75666] → [5.1413958:1413976]
∅:D[8.414521] → [5.1413958:1413976]
B:BD[5.1413958] → [5.1413958:1413976]
```
                }
                else if (you.religion == GOD_SHINING_ONE
                         || you.religion == GOD_VEHUMET
                         || you.religion == GOD_MAKHLEB
                         || you.religion == GOD_LUGONU
                         || !anon && mons_is_god_gift(&menv[killer_index]))
                {
```

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

B:BD[8.414595] → [2.204:279]

∅:D[2.279] → [8.414669:414745]

B:BD[8.414669] → [8.414669:414745]

B:BD[8.414745] → [2.280:424]

∅:D[2.424] → [8.414891:414961]

B:BD[8.414891] → [8.414891:414961]

B:BD[8.414961] → [2.425:494]

∅:D[2.494] → [8.415031:415102]

B:BD[8.415031] → [8.415031:415102]

B:BD[5.1414047] → [8.415103:415152]

                    // as a way to focus Necromancy vs Summoning (ignoring
                    // Summon Wraith here)... at least we're being nice and
                    // putting the natural creature Summons together with
                    // the Demon ones.  Note that Vehumet gets a free
                    // pass here since those followers are assumed to
                    // come from Summoning spells...  the others are
                    // from invocations (Zin, TSO, Makh, Kiku). -- bwr
                    if (targ_holy == MH_NATURAL)

[8.414595]

[5.1414209]

                    // as a way to focus Necromancy vs. Summoning
                    // (ignoring Summon Wraith here)... at least we're
                    // being nice and putting the natural creature
                    // summons together with the demonic ones.  Note
                    // that Vehumet gets a free pass here since those
                    // followers are assumed to come from summoning
                    // spells...  the others are from invocations (TSO,
                    // Makhleb, Kiku). - bwr
                    else if (targ_holy == MH_NATURAL)

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

B:BD[5.1414521] → [16.3391:3478]

∅:D[16.3478] → [8.415467:415543]

B:BD[8.415467] → [8.415467:415543]

B:BD[8.415543] → [4.6432:6492]

                            notice |=
                                did_god_conduct(
                                        DID_NATURAL_EVIL_KILLED_BY_SERVANT,
                                        monster->hit_dice);

[5.1414521]

[5.1414707]

                            notice |= did_god_conduct(
                                          DID_NATURAL_EVIL_KILLED_BY_SERVANT,
                                          monster->hit_dice);

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

B:BD[5.1414755] → [8.415605:415659]

                    else if (targ_holy == MH_DEMONIC)

[5.1414755]

[8.415659]

                    else if (targ_holy == MH_UNDEAD)

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

B:BD[8.415681] → [4.6493:6572]

                        notice |= did_god_conduct(DID_DEMON_KILLED_BY_SERVANT,

[8.415681]

[4.6572]

                        notice |= did_god_conduct(DID_UNDEAD_KILLED_BY_SERVANT,

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

B:BD[8.415856] → [8.415856:415909]

                    else if (targ_holy == MH_UNDEAD)

[8.415856]

[8.415909]

                    else if (targ_holy == MH_DEMONIC)

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

B:BD[8.415931] → [4.6643:6723]

                        notice |= did_god_conduct(DID_UNDEAD_KILLED_BY_SERVANT,

[8.415931]

[4.6723]

                        notice |= did_god_conduct(DID_DEMON_KILLED_BY_SERVANT,

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

B:BD[4.6868] → [4.6868:7239]

                        // Yes, this is a hack, but it makes sure that confused
                        // monsters doing the kill are not referred to as
                        // "slave", and I think it's okay that Yredelemnul
                        // ignores kills done by confused monsters as opposed
                        // to enslaved or friendly ones. (jpeg)

[4.6868]

[4.7239]

                        // Yes, this is a hack, but it makes sure that
                        // confused monsters doing kills are not
                        // referred to as "slaves", and I think it's
                        // okay that Yredelemnul ignores kills done by
                        // confused monsters as opposed to enslaved or
                        // friendly ones. (jpeg)

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

B:BD[4.7329] → [4.7329:7516]

                            notice |=
                                did_god_conduct(DID_HOLY_KILLED_BY_UNDEAD_SLAVE,
                                                monster->hit_dice);

[4.7329]

[4.7516]

                            notice |= did_god_conduct(
                                          DID_HOLY_KILLED_BY_UNDEAD_SLAVE,
                                          monster->hit_dice);

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

B:BD[4.7597] → [4.7597:7779]

                            notice |=
                                did_god_conduct(DID_HOLY_KILLED_BY_SERVANT,
                                                monster->hit_dice);

[4.7597]

[4.7779]

                            notice |= did_god_conduct(
                                          DID_HOLY_KILLED_BY_SERVANT,
                                          monster->hit_dice);