Another variety of changes.

1. Food
- Fix bug 1784968.
- make sausages count as carnivorous food
- make pizza message respect carni/herbivorousness

2. Skills and items
- added note_all_skill_levels as a shortcut for
  note_skill_levels = 1..27
- changed skill progress colour to CYAN
- Harold and Jozef get throwing nets

Also:
- Berserkers can still open and close doors, but they
  do this none too gently and make a lot of noise
- corrected a few mistakes in spells.txt


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2049 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 1 deletions

diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 7df469dd70..522a99f8f6 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -512,8 +512,9 @@ static int find_acquirement_subtype(object_class_type class_wanted,
         {
             // Vampires really don't want any OBJ_FOOD but OBJ_CORPSES
             // but it's easier to just give them a potion of blood
-            class_wanted = OBJ_POTIONS;
+            // class type is set elsewhere
             type_wanted = POT_BLOOD;
+            unique = 2 + random2(4);
         }
         else 
         {
@@ -1146,6 +1147,10 @@ bool acquirement(object_class_type class_wanted, int agent)
         {
             unique = 1;
             int type_wanted = find_acquirement_subtype(class_wanted, unique);
+            
+            // clobber class_wanted for vampires
+            if (you.species == SP_VAMPIRE && class_wanted == OBJ_FOOD)
+                class_wanted = OBJ_POTIONS;
 
             // BCR - unique is now used for food quantity.
             thing_created = items( unique, class_wanted, type_wanted, true,