fiddlerwoaroof/crawl - Change P3BAFR6LTI7HANQCRLZWJ7LRJYFPFYIG7OVZV4RZM5EAMODRJKZAC

Implementing FR 1829063: warning when putting on/removing items

with a stat property that will be fatal.

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

Created by j-p-e-g on November 11, 2007

P3BAFR6LTI7HANQCRLZWJ7LRJYFPFYIG7OVZV4RZM5EAMODRJKZAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/randart.h at line 83 [4.889057]

[3.527]

[4.891775]


int randart_known_wpn_property( const item_def &item, randart_prop_type prop );

Insertion in crawl-ref/source/randart.cc at line 1524 [4.893152]

[5.2031]

[6.293]

}
int randart_known_wpn_property( const item_def &item, randart_prop_type prop )
{
    randart_properties_t  proprt;
    randart_known_props_t known;
    randart_wpn_properties( item, proprt, known );
    if (known[prop])
        return ( proprt[prop] );
    else
        return (0);

Insertion in crawl-ref/source/randart.cc at line 1539 [4.893152]
[6.296]
[6.296]

Replacement in crawl-ref/source/player.cc at line 4064 [4.962854]

B:BD[7.1670] → [7.1670:1725]

}                               // end scan_randarts()

[7.1670]

[4.1049042]

}                               // end items_give_ability()

Insertion in crawl-ref/source/item_use.h at line 69 [4.2777340]
[8.728379]
[4.2778533]
```
bool safe_to_remove_or_wear(const item_def &item, bool remove);
```

Replacement in crawl-ref/source/item_use.cc at line 239 [4.2781507]

B:BD[4.2785304] → [9.1093:1143]

                unwield_item(show_weff_messages);

[4.2785304]

[4.2785438]

                if (!unwield_item(show_weff_messages))
                    return (false);

Insertion in crawl-ref/source/item_use.cc at line 263 [4.2781507]

[8.731818]

        return (false);
    if (!safe_to_remove_or_wear(you.inv[item_slot], false))

Replacement in crawl-ref/source/item_use.cc at line 269 [4.2781507]

B:BD[8.731881] → [8.731881:731917]

B:BD[8.731917] → [9.1187:1229]

    if (you.equip[EQ_WEAPON] != -1)
        unwield_item(show_weff_messages);

[8.731881]

[4.2787598]

    if (you.equip[EQ_WEAPON] != -1 && !unwield_item(show_weff_messages))
        return (false);

Replacement in crawl-ref/source/item_use.cc at line 732 [4.2781507]

B:BD[4.2797765] → [4.2797765:2797809]

    do_wear_armour( armour_wear_2, false );

[4.2797765]

[10.365434]

    if (safe_to_remove_or_wear(you.inv[armour_wear_2], false))
        do_wear_armour( armour_wear_2, false );

Insertion in crawl-ref/source/item_use.cc at line 1028 [4.2781507]

[4.2804804]

[8.737295]

    if (!safe_to_remove_or_wear(you.inv[item], false))
        return (false);

Insertion in crawl-ref/source/item_use.cc at line 1064 [4.2781507]

[4.2805592]

    if (!safe_to_remove_or_wear(you.inv[item], true))
        return (false);

Insertion in crawl-ref/source/item_use.cc at line 2573 [4.2781507]

[8.753725]

}
// Checks whether a to-be-worn or to-be-removed item affects
// character stats and whether wearing/removing it could be fatal.
// If so, warns the player.
bool safe_to_remove_or_wear(const item_def &item, bool remove)
{
    int prop_str = 0;
    int prop_dex = 0;
    int prop_int = 0;
    // don't warn when putting on an unknown item
    if (item.base_type == OBJ_JEWELLERY && item_ident( item, ISFLAG_KNOW_PLUSES ))
    {
        switch (item.sub_type)
        {
        case RING_STRENGTH:
            if (item.plus != 0)
                prop_str = item.plus;
            break;
        case RING_DEXTERITY:
            if (item.plus != 0)
                prop_dex = item.plus;
            break;
        case RING_INTELLIGENCE:
            if (item.plus != 0)
                prop_int = item.plus;
            break;
        default:
            break;
        }
    }
    if (is_random_artefact( item ))
    {
        prop_str += randart_known_wpn_property(item, RAP_STRENGTH);
        prop_int += randart_known_wpn_property(item, RAP_INTELLIGENCE);
        prop_dex += randart_known_wpn_property(item, RAP_DEXTERITY);
    }
    if (remove)
    {
        std::string prompt = item.base_type == OBJ_WEAPONS ? "Unwield" : "Remov";
                    prompt += "ing this item could be fatal. ";
                    prompt += item.base_type == OBJ_WEAPONS ? "Unwield" : "Remove";
                    prompt += " anyway? ";
        if ((prop_str >= you.strength || prop_int >= you.intel ||
             prop_dex >= you.dex)
            && !yesno(prompt.c_str(), false, 'n'))
        {
            return (false);
        }
    }
    else // put on
    {
        std::string prompt = item.base_type == OBJ_WEAPONS ? "Wield" : "Wear";
                    prompt += "ing this item could be fatal. ";
                    prompt += item.base_type == OBJ_WEAPONS ? "Wield" : "Put on";
                    prompt += " anyway? ";
                    
        if ((-prop_str >= you.strength || -prop_int >= you.intel ||
             -prop_dex >= you.dex)
            && !yesno(prompt.c_str(), false, 'n'))
        {
            return (false);
        }
    }
    return (true);

Replacement in crawl-ref/source/item_use.cc at line 2664 [4.2781507]

B:BD[8.754179] → [8.754179:754180]

[8.754179]

[8.754180]

        
    if (!safe_to_remove_or_wear(you.inv[ring_slot], false))
        return (false);

Insertion in crawl-ref/source/item_use.cc at line 2717 [4.2781507]

[8.755385]

        if (!safe_to_remove_or_wear(you.inv[item_slot], false))
            return (false);

Insertion in crawl-ref/source/item_use.cc at line 2726 [4.2781507]

[4.2836288]

[8.755506]

    if (!safe_to_remove_or_wear(you.inv[item_slot], false))
        return (false);

Insertion in crawl-ref/source/item_use.cc at line 2995 [4.2781507]
[4.2840679]
[4.2840768]
```
    
    ring_wear_2 = you.equip[hand_used];
```

Replacement in crawl-ref/source/item_use.cc at line 2998 [4.2781507]

B:BD[4.2840769] → [2.1672:1712]

    ring_wear_2 = you.equip[hand_used];

[4.2840769]

[2.1712]

    if (!safe_to_remove_or_wear(you.inv[ring_wear_2], true))
        return (false);

Replacement in crawl-ref/source/it_use2.h at line 72 [4.2902964]
B:BD[4.2904256] → [9.1258:1299]
```
void unwield_item(bool showMsgs = true);
```
[4.2904256]
[4.2904285]
```
bool unwield_item(bool showMsgs = true);
```
Insertion in crawl-ref/source/it_use2.cc at line 30 [4.2904329]
[4.2905135]
[4.2905135]
```
#include "item_use.h"
```
Replacement in crawl-ref/source/it_use2.cc at line 369 [4.2904329]
B:BD[4.2912167] → [9.1301:1334]
```
void unwield_item(bool showMsgs)
```
[4.2912167]
[4.2912195]
```
bool unwield_item(bool showMsgs)
```
Replacement in crawl-ref/source/it_use2.cc at line 373 [4.2904329]
B:BD[9.1398] → [9.1398:1414]
```
        return;
```
[9.1398]
[9.1414]
```
        return (false);
```

Insertion in crawl-ref/source/it_use2.cc at line 375 [4.2904329]

[9.1419]

    if (!safe_to_remove_or_wear(you.inv[unw], true))
        return (false);

Replacement in crawl-ref/source/it_use2.cc at line 420 [4.2904329]
B:BD[4.2913122] → [4.2913122:2913142]
```
            return;
```
[4.2913122]
[4.2913142]
```
            return (true);
```
Replacement in crawl-ref/source/it_use2.cc at line 505 [4.2904329]
B:BD[4.2916236] → [4.2916236:2916248]
```
    return;
```
[4.2916236]
[4.2916248]
```
    return (true);
```

Implementing FR 1829063: warning when putting on/removing items

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/randart.h at line 83 [4.889057]

Insertion in crawl-ref/source/randart.cc at line 1524 [4.893152]

Insertion in crawl-ref/source/randart.cc at line 1539 [4.893152]

Replacement in crawl-ref/source/player.cc at line 4064 [4.962854]

Insertion in crawl-ref/source/item_use.h at line 69 [4.2777340]

Replacement in crawl-ref/source/item_use.cc at line 239 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 263 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 269 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 732 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 1028 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 1064 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2573 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2664 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2717 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2726 [4.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2995 [4.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2998 [4.2781507]

Replacement in crawl-ref/source/it_use2.h at line 72 [4.2902964]

Insertion in crawl-ref/source/it_use2.cc at line 30 [4.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 369 [4.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 373 [4.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 375 [4.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 420 [4.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 505 [4.2904329]