fiddlerwoaroof/crawl - Change JBMC2XNV3DNWMMLKUDRKBPDCPVRITY6L3WRQSD2SJMWNZUSIBMRQC

Move the "Really attack..." prompt to a better location, and add prompts

to avoid attacking e.g. friendly monsters in melee when not confused (usually via the Ctrl-key combinations while trying to disarm traps).

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

Created by dolorous on May 19, 2008

JBMC2XNV3DNWMMLKUDRKBPDCPVRITY6L3WRQSD2SJMWNZUSIBMRQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/fight.cc at line 608 [3.3140790]

B:BD[3.3147788] → [4.3109:3186]

    if (attacker->atype() == ACT_PLAYER && defender->atype() == ACT_MONSTER)

[3.3147788]

[4.3186]

    if (attacker->atype() == ACT_PLAYER)

Replacement in crawl-ref/source/fight.cc at line 610 [3.3140790]

B:BD[4.3192] → [4.3192:3377]

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

[4.3192]

[5.2797]

        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);

Replacement in crawl-ref/source/fight.cc at line 616 [3.3140790]

B:BD[5.2798] → [5.2798:2901]

        if (mons_is_holy(def))
            did_god_conduct(DID_ATTACK_HOLY, def->hit_dice, true, def);

[5.2798]

[4.3377]

        if (wontAttack
            || (is_good_god(you.religion) && (isNeutral || isHoly))
            || (you.religion == GOD_SHINING_ONE && isUnchivalric))
        {
            snprintf(info, INFO_SIZE, "Really attack this %s%s creature?",
                                      (isFriendly)    ? "friendly " :
                                      (wontAttack)    ? "non-hostile " :
                                      (isNeutral)     ? "neutral " :
                                      (isUnchivalric) ? "helpless "
                                                      : "",
                                      (isHoly)        ? "holy"
                                                      : "");
            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);
                if (isHoly)
                    conduct.set(DID_ATTACK_HOLY, def->hit_dice, true, def);
            }
            else
                cancel_attack = true;
        }

Insertion in crawl-ref/source/fight.cc at line 774 [3.3140790]
[6.33432]
[6.33432]
```
    if (cancel_attack)
        return (false);
```

Replacement in crawl-ref/source/fight.cc at line 778 [3.3140790]

B:BD[6.33455] → [6.33455:33557]

        !weapon? player_calc_base_unarmed_damage()
               : player_calc_base_weapon_damage();

[6.33455]

[3.3147940]

        !weapon ? player_calc_base_unarmed_damage()
                : player_calc_base_weapon_damage();

Deletion in crawl-ref/source/fight.cc at line 783 [3.3140790]
B:BD[6.33616] → [7.215:263]
```
    if (cancel_attack)
        return (false);
```

Deletion in crawl-ref/source/fight.cc at line 2865 [3.3140790]

B:BD[8.5016] → [2.2661:3088]

    if (unchivalric)
    {
        if (you.religion == GOD_SHINING_ONE
            && !tso_unchivalric_attack_safe_monster(defender))
        {
            if (!you.confused()
                && !yesno("Really attack this helpless creature?", false, 'n'))
            {
                cancel_attack = true;
                return;
            }
        }
        did_god_conduct(DID_UNCHIVALRIC_ATTACK, 4, true, def);
    }