fiddlerwoaroof/crawl - Change IGN3Q5YCLHXKWFZQRSRABCHW2JFW5TFVU7TM5EXE2EW7PDBBSQWAC

Consolidate the attack warning prompts for both melee and beams, and use

the prompts properly with Burn/Freeze, Smite, and Airstrike. Also, move the now-single function for this into misc.cc, since I can't think of a better location right now.

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

Created by dolorous on May 25, 2008

IGN3Q5YCLHXKWFZQRSRABCHW2JFW5TFVU7TM5EXE2EW7PDBBSQWAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells3.cc at line 34 [7.531613]
B:BD[5.242] → [6.167:186]
```
#include "fight.h"
```
Replacement in crawl-ref/source/spells3.cc at line 202 [7.531613]
B:BD[7.536995] → [8.146851:146897]
∅:D[8.146897] → [7.537066:537094]
B:BD[7.537066] → [7.537066:537094]
```
    if (mgrd[beam.tx][beam.ty] == NON_MONSTER
        || beam.isMe)
    {
```
[7.536995]
[7.537094]
```
    if (mgrd[beam.tx][beam.ty] == NON_MONSTER || beam.isMe)
```
Deletion in crawl-ref/source/spells3.cc at line 204 [7.531613]
B:BD[7.537133] → [7.537133:537139]
```
    }
```
Deletion in crawl-ref/source/spells3.cc at line 208 [7.531613]
B:BD[7.537204] → [9.702:772]
∅:D[10.104] → [7.537346:537347]
∅:D[11.220] → [7.537346:537347]
∅:D[12.221] → [7.537346:537347]
∅:D[9.772] → [7.537346:537347]
∅:D[13.827] → [7.537346:537347]
B:BD[7.537346] → [7.537346:537347]
```
        mprf("You smite %s!", monster->name(DESC_NOCAP_THE).c_str());
```

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

B:BD[14.168] → [14.168:204]

B:BD[14.204] → [15.298:360]

∅:D[15.360] → [16.167:207]

B:BD[14.270] → [16.167:207]

B:BD[16.207] → [15.361:424]

        if (mons_friendly(monster))
            conduct.set(DID_ATTACK_FRIEND, 5, true, monster);
        else if (mons_neutral(monster))
            conduct.set(DID_ATTACK_NEUTRAL, 5, true, monster);

[14.168]

[6.187]

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

Replacement in crawl-ref/source/spells3.cc at line 213 [7.531613]

B:BD[6.188] → [6.188:247]

B:BD[6.247] → [17.167:234]

∅:D[17.234] → [18.167:203]

∅:D[19.281] → [18.167:203]

∅:D[6.318] → [18.167:203]

∅:D[15.492] → [18.167:203]

B:BD[20.274] → [18.167:203]

B:BD[18.203] → [15.493:569]

        if (is_unchivalric_attack(&you, monster, monster))
            conduct.set(DID_UNCHIVALRIC_ATTACK, 4, true, monster);
        if (mons_is_holy(monster))
            conduct.set(DID_ATTACK_HOLY, monster->hit_dice, true, monster);

[6.188]

[21.167]

        if (success)
        {
            mprf("You smite %s!", monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells3.cc at line 217 [7.531613]

B:BD[21.168] → [21.168:221]

        behaviour_event(monster, ME_ANNOY, MHITYOU);

[21.168]

[15.570]

            behaviour_event(monster, ME_ANNOY, MHITYOU);
        }

Replacement in crawl-ref/source/spells3.cc at line 222 [7.531613]

B:BD[7.537414] → [15.604:825]

∅:D[15.825] → [7.537414:537511]

B:BD[7.537414] → [7.537414:537511]

B:BD[7.537511] → [15.826:861]

        // Maxes out at around 40 damage at 27 Invocations, which is plenty
        // in my book (the old max damage was around 70, which seems excessive)
        hurt_monster(monster, 7 + (random2(power) * 33 / 191));
        if (monster->hit_points < 1)
            monster_die(monster, KILL_YOU, 0);
        else
            print_wounds(monster);

[7.537414]

[7.537546]

        if (success)
        {
            // Maxes out at around 40 damage at 27 Invocations, which is
            // plenty in my book (the old max damage was around 70,
            // which seems excessive).
            hurt_monster(monster, 7 + (random2(power) * 33 / 191));

Replacement in crawl-ref/source/spells3.cc at line 229 [7.531613]

B:BD[7.537547] → [7.537547:537571]

        success = true;

[7.537547]

[7.537571]

            if (monster->hit_points < 1)
                monster_die(monster, KILL_YOU, 0);
            else
                print_wounds(monster);
        }

Replacement in crawl-ref/source/spells3.cc at line 243 [7.531613]
B:BD[7.537894] → [8.147064:147110]
∅:D[8.147110] → [7.537965:537993]
B:BD[7.537965] → [7.537965:537993]
```
    if (mgrd[beam.tx][beam.ty] == NON_MONSTER
        || beam.isMe)
    {
```
[7.537806]
[7.537993]
```
    if (mgrd[beam.tx][beam.ty] == NON_MONSTER || beam.isMe)
```
Deletion in crawl-ref/source/spells3.cc at line 245 [7.531613]
B:BD[7.538032] → [7.538032:538038]
```
    }
```

Replacement in crawl-ref/source/spells3.cc at line 249 [7.531613]

B:BD[7.538103] → [10.326:380]

B:BD[10.380] → [9.854:907]

        mprf("The air twists around and strikes %s!",
             monster->name(DESC_NOCAP_THE).c_str());

[7.538103]

[7.538269]

        god_conduct_trigger conduct;
        conduct.enabled = false;

Replacement in crawl-ref/source/spells3.cc at line 252 [7.531613]

B:BD[7.538270] → [15.922:1050]

        int hurted = 8 + random2( random2(4) + (random2(power) / 6)
                                  + (random2(power) / 7) );

[7.538270]

[22.167]

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

Replacement in crawl-ref/source/spells3.cc at line 254 [7.531613]
∅:D[22.168] → [23.733:768]
B:BD[23.733] → [23.733:768]
```
        if ( mons_flies(monster) )
```
[22.168]
[23.768]
```
        if (success)
```

Replacement in crawl-ref/source/spells3.cc at line 256 [7.531613]

B:BD[23.778] → [23.778:838]

            hurted *= 3;
            hurted /= 2;
        }

[23.778]

[7.538449]

            mprf("The air twists around and strikes %s!",
                 monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells3.cc at line 259 [7.531613]

B:BD[7.538450] → [10.554:598]

        hurted -= random2(1 + monster->ac);

[7.538450]

[22.169]

            behaviour_event(monster, ME_ANNOY, MHITYOU);
        }

Replacement in crawl-ref/source/spells3.cc at line 262 [7.531613]
∅:D[22.170] → [7.538450:538498]
∅:D[10.607] → [7.538450:538498]
B:BD[7.538450] → [7.538450:538498]
```
        if (hurted < 0)
            hurted = 0;
```
[22.170]
[15.1051]
```
        conduct.enabled = true;
```
Replacement in crawl-ref/source/spells3.cc at line 264 [7.531613]
B:BD[15.1052] → [15.1052:1072]
```
        if (hurted)
```
[15.1052]
[7.538511]
```
        if (success)
```

Replacement in crawl-ref/source/spells3.cc at line 266 [7.531613]

B:BD[7.538521] → [15.1073:1151]

∅:D[15.1151] → [14.272:313]

B:BD[7.538564] → [14.272:313]

B:BD[14.313] → [15.1152:1218]

∅:D[15.1218] → [16.208:252]

B:BD[14.383] → [16.208:252]

B:BD[16.252] → [15.1219:1286]

∅:D[20.390] → [14.383:384]

∅:D[19.412] → [14.383:384]

∅:D[15.1286] → [14.383:384]

B:BD[14.383] → [14.383:384]

B:BD[14.384] → [6.319:382]

B:BD[6.382] → [15.1287:1358]

            god_conduct_trigger conduct;
            conduct.enabled = false;
            if (mons_friendly(monster))
                conduct.set(DID_ATTACK_FRIEND, 5, true, monster);
            else if (mons_neutral(monster))
                conduct.set(DID_ATTACK_NEUTRAL, 5, true, monster);
            if (is_unchivalric_attack(&you, monster, monster))
                conduct.set(DID_UNCHIVALRIC_ATTACK, 5, true, monster);

[7.538521]

[6.457]

            int hurted = 8 + random2(random2(4) + (random2(power) / 6)
                           + (random2(power) / 7));

Replacement in crawl-ref/source/spells3.cc at line 269 [7.531613]

∅:D[6.458] → [18.284:323]

B:BD[14.384] → [18.284:323]

B:BD[18.323] → [15.1359:1439]

            if (mons_is_holy(monster))
                conduct.set(DID_ATTACK_HOLY, monster->hit_dice, true, monster);

[6.458]

[21.222]

            if (mons_flies(monster))
            {
                hurted *= 3;
                hurted /= 2;
            }

Replacement in crawl-ref/source/spells3.cc at line 275 [7.531613]

B:BD[21.223] → [21.223:280]

            behaviour_event(monster, ME_ANNOY, MHITYOU);

[21.223]

[15.1440]

            hurted -= random2(1 + monster->ac);

Replacement in crawl-ref/source/spells3.cc at line 277 [7.531613]

B:BD[15.1441] → [15.1441:1477]

            conduct.enabled = true;

[15.1441]

[18.407]

            if (hurted < 0)
                hurted = 0;

Deletion in crawl-ref/source/spells3.cc at line 287 [7.531613]
B:BD[7.538723] → [7.538723:538748]
```
        success = true;
```
Deletion in crawl-ref/source/spells2.cc at line 38 [7.569242]
B:BD[7.570207] → [6.461:480]
```
#include "fight.h"
```
Deletion in crawl-ref/source/spells2.cc at line 1191 [7.569242]
∅:D[15.1561] → [7.597001:597002]
B:BD[7.597001] → [7.597001:597002]
B:BD[7.597002] → [24.7089:7363]
B:BD[24.7363] → [9.1138:1187]
∅:D[9.1187] → [7.597438:597439]
∅:D[13.1283] → [7.597438:597439]
∅:D[24.7411] → [7.597438:597439]
B:BD[7.597438] → [7.597438:597439]
B:BD[7.597439] → [20.393:439]
∅:D[20.439] → [7.597486:597487]
B:BD[7.597486] → [7.597486:597487]
B:BD[7.597487] → [9.1188:1203]
```
    mprf("You %s %s.",
         (flavour == BEAM_FIRE)        ? "burn" :
         (flavour == BEAM_COLD)        ? "freeze" :
         (flavour == BEAM_MISSILE)     ? "crush" :
         (flavour == BEAM_ELECTRICITY) ? "zap"
                                       : "______",
         monster->name(DESC_NOCAP_THE).c_str());
    int hurted = roll_dice( 1, 3 + pow / 3 );
    bolt beam;
```
Replacement in crawl-ref/source/spells2.cc at line 1192 [7.569242]
B:BD[7.597510] → [7.597510:597538]
```
    beam.flavour = flavour;
```
[7.597510]
[7.597538]
```
    god_conduct_trigger conduct;
    conduct.enabled = false;
```

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

B:BD[7.597539] → [7.597539:597635]

    if (flavour != BEAM_MISSILE)
        hurted = mons_adjust_flavoured(monster, beam, hurted);

[7.597539]

[12.336]

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

Replacement in crawl-ref/source/spells2.cc at line 1197 [7.569242]
B:BD[12.337] → [25.169:185]
```
    if (hurted)
```
[12.337]
[25.185]
```
    if (success)
```

Replacement in crawl-ref/source/spells2.cc at line 1199 [7.569242]

B:BD[25.191] → [15.1562:1632]

        god_conduct_trigger conduct;
        conduct.enabled = false;

[25.191]

[15.1632]

        mprf("You %s %s.",
             (flavour == BEAM_FIRE)        ? "burn" :
             (flavour == BEAM_COLD)        ? "freeze" :
             (flavour == BEAM_MISSILE)     ? "crush" :
             (flavour == BEAM_ELECTRICITY) ? "zap"
                                           : "______",
             monster->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells2.cc at line 1207 [7.569242]

∅:D[15.1633] → [25.191:227]

B:BD[25.191] → [25.191:227]

B:BD[25.227] → [15.1634:1696]

∅:D[15.1696] → [25.293:333]

B:BD[25.293] → [25.293:333]

B:BD[25.333] → [15.1697:1760]

        if (mons_friendly(monster))
            conduct.set(DID_ATTACK_FRIEND, 5, true, monster);
        else if (mons_neutral(monster))
            conduct.set(DID_ATTACK_NEUTRAL, 5, true, monster);

[15.1633]

[6.481]

        behaviour_event(monster, ME_ANNOY, MHITYOU);
    }

Replacement in crawl-ref/source/spells2.cc at line 1210 [7.569242]

B:BD[6.482] → [25.401:460]

B:BD[25.460] → [17.237:304]

        if (is_unchivalric_attack(&you, monster, monster))
            conduct.set(DID_UNCHIVALRIC_ATTACK, 4, true, monster);

[6.482]

[20.551]

    conduct.enabled = true;

Replacement in crawl-ref/source/spells2.cc at line 1212 [7.569242]

B:BD[20.552] → [25.532:567]

B:BD[25.567] → [15.1829:1890]

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

[20.552]

[26.169]

    if (success)
    {
        bolt beam;
        beam.flavour = flavour;

Replacement in crawl-ref/source/spells2.cc at line 1217 [7.569242]

B:BD[26.170] → [25.633:686]

        behaviour_event(monster, ME_ANNOY, MHITYOU);

[26.170]

[15.1891]

        int hurted = roll_dice(1, 3 + pow / 3);

Replacement in crawl-ref/source/spells2.cc at line 1219 [7.569242]

B:BD[15.1892] → [15.1892:1924]

        conduct.enabled = true;

[15.1892]

[27.257]

        if (flavour != BEAM_MISSILE)
            hurted = mons_adjust_flavoured(monster, beam, hurted);

Replacement in crawl-ref/source/spells2.cc at line 1232 [7.569242]

B:BD[7.597893] → [27.380:447]

                if (mons_class_flag( monster->type, M_COLD_BLOOD )

[7.597893]

[27.447]

                if (mons_class_flag(monster->type, M_COLD_BLOOD)

Insertion in crawl-ref/source/misc.h at line 17 [7.1928926]
[7.1929186]
[28.72100]
```
#include "religion.h"
```

Insertion in crawl-ref/source/misc.h at line 148 [7.1928926]

[2.2635]

[29.10009]


bool stop_attack_prompt(const monsters *mon, bool beam_attack,
                        bool beam_target, god_conduct_trigger *conduct = NULL);

Insertion in crawl-ref/source/misc.cc at line 52 [7.1933596]
[28.72232]
[7.1934219]
```
#include "fight.h"
```

Insertion in crawl-ref/source/misc.cc at line 3001 [7.1933596]

[2.3574]


bool stop_attack_prompt(const monsters *mon, bool beam_attack,
                        bool beam_target, god_conduct_trigger *conduct)
{
    bool retval = false;
    bool prompt = false;
    const bool inSanctuary   = (is_sanctuary(you.x_pos, you.y_pos)
                                 || is_sanctuary(mon->x, mon->y));
    const bool wontAttack    = mons_wont_attack(mon);
    const bool isFriendly    = mons_friendly(mon);
    const bool isNeutral     = mons_neutral(mon);
    const bool isUnchivalric = is_unchivalric_attack(&you, mon, mon);
    const bool isHoly        = mons_is_holy(mon);
    if (isFriendly)
    {
        // listed in the form: "your rat", "Blork"
        snprintf(info, INFO_SIZE, "Really %s %s%s?",
                 (beam_attack) ? (beam_target) ? "fire at"
                                               : "fire through"
                               : "attack",
                 mon->name(DESC_NOCAP_THE).c_str(),
                 (inSanctuary) ? ", despite your sanctuary"
                               : "");
        prompt = true;
    }
    else if (inSanctuary || wontAttack
        || (is_good_god(you.religion) && (isNeutral || isHoly))
        || (you.religion == GOD_SHINING_ONE && isUnchivalric))
    {
        // "Really fire through the helpless neutral holy Daeva?"
        // was: "Really fire through this helpless neutral holy creature?"
        snprintf(info, INFO_SIZE, "Really %s the %s%s%s%s%s?",
                 (beam_attack) ? (beam_target) ? "fire at"
                                               : "fire through"
                               : "attack",
                 (isUnchivalric) ? "helpless "
                                 : "",
                 (isFriendly)    ? "friendly " :
                 (wontAttack)    ? "non-hostile " :
                 (isNeutral)     ? "neutral "
                                 : "",
                 (isHoly)        ? "holy "
                                 : "",
                 mon->name(DESC_PLAIN).c_str(),
                 (inSanctuary)   ? ", despite your sanctuary"
                                 : "");
        prompt = true;
    }
    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);
            if (isUnchivalric)
                conduct->set(DID_UNCHIVALRIC_ATTACK, 4, true, mon);
            if (isHoly)
                conduct->set(DID_ATTACK_HOLY, mon->hit_dice, true, mon);
        }
    }
    else
        retval = true;
    return retval;
}

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

∅:D[30.2702] → [31.3186:3192]

B:BD[31.3186] → [31.3186:3192]

B:BD[31.3192] → [32.2661:2732]

B:BD[32.2732] → [4.2661:2899]

∅:D[4.2899] → [30.2860:2934]

B:BD[30.2860] → [30.2860:2934]

B:BD[30.2934] → [4.2900:2954]

∅:D[4.2954] → [17.2797:2798]

∅:D[30.2981] → [17.2797:2798]

B:BD[31.3377] → [17.2797:2798]

B:BD[17.2798] → [32.2806:2844]

∅:D[32.2844] → [30.3005:3150]

B:BD[30.3005] → [30.3005:3150]

B:BD[30.3150] → [32.2845:2916]

∅:D[33.2737] → [34.2738:2866]

∅:D[32.2916] → [34.2738:2866]

B:BD[34.2738] → [34.2738:2866]

∅:D[34.2866] → [30.3225:3368]

B:BD[30.3225] → [30.3225:3368]

B:BD[30.3368] → [34.2867:2934]

∅:D[34.2934] → [30.3505:3565]

B:BD[30.3505] → [30.3505:3565]

B:BD[30.3565] → [33.2738:2802]

B:BD[33.2802] → [32.2917:3129]

∅:D[33.2802] → [30.3628:4071]

∅:D[32.3129] → [30.3628:4071]

B:BD[30.3628] → [30.3628:4071]

    {
        const bool inSanctuary   = (is_sanctuary(you.x_pos, you.y_pos)
                                     || is_sanctuary(def->x, def->y));
        const bool wontAttack    = mons_wont_attack(def);
        const bool isFriendly    = mons_friendly(def);
        const bool isNeutral     = mons_neutral(def);
        const bool isUnchivalric = is_unchivalric_attack(&you, def, def);
        const bool isHoly        = mons_is_holy(def);
        if (inSanctuary || wontAttack
            || (is_good_god(you.religion) && (isNeutral || isHoly))
            || (you.religion == GOD_SHINING_ONE && isUnchivalric))
        {
            snprintf(info, INFO_SIZE, "Really attack the %s%s%s%s%s?",
                                      (isUnchivalric) ? "helpless "
                                                      : "",
                                      (isFriendly)    ? "friendly " :
                                      (wontAttack)    ? "non-hostile " :
                                      (isNeutral)     ? "neutral "
                                                      : "",
                                      (isHoly)        ? "holy "
                                                      : "",
                                      def->name(DESC_PLAIN).c_str(),
                                      (inSanctuary)   ? ", despite your sanctuary"
                                                      : "");
            if (you.confused() || yesno(info, false, 'n'))
            {
                if (isFriendly)
                    conduct.set(DID_ATTACK_FRIEND, 5, true, def);
                else if (isNeutral)
                    conduct.set(DID_ATTACK_NEUTRAL, 5, true, def);
                if (isUnchivalric)
                    conduct.set(DID_UNCHIVALRIC_ATTACK, 4, true, def);

[30.2702]

[30.4071]

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

Deletion in crawl-ref/source/fight.cc at line 611 [7.3140790]

B:BD[30.4072] → [30.4072:4255]

∅:D[17.2901] → [31.3377:3384]

∅:D[30.4255] → [31.3377:3384]

B:BD[31.3377] → [31.3377:3384]

                if (isHoly)
                    conduct.set(DID_ATTACK_HOLY, def->hit_dice, true, def);
            }
            else
                cancel_attack = true;
        }
    }

Deletion in crawl-ref/source/beam.cc at line 4175 [7.4128068]

B:BD[35.9090] → [35.9090:9099]

B:BD[35.9099] → [36.2801:2866]

∅:D[36.2866] → [35.9151:9153]

B:BD[35.9151] → [35.9151:9153]

B:BD[35.9153] → [3.2762:2898]

∅:D[3.2898] → [35.9153:9429]

B:BD[35.9153] → [35.9153:9429]

B:BD[35.9429] → [37.5117:5137]

∅:D[37.5137] → [35.9571:9577]

B:BD[35.9571] → [35.9571:9577]

B:BD[35.9577] → [37.5138:5189]

B:BD[37.5189] → [3.2899:3189]

∅:D[3.3189] → [37.5303:5374]

B:BD[37.5303] → [37.5303:5374]

B:BD[37.5374] → [3.3190:3229]

∅:D[3.3229] → [37.5398:5678]

B:BD[37.5398] → [37.5398:5678]

B:BD[37.5678] → [3.3230:3384]

∅:D[36.3082] → [35.9692:10007]

∅:D[3.3384] → [35.9692:10007]

∅:D[37.5786] → [35.9692:10007]

B:BD[35.9692] → [35.9692:10007]

B:BD[35.10007] → [37.5787:5826]

B:BD[37.5826] → [3.3385:3535]

∅:D[38.2878] → [35.10047:10112]

∅:D[39.3047] → [35.10047:10112]

∅:D[3.3535] → [35.10047:10112]

∅:D[37.5875] → [35.10047:10112]

B:BD[35.10047] → [35.10047:10112]

    }
}
static bool _stop_unchivalric_attack(monsters *mon, bool target)
{
    const bool inSanctuary   = (is_sanctuary(you.x_pos, you.y_pos)
                                   || is_sanctuary(mon->x, mon->y));
    const bool wontAttack    = mons_wont_attack(mon);
    const bool isFriendly    = mons_friendly(mon);
    const bool isNeutral     = mons_neutral(mon);
    const bool isUnchivalric = is_unchivalric_attack(&you, mon, mon);
    const bool isHoly        = mons_is_holy(mon);
    if (isFriendly)
    {
        // listed in the form: "your rat", "Blork"
        snprintf(info, INFO_SIZE, "Really fire %s %s%s?",
                 (target)      ? "at"
                               : "through",
                 mon->name(DESC_NOCAP_THE).c_str(),
                 (inSanctuary) ? ", despite your sanctuary"
                               : "");
        if (!yesno(info, true, 'n'))
            return (true);
    }
    else if (inSanctuary || wontAttack
             || is_good_god(you.religion) && (isNeutral || isHoly)
             || you.religion == GOD_SHINING_ONE && isUnchivalric)
    {
        // "Really fire through the helpless neutral holy Daeva?"
        // was: "Really fire through this helpless neutral holy creature?"
        snprintf(info, INFO_SIZE, "Really fire %s the %s%s%s%s%s?",
                 (target)        ? "at"
                                 : "through",
                 (isUnchivalric) ? "helpless "
                                 : "",
                 (isFriendly)    ? "friendly " :
                 (wontAttack)    ? "non-hostile " :
                 (isNeutral)     ? "neutral "
                                 : "",
                 (isHoly)        ? "holy "
                                 : "",
                 mon->name(DESC_PLAIN).c_str(),
                 (inSanctuary)   ? ", despite your sanctuary"
                                 : "");
        if (!yesno(info, true, 'n'))
            return (true);

Deletion in crawl-ref/source/beam.cc at line 4176 [7.4128068]
B:BD[35.10118] → [35.10118:10138]
```
    return (false);
```

Replacement in crawl-ref/source/beam.cc at line 4249 [7.4128068]

B:BD[36.3271] → [36.3271:3334]

                    if (_stop_unchivalric_attack(mon, target))

[36.3271]

[36.3334]

                    if (stop_attack_prompt(mon, true, target))

Replacement in crawl-ref/source/beam.cc at line 4428 [7.4128068]

B:BD[36.3671] → [36.3671:3734]

                    if (_stop_unchivalric_attack(mon, target))

[36.3671]

[36.3734]

                    if (stop_attack_prompt(mon, true, target))

Consolidate the attack warning prompts for both melee and beams, and use

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spells3.cc at line 34 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 202 [7.531613]

Deletion in crawl-ref/source/spells3.cc at line 204 [7.531613]

Deletion in crawl-ref/source/spells3.cc at line 208 [7.531613]

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

Replacement in crawl-ref/source/spells3.cc at line 213 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 217 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 222 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 229 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 243 [7.531613]

Deletion in crawl-ref/source/spells3.cc at line 245 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 249 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 252 [7.531613]

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

Replacement in crawl-ref/source/spells3.cc at line 256 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 259 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 262 [7.531613]

Replacement in crawl-ref/source/spells3.cc at line 264 [7.531613]