diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 21:29:46 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 21:29:46 +0000 |
| commit | ed2216e8f9a93c5ba091659fd5e4ee5750187e80 (patch) | |
| tree | 7b9d050f00d0d608ace9c00303e29a5501f30605 /crawl-ref/source/shopping.cc | |
| parent | abceff13c3921aa10542fb3079abb3ba113ece41 (diff) | |
| download | crawl-ref-ed2216e8f9a93c5ba091659fd5e4ee5750187e80.tar.gz crawl-ref-ed2216e8f9a93c5ba091659fd5e4ee5750187e80.zip | |
Fix 2028969: excess comma in autoinscriptions of brand-only artefacts.
Also: Tweak inscription prompt.
Fix 2027600: Don't prompt when attacking with inappropriate weapon while
confused.
Fix 2027328: Throwing projectiles at enslaved monsters.
When saccing to Nemelex, count chunks and !blood like corpses (deck of
summoning rather than wonder). Chunks used to be ignored completely but
since they're just chopped up corpses and corpses are worth much more
than 4 per piece I don't think it hurts. (Rotten chunks have a value of
zero.) Also, decrease !blood price to that of !porridge and lower.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6700 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 b383b1e548..8610e3c7ef 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -1284,7 +1284,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; @@ -1297,10 +1296,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: @@ -1353,11 +1355,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; |