diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-13 23:28:11 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-13 23:28:11 +0000 |
commit | bd19eb507dcd40d235ab26ae68c7d091aaeecb65 (patch) | |
tree | f0b68ab66a429459cd94ab732ce6be74f21e2e01 /crawl-ref/source | |
parent | 9d0ad4c554253667565a3c0b5d90350ff15b94e7 (diff) | |
download | crawl-ref-bd19eb507dcd40d235ab26ae68c7d091aaeecb65.tar.gz crawl-ref-bd19eb507dcd40d235ab26ae68c7d091aaeecb65.zip |
Fixed "shiny" and "embroidered" items not showing as white in abbreviated
display.
Fix bad merfolk energy.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2455 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/items.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/mon-data.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 1e5d7cb6cc..d14aa7ebd3 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -701,12 +701,16 @@ static int item_name_specialness(const item_def& item) std::string itname = item.name(DESC_PLAIN, false, false, false); lowercase(itname); + // FIXME Maybe we should replace this with a test of ISFLAG_COSMETIC_MASK? const bool item_runed = itname.find("runed ") != std::string::npos; const bool heav_runed = itname.find("heavily ") != std::string::npos; const bool item_glows = itname.find("glowing") != std::string::npos; - if ( item_glows || (item_runed && !heav_runed) ) + if ( item_glows || (item_runed && !heav_runed) || + get_equip_desc(item) == ISFLAG_EMBROIDERED_SHINY ) + { return 1; + } // You can tell artefacts, because they'll have a description which // rules out anything else. diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index b021392e7d..7e77487213 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -3992,7 +3992,7 @@ { {AT_HIT, AF_PLAIN, 14}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} }, { 8, 2, 4, 0 }, 4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, - MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM + 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM } , @@ -4004,7 +4004,7 @@ { {AT_HIT, AF_PLAIN, 10}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} }, { 8, 2, 4, 0 }, 4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, - MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM + 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM } , @@ -4132,4 +4132,3 @@ 8, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT, }, #endif - |