diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-07 14:53:36 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-07 14:53:36 +0000 |
| commit | a413ee411896f198be84496ce3d99d7af5527b8a (patch) | |
| tree | a018fc55fe1cd152445e127b7000eb2bf67fe33e | |
| parent | a9c6a9b1e9c9055a8d1fe2e9f77cade1cfc1d834 (diff) | |
| download | crawl-ref-a413ee411896f198be84496ce3d99d7af5527b8a.tar.gz crawl-ref-a413ee411896f198be84496ce3d99d7af5527b8a.zip | |
* 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
| -rw-r--r-- | crawl-ref/source/debug.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/describe.cc | 2 | ||||
| -rw-r--r-- | 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) { |