From 630655e6f0b21126c76a7208316da0811845951f Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Fri, 11 Dec 2009 20:21:23 +1000 Subject: Add tiles for Wucad Mu's ghosts, descriptions. --- crawl-ref/source/rltiles/dc-mon.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'crawl-ref/source/rltiles/dc-mon.txt') diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 3da868aa54..0b1d2f1a80 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -326,6 +326,8 @@ vault_guard MONS_VAULT_GUARD shapeshifter MONS_SHAPESHIFTER glowing_shapeshifter MONS_GLOWING_SHAPESHIFTER killer_klown MONS_KILLER_KLOWN +## From the Wucad Mu wizlab +human_monk_ghost MONS_HUMAN_MONK ## Angels ('A') angel MONS_ANGEL @@ -464,6 +466,9 @@ troll MONS_TROLL rock_troll MONS_ROCK_TROLL iron_troll MONS_IRON_TROLL deep_troll MONS_DEEP_TROLL +## From the Wucad Mu wizard laboratory +rock_troll_monk_ghost MONS_ROCK_TROLL_MONK +iron_troll_monk_ghost MONS_IRON_TROLL_MONK ## Vampires ('V') vampire MONS_VAMPIRE -- cgit v1.2.3-54-g00ecf From 563c49bab4f18add0f6fec7e857451c65f1c7c1f Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Thu, 17 Dec 2009 15:57:12 +1000 Subject: Add more tiles for Cigotuvi WizLab. This includes deformed human (sickly green, with a single wing), a deformed elf (horrible fleshy grey colour with a hole in the middle), and a deformed orc (missing an arm and part of its face). Also, add a tile for "flesh golem". This is basically a reworked stone golem, using some colours from the wall_flesh series of tiles. Might be a bit dark, but it looks okay at the minute. --- crawl-ref/source/rltiles/dc-mon.txt | 7 +++++++ crawl-ref/source/rltiles/dc-mon/deformed_elf.png | Bin 0 -> 1282 bytes crawl-ref/source/rltiles/dc-mon/deformed_human.png | Bin 0 -> 1363 bytes crawl-ref/source/rltiles/dc-mon/deformed_orc.png | Bin 0 -> 1166 bytes crawl-ref/source/rltiles/dc-mon/flesh_golem.png | Bin 0 -> 2405 bytes 5 files changed, 7 insertions(+) create mode 100644 crawl-ref/source/rltiles/dc-mon/deformed_elf.png create mode 100644 crawl-ref/source/rltiles/dc-mon/deformed_human.png create mode 100644 crawl-ref/source/rltiles/dc-mon/deformed_orc.png create mode 100644 crawl-ref/source/rltiles/dc-mon/flesh_golem.png (limited to 'crawl-ref/source/rltiles/dc-mon.txt') diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index b162e9ad2a..7a6867737b 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -274,6 +274,8 @@ iron_golem MONS_IRON_GOLEM stone_golem MONS_STONE_GOLEM toenail_golem MONS_TOENAIL_GOLEM wood_golem MONS_WOOD_GOLEM +# For the Cigotuvi WizLab +flesh_golem MONS_FLESH_GOLEM ## Statues (also '8') %sdir dc-mon/unique @@ -329,6 +331,8 @@ glowing_shapeshifter MONS_GLOWING_SHAPESHIFTER killer_klown MONS_KILLER_KLOWN ## From the Wucad Mu wizlab human_monk_ghost MONS_HUMAN_MONK +## From the Cigotuvi wizlab +deformed_human MONS_DEFORMED_HUMAN ## Angels ('A') angel MONS_ANGEL @@ -523,6 +527,8 @@ deep_elf_priest MONS_DEEP_ELF_PRIEST deep_elf_high_priest MONS_DEEP_ELF_HIGH_PRIEST deep_elf_blademaster MONS_DEEP_ELF_BLADEMASTER deep_elf_master_archer MONS_DEEP_ELF_MASTER_ARCHER +## From the Cigotuvi wizlab +deformed_elf MONS_DEFORMED_ELF ## Fungi ('f') fungus MONS_TOADSTOOL @@ -571,6 +577,7 @@ orc_knight MONS_ORC_KNIGHT orc_warlord MONS_ORC_WARLORD orc_sorcerer MONS_ORC_SORCERER orc_high_priest MONS_ORC_HIGH_PRIEST +deformed_orc MONS_DEFORMED_ORC ## Ghosts ('p') %rim 0 diff --git a/crawl-ref/source/rltiles/dc-mon/deformed_elf.png b/crawl-ref/source/rltiles/dc-mon/deformed_elf.png new file mode 100644 index 0000000000..df09452448 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/deformed_elf.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/deformed_human.png b/crawl-ref/source/rltiles/dc-mon/deformed_human.png new file mode 100644 index 0000000000..78d8225146 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/deformed_human.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/deformed_orc.png b/crawl-ref/source/rltiles/dc-mon/deformed_orc.png new file mode 100644 index 0000000000..4d62be9385 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/deformed_orc.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/flesh_golem.png b/crawl-ref/source/rltiles/dc-mon/flesh_golem.png new file mode 100644 index 0000000000..d763855dd6 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/flesh_golem.png differ -- cgit v1.2.3-54-g00ecf From 123e41762d8db75f5b28d51a032a4ba6bc3a928c Mon Sep 17 00:00:00 2001 From: Jude Brown Date: Tue, 22 Dec 2009 18:34:36 +1000 Subject: Vine-covered golem tile for Erinya's Garden (purge). --- crawl-ref/source/dat/wizlab.des | 3 ++- crawl-ref/source/rltiles/dc-mon.txt | 2 ++ crawl-ref/source/rltiles/dc-mon/vine-covered_golem.png | Bin 0 -> 4523 bytes 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/vine-covered_golem.png (limited to 'crawl-ref/source/rltiles/dc-mon.txt') diff --git a/crawl-ref/source/dat/wizlab.des b/crawl-ref/source/dat/wizlab.des index 00002ca8dc..9bf96d528b 100644 --- a/crawl-ref/source/dat/wizlab.des +++ b/crawl-ref/source/dat/wizlab.des @@ -338,7 +338,8 @@ ORIENT: encompass TAGS: wizlab no_item_gen no_monster_gen no_rotate allow_dup MONS: centaur col:green, centaur warrior col:lightgreen MONS: oklob plant -MONS: stone golem name:vine_covered name_adjective +MONS: stone golem name:vine_covered name_adjective col:lightgreen \ + tile:mons_vine_golem MONS: toadstool col:any name:flowers n_rpl n_des n_the SUBST: y = ct COLOUR: G = yellow diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index e87d129684..261076e9f2 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -276,6 +276,8 @@ toenail_golem MONS_TOENAIL_GOLEM wood_golem MONS_WOOD_GOLEM # For the Cigotuvi WizLab flesh_golem MONS_FLESH_GOLEM +# For the Erinya WizLab +vine-covered_golem MONS_VINE_GOLEM ## Statues (also '8') %sdir dc-mon/unique diff --git a/crawl-ref/source/rltiles/dc-mon/vine-covered_golem.png b/crawl-ref/source/rltiles/dc-mon/vine-covered_golem.png new file mode 100644 index 0000000000..d8f604671b Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/vine-covered_golem.png differ -- cgit v1.2.3-54-g00ecf From 1f325d8c00116cee89417c201127b5a9731e0d42 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Mon, 28 Dec 2009 22:49:23 +0100 Subject: Add purge's ballistomycete tiles, thanks! --- crawl-ref/source/mon-abil.cc | 2 -- crawl-ref/source/rltiles/dc-mon.txt | 2 ++ .../source/rltiles/dc-mon/active_ballistomycete.png | Bin 0 -> 3597 bytes crawl-ref/source/rltiles/dc-mon/ballistomycete.png | Bin 0 -> 3523 bytes crawl-ref/source/tilepick.cc | 4 +++- 5 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/active_ballistomycete.png create mode 100644 crawl-ref/source/rltiles/dc-mon/ballistomycete.png (limited to 'crawl-ref/source/rltiles/dc-mon.txt') diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 5325d3f27b..b64ffcf9b4 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -1499,7 +1499,5 @@ void activate_ballistomycetes( monsters * monster, const coord_def & origin) } if (you.see_cell(origin) && found_others) - { mprf("You feel the ballistomycetes will spawn a replacement spore."); - } } diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 3a48f1307d..aba512e4b7 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -532,6 +532,8 @@ deep_elf_master_archer MONS_DEEP_ELF_MASTER_ARCHER ## Fungi ('f') 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/active_ballistomycete.png b/crawl-ref/source/rltiles/dc-mon/active_ballistomycete.png new file mode 100644 index 0000000000..bd01f0470c Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/active_ballistomycete.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/ballistomycete.png b/crawl-ref/source/rltiles/dc-mon/ballistomycete.png new file mode 100644 index 0000000000..69bff99afd Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/ballistomycete.png differ diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 34cbf7eb7f..28c94a04b0 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -199,7 +199,9 @@ int tileidx_monster_base(const monsters *mon, bool detected) // fungi ('f') case MONS_BALLISTOMYCETE: - return TILEP_MONS_FUNGUS; + if (!detected && mon->has_ench(ENCH_SPORE_PRODUCTION)) + return TILEP_MONS_BALLISTOMYCETE_ACTIVE; + return TILEP_MONS_BALLISTOMYCETE_INACTIVE; case MONS_TOADSTOOL: return TILEP_MONS_TOADSTOOL; case MONS_FUNGUS: -- cgit v1.2.3-54-g00ecf From de9c9716195ef407110fb99bdeed1c3b85e13385 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Mon, 28 Dec 2009 23:01:06 +0100 Subject: Move plant and fungi tiles into their own subdirectory. This seems sensible especially considering we'll also be adding tiles for the toadstool, bush, burning bush, and possibly more plants. That said, the folder could use some renaming itself. Not very creative right now. --- crawl-ref/source/rltiles/dc-mon.txt | 2 ++ .../source/rltiles/dc-mon/active_ballistomycete.png | Bin 3597 -> 0 bytes crawl-ref/source/rltiles/dc-mon/ballistomycete.png | Bin 3523 -> 0 bytes .../dc-mon/fungi_plants/active_ballistomycete.png | Bin 0 -> 3597 bytes .../rltiles/dc-mon/fungi_plants/ballistomycete.png | Bin 0 -> 3523 bytes crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png | Bin 0 -> 828 bytes .../source/rltiles/dc-mon/fungi_plants/oklob_plant.png | Bin 0 -> 1037 bytes crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png | Bin 0 -> 673 bytes .../source/rltiles/dc-mon/fungi_plants/plant_crypt.png | Bin 0 -> 1539 bytes .../rltiles/dc-mon/fungi_plants/wandering_mushroom.png | Bin 0 -> 879 bytes crawl-ref/source/rltiles/dc-mon/fungus.png | Bin 828 -> 0 bytes crawl-ref/source/rltiles/dc-mon/oklob_plant.png | Bin 1037 -> 0 bytes crawl-ref/source/rltiles/dc-mon/plant.png | Bin 673 -> 0 bytes crawl-ref/source/rltiles/dc-mon/plant_crypt.png | Bin 1539 -> 0 bytes crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png | Bin 879 -> 0 bytes 15 files changed, 2 insertions(+) delete mode 100644 crawl-ref/source/rltiles/dc-mon/active_ballistomycete.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/ballistomycete.png create mode 100644 crawl-ref/source/rltiles/dc-mon/fungi_plants/active_ballistomycete.png create mode 100644 crawl-ref/source/rltiles/dc-mon/fungi_plants/ballistomycete.png create mode 100644 crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png create mode 100644 crawl-ref/source/rltiles/dc-mon/fungi_plants/oklob_plant.png create mode 100644 crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png create mode 100644 crawl-ref/source/rltiles/dc-mon/fungi_plants/plant_crypt.png create mode 100644 crawl-ref/source/rltiles/dc-mon/fungi_plants/wandering_mushroom.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/fungus.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/oklob_plant.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/plant.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/plant_crypt.png delete mode 100644 crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png (limited to 'crawl-ref/source/rltiles/dc-mon.txt') diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index aba512e4b7..dba205a119 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -465,6 +465,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 @@ -530,6 +531,7 @@ deep_elf_blademaster MONS_DEEP_ELF_BLADEMASTER deep_elf_master_archer MONS_DEEP_ELF_MASTER_ARCHER ## Fungi ('f') +%sdir dc-mon/fungi_plants fungus MONS_TOADSTOOL fungus MONS_FUNGUS ballistomycete MONS_BALLISTOMYCETE_INACTIVE diff --git a/crawl-ref/source/rltiles/dc-mon/active_ballistomycete.png b/crawl-ref/source/rltiles/dc-mon/active_ballistomycete.png deleted file mode 100644 index bd01f0470c..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/active_ballistomycete.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/ballistomycete.png b/crawl-ref/source/rltiles/dc-mon/ballistomycete.png deleted file mode 100644 index 69bff99afd..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/ballistomycete.png and /dev/null differ 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 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/fungi_plants/active_ballistomycete.png differ 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 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/fungi_plants/ballistomycete.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png new file mode 100644 index 0000000000..75d0cd66ed Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/fungi_plants/fungus.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/oklob_plant.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/oklob_plant.png new file mode 100644 index 0000000000..4f0f0da6b2 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/fungi_plants/oklob_plant.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png new file mode 100644 index 0000000000..b3124b5cae Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant_crypt.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant_crypt.png new file mode 100644 index 0000000000..f17a501d4f Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/fungi_plants/plant_crypt.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/wandering_mushroom.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/wandering_mushroom.png new file mode 100644 index 0000000000..e8cff68b06 Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/fungi_plants/wandering_mushroom.png differ diff --git a/crawl-ref/source/rltiles/dc-mon/fungus.png b/crawl-ref/source/rltiles/dc-mon/fungus.png deleted file mode 100644 index 75d0cd66ed..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/fungus.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/oklob_plant.png b/crawl-ref/source/rltiles/dc-mon/oklob_plant.png deleted file mode 100644 index 4f0f0da6b2..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/oklob_plant.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/plant.png b/crawl-ref/source/rltiles/dc-mon/plant.png deleted file mode 100644 index b3124b5cae..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/plant.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/plant_crypt.png b/crawl-ref/source/rltiles/dc-mon/plant_crypt.png deleted file mode 100644 index f17a501d4f..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/plant_crypt.png and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png b/crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png deleted file mode 100644 index e8cff68b06..0000000000 Binary files a/crawl-ref/source/rltiles/dc-mon/wandering_mushroom.png and /dev/null differ -- cgit v1.2.3-54-g00ecf 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/dat/float.des | 24 ++++++++++------ crawl-ref/source/dat/mini.des | 2 +- 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 12 files changed, 47 insertions(+), 10 deletions(-) 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/dc-mon.txt') 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 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 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/dc-mon.txt') 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 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/dc-mon.txt') 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