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-04-18 18:46:56 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-18 18:46:56 +0000
commit52635e528e83419737ee28b01286ecd3df9be11a (patch)
treec9b47fa14d928199de8e5dc44d6e1cf6803f1b58 /crawl-ref/source/itemname.cc
parent89b84f43d74acefe2f6e405d39c5e6121111aeb3 (diff)
downloadcrawl-ref-52635e528e83419737ee28b01286ecd3df9be11a.tar.gz
crawl-ref-52635e528e83419737ee28b01286ecd3df9be11a.zip
* Fix Xom's piety wrapping around from 0 -> 255.
* Fix Xom piety 100 (initial state) favouring bad effects. * Limit tension bonus for good effects to 199. * Add penalty for tension 0, so bad effects become more likely without tension. * Revert order of Xom's amusement to actually match the amusement gain. (Was getting "roars with laughter" for gain of 2, etc.) * Add damage shaving to Deep Dwarf ghosts. * Add 'o' to pickup list commands -> stop prompting, start autoexplore. * Default menu_colour_item_class to true in initfile.cc. * Allow autopickup of chunks in Lich form. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9634 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
-rw-r--r--crawl-ref/source/itemname.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 2e4c449cd3..c54cbbc748 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -24,6 +24,7 @@ REVISION("$Rev$");
#include "externs.h"
#include "decks.h"
+#include "describe.h"
#include "food.h"
#include "initfile.h"
#include "invent.h"
@@ -43,11 +44,8 @@ REVISION("$Rev$");
#include "spl-book.h"
#include "state.h"
#include "stuff.h"
+#include "transfor.h"
#include "view.h"
-#include "items.h"
-
-
-#include "describe.h"
id_arr type_ids;
@@ -2613,7 +2611,8 @@ bool is_useless_item(const item_def &item, bool temp)
if (item.sub_type == FOOD_CHUNK
&& (you.has_spell(SPELL_SUBLIMATION_OF_BLOOD)
- || you.has_spell(SPELL_SIMULACRUM)))
+ || you.has_spell(SPELL_SIMULACRUM)
+ || !temp && you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH))
{
return (false);
}