fiddlerwoaroof/crawl - Change HKPD4Y2U4A6IJLF6KSWEUT5WYHMQRYZPIOEVULCQLCZ5O6SQZPPQC

After some thought, remove assumptions about armor subtype order again.

There are still some left, but they're mostly checks for armor greater than plate mail, and they still work with the current code.

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

Created by dolorous on February 5, 2009

HKPD4Y2U4A6IJLF6KSWEUT5WYHMQRYZPIOEVULCQLCZ5O6SQZPPQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/makeitem.cc at line 4150 [3.927]
[3.127355]
[4.3964]
```
    {
```

Replacement in crawl-ref/source/makeitem.cc at line 4152 [3.927]

B:BD[4.4001] → [2.2672:2749]

        item.sub_type = ARM_LEATHER_ARMOUR + random2(4); // up to chain mail

[4.4001]

[3.127457]


        const int temp_rand = random2(4);
        item.sub_type = ((temp_rand == 0) ? ARM_LEATHER_ARMOUR :
                         (temp_rand == 1) ? ARM_RING_MAIL :
                         (temp_rand == 2) ? ARM_SCALE_MAIL
                                          : ARM_CHAIN_MAIL);

Insertion in crawl-ref/source/makeitem.cc at line 4159 [3.927]
[3.127472]
[3.127472]
```
    }
```
Insertion in crawl-ref/source/makeitem.cc at line 4180 [3.927]
[3.128006]
[4.4059]
```
    {
```

Replacement in crawl-ref/source/makeitem.cc at line 4182 [3.927]

B:BD[4.4096] → [2.2750:2823]

        item.sub_type = ARM_CHAIN_MAIL + random2(4); // up to plate mail

[4.4096]

[3.128104]


        const int temp_rand = random2(4);
        item.sub_type = ((temp_rand == 0) ? ARM_CHAIN_MAIL :
                         (temp_rand == 1) ? ARM_SPLINT_MAIL :
                         (temp_rand == 2) ? ARM_BANDED_MAIL
                                          : ARM_PLATE_MAIL);

Insertion in crawl-ref/source/makeitem.cc at line 4189 [3.927]
[3.128119]
[3.128119]
```
    }
```

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

B:BD[5.47846] → [2.2824:2921]

    // Default (lowest-level) armours, up to ring mail.
    int armtype = ARM_ROBE + random2(3);

[5.47846]

[6.3269]

    // Default (lowest-level) armours.
    const armour_type defarmours[] = { ARM_ROBE, ARM_LEATHER_ARMOUR,
                                       ARM_RING_MAIL };
    int armtype = RANDOM_ELEMENT(defarmours);

Replacement in crawl-ref/source/makeitem.cc at line 4398 [3.927]

B:BD[5.47927] → [2.2922:3011]

        // Low-level armours, up to chain mail.
        armtype = ARM_ROBE + random2(5);

[5.47927]

[7.3122]

        // Low-level armours.
        const armour_type lowarmours[] = { ARM_ROBE, ARM_LEATHER_ARMOUR,
                                           ARM_RING_MAIL, ARM_SCALE_MAIL,
                                           ARM_CHAIN_MAIL };
        armtype = RANDOM_ELEMENT(lowarmours);

Replacement in crawl-ref/source/makeitem.cc at line 4411 [3.927]

B:BD[7.3177] → [2.3012:3104]

        // Medium-level armours, up to plate mail.
        armtype = ARM_ROBE + random2(8);

[7.3177]

[7.3558]

        // Medium-level armours.
        const armour_type medarmours[] = { ARM_ROBE, ARM_LEATHER_ARMOUR,
                                           ARM_RING_MAIL, ARM_SCALE_MAIL,
                                           ARM_CHAIN_MAIL, ARM_SPLINT_MAIL,
                                           ARM_BANDED_MAIL, ARM_PLATE_MAIL };
        armtype = RANDOM_ELEMENT(medarmours);

Replacement in crawl-ref/source/effects.cc at line 961 [8.3382105]

B:BD[8.3397012] → [9.6413:6483]

            result = static_cast<armour_type>(ARM_ROBE + random2(8));

[8.3397012]

[8.3397262]

            const armour_type armours[] = { ARM_ROBE, ARM_LEATHER_ARMOUR,
                                            ARM_RING_MAIL, ARM_SCALE_MAIL,
                                            ARM_CHAIN_MAIL, ARM_SPLINT_MAIL,
                                            ARM_BANDED_MAIL, ARM_PLATE_MAIL };
            result = static_cast<armour_type>(RANDOM_ELEMENT(armours));