get_random_armour_type(), and fix it so that it works the same way as before r8681. Sorry for the breakage.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8900 c06c8d41-db1a-0410-9941-cceddc491573
N7OX4IR4OPCSYGLMNZQF6GPVHEZDCOZVKJVKL54CX7HY7OHBD4LQC
E4TSDW2JQI5ZHGUKO5TJG2FBICUL47HF5INLCV7UAXTUPSVGXVBAC
KFULGQQOHWUTXOM3BXCCYPGGVGGY4Z6265XUFRCBPNLTZAEHJZSQC
DTO3EUKWHZ5RJNGNCFYXSOVTIPVXPP637F2W7WFGYKJ7JK7VNKNQC
DCZTGQOKB4UO7GTDDG55NYMJXJIZKPMC75IVEGPEDOLTQHXBNQJQC
PHBACPMH3F34GODHVDKNCMXWU373RJQGVTDLBFCCDLLWDXVYOLTAC
MNYDF64QY6NHYKOAFOGBQJFYU7TZDILXRV23EXJPN4IZOCLSJ2AQC
armtype = random2(ARM_SHIELD); // body armour of some kind
{
// 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);
}
armtype = ARM_DRAGON_HIDE + random2(7); // (ice) dragon/troll/crystal
{
// High-level armours, including troll and some dragon armours.
const armour_type hiarmours[] = { ARM_CRYSTAL_PLATE_MAIL,
ARM_TROLL_HIDE,
ARM_TROLL_LEATHER_ARMOUR,
ARM_DRAGON_HIDE, ARM_DRAGON_ARMOUR,
ARM_ICE_DRAGON_HIDE,
ARM_ICE_DRAGON_ARMOUR };
armtype = RANDOM_ELEMENT(hiarmours);
}
// Other dragon hides/armour or animal skin.
armtype = ARM_STEAM_DRAGON_HIDE + random2(11);
// Animal skins and high-level armours, including the rest of
// the dragon armours.
const armour_type morehiarmours[] = { ARM_ANIMAL_SKIN,
ARM_STEAM_DRAGON_HIDE,
ARM_STEAM_DRAGON_ARMOUR,
ARM_MOTTLED_DRAGON_HIDE,
ARM_MOTTLED_DRAGON_ARMOUR,
ARM_STORM_DRAGON_HIDE,
ARM_STORM_DRAGON_ARMOUR,
ARM_GOLD_DRAGON_HIDE,
ARM_GOLD_DRAGON_ARMOUR,
ARM_SWAMP_DRAGON_HIDE,
ARM_SWAMP_DRAGON_ARMOUR };
armtype = RANDOM_ELEMENT(morehiarmours);