fiddlerwoaroof/crawl - Change NVZRXXE5HL76ZOGL6H4LXJJMTWCULFGUJMOZKE7UQBAVDKJRMF3QC

[1631021] Interrupt delays only if the player knows he was attacked.

Under the old system, the delay was interrupted when the monster got an attack round against the player; if the monster is invisible and misses, the player received no message, but delays were interrupted.

Under the new system, the delay is interrupted only if the player perceives the attempted attack (if the player shield-blocks, or the attacker is visible, or the player actually takes a hit).

Also fixed the old behaviour where you would not be aware of an unseen horror if it hits but does no damage.

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

Created by dshaligram on January 9, 2007

NVZRXXE5HL76ZOGL6H4LXJJMTWCULFGUJMOZKE7UQBAVDKJRMF3QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/fight.cc at line 2034 [3.3140790]
B:BD[3.3200704] → [3.3200704:3200812]
B:BD[3.3200812] → [2.887035:887091]
∅:D[2.887091] → [3.3200861:3200862]
B:BD[3.3200861] → [3.3200861:3200862]
```
    // This should happen after the mons_friendly check so we're 
    // only disturbed by hostiles. -- bwr
    interrupt_activity( AI_MONSTER_ATTACKS, attacker );
```

Replacement in crawl-ref/source/fight.cc at line 2052 [3.3140790]

B:BD[3.3201400] → [3.3201400:3201521]

        simple_monster_message(attacker,
                   " tries to attack you, but is repelled by your holy aura.");

[3.3201400]

[3.3201521]

        if (simple_monster_message(
                attacker,
                " tries to attack you, but is repelled by your holy aura."))
            interrupt_activity( AI_MONSTER_ATTACKS, attacker );

Replacement in crawl-ref/source/fight.cc at line 2068 [3.3140790]

B:BD[3.3201868] → [3.3201868:3201997]

                simple_monster_message(attacker,
                                   " tries to attack you, but flinches away.");

[3.3201868]

[3.3201997]

                if (simple_monster_message(
                        attacker,
                        " tries to attack you, but flinches away."))
                    interrupt_activity( AI_MONSTER_ATTACKS, attacker );

Replacement in crawl-ref/source/fight.cc at line 2083 [3.3140790]

B:BD[3.3202296] → [3.3202296:3202372]

        simple_monster_message(attacker, " splashes around in the water.");

[3.3202296]

[3.3202372]

        if (simple_monster_message(attacker, " splashes around in the water."))
            interrupt_activity( AI_MONSTER_ATTACKS, attacker );

Insertion in crawl-ref/source/fight.cc at line 2098 [3.3140790]
[3.3202699]
[3.3202699]
```
    bool player_perceives_attack = false;
```
Insertion in crawl-ref/source/fight.cc at line 2193 [3.3140790]
[3.3205269]
[3.3205269]
```
            player_perceives_attack = true;
```

Replacement in crawl-ref/source/fight.cc at line 2287 [3.3140790]

B:BD[3.3208249] → [3.3208249:3208311]

            simple_monster_message(attacker, " misses you.");

[3.3208249]

[3.3208311]

            if (simple_monster_message(attacker, " misses you."))
                player_perceives_attack = true;

Insertion in crawl-ref/source/fight.cc at line 2291 [3.3140790]

[3.3208322]

        if ((hit && !blocked) || damage_taken > 0)
            player_perceives_attack = true;

Replacement in crawl-ref/source/fight.cc at line 2296 [3.3140790]

B:BD[3.3208381] → [3.3208381:3208503]

            simple_monster_message(attacker,
                                    " hits you but doesn't do any damage.");

[3.3208381]

[3.3208503]

            mprf("%s hits you but doesn't do any damage.",
                 ptr_monam(attacker, DESC_CAP_THE));

Insertion in crawl-ref/source/fight.cc at line 3076 [3.3140790]

[3.3233280]


    if (player_perceives_attack)
        interrupt_activity(AI_MONSTER_ATTACKS, attacker);