fiddlerwoaroof/crawl - Change WU3E44CEYAC6TWW7M62DXXEJGZO4VJ5TOJALOLAQUNHJGCICWTPAC

Clean up armor subtype handling again. There's other code that relies

on the assumption that the normal armours are in ascending order by AC, from ARM_ROBE to ARM_PLATE_MAIL, so it seems okay to use that for now.

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

Created by dolorous on February 5, 2009

WU3E44CEYAC6TWW7M62DXXEJGZO4VJ5TOJALOLAQUNHJGCICWTPAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/makeitem.cc at line 4125 [4.927]

B:BD[2.4001] → [2.4001:4058]

        item.sub_type = ARM_LEATHER_ARMOUR + random2(4);

[2.4001]

[4.127457]

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

Replacement in crawl-ref/source/makeitem.cc at line 4148 [4.927]

B:BD[2.4096] → [2.4096:4149]

        item.sub_type = ARM_CHAIN_MAIL + random2(4);

[2.4096]

[4.128104]

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

Replacement in crawl-ref/source/makeitem.cc at line 4350 [4.927]

B:BD[5.47846] → [3.2672:2883]

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

[5.47846]

[6.3269]

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

Replacement in crawl-ref/source/makeitem.cc at line 4355 [4.927]

B:BD[5.47927] → [3.2884:3122]

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

[5.47927]

[3.3122]

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

Deletion in crawl-ref/source/makeitem.cc at line 4358 [4.927]
B:BD[3.3123] → [3.3123:3170]
```
        armtype = RANDOM_ELEMENT(lowarmours);
```

Replacement in crawl-ref/source/makeitem.cc at line 4364 [4.927]

B:BD[3.3177] → [3.3177: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);

[3.3177]

[3.3558]

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