fiddlerwoaroof/crawl - Change F42F3QNVICCXWPMNYL2QQJZNOVBVF4MXZUXNUC7KKYIRZ7R5HGPAC

For unidentified randart jewellery, remember and display obvious-from-wearing

effects caused by the base type item as if they were randart properties.

Related changes:

Equpping or unequipping a ring of magical power or staff of power will give a message about mana capacity increasing/decreasing.
The randart property RAP_MAGICAL_POWER has been added. randart_wpn_property() doesn't yet give this to any randarts, but the rest of the code for it is in place.

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

Created by zelgadis on October 10, 2007

F42F3QNVICCXWPMNYL2QQJZNOVBVF4MXZUXNUC7KKYIRZ7R5HGPAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/randart.h at line 50 [6.889057]
[5.49299]
[5.49299]
```
    RAP_MAGICAL_POWER,                 //   30
```
Replacement in crawl-ref/source/randart.h at line 56 [6.889057]
∅:D[7.928] → [6.889543:889568]
B:BD[6.889543] → [6.889543:889568]
```
#define RA_PROPERTIES 30
```
[7.928]
[6.889568]
```
#define RA_PROPERTIES RAP_NUM_PROPERTIES
```

Insertion in crawl-ref/source/randart.h at line 104 [6.889057]

[6.891586]

[8.306]

void randart_desc_properties( const item_def &item, 
                              randart_properties_t &proprt,
                              randart_known_props_t &known );

Insertion in crawl-ref/source/randart.cc at line 881 [6.893152]

[6.908970]

}
void randart_desc_properties( const item_def &item, 
                              randart_properties_t &proprt,
                              randart_known_props_t &known )
{
    randart_wpn_properties( item, proprt, known);
    if ( item_ident( item, ISFLAG_KNOW_PROPERTIES ) )
        return;
    if (item.base_type != OBJ_JEWELLERY)
        return;
    randart_prop_type fake_rap  = RAP_NUM_PROPERTIES;
    int               fake_plus = 1;
    switch (item.sub_type)
    {
    case RING_INVISIBILITY:
        fake_rap = RAP_INVISIBLE;
        break;
    case RING_TELEPORTATION:
        fake_rap = RAP_CAUSE_TELEPORTATION;
        break;
    case RING_MAGICAL_POWER:
        fake_rap  = RAP_MAGICAL_POWER;
        fake_plus = 9;
        break;
    case RING_LEVITATION:
        fake_rap = RAP_LEVITATE;
        break;
    case AMU_RAGE:
        fake_rap = RAP_BERSERK;
        break;
    }    
    if (fake_rap != RAP_NUM_PROPERTIES)
        proprt[fake_rap] += fake_plus;

Replacement in crawl-ref/source/randart.cc at line 1451 [6.893152]
B:BD[4.539] → [4.539:552]
```
    int num;
```
[4.539]
[4.552]
```
    int num = 0;
```

Deletion in crawl-ref/source/randart.cc at line 1862 [6.893152]

B:BD[4.999] → [4.999:1187]

    case RING_SUSTAIN_ABILITIES:
    case RING_SUSTENANCE:
    case RING_REGENERATION:
    case RING_TELEPORT_CONTROL:
    case RING_WIZARDRY:
    case RING_MAGICAL_POWER:
        break;

Insertion in crawl-ref/source/randart.cc at line 1916 [6.893152]

[4.2281]

        break;
    case RING_MAGICAL_POWER:
        provides = RAP_MAGICAL_POWER;

Deletion in crawl-ref/source/randart.cc at line 1940 [6.893152]

B:BD[4.2654] → [4.2654:2887]

        break;
    case AMU_RESIST_SLOW:
    case AMU_CLARITY:
    case AMU_WARDING:
    case AMU_RESIST_CORROSION:
    case AMU_THE_GOURMAND:
    case AMU_CONSERVATION:
    case AMU_CONTROLLED_FLIGHT:
    case AMU_RESIST_MUTATION:

Deletion in crawl-ref/source/randart.cc at line 1968 [6.893152]

B:BD[4.3447] → [4.3447:3951]

    case RING_REGENERATION:
    case RING_PROTECTION:
    case RING_PROTECTION_FROM_FIRE:
    case RING_POISON_RESISTANCE:
    case RING_PROTECTION_FROM_COLD:
    case RING_STRENGTH:
    case RING_SLAYING:
    case RING_SEE_INVISIBLE:
    case RING_INVISIBILITY:
    case RING_HUNGER:
    case RING_EVASION:
    case RING_SUSTAIN_ABILITIES:
    case RING_DEXTERITY:
    case RING_INTELLIGENCE:
    case RING_LEVITATION:
    case RING_LIFE_PROTECTION:
    case RING_PROTECTION_FROM_MAGIC:
        break;

Deletion in crawl-ref/source/randart.cc at line 1990 [6.893152]

B:BD[4.4440] → [4.4440:4668]

        break;
    case AMU_RESIST_SLOW:
    case AMU_CLARITY:
    case AMU_WARDING:
    case AMU_RESIST_CORROSION:
    case AMU_THE_GOURMAND:
    case AMU_CONSERVATION:
    case AMU_CONTROLLED_FLIGHT:
    case AMU_INACCURACY:

Replacement in crawl-ref/source/player.cc at line 2226 [6.962854]

B:BD[6.1000999] → [6.1000999:1001116]

    ret += 13 * player_equip( EQ_STAFF, STAFF_POWER );
    ret +=  9 * player_equip( EQ_RINGS, RING_MAGICAL_POWER );

[6.1000999]

[6.1001116]

    ret += 13 * player_equip(  EQ_STAFF, STAFF_POWER );
    ret +=  9 * player_equip(  EQ_RINGS, RING_MAGICAL_POWER );
    ret +=      scan_randarts( RAP_MAGICAL_POWER );

Insertion in crawl-ref/source/item_use.cc at line 429 [6.2781507]
[6.2789752]
[6.2789752]
```
            mpr("You fell your mana capacity increase.");
```

Replacement in crawl-ref/source/item_use.cc at line 2285 [6.2781507]

B:BD[6.2830767] → [9.8716:8767]

    item_type_id_state_type ident = ID_TRIED_TYPE;

[6.2830767]

[6.2833497]

    item_type_id_state_type ident        = ID_TRIED_TYPE;
    randart_prop_type       fake_rap     = RAP_NUM_PROPERTIES;
    bool                    learn_pluses = false;

Replacement in crawl-ref/source/item_use.cc at line 2293 [6.2781507]

B:BD[2.15205] → [2.15205:15261]

    const bool identified   = fully_identified( item );

[2.15205]

[2.15261]

    const bool known_pluses = item_ident( item, ISFLAG_KNOW_PLUSES );

Replacement in crawl-ref/source/item_use.cc at line 2323 [6.2781507]
B:BD[10.2206] → [10.2206:2240]
```
            else if (!identified)
```
[10.2206]
[10.2240]
```
            else if (!known_pluses)
```
Insertion in crawl-ref/source/item_use.cc at line 2328 [6.2781507]
[10.2380]
[10.2380]
```
            learn_pluses = true;
```

Replacement in crawl-ref/source/item_use.cc at line 2336 [6.2781507]

B:BD[6.2834262] → [10.2391:2418]

            if (!artefact)

[6.2834262]

[10.2418]

            if (artefact)
                fake_rap = RAP_INVISIBLE;
            else

Replacement in crawl-ref/source/item_use.cc at line 2349 [6.2781507]
B:BD[10.2534] → [10.2534:2568]
```
            else if (!identified)
```
[10.2534]
[10.2568]
```
            else if (!known_pluses)
```
Insertion in crawl-ref/source/item_use.cc at line 2351 [6.2781507]
[10.2649]
[10.2649]
```
            learn_pluses = true;
```
Insertion in crawl-ref/source/item_use.cc at line 2359 [6.2781507]
[6.2834639]
[6.2834639]
```
        learn_pluses = true;
```
Insertion in crawl-ref/source/item_use.cc at line 2366 [6.2781507]
[6.2834825]
[6.2834825]
```
        learn_pluses = true;
```
Insertion in crawl-ref/source/item_use.cc at line 2373 [6.2781507]
[6.2835017]
[6.2835017]
```
        learn_pluses = true;
```
Insertion in crawl-ref/source/item_use.cc at line 2377 [6.2781507]
[6.2835062]
[6.2835062]
```
        mpr("You feel you mana capacity increase.");
```

Replacement in crawl-ref/source/item_use.cc at line 2379 [6.2781507]

B:BD[6.2835081] → [10.2965:2988]

        if (!artefact)

[6.2835081]

[10.2988]

        if (artefact)
            fake_rap = RAP_MAGICAL_POWER;
        else

Replacement in crawl-ref/source/item_use.cc at line 2389 [6.2781507]

B:BD[10.3116] → [10.3116:3143]

            if (!artefact)

[10.3116]

[10.3143]

            if (artefact)
                fake_rap = RAP_LEVITATE;
            else

Replacement in crawl-ref/source/item_use.cc at line 2400 [6.2781507]

B:BD[11.14810] → [10.3193:3220]

            if (!artefact)

[11.14810]

[10.3220]

            if (artefact)
                fake_rap = RAP_CAUSE_TELEPORTATION;
            else

Replacement in crawl-ref/source/item_use.cc at line 2411 [6.2781507]

B:BD[10.3382] → [10.3382:3409]

            if (!artefact)

[10.3382]

[10.3409]

            if (artefact)
                fake_rap = RAP_BERSERK;
            else

Insertion in crawl-ref/source/item_use.cc at line 2426 [6.2781507]
[10.3477]
[12.752256]
```
    {
```

Insertion in crawl-ref/source/item_use.cc at line 2428 [6.2781507]

[12.752283]

[6.2835774]


        if (learn_pluses && (item.plus != 0 || item.plus2 != 0))
            set_ident_flags( item, ISFLAG_KNOW_PLUSES );
        if (fake_rap != RAP_NUM_PROPERTIES)
            randart_wpn_learn_prop( item, fake_rap );
    }

Insertion in crawl-ref/source/item_use.cc at line 2436 [6.2781507]
[6.2835783]
[12.752284]
```
    {
```

Replacement in crawl-ref/source/item_use.cc at line 2439 [6.2781507]

B:BD[12.752349] → [12.752349:752440]

    if (ident == ID_KNOWN_TYPE)
        set_ident_flags( item, ISFLAG_EQ_JEWELLERY_MASK );

[12.752349]

[12.752440]

        if (ident == ID_KNOWN_TYPE)
            set_ident_flags( item, ISFLAG_EQ_JEWELLERY_MASK );
    }

Insertion in crawl-ref/source/item_use.cc at line 2717 [6.2781507]
[12.758366]
[12.758366]
```
        mpr("You feel you mana capacity decrease.");
```

Insertion in crawl-ref/source/item_use.cc at line 4014 [6.2781507]

[6.2868789]

    if (proprt[RAP_MAGICAL_POWER])
    {
        you.redraw_magic_points = 1;
        if (!known[RAP_MAGICAL_POWER])
        {
            mprf("You feel you mana capacity %s.", proprt[RAP_EVASION] > 0?
                 "increase" : "decrease");
            randart_wpn_learn_prop(item, RAP_MAGICAL_POWER);
        }
    }

Insertion in crawl-ref/source/it_use2.cc at line 496 [6.2904329]
[3.948]
[6.2916172]
```
    {
```
Insertion in crawl-ref/source/it_use2.cc at line 498 [6.2904329]
[6.2916191]
[6.2916235]
```
        mpr("You fell your mana capacity decrease.");
    }
```

Insertion in crawl-ref/source/it_use2.cc at line 631 [6.2904329]

[6.2918665]

[10.5323]

    if (proprt[RAP_MAGICAL_POWER])
    {
        you.redraw_magic_points = 1;
        if (!known[RAP_MAGICAL_POWER])
        {
            mprf("You feel you mana capacity %s.", proprt[RAP_EVASION] > 0?
                 "decrease" : "increase");
        }
    }

Replacement in crawl-ref/source/describe.cc at line 171 [6.3736416]
B:BD[8.5469] → [8.5469:5520]
```
    randart_wpn_properties( item, proprt, known );
```
[8.5469]
[6.3740977]
```
    randart_desc_properties( item, proprt, known );
```

Insertion in crawl-ref/source/describe.cc at line 292 [6.3736416]

[6.3744642]

[8.8319]

    if (known_proprt( RAP_MAGICAL_POWER ))
    {
        description += "$It affects your mana capacity (";
        append_value(description, proprt[ RAP_MAGICAL_POWER ], true);
        description += ").";
    }

For unidentified randart jewellery, remember and display obvious-from-wearing

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/randart.h at line 50 [6.889057]

Replacement in crawl-ref/source/randart.h at line 56 [6.889057]

Insertion in crawl-ref/source/randart.h at line 104 [6.889057]

Insertion in crawl-ref/source/randart.cc at line 881 [6.893152]

Replacement in crawl-ref/source/randart.cc at line 1451 [6.893152]

Deletion in crawl-ref/source/randart.cc at line 1862 [6.893152]

Insertion in crawl-ref/source/randart.cc at line 1916 [6.893152]

Deletion in crawl-ref/source/randart.cc at line 1940 [6.893152]

Deletion in crawl-ref/source/randart.cc at line 1968 [6.893152]

Deletion in crawl-ref/source/randart.cc at line 1990 [6.893152]

Replacement in crawl-ref/source/player.cc at line 2226 [6.962854]

Insertion in crawl-ref/source/item_use.cc at line 429 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2285 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2293 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2323 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2328 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2336 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2349 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2351 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2359 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2366 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2373 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2377 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2379 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2389 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2400 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2411 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2426 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2428 [6.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2436 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2439 [6.2781507]

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

Insertion in crawl-ref/source/item_use.cc at line 4014 [6.2781507]

Insertion in crawl-ref/source/it_use2.cc at line 496 [6.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 498 [6.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 631 [6.2904329]

Replacement in crawl-ref/source/describe.cc at line 171 [6.3736416]

Insertion in crawl-ref/source/describe.cc at line 292 [6.3736416]