From 07ec071cac85c4c35637cd84f07c70781e8ba05f Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Tue, 29 Dec 2009 22:51:41 +1000 Subject: 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. --- crawl-ref/source/rltiles/dc-mon.txt | 31 ++++++++++++++++++++- .../dc-mon/statues/dark_vine_statue_base.png | Bin 0 -> 3821 bytes .../dc-mon/statues/light_vine_statue_base.png | Bin 0 -> 3870 bytes .../source/rltiles/dc-mon/statues/overlay_axe.png | Bin 0 -> 1026 bytes .../source/rltiles/dc-mon/statues/overlay_bow.png | Bin 0 -> 999 bytes .../rltiles/dc-mon/statues/overlay_crossbow.png | Bin 0 -> 1093 bytes .../source/rltiles/dc-mon/statues/overlay_mace.png | Bin 0 -> 981 bytes .../source/rltiles/dc-mon/statues/overlay_mage.png | Bin 0 -> 985 bytes .../rltiles/dc-mon/statues/overlay_scythe.png | Bin 0 -> 989 bytes .../rltiles/dc-mon/statues/overlay_sword.png | Bin 0 -> 1021 bytes 10 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.png create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.png create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png (limited to 'crawl-ref/source/rltiles') 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 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/dark_vine_statue_base.png 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 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/light_vine_statue_base.png 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..1dcb1f1574 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png 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..4710c7d683 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png 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..3f78ae7af0 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png 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..12a2fb2486 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png 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..ab1533abbb Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png 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..671280385d Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png 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..b0ea9caaae Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png differ -- cgit v1.2.3-54-g00ecf From 846946afdb8c45bf6490f778fedc3ac8937f145f Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Tue, 29 Dec 2009 23:32:18 +0100 Subject: Cleanup animated statues' weapon overlays. --- .../source/rltiles/dc-mon/statues/overlay_axe.png | Bin 1026 -> 992 bytes .../source/rltiles/dc-mon/statues/overlay_bow.png | Bin 999 -> 946 bytes .../rltiles/dc-mon/statues/overlay_crossbow.png | Bin 1093 -> 1058 bytes .../source/rltiles/dc-mon/statues/overlay_mace.png | Bin 981 -> 946 bytes .../source/rltiles/dc-mon/statues/overlay_mage.png | Bin 985 -> 939 bytes .../source/rltiles/dc-mon/statues/overlay_scythe.png | Bin 989 -> 950 bytes .../source/rltiles/dc-mon/statues/overlay_sword.png | Bin 1021 -> 966 bytes 7 files changed, 0 insertions(+), 0 deletions(-) (limited to 'crawl-ref/source/rltiles') diff --git a/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png b/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png index 1dcb1f1574..51138c7992 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_axe.png 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 index 4710c7d683..a674ae87dc 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_bow.png 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 index 3f78ae7af0..d65db57370 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_crossbow.png 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 index 12a2fb2486..7555ff46c1 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mace.png 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 index ab1533abbb..aa26b5b556 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage.png 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 index 671280385d..bb2f7df127 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_scythe.png 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 index b0ea9caaae..6b6e8050de 100644 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_sword.png differ -- cgit v1.2.3-54-g00ecf From 48586bbe934e4f37601b90a5b1b8427a6998b67a Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Tue, 29 Dec 2009 23:33:20 +0100 Subject: Add a mage statue overlay including a wizard hat. --- .../source/rltiles/dc-mon/statues/overlay_mage_hat.png | Bin 0 -> 975 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/statues/overlay_mage_hat.png (limited to 'crawl-ref/source/rltiles') 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 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/statues/overlay_mage_hat.png differ -- cgit v1.2.3-54-g00ecf From c33c77fcd7ce9820640cf5e4e4905321d1bd9ca7 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Tue, 29 Dec 2009 23:33:50 +0100 Subject: And use it for the non-vinecovered statue tiles. Looks really odd on the recoloured ones. --- crawl-ref/source/rltiles/dc-mon.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crawl-ref/source/rltiles') diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 2ecaf85b16..b4c3dd3e2c 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -293,7 +293,7 @@ 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_mage_hat MONS_STATUE_MAGE overlay_scythe MONS_STATUE_SCYTHE overlay_sword MONS_STATUE_SWORD %back none -- cgit v1.2.3-54-g00ecf From fe24d203fafbdbba479f6f86a9d71fa50bdcab61 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Tue, 29 Dec 2009 23:35:39 +0100 Subject: Remove the statue tiles predating the weapon overlays. --- .../source/rltiles/dc-mon/statues/statue_archer.png | Bin 996 -> 0 bytes crawl-ref/source/rltiles/dc-mon/statues/statue_axe.png | Bin 1026 -> 0 bytes .../source/rltiles/dc-mon/statues/statue_crossbow.png | Bin 1104 -> 0 bytes crawl-ref/source/rltiles/dc-mon/statues/statue_mace.png | Bin 979 -> 0 bytes crawl-ref/source/rltiles/dc-mon/statues/statue_mage.png | Bin 975 -> 0 bytes .../source/rltiles/dc-mon/statues/statue_scythe.png | Bin 1008 -> 0 bytes crawl-ref/source/rltiles/dc-mon/statues/statue_sword.png | Bin 993 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 crawl-ref/source/rltiles/dc-mon/statues/statue_archer.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/statues/statue_axe.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/statues/statue_crossbow.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/statues/statue_mace.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/statues/statue_mage.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/statues/statue_scythe.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/statues/statue_sword.png (limited to 'crawl-ref/source/rltiles') 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 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/statue_archer.png and /dev/null 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 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/statue_axe.png and /dev/null 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 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/statue_crossbow.png and /dev/null 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 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/statue_mace.png and /dev/null 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 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/statue_mage.png and /dev/null 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 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/statue_scythe.png and /dev/null 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 Binary files a/crawl-ref/source/rltiles/dc-mon/statues/statue_sword.png and /dev/null differ -- cgit v1.2.3-54-g00ecf From 91adc427383b9284af5f2347a6e50c81ed3db00c Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Tue, 29 Dec 2009 23:41:59 +0100 Subject: Move the giant spore tile into the fungi_plants subfolder. --- crawl-ref/source/rltiles/dc-mon.txt | 2 ++ .../source/rltiles/dc-mon/fungi_plants/giant_spore.png | Bin 0 -> 602 bytes crawl-ref/source/rltiles/dc-mon/giant_spore.png | Bin 602 -> 0 bytes 3 files changed, 2 insertions(+) create mode 100644 crawl-ref/source/rltiles/dc-mon/fungi_plants/giant_spore.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/giant_spore.png (limited to 'crawl-ref/source/rltiles') diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index b4c3dd3e2c..ed37fd06d6 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -416,7 +416,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/fungi_plants/giant_spore.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/giant_spore.png new file mode 100644 index 0000000000..77c5948737 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/fungi_plants/giant_spore.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/giant_spore.png b/crawl-ref/source/rltiles/dc-mon/giant_spore.png deleted file mode 100644 index 77c5948737..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/giant_spore.png and /dev/null differ -- cgit v1.2.3-54-g00ecf