fiddlerwoaroof/crawl - Change 5HGMULU7IWTFJJH35S6XTCW3YZEMCORXHQL6NVY2TO4DUMVITNJAC

Enable handling of long-distance unchivalric attacks, and increase the

penalty from 4 to 5 for consistency with similar attacks frowned upon by the good gods.

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

Created by dolorous on May 17, 2008

5HGMULU7IWTFJJH35S6XTCW3YZEMCORXHQL6NVY2TO4DUMVITNJAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells3.cc at line 34 [8.531613]
[6.242]
[7.46753]
```
#include "fight.h"
```

Insertion in crawl-ref/source/spells3.cc at line 223 [8.531613]

[9.274]

[10.167]


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

Insertion in crawl-ref/source/spells3.cc at line 286 [8.531613]

[11.384]

[10.284]

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

Insertion in crawl-ref/source/spells2.cc at line 38 [8.569242]
[8.570207]
[8.570207]
```
#include "fight.h"
```

Insertion in crawl-ref/source/spells2.cc at line 1216 [8.569242]

[2.479]

[9.551]


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

Insertion in crawl-ref/source/fight.h at line 29 [8.3139131]

[7.93788]

};
enum unchivalric_attack_type
{
    UCAT_NO_ATTACK,                    //    0
    UCAT_DISTRACTED,
    UCAT_CONFUSED,
    UCAT_FLEEING,
    UCAT_INVISIBLE,
    UCAT_NET_HELD,
    UCAT_PARALYSED,
    UCAT_SLEEPING

Insertion in crawl-ref/source/fight.h at line 84 [8.3139131]

[12.875232]

[13.24890]


unchivalric_attack_type is_unchivalric_attack(const actor *attacker,
                                              const actor *defender,
                                              const monsters *def);

Insertion in crawl-ref/source/fight.cc at line 285 [8.3140790]

[14.7669]


unchivalric_attack_type is_unchivalric_attack(const actor *attacker,
                                              const actor *defender,
                                              const monsters *def)
{
    unchivalric_attack_type unchivalric = UCAT_NO_ATTACK;
    // distracted (but not batty)
    if (def->foe != MHITYOU && !testbits(def->flags, MF_BATTY))
        unchivalric = UCAT_DISTRACTED;
    // confused (but not perma-confused)
    if (def->has_ench(ENCH_CONFUSION)
        && !mons_class_flag(def->type, M_CONFUSED))
    {
        unchivalric = UCAT_CONFUSED;
    }
    // fleeing
    if (def->behaviour == BEH_FLEE)
        unchivalric = UCAT_FLEEING;

Insertion in crawl-ref/source/fight.cc at line 307 [8.3140790]

[14.7670]

[13.29838]

    // invisible
    if (attacker->invisible() && !defender->can_see_invisible())
        unchivalric = UCAT_INVISIBLE;
    // held in a net
    if (def->has_ench(ENCH_HELD))
        unchivalric = UCAT_NET_HELD;
    // paralysed
    if (def->has_ench(ENCH_PARALYSIS))
        unchivalric = UCAT_PARALYSED;
    // sleeping
    if (def->behaviour == BEH_SLEEP)
        unchivalric = UCAT_SLEEPING;
    // no unchivalric attacks on monsters that cannot fight
    // (plants, etc.)
    if (defender->cannot_fight())
        unchivalric = UCAT_NO_ATTACK;
    // no unchivalric attacks on invisible monsters
    if (!player_monster_visible(def))
        unchivalric = UCAT_NO_ATTACK;
    return unchivalric;
}

Insertion in crawl-ref/source/fight.cc at line 2826 [8.3140790]

[13.73485]

    unchivalric_attack_type unchivalric =
        is_unchivalric_attack(attacker, defender, def);

Replacement in crawl-ref/source/fight.cc at line 2833 [8.3140790]

B:BD[8.3192930] → [13.73550:73658]

    // not paying attention (but not batty)
    if (def->foe != MHITYOU && !testbits(def->flags, MF_BATTY))

[8.3192930]

[13.73658]

    switch (unchivalric)

Insertion in crawl-ref/source/fight.cc at line 2835 [8.3140790]

[13.73664]

    default:
    case UCAT_NO_ATTACK:
        stab_attempt = false;
        stab_bonus = 0;
        break;
    case UCAT_DISTRACTED:

Replacement in crawl-ref/source/fight.cc at line 2844 [8.3140790]
B:BD[13.73717] → [13.73717:73723]
```
    }
```
[13.73717]
[8.3193130]
```
        break;
```
Replacement in crawl-ref/source/fight.cc at line 2846 [8.3140790]
B:BD[8.3193131] → [13.73724:73765]
B:BD[13.73765] → [15.2666:2704]
∅:D[15.2704] → [13.73809:73867]
∅:D[16.30197] → [13.73809:73867]
B:BD[13.73809] → [13.73809:73867]
```
    // confused (but not perma-confused)
    if (def->has_ench(ENCH_CONFUSION)
        && !mons_class_flag(def->type, M_CONFUSED))
    {
```
[8.3193131]
[13.73867]
```
    case UCAT_CONFUSED:
    case UCAT_FLEEING:
```
Replacement in crawl-ref/source/fight.cc at line 2850 [8.3140790]
B:BD[13.73920] → [13.73920:73926]
```
    }
```
[13.73920]
[8.3193655]
```
        break;
```

Replacement in crawl-ref/source/fight.cc at line 2852 [8.3140790]

B:BD[8.3193656] → [13.73927:74043]

∅:D[13.74043] → [8.3193756:3193757]

B:BD[8.3193756] → [8.3193756:3193757]

B:BD[8.3193757] → [17.313:384]

    // fleeing
    if (def->behaviour == BEH_FLEE)
    {
        stab_attempt = true;
        stab_bonus = 2;
    }
    if (attacker->invisible() && !defender->can_see_invisible())
    {

[8.3193656]

[17.384]

    case UCAT_INVISIBLE:

Replacement in crawl-ref/source/fight.cc at line 2857 [8.3140790]
∅:D[18.437] → [17.503:509]
∅:D[15.2856] → [17.503:509]
B:BD[17.503] → [17.503:509]
```
    }
```
[18.437]
[17.509]
```
        break;
```

Replacement in crawl-ref/source/fight.cc at line 2859 [8.3140790]

B:BD[17.510] → [3.2661:2771]

    // trapped in a net or paralysed
    if (def->has_ench(ENCH_HELD) || def->has_ench(ENCH_PARALYSIS))
    {

[17.510]

[3.2771]

    case UCAT_NET_HELD:
    case UCAT_PARALYSED:

Replacement in crawl-ref/source/fight.cc at line 2863 [8.3140790]
B:BD[3.2824] → [3.2824:2830]
```
    }
```
[3.2824]
[3.2830]
```
        break;
```
Replacement in crawl-ref/source/fight.cc at line 2865 [8.3140790]
B:BD[3.2831] → [3.2831:2884]
∅:D[3.2884] → [13.74097:74103]
∅:D[19.2988] → [13.74097:74103]
B:BD[13.74097] → [13.74097:74103]
```
    // sleeping
    if (def->behaviour == BEH_SLEEP)
    {
```
[3.2831]
[13.74103]
```
    case UCAT_SLEEPING:
```
Insertion in crawl-ref/source/fight.cc at line 2869 [8.3140790]
[13.74185]
[13.74185]
```
        break;
```

Replacement in crawl-ref/source/fight.cc at line 2872 [8.3140790]

B:BD[8.3194126] → [19.2989:3020]

∅:D[19.3020] → [13.74222:74286]

B:BD[13.74222] → [13.74222:74286]

    // helpless (plants, etc.)
    if (defender->cannot_fight())
        stab_attempt = false;

[8.3194126]

[20.2662]

    // see if we need to roll against dexterity / stabbing
    if (stab_attempt && roll_needed)
        stab_attempt = (random2(roll) <= you.skills[SK_STABBING] + you.dex);

Replacement in crawl-ref/source/fight.cc at line 2876 [8.3140790]

B:BD[20.2663] → [20.2663:2767]

B:BD[21.2735] → [21.2735:2859]

    // check for invisibility - no stabs on invisible monsters.
    if (!player_monster_visible( def ))
    {
        stab_attempt = false;
        stab_bonus = 0;
    }
    if (stab_attempt && you.religion == GOD_SHINING_ONE)

[20.2663]

[22.321]

    if (unchivalric && you.religion == GOD_SHINING_ONE)

Replacement in crawl-ref/source/fight.cc at line 2890 [8.3140790]

B:BD[5.3410] → [5.3410:3466]

            did_god_conduct(DID_UNCHIVALRIC_ATTACK, 4);

[5.3410]

[22.489]

            did_god_conduct(DID_UNCHIVALRIC_ATTACK, 5);

Deletion in crawl-ref/source/fight.cc at line 2892 [8.3140790]

B:BD[22.495] → [4.2661:2835]


    // see if we need to roll against dexterity / stabbing
    if (stab_attempt && roll_needed)
        stab_attempt = (random2(roll) <= you.skills[SK_STABBING] + you.dex);

Insertion in crawl-ref/source/beam.cc at line 3773 [8.4128068]

[2.3738]

[23.3644]


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

Insertion in crawl-ref/source/beam.cc at line 3949 [8.4128068]

[2.4031]

[12.1249580]


            if (is_unchivalric_attack(&you, mon, mon))
                conduct.set(DID_UNCHIVALRIC_ATTACK, 5, !okay, mon);

Replacement in crawl-ref/source/beam.cc at line 3954 [8.4128068]

∅:D[24.3423] → [25.4951:5026]

B:BD[12.1249630] → [25.4951:5026]

                conduct.set( DID_ATTACK_HOLY, mon->hit_dice, !okay, mon );

[24.3423]

[8.4239223]

                conduct.set(DID_ATTACK_HOLY, mon->hit_dice, !okay, mon);