fiddlerwoaroof/crawl - Change ECIVNJZMVLZ5ZKAFMNXAQHMECVDNIPOYCLEGINRODBW34ZBT4GIAC

Actually apply the patch described in the previous commit. The actual

previous commit was to handle enchantment beams the same way as offensive beams (oops).

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

Created by dolorous on May 19, 2008

ECIVNJZMVLZ5ZKAFMNXAQHMECVDNIPOYCLEGINRODBW34ZBT4GIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1211 [5.569242]

B:BD[3.337] → [4.219:412]

    if (mons_friendly(monster))
        did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);
    else if (mons_neutral(monster))
        did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);

[3.337]

[6.481]

    if (hurted)
    {
        if (mons_friendly(monster))
            did_god_conduct(DID_ATTACK_FRIEND, 5, true, monster);
        else if (mons_neutral(monster))
            did_god_conduct(DID_ATTACK_NEUTRAL, 5, true, monster);

Replacement in crawl-ref/source/spells2.cc at line 1218 [5.569242]

B:BD[6.482] → [4.413:535]

    if (is_unchivalric_attack(&you, monster, monster))
        did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

[6.482]

[7.551]

        if (is_unchivalric_attack(&you, monster, monster))
            did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

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

B:BD[7.552] → [4.536:628]

    if (mons_is_holy(monster))
        did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice);

[7.552]

[2.169]

        if (mons_is_holy(monster))
            did_god_conduct(DID_ATTACK_HOLY, monster->hit_dice);

Replacement in crawl-ref/source/spells2.cc at line 1224 [5.569242]

B:BD[2.170] → [2.170:219]

    behaviour_event(monster, ME_ANNOY, MHITYOU);

[2.170]

[8.257]

        behaviour_event(monster, ME_ANNOY, MHITYOU);

Deletion in crawl-ref/source/spells2.cc at line 1226 [5.569242]
B:BD[8.357] → [8.357:379]
```
    if (hurted)
    {
```