diff options
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/xom.cc | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 4e815f5214..77c3fa3d2b 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -873,6 +873,8 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) can_wear = (you.species == SP_NAGA); else if (sub_type == ARM_CENTAUR_BARDING) can_wear = (you.species == SP_CENTAUR); + else + can_wear = (fit_armour_size(item, player_size()) == 0); if (!can_wear) { diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 19ca2226ea..3cfa6f4fc1 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -77,13 +77,13 @@ static armour_def Armour_prop[NUM_ARMOURS] = { ARM_CHAIN_MAIL, "chain mail", 6, -4, 400, false, EQ_BODY_ARMOUR, SIZE_SMALL, SIZE_MEDIUM }, { ARM_BANDED_MAIL, "banded mail", 7, -5, 500, - false, EQ_BODY_ARMOUR, SIZE_MEDIUM, SIZE_MEDIUM }, + false, EQ_BODY_ARMOUR, SIZE_SMALL, SIZE_MEDIUM }, { ARM_SPLINT_MAIL, "splint mail", 8, -5, 550, - false, EQ_BODY_ARMOUR, SIZE_MEDIUM, SIZE_MEDIUM }, + false, EQ_BODY_ARMOUR, SIZE_SMALL, SIZE_MEDIUM }, { ARM_PLATE_MAIL, "plate mail", 10, -6, 650, - false, EQ_BODY_ARMOUR, SIZE_MEDIUM, SIZE_MEDIUM }, + false, EQ_BODY_ARMOUR, SIZE_SMALL, SIZE_MEDIUM }, { ARM_CRYSTAL_PLATE_MAIL, "crystal plate mail", 14, -8, 1200, - false, EQ_BODY_ARMOUR, SIZE_MEDIUM, SIZE_MEDIUM }, + false, EQ_BODY_ARMOUR, SIZE_SMALL, SIZE_MEDIUM }, { ARM_TROLL_HIDE, "troll hide", 2, -1, 220, true, EQ_BODY_ARMOUR, SIZE_LITTLE, SIZE_GIANT }, diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 9f86c9368a..3d06a03eba 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -2182,6 +2182,8 @@ void xom_check_destroyed_item(const item_def& item, int cause) void xom_death_message() { - if (you.religion == GOD_XOM) - god_speaks(GOD_XOM, _get_xom_speech("laughter").c_str()); + if (you.religion != GOD_XOM && (!you.worshipped[GOD_XOM] || coinflip())) + return; + + god_speaks(GOD_XOM, _get_xom_speech("laughter").c_str()); } |