fiddlerwoaroof/crawl - Change JGG5BOXMZVSRYEQERY76GSTZW7YZBY2FBXFJFF4MEPWL7A2OMPXAC

Fix 2448686: some jewellery properties not working properly while transformed.

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

Created by j-p-e-g on December 26, 2008

JGG5BOXMZVSRYEQERY76GSTZW7YZBY2FBXFJFF4MEPWL7A2OMPXAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/unrand.h at line 837 [3.114533]
B:BD[3.135903] → [4.562:605]
```
        -1, 0                    // cursed
```
[3.135903]
[3.135945]
```
        -1, 0                   // cursed
```

Replacement in crawl-ref/source/player.cc at line 684 [3.962854]

B:BD[5.3616] → [5.3616:3686]

    if (eq == EQ_LEFT_RING || eq == EQ_RIGHT_RING || eq == EQ_AMULET)

[5.3616]

[5.3686]

    if (eq == EQ_LEFT_RING || eq == EQ_RIGHT_RING || eq == EQ_RINGS
        || eq == EQ_AMULET)
    {

Insertion in crawl-ref/source/player.cc at line 688 [3.962854]
[5.3709]
[6.1560]
```
    }
```

Replacement in crawl-ref/source/player.cc at line 1004 [3.962854]

∅:D[7.2613] → [8.97:198]

B:BD[8.97] → [8.97:198]

    if (player_equip( EQ_BODY_ARMOUR, ARM_TROLL_LEATHER_ARMOUR ) &&
        you.species != SP_TROLL)

[7.2613]

[3.972937]

    if (player_equip( EQ_BODY_ARMOUR, ARM_TROLL_LEATHER_ARMOUR )
        && you.species != SP_TROLL)
    {

Insertion in crawl-ref/source/player.cc at line 1008 [3.962854]
[3.972955]
[3.972955]
```
    }
```
Deletion in crawl-ref/source/player.cc at line 2036 [3.962854]
B:BD[9.4009] → [9.4009:4058]
```
    int i;                      // loop variable
```
Replacement in crawl-ref/source/player.cc at line 2037 [3.962854]
∅:D[9.4059] → [3.989718:989767]
B:BD[3.989718] → [3.989718:989767]
```
    for (i = EQ_CLOAK; i <= EQ_BODY_ARMOUR; i++)
```
[9.4059]
[3.989767]
```
    for (int eq = EQ_CLOAK; eq <= EQ_BODY_ARMOUR; ++eq)
```
Replacement in crawl-ref/source/player.cc at line 2039 [3.962854]
B:BD[3.989773] → [10.5154:5182]
```
        if (i == EQ_SHIELD)
```
[3.989773]
[11.503]
```
        if (eq == EQ_SHIELD)
```
Replacement in crawl-ref/source/player.cc at line 2042 [3.962854]
B:BD[3.989814] → [2.3653:3690]
```
        if (!player_wearing_slot(i))
```
[3.989814]
[3.989856]
```
        if (!player_wearing_slot(eq))
```

Replacement in crawl-ref/source/player.cc at line 2045 [3.962854]

B:BD[3.989879] → [11.561:615]

        const item_def& item = you.inv[you.equip[i]];

[3.989879]

[11.712]

        const item_def& item = you.inv[you.equip[eq]];

Replacement in crawl-ref/source/player.cc at line 2055 [3.962854]

∅:D[12.2654] → [13.7652:7724]

B:BD[9.4261] → [13.7652:7724]

        if (i == EQ_BODY_ARMOUR && player_mutation_level(MUT_DEFORMED))

[12.2654]

[3.991668]

        if (eq == EQ_BODY_ARMOUR && player_mutation_level(MUT_DEFORMED))

Replacement in crawl-ref/source/player.cc at line 4451 [3.962854]

B:BD[14.478] → [14.478:538]

        const int eq = you.equip[i];
        if (eq == -1)

[14.478]

[14.538]

        if (!player_wearing_slot(i))

Insertion in crawl-ref/source/player.cc at line 4453 [3.962854]
[14.560]
[14.560]
```
        const int eq = you.equip[i];
```
Deletion in crawl-ref/source/player.cc at line 4495 [3.962854]
B:BD[3.1049235] → [3.1049235:1049250]
```
    int i = 0;
```
Replacement in crawl-ref/source/player.cc at line 4497 [3.962854]
B:BD[3.1049271] → [3.1049271:1049315]
```
    for (i = EQ_WEAPON; i < NUM_EQUIP; i++)
```
[3.1049271]
[3.1049315]
```
    for (int i = EQ_WEAPON; i < NUM_EQUIP; ++i)
```

Replacement in crawl-ref/source/player.cc at line 6691 [3.962854]

B:BD[15.6107] → [15.6107:6160]

               && you.duration[DUR_LEVITATION] > 1);

[15.6107]

[16.1007]

            && you.duration[DUR_LEVITATION] > 1);

Replacement in crawl-ref/source/output.cc at line 1649 [3.1088282]

B:BD[17.2971] → [17.2971:3060]

        snprintf(slot_name_lwr, sizeof slot_name_lwr, "%s", equip_slot_to_name(eqslot));

[17.2971]

[17.3060]

        snprintf(slot_name_lwr, sizeof slot_name_lwr, "%s",
                 equip_slot_to_name(eqslot));

Replacement in crawl-ref/source/output.cc at line 1657 [3.1088282]

B:BD[17.3266] → [10.5307:5795]

        if (!you_can_wear(e_order[i], true))
        {
            snprintf(buf, sizeof buf,
                     "%s<darkgrey>(%s unavailable)</darkgrey>",
                     slot, slot_name_lwr);
        }
        else if (!you_tran_can_wear(e_order[i], true))
        {
            snprintf(buf, sizeof buf,
                     "%s<darkgrey>(%s currently unavailable)</darkgrey>",
                     slot, slot_name_lwr);
        }
        else if (you.equip[ e_order[i] ] != -1)

[17.3266]

[17.3310]

        if (you.equip[ e_order[i] ] != -1)

Replacement in crawl-ref/source/output.cc at line 1673 [3.1088282]

B:BD[10.5806] → [10.5806:5850]

        else if (!you_can_wear(e_order[i]))

[10.5806]

[10.5850]

        else if (e_order[i] == EQ_WEAPON
                 && you.skills[SK_UNARMED_COMBAT])

Replacement in crawl-ref/source/output.cc at line 1676 [3.1088282]

B:BD[10.5860] → [10.5860:6006]

            snprintf(buf, sizeof buf,
                     "%s<lightgrey>(%s restricted)</lightgrey>",
                     slot, slot_name_lwr);

[10.5860]

[17.4108]

            snprintf(buf, sizeof buf, "%s  - Unarmed", slot);

Replacement in crawl-ref/source/output.cc at line 1683 [3.1088282]

B:BD[17.4321] → [17.4321:4413]

        else if (e_order[i] == EQ_WEAPON
                 && you.skills[SK_UNARMED_COMBAT])

[17.4321]

[17.4413]

        else if (e_order[i] == EQ_BOOTS
                 && (you.species == SP_NAGA || you.species == SP_CENTAUR))
        {
            snprintf(buf, sizeof buf,
                     "<darkgrey>(no %s)</darkgrey>", slot_name_lwr);
        }
        else if (!you_can_wear(e_order[i], true))
        {
            snprintf(buf, sizeof buf,
                     "<darkgrey>(%s unavailable)</darkgrey>", slot_name_lwr);
        }
        else if (!you_tran_can_wear(e_order[i], true))
        {
            snprintf(buf, sizeof buf,
                     "<darkgrey>(%s currently unavailable)</darkgrey>",
                     slot_name_lwr);
        }
        else if (!you_can_wear(e_order[i]))

Replacement in crawl-ref/source/output.cc at line 1702 [3.1088282]

B:BD[17.4423] → [17.4423:4485]

            snprintf(buf, sizeof buf, "%s  - Unarmed", slot);

[17.4423]

[17.4700]

            snprintf(buf, sizeof buf,
                     "<lightgrey>(%s restricted)</lightgrey>", slot_name_lwr);

Replacement in crawl-ref/source/dat/descript/items.txt at line 1485 [20.62757]

B:BD[18.47873] → [19.31061:31116]

An extremely powerful but unpredictable book of magic.

[18.47873]

[18.47906]

An extremely powerful but unpredictable book of wild magic.
Warning: Reading may be hazardous to you or your surroundings!

Replacement in crawl-ref/source/acr.cc at line 1858 [3.4397395]

B:BD[21.5021] → [22.3702:3797]

        mprf("Your intelligent, permanent allies are %sforbidden to pick up anything at all.",

[21.5021]

[21.5093]

        mprf("Your intelligent allies are %sforbidden to pick up anything at all.",

Replacement in crawl-ref/source/acr.cc at line 1863 [3.4397395]

B:BD[21.5175] → [22.3798:3893]

        mprf("Your intelligent, permanent allies may %sonly pick up items dropped by allies.",

[21.5175]

[21.5247]

        mprf("Your intelligent allies may %sonly pick up items dropped by allies.",

Replacement in crawl-ref/source/acr.cc at line 1868 [3.4397395]

B:BD[21.5329] → [22.3894:3993]

        mprf("Your intelligent, permanent allies may %spick up anything they need.", now.c_str());

[21.5329]

[21.5405]

        mprf("Your intelligent allies may %spick up anything they need.", now.c_str());

Fix 2448686: some jewellery properties not working properly while transformed.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/unrand.h at line 837 [3.114533]

Replacement in crawl-ref/source/player.cc at line 684 [3.962854]

Insertion in crawl-ref/source/player.cc at line 688 [3.962854]

Replacement in crawl-ref/source/player.cc at line 1004 [3.962854]

Insertion in crawl-ref/source/player.cc at line 1008 [3.962854]

Deletion in crawl-ref/source/player.cc at line 2036 [3.962854]

Replacement in crawl-ref/source/player.cc at line 2037 [3.962854]

Replacement in crawl-ref/source/player.cc at line 2039 [3.962854]

Replacement in crawl-ref/source/player.cc at line 2042 [3.962854]