FR 1836617: Add item brand for plants (and mimics) in Tiles.

FR 1870291: Give a message when gaining exp for killing monsters 
            outside LOS.
            (This is something the player can find out by checking 
	     their xp pool, anyway, so it's not like it gives 
	     anything away. Currently does not happen for pet kills, 
	     should it?)

Implement 1829910: Make Daevas fully resist negative energy, with the
                   reasoning that TSO will protect them.

Also, fix dragon slaying to actually have an effect on draconian 
players (whoops!) as well as on characters in Dragon Form.


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

1 files changed, 20 insertions, 0 deletions

diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index a95d7a9d41..52337dbee7 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -3625,6 +3625,15 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground)
         const monsters *mon = &menv[idx];
         if (!mons_is_known_mimic(mon))
         {
+            // if necessary add item brand
+            if (igrd[gx][gy] != NON_ITEM)
+            {
+                if (foreground)
+                    t |= TILE_FLAG_S_UNDER;
+                else
+                    t0 |= TILE_FLAG_S_UNDER;
+            }
+
             item_def item;
             get_mimic_item( mon, item );
             if (item_needs_autopickup(item))
@@ -3636,6 +3645,17 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground)
             }
         }
     }
+    else if (menv[idx].holiness() == MH_PLANT)
+    {
+        // if necessary add item brand
+        if (igrd[gx][gy] != NON_ITEM)
+        {
+            if (foreground)
+                t |= TILE_FLAG_S_UNDER;
+            else
+                t0 |= TILE_FLAG_S_UNDER;
+        }
+    }
     else if (menv[idx].type >=  MONS_DRACONIAN &&
              menv[idx].type <= MONS_DRACONIAN_SCORCHER)
     {