diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-16 14:58:51 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-16 14:58:51 +0000 |
| commit | 42acab0b7d5738062a3d4efc83002d9ad890381f (patch) | |
| tree | e56f08883a15f1ee79ee5ff234512a25208b433e /crawl-ref/source/itemname.cc | |
| parent | e2e74507bbc5ce16bad61bedc0bd881acdbea280 (diff) | |
| download | crawl-ref-42acab0b7d5738062a3d4efc83002d9ad890381f.tar.gz crawl-ref-42acab0b7d5738062a3d4efc83002d9ad890381f.zip | |
Don't change beam names for tracers. (Fixes 1994978.)
Clean up the vampire ability screen a bit.
Special case naga bardings of running (according to makeitem.cc they can
exist) to be called "naga barding of speedy slithering" instead. Yes,
it's a hack, and yes, the name is rather unwieldy, but it makes more
sense this way. I hope. :p
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5880 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index d557138d8e..9fa9e05cc6 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -214,11 +214,11 @@ std::string item_def::name(description_level_type descrip, equipped = true; } else if (this->link == you.equip[EQ_CLOAK] - || this->link == you.equip[EQ_HELMET] - || this->link == you.equip[EQ_GLOVES] - || this->link == you.equip[EQ_BOOTS] - || this->link == you.equip[EQ_SHIELD] - || this->link == you.equip[EQ_BODY_ARMOUR]) + || this->link == you.equip[EQ_HELMET] + || this->link == you.equip[EQ_GLOVES] + || this->link == you.equip[EQ_BOOTS] + || this->link == you.equip[EQ_SHIELD] + || this->link == you.equip[EQ_BODY_ARMOUR]) { buff << " (worn)"; equipped = true; @@ -1245,9 +1245,15 @@ std::string item_def::name_aux( description_level_type desc, if (sparm != SPARM_NORMAL) { - if ( !terse ) + if (!terse) buff << " of "; - buff << armour_ego_name(sparm, terse); + + // "naga barding of running" doesn't make any sense, and yes, + // they are possible. + if (sub_type == ARM_NAGA_BARDING && sparm == SPARM_RUNNING) + buff << (terse ? "speed" : "speedy slithering"); + else + buff << armour_ego_name(sparm, terse); } } |