fiddlerwoaroof/crawl - Change E4TSDW2JQI5ZHGUKO5TJG2FBICUL47HF5INLCV7UAXTUPSVGXVBAC

Partially fix get_random_armour_type being completely broken (e.g. wizard

hats and caps can get generated again.) get_random_armour_type makes assumptions about the order of armour_type, which were invalidated by r8681; I'm hesitant to touch the order again for fear of breaking something. dolorous, can you check?

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

Created by haranp on February 4, 2009

E4TSDW2JQI5ZHGUKO5TJG2FBICUL47HF5INLCV7UAXTUPSVGXVBAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 7165 [4.1396662]
B:BD[3.7707] → [3.7707:7753]
∅:D[5.4832] → [6.1735:1736]
∅:D[3.7753] → [6.1735:1736]
B:BD[6.1735] → [6.1735:1736]
```
                std::vector<coord_def> moves;
```

Replacement in crawl-ref/source/makeitem.cc at line 4325 [9.927]

B:BD[7.47260] → [8.20971:21085]

            || j == RING_REGENERATION
            || j == RING_TELEPORT_CONTROL
            || j == RING_SLAYING)

[7.47260]

[7.47365]

         || j == RING_REGENERATION
         || j == RING_TELEPORT_CONTROL
         || j == RING_SLAYING)

Insertion in crawl-ref/source/makeitem.cc at line 4359 [9.927]

[7.48033]

[10.9519]

    // FIXME! This makes assumptions about the order of subtypes, and
    // the assumptions are wrong!

Replacement in crawl-ref/source/makeitem.cc at line 4379 [9.927]

B:BD[7.48511] → [11.3031:3097]

B:BD[11.3097] → [12.3225:3450]

∅:D[12.3450] → [11.3440:3450]

B:BD[11.3440] → [11.3440:3450]

        // same chance each
        switch (random2(5))
        {
        case 0: armtype = ARM_SHIELD; break;
        case 1: armtype = ARM_CLOAK;  break;
        case 2: armtype = ARM_HELMET; break;
        case 3: armtype = ARM_GLOVES; break;
        case 4: armtype = ARM_BOOTS;  break;
        }

[7.48511]

[13.3271]

        const armour_type secarmours[] = { ARM_SHIELD, ARM_CLOAK, ARM_HELMET,
                                           ARM_GLOVES, ARM_BOOTS };
        armtype = RANDOM_ELEMENT(secarmours);

Replacement in crawl-ref/source/makeitem.cc at line 4385 [9.927]

B:BD[7.48625] → [11.3515:3562]

            armtype = ARM_HELMET + random2(3);

[7.48625]

[11.3562]

            const armour_type hats[] = { ARM_CAP, ARM_WIZARD_HAT, ARM_HELMET };
            armtype = RANDOM_ELEMENT(hats);

Replacement in crawl-ref/source/makeitem.cc at line 4388 [9.927]

B:BD[11.3572] → [11.3572:3632]

        else if (armtype == ARM_SHIELD)            // 33.3%

[11.3572]

[11.3632]

        else if (armtype == ARM_SHIELD)

Replacement in crawl-ref/source/makeitem.cc at line 4390 [9.927]

∅:D[11.3642] → [7.48625:48812]

B:BD[7.48625] → [7.48625:48812]

            if (coinflip())
                armtype = ARM_BUCKLER;             // 50.0%
            else if (one_chance_in(3))
                armtype = ARM_LARGE_SHIELD;        // 16.7%

[11.3642]

[7.48812]

            armtype = random_choose_weighted(333, ARM_SHIELD,
                                             500, ARM_BUCKLER,
                                             167, ARM_LARGE_SHIELD,
                                             0);

Replacement in crawl-ref/source/itemprop.cc at line 2386 [16.646661]
∅:D[14.27487] → [15.12645:12688]
B:BD[15.12645] → [15.12645:12688]
```
bool gives_ability( const item_def &item )
```
[14.27487]
[15.12688]
```
bool gives_ability(const item_def &item)
```
Replacement in crawl-ref/source/itemprop.cc at line 2397 [16.646661]
B:BD[14.27626] → [14.27626:27674]
```
        if (!weap || (*weap).slot != item.slot)
```
[14.27626]
[14.27674]
```
        if (!weap || weap->slot != item.slot)
```

Replacement in crawl-ref/source/itemprop.cc at line 2408 [16.646661]

B:BD[14.27944] → [14.27944:28058]

            if ((!lring || (*lring).slot != item.slot)
                && (!rring || (*rring).slot != item.slot))

[14.27944]

[14.28058]

            if ((!lring || lring->slot != item.slot)
                && (!rring || rring->slot != item.slot))

Replacement in crawl-ref/source/itemprop.cc at line 2425 [16.646661]

B:BD[14.28454] → [14.28454:28506]

            if (!amul || (*amul).slot != item.slot)

[14.28454]

[14.28506]

            if (!amul || amul->slot != item.slot)

Replacement in crawl-ref/source/itemprop.cc at line 2441 [16.646661]
B:BD[14.28852] → [14.28852:28898]
```
        if (!arm || (*arm).slot != item.slot)
```
[14.28852]
[14.28898]
```
        if (!arm || arm->slot != item.slot)
```
Replacement in crawl-ref/source/itemprop.cc at line 2461 [16.646661]
∅:D[17.2986] → [18.8373:8419]
∅:D[14.29188] → [18.8373:8419]
B:BD[18.8373] → [18.8373:8419]
```
bool gives_resistance( const item_def &item )
```
[17.2986]
[18.8419]
```
bool gives_resistance(const item_def &item)
```
Replacement in crawl-ref/source/itemprop.cc at line 2472 [16.646661]
B:BD[14.29321] → [14.29321:29369]
```
        if (!weap || (*weap).slot != item.slot)
```
[14.29321]
[14.29369]
```
        if (!weap || weap->slot != item.slot)
```
Replacement in crawl-ref/source/itemprop.cc at line 2478 [16.646661]
B:BD[14.29448] → [14.29448:29487]
```
        if (item.sub_type < NUM_RINGS)
```
[14.29448]
[14.29487]
```
        if (!jewellery_is_amulet(item))
```

Replacement in crawl-ref/source/itemprop.cc at line 2481 [16.646661]

B:BD[14.29524] → [14.29524:29757]

            item_def *lring = you.slot_item(EQ_LEFT_RING);
            item_def *rring = you.slot_item(EQ_RIGHT_RING);
            if ((!lring || (*lring).slot != item.slot)
                && (!rring || (*rring).slot != item.slot))

[14.29524]

[14.29757]

            const item_def *lring = you.slot_item(EQ_LEFT_RING);
            const item_def *rring = you.slot_item(EQ_RIGHT_RING);
            if ((!lring || lring->slot != item.slot)
                && (!rring || rring->slot != item.slot))

Replacement in crawl-ref/source/itemprop.cc at line 2502 [16.646661]

B:BD[14.30296] → [14.30296:30403]

            item_def *amul = you.slot_item(EQ_AMULET);
            if (!amul || (*amul).slot != item.slot)

[14.30296]

[14.30403]

            const item_def *amul = you.slot_item(EQ_AMULET);
            if (!amul || amul->slot != item.slot)

Replacement in crawl-ref/source/itemprop.cc at line 2519 [16.646661]
B:BD[14.30784] → [14.30784:30830]
```
        if (!arm || (*arm).slot != item.slot)
```
[14.30784]
[14.30830]
```
        if (!arm || arm->slot != item.slot)
```
Replacement in crawl-ref/source/itemprop.cc at line 2523 [16.646661]
B:BD[19.28441] → [14.30874:30927]
```
        const int ego = get_armour_ego_type( item );
```
[19.28441]
[14.30927]
```
        const int ego = get_armour_ego_type(item);
```
Replacement in crawl-ref/source/itemprop.cc at line 2534 [16.646661]
B:BD[14.31228] → [14.31228:31276]
```
        if (!weap || (*weap).slot != item.slot)
```
[14.31228]
[14.31276]
```
        if (!weap || weap->slot != item.slot)
```

Replacement in crawl-ref/source/effects.cc at line 1148 [4.3382105]

B:BD[2.12017] → [2.12017:12047]

∅:D[2.12047] → [4.3403247:3403257]

B:BD[4.3403247] → [4.3403247:3403257]

B:BD[4.3403257] → [2.12048:12231]

        if (one_chance_in(3))
        {
            result = AMU_FIRST_AMULET
                + random2(NUM_JEWELLERY - AMU_FIRST_AMULET);
        }
        else
        {
            result = random2(NUM_RINGS);
        }

[2.12017]

[4.3403541]

        result = (one_chance_in(3) ? get_random_amulet_type()
                                   : get_random_ring_type());

Partially fix get_random_armour_type being completely broken (e.g. wizard

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/monstuff.cc at line 7165 [4.1396662]

Replacement in crawl-ref/source/makeitem.cc at line 4325 [9.927]

Insertion in crawl-ref/source/makeitem.cc at line 4359 [9.927]

Replacement in crawl-ref/source/makeitem.cc at line 4379 [9.927]

Replacement in crawl-ref/source/makeitem.cc at line 4385 [9.927]

Replacement in crawl-ref/source/makeitem.cc at line 4388 [9.927]

Replacement in crawl-ref/source/makeitem.cc at line 4390 [9.927]

Replacement in crawl-ref/source/itemprop.cc at line 2386 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2397 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2408 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2425 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2441 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2461 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2472 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2478 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2481 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2502 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2519 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2523 [16.646661]

Replacement in crawl-ref/source/itemprop.cc at line 2534 [16.646661]

Replacement in crawl-ref/source/effects.cc at line 1148 [4.3382105]