summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemname.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-17 17:26:46 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-17 17:26:46 +0000
commit4cb403f3211066a2c2e131e824ed50f9a83d9c4a (patch)
tree11fed7ea793ea5ffc06d74f085da37fc8c3eba6f /crawl-ref/source/itemname.cc
parent7e4d7e95e692aa3fa32430cd9ddaece5ad96e2fa (diff)
downloadcrawl-ref-4cb403f3211066a2c2e131e824ed50f9a83d9c4a.tar.gz
crawl-ref-4cb403f3211066a2c2e131e824ed50f9a83d9c4a.zip
* Tweak FAQ as suggested in FR 2472030.
* Fix 2515108: stash tracker not being initialized at game start. * Fix 2514024: melded armour hindering melee. * Fix 2512301: =regeneration described as useless for Mummies. * Fix weapon swap prompt when untransforming with monsters in view. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8503 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
-rw-r--r--crawl-ref/source/itemname.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index a6b918dc37..7eacf12918 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -2545,6 +2545,7 @@ bool is_useless_item(const item_def &item, bool temp)
if (!item_type_known(item))
return (false);
+ // Potentially useful.
if (is_artefact(item))
return (false);
@@ -2560,12 +2561,17 @@ bool is_useless_item(const item_def &item, bool temp)
|| you.religion == GOD_TROG);
case RING_LIFE_PROTECTION:
+ return (player_prot_life(false, temp, false) == 3);
+
case RING_HUNGER:
- case RING_REGENERATION:
case RING_SUSTENANCE:
- return (you.is_undead
- && (you.species != SP_VAMPIRE
- || temp && you.hunger_state == HS_STARVING));
+ return (you.species == SP_MUMMY
+ || temp && you.species == SP_VAMPIRE
+ && you.hunger_state == HS_STARVING);
+
+ case RING_REGENERATION:
+ return (temp && you.species == SP_VAMPIRE
+ && you.hunger_state == HS_STARVING);
case RING_SEE_INVISIBLE:
return (player_mutation_level(MUT_ACUTE_VISION));