* Move all tiles of animal monsters into a subfolder animals/.

* Reorder dc-mon.txt accordingly, and by difficulty.
* Add the siren tiles I forgot in my last commit.


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

88 files changed, 224 insertions, 189 deletions

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index f0014fcaf6..8c466dfaca 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -2096,7 +2096,7 @@ static monsterentry mondata[] = {
     HT_LAND, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
-// half-breeds ('H')
+// hybrids ('H')
 {
     MONS_HIPPOGRIFF, 'H', BROWN, "hippogriff",
     M_FLIES | M_WARM_BLOOD,
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 70ae82d0ef..846f426cbe 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -1,11 +1,133 @@
 dc-misc/error MONS_PROGRAM_BUG

 

+### Animals

+%sdir dc-mon/animals

+

+## Insects

+giant_cockroach MONS_GIANT_COCKROACH /*'a'*/

+giant_ant MONS_GIANT_ANT /*'a'*/

+soldier_ant MONS_SOLDIER_ANT /*'a'*/

+

+## Batty monsters

+giant_bat MONS_GIANT_BAT /*'b'*/

+butterfly MONS_BUTTERFLY /*'b'*/

+butterfly1

+butterfly2

+butterfly3

+butterfly4

+butterfly5

+butterfly6

+

+## Hounds

+jackal MONS_JACKAL /*'h'*/

+hound MONS_HOUND /*'h'*/

+warg MONS_WARG /*'h'*/

+war_dog MONS_WAR_DOG /*'h'*/

+wolf MONS_WOLF /*'h'*/

+hell_hound MONS_HELL_HOUND /*'h'*/

+hog MONS_HOG /*'h'*/

+hell_hog MONS_HELL_HOG /*'h'*/

+

+bumblebee MONS_BUMBLEBEE /*'k'*/

+killer_bee MONS_KILLER_BEE /*'k'*/

+

+## Lizards

+giant_newt MONS_GIANT_NEWT /*'l'*/

+giant_gecko MONS_GIANT_GECKO /*'l'*/

+giant_iguana MONS_GIANT_IGUANA /*'l'*/

+giant_lizard MONS_GIANT_LIZARD /*'l'*/

+gila_monster MONS_GILA_MONSTER /*'l'*/

+komodo_dragon MONS_KOMODO_DRAGON /*'l'*/

+

+## Slugs

+elephant_slug MONS_ELEPHANT_SLUG /*'j'*/

+giant_slug MONS_GIANT_SLUG /*'j'*/

+giant_snail MONS_GIANT_SNAIL /*'j'*/

+

+## Rodents

+rat MONS_RAT /*'r'*/

+quokka MONS_QUOKKA /*'r'*/

+grey_rat MONS_GREY_RAT /*'r'*/

+green_rat MONS_GREEN_RAT /*'r'*/

+orange_rat MONS_ORANGE_RAT /*'r'*/

+

+## Spiders

+giant_centipede MONS_GIANT_CENTIPEDE /*'s'*/

+giant_mite MONS_GIANT_MITE /*'s'*/

+scorpion MONS_SCORPION /*'s'*/

+wolf_spider MONS_WOLF_SPIDER /*'s'*/

+trapdoor_spider MONS_TRAPDOOR_SPIDER /*'s'*/

+redback MONS_REDBACK /*'s'*/

+

+## Worms and larvae

+killer_bee_larva MONS_ANT_LARVA /*'w'*/

+killer_bee_larva MONS_KILLER_BEE_LARVA /*'w'*/

+worm MONS_WORM /*'w'*/

+swamp_worm MONS_SWAMP_WORM /*'w'*/

+spiny_worm MONS_SPINY_WORM /*'w'*/

+lava_worm MONS_LAVA_WORM /*'w'*/

+brain_worm MONS_BRAIN_WORM /*'w'*/

+rock_worm MONS_ROCK_WORM /*'w' currently unused*/

+

+## Flying insects

+yellow_wasp MONS_YELLOW_WASP /*'y'*/

+giant_blowfly MONS_GIANT_BLOWFLY /*'y'*/

+giant_mosquito MONS_GIANT_MOSQUITO /*'y'*/

+red_wasp MONS_RED_WASP /*'y'*/

+moth_of_wrath MONS_MOTH_OF_WRATH /*'y'*/

+

+## Aquatics

+big_fish MONS_BIG_FISH /*';'*/

+giant_goldfish MONS_GIANT_GOLDFISH /*';'*/

+electrical_eel MONS_ELECTRICAL_EEL /*';'*/

+lava_fish MONS_LAVA_FISH /*';'*/

+jellyfish MONS_JELLYFISH /*'J'*/

+

+## Beetles

+giant_beetle MONS_GIANT_BEETLE /*'B'*/

+boring_beetle MONS_BORING_BEETLE /*'B'*/

+boulder_beetle MONS_BOULDER_BEETLE /*'B'*/

+

+## Frogs

+giant_frog MONS_GIANT_FROG /*'F'*/

+giant_brown_frog MONS_GIANT_BROWN_FROG /*'F'*/

+%rim 0

+blink_frog MONS_BLINK_FROG /*'F'*/

+%rim 1

+spiny_frog MONS_SPINY_FROG /*'F'*/

+

+queen_ant MONS_QUEEN_ANT /*'Q'*/

+queen_bee MONS_QUEEN_BEE /*'Q'*/

+

+small_snake MONS_SMALL_SNAKE /*'S'*/

+snake MONS_SNAKE /*'S'*/

+black_snake MONS_BLACK_SNAKE /*'S'*/

+brown_snake MONS_BROWN_SNAKE /*'S'*/

+grey_snake MONS_GREY_SNAKE /*'S'*/

+lava_snake MONS_LAVA_SNAKE /*'S'*/

+yellow_snake MONS_YELLOW_SNAKE /*'S'*/

+salamander MONS_SALAMANDER /*'S'*/

+

+bear MONS_BEAR /*'U'*/

+black_bear MONS_BLACK_BEAR /*'U'*/

+grizzly_bear MONS_GRIZZLY_BEAR /*'U'*/

+polar_bear MONS_POLAR_BEAR /*'U'*/

+

+sheep MONS_SHEEP /*'Y'*/

+yak MONS_YAK /*'Y'*/

+death_yak MONS_DEATH_YAK /*'Y'*/

+

+### Non-animal monsters

 %sdir dc-mon

 %rim 0

 shadow MONS_SHADOW /*' '*/

 %rim 1

 earth_elemental MONS_EARTH_ELEMENTAL /*'#'*/

 fire_elemental MONS_FIRE_ELEMENTAL /*'#'*/

+water_elemental MONS_WATER_ELEMENTAL /*'{'*/

+air_elemental MONS_AIR_ELEMENTAL /*'v'*/

+fire_vortex MONS_FIRE_VORTEX /*'v'*/

+spatial_vortex MONS_SPATIAL_VORTEX /*'v'*/

 %rim 0

 vapour MONS_VAPOUR /*'#'*/

 %rim 1

@@ -79,21 +201,27 @@ stone_golem MONS_STONE_GOLEM /*'8'*/
 toenail_golem MONS_TOENAIL_GOLEM /*'8'*/

 wood_golem MONS_WOOD_GOLEM /*'8'*/

 

-## Aquatics

-big_fish MONS_BIG_FISH /*';'*/

-electrical_eel MONS_ELECTRICAL_EEL /*';'*/

-giant_goldfish MONS_GIANT_GOLDFISH /*';'*/

-lava_fish MONS_LAVA_FISH /*';'*/

+## Statues

+%sdir dc-dngn

+dngn_ice_statue ICE_STATUE /*'8'*/

+dngn_silver_statue SILVER_STATUE /*'8'*/

+dngn_orange_crystal_statue ORANGE_CRYSTAL_STATUE /*'8'*/

+%sdir dc-mon

+

+## Gargoyles

+gargoyle MONS_GARGOYLE /*'9'*/

+metal_gargoyle MONS_METAL_GARGOYLE /*'9'*/

+molten_gargoyle MONS_MOLTEN_GARGOYLE /*'9'*/

 

 ## Humans

-shapeshifter MONS_SHAPESHIFTER /*'@'*/

-glowing_shapeshifter MONS_GLOWING_SHAPESHIFTER /*'@'*/

-killer_klown MONS_KILLER_KLOWN /*'@'*/

-vault_guard0 MONS_VAULT_GUARD /*'@'*/

+human MONS_HUMAN /*'@'*/

 hell_knight MONS_HELL_KNIGHT /*'@'*/

 necromancer MONS_NECROMANCER /*'@'*/

 wizard MONS_WIZARD /*'@'*/

-human MONS_HUMAN /*'@'*/

+vault_guard0 MONS_VAULT_GUARD /*'@'*/

+shapeshifter MONS_SHAPESHIFTER /*'@'*/

+glowing_shapeshifter MONS_GLOWING_SHAPESHIFTER /*'@'*/

+killer_klown MONS_KILLER_KLOWN /*'@'*/

 

 %sdir dc-mon/unique

 ## Unique human, in alphabetical order

@@ -127,30 +255,31 @@ wayne MONS_WAYNE /*'@'*/
 angel MONS_ANGEL /*'A'*/

 daeva MONS_DAEVA /*'A'*/

 

-## Beetles

-boring_beetle MONS_BORING_BEETLE /*'B'*/

-boulder_beetle MONS_BOULDER_BEETLE /*'B'*/

-giant_beetle MONS_GIANT_BEETLE /*'B'*/

-

 ## Giants

 %sdir dc-mon/unique

 antaeus MONS_ANTAEUS /*'C'*/

 polyphemus MONS_POLYPHEMUS

 %sdir dc-mon

-cyclops MONS_CYCLOPS /*'C'*/

+hill_giant MONS_HILL_GIANT /*'C'*/

 ettin MONS_ETTIN /*'C'*/

+cyclops MONS_CYCLOPS /*'C'*/

 fire_giant MONS_FIRE_GIANT /*'C'*/

 frost_giant MONS_FROST_GIANT /*'C'*/

-hill_giant MONS_HILL_GIANT /*'C'*/

 stone_giant MONS_STONE_GIANT /*'C'*/

 titan MONS_TITAN /*'C'*/

 

+## drakes

+swamp_drake MONS_SWAMP_DRAKE /*'d'*/

+firedrake MONS_FIREDRAKE /*'d'*/

+lindwurm MONS_LINDWURM /*'d'*/

+death_drake MONS_DEATH_DRAKE /*'d'*/

+

 ## Dragons

 %sdir dc-mon/unique

 xtahua MONS_XTAHUA /*'D'*/

 %sdir dc-mon

+wyvern MONS_WYVERN /*'D'*/

 dragon MONS_DRAGON /*'D'*/

-golden_dragon MONS_GOLDEN_DRAGON /*'D'*/

 hydra1 MONS_HYDRA /*'D'*/

 hydra2

 hydra3

@@ -159,129 +288,106 @@ hydra5
 hydra5

 hydra5

 ice_dragon MONS_ICE_DRAGON /*'D'*/

-iron_dragon MONS_IRON_DRAGON /*'D'*/

+steam_dragon MONS_STEAM_DRAGON /*'D'*/

+swamp_dragon MONS_SWAMP_DRAGON /*'D'*/

+mottled_dragon MONS_MOTTLED_DRAGON /*'D'*/

 quicksilver_dragon MONS_QUICKSILVER_DRAGON /*'D'*/

-serpent_of_hell MONS_SERPENT_OF_HELL /*'D'*/

+iron_dragon MONS_IRON_DRAGON /*'D'*/

+storm_dragon MONS_STORM_DRAGON /*'D'*/

+golden_dragon MONS_GOLDEN_DRAGON /*'D'*/

 shadow_dragon MONS_SHADOW_DRAGON /*'D'*/

 skeletal_dragon MONS_SKELETAL_DRAGON /*'D'*/

-storm_dragon MONS_STORM_DRAGON /*'D'*/

-swamp_dragon MONS_SWAMP_DRAGON /*'D'*/

-wyvern MONS_WYVERN /*'D'*/

+serpent_of_hell MONS_SERPENT_OF_HELL /*'D'*/

 

 ## Efreet only

 efreet MONS_EFREET /*'E'*/

 

-## Frogs

-%rim 0

-blink_frog MONS_BLINK_FROG /*'F'*/

-%rim 1

-giant_brown_frog MONS_GIANT_BROWN_FROG /*'F'*/

-giant_frog MONS_GIANT_FROG /*'F'*/

-spiny_frog MONS_SPINY_FROG /*'F'*/

-

 ## Eyes

-eye_of_devastation MONS_EYE_OF_DEVASTATION /*'G'*/

-eye_of_draining MONS_EYE_OF_DRAINING /*'G'*/

+giant_spore MONS_GIANT_SPORE /*'G'*/

 giant_eyeball MONS_GIANT_EYEBALL /*'G'*/

+eye_of_draining MONS_EYE_OF_DRAINING /*'G'*/

 giant_orange_brain MONS_GIANT_ORANGE_BRAIN /*'G'*/

-giant_spore MONS_GIANT_SPORE /*'G'*/

 great_orb_of_eyes MONS_GREAT_ORB_OF_EYES /*'G'*/

 shining_eye MONS_SHINING_EYE /*'G'*/

+eye_of_devastation MONS_EYE_OF_DEVASTATION /*'G'*/

 

 ## Hybrids

-griffon MONS_GRIFFON /*'H'*/

 hippogriff MONS_HIPPOGRIFF /*'H'*/

+manticore MONS_MANTICORE /*'H'*/

+griffon MONS_GRIFFON /*'H'*/

 sphinx MONS_SPHINX /*'H'*/

 

 ## Ice beast only

 ice_beast MONS_ICE_BEAST /*'I'*/

 

 ## Jellies

-acid_blob MONS_ACID_BLOB /*'J'*/

-azure_jelly MONS_AZURE_JELLY /*'J'*/

-brown_ooze MONS_BROWN_OOZE /*'J'*/

-death_ooze MONS_DEATH_OOZE /*'J'*/

-giant_amoeba MONS_GIANT_AMOEBA /*'J'*/

-jelly MONS_JELLY /*'J'*/

-jellyfish MONS_JELLYFISH /*'J'*/

 ooze MONS_OOZE /*'J'*/

+jelly MONS_JELLY /*'J'*/

+slime_creature MONS_SLIME_CREATURE /*'J'*/

 pulsating_lump MONS_PULSATING_LUMP /*'J'*/

+giant_amoeba MONS_GIANT_AMOEBA /*'J'*/

+brown_ooze MONS_BROWN_OOZE /*'J'*/

+azure_jelly MONS_AZURE_JELLY /*'J'*/

+death_ooze MONS_DEATH_OOZE /*'J'*/

+acid_blob MONS_ACID_BLOB /*'J'*/

 royal_jelly MONS_ROYAL_JELLY /*'J'*/

-slime_creature MONS_SLIME_CREATURE /*'J'*/

 

 ## Kobolds

-big_kobold MONS_BIG_KOBOLD /*'K'*/

 kobold MONS_KOBOLD /*'K'*/

+big_kobold MONS_BIG_KOBOLD /*'K'*/

 kobold_demonologist MONS_KOBOLD_DEMONOLOGIST /*'K'*/

 

 ## Liches

 %sdir dc-mon/unique

 boris MONS_BORIS /*'L'*/

 %sdir dc-mon

-ancient_lich MONS_ANCIENT_LICH /*'L'*/

 lich MONS_LICH /*'L'*/

+ancient_lich MONS_ANCIENT_LICH /*'L'*/

 

 ## Mummies

-greater_mummy MONS_GREATER_MUMMY /*'M'*/

-guardian_mummy MONS_GUARDIAN_MUMMY /*'M'*/

 mummy MONS_MUMMY /*'M'*/

+guardian_mummy MONS_GUARDIAN_MUMMY /*'M'*/

+greater_mummy MONS_GREATER_MUMMY /*'M'*/

 mummy_priest MONS_MUMMY_PRIEST /*'M'*/

 

 ## Nagas

 naga0 MONS_NAGA /*'N'*/

-greater_naga0 MONS_GREATER_NAGA /*'N'*/

-naga_warrior0 MONS_NAGA_WARRIOR /*'N'*/

 guardian_naga MONS_GUARDIAN_NAGA /*'N'*/

 naga_mage MONS_NAGA_MAGE /*'N'*/

+naga_warrior0 MONS_NAGA_WARRIOR /*'N'*/

+greater_naga0 MONS_GREATER_NAGA /*'N'*/

 

 %sdir dc-mon/unique

 erolcha MONS_EROLCHA /*'O'*/

 %sdir dc-mon

 ogre MONS_OGRE /*'O'*/

-ogre_mage MONS_OGRE_MAGE /*'O'*/

 two_headed_ogre MONS_TWO_HEADED_OGRE /*'O'*/

+ogre_mage MONS_OGRE_MAGE /*'O'*/

 

-oklob_plant MONS_OKLOB_PLANT /*'P'*/

 plant MONS_PLANT /*'P'*/

-

-queen_ant MONS_QUEEN_ANT /*'Q'*/

-queen_bee MONS_QUEEN_BEE /*'Q'*/

+oklob_plant MONS_OKLOB_PLANT /*'P'*/

 

 rakshasa MONS_RAKSHASA /*'R'*/

 rakshasa MONS_RAKSHASA_FAKE /*'R'*/

 

-black_snake MONS_BLACK_SNAKE /*'S'*/

-brown_snake MONS_BROWN_SNAKE /*'S'*/

-grey_snake MONS_GREY_SNAKE /*'S'*/

-lava_snake MONS_LAVA_SNAKE /*'S'*/

-salamander MONS_SALAMANDER /*'S'*/

-small_snake MONS_SMALL_SNAKE /*'S'*/

-snake MONS_SNAKE /*'S'*/

-yellow_snake MONS_YELLOW_SNAKE /*'S'*/

-

 %sdir dc-mon/unique

 snorg MONS_SNORG /*'T'*/

 %sdir dc-mon

-deep_troll MONS_DEEP_TROLL /*'T'*/

-iron_troll MONS_IRON_TROLL /*'T'*/

-rock_troll MONS_ROCK_TROLL /*'T'*/

 troll MONS_TROLL /*'T'*/

-

-bear MONS_BEAR /*'U'*/

-black_bear MONS_BLACK_BEAR /*'U'*/

-grizzly_bear MONS_GRIZZLY_BEAR /*'U'*/

-polar_bear MONS_POLAR_BEAR /*'U'*/

+rock_troll MONS_ROCK_TROLL /*'T'*/

+iron_troll MONS_IRON_TROLL /*'T'*/

+deep_troll MONS_DEEP_TROLL /*'T'*/

 

 vampire MONS_VAMPIRE /*'V'*/

 vampire_knight MONS_VAMPIRE_KNIGHT /*'V'*/

 vampire_mage MONS_VAMPIRE_MAGE /*'V'*/

 

-freezing_wraith MONS_FREEZING_WRAITH /*'W'*/

-shadow_wraith MONS_SHADOW_WRAITH /*'W'*/

-spectral_thing MONS_SPECTRAL_THING /*'W'*/

-spectral_warrior MONS_SPECTRAL_WARRIOR /*'W'*/

 wight MONS_WIGHT /*'W'*/

 wraith MONS_WRAITH /*'W'*/

+shadow_wraith MONS_SHADOW_WRAITH /*'W'*/

+freezing_wraith MONS_FREEZING_WRAITH /*'W'*/

+spectral_warrior MONS_SPECTRAL_WARRIOR /*'W'*/

+spectral_thing MONS_SPECTRAL_THING /*'W'*/

 

 abomination_large MONS_ABOMINATION_LARGE /*'X'*/

 abomination_large1

@@ -290,29 +396,12 @@ abomination_large3
 abomination_large4

 abomination_large5

 abomination_large6

-orb_guardian MONS_ORB_GUARDIAN /*'X'*/

 tentacled_monstrosity MONS_TENTACLED_MONSTROSITY /*'X'*/

+orb_guardian MONS_ORB_GUARDIAN /*'X'*/

 

-death_yak MONS_DEATH_YAK /*'Y'*/

-sheep MONS_SHEEP /*'Y'*/

-yak MONS_YAK /*'Y'*/

-

-simulacrum_large MONS_SIMULACRUM_LARGE /*'Z'*/

-skeleton_large MONS_SKELETON_LARGE /*'Z'*/

 zombie_large MONS_ZOMBIE_LARGE /*'Z'*/

-

-giant_ant MONS_GIANT_ANT /*'a'*/

-giant_cockroach MONS_GIANT_COCKROACH /*'a'*/

-soldier_ant MONS_SOLDIER_ANT /*'a'*/

-

-butterfly MONS_BUTTERFLY /*'b'*/

-butterfly1

-butterfly2

-butterfly3

-butterfly4

-butterfly5

-butterfly6

-giant_bat MONS_GIANT_BAT /*'b'*/

+skeleton_large MONS_SKELETON_LARGE /*'Z'*/

+simulacrum_large MONS_SIMULACRUM_LARGE /*'Z'*/

 

 centaur MONS_CENTAUR /*'c'*/

 centaur-melee MONS_CENTAUR_MELEE

@@ -323,13 +412,6 @@ yaktaur-melee MONS_YAKTAUR_MELEE
 yaktaur_captain MONS_YAKTAUR_CAPTAIN /*'c'*/

 yaktaur_captain-melee MONS_YAKTAUR_CAPTAIN_MELEE

 

-firedrake MONS_FIREDRAKE /*'d'*/

-lindwurm MONS_LINDWURM /*'d'*/

-mottled_dragon MONS_MOTTLED_DRAGON /*'d'*/

-steam_dragon MONS_STEAM_DRAGON /*'d'*/

-swamp_drake MONS_SWAMP_DRAKE /*'d'*/

-death_drake MONS_DEATH_DRAKE /*'d'*/

-

 elf MONS_ELF /*'e'*/

 deep_elf_fighter0 MONS_DEEP_ELF_FIGHTER /*'e'*/

 deep_elf_soldier0 MONS_DEEP_ELF_SOLDIER /*'e'*/

@@ -356,35 +438,15 @@ goblin0 MONS_GOBLIN /*'g'*/
 hobgoblin0 MONS_HOBGOBLIN /*'g'*/

 gnoll0 MONS_GNOLL /*'g'*/

 boggart MONS_BOGGART /*'g'*/

-gargoyle MONS_GARGOYLE /*'g'*/

-metal_gargoyle MONS_METAL_GARGOYLE /*'g'*/

-molten_gargoyle MONS_MOLTEN_GARGOYLE /*'g'*/

-

-hell_hog MONS_HELL_HOG /*'h'*/

-hell_hound MONS_HELL_HOUND /*'h'*/

-hog MONS_HOG /*'h'*/

-hound MONS_HOUND /*'h'*/

-warg MONS_WARG /*'h'*/

-war_dog MONS_WAR_DOG /*'h'*/

-wolf MONS_WOLF /*'h'*/

-

-jackal MONS_JACKAL /*'j'*/

-

-bumblebee MONS_BUMBLEBEE /*'k'*/

-killer_bee MONS_KILLER_BEE /*'k'*/

 

-giant_gecko MONS_GIANT_GECKO /*'l'*/

-giant_iguana MONS_GIANT_IGUANA /*'l'*/

-giant_lizard MONS_GIANT_LIZARD /*'l'*/

-giant_newt MONS_GIANT_NEWT /*'l'*/

-gila_monster MONS_GILA_MONSTER /*'l'*/

-komodo_dragon MONS_KOMODO_DRAGON /*'l'*/

+merfolk_fighter MONS_MERFOLK_FIGHTER /*'m'*/

+merfolk_fighter_water MONS_MERFOLK_FIGHTER_WATER

+mermaid MONS_MERMAID /*'m'*/

+mermaid_water MONS_MERMAID_WATER

+siren MONS_SIREN /*'m'*/

+siren_water MONS_SIREN_WATER

 

-elephant_slug MONS_ELEPHANT_SLUG /*'m'*/

-giant_slug MONS_GIANT_SLUG /*'m'*/

-giant_snail MONS_GIANT_SNAIL /*'m'*/

-manticore MONS_MANTICORE /*'m'*/

-minotaur MONS_MINOTAUR /*'m'*/

+minotaur MONS_MINOTAUR /*'t'*/

 

 ghoul MONS_GHOUL /*'n'*/

 necrophage MONS_NECROPHAGE /*'n'*/

@@ -395,86 +457,39 @@ blork_the_orc MONS_BLORK_THE_ORC /*'o'*/
 urug MONS_URUG /*'o'*/

 %sdir dc-mon

 orc0 MONS_ORC /*'o'*/

+orc_wizard MONS_ORC_WIZARD /*'o'*/

+orc_priest MONS_ORC_PRIEST /*'o'*/

 orc_warrior0 MONS_ORC_WARRIOR /*'o'*/

 orc_knight0 MONS_ORC_KNIGHT /*'o'*/

 orc_warlord0 MONS_ORC_WARLORD /*'o'*/

-orc_priest MONS_ORC_PRIEST /*'o'*/

-orc_high_priest MONS_ORC_HIGH_PRIEST /*'o'*/

 orc_sorcerer MONS_ORC_SORCERER /*'o'*/

-orc_wizard MONS_ORC_WIZARD /*'o'*/

+orc_high_priest MONS_ORC_HIGH_PRIEST /*'o'*/

 

-flayed_ghost MONS_FLAYED_GHOST /*'p'*/

-hungry_ghost MONS_HUNGRY_GHOST /*'p'*/

 %rim 0

 insubstantial_wisp MONS_INSUBSTANTIAL_WISP /*'p'*/

 phantom MONS_PHANTOM /*'p'*/

 ghost MONS_PLAYER_GHOST /*'p'*/

 %rim 1

-

-green_rat MONS_GREEN_RAT /*'r'*/

-grey_rat MONS_GREY_RAT /*'r'*/

-orange_rat MONS_ORANGE_RAT /*'r'*/

-quokka MONS_QUOKKA /*'r'*/

-rat MONS_RAT /*'r'*/

-

-giant_centipede MONS_GIANT_CENTIPEDE /*'s'*/

-giant_mite MONS_GIANT_MITE /*'s'*/

-scorpion MONS_SCORPION /*'s'*/

-wolf_spider MONS_WOLF_SPIDER /*'s'*/

-trapdoor_spider MONS_TRAPDOOR_SPIDER /*'s'*/

-redback MONS_REDBACK /*'s'*/

+flayed_ghost MONS_FLAYED_GHOST /*'p'*/

+hungry_ghost MONS_HUNGRY_GHOST /*'p'*/

 

 ugly_thing MONS_UGLY_THING /*'u'*/

 very_ugly_thing MONS_VERY_UGLY_THING /*'u'*/

 

-air_elemental MONS_AIR_ELEMENTAL /*'v'*/

-fire_vortex MONS_FIRE_VORTEX /*'v'*/

-spatial_vortex MONS_SPATIAL_VORTEX /*'v'*/

-

-killer_bee_larva MONS_ANT_LARVA /*'w'*/

-brain_worm MONS_BRAIN_WORM /*'w'*/

-killer_bee_larva MONS_KILLER_BEE_LARVA /*'w'*/

-lava_worm MONS_LAVA_WORM /*'w'*/

-spiny_worm MONS_SPINY_WORM /*'w'*/

-swamp_worm MONS_SWAMP_WORM /*'w'*/

-worm MONS_WORM /*'w'*/

-rock_worm MONS_ROCK_WORM /*'w' currently unused*/

-

-abomination_small MONS_ABOMINATION_SMALL /*'x'*/

 unseen_horror MONS_UNSEEN_HORROR /*'x'*/

+abomination_small MONS_ABOMINATION_SMALL /*'x'*/

 

-giant_blowfly MONS_GIANT_BLOWFLY /*'y'*/

-giant_mosquito MONS_GIANT_MOSQUITO /*'y'*/

-moth_of_wrath MONS_MOTH_OF_WRATH /*'y'*/

-red_wasp MONS_RED_WASP /*'y'*/

-yellow_wasp MONS_YELLOW_WASP /*'y'*/

-

+zombie_small MONS_ZOMBIE_SMALL /*'z'*/

+skeleton_small MONS_SKELETON_SMALL /*'z'*/

+simulacrum_small MONS_SIMULACRUM_SMALL /*'z'*/

+skeletal_warrior0 MONS_SKELETAL_WARRIOR /*'z'*/

+flaming_corpse MONS_FLAMING_CORPSE /*'z'*/

 %sdir dc-mon/unique

 murray MONS_MURRAY

 %sdir dc-mon

 curse_skull MONS_CURSE_SKULL /*'z'*/

 curse_toe MONS_CURSE_TOE /*'z'*/

 flying_skull MONS_FLYING_SKULL /*'z'*/

-simulacrum_small MONS_SIMULACRUM_SMALL /*'z'*/

-skeletal_warrior0 MONS_SKELETAL_WARRIOR /*'z'*/

-skeleton_small MONS_SKELETON_SMALL /*'z'*/

-zombie_small MONS_ZOMBIE_SMALL /*'z'*/

-flaming_corpse MONS_FLAMING_CORPSE /*'z'*/

-

-water_elemental MONS_WATER_ELEMENTAL /*'{'*/

-

-merfolk_fighter MONS_MERFOLK_FIGHTER

-merfolk_fighter_water MONS_MERFOLK_FIGHTER_WATER

-mermaid MONS_MERMAID

-mermaid_water MONS_MERMAID_WATER

-siren MONS_SIREN

-siren_water MONS_SIREN_WATER

-

-%sdir dc-dngn

-dngn_orange_crystal_statue ORANGE_CRYSTAL_STATUE

-dngn_ice_statue ICE_STATUE

-dngn_silver_statue SILVER_STATUE

-%sdir dc-mon

 

 %sdir dc-mon/unique

 tiamat MONS_TIAMAT

diff --git a/crawl-ref/source/rltiles/dc-mon/animals/animals.txt b/crawl-ref/source/rltiles/dc-mon/animals/animals.txt
new file mode 100644
index 0000000000..e06ad01866
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/animals/animals.txt
@@ -0,0 +1,20 @@
+Contains all monsters with the following ASCII glyphs:
+a (insects)
+b (bat, butterflies)
+h (hounds)
+j (slugs)
+k (bees)
+l (lizards) but not drakes (also l)
+r (rodents)
+s (spiders, scorpion)
+w (worms)
+y (flying insects)
+B (beetles) but not program bug
+F (frogs)
+Q (queen insects)
+S (snakes)
+U (bears)
+Y (yaks, sheep)
+; (fish) and jellyfish (J)
+
+See mon-data.h.
\ No newline at end of file
diff --git a/crawl-ref/source/rltiles/dc-mon/bear.png b/crawl-ref/source/rltiles/dc-mon/animals/bear.png
index e8fabc1ede..e8fabc1ede 100644
--- a/crawl-ref/source/rltiles/dc-mon/bear.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/bear.png
diff --git a/crawl-ref/source/rltiles/dc-mon/big_fish.png b/crawl-ref/source/rltiles/dc-mon/animals/big_fish.png
index c542cfeb80..c542cfeb80 100644
--- a/crawl-ref/source/rltiles/dc-mon/big_fish.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/big_fish.png
diff --git a/crawl-ref/source/rltiles/dc-mon/black_bear.png b/crawl-ref/source/rltiles/dc-mon/animals/black_bear.png
index c092d49494..c092d49494 100644
--- a/crawl-ref/source/rltiles/dc-mon/black_bear.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/black_bear.png
diff --git a/crawl-ref/source/rltiles/dc-mon/black_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/black_snake.png
index 74b35a58f3..74b35a58f3 100644
--- a/crawl-ref/source/rltiles/dc-mon/black_snake.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/black_snake.png
diff --git a/crawl-ref/source/rltiles/dc-mon/blink_frog.png b/crawl-ref/source/rltiles/dc-mon/animals/blink_frog.png
index 9e55a41215..9e55a41215 100644
--- a/crawl-ref/source/rltiles/dc-mon/blink_frog.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/blink_frog.png
diff --git a/crawl-ref/source/rltiles/dc-mon/boring_beetle.png b/crawl-ref/source/rltiles/dc-mon/animals/boring_beetle.png
index edc5fc490b..edc5fc490b 100644
--- a/crawl-ref/source/rltiles/dc-mon/boring_beetle.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/boring_beetle.png
diff --git a/crawl-ref/source/rltiles/dc-mon/boulder_beetle.png b/crawl-ref/source/rltiles/dc-mon/animals/boulder_beetle.png
index 9c74d98423..9c74d98423 100644
--- a/crawl-ref/source/rltiles/dc-mon/boulder_beetle.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/boulder_beetle.png
diff --git a/crawl-ref/source/rltiles/dc-mon/brain_worm.png b/crawl-ref/source/rltiles/dc-mon/animals/brain_worm.png
index c52d3142ea..c52d3142ea 100644
--- a/crawl-ref/source/rltiles/dc-mon/brain_worm.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/brain_worm.png
diff --git a/crawl-ref/source/rltiles/dc-mon/brown_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/brown_snake.png
index 5fa893de0f..5fa893de0f 100644
--- a/crawl-ref/source/rltiles/dc-mon/brown_snake.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/brown_snake.png
diff --git a/crawl-ref/source/rltiles/dc-mon/bumblebee.png b/crawl-ref/source/rltiles/dc-mon/animals/bumblebee.png
index 6f48c69ce0..6f48c69ce0 100644
--- a/crawl-ref/source/rltiles/dc-mon/bumblebee.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/bumblebee.png
diff --git a/crawl-ref/source/rltiles/dc-mon/butterfly.png b/crawl-ref/source/rltiles/dc-mon/animals/butterfly.png
index 33fed50a8d..33fed50a8d 100644
--- a/crawl-ref/source/rltiles/dc-mon/butterfly.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/butterfly.png
diff --git a/crawl-ref/source/rltiles/dc-mon/butterfly1.png b/crawl-ref/source/rltiles/dc-mon/animals/butterfly1.png
index 50b8a3b9fd..50b8a3b9fd 100644
--- a/crawl-ref/source/rltiles/dc-mon/butterfly1.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/butterfly1.png
diff --git a/crawl-ref/source/rltiles/dc-mon/butterfly2.png b/crawl-ref/source/rltiles/dc-mon/animals/butterfly2.png
index 160ce6915e..160ce6915e 100644
--- a/crawl-ref/source/rltiles/dc-mon/butterfly2.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/butterfly2.png
diff --git a/crawl-ref/source/rltiles/dc-mon/butterfly3.png b/crawl-ref/source/rltiles/dc-mon/animals/butterfly3.png
index a516999b89..a516999b89 100644
--- a/crawl-ref/source/rltiles/dc-mon/butterfly3.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/butterfly3.png
diff --git a/crawl-ref/source/rltiles/dc-mon/butterfly4.png b/crawl-ref/source/rltiles/dc-mon/animals/butterfly4.png
index e719a0773e..e719a0773e 100644
--- a/crawl-ref/source/rltiles/dc-mon/butterfly4.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/butterfly4.png
diff --git a/crawl-ref/source/rltiles/dc-mon/butterfly5.png b/crawl-ref/source/rltiles/dc-mon/animals/butterfly5.png
index c7d22119e6..c7d22119e6 100644
--- a/crawl-ref/source/rltiles/dc-mon/butterfly5.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/butterfly5.png
diff --git a/crawl-ref/source/rltiles/dc-mon/butterfly6.png b/crawl-ref/source/rltiles/dc-mon/animals/butterfly6.png
index 8b47e1b512..8b47e1b512 100644
--- a/crawl-ref/source/rltiles/dc-mon/butterfly6.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/butterfly6.png
diff --git a/crawl-ref/source/rltiles/dc-mon/death_yak.png b/crawl-ref/source/rltiles/dc-mon/animals/death_yak.png
index b8a7f2a88f..b8a7f2a88f 100644
--- a/crawl-ref/source/rltiles/dc-mon/death_yak.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/death_yak.png
diff --git a/crawl-ref/source/rltiles/dc-mon/electrical_eel.png b/crawl-ref/source/rltiles/dc-mon/animals/electrical_eel.png
index c03fb856d7..c03fb856d7 100644
--- a/crawl-ref/source/rltiles/dc-mon/electrical_eel.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/electrical_eel.png
diff --git a/crawl-ref/source/rltiles/dc-mon/elephant_slug.png b/crawl-ref/source/rltiles/dc-mon/animals/elephant_slug.png
index 91ec9f76ac..91ec9f76ac 100644
--- a/crawl-ref/source/rltiles/dc-mon/elephant_slug.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/elephant_slug.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_ant.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_ant.png
index 2188d254af..2188d254af 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_ant.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_ant.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_bat.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_bat.png
index ef8961b2de..ef8961b2de 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_bat.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_bat.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_beetle.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_beetle.png
index 44491bd9c3..44491bd9c3 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_beetle.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_beetle.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_blowfly.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_blowfly.png
index 3be8f52af1..3be8f52af1 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_blowfly.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_blowfly.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_brown_frog.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_brown_frog.png
index 9158d537f0..9158d537f0 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_brown_frog.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_brown_frog.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_centipede.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_centipede.png
index 56722af01d..56722af01d 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_centipede.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_centipede.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_cockroach.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_cockroach.png
index eb1c906da5..eb1c906da5 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_cockroach.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_cockroach.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_frog.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_frog.png
index 4ec2ba26b6..4ec2ba26b6 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_frog.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_frog.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_gecko.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_gecko.png
index 7ba3b1998b..7ba3b1998b 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_gecko.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_gecko.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_goldfish.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_goldfish.png
index 0ef1629c36..0ef1629c36 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_goldfish.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_goldfish.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_iguana.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_iguana.png
index 4e0f11f867..4e0f11f867 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_iguana.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_iguana.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_lizard.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_lizard.png
index e6bac3ae73..e6bac3ae73 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_lizard.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_lizard.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_mite.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_mite.png
index bc63c1487f..bc63c1487f 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_mite.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_mite.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_mosquito.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_mosquito.png
index 8879878153..8879878153 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_mosquito.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_mosquito.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_newt.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_newt.png
index f19b722666..f19b722666 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_newt.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_newt.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_slug.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_slug.png
index e0807137c1..e0807137c1 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_slug.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_slug.png
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_snail.png b/crawl-ref/source/rltiles/dc-mon/animals/giant_snail.png
index 8e780d7430..8e780d7430 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_snail.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/giant_snail.png
diff --git a/crawl-ref/source/rltiles/dc-mon/gila_monster.png b/crawl-ref/source/rltiles/dc-mon/animals/gila_monster.png
index 8b9e012590..8b9e012590 100644
--- a/crawl-ref/source/rltiles/dc-mon/gila_monster.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/gila_monster.png
diff --git a/crawl-ref/source/rltiles/dc-mon/green_rat.png b/crawl-ref/source/rltiles/dc-mon/animals/green_rat.png
index 426d360c0d..426d360c0d 100644
--- a/crawl-ref/source/rltiles/dc-mon/green_rat.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/green_rat.png
diff --git a/crawl-ref/source/rltiles/dc-mon/grey_rat.png b/crawl-ref/source/rltiles/dc-mon/animals/grey_rat.png
index 21e060b9d7..21e060b9d7 100644
--- a/crawl-ref/source/rltiles/dc-mon/grey_rat.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/grey_rat.png
diff --git a/crawl-ref/source/rltiles/dc-mon/grey_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png
index 2da9df3b93..2da9df3b93 100644
--- a/crawl-ref/source/rltiles/dc-mon/grey_snake.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/grey_snake.png
diff --git a/crawl-ref/source/rltiles/dc-mon/grizzly_bear.png b/crawl-ref/source/rltiles/dc-mon/animals/grizzly_bear.png
index 3612bc4738..3612bc4738 100644
--- a/crawl-ref/source/rltiles/dc-mon/grizzly_bear.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/grizzly_bear.png
diff --git a/crawl-ref/source/rltiles/dc-mon/hell_hog.png b/crawl-ref/source/rltiles/dc-mon/animals/hell_hog.png
index 460cd42dfa..460cd42dfa 100644
--- a/crawl-ref/source/rltiles/dc-mon/hell_hog.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/hell_hog.png
diff --git a/crawl-ref/source/rltiles/dc-mon/hell_hound.png b/crawl-ref/source/rltiles/dc-mon/animals/hell_hound.png
index acdb75be9f..acdb75be9f 100644
--- a/crawl-ref/source/rltiles/dc-mon/hell_hound.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/hell_hound.png
diff --git a/crawl-ref/source/rltiles/dc-mon/hog.png b/crawl-ref/source/rltiles/dc-mon/animals/hog.png
index 8ffd3eced6..8ffd3eced6 100644
--- a/crawl-ref/source/rltiles/dc-mon/hog.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/hog.png
diff --git a/crawl-ref/source/rltiles/dc-mon/hound.png b/crawl-ref/source/rltiles/dc-mon/animals/hound.png
index 7b6fc65aad..7b6fc65aad 100644
--- a/crawl-ref/source/rltiles/dc-mon/hound.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/hound.png
diff --git a/crawl-ref/source/rltiles/dc-mon/jackal.png b/crawl-ref/source/rltiles/dc-mon/animals/jackal.png
index 305156e801..305156e801 100644
--- a/crawl-ref/source/rltiles/dc-mon/jackal.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/jackal.png
diff --git a/crawl-ref/source/rltiles/dc-mon/jellyfish.png b/crawl-ref/source/rltiles/dc-mon/animals/jellyfish.png
index e82a8a1897..e82a8a1897 100644
--- a/crawl-ref/source/rltiles/dc-mon/jellyfish.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/jellyfish.png
diff --git a/crawl-ref/source/rltiles/dc-mon/killer_bee.png b/crawl-ref/source/rltiles/dc-mon/animals/killer_bee.png
index f1bd2ad9c9..f1bd2ad9c9 100644
--- a/crawl-ref/source/rltiles/dc-mon/killer_bee.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/killer_bee.png
diff --git a/crawl-ref/source/rltiles/dc-mon/killer_bee_larva.png b/crawl-ref/source/rltiles/dc-mon/animals/killer_bee_larva.png
index facab392dd..facab392dd 100644
--- a/crawl-ref/source/rltiles/dc-mon/killer_bee_larva.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/killer_bee_larva.png
diff --git a/crawl-ref/source/rltiles/dc-mon/komodo_dragon.png b/crawl-ref/source/rltiles/dc-mon/animals/komodo_dragon.png
index c0ed329a67..c0ed329a67 100644
--- a/crawl-ref/source/rltiles/dc-mon/komodo_dragon.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/komodo_dragon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/lava_fish.png b/crawl-ref/source/rltiles/dc-mon/animals/lava_fish.png
index 3c998c6b50..3c998c6b50 100644
--- a/crawl-ref/source/rltiles/dc-mon/lava_fish.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/lava_fish.png
diff --git a/crawl-ref/source/rltiles/dc-mon/lava_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/lava_snake.png
index 808f857eb2..808f857eb2 100644
--- a/crawl-ref/source/rltiles/dc-mon/lava_snake.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/lava_snake.png
diff --git a/crawl-ref/source/rltiles/dc-mon/lava_worm.png b/crawl-ref/source/rltiles/dc-mon/animals/lava_worm.png
index c9332e0831..c9332e0831 100644
--- a/crawl-ref/source/rltiles/dc-mon/lava_worm.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/lava_worm.png
diff --git a/crawl-ref/source/rltiles/dc-mon/moth_of_wrath.png b/crawl-ref/source/rltiles/dc-mon/animals/moth_of_wrath.png
index fe4276f522..fe4276f522 100644
--- a/crawl-ref/source/rltiles/dc-mon/moth_of_wrath.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/moth_of_wrath.png
diff --git a/crawl-ref/source/rltiles/dc-mon/orange_rat.png b/crawl-ref/source/rltiles/dc-mon/animals/orange_rat.png
index 6a89edd8e9..6a89edd8e9 100644
--- a/crawl-ref/source/rltiles/dc-mon/orange_rat.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/orange_rat.png
diff --git a/crawl-ref/source/rltiles/dc-mon/polar_bear.png b/crawl-ref/source/rltiles/dc-mon/animals/polar_bear.png
index a35b478af7..a35b478af7 100644
--- a/crawl-ref/source/rltiles/dc-mon/polar_bear.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/polar_bear.png
diff --git a/crawl-ref/source/rltiles/dc-mon/queen_ant.png b/crawl-ref/source/rltiles/dc-mon/animals/queen_ant.png
index dfef17914c..dfef17914c 100644
--- a/crawl-ref/source/rltiles/dc-mon/queen_ant.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/queen_ant.png
diff --git a/crawl-ref/source/rltiles/dc-mon/queen_bee.png b/crawl-ref/source/rltiles/dc-mon/animals/queen_bee.png
index e9365b0e67..e9365b0e67 100644
--- a/crawl-ref/source/rltiles/dc-mon/queen_bee.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/queen_bee.png
diff --git a/crawl-ref/source/rltiles/dc-mon/quokka.png b/crawl-ref/source/rltiles/dc-mon/animals/quokka.png
index ed896349fe..ed896349fe 100644
--- a/crawl-ref/source/rltiles/dc-mon/quokka.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/quokka.png
diff --git a/crawl-ref/source/rltiles/dc-mon/rat.png b/crawl-ref/source/rltiles/dc-mon/animals/rat.png
index db116fea17..db116fea17 100644
--- a/crawl-ref/source/rltiles/dc-mon/rat.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/rat.png
diff --git a/crawl-ref/source/rltiles/dc-mon/red_wasp.png b/crawl-ref/source/rltiles/dc-mon/animals/red_wasp.png
index 0af7b32ab2..0af7b32ab2 100644
--- a/crawl-ref/source/rltiles/dc-mon/red_wasp.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/red_wasp.png
diff --git a/crawl-ref/source/rltiles/dc-mon/redback.png b/crawl-ref/source/rltiles/dc-mon/animals/redback.png
index bafad8bfe6..bafad8bfe6 100644
--- a/crawl-ref/source/rltiles/dc-mon/redback.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/redback.png
diff --git a/crawl-ref/source/rltiles/dc-mon/rock_worm.png b/crawl-ref/source/rltiles/dc-mon/animals/rock_worm.png
index eb15956c11..eb15956c11 100644
--- a/crawl-ref/source/rltiles/dc-mon/rock_worm.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/rock_worm.png
diff --git a/crawl-ref/source/rltiles/dc-mon/salamander.png b/crawl-ref/source/rltiles/dc-mon/animals/salamander.png
index 817e7cb184..817e7cb184 100644
--- a/crawl-ref/source/rltiles/dc-mon/salamander.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/salamander.png
diff --git a/crawl-ref/source/rltiles/dc-mon/scorpion.png b/crawl-ref/source/rltiles/dc-mon/animals/scorpion.png
index 73002e5214..73002e5214 100644
--- a/crawl-ref/source/rltiles/dc-mon/scorpion.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/scorpion.png
diff --git a/crawl-ref/source/rltiles/dc-mon/sheep.png b/crawl-ref/source/rltiles/dc-mon/animals/sheep.png
index 6cd6070019..6cd6070019 100644
--- a/crawl-ref/source/rltiles/dc-mon/sheep.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/sheep.png
diff --git a/crawl-ref/source/rltiles/dc-mon/small_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/small_snake.png
index ab7f787b9e..ab7f787b9e 100644
--- a/crawl-ref/source/rltiles/dc-mon/small_snake.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/small_snake.png
diff --git a/crawl-ref/source/rltiles/dc-mon/snake.png b/crawl-ref/source/rltiles/dc-mon/animals/snake.png
index 502219415c..502219415c 100644
--- a/crawl-ref/source/rltiles/dc-mon/snake.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/snake.png
diff --git a/crawl-ref/source/rltiles/dc-mon/soldier_ant.png b/crawl-ref/source/rltiles/dc-mon/animals/soldier_ant.png
index ff82c73bcb..ff82c73bcb 100644
--- a/crawl-ref/source/rltiles/dc-mon/soldier_ant.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/soldier_ant.png
diff --git a/crawl-ref/source/rltiles/dc-mon/spiny_frog.png b/crawl-ref/source/rltiles/dc-mon/animals/spiny_frog.png
index fa12d880b9..fa12d880b9 100644
--- a/crawl-ref/source/rltiles/dc-mon/spiny_frog.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/spiny_frog.png
diff --git a/crawl-ref/source/rltiles/dc-mon/spiny_worm.png b/crawl-ref/source/rltiles/dc-mon/animals/spiny_worm.png
index 5dce53771a..5dce53771a 100644
--- a/crawl-ref/source/rltiles/dc-mon/spiny_worm.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/spiny_worm.png
diff --git a/crawl-ref/source/rltiles/dc-mon/swamp_worm.png b/crawl-ref/source/rltiles/dc-mon/animals/swamp_worm.png
index 289e63eea0..289e63eea0 100644
--- a/crawl-ref/source/rltiles/dc-mon/swamp_worm.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/swamp_worm.png
diff --git a/crawl-ref/source/rltiles/dc-mon/trapdoor_spider.png b/crawl-ref/source/rltiles/dc-mon/animals/trapdoor_spider.png
index 655921ef47..655921ef47 100644
--- a/crawl-ref/source/rltiles/dc-mon/trapdoor_spider.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/trapdoor_spider.png
diff --git a/crawl-ref/source/rltiles/dc-mon/war_dog.png b/crawl-ref/source/rltiles/dc-mon/animals/war_dog.png
index 6250f83d92..6250f83d92 100644
--- a/crawl-ref/source/rltiles/dc-mon/war_dog.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/war_dog.png
diff --git a/crawl-ref/source/rltiles/dc-mon/warg.png b/crawl-ref/source/rltiles/dc-mon/animals/warg.png
index 4d124472b8..4d124472b8 100644
--- a/crawl-ref/source/rltiles/dc-mon/warg.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/warg.png
diff --git a/crawl-ref/source/rltiles/dc-mon/wolf.png b/crawl-ref/source/rltiles/dc-mon/animals/wolf.png
index 30aeba0874..30aeba0874 100644
--- a/crawl-ref/source/rltiles/dc-mon/wolf.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/wolf.png
diff --git a/crawl-ref/source/rltiles/dc-mon/wolf_spider.png b/crawl-ref/source/rltiles/dc-mon/animals/wolf_spider.png
index d42affd9e7..d42affd9e7 100644
--- a/crawl-ref/source/rltiles/dc-mon/wolf_spider.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/wolf_spider.png
diff --git a/crawl-ref/source/rltiles/dc-mon/worm.png b/crawl-ref/source/rltiles/dc-mon/animals/worm.png
index e7bcb84761..e7bcb84761 100644
--- a/crawl-ref/source/rltiles/dc-mon/worm.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/worm.png
diff --git a/crawl-ref/source/rltiles/dc-mon/yak.png b/crawl-ref/source/rltiles/dc-mon/animals/yak.png
index 38ac4a2eb8..38ac4a2eb8 100644
--- a/crawl-ref/source/rltiles/dc-mon/yak.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/yak.png
diff --git a/crawl-ref/source/rltiles/dc-mon/yellow_snake.png b/crawl-ref/source/rltiles/dc-mon/animals/yellow_snake.png
index f7e1710131..f7e1710131 100644
--- a/crawl-ref/source/rltiles/dc-mon/yellow_snake.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/yellow_snake.png
diff --git a/crawl-ref/source/rltiles/dc-mon/yellow_wasp.png b/crawl-ref/source/rltiles/dc-mon/animals/yellow_wasp.png
index 59afa91d63..59afa91d63 100644
--- a/crawl-ref/source/rltiles/dc-mon/yellow_wasp.png
+++ b/crawl-ref/source/rltiles/dc-mon/animals/yellow_wasp.png
diff --git a/crawl-ref/source/rltiles/dc-mon/siren.png b/crawl-ref/source/rltiles/dc-mon/siren.png
new file mode 100644
index 0000000000..8b2f6a5e30
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/siren.png
diff --git a/crawl-ref/source/rltiles/dc-mon/siren_water.png b/crawl-ref/source/rltiles/dc-mon/siren_water.png
new file mode 100644
index 0000000000..f859c643ab
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/siren_water.png
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 037d956f4d..93615fa369 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -522,7 +522,7 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
     case MONS_EYE_OF_DEVASTATION:
         return TILEP_MONS_EYE_OF_DEVASTATION;
 
-    // half-breeds ('H')
+    // hybrids ('H')
     case MONS_HIPPOGRIFF:
         return TILEP_MONS_HIPPOGRIFF;
     case MONS_MANTICORE: