fiddlerwoaroof/crawl - Change FJCG7QPYI2ON5QIGUZDIA6KTJP2BOU45K5ZE6HOEUSLZTEW2YW6QC

Clean up the unchivalric attack routine a bit.

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

Created by dolorous on May 17, 2008

FJCG7QPYI2ON5QIGUZDIA6KTJP2BOU45K5ZE6HOEUSLZTEW2YW6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/fight.h at line 38 [3.3139131]
B:BD[2.3264] → [2.3264:3283]
```
    UCAT_NET_HELD,
```
[2.3264]
[2.3283]
```
    UCAT_HELD_IN_NET,
```

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

B:BD[2.3797] → [2.3797:3935]


    // distracted (but not batty)
    if (def->foe != MHITYOU && !testbits(def->flags, MF_BATTY))
        unchivalric = UCAT_DISTRACTED;

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

B:BD[2.3936] → [2.3936:4067]

    // confused (but not perma-confused)
    if (def->has_ench(ENCH_CONFUSION)
        && !mons_class_flag(def->type, M_CONFUSED))

[2.3936]

[2.4067]

    // no unchivalric attacks on dead or abjured monsters, monsters that
    // cannot fight (e.g. plants), or invisible monsters
    if (defender->alive() && !defender->cannot_fight()
        && player_monster_visible(def))

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

B:BD[2.4073] → [2.4073:4116]

        unchivalric = UCAT_CONFUSED;
    }

[2.4073]

[2.4116]

        // distracted (but not batty)
        if (def->foe != MHITYOU && !testbits(def->flags, MF_BATTY))
            unchivalric = UCAT_DISTRACTED;

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

B:BD[2.4117] → [2.4117:4204]

    // fleeing
    if (def->behaviour == BEH_FLEE)
        unchivalric = UCAT_FLEEING;

[2.4117]

[4.7669]

        // confused (but not perma-confused)
        if (def->has_ench(ENCH_CONFUSION)
            && !mons_class_flag(def->type, M_CONFUSED))
        {
            unchivalric = UCAT_CONFUSED;
        }

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

B:BD[4.7670] → [2.4205:4325]

    // invisible
    if (attacker->invisible() && !defender->can_see_invisible())
        unchivalric = UCAT_INVISIBLE;

[4.7670]

[2.4325]

        // fleeing
        if (def->behaviour == BEH_FLEE)
            unchivalric = UCAT_FLEEING;

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

B:BD[2.4326] → [2.4326:4418]

    // held in a net
    if (def->has_ench(ENCH_HELD))
        unchivalric = UCAT_NET_HELD;

[2.4326]

[2.4418]

        // invisible
        if (attacker->invisible() && !defender->can_see_invisible())
            unchivalric = UCAT_INVISIBLE;

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

B:BD[2.4419] → [2.4419:4513]

    // paralysed
    if (def->has_ench(ENCH_PARALYSIS))
        unchivalric = UCAT_PARALYSED;

[2.4419]

[2.4513]

        // held in a net
        if (def->has_ench(ENCH_HELD))
            unchivalric = UCAT_HELD_IN_NET;

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

B:BD[2.4514] → [2.4514:4604]

    // sleeping
    if (def->behaviour == BEH_SLEEP)
        unchivalric = UCAT_SLEEPING;

[2.4514]

[2.4604]

        // paralysed
        if (def->has_ench(ENCH_PARALYSIS))
            unchivalric = UCAT_PARALYSED;

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

B:BD[2.4605] → [2.4605:4759]

    // no unchivalric attacks on monsters that cannot fight
    // (plants, etc.)
    if (defender->cannot_fight())
        unchivalric = UCAT_NO_ATTACK;

[2.4605]

[2.4759]

        // sleeping
        if (def->behaviour == BEH_SLEEP)
            unchivalric = UCAT_SLEEPING;
    }

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

B:BD[2.4760] → [2.4760:4889]

    // no unchivalric attacks on invisible monsters
    if (!player_monster_visible(def))
        unchivalric = UCAT_NO_ATTACK;

Replacement in crawl-ref/source/fight.cc at line 2856 [3.3140790]
B:BD[5.510] → [2.5300:5324]
```
    case UCAT_NET_HELD:
```
[5.510]
[2.5324]
```
    case UCAT_HELD_IN_NET:
```