fiddlerwoaroof/crawl - Change CHUJFZ7HBTS6IC46OJQEMWSQV5QLF7LCPBYW5NPSEM4L6OT3PJVQC

Amulet/ring swapping now respects !R, !*.

(The message produced is a bit confusing with amulets, though.)

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

Created by haranp on May 11, 2007

CHUJFZ7HBTS6IC46OJQEMWSQV5QLF7LCPBYW5NPSEM4L6OT3PJVQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/itemname.cc at line 1304 [3.2667494]

B:BD[3.2723547] → [2.739:1023]

            if (item_typ < AMU_RAGE) // rings
            {
                buff << ring_secondary_string(this->special / 13)
                     << ring_primary_string(this->special % 13)
                     << " ring";
            }
            else                    // amulets

[3.2723547]

[2.1023]

            if ( jewellery_is_amulet(*this) )

Insertion in crawl-ref/source/itemname.cc at line 1310 [3.2667494]

[2.1220]

[4.33484]

            else                // i.e., an amulet
            {
                buff << ring_secondary_string(this->special / 13)
                     << ring_primary_string(this->special % 13)
                     << " ring";
            }

Insertion in crawl-ref/source/item_use.cc at line 2139 [3.2781507]
[5.753633]
[5.753633]
```
    const int eqslot = c == lslot? EQ_LEFT_RING : EQ_RIGHT_RING;
```

Replacement in crawl-ref/source/item_use.cc at line 2142 [3.2781507]

B:BD[5.753634] → [5.753634:753693]

    int eqslot = c == lslot? EQ_LEFT_RING : EQ_RIGHT_RING;

[5.753634]

[5.753693]

    if (!check_warning_inscriptions(you.inv[you.equip[eqslot]], OPER_REMOVE))
        return -1;

Insertion in crawl-ref/source/item_use.cc at line 2159 [3.2781507]
[5.754091]
[5.754091]
```
    {
        canned_msg(MSG_OK);
```
Insertion in crawl-ref/source/item_use.cc at line 2162 [3.2781507]
[5.754115]
[5.754115]
```
    }
```

Replacement in crawl-ref/source/item_use.cc at line 2194 [3.2781507]

B:BD[3.2835913] → [5.754786:754850]

    bool is_amulet = jewellery_is_amulet( you.inv[item_slot] );

[3.2835913]

[3.2836018]

    const bool is_amulet = jewellery_is_amulet( you.inv[item_slot] );

Replacement in crawl-ref/source/item_use.cc at line 2211 [3.2781507]

B:BD[3.2836068] → [5.755300:755384]

        if (!remove_ring( you.equip[EQ_AMULET], true ))
            return (false);

[3.2836068]

[5.755384]

        if (!check_warning_inscriptions(you.inv[you.equip[EQ_AMULET]],
                                        OPER_REMOVE) ||
            !remove_ring( you.equip[EQ_AMULET], true ))
            return false;

Replacement in crawl-ref/source/item_use.cc at line 2379 [3.2781507]
B:BD[3.2836571] → [3.2836571:2836595]
```
    int hand_used = 10;
```
[3.2836571]
[3.2836595]
```
    equipment_type hand_used = EQ_NONE;
```
Replacement in crawl-ref/source/item_use.cc at line 2406 [3.2781507]
B:BD[3.2837284] → [3.2837284:2837307]
```
        hand_used = 0;
```
[3.2837284]
[3.2837307]
```
        hand_used = EQ_LEFT_RING;
```
Replacement in crawl-ref/source/item_use.cc at line 2412 [3.2781507]
B:BD[3.2837431] → [3.2837431:2837454]
```
        hand_used = 1;
```
[3.2837431]
[3.2837454]
```
        hand_used = EQ_RIGHT_RING;
```
Replacement in crawl-ref/source/item_use.cc at line 2418 [3.2781507]
B:BD[3.2837578] → [3.2837578:2837601]
```
        hand_used = 2;
```
[3.2837578]
[3.2837601]
```
        hand_used = EQ_AMULET;
```
Replacement in crawl-ref/source/item_use.cc at line 2421 [3.2781507]
B:BD[3.2837608] → [3.2837608:2837633]
```
    if (hand_used == 10)
```
[3.2837608]
[3.2837633]
```
    if (hand_used == EQ_NONE)
```
Replacement in crawl-ref/source/item_use.cc at line 2423 [3.2781507]
B:BD[3.2837639] → [6.367910:367932]
```
        int equipn = 
```
[3.2837639]
[6.367932]
```
        const int equipn = 
```
Replacement in crawl-ref/source/item_use.cc at line 2443 [3.2781507]
B:BD[3.2838084] → [3.2838084:2838111]
```
            hand_used = 0;
```
[3.2838084]
[3.2838111]
```
            hand_used = EQ_LEFT_RING;
```
Replacement in crawl-ref/source/item_use.cc at line 2445 [3.2781507]
B:BD[3.2838164] → [3.2838164:2838191]
```
            hand_used = 1;
```
[3.2838164]
[3.2838191]
```
            hand_used = EQ_RIGHT_RING;
```
Replacement in crawl-ref/source/item_use.cc at line 2447 [3.2781507]
B:BD[3.2838240] → [3.2838240:2838267]
```
            hand_used = 2;
```
[3.2838240]
[3.2838267]
```
            hand_used = EQ_AMULET;
```

Replacement in crawl-ref/source/item_use.cc at line 2457 [3.2781507]

B:BD[3.2838464] → [3.2838464:2838511]

        && (hand_used == 0 || hand_used == 1))

[3.2838464]

[3.2838511]

        && (hand_used == EQ_LEFT_RING || hand_used == EQ_RIGHT_RING))

Replacement in crawl-ref/source/item_use.cc at line 2463 [3.2781507]
B:BD[3.2838608] → [5.758801:758852]
```
    if (you.equip[hand_used + EQ_LEFT_RING] == -1)
```
[3.2838608]
[3.2838648]
```
    if (you.equip[hand_used] == -1)
```

Replacement in crawl-ref/source/item_use.cc at line 2469 [3.2781507]

B:BD[3.2838730] → [5.758853:758922]

    if (item_cursed( you.inv[you.equip[hand_used + EQ_LEFT_RING]] ))

[3.2838730]

[3.2838788]

    if (item_cursed( you.inv[you.equip[hand_used]] ))

Replacement in crawl-ref/source/item_use.cc at line 2473 [3.2781507]

B:BD[5.758985] → [7.23042:23134]

                 you.inv[you.equip[hand_used + EQ_LEFT_RING]].name(DESC_CAP_YOUR).c_str());

[5.758985]

[5.759088]

                 you.inv[you.equip[hand_used]].name(DESC_CAP_YOUR).c_str());

Replacement in crawl-ref/source/item_use.cc at line 2477 [3.2781507]

B:BD[3.2838830] → [5.759141:759259]

        set_ident_flags( you.inv[you.equip[hand_used + EQ_LEFT_RING]], 
                         ISFLAG_KNOW_CURSE );

[3.2838830]

[6.368237]

        set_ident_flags( you.inv[you.equip[hand_used]], ISFLAG_KNOW_CURSE );

Replacement in crawl-ref/source/item_use.cc at line 2481 [3.2781507]

B:BD[3.2840769] → [5.759260:759361]

    ring_wear_2 = you.equip[hand_used + EQ_LEFT_RING];
    you.equip[hand_used + EQ_LEFT_RING] = -1;

[3.2840769]

[3.2840804]

    ring_wear_2 = you.equip[hand_used];
    you.equip[hand_used] = -1;

Replacement in crawl-ref/source/item_use.cc at line 2486 [3.2781507]
B:BD[3.2840868] → [5.759415:759461]
```
    you.time_taken = you.time_taken * 5 / 10;
```
[3.2840868]
[5.759461]
```
    you.time_taken /= 2;
```

Amulet/ring swapping now respects !R, !*.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/itemname.cc at line 1304 [3.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1310 [3.2667494]

Insertion in crawl-ref/source/item_use.cc at line 2139 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2142 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2159 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 2162 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2194 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2211 [3.2781507]

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

Replacement in crawl-ref/source/item_use.cc at line 2406 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2412 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2418 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2421 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2423 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2443 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2445 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2447 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2457 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2463 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2469 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2473 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2477 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2481 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2486 [3.2781507]