fiddlerwoaroof/crawl - Change 25ZIRUIA4L47VVI3CHNJ66VZZDPJLTYC5KHEMD6BROGKLQNC5G5AC

Add more consistency fixes: the conduct for melee attacks on holy beings

now uses their hit dice, as beams do, and conducts for stabbing and unchivalrous attacks give 4 points instead of 5 again, for consistency with e.g. necromancy and unholy attacks.

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

Created by dolorous on May 19, 2008

25ZIRUIA4L47VVI3CHNJ66VZZDPJLTYC5KHEMD6BROGKLQNC5G5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 223 [9.531613]

B:BD[7.247] → [8.425:492]

            conduct.set(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

[7.247]

[10.167]

            conduct.set(DID_UNCHIVALRIC_ATTACK, 4, true, monster);

Replacement in crawl-ref/source/spells2.cc at line 1221 [9.569242]

B:BD[11.460] → [8.1761:1828]

            conduct.set(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

[11.460]

[12.551]

            conduct.set(DID_UNCHIVALRIC_ATTACK, 4, true, monster);

Insertion in crawl-ref/source/fight.cc at line 614 [9.3140790]

[6.3377]


        if (mons_is_holy(def))
            did_god_conduct(DID_ATTACK_HOLY, def->hit_dice, true, def);

Deletion in crawl-ref/source/fight.cc at line 1190 [9.3140790]
∅:D[13.3194] → [14.42076:42119]
B:BD[14.42076] → [14.42076:42119]
B:BD[14.42119] → [15.3797:3857]
∅:D[16.342] → [17.1442:1443]
∅:D[15.3857] → [17.1442:1443]
B:BD[14.42167] → [17.1442:1443]
```
        if (mons_holiness(def) == MH_HOLY)
            did_god_conduct(DID_ATTACK_HOLY, 1, true, def);
```
Replacement in crawl-ref/source/fight.cc at line 1488 [9.3140790]
B:BD[18.3103] → [3.2661:2703]
```
        did_god_conduct(DID_STABBING, 5);
```
[18.3103]
[14.48855]
```
        did_god_conduct(DID_STABBING, 4);
```
Deletion in crawl-ref/source/fight.cc at line 1764 [9.3140790]
B:BD[19.1042] → [2.2661:2768]
∅:D[19.1152] → [20.397:398]
∅:D[2.2768] → [20.397:398]
∅:D[15.3964] → [20.397:398]
∅:D[21.8578] → [20.397:398]
B:BD[20.397] → [20.397:398]
```
    if (!mondied && mons_holiness(def) == MH_HOLY)
        did_god_conduct(DID_ATTACK_HOLY, 1, true, def);
```

Replacement in crawl-ref/source/fight.cc at line 2897 [9.3140790]

B:BD[8.4418] → [5.2686:2749]

        did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, def);

[8.4418]

[22.489]

        did_god_conduct(DID_UNCHIVALRIC_ATTACK, 4, true, def);

Replacement in crawl-ref/source/beam.cc at line 3778 [9.4128068]

B:BD[7.5860] → [4.2977:3052]

                        conduct.set(DID_UNCHIVALRIC_ATTACK, 5, true, mon);

[7.5860]

[23.3644]

                        conduct.set(DID_UNCHIVALRIC_ATTACK, 4, true, mon);

Replacement in crawl-ref/source/beam.cc at line 3957 [9.4128068]

B:BD[7.5996] → [7.5996:6064]

                conduct.set(DID_UNCHIVALRIC_ATTACK, 5, !okay, mon);

[7.5996]

[24.1249580]

                conduct.set(DID_UNCHIVALRIC_ATTACK, 4, !okay, mon);