diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:07:35 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:07:35 +0000 |
| commit | 6bf5bb925649736d9d313011523bdb429c225970 (patch) | |
| tree | c874f9c4aa50725e1d48d7dbb624370e3823e8f2 /crawl-ref/source/shopping.cc | |
| parent | ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7 (diff) | |
| download | crawl-ref-6bf5bb925649736d9d313011523bdb429c225970.tar.gz crawl-ref-6bf5bb925649736d9d313011523bdb429c225970.zip | |
Apply r6700 and r6706: Cleansing Flame harming helpless monsters and
angering TSO, !blood counting towards decks of summoning.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6710 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/shopping.cc')
| -rw-r--r-- | crawl-ref/source/shopping.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index a169778b4a..0766efd39f 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -1155,7 +1155,6 @@ unsigned int item_value( item_def item, bool ident ) case POT_RESTORE_ABILITIES: valued += 50; break; - case POT_BLOOD: case POT_BERSERK_RAGE: case POT_HEAL_WOUNDS: valued += 30; @@ -1168,10 +1167,13 @@ unsigned int item_value( item_def item, bool ident ) case POT_LEVITATION: valued += 20; break; - case POT_BLOOD_COAGULATED: + case POT_BLOOD: case POT_PORRIDGE: valued += 10; break; + case POT_BLOOD_COAGULATED: + valued += 5; + break; case POT_CONFUSION: case POT_DECAY: case POT_DEGENERATION: @@ -1224,11 +1226,14 @@ unsigned int item_value( item_def item, bool ident ) valued = 8; break; + case FOOD_CHUNK: + if (food_is_rotten(item)) + break; + case FOOD_CHOKO: case FOOD_LYCHEE: case FOOD_RAMBUTAN: case FOOD_SNOZZCUMBER: - case FOOD_CHUNK: valued = 4; break; |