fiddlerwoaroof/crawl - Change AZ2RCXNVULJUSCBDBK3VARTUCTPEJXHTA7ALP73S4EXLJB6YYB5QC

Add a blessing to improve AC by enchanting armor or shields by one or

two points, or at least uncursing them (5% chance, to discourage killings for armor; the probability of healing has been dropped to 90%).
In the process, split out and generalize the code to enchant armor to not be so player-specific; now, handle_enchant_armour() contains the player-specific portion, and enchant_armour() contains the rest.

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

Created by dolorous on March 21, 2008

AZ2RCXNVULJUSCBDBK3VARTUCTPEJXHTA7ALP73S4EXLJB6YYB5QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 757 [5.804403]
B:BD[4.2510] → [4.2510:2555]
```
static bool promote_to_priest(monsters* mon)
```
[4.2510]
[4.2555]
```
static bool blessing_priesthood(monsters* mon)
```

Insertion in crawl-ref/source/religion.cc at line 778 [5.804403]

[4.3944]

[6.2605]

static bool blessing_ac(monsters* mon)
{
    // Pick either the armour or the shield.
    const int armour = mon->inv[MSLOT_ARMOUR];
    const int shield = mon->inv[MSLOT_SHIELD];
    if (armour == NON_ITEM && shield == NON_ITEM)
        return false;
    int slot;
    if (armour == NON_ITEM)
        slot = shield;
    else if (shield == NON_ITEM)
        slot = armour;
    else
        slot = (coinflip()) ? armour : shield;
    item_def& arm(mitm[slot]);
    int ac_change;
    // And enchant it.
    return enchant_armour(ac_change, true, arm);
}

Replacement in crawl-ref/source/religion.cc at line 821 [5.804403]
B:BD[3.2573] → [3.2573:2645]
```
    if (god == GOD_BEOGH && one_chance_in(20) && mon->type == MONS_ORC)
```
[3.2573]
[3.2645]
```
    if (one_chance_in(20))
```

Replacement in crawl-ref/source/religion.cc at line 823 [5.804403]

B:BD[3.2651] → [3.2651:2683]

∅:D[3.2683] → [7.2724:2755]

B:BD[7.2724] → [7.2724:2755]

        promote_to_priest(mon);
        result = "priesthood";

[3.2651]

[3.2684]

        if (god == GOD_BEOGH && mon->type == MONS_ORC
            && blessing_priesthood(mon))
        {
            result = "priesthood";
            goto blessing_done;
        }

Replacement in crawl-ref/source/religion.cc at line 830 [5.804403]

∅:D[3.2690] → [7.2755:2797]

B:BD[7.2755] → [7.2755:2797]

    // 95% chance: full healing.
    else

[3.2690]

[6.2900]


    // 5% chance: Enchant a monster's armour or shield by one or two
    // points, or at least uncurse it, if possible.  The message doesn't
    // make a distinction.
    if (one_chance_in(20))
    {
        bool ac_effect = blessing_ac(mon);
        if (!ac_effect || coinflip())
        {
            if (blessing_ac(mon))
                ac_effect = true;
        }
        if (ac_effect)
        {
            result = "extra defence";
            goto blessing_done;
        }
    }
    // 90% chance: full healing, optionally adding one or two extra hit
    // points.

Deletion in crawl-ref/source/religion.cc at line 861 [5.804403]
B:BD[6.3130] → [7.2960:3015]
```
            // Full healing, plus one added hit point.
```
Deletion in crawl-ref/source/religion.cc at line 864 [5.804403]
B:BD[7.3102] → [7.3102:3165]
```
                // Full healing, plus another added hit point.
```
Insertion in crawl-ref/source/religion.cc at line 877 [5.804403]
[4.5308]
[4.5308]
```
blessing_done:
```
Insertion in crawl-ref/source/item_use.h at line 165 [5.2777340]
[2.4354]
[8.362286]
```
bool enchant_armour( int &ac_change, bool quiet, item_def &arm );
```
Replacement in crawl-ref/source/item_use.cc at line 84 [5.2781507]
B:BD[9.2158] → [2.4356:4404]
```
static bool enchant_armour(int item_slot = -1);
```
[9.2158]
[10.2655]
```
static bool handle_enchant_armour( int item_slot = -1 );
```
Replacement in crawl-ref/source/item_use.cc at line 3918 [5.2781507]
B:BD[5.2854458] → [2.4546:4590]
```
static bool enchant_armour( int item_slot )
```
[5.2854458]
[5.2854493]
```
bool enchant_armour( int &ac_change, bool quiet, item_def &arm )
```

Replacement in crawl-ref/source/item_use.cc at line 3920 [5.2781507]

B:BD[5.2854495] → [2.4591:4767]

    if (item_slot == -1)
        item_slot = prompt_invent_item( "Enchant which item?", MT_INVLIST,
                                        OSEL_ENCH_ARM, true, true, false );

[5.2854495]

[5.2854720]

    ac_change = 0;

Deletion in crawl-ref/source/item_use.cc at line 3922 [5.2781507]
B:BD[5.2854721] → [2.4768:4803]
∅:D[2.4803] → [5.2855247:2855253]
B:BD[5.2855247] → [5.2855247:2855253]
B:BD[5.2855253] → [2.4804:4864]
∅:D[2.4864] → [5.2855427:2855428]
∅:D[11.24294] → [5.2855427:2855428]
B:BD[5.2855427] → [5.2855427:2855428]
B:BD[5.2855428] → [2.4865:4904]
∅:D[2.4904] → [5.2855465:2855466]
B:BD[5.2855465] → [5.2855465:2855466]
```
    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
        return (false);
    }
    item_def& arm(you.inv[item_slot]);
```
Deletion in crawl-ref/source/item_use.cc at line 3924 [5.2781507]
B:BD[2.4988] → [2.4988:5037]
```
    {
        canned_msg( MSG_NOTHING_HAPPENS );
```
Deletion in crawl-ref/source/item_use.cc at line 3925 [5.2781507]
∅:D[2.5061] → [5.2855541:2855547]
B:BD[5.2855541] → [5.2855541:2855547]
```
    }
```
Replacement in crawl-ref/source/item_use.cc at line 3927 [5.2781507]
B:BD[2.5101] → [2.5101:5118]
```
                
```
[2.5101]
[2.5118]

Replacement in crawl-ref/source/item_use.cc at line 3931 [5.2781507]

B:BD[2.5310] → [2.5310:5686]

    if (arm.sub_type == ARM_DRAGON_HIDE
        || arm.sub_type == ARM_ICE_DRAGON_HIDE
        || arm.sub_type == ARM_STEAM_DRAGON_HIDE
        || arm.sub_type == ARM_MOTTLED_DRAGON_HIDE
        || arm.sub_type == ARM_STORM_DRAGON_HIDE
        || arm.sub_type == ARM_GOLD_DRAGON_HIDE
        || arm.sub_type == ARM_SWAMP_DRAGON_HIDE
        || arm.sub_type == ARM_TROLL_HIDE)

[2.5310]

[5.2855692]

    if (armour_is_hide(arm, false))

Replacement in crawl-ref/source/item_use.cc at line 3935 [5.2781507]
B:BD[2.5779] → [2.5779:5793]
```
             
```
[2.5779]
[2.5793]
```
        ac_change = arm.plus;
```
Insertion in crawl-ref/source/item_use.cc at line 3938 [5.2781507]
[2.5819]
[5.2855853]
```
        ac_change = arm.plus - ac_change;
```
Deletion in crawl-ref/source/item_use.cc at line 3943 [5.2781507]
B:BD[5.2856003] → [2.5880:5917]
∅:D[2.5917] → [5.2856087:2856088]
B:BD[5.2856087] → [5.2856087:2856088]
```
        you.redraw_armour_class = 1;
```

Replacement in crawl-ref/source/item_use.cc at line 3953 [5.2781507]

B:BD[5.2856611] → [11.24295:24345]

B:BD[11.24345] → [2.6098:6167]

            mprf("%s glows silver for a moment.",
                 arm.name(DESC_CAP_YOUR).c_str());

[5.2856611]

[2.6167]

            if (!quiet)
            {
                mprf("%s glows silver for a moment.",
                     arm.name(DESC_CAP_YOUR).c_str());
            }

Deletion in crawl-ref/source/item_use.cc at line 3963 [5.2781507]
B:BD[5.2856906] → [5.2856906:2856963]
```
        {
            canned_msg( MSG_NOTHING_HAPPENS );
```
Deletion in crawl-ref/source/item_use.cc at line 3964 [5.2781507]
B:BD[5.2856991] → [5.2856991:2857001]
```
        }
```

Replacement in crawl-ref/source/item_use.cc at line 3967 [5.2781507]

∅:D[2.6271] → [11.24398:24439]

B:BD[5.2857053] → [11.24398:24439]

B:BD[11.24439] → [2.6272:6315]

    mprf("%s glows green for a moment.",
         arm.name(DESC_CAP_YOUR).c_str());

[2.6271]

[5.2857190]

    if (!quiet)
    {
        mprf("%s glows green for a moment.",
             arm.name(DESC_CAP_YOUR).c_str());
    }

Insertion in crawl-ref/source/item_use.cc at line 3974 [5.2781507]
[2.6332]
[5.2857208]
```
    ac_change++;
```
Replacement in crawl-ref/source/item_use.cc at line 3978 [5.2781507]
B:BD[2.6384] → [2.6384:6393]
∅:D[2.6393] → [5.2857238:2857271]
B:BD[5.2857238] → [5.2857238:2857271]
```
        
    you.redraw_armour_class = 1;
```
[2.6384]
[12.50670]

Insertion in crawl-ref/source/item_use.cc at line 3981 [5.2781507]

[5.2857290]

}
static bool handle_enchant_armour( int item_slot )
{
    if (item_slot == -1)
        item_slot = prompt_invent_item( "Enchant which item?", MT_INVLIST,
                                        OSEL_ENCH_ARM, true, true, false );
    if (item_slot == PROMPT_ABORT)
    {
        canned_msg( MSG_OK );
        return (false);
    }
    item_def& arm(you.inv[item_slot]);
    int ac_change;
    bool result = enchant_armour(ac_change, false, arm);
    if (!result)
        canned_msg( MSG_NOTHING_HAPPENS );
    else if (ac_change)
        you.redraw_armour_class = true;
    return result;

Replacement in crawl-ref/source/item_use.cc at line 4058 [5.2781507]
B:BD[2.6678] → [2.6678:6721]
```
                                          
```
[2.6678]
[2.6721]
Replacement in crawl-ref/source/item_use.cc at line 4066 [5.2781507]
B:BD[2.6870] → [2.6870:6913]
```
                                          
```
[2.6870]
[2.6913]

Replacement in crawl-ref/source/item_use.cc at line 4091 [5.2781507]

B:BD[2.7510] → [2.7510:7553]

            if (enchant_armour(item_slot))

[2.7510]

[2.7553]

            if (handle_enchant_armour(item_slot))

Replacement in crawl-ref/source/item_use.cc at line 4429 [5.2781507]
B:BD[2.8538] → [2.8538:8571]
```
             enchant_armour(-1);
```
[2.8538]
[5.2866908]
```
             handle_enchant_armour(-1);
```

Add a blessing to improve AC by enchanting armor or shields by one or

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 757 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 778 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 821 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 823 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 830 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 861 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 864 [5.804403]

Insertion in crawl-ref/source/religion.cc at line 877 [5.804403]

Insertion in crawl-ref/source/item_use.h at line 165 [5.2777340]

Replacement in crawl-ref/source/item_use.cc at line 84 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3918 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3920 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3922 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3924 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3925 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3927 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3931 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3935 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3938 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3943 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3953 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3963 [5.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3964 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3967 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3974 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3978 [5.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3981 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4058 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4066 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4091 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4429 [5.2781507]