Move nonliving monsters' tiles into subfolder dc-mon/nonliving.

25 files changed, 9 insertions, 10 deletions

diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index de75e0e508..607561f0f3 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -146,7 +146,7 @@ yak MONS_YAK
 death_yak MONS_DEATH_YAK
 
 ### Elemental monsters
-%sdir dc-mon
+%sdir dc-mon/nonliving
 earth_elemental MONS_EARTH_ELEMENTAL /*'#'*/
 fire_elemental MONS_FIRE_ELEMENTAL /*'#'*/
 water_elemental MONS_WATER_ELEMENTAL /*'{'*/
@@ -155,13 +155,12 @@ fire_vortex MONS_FIRE_VORTEX /*'v'*/
 spatial_vortex MONS_SPATIAL_VORTEX /*'v'*/
 %rim 0
 vapour MONS_VAPOUR /*'#'*/
-%rim 1
-death_cob MONS_DEATH_COB /*'%'*/
-ball_lightning MONS_BALL_LIGHTNING /*'*'*/
-%rim 0
 orb_of_fire MONS_ORB_OF_FIRE /*'*'*/
 orb_of_destruction MONS_ORB_OF_DESTRUCTION /*'*'*/
 %rim 1
+ball_lightning MONS_BALL_LIGHTNING /*'*'*/
+%sdir dc-mon
+death_cob MONS_DEATH_COB /*'%'*/
 
 ### Demonic monsters
 ## Arch demons ('&')
@@ -270,7 +269,7 @@ unseen_horror MONS_UNSEEN_HORROR
 abomination_small MONS_ABOMINATION_SMALL
 
 ## Golems ('8')
-%sdir dc-mon
+%sdir dc-mon/nonliving
 clay_golem MONS_CLAY_GOLEM
 crystal_golem MONS_CRYSTAL_GOLEM
 %rim 0
@@ -324,7 +323,7 @@ overlay_sword MONS_DARK_VINE_STATUE_SWORD
 %back none
 
 ## Gargoyles ('9')
-%sdir dc-mon
+%sdir dc-mon/nonliving
 gargoyle MONS_GARGOYLE
 metal_gargoyle MONS_METAL_GARGOYLE
 molten_gargoyle MONS_MOLTEN_GARGOYLE
@@ -632,13 +631,13 @@ deformed_orc MONS_DEFORMED_ORC
 ## Ghosts ('p')
 %rim 0
 shadow MONS_SHADOW /*' '*/
-insubstantial_wisp MONS_INSUBSTANTIAL_WISP
 phantom MONS_PHANTOM
 ## used for Detect Creatures
 ghost MONS_PLAYER_GHOST
 %rim 1
 flayed_ghost MONS_FLAYED_GHOST
 hungry_ghost MONS_HUNGRY_GHOST
+nonliving/insubstantial_wisp MONS_INSUBSTANTIAL_WISP
 
 minotaur MONS_MINOTAUR /*'t'*/
 
@@ -680,7 +679,7 @@ draco-job-scorcher DRACO_SCORCHER
 draco-job-shifter DRACO_SHIFTER
 draco-job-zealot DRACO_ZEALOT
 
-%sdir dc-mon
+%sdir dc-mon/nonliving
 test_spawner MONS_TEST_SPAWNER
 
 dc-misc/unseen PLAYER
@@ -692,7 +691,7 @@ wolf_spider TRAN_SPIDER
 hog_player TRAN_PIG
 %sdir dc-mon
 ice_beast TRAN_ICE_BEAST
-stone_golem TRAN_STATUE
+nonliving/stone_golem TRAN_STATUE
 dragon TRAN_DRAGON
 lich TRAN_LICH
 
diff --git a/crawl-ref/source/rltiles/dc-mon/air_elemental.png b/crawl-ref/source/rltiles/dc-mon/nonliving/air_elemental.png
index dc7401540d..dc7401540d 100644
--- a/crawl-ref/source/rltiles/dc-mon/air_elemental.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/air_elemental.png
diff --git a/crawl-ref/source/rltiles/dc-mon/ball_lightning.png b/crawl-ref/source/rltiles/dc-mon/nonliving/ball_lightning.png
index 12a6f97f24..12a6f97f24 100644
--- a/crawl-ref/source/rltiles/dc-mon/ball_lightning.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/ball_lightning.png
diff --git a/crawl-ref/source/rltiles/dc-mon/clay_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/clay_golem.png
index 30c620cb45..30c620cb45 100644
--- a/crawl-ref/source/rltiles/dc-mon/clay_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/clay_golem.png
diff --git a/crawl-ref/source/rltiles/dc-mon/crystal_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/crystal_golem.png
index 04ef6e63d2..04ef6e63d2 100644
--- a/crawl-ref/source/rltiles/dc-mon/crystal_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/crystal_golem.png
diff --git a/crawl-ref/source/rltiles/dc-mon/earth_elemental.png b/crawl-ref/source/rltiles/dc-mon/nonliving/earth_elemental.png
index 4a6e061ad8..4a6e061ad8 100644
--- a/crawl-ref/source/rltiles/dc-mon/earth_elemental.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/earth_elemental.png
diff --git a/crawl-ref/source/rltiles/dc-mon/electric_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/electric_golem.png
index 372c869003..372c869003 100644
--- a/crawl-ref/source/rltiles/dc-mon/electric_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/electric_golem.png
diff --git a/crawl-ref/source/rltiles/dc-mon/fire_elemental.png b/crawl-ref/source/rltiles/dc-mon/nonliving/fire_elemental.png
index bbd262e70f..bbd262e70f 100644
--- a/crawl-ref/source/rltiles/dc-mon/fire_elemental.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/fire_elemental.png
diff --git a/crawl-ref/source/rltiles/dc-mon/fire_vortex.png b/crawl-ref/source/rltiles/dc-mon/nonliving/fire_vortex.png
index 0af5dbc29a..0af5dbc29a 100644
--- a/crawl-ref/source/rltiles/dc-mon/fire_vortex.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/fire_vortex.png
diff --git a/crawl-ref/source/rltiles/dc-mon/flesh_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/flesh_golem.png
index d763855dd6..d763855dd6 100644
--- a/crawl-ref/source/rltiles/dc-mon/flesh_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/flesh_golem.png
diff --git a/crawl-ref/source/rltiles/dc-mon/gargoyle.png b/crawl-ref/source/rltiles/dc-mon/nonliving/gargoyle.png
index 46eb798868..46eb798868 100644
--- a/crawl-ref/source/rltiles/dc-mon/gargoyle.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/gargoyle.png
diff --git a/crawl-ref/source/rltiles/dc-mon/insubstantial_wisp.png b/crawl-ref/source/rltiles/dc-mon/nonliving/insubstantial_wisp.png
index c515b3662b..c515b3662b 100644
--- a/crawl-ref/source/rltiles/dc-mon/insubstantial_wisp.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/insubstantial_wisp.png
diff --git a/crawl-ref/source/rltiles/dc-mon/iron_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/iron_golem.png
index e11d6e9ef8..e11d6e9ef8 100644
--- a/crawl-ref/source/rltiles/dc-mon/iron_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/iron_golem.png
diff --git a/crawl-ref/source/rltiles/dc-mon/metal_gargoyle.png b/crawl-ref/source/rltiles/dc-mon/nonliving/metal_gargoyle.png
index 58ce10ba26..58ce10ba26 100644
--- a/crawl-ref/source/rltiles/dc-mon/metal_gargoyle.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/metal_gargoyle.png
diff --git a/crawl-ref/source/rltiles/dc-mon/molten_gargoyle.png b/crawl-ref/source/rltiles/dc-mon/nonliving/molten_gargoyle.png
index 2b459590d4..2b459590d4 100644
--- a/crawl-ref/source/rltiles/dc-mon/molten_gargoyle.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/molten_gargoyle.png
diff --git a/crawl-ref/source/rltiles/dc-mon/orb_of_destruction.png b/crawl-ref/source/rltiles/dc-mon/nonliving/orb_of_destruction.png
index b328f0a7ca..b328f0a7ca 100644
--- a/crawl-ref/source/rltiles/dc-mon/orb_of_destruction.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/orb_of_destruction.png
diff --git a/crawl-ref/source/rltiles/dc-mon/orb_of_fire.png b/crawl-ref/source/rltiles/dc-mon/nonliving/orb_of_fire.png
index cef783d8b9..cef783d8b9 100644
--- a/crawl-ref/source/rltiles/dc-mon/orb_of_fire.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/orb_of_fire.png
diff --git a/crawl-ref/source/rltiles/dc-mon/spatial_vortex.png b/crawl-ref/source/rltiles/dc-mon/nonliving/spatial_vortex.png
index 37fcd964b5..37fcd964b5 100644
--- a/crawl-ref/source/rltiles/dc-mon/spatial_vortex.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/spatial_vortex.png
diff --git a/crawl-ref/source/rltiles/dc-mon/stone_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/stone_golem.png
index b191e0c108..b191e0c108 100644
--- a/crawl-ref/source/rltiles/dc-mon/stone_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/stone_golem.png
diff --git a/crawl-ref/source/rltiles/dc-mon/test_spawner.png b/crawl-ref/source/rltiles/dc-mon/nonliving/test_spawner.png
index 101c8857bc..101c8857bc 100644
--- a/crawl-ref/source/rltiles/dc-mon/test_spawner.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/test_spawner.png
diff --git a/crawl-ref/source/rltiles/dc-mon/toenail_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/toenail_golem.png
index b50c42be2e..b50c42be2e 100644
--- a/crawl-ref/source/rltiles/dc-mon/toenail_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/toenail_golem.png
diff --git a/crawl-ref/source/rltiles/dc-mon/vapour.png b/crawl-ref/source/rltiles/dc-mon/nonliving/vapour.png
index a27ebade35..a27ebade35 100644
--- a/crawl-ref/source/rltiles/dc-mon/vapour.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/vapour.png
diff --git a/crawl-ref/source/rltiles/dc-mon/vine-covered_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/vine-covered_golem.png
index d8f604671b..d8f604671b 100644
--- a/crawl-ref/source/rltiles/dc-mon/vine-covered_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/vine-covered_golem.png
diff --git a/crawl-ref/source/rltiles/dc-mon/water_elemental.png b/crawl-ref/source/rltiles/dc-mon/nonliving/water_elemental.png
index 5a6b2df738..5a6b2df738 100644
--- a/crawl-ref/source/rltiles/dc-mon/water_elemental.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/water_elemental.png
diff --git a/crawl-ref/source/rltiles/dc-mon/wood_golem.png b/crawl-ref/source/rltiles/dc-mon/nonliving/wood_golem.png
index 878198d53f..878198d53f 100644
--- a/crawl-ref/source/rltiles/dc-mon/wood_golem.png
+++ b/crawl-ref/source/rltiles/dc-mon/nonliving/wood_golem.png