* Don't offer rotten chunks for wearers of "otG since it doesn't

  actually allow eating of rotten stuff.
* Tweak Xom's mood descriptions -> shortened to 7.
* Increase chance of Xom acting under tension: 5% -> 10%


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

8 files changed, 22 insertions, 25 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 474b201667..061e5085c2 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1964,8 +1964,9 @@ void process_command( command_type cmd )
         else // well, not examine, but...
            mpr("Unknown command.", MSGCH_EXAMINE_FILTER);
         break;
-
     }
+
+    flush_prev_message();
 }
 
 static void _prep_input()
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 9f31f50935..3f10cf7ce8 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -3050,6 +3050,7 @@ std::string get_monster_equipment_desc(const monsters *mon, bool full_desc,
                 str = "neutral";
 
             if (mon->type == MONS_DANCING_WEAPON
+                || mon-> type == MONS_PANDEMONIUM_DEMON
                 || mons_is_known_mimic(mon))
             {
                 if (!str.empty())
@@ -3057,6 +3058,8 @@ std::string get_monster_equipment_desc(const monsters *mon, bool full_desc,
 
                 if (mon->type == MONS_DANCING_WEAPON)
                     str += "dancing weapon";
+                else if (mon->type == MONS_PANDEMONIUM_DEMON)
+                    str += "pandemonium demon";
                 else
                     str += "mimic";
             }
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 6f9f464e0c..13c0c3d4a7 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -2407,8 +2407,7 @@ static int _player_likes_food_type(int type)
 bool is_inedible(const item_def &item)
 {
     if (food_is_rotten(item)
-        && !player_mutation_level(MUT_SAPROVOROUS)
-        && !wearing_amulet(AMU_THE_GOURMAND))
+        && !player_mutation_level(MUT_SAPROVOROUS))
     {
         return (true);
     }
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 77c3fa3d2b..1ef169b56b 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3255,6 +3255,7 @@ void jewellery_wear_effects(item_def &item)
         break;
 
     case AMU_THE_GOURMAND:
+        // What's this supposed to achieve? (jpeg)
         you.duration[DUR_GOURMAND] = 0;
         break;
 
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index e5165c3022..2b59f5152b 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -1069,7 +1069,7 @@ void more(bool user_forced)
             autoclear_more = true;
     }
     mesclr(true);
-}                               // end more()
+}
 
 static bool is_channel_dumpworthy(msg_channel_type channel)
 {
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index b112896d4b..47ba522857 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -3061,8 +3061,7 @@ bool monster_pathfind::mons_traversable(const coord_def p)
     // Your friends only know about doors you know about, unless they feel
     // at home in this branch.
     if (grd(p) == DNGN_SECRET_DOOR && mons_friendly(mons)
-        && (mons_intel(mons) < I_NORMAL
-            || !mons_is_native_in_branch(mons)))
+        && (mons_intel(mons) < I_NORMAL || !mons_is_native_in_branch(mons)))
     {
         return (false);
     }
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 1f305c67f5..a6fc6c671d 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -4301,21 +4301,18 @@ void tile_draw_floor()
             int bg = TILE_DNGN_UNSEEN | tile_unseen_flag(gc);
 
             int object = show_appearance(ep);
-            if (in_bounds(gc) && object != 0)
+            if (object != 0 && map_bounds(gc))
             {
                 bg = tileidx_feature(object, gc.x, gc.y);
 
-                if (is_travelable_stair((dungeon_feature_type)object)
+                if (in_bounds(gc)
+                    && is_travelable_stair((dungeon_feature_type)object)
                     && !travel_cache.know_stair(gc))
                 {
                     bg |= TILE_FLAG_NEW_STAIR;
                 }
             }
-            else if (map_bounds(gc) && object != 0)
-            {
-                // outside border
-                bg = tileidx_feature(object, gc.x, gc.y);
-            }
+
             // init tiles
             env.tile_bg[ep.x-1][ep.y-1] = bg;
             env.tile_fg[ep.x-1][ep.y-1] = 0;
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index d0b640863d..99d2434fc4 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -104,16 +104,13 @@ const char *describe_xom_favour()
         return "A BORING thing.";
     else
     {
-        return (you.piety > 180) ? "A beloved toy of Xom." :
-               (you.piety > 160) ? "A favourite toy of Xom." :
-               (you.piety > 140) ? "A very special toy of Xom." :
-               (you.piety > 120) ? "A special toy of Xom." :
-               (you.piety > 100) ? "A toy of Xom." :
-               (you.piety >  80) ? "A plaything of Xom." :
-               (you.piety >  60) ? "A special plaything of Xom." :
-               (you.piety >  40) ? "A very special plaything of Xom." :
-               (you.piety >  20) ? "A favourite plaything of Xom."
-                                 : "A beloved plaything of Xom.";
+        return (you.piety > 180) ? "Xom's teddy bear." :
+               (you.piety > 150) ? "A beloved toy of Xom." :
+               (you.piety > 120) ? "A favourite toy of Xom." :
+               (you.piety >  80) ? "A toy of Xom." :
+               (you.piety >  50) ? "A plaything of Xom." :
+               (you.piety >  20) ? "A special plaything of Xom."
+                                 : "A very special plaything of Xom.";
     }
 }
 
@@ -138,7 +135,7 @@ bool xom_is_nice()
     if (you.religion == GOD_XOM)
     {
         // If you.gift_timeout was 0, then Xom was BORED.  He HATES that.
-        return (you.gift_timeout > 0 && you.piety > random2(MAX_PIETY));
+        return (you.gift_timeout > 0 && you.piety >= random2(MAX_PIETY+1));
     }
     else // CARD_XOM
         return coinflip();
@@ -222,7 +219,7 @@ void xom_tick()
     if (you.gift_timeout == 1)
         simple_god_message(" is getting BORED.");
 
-    if (one_chance_in(20))
+    if (one_chance_in(10) && (coinflip() || get_tension(GOD_XOM)))
         xom_acts(abs(you.piety - MAX_PIETY/2));
 }