fiddlerwoaroof/crawl - Change SROWUFFIKQV3PLGRJBPFUBMY4THTWIR2632PTVDAYEB5R3BDSDJAC

For consistency, split off the conduct for your undead slaves' killing

holy beings.

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

Created by dolorous on November 23, 2008

SROWUFFIKQV3PLGRJBPFUBMY4THTWIR2632PTVDAYEB5R3BDSDJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 612 [5.804403]
B:BD[4.2508] → [4.2508:2571]
```
    case GOD_KIKUBAAQUDGHA: case GOD_MAKHLEB: case GOD_LUGONU:
```
[4.2508]
[6.4324]
```
    case GOD_MAKHLEB: case GOD_LUGONU:
```

Insertion in crawl-ref/source/religion.cc at line 616 [5.804403]

[6.4404]

    case GOD_KIKUBAAQUDGHA:
        likes.push_back("you kill holy beings");
        likes.push_back("your god-given allies kill holy beings");
        likes.push_back("your undead slaves kill holy beings");
        break;

Replacement in crawl-ref/source/religion.cc at line 623 [5.804403]

B:BD[6.4430] → [6.4430:4487]

        likes.push_back("your allies kill holy beings");

[6.4430]

[7.5830]

        likes.push_back("your undead slaves kill holy beings");

Insertion in crawl-ref/source/religion.cc at line 2264 [5.804403]
[2.2676]
[2.2676]
```
    case DID_HOLY_KILLED_BY_UNDEAD_SLAVE:
```

Replacement in crawl-ref/source/religion.cc at line 2302 [5.804403]

B:BD[8.3005] → [8.3005:3048]

                // deliberate fall-through

[8.3005]

[8.3048]

                // deliberate fall through

Deletion in crawl-ref/source/religion.cc at line 2627 [5.804403]
B:BD[8.12821] → [8.12821:12862]
```
        case DID_HOLY_KILLED_BY_SERVANT:
```

Replacement in crawl-ref/source/religion.cc at line 2649 [5.804403]

B:BD[9.2887] → [8.13556:13763]

                if (thing_done == DID_KILL_HOLY)
                    simple_god_message(" accepts your kill.");
                else
                    simple_god_message(" accepts your collateral kill.");

[9.2887]

[8.13763]

                simple_god_message(" accepts your kill.");

Replacement in crawl-ref/source/religion.cc at line 2654 [5.804403]

B:BD[9.3267] → [8.13878:13982]

                if (you.religion == GOD_YREDELEMNUL
                    && thing_done == DID_KILL_HOLY)

[9.3267]

[8.13982]

                if (you.religion == GOD_YREDELEMNUL)

Replacement in crawl-ref/source/religion.cc at line 2669 [5.804403]

B:BD[5.838802] → [8.14374:14538]

        // Undead slave is any friendly undead monster.  Kiku and Yred pay
        // attention to the undead, and both like the death of living
        // things.

[5.838802]

[8.14538]

        // You shouldn't have undead slaves if you worship a good god,
        // but check anyway, just in case.
        case DID_HOLY_KILLED_BY_UNDEAD_SLAVE:
            switch (you.religion)
            {
            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;
            case GOD_YREDELEMNUL:
            case GOD_KIKUBAAQUDGHA: // note: reapers aren't undead
            case GOD_MAKHLEB:
            case GOD_LUGONU:
                if (god_hates_attacking_friend(you.religion, victim))
                    break;
                simple_god_message(" accepts your slave's kill.");
                retval = true;
                if (random2(level + 18) > 2)
                    piety_change = 1;
                break;
            default:
                break;
            }
            break;
        case DID_HOLY_KILLED_BY_SERVANT:
            switch (you.religion)
            {
            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;
            case GOD_KIKUBAAQUDGHA: // note: reapers aren't undead
            case GOD_MAKHLEB:
            case GOD_LUGONU:
                if (god_hates_attacking_friend(you.religion, victim))
                    break;
                simple_god_message(" accepts your collateral kill.");
                retval = true;
                if (random2(level + 18) > 2)
                    piety_change = 1;
                break;
            default:
                break;
            }
            break;

Deletion in crawl-ref/source/religion.cc at line 2756 [5.804403]

B:BD[5.839181] → [8.15054:15175]

        // Servants are currently any friendly or charmed monster, excluding
        // undead, which are handled above.

Replacement in crawl-ref/source/religion.cc at line 2974 [5.804403]

B:BD[3.3018] → [3.3018:3287]

                "Servant Kill Natural Evil", "Servant Kill Holy",
                "Spell Memorise", "Spell Cast", "Spell Practise",
                "Spell Nonutility", "Cards", "Stimulants", "Drink Blood",
                "Cannibalism", "Eat Meat", "Eat Souled Being",

[3.3018]

[3.3287]

                "Servant Kill Natural Evil", "Undead Slave Kill Holy",
                "Servant Kill Holy", "Spell Memorise", "Spell Cast",
                "Spell Practise", "Spell Nonutility", "Cards", "Stimulants",
                "Drink Blood", "Cannibalism", "Eat Meat", "Eat Souled Being",

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

B:BD[5.1413593] → [10.414128:414176]

                if (attacker_holy == MH_UNDEAD)

[5.1413593]

[5.1413655]

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

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

B:BD[5.1413673] → [10.414177:414226]

                    if (targ_holy == MH_NATURAL)

[5.1413673]

[11.13860]

                    // 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)
                    if (mons_friendly(&menv[killer_index]))

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

B:BD[11.13882] → [11.13882:14253]

B:BD[11.14253] → [12.75525:75589]

∅:D[12.75589] → [11.14306:14453]

B:BD[11.14306] → [11.14306:14453]

                        // 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)
                        if (mons_friendly(&menv[killer_index]))
                        {
                            notice |=
                                did_god_conduct(DID_LIVING_KILLED_BY_UNDEAD_SLAVE,

[11.13882]

[11.14453]

                        notice |=
                            did_god_conduct(DID_LIVING_KILLED_BY_UNDEAD_SLAVE,

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

B:BD[11.14517] → [11.14517:14714]

                        }
                        else
                        {
                            notice |=
                                did_god_conduct(DID_LIVING_KILLED_BY_SERVANT,

[11.14517]

[11.14714]

                    }
                    else
                    {
                        notice |=
                            did_god_conduct(DID_LIVING_KILLED_BY_SERVANT,

Deletion in crawl-ref/source/monstuff.cc at line 1156 [5.1396662]
B:BD[11.14778] → [11.14778:14804]
```
                        }
```
Deletion in crawl-ref/source/monstuff.cc at line 1172 [5.1396662]
∅:D[10.415102] → [5.1414046:1414047]
B:BD[5.1414046] → [5.1414046:1414047]

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

B:BD[5.1414231] → [10.415153:415306]

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

[5.1414231]

[10.415306]

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

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

B:BD[10.415543] → [10.415543:415604]

                                        monster->hit_dice );

[10.415543]

[5.1414707]

                                        monster->hit_dice);

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

B:BD[10.415681] → [13.3479:3559]

∅:D[13.3559] → [10.415762:415834]

B:BD[10.415762] → [10.415762:415834]

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

[10.415681]

[10.415834]

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

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

B:BD[10.415931] → [10.415931:416084]

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

[10.415931]

[10.416084]

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

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

B:BD[10.416236] → [14.3167:3242]

∅:D[14.3242] → [10.416313:416381]

∅:D[13.3636] → [10.416313:416381]

B:BD[10.416313] → [10.416313:416381]

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

[10.416236]

[10.416381]

                    if (attacker_holy == MH_UNDEAD)
                    {
                        // 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)
                        if (mons_friendly(&menv[killer_index]))
                        {
                            notice |=
                                did_god_conduct(DID_HOLY_KILLED_BY_UNDEAD_SLAVE,
                                                monster->hit_dice);
                        }
                        else
                        {
                            notice |=
                                did_god_conduct(DID_HOLY_KILLED_BY_SERVANT,
                                                monster->hit_dice);
                        }
                    }
                    else
                        notice |= did_god_conduct(DID_HOLY_KILLED_BY_SERVANT,
                                                  monster->hit_dice);

Insertion in crawl-ref/source/enum.h at line 664 [5.3287960]
[9.6246]
[14.3436]
```
    DID_HOLY_KILLED_BY_UNDEAD_SLAVE,
```