Merge branch 'master' into wizlab

11 files changed, 7 insertions, 0 deletions

diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index 5f428e7bb1..f306cfd048 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -881,6 +881,9 @@ wall/dngn_green_crystal_wall DNGN_GREEN_CRYSTAL_WALL DNGN_CRYSTAL DNGN_CRYSTAL_G
 %repeat DNGN_CRYSTAL DNGN_CRYSTAL_WHITE
 %resetcol
 
+wall/tree1 DNGN_TREE
+wall/tree2
+
 ## doors
 dngn_detected_secret_door DNGN_DETECTED_SECRET_DOOR
 dngn_closed_door DNGN_CLOSED_DOOR
diff --git a/crawl-ref/source/rltiles/dc-dngn/wall/tree1.png b/crawl-ref/source/rltiles/dc-dngn/wall/tree1.png
new file mode 100644
index 0000000000..c5c69a2156
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/tree1.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/wall/tree2.png b/crawl-ref/source/rltiles/dc-dngn/wall/tree2.png
new file mode 100644
index 0000000000..711742ee6b
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/wall/tree2.png
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index b4a0c59fdf..208a27627e 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -473,6 +473,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
@@ -543,8 +544,11 @@ deep_elf_master_archer MONS_DEEP_ELF_MASTER_ARCHER
 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')
diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/active_ballistomycete.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/active_ballistomycete.png
new file mode 100644
index 0000000000..bd01f0470c
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/active_ballistomycete.png
diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/ballistomycete.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/ballistomycete.png
new file mode 100644
index 0000000000..69bff99afd
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/ballistomycete.png
diff --git a/crawl-ref/source/rltiles/dc-mon/fungus.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png
index 75d0cd66ed..75d0cd66ed 100644
--- a/crawl-ref/source/rltiles/dc-mon/fungus.png
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png
diff --git a/crawl-ref/source/rltiles/dc-mon/oklob_plant.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/oklob_plant.png
index 4f0f0da6b2..4f0f0da6b2 100644
--- a/crawl-ref/source/rltiles/dc-mon/oklob_plant.png
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/oklob_plant.png
diff --git a/crawl-ref/source/rltiles/dc-mon/plant.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png
index b3124b5cae..b3124b5cae 100644
--- a/crawl-ref/source/rltiles/dc-mon/plant.png
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png
diff --git a/crawl-ref/source/rltiles/dc-mon/plant_crypt.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant_crypt.png
index f17a501d4f..f17a501d4f 100644
--- a/crawl-ref/source/rltiles/dc-mon/plant_crypt.png
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant_crypt.png
diff --git a/crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/wandering_mushroom.png
index e8cff68b06..e8cff68b06 100644
--- a/crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/wandering_mushroom.png