* Fix Xom's interest wrapping around from 0 to 255. (!!!)

* In xom_acts, if Xom was bored (and now did something bad) reroll interest.
* Greatly decrease amusement derived from the player entering a new
  level. (However, entering a new level via escape hatch or shaft is
  REALLY amusing, more so the deeper the shaft.)
* Xom may be amused if you are caught in a net and there are hostile
  monsters around.
* Fix draconian tiles not showing up correctly for Detect Creatures.
* Improve card descriptions output for Triple Draw/Stack Five.
* In inventory, add '&' hotkey for useless (== inedible) chunks.
  Still needs documentation.


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

1 files changed, 11 insertions, 7 deletions

diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 0eb05e8d5c..1dc3c418c5 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -121,7 +121,7 @@ int tileidx_monster_base(const monsters *mon, bool detected)
 
     int type = mon->type;
 
-    // show only base class for detected monsters
+    // Show only base class for detected monsters.
     if (detected)
         type = mons_genus(type);
 
@@ -143,7 +143,7 @@ int tileidx_monster_base(const monsters *mon, bool detected)
     case MONS_GIANT_BAT:
         return TILEP_MONS_GIANT_BAT;
     case MONS_BUTTERFLY:
-        return TILEP_MONS_BUTTERFLY + ((mon->colour)%7);
+        return TILEP_MONS_BUTTERFLY + ((mon->colour) % 7);
 
     // centaurs ('c')
     case MONS_CENTAUR:
@@ -155,6 +155,10 @@ int tileidx_monster_base(const monsters *mon, bool detected)
     case MONS_YAKTAUR_CAPTAIN:
         return TILEP_MONS_YAKTAUR_CAPTAIN + _bow_offset(mon);
 
+    // draconians ('d'):
+    case MONS_DRACONIAN:
+        return TILEP_DRACO_BASE;
+
     // elves ('e')
     case MONS_ELF:
         return TILEP_MONS_ELF;
@@ -740,15 +744,15 @@ int tileidx_monster_base(const monsters *mon, bool detected)
     case MONS_SCROLL_MIMIC:
     case MONS_POTION_MIMIC:
     {
-      // Use item tile
-      item_def  item;
-      get_mimic_item( mon, item );
-      return tileidx_item(item);
+        // Use item tile.
+        item_def  item;
+        get_mimic_item( mon, item );
+        return tileidx_item(item);
     }
 
     case MONS_DANCING_WEAPON:
     {
-        // Use item tile
+        // Use item tile.
         item_def item = mitm[mon->inv[MSLOT_WEAPON]];
         return tileidx_item(item) | TILE_FLAG_ANIM_WEP;
     }