Setting temporary tiles for new uniques (and adding a real tile for Prince Ribbit.) Also, auto-excluding Roxanne.

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

4 files changed, 22 insertions, 1 deletions

diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 26329261a6..6975ac985a 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -166,7 +166,7 @@ trap_item_brand    = reverse
 # explore_stop     = items,greedy_items,stairs,shops,altars,gates
 # explore_improved = true
 auto_exclude = oklob plant,silver statue,orange crystal statue,ice statue
-auto_exclude = curse skull
+auto_exclude = curse skull,Roxanne
 
 # tc_reachable      = blue
 # tc_dangerous      = cyan
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 5849dabc22..f9785c5235 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -93,6 +93,11 @@ boring_beetle MONS_BORING_BEETLE /*'B'*/
 boulder_beetle MONS_BOULDER_BEETLE /*'B'*/

 

 ## Frogs

+%sdir dc-mon/unique

+%rim 0

+prince_ribbit MONS_PRINCE_RIBBIT

+%rim 1

+%sdir dc-mon/animals

 giant_frog MONS_GIANT_FROG /*'F'*/

 giant_brown_frog MONS_GIANT_BROWN_FROG /*'F'*/

 %rim 0

diff --git a/crawl-ref/source/rltiles/dc-mon/unique/prince_ribbit.png b/crawl-ref/source/rltiles/dc-mon/unique/prince_ribbit.png
new file mode 100644
index 0000000000..477817674a
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/prince_ribbit.png
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 35169255ff..fb4a196b39 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -915,6 +915,20 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
         return TILEP_MONS_BORIS;
     case MONS_MURRAY:
         return TILEP_MONS_MURRAY;
+    case MONS_ROXANNE:
+        return TILEP_ORANGE_CRYSTAL_STATUE; // TODO enne
+    case MONS_SONJA:
+        return TILEP_MONS_KOBOLD; // TODO enne
+    case MONS_AZRAEL:
+        return TILEP_MONS_EFREET; // TODO enne
+    case MONS_ILSUIW:
+        return TILEP_MONS_MERMAID; // TODO enne
+    case MONS_PRINCE_RIBBIT:
+        return TILEP_MONS_PRINCE_RIBBIT;
+    case MONS_NERGALLE:
+        return TILEP_MONS_ORC_SORCERER; // TODO enne
+    case MONS_SAINT_ROKA:
+        return TILEP_MONS_ORC_PRIEST; // TODO enne
 
     // human uniques ('@')
     case MONS_TERENCE:
@@ -967,6 +981,8 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
         return TILEP_MONS_FREDERICK;
     case MONS_MARGERY:
         return TILEP_MONS_MARGERY;
+    case MONS_EUSTACHIO:
+        return TILEP_MONS_HUMAN; // TODO enne
 
     // unique major demons ('&')
     case MONS_MNOLEG: