fiddlerwoaroof/crawl - Change ZI7643NG3LOKVSDXHFNV2YU3ZIQUVEY25AOXZCPBXJB5SQAUCE6QC

Consolidate the setting of the "standard" attack conducts.

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

Created by dolorous on May 25, 2008

ZI7643NG3LOKVSDXHFNV2YU3ZIQUVEY25AOXZCPBXJB5SQAUCE6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 211 [4.531613]

B:BD[3.168] → [2.228:300]

        success = !stop_attack_prompt(monster, false, false, &conduct);

[3.168]

[5.187]

        success = !stop_attack_prompt(monster, false, false);

Insertion in crawl-ref/source/spells3.cc at line 215 [4.531613]
[2.332]
[2.332]
```
            set_attack_conduct(monster, conduct);
```

Replacement in crawl-ref/source/spells3.cc at line 254 [4.531613]

B:BD[4.538270] → [2.1046:1118]

        success = !stop_attack_prompt(monster, false, false, &conduct);

[4.538270]

[6.167]

        success = !stop_attack_prompt(monster, false, false);

Insertion in crawl-ref/source/spells3.cc at line 258 [4.531613]
[7.778]
[2.1141]
```
            set_attack_conduct(monster, conduct);
```

Replacement in crawl-ref/source/spells2.cc at line 1195 [4.569242]

B:BD[4.597539] → [2.1799:1872]

    bool success = !stop_attack_prompt(monster, false, false, &conduct);

[4.597539]

[8.336]

    bool success = !stop_attack_prompt(monster, false, false);

Insertion in crawl-ref/source/spells2.cc at line 1199 [4.569242]
[9.191]
[2.1891]
```
        set_attack_conduct(monster, conduct);
```

Replacement in crawl-ref/source/misc.h at line 150 [4.1928926]

B:BD[2.5124] → [2.5124:5204]

                        bool beam_target, god_conduct_trigger *conduct = NULL);

[2.5124]

[10.10009]

                        bool beam_target);
void set_attack_conduct(const monsters *mon, god_conduct_trigger& conduct,
                        bool known = true);

Replacement in crawl-ref/source/misc.cc at line 3003 [4.1933596]

B:BD[2.5290] → [2.5290:5362]

                        bool beam_target, god_conduct_trigger *conduct)

[2.5290]

[2.5362]

                        bool beam_target)

Deletion in crawl-ref/source/misc.cc at line 3005 [4.1933596]
B:BD[2.5364] → [2.5364:5389]
```
    bool retval = false;
```

Replacement in crawl-ref/source/misc.cc at line 3051 [4.1933596]

B:BD[2.7376] → [2.7376:7663]

    if (you.confused() || (prompt && yesno(info, false, 'n')))
    {
        if (conduct)
        {
            if (isFriendly)
                conduct->set(DID_ATTACK_FRIEND, 5, true, mon);
            else if (isNeutral)
                conduct->set(DID_ATTACK_NEUTRAL, 5, true, mon);

[2.7376]

[2.7663]

    return (!you.confused() && (!prompt || yesno(info, false, 'n')));
}

Replacement in crawl-ref/source/misc.cc at line 3054 [4.1933596]

B:BD[2.7664] → [2.7664:7763]

            if (isUnchivalric)
                conduct->set(DID_UNCHIVALRIC_ATTACK, 4, true, mon);

[2.7664]

[2.7763]

void set_attack_conduct(const monsters *mon, god_conduct_trigger& conduct,
                        bool known)
{
    if (mons_friendly(mon))
        conduct.set(DID_ATTACK_FRIEND, 5, known, mon);
    else if (mons_neutral(mon))
        conduct.set(DID_ATTACK_NEUTRAL, 5, known, mon);

Replacement in crawl-ref/source/misc.cc at line 3062 [4.1933596]

B:BD[2.7764] → [2.7764:7909]

            if (isHoly)
                conduct->set(DID_ATTACK_HOLY, mon->hit_dice, true, mon);
        }
    }
    else
        retval = true;

[2.7764]

[2.7909]

    if (is_unchivalric_attack(&you, mon, mon))
        conduct.set(DID_UNCHIVALRIC_ATTACK, 4, known, mon);

Replacement in crawl-ref/source/misc.cc at line 3065 [4.1933596]

B:BD[2.7910] → [2.7910:7929]

    return retval;

[2.7910]

[2.7929]

    if (mons_is_holy(mon))
        conduct.set(DID_ATTACK_HOLY, mon->hit_dice, known, mon);

Replacement in crawl-ref/source/fight.cc at line 609 [4.3140790]

B:BD[11.2702] → [2.8013:8086]

        cancel_attack = stop_attack_prompt(def, false, false, &conduct);

[11.2702]

[11.4071]

    {
        if (!stop_attack_prompt(def, false, false))
            set_attack_conduct(def, conduct);
        else
            cancel_attack = true;
    }

Replacement in crawl-ref/source/beam.cc at line 4489 [4.4128068]
∅:D[12.913] → [13.1249487:1249523]
∅:D[14.3387] → [13.1249487:1249523]
∅:D[15.4884] → [13.1249487:1249523]
∅:D[16.18443] → [13.1249487:1249523]
B:BD[4.4238975] → [13.1249487:1249523]
B:BD[13.1249523] → [17.3859:3922]
B:BD[17.3922] → [18.2962:3002]
∅:D[18.3002] → [17.3967:4031]
B:BD[17.3967] → [17.3967:4031]
B:BD[17.4031] → [5.5940:5996]
B:BD[5.5996] → [19.3186:3254]
∅:D[12.983] → [13.1249580:1249581]
∅:D[20.1378] → [13.1249580:1249581]
∅:D[19.3254] → [13.1249580:1249581]
∅:D[21.3785] → [13.1249580:1249581]
∅:D[17.4031] → [13.1249580:1249581]
∅:D[22.4356] → [13.1249580:1249581]
∅:D[15.4950] → [13.1249580:1249581]
∅:D[5.6064] → [13.1249580:1249581]
∅:D[23.6730] → [13.1249580:1249581]
B:BD[13.1249580] → [13.1249580:1249581]
B:BD[13.1249581] → [14.3388:3423]
B:BD[14.3423] → [5.6065:6138]
```
            if (mons_friendly(mon))
                conduct.set(DID_ATTACK_FRIEND, 5, !okay, mon);
            else if (mons_neutral(mon))
                conduct.set(DID_ATTACK_NEUTRAL, 5, !okay, mon);
            if (is_unchivalric_attack(&you, mon, mon))
                conduct.set(DID_UNCHIVALRIC_ATTACK, 4, !okay, mon);
            if (mons_is_holy(mon))
                conduct.set(DID_ATTACK_HOLY, mon->hit_dice, !okay, mon);
```
[14.3387]
[4.4239223]
```
            set_attack_conduct(mon, conduct, !okay);
```
Replacement in crawl-ref/source/beam.cc at line 5468 [4.4128068]
B:BD[4.4259942] → [4.4259942:4259993]
```
        return (!mons_res_negative_energy( mon ));
```
[4.4259942]
[4.4259993]
```
        return (!mons_res_negative_energy(mon));
```