fiddlerwoaroof/crawl - Change 7Z4BW72WSXVYBFEPMJI5PCFAV7POF6JSCX4MAW47G3CGTQAAPQOAC

Don't count an attack as unchivalrous if the attacker can't see the defender,

which includes the defender being invisble, being behind opaque clouds, and being behind a wall when hit with an area attack. Before the code was only checking invisibility, which doesn't take into account LOS blocking things like opaque clouds and walls.

Don't give a duplicate message when hitting a giant spore or ball lightning.

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

Created by zelgadis on June 29, 2008

7Z4BW72WSXVYBFEPMJI5PCFAV7POF6JSCX4MAW47G3CGTQAAPQOAC

Dependencies

In channels

main

Change contents

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

B:BD[2.4664] → [2.4664:4702]

∅:D[2.4702] → [4.3211:3280]

B:BD[5.2927] → [4.3211:3280]

    // plants) or invisible monsters.
    if (!defender->cannot_fight() && defender->visible_to(attacker))

[2.4664]

[6.4067]

    // plants) or monsters the attacker can't see (either due to
    // invisibility or being behind opaque clouds).
    if (!defender->cannot_fight() && attacker->can_see(defender))

Deletion in crawl-ref/source/fight.cc at line 2647 [3.3140790]

B:BD[3.3183781] → [7.68038:68117]

B:BD[7.68117] → [8.10741:10751]

∅:D[8.10751] → [9.11998:12054]

B:BD[7.68117] → [9.11998:12054]

B:BD[9.12054] → [10.3041:3115]

B:BD[10.3115] → [8.10752:10762]

        if (def->type == MONS_GIANT_SPORE || def->type == MONS_BALL_LIGHTNING)
        {
            msg::stream << "You " << attack_verb << ' '
                        << def->name(DESC_NOCAP_THE) << '.' << std::endl;
        }