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, 11 insertions, 5 deletions

diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 10334a013b..7b8d7dd3c7 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1032,7 +1032,6 @@ static void eating(unsigned char item_class, int item_type)
         }                       // end base sustenance listing {dlb}
 
         // next, sustenance modifier for carnivores/herbivores {dlb}:
-        // for some reason, sausages do not penalize herbivores {dlb}:
         switch (item_type)
         {
         case FOOD_MEAT_RATION:
@@ -1040,6 +1039,7 @@ static void eating(unsigned char item_class, int item_type)
             herbivore_modifier = -1500;
             break;
         case FOOD_BEEF_JERKY:
+        case FOOD_SAUSAGE:
             carnivore_modifier = 200;
             herbivore_modifier = -200;
             break;
@@ -1096,6 +1096,9 @@ static void eating(unsigned char item_class, int item_type)
                      one_chance_in(4) ? "jerk-a-riffic"
                                       : "delicious");
                 break;
+            case FOOD_SAUSAGE:
+                mpr("That sausage was delicious!");
+                break;
             default:
                 break;
             }
@@ -1168,7 +1171,13 @@ static void eating(unsigned char item_class, int item_type)
                 mprf("Mmm... %s.", SysEnv.crawl_pizza.c_str());
             else
             {
-                temp_rand = random2(9);
+                if (how_carnivorous >= 1) // non-vegetable
+                    temp_rand = 5 + random2(4);
+                else if (how_herbivorous >= 1) // non-meaty
+                    temp_rand = random2(6) + 2;
+                else
+                    temp_rand = random2(9);
+                    
                 mprf("Mmm... %s",
                      (temp_rand == 0) ? "Ham and pineapple." :
                      (temp_rand == 2) ? "Vegetable." :
@@ -1193,9 +1202,6 @@ static void eating(unsigned char item_class, int item_type)
                  (temp_rand == 7) ? "Sheep cheese"
                                   : "Yak cheese");
             break;
-        case FOOD_SAUSAGE:
-            mpr("That sausage was delicious!");
-            break;
         default:
             break;
         }