From a413ee411896f198be84496ce3d99d7af5527b8a Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 7 Aug 2009 14:53:36 +0000 Subject: * Fix capitalization is staff description (2832393). * Use MSGCH_WARN for stat loss messaging (2831539). * Make debug armour acquirement statistics really ignore artefacts when counting egos. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10499 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/debug.cc | 5 +++-- crawl-ref/source/describe.cc | 2 +- crawl-ref/source/effects.cc | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index e7a72aad1a..e9712ea131 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -3307,11 +3307,12 @@ static void _debug_acquirement_stats(FILE *ostat) if (is_artefact(item)) num_arts++; + else if (type == OBJ_ARMOUR) // Exclude artefacts when counting egos. + ego_quants[get_armour_ego_type(item)]++; + // Include artefacts for weapon brands. if (type == OBJ_WEAPONS) ego_quants[get_weapon_brand(item)]++; - else if (type == OBJ_ARMOUR) - ego_quants[get_armour_ego_type(item)]++; destroy_item(item_index, true); diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 25047e2099..ca8c6e66b4 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1919,7 +1919,7 @@ std::string get_item_description( const item_def &item, bool verbose, "$Damage rating: 7 Accuracy rating: +6 " "Attack delay: 120%"; - description << "$$It falls into the 'staves' category."; + description << "$$It falls into the 'Staves' category."; } break; diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 416f860d0b..dee0d8b925 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -663,7 +663,7 @@ bool lose_stat(unsigned char which_stat, unsigned char stat_loss, bool force, // finish outputting message: {dlb} msg += "."; - mpr(msg.c_str()); + mpr(msg.c_str(), statLowered ? MSGCH_WARN : MSGCH_PLAIN); if (newValue < 1) { -- cgit v1.2.3-54-g00ecf