Add light and dark vine-covered statue bases.

Also, convert the weapons wielded by the current statue into overlays,
and add relevant combination lines to dc-mon.txt to generate. The names
may require changing if they cause confusion, or if unneeded, the
section could be commented out.

Also update the relevant vaults.

12 files changed, 47 insertions, 10 deletions

diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 493d018b9e..a66a5961dc 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -709,15 +709,23 @@ NAME:    statue_cache
 ORIENT:  north
 TAGS:    no_monster_gen
 DEPTH:   D:12-20, Elf, Vault
-MONS: statue name:archer name_adjective ; crossbow ego:flame . bolt q:30
-MONS: statue name:archer name_adjective ; crossbow ego:frost . bolt q:30
-MONS: statue name:warrior name_adjective ; battleaxe ego:flaming good_item
-MONS: statue name:warrior name_adjective ; battleaxe ego:freezing good_item
-MONS: statue name:warrior name_adjective ; great mace ego:flaming good_item
-MONS: statue name:warrior name_adjective ; great mace ego:freezing good_item
+MONS: statue name:archer name_adjective tile:mons_statue_crossbow ; crossbow \
+      ego:flame . bolt q:30 
+MONS: statue name:archer name_adjective tile:mons_statue_crossbow ; crossbow \
+      ego:frost . bolt q:30
+MONS: statue name:warrior name_adjective tile:mons_statue_axe ; battleaxe \
+      ego:flaming good_item
+MONS: statue name:warrior name_adjective tile:mons_statue_axe ; battleaxe \
+      ego:freezing good_item
+MONS: statue name:warrior name_adjective tile:mons_statue_mace ; great mace \
+      ego:flaming good_item
+MONS: statue name:warrior name_adjective tile:mons_statue_mace ; great mace \
+      ego:freezing good_item
 MONS: silver statue
-KMONS: 8 = statue name:wizard name_adjective spells:lehudib's_crystal_spear;iskenderun's_mystic_blast;slow;stone_arrow
-KMONS: 9 = statue name:wizard name_adjective spells:freezing_cloud;mephitic_cloud;throw_icicle;confuse
+KMONS: 8 = statue name:wizard name_adjective tile:mons_statue_mage \
+           spells:lehudib's_crystal_spear;iskenderun's_mystic_blast;slow;stone_arrow
+KMONS: 9 = statue name:wizard name_adjective tile:mons_statue_mage \
+           spells:freezing_cloud;mephitic_cloud;throw_icicle;confuse
 MAP
   cccccccccccccc
   cccccccc7ccccc
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 2927e8362c..d29eeff639 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -2667,7 +2667,7 @@ ENDMAP
 #
 NAME:   archer_statue
 DEPTH:  D:8-, Vault, Elf
-MONS:   statue tile:mons_archer_statue name:archer name_adjective; longbow . arrow q:30
+MONS:   statue tile:mons_statue_archer name:archer name_adjective; longbow . arrow q:30
 MAP
     ccc
 ccccc1ccccc
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index dba205a119..2ecaf85b16 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -287,7 +287,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 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
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.png b/crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.png
new file mode 100644
index 0000000000..5d2a5a1283
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.png
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.png b/crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.png
new file mode 100644
index 0000000000..2d0a4e5ee1
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.png
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png
new file mode 100644
index 0000000000..1dcb1f1574
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png
new file mode 100644
index 0000000000..4710c7d683
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png
new file mode 100644
index 0000000000..3f78ae7af0
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png
new file mode 100644
index 0000000000..12a2fb2486
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png
new file mode 100644
index 0000000000..ab1533abbb
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png
new file mode 100644
index 0000000000..671280385d
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png
new file mode 100644
index 0000000000..b0ea9caaae
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png