fiddlerwoaroof/crawl - Change SCRNLNQV4NWVMD7346D2DD23SWBH2TDI4QVG7WUZ7XRBHVRRQLMAC

Make paralysed creatures auto-stabbable and brand them appropriately.

Petrified creatures are still only may-stabbable.

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

Created by haranp on February 15, 2009

SCRNLNQV4NWVMD7346D2DD23SWBH2TDI4QVG7WUZ7XRBHVRRQLMAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 2671 [5.1699344]
[5.1734580]
[6.2594]
```
    const unchivalric_attack_type uat = is_unchivalric_attack(&you, m);
```

Replacement in crawl-ref/source/mon-util.cc at line 2674 [5.1699344]

B:BD[6.2669] → [4.2643:2680]

            && mons_is_sleeping(m));

[6.2669]

[7.483009]

            && (uat == UCAT_PARALYSED || uat == UCAT_SLEEPING));

Insertion in crawl-ref/source/mon-util.cc at line 2679 [5.1699344]
[7.483060]
[6.2707]
```
    const unchivalric_attack_type uat = is_unchivalric_attack(&you, m);
```

Replacement in crawl-ref/source/mon-util.cc at line 2682 [5.1699344]

B:BD[8.2580] → [9.23432:23507]

∅:D[9.23507] → [8.2657:2734]

B:BD[8.2657] → [8.2657:2734]

B:BD[8.2734] → [10.5512:5549]

B:BD[10.5549] → [4.2681:2763]

            && (m->foe != MHITYOU && !mons_is_batty(m) && !mons_neutral(m)
                || mons_is_confused(m)
                || mons_is_fleeing(m)
                || mons_is_caught(m)
                || mons_is_petrifying(m)
                || mons_cannot_act(m)));

[8.2580]

[7.483433]

            && uat != UCAT_NO_ATTACK
            && uat != UCAT_PARALYSED
            && uat != UCAT_SLEEPING);

Replacement in crawl-ref/source/mon-util.cc at line 5847 [5.1699344]

B:BD[11.2667] → [11.2667:2733]

B:BD[11.2733] → [12.2918:2970]

∅:D[12.2970] → [13.3372:3412]

B:BD[13.3372] → [13.3372:3412]

B:BD[13.3412] → [11.2734:2771]

           || mons_is_holy(this)
           || mons_neutral(this)
           || is_unchivalric_attack(attacker, this)
           || is_good_god(you.religion)
               && is_follower(this))

[11.2667]

[13.3473]

        || mons_is_holy(this)
        || mons_neutral(this)
        || is_unchivalric_attack(attacker, this)
        || is_good_god(you.religion) && is_follower(this))

Insertion in crawl-ref/source/fight.h at line 37 [5.3139131]
[14.2746]
[15.3283]
```
    UCAT_PETRIFIED,
```

Replacement in crawl-ref/source/fight.cc at line 273 [5.3140790]

B:BD[3.7523] → [3.7523:7630]

    if (attacker && attacker->atype() == ACT_PLAYER && def->foe != MHITYOU
        && !mons_is_batty(def))

[3.7523]

[15.4067]

    if (attacker && attacker->atype() == ACT_PLAYER
        && def && def->foe != MHITYOU && !mons_is_batty(def))

Replacement in crawl-ref/source/fight.cc at line 280 [5.3140790]
B:BD[3.7718] → [3.7718:7756]
```
    if (def->has_ench(ENCH_CONFUSION)
```
[3.7718]
[3.7756]
```
    if (def
        && def->has_ench(ENCH_CONFUSION)
```
Replacement in crawl-ref/source/fight.cc at line 288 [5.3140790]
B:BD[3.7873] → [3.7873:7903]
```
    if (mons_is_fleeing(def))
```
[3.7873]
[3.7903]
```
    if (def && mons_is_fleeing(def))
```
Replacement in crawl-ref/source/fight.cc at line 296 [5.3140790]
B:BD[3.8070] → [3.8070:8099]
```
    if (mons_is_caught(def))
```
[3.8070]
[3.8099]
```
    if (def && mons_is_caught(def))
```
Replacement in crawl-ref/source/fight.cc at line 300 [5.3140790]
B:BD[3.8158] → [3.8158:8191]
```
    if (mons_is_petrifying(def))
```
[3.8158]
[3.8191]
```
    if (def && mons_is_petrifying(def))
```

Insertion in crawl-ref/source/fight.cc at line 303 [5.3140790]

[15.4514]

[3.8231]

    // petrified
    if (def && mons_is_petrified(def))
        unchivalric = UCAT_PETRIFIED;

Replacement in crawl-ref/source/fight.cc at line 308 [5.3140790]
B:BD[3.8248] → [3.8248:8275]
```
    if (def->cannot_act())
```
[3.8248]
[3.8275]
```
    if (defender->paralysed())
```
Replacement in crawl-ref/source/fight.cc at line 312 [5.3140790]
B:BD[3.8330] → [3.8330:8361]
```
    if (mons_is_sleeping(def))
```
[3.8330]
[3.8361]
```
    if (defender->asleep())
```

Replacement in crawl-ref/source/fight.cc at line 3569 [5.3140790]

B:BD[16.73485] → [17.12211:12292]

    unchivalric_attack_type unchivalric = is_unchivalric_attack(&you, defender);

[16.73485]

[15.5015]

    const unchivalric_attack_type uat = is_unchivalric_attack(&you, defender);
    stab_attempt = (uat != UCAT_NO_ATTACK);
    const bool roll_needed = (uat != UCAT_SLEEPING && uat != UCAT_PARALYSED);

Deletion in crawl-ref/source/fight.cc at line 3573 [5.3140790]
∅:D[18.3088] → [16.73485:73514]
∅:D[15.5016] → [16.73485:73514]
B:BD[16.73485] → [16.73485:73514]
```
    bool roll_needed = true;
```

Insertion in crawl-ref/source/fight.cc at line 3574 [5.3140790]

[19.3300]

[5.3192929]

    if (uat == UCAT_INVISIBLE && !mons_sense_invis(defender_as_monster()))
        roll -= 15;

Replacement in crawl-ref/source/fight.cc at line 3577 [5.3140790]
B:BD[5.3192930] → [20.11870:11905]
∅:D[20.11905] → [15.5017:5042]
B:BD[5.3192930] → [15.5017:5042]
```
    // This ordering is important!
    switch (unchivalric)
```
[5.3192930]
[16.73658]
```
    switch (uat)
```
Replacement in crawl-ref/source/fight.cc at line 3579 [5.3140790]
B:BD[16.73664] → [15.5043:5111]
B:BD[15.5111] → [21.7008:7034]
∅:D[21.7034] → [15.5135:5177]
B:BD[15.5135] → [15.5135:5177]
∅:D[15.5177] → [16.73664:73693]
B:BD[16.73664] → [16.73664:73693]
B:BD[16.73693] → [21.7035:7061]
∅:D[21.7061] → [15.5178:5193]
B:BD[16.73717] → [15.5178:5193]
∅:D[15.5193] → [5.3193130:3193131]
∅:D[16.73723] → [5.3193130:3193131]
B:BD[5.3193130] → [5.3193130:3193131]
B:BD[5.3193131] → [15.5194:5241]
∅:D[15.5241] → [16.73867:73896]
B:BD[16.73867] → [16.73867:73896]
B:BD[16.73896] → [21.7062:7088]
∅:D[21.7088] → [15.5242:5257]
B:BD[16.73920] → [15.5242:5257]
∅:D[15.5257] → [5.3193655:3193656]
∅:D[16.73926] → [5.3193655:3193656]
B:BD[5.3193655] → [5.3193655:3193656]
B:BD[5.3193656] → [15.5258:5283]
∅:D[15.5283] → [22.384:413]
B:BD[22.384] → [22.384:413]
B:BD[22.413] → [21.7089:7115]
B:BD[21.7115] → [17.12293:12347]
∅:D[17.12347] → [23.298:322]
B:BD[24.389] → [23.298:322]
B:BD[24.437] → [15.5284:5299]
∅:D[15.5299] → [22.509:510]
B:BD[22.509] → [22.509:510]
```
    default:
    case UCAT_NO_ATTACK:
        stab_attempt = false;
        stab_bonus   = 0;
        break;
    case UCAT_DISTRACTED:
        stab_attempt = true;
        stab_bonus   = 3;
        break;
    case UCAT_CONFUSED:
    case UCAT_FLEEING:
        stab_attempt = true;
        stab_bonus   = 2;
        break;
    case UCAT_INVISIBLE:
        stab_attempt = true;
        stab_bonus   = 2;
        if (!mons_sense_invis(defender_as_monster()))
            roll -= 15;
        break;
```
[16.73664]
[25.3822]
```
    case UCAT_NO_ATTACK:  stab_bonus = 0; break;
```
Insertion in crawl-ref/source/fight.cc at line 3582 [5.3140790]
[2.2752]
[15.5324]
```
    case UCAT_PETRIFIED:
    case UCAT_SLEEPING:
```
Replacement in crawl-ref/source/fight.cc at line 3585 [5.3140790]
∅:D[15.5349] → [26.2771:2800]
B:BD[26.2771] → [26.2771:2800]
B:BD[26.2800] → [21.7116:7142]
```
        stab_attempt = true;
        stab_bonus   = 1;
```
[15.5349]
[15.5350]
```
        stab_bonus = 1;
```
Replacement in crawl-ref/source/fight.cc at line 3587 [5.3140790]
∅:D[15.5365] → [26.2830:2831]
B:BD[26.2830] → [26.2830:2831]
B:BD[26.2831] → [15.5366:5390]
∅:D[15.5390] → [16.74103:74161]
B:BD[16.74103] → [16.74103:74161]
B:BD[16.74161] → [21.7143:7168]
```
    case UCAT_SLEEPING:
        stab_attempt = true;
        roll_needed = false;
        stab_bonus  = 1;
```
[15.5365]
[15.5391]
```
    case UCAT_INVISIBLE:
    case UCAT_CONFUSED:
    case UCAT_FLEEING:
        stab_bonus = 2;
```
Insertion in crawl-ref/source/fight.cc at line 3592 [5.3140790]
[15.5406]
[16.74185]
```
    case UCAT_DISTRACTED: stab_bonus = 3; break;
```

Make paralysed creatures auto-stabbable and brand them appropriately.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 2671 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2674 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2679 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2682 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5847 [5.1699344]

Insertion in crawl-ref/source/fight.h at line 37 [5.3139131]

Replacement in crawl-ref/source/fight.cc at line 273 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 280 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 288 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 296 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 300 [5.3140790]

Insertion in crawl-ref/source/fight.cc at line 303 [5.3140790]

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

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

Replacement in crawl-ref/source/fight.cc at line 3569 [5.3140790]

Deletion in crawl-ref/source/fight.cc at line 3573 [5.3140790]

Insertion in crawl-ref/source/fight.cc at line 3574 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 3577 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 3579 [5.3140790]

Insertion in crawl-ref/source/fight.cc at line 3582 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 3585 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 3587 [5.3140790]

Insertion in crawl-ref/source/fight.cc at line 3592 [5.3140790]