fiddlerwoaroof/crawl - Change X6PDJWFXOZ4NUKXNOEP54CYQ6PCQJQK2KALAYY75XDAFCJJYWE6AC

Revert the previous conduct-related changes, so that attacking friendly

or neutral monsters generates the proper conduct again. The previous consistency needs to be reimplemented.

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

Created by dolorous on May 19, 2008

X6PDJWFXOZ4NUKXNOEP54CYQ6PCQJQK2KALAYY75XDAFCJJYWE6AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells3.cc at line 214 [6.531613]
B:BD[4.772] → [5.167:168]
B:BD[5.168] → [2.167:220]
```
        behaviour_event(monster, ME_WHACK, MHITYOU);
```
Insertion in crawl-ref/source/spells3.cc at line 229 [6.531613]
[7.283]
[6.537413]
```
        behaviour_event(monster, ME_ANNOY, MHITYOU);
```
Deletion in crawl-ref/source/spells3.cc at line 279 [6.531613]
B:BD[6.538521] → [2.221:278]
∅:D[2.278] → [5.279:280]
B:BD[5.279] → [5.279:280]
```
            behaviour_event(monster, ME_WHACK, MHITYOU);
```
Insertion in crawl-ref/source/spells3.cc at line 291 [6.531613]
[7.407]
[7.407]
```
            behaviour_event(monster, ME_ANNOY, MHITYOU);
```

Replacement in crawl-ref/source/spells2.cc at line 1213 [6.569242]

B:BD[6.597658] → [2.362:415]

        behaviour_event(monster, ME_WHACK, MHITYOU);

[6.597658]

[5.336]

        behaviour_event(monster, ME_ANNOY, MHITYOU);

Insertion in crawl-ref/source/fight.cc at line 596 [6.3140790]

[8.32942]

[6.3147521]


    // Allow god to get offended, etc.
    attacker->attacking(defender);

Deletion in crawl-ref/source/fight.cc at line 612 [6.3140790]
B:BD[3.2884] → [3.2884:2959]
```
    // Allow god to get offended, etc.
    attacker->attacking(defender);
```