summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/rltiles
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2009-12-30 15:08:15 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2009-12-30 15:08:15 +1000
commit6b67ac45887ff82cdcd69797005d5f0f60ca9769 (patch)
tree73ef3bdb841f239d67369ff82fb247230caacdf4 /crawl-ref/source/rltiles
parenta527e772ec64d116b53d226c4f337a8b287239da (diff)
parent75c0968931bf47f6f718b91ce3f589cd9f815298 (diff)
downloadcrawl-ref-6b67ac45887ff82cdcd69797005d5f0f60ca9769.tar.gz
crawl-ref-6b67ac45887ff82cdcd69797005d5f0f60ca9769.zip
Merge branch 'master' into wizlab
Diffstat (limited to 'crawl-ref/source/rltiles')
-rw-r--r--crawl-ref/source/rltiles/dc-mon.txt33
-rw-r--r--crawl-ref/source/rltiles/dc-mon/fungi_plants/giant_spore.png (renamed from crawl-ref/source/rltiles/dc-mon/giant_spore.png)bin602 -> 602 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.pngbin0 -> 3821 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.pngbin0 -> 3870 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.pngbin0 -> 992 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.pngbin0 -> 946 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.pngbin0 -> 1058 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.pngbin0 -> 946 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.pngbin0 -> 939 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/overlay_mage_hat.pngbin0 -> 975 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.pngbin0 -> 950 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.pngbin0 -> 966 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/statue_archer.pngbin996 -> 0 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/statue_axe.pngbin1026 -> 0 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/statue_crossbow.pngbin1104 -> 0 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/statue_mace.pngbin979 -> 0 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/statue_mage.pngbin975 -> 0 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/statue_scythe.pngbin1008 -> 0 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/statues/statue_sword.pngbin993 -> 0 bytes
19 files changed, 32 insertions, 1 deletions
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 208a27627e..e539d95c86 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -291,7 +291,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
@@ -395,7 +424,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
diff --git a/crawl-ref/source/rltiles/dc-mon/giant_spore.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/giant_spore.png
index 77c5948737..77c5948737 100644
--- a/crawl-ref/source/rltiles/dc-mon/giant_spore.png
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/giant_spore.png
Binary files differ
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
Binary files differ
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
Binary files differ
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..51138c7992
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png
Binary files differ
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..a674ae87dc
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png
Binary files differ
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..d65db57370
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png
Binary files differ
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..7555ff46c1
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png
Binary files differ
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..aa26b5b556
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage_hat.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage_hat.png
new file mode 100644
index 0000000000..d9960f0db0
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage_hat.png
Binary files differ
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..bb2f7df127
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png
Binary files differ
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..6b6e8050de
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/statue_archer.png b/crawl-ref/source/rltiles/dc-mon/statues/statue_archer.png
deleted file mode 100644
index 0358366f7c..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/statues/statue_archer.png
+++ /dev/null
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/statue_axe.png b/crawl-ref/source/rltiles/dc-mon/statues/statue_axe.png
deleted file mode 100644
index 795928ef22..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/statues/statue_axe.png
+++ /dev/null
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/statue_crossbow.png b/crawl-ref/source/rltiles/dc-mon/statues/statue_crossbow.png
deleted file mode 100644
index 80fa73380d..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/statues/statue_crossbow.png
+++ /dev/null
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/statue_mace.png b/crawl-ref/source/rltiles/dc-mon/statues/statue_mace.png
deleted file mode 100644
index c74efdd79e..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/statues/statue_mace.png
+++ /dev/null
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/statue_mage.png b/crawl-ref/source/rltiles/dc-mon/statues/statue_mage.png
deleted file mode 100644
index bc709937e2..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/statues/statue_mage.png
+++ /dev/null
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/statue_scythe.png b/crawl-ref/source/rltiles/dc-mon/statues/statue_scythe.png
deleted file mode 100644
index 19ab6410ce..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/statues/statue_scythe.png
+++ /dev/null
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/statues/statue_sword.png b/crawl-ref/source/rltiles/dc-mon/statues/statue_sword.png
deleted file mode 100644
index 6a8c005184..0000000000
--- a/crawl-ref/source/rltiles/dc-mon/statues/statue_sword.png
+++ /dev/null
Binary files differ