Merge branch 'master' into iood

1 files changed, 50 insertions, 1 deletions

diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 49e246efe8..06220dd2f5 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -280,6 +280,10 @@ iron_golem MONS_IRON_GOLEM
 stone_golem MONS_STONE_GOLEM
 toenail_golem MONS_TOENAIL_GOLEM
 wood_golem MONS_WOOD_GOLEM
+# For the Cigotuvi WizLab
+flesh_golem MONS_FLESH_GOLEM
+# For the Erinya WizLab
+vine-covered_golem MONS_VINE_GOLEM
 
 ## Statues (also '8')
 %sdir dc-mon/unique
@@ -288,7 +292,36 @@ roxanne MONS_ROXANNE
 ice_statue MONS_ICE_STATUE
 silver_statue MONS_SILVER_STATUE
 orange_crystal_statue MONS_ORANGE_CRYSTAL_STATUE
-statue_archer MONS_ARCHER_STATUE
+
+%back statue_base
+overlay_axe MONS_STATUE_AXE
+overlay_bow MONS_STATUE_ARCHER
+overlay_crossbow MONS_STATUE_CROSSBOW
+overlay_mace MONS_STATUE_MACE
+overlay_mage_hat MONS_STATUE_MAGE
+overlay_scythe MONS_STATUE_SCYTHE
+overlay_sword MONS_STATUE_SWORD
+%back none
+
+%back light_vine_statue_base
+overlay_axe MONS_LIGHT_VINE_STATUE_AXE
+overlay_bow MONS_LIGHT_VINE_STATUE_ARCHER
+overlay_crossbow MONS_LIGHT_VINE_STATUE_CROSSBOW
+overlay_mace MONS_LIGHT_VINE_STATUE_MACE
+overlay_mage MONS_LIGHT_VINE_STATUE_MAGE
+overlay_scythe MONS_LIGHT_VINE_STATUE_SCYTHE
+overlay_sword MONS_LIGHT_VINE_STATUE_SWORD
+%back none
+
+%back dark_vine_statue_base
+overlay_axe MONS_DARK_VINE_STATUE_AXE
+overlay_bow MONS_DARK_VINE_STATUE_ARCHER
+overlay_crossbow MONS_DARK_VINE_STATUE_CROSSBOW
+overlay_mace MONS_DARK_VINE_STATUE_MACE
+overlay_mage MONS_DARK_VINE_STATUE_MAGE
+overlay_scythe MONS_DARK_VINE_STATUE_SCYTHE
+overlay_sword MONS_DARK_VINE_STATUE_SWORD
+%back none
 
 ## Gargoyles ('9')
 %sdir dc-mon
@@ -337,6 +370,10 @@ shapeshifter MONS_SHAPESHIFTER
 glowing_shapeshifter MONS_GLOWING_SHAPESHIFTER
 killer_klown MONS_KILLER_KLOWN
 slave MONS_SLAVE
+## From the Wucad Mu wizlab
+human_monk_ghost MONS_HUMAN_MONK
+## From the Cigotuvi wizlab
+deformed_human MONS_DEFORMED_HUMAN
 
 ## Angels ('A')
 angel MONS_ANGEL
@@ -388,7 +425,9 @@ skeletal_dragon MONS_SKELETAL_DRAGON
 serpent_of_hell MONS_SERPENT_OF_HELL
 
 ## Eyes ('G')
+%sdir dc-mon/fungi_plants
 giant_spore MONS_GIANT_SPORE
+%sdir dc-mon
 giant_eyeball MONS_GIANT_EYEBALL
 eye_of_draining MONS_EYE_OF_DRAINING
 giant_orange_brain MONS_GIANT_ORANGE_BRAIN
@@ -466,6 +505,7 @@ two_headed_ogre MONS_TWO_HEADED_OGRE
 ogre_mage MONS_OGRE_MAGE
 
 ## Plants ('P')
+%sdir dc-mon/fungi_plants
 plant MONS_PLANT
 plant_crypt MONS_WITHERED_PLANT
 oklob_plant MONS_OKLOB_PLANT
@@ -479,6 +519,9 @@ troll MONS_TROLL
 rock_troll MONS_ROCK_TROLL
 iron_troll MONS_IRON_TROLL
 deep_troll MONS_DEEP_TROLL
+## From the Wucad Mu wizard laboratory
+rock_troll_monk_ghost MONS_ROCK_TROLL_MONK
+iron_troll_monk_ghost MONS_IRON_TROLL_MONK
 
 ## Vampires ('V')
 vampire MONS_VAMPIRE
@@ -529,10 +572,15 @@ deep_elf_priest MONS_DEEP_ELF_PRIEST
 deep_elf_high_priest MONS_DEEP_ELF_HIGH_PRIEST
 deep_elf_blademaster MONS_DEEP_ELF_BLADEMASTER
 deep_elf_master_archer MONS_DEEP_ELF_MASTER_ARCHER
+## From the Cigotuvi wizlab
+deformed_elf MONS_DEFORMED_ELF
 
 ## Fungi ('f')
+%sdir dc-mon/fungi_plants
 fungus MONS_TOADSTOOL
 fungus MONS_FUNGUS
+ballistomycete MONS_BALLISTOMYCETE_INACTIVE
+active_ballistomycete MONS_BALLISTOMYCETE_ACTIVE
 wandering_mushroom MONS_WANDERING_MUSHROOM
 
 ## Goblins ('g')
@@ -577,6 +625,7 @@ orc_knight MONS_ORC_KNIGHT
 orc_warlord MONS_ORC_WARLORD
 orc_sorcerer MONS_ORC_SORCERER
 orc_high_priest MONS_ORC_HIGH_PRIEST
+deformed_orc MONS_DEFORMED_ORC
 
 ## Ghosts ('p')
 %rim 0