fiddlerwoaroof/crawl - Change UA7TWR6TJ7NAUQ5J7APBTBQW3PV6ZAAD7D7HCTJT3CGMW6JIEIVQC

Add conducts for undead slaves' killing undead and demons. Currently,

the only difference between these and the conducts for servants' killing undead and demons are the messages ("slaves' kills" vs. "collateral kills").

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

Created by dolorous on February 28, 2009

UA7TWR6TJ7NAUQ5J7APBTBQW3PV6ZAAD7D7HCTJT3CGMW6JIEIVQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/religion.cc at line 2775 [3.804403]

B:BD[3.838802] → [4.2978:3092]

        // You shouldn't have undead slaves if you worship a good god,
        // but check anyway, just in case.

Deletion in crawl-ref/source/religion.cc at line 2778 [3.804403]

B:BD[4.3186] → [4.3186:3605]

            case GOD_ZIN:
            case GOD_SHINING_ONE:
            case GOD_ELYVILON:
                if (testbits(victim->flags, MF_CREATED_FRIENDLY)
                    || testbits(victim->flags, MF_WAS_NEUTRAL))
                {
                    level *= 3;
                    penance = level;
                }
                piety_change = -level;
                retval = true;
                break;

Insertion in crawl-ref/source/religion.cc at line 2860 [3.804403]

[5.15547]

                retval = true;
                if (random2(level + 10 - you.experience_level/3) > 5)
                    piety_change = 1;
                break;
            default:
                break;
            }
            break;
        case DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE:
            switch (you.religion)
            {
            case GOD_VEHUMET:
            case GOD_MAKHLEB:
            case GOD_BEOGH:
            case GOD_LUGONU:
                simple_god_message(" accepts your slave's kill.");

Insertion in crawl-ref/source/religion.cc at line 2907 [3.804403]

[6.767]

[5.16318]

        case DID_DEMON_KILLED_BY_UNDEAD_SLAVE:
            switch (you.religion)
            {
            case GOD_MAKHLEB:
            case GOD_BEOGH:
                simple_god_message(" accepts your slave's kill.");
                retval = true;
                if (random2(level + 10 - you.experience_level/3) > 5)
                    piety_change = 1;
                break;
            default:
                break;
            }
            break;

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

B:BD[7.2957] → [7.2957:3018]

                "Servant Kill Undead", "Servant Kill Demon",

[7.2957]

[4.5165]

                "Undead Slave Kill Undead", "Servant Kill Undead",
                "Undead Slave Kill Demon", "Servant Kill Demon",

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

B:BD[3.1413673] → [2.3087:3166]

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

[3.1413673]

[8.13860]

                    if (attacker_holy == MH_UNDEAD)

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

B:BD[8.13882] → [2.3167:3238]

                        // Yes, this is a hack, but it makes sure that

[8.13882]

[2.3238]

                        const bool confused =
                            !mons_friendly(&menv[killer_index]);
                        // Yes, these are hacks, but they make sure that

Replacement in crawl-ref/source/monstuff.cc at line 1459 [3.1396662]

B:BD[2.3372] → [2.3372:3627]

                        // okay that Yredelemnul ignores kills done by
                        // confused monsters as opposed to enslaved or
                        // friendly ones. (jpeg)
                        if (mons_friendly(&menv[killer_index]))

[2.3372]

[2.3627]

                        // okay that e.g. Yredelemnul ignores kills done
                        // by confused monsters as opposed to enslaved
                        // or friendly ones. (jpeg)
                        if (targ_holy == MH_NATURAL)
                        {
                            notice |= did_god_conduct(
                                          !confused ? DID_LIVING_KILLED_BY_UNDEAD_SLAVE :
                                                      DID_LIVING_KILLED_BY_SERVANT,
                                          monster->hit_dice);
                        }
                        else if (targ_holy == MH_UNDEAD)

Replacement in crawl-ref/source/monstuff.cc at line 1472 [3.1396662]

B:BD[2.3708] → [2.3708:3785]

                                          DID_LIVING_KILLED_BY_UNDEAD_SLAVE,

[2.3708]

[2.3785]

                                          !confused ? DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE :
                                                      DID_UNDEAD_KILLED_BY_SERVANT,

Replacement in crawl-ref/source/monstuff.cc at line 1476 [3.1396662]

B:BD[2.3873] → [2.3873:3902]

                        else

[2.3873]

[2.3902]

                        else if (targ_holy == MH_DEMONIC)

Replacement in crawl-ref/source/monstuff.cc at line 1479 [3.1396662]

B:BD[2.3983] → [2.3983:4055]

                                          DID_LIVING_KILLED_BY_SERVANT,

[2.3983]

[2.4055]

                                          !confused ? DID_DEMON_KILLED_BY_UNDEAD_SLAVE :
                                                      DID_DEMON_KILLED_BY_SERVANT,

Insertion in crawl-ref/source/enum.h at line 709 [3.3287960]
[9.908846]
[9.908846]
```
    DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE,
```
Insertion in crawl-ref/source/enum.h at line 711 [3.3287960]
[9.908880]
[9.908880]
```
    DID_DEMON_KILLED_BY_UNDEAD_SLAVE,
```