Add tiles for Azrael and Saint Roka.

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

5 files changed, 15 insertions, 13 deletions

diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index ca5bdda264..f2daf59285 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -211,7 +211,11 @@ shadow_imp MONS_SHADOW_IMP
 ufetubus MONS_UFETUBUS

 white_imp MONS_WHITE_IMP

 

-efreet MONS_EFREET /*'E'*/

+# efreet ('E')

+%sdir dc-mon/unique

+azrael MONS_AZRAEL

+%sdir dc-mon/demons

+efreet MONS_EFREET

 

 ## Rakshasa ('R')

 rakshasa MONS_RAKSHASA

@@ -251,9 +255,9 @@ wood_golem MONS_WOOD_GOLEM
 %sdir dc-mon/unique

 roxanne MONS_ROXANNE

 %sdir dc-mon

-ice_statue ICE_STATUE

-silver_statue SILVER_STATUE

-orange_crystal_statue ORANGE_CRYSTAL_STATUE

+ice_statue MONS_ICE_STATUE

+silver_statue MONS_SILVER_STATUE

+orange_crystal_statue MONS_ORANGE_CRYSTAL_STATUE

 

 ## Gargoyles ('9')

 gargoyle MONS_GARGOYLE

@@ -511,6 +515,7 @@ rotting_hulk MONS_ROTTING_HULK
 %sdir dc-mon/unique

 blork_the_orc MONS_BLORK_THE_ORC

 urug MONS_URUG

+saint_roka MONS_SAINT_ROKA

 %sdir dc-mon

 orc MONS_ORC

 orc_wizard MONS_ORC_WIZARD

diff --git a/crawl-ref/source/rltiles/dc-mon/unique/azrael.png b/crawl-ref/source/rltiles/dc-mon/unique/azrael.png
new file mode 100644
index 0000000000..0f6b122e79
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/azrael.png
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/saint_roka.png b/crawl-ref/source/rltiles/dc-mon/unique/saint_roka.png
new file mode 100644
index 0000000000..7304204960
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/saint_roka.png
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 18faa0868f..d17f388910 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1811,9 +1811,6 @@ static void _get_spell_list(std::vector<spell_type> &spell_list, int level,
             continue;
         }
 
-//         if (spell_rarity(spell) == -1)
-//             mprf("chosen spell: %s (%d)", spell_title(spell), spell);
-
         // Passed all tests.
         spell_list.push_back(spell);
     }
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index db9e3c0101..ab9f67a587 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -858,11 +858,11 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
 
     // statues (also '8')
     case MONS_ICE_STATUE:
-        return TILEP_ICE_STATUE;
+        return TILEP_MONS_ICE_STATUE;
     case MONS_SILVER_STATUE:
-        return TILEP_SILVER_STATUE;
+        return TILEP_MONS_SILVER_STATUE;
     case MONS_ORANGE_STATUE:
-        return TILEP_ORANGE_CRYSTAL_STATUE;
+        return TILEP_MONS_ORANGE_CRYSTAL_STATUE;
 
     // gargoyles ('9')
     case MONS_GARGOYLE:
@@ -916,7 +916,7 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
     case MONS_SONJA:
         return TILEP_MONS_KOBOLD; // TODO enne
     case MONS_AZRAEL:
-        return TILEP_MONS_EFREET; // TODO enne
+        return TILEP_MONS_AZRAEL;
     case MONS_ILSUIW:
         if (in_water)
             return TILEP_MONS_ILSUIW_WATER;
@@ -927,7 +927,7 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
     case MONS_NERGALLE:
         return TILEP_MONS_ORC_SORCERER; // TODO enne
     case MONS_SAINT_ROKA:
-        return TILEP_MONS_ORC_WARLORD; // TODO enne
+        return TILEP_MONS_SAINT_ROKA;
     case MONS_NESSOS:
         return TILEP_MONS_NESSOS;
     case MONS_LERNAEAN_HYDRA:
@@ -2636,7 +2636,7 @@ void tileidx_unseen(unsigned int &fg, unsigned int &bg, int ch,
         case '+': fg = TILE_BOOK_PAPER_OFFSET + 15; break;
 
         case '/': fg = TILE_WAND_OFFSET; break;
-        case '8': fg = TILEP_SILVER_STATUE; break;
+        case '8': fg = TILEP_MONS_SILVER_STATUE; break;
         case '<': bg = TILE_DNGN_STONE_STAIRS_UP; break;
         case '=': fg = TILE_RING_NORMAL_OFFSET + 1; break;
         case '>': bg = TILE_DNGN_STONE_STAIRS_DOWN; break;