fiddlerwoaroof/crawl - Change TWYB52EBZRZEABTKQ7D6OWKMDKIGACWDUGNH5LP47QX4SKC3SFYAC

Add more minor cosmetic fixes, and make sure Burn/Freeze always annoys

the monster, for consistency with beams.

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

Created by dolorous on May 19, 2008

TWYB52EBZRZEABTKQ7D6OWKMDKIGACWDUGNH5LP47QX4SKC3SFYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1211 [7.569242]
B:BD[7.597636] → [7.597636:597658]
B:BD[7.597658] → [6.283:336]
```
    if (hurted)
    {
        behaviour_event(monster, ME_ANNOY, MHITYOU);
```
[7.597636]
[8.336]
```
    behaviour_event(monster, ME_ANNOY, MHITYOU);
```

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

∅:D[8.337] → [9.265:367]

B:BD[7.597658] → [9.265:367]

B:BD[9.367] → [2.255:295]

∅:D[2.295] → [9.412:479]

B:BD[9.412] → [9.412:479]

        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);

[8.337]

[4.481]

    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 [7.569242]

B:BD[4.482] → [4.482:612]

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

[4.482]

[10.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 [7.569242]

B:BD[10.552] → [5.169:204]

∅:D[5.204] → [9.527:592]

B:BD[9.527] → [9.527:592]

∅:D[9.592] → [11.251:257]

B:BD[11.251] → [11.251:257]

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

[10.552]

[11.257]

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

Replacement in crawl-ref/source/beam.cc at line 3874 [7.4128068]
B:BD[7.4236826] → [7.4236826:4236850]
```
    if (hurt_final < 1)
```
[7.4236826]
[7.4236856]
```
    if (hurt_final < 0)
```

Replacement in crawl-ref/source/beam.cc at line 3966 [7.4128068]

B:BD[3.2822] → [3.2822:2882]

        // did no damage. Hostiles will still take umbrage.

[3.2822]

[3.2882]

        // did no damage.  Hostiles will still take umbrage.

Replacement in crawl-ref/source/beam.cc at line 4017 [7.4128068]
∅:D[12.5060] → [7.4239908:4239929]
∅:D[13.15725] → [7.4239908:4239929]
∅:D[14.27004] → [7.4239908:4239929]
B:BD[7.4239908] → [7.4239908:4239929]
```
    // the beam hit.
```
[13.15725]
[7.4239929]
```
    // The beam hit.
```

Replacement in crawl-ref/source/beam.cc at line 4028 [7.4128068]

B:BD[7.4240317] → [7.4240317:4240409]

        // the player might hear something,
        // if _they_ fired a missile (not beam)

[7.4240317]

[7.4240409]

        // The player might hear something, if _they_ fired a missile
        // (not beam).