fiddlerwoaroof/crawl - Change TBLVONZGCKVUXW7NEG4NSDMFIIO6UZOG4FHTJGT6MKSSO3B5J46AC

Add more holiness-related cleanups. Notably, the ANGEL-related conducts

have been renamed to HOLY-related conducts, since they apply to all holy beings, not just angels.

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

Created by dolorous on March 19, 2008

TBLVONZGCKVUXW7NEG4NSDMFIIO6UZOG4FHTJGT6MKSSO3B5J46AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 751 [6.16817]
∅:D[4.9] → [5.144:216]
B:BD[5.144] → [5.144:216]
```
    const bool is_holy = mons_class_holiness(monster->type) == MH_HOLY;
```
Replacement in crawl-ref/source/view.cc at line 756 [6.16817]
∅:D[7.61] → [5.432:451]
B:BD[5.432] → [5.432:451]
```
        && is_holy
```
[7.61]
[5.451]
```
        && mons_is_holy(monster)
```

Replacement in crawl-ref/source/view.cc at line 781 [6.16817]

B:BD[5.1369] → [5.1369:1390]

B:BD[5.1390] → [8.8:51]

    else if (is_holy
             && !is_good_god(you.religion)

[5.1369]

[7.112]

    else if (!is_good_god(you.religion)
             && mons_is_holy(monster)

Deletion in crawl-ref/source/view.cc at line 809 [6.16817]
∅:D[4.117] → [9.189:254]
B:BD[9.189] → [9.189:254]
```
    const bool is_orc = mons_species(monster->type) == MONS_ORC;
```
Replacement in crawl-ref/source/view.cc at line 813 [6.16817]
∅:D[7.272] → [9.340:358]
B:BD[9.340] → [9.340:358]
```
        && is_orc
```
[7.272]
[9.358]
```
        && mons_species(monster->type) == MONS_ORC
```

Replacement in crawl-ref/source/religion.cc at line 1444 [6.804403]

B:BD[6.838802] → [3.2600:2670]

    // Note that Angel deaths are special, they are always noticed...

[6.838802]

[10.184754]

    // Note that holy deaths are special, they are always noticed...

Replacement in crawl-ref/source/religion.cc at line 1446 [6.804403]

B:BD[10.184830] → [10.184830:184893]

    case DID_ANGEL_KILLED_BY_SERVANT:
    case DID_KILL_ANGEL:

[10.184830]

[6.838880]

    case DID_HOLY_KILLED_BY_SERVANT:
    case DID_KILL_HOLY:

Replacement in crawl-ref/source/religion.cc at line 1468 [6.804403]

B:BD[10.185276] → [10.185276:185353]

                      (thing_done == DID_KILL_ANGEL) ? "" : "collateral " );

[10.185276]

[10.185353]

                      (thing_done == DID_KILL_HOLY) ? "" : "collateral " );

Replacement in crawl-ref/source/religion.cc at line 1686 [6.804403]

B:BD[11.2571] → [3.3042:3110]

          "Kill Angel", "Kill Neutral", "Undead Slave Kill Living",

[11.2571]

[12.2495]

          "Kill Holy", "Kill Neutral", "Undead Slave Kill Living",

Replacement in crawl-ref/source/religion.cc at line 1688 [6.804403]
∅:D[12.2573] → [13.1676:1737]
∅:D[11.2701] → [13.1676:1737]
∅:D[14.3162] → [13.1676:1737]
B:BD[13.1676] → [13.1676:1737]
```
          "Servant Kill Natural Evil", "Servant Kill Angel",
```
[12.2573]
[10.190175]
```
          "Servant Kill Natural Evil", "Servant Kill Holy",
```

Replacement in crawl-ref/source/monstuff.cc at line 723 [6.1396662]

∅:D[2.2790] → [15.4366:4437]

B:BD[10.413624] → [15.4366:4437]

                    did_god_conduct(DID_KILL_ANGEL, monster->hit_dice,

[2.2790]

[15.4437]

                    did_god_conduct(DID_KILL_HOLY, monster->hit_dice,

Replacement in crawl-ref/source/monstuff.cc at line 852 [6.1396662]

B:BD[10.416125] → [10.416125:416176]

                // Angel kills are always noticed.

[10.416125]

[10.416176]

                // Holy kills are always noticed.

Replacement in crawl-ref/source/monstuff.cc at line 855 [6.1396662]

B:BD[10.416236] → [16.3560:3636]

                    notice |= did_god_conduct( DID_ANGEL_KILLED_BY_SERVANT,

[10.416236]

[10.416313]

                    notice |= did_god_conduct( DID_HOLY_KILLED_BY_SERVANT,

Replacement in crawl-ref/source/fight.cc at line 1586 [6.3140790]

B:BD[17.1081] → [18.3858:3928]

        did_god_conduct(mondied? DID_KILL_ANGEL : DID_ATTACK_HOLY, 1,

[17.1081]

[18.3928]

        did_god_conduct(mondied? DID_KILL_HOLY : DID_ATTACK_HOLY, 1,

Replacement in crawl-ref/source/enum.h at line 644 [6.3287960]
∅:D[19.7114] → [10.908753:908773]
B:BD[10.908753] → [10.908753:908773]
```
    DID_KILL_ANGEL,
```
[19.7114]
[18.3967]
```
    DID_KILL_HOLY,
```
Replacement in crawl-ref/source/enum.h at line 651 [6.3287960]
∅:D[20.6246] → [10.908963:908996]
B:BD[10.908963] → [10.908963:908996]
```
    DID_ANGEL_KILLED_BY_SERVANT,
```
[20.6246]
[10.908996]
```
    DID_HOLY_KILLED_BY_SERVANT,
```

Add more holiness-related cleanups. Notably, the ANGEL-related conducts

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 751 [6.16817]

Replacement in crawl-ref/source/view.cc at line 756 [6.16817]

Replacement in crawl-ref/source/view.cc at line 781 [6.16817]

Deletion in crawl-ref/source/view.cc at line 809 [6.16817]

Replacement in crawl-ref/source/view.cc at line 813 [6.16817]