fiddlerwoaroof/crawl - Change QCSLMPAVJIRPFKQRPQH2KGKHEWMVD3PD3EFEC3P5QM4Y5TMTDYMQC

For TSO, change the "stabbing" conduct to an "unchivalrous attack"

conduct, and exercise it on every stabbing attempt, whether it succeeds or not (and also whether the player is berserk or not, since a berserk player trying to stab seems unchivalrous to me).

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

Created by dolorous on May 16, 2008

QCSLMPAVJIRPFKQRPQH2KGKHEWMVD3PD3EFEC3P5QM4Y5TMTDYMQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.h at line 76 [9.800304]
B:BD[8.215] → [8.215:261]
```
bool tso_stab_safe_monster(const actor *act);
```
[10.193]
[2.2592]
```
bool tso_unchivalric_attack_safe_monster(const actor *act);
```
Replacement in crawl-ref/source/religion.cc at line 1896 [9.804403]
B:BD[11.182336] → [11.182336:182359]
```
    case DID_STABBING:
```
[11.182336]
[11.182359]
```
    case DID_UNCHIVALRIC_ATTACK:
```

Replacement in crawl-ref/source/religion.cc at line 2376 [9.804403]

B:BD[3.3323] → [3.3323:3402]

∅:D[3.3402] → [11.189856:189931]

B:BD[11.189856] → [11.189856:189931]

B:BD[11.189931] → [12.2505:2571]

B:BD[12.2571] → [3.3403:3532]

          "Attack Friend", "Friend Died", "Stab", "Poison", "Field Sacrifice",
          "Kill Living", "Kill Undead", "Kill Demon", "Kill Natural Evil",
          "Kill Mutator Or Rotter", "Kill Wizard", "Kill Priest",
          "Kill Holy", "Undead Slave Kill Living", "Servant Kill Living",
          "Servant Kill Undead", "Servant Kill Demon",

[3.3323]

[3.3532]

          "Attack Friend", "Friend Died", "Unchivalric Attack", "Poison",
          "Field Sacrifice", "Kill Living", "Kill Undead", "Kill Demon",
          "Kill Natural Evil", "Kill Mutator Or Rotter", "Kill Wizard",
          "Kill Priest", "Kill Holy", "Undead Slave Kill Living",
          "Servant Kill Living", "Servant Kill Undead", "Servant Kill Demon",

Replacement in crawl-ref/source/religion.cc at line 5359 [9.804403]

B:BD[8.265] → [7.2528:2595]

∅:D[7.2595] → [13.2591:2604]

B:BD[13.2591] → [13.2591:2604]

∅:D[13.2604] → [8.341:386]

B:BD[8.341] → [8.341:386]

// Returns true if the Shining One doesn't mind your stabbing this
// creature.
bool tso_stab_safe_monster(const actor *act)

[8.265]

[8.386]

// Returns true if the Shining One doesn't mind your using unchivalric
// attacks on this creature.
bool tso_unchivalric_attack_safe_monster(const actor *act)

Deletion in crawl-ref/source/fight.cc at line 1427 [9.3140790]
B:BD[14.48689] → [8.1243:1290]
∅:D[8.1290] → [14.48799:48845]
B:BD[14.48799] → [14.48799:48845]
```
        if (!tso_stab_safe_monster(defender))
            did_god_conduct(DID_STABBING, 4);
```
Replacement in crawl-ref/source/fight.cc at line 2776 [9.3140790]
B:BD[14.73514] → [15.276:297]
```
    int  roll = 155;
```
[14.73514]
[14.73514]
```
    int roll = 155;
```
Deletion in crawl-ref/source/fight.cc at line 2830 [9.3140790]
B:BD[4.2767] → [4.2767:2833]
∅:D[16.232] → [9.3194436:3194437]
∅:D[17.515] → [9.3194436:3194437]
∅:D[4.2833] → [9.3194436:3194437]
∅:D[14.74459] → [9.3194436:3194437]
B:BD[9.3194436] → [9.3194436:3194437]
B:BD[9.3194437] → [6.2668:2735]
```
    {
        stab_attempt = false;
        stab_bonus = 0;
    }
    // no stabs while berserk
    if (you.duration[DUR_BERSERKER])
```

Replacement in crawl-ref/source/fight.cc at line 2840 [9.3140790]

B:BD[5.2836] → [5.2836:2882]

            (!tso_stab_safe_monster(defender)

[5.2836]

[5.2882]

            (!tso_unchivalric_attack_safe_monster(defender)

Replacement in crawl-ref/source/fight.cc at line 2845 [9.3140790]
B:BD[18.410] → [18.410:445]
```
            stab_attempt  = false;
```
[18.410]
[18.445]
```
            stab_attempt = false;
```

Insertion in crawl-ref/source/fight.cc at line 2848 [9.3140790]

[18.489]

        else
            did_god_conduct(DID_UNCHIVALRIC_ATTACK, 4);

Replacement in crawl-ref/source/enum.h at line 640 [9.3287960]
B:BD[11.908338] → [11.908338:908356]
```
    DID_STABBING,
```
[11.908338]
[11.908356]
```
    DID_UNCHIVALRIC_ATTACK,
```

For TSO, change the "stabbing" conduct to an "unchivalrous attack"

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.h at line 76 [9.800304]

Replacement in crawl-ref/source/religion.cc at line 1896 [9.804403]

Replacement in crawl-ref/source/religion.cc at line 2376 [9.804403]

Replacement in crawl-ref/source/religion.cc at line 5359 [9.804403]

Deletion in crawl-ref/source/fight.cc at line 1427 [9.3140790]

Replacement in crawl-ref/source/fight.cc at line 2776 [9.3140790]

Deletion in crawl-ref/source/fight.cc at line 2830 [9.3140790]

Replacement in crawl-ref/source/fight.cc at line 2840 [9.3140790]

Replacement in crawl-ref/source/fight.cc at line 2845 [9.3140790]

Insertion in crawl-ref/source/fight.cc at line 2848 [9.3140790]

Replacement in crawl-ref/source/enum.h at line 640 [9.3287960]