diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-10 07:41:27 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-10 07:41:27 +0000 |
| commit | aa3717c904d5d25c9f58f5d17e66379966f00a8f (patch) | |
| tree | b0e55eb934017aada2332593ee8aa8979aeb9b58 /crawl-ref/source/item_use.cc | |
| parent | 172979dfbcd139f1adba90624340e9e6e5184cae (diff) | |
| download | crawl-ref-aa3717c904d5d25c9f58f5d17e66379966f00a8f.tar.gz crawl-ref-aa3717c904d5d25c9f58f5d17e66379966f00a8f.zip | |
Move pickup_butcher_tool.txt into (the recently freed) pickup.lua,
re-enable it (whoops) and clean up its code.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5698 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index a704d4c989..e91c6b9296 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -862,8 +862,7 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) if (sub_type == ARM_NAGA_BARDING) can_wear = (you.species == SP_NAGA); - - if (sub_type == ARM_CENTAUR_BARDING) + else if (sub_type == ARM_CENTAUR_BARDING) can_wear = (you.species == SP_CENTAUR); if (!can_wear) @@ -921,14 +920,14 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) if (you.species == SP_NAGA && sub_type == ARM_NAGA_BARDING && (ignore_temporary || !player_is_shapechanged())) { - // it fits + // It fits. return (true); } else if (you.species == SP_CENTAUR && sub_type == ARM_CENTAUR_BARDING && (ignore_temporary || !player_is_shapechanged())) { - // it fits + // It fits. return (true); } else if (slot == EQ_HELMET) @@ -976,13 +975,13 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) } // Giant races - if ((you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE) + if (you.species >= SP_OGRE && you.species <= SP_OGRE_MAGE || player_genus(GENPC_DRACONIAN)) { - if ((sub_type >= ARM_LEATHER_ARMOUR - && sub_type <= ARM_PLATE_MAIL) - || (sub_type >= ARM_GLOVES - && sub_type <= ARM_BUCKLER) + if (sub_type >= ARM_LEATHER_ARMOUR + && sub_type <= ARM_PLATE_MAIL + || sub_type >= ARM_GLOVES + && sub_type <= ARM_BUCKLER || sub_type == ARM_CRYSTAL_PLATE_MAIL || is_hard_helmet(item)) { |