From d04148fa8117632bb4b6e9700f6374f8894f1d96 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Fri, 8 Jan 2010 13:57:32 +0100 Subject: Add preliminary turtle tile. It's a bit on the smallish side, having been originally intended for altar decoration, and also a bit too dark. I've no idea how an alligator turtle is supposed to look, so the two share the same tile for now. --- crawl-ref/source/rltiles/dc-corpse.txt | 10 ++++++---- crawl-ref/source/rltiles/dc-mon.txt | 3 +++ crawl-ref/source/rltiles/dc-mon/animals/turtle.png | Bin 0 -> 1114 bytes crawl-ref/source/tilepick.cc | 18 ++++++++++++------ 4 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 crawl-ref/source/rltiles/dc-mon/animals/turtle.png (limited to 'crawl-ref') diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt index 5e5301f9a2..1e4a3c17be 100644 --- a/crawl-ref/source/rltiles/dc-corpse.txt +++ b/crawl-ref/source/rltiles/dc-corpse.txt @@ -67,8 +67,12 @@ wolf_spider CORPSE_WOLF_SPIDER trapdoor_spider CORPSE_TRAPDOOR_SPIDER redback CORPSE_REDBACK +## Turtles ('t') +%back dc-misc/blood_red dc-misc/blood_red1 dc-misc/blood_red2 dc-misc/blood_red3 dc-misc/blood_red4 +turtle CORPSE_TURTLE + ## Worms ('w') -%sdir dc-mon/animals +%back dc-misc/blood_green killer_bee_larva CORPSE_ANT_LARVA killer_bee_larva CORPSE_KILLER_BEE_LARVA worm CORPSE_WORM @@ -162,9 +166,6 @@ ghoul CORPSE_GHOUL %back dc-misc/blood_red dc-misc/blood_red1 dc-misc/blood_red2 dc-misc/blood_red3 dc-misc/blood_red4 orc CORPSE_ORC -## Minotaur ('t') -minotaur CORPSE_MINOTAUR - ## Ugly things ('u') %sdir dc-mon/demons ugly_thing CORPSE_UGLY_THING @@ -223,6 +224,7 @@ hippogriff CORPSE_HIPPOGRIFF griffon CORPSE_GRIFFON manticore CORPSE_MANTICORE harpy CORPSE_HARPY +minotaur CORPSE_MINOTAUR ## Jellies ('J') %back dc-misc/blood_green diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 607561f0f3..9e4b9b4bad 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -66,6 +66,9 @@ wolf_spider MONS_WOLF_SPIDER trapdoor_spider MONS_TRAPDOOR_SPIDER redback MONS_REDBACK +## Turtles ('t') +turtle.png MONS_TURTLE + ## Worms and larvae ('w') killer_bee_larva MONS_ANT_LARVA killer_bee_larva MONS_KILLER_BEE_LARVA diff --git a/crawl-ref/source/rltiles/dc-mon/animals/turtle.png b/crawl-ref/source/rltiles/dc-mon/animals/turtle.png new file mode 100644 index 0000000000..493760d51b Binary files /dev/null and b/crawl-ref/source/rltiles/dc-mon/animals/turtle.png differ diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 06c5ec5e6e..2aa99cccdd 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -358,9 +358,10 @@ int tileidx_monster_base(const monsters *mon, bool detected) case MONS_REDBACK: return TILEP_MONS_REDBACK; - // minotaur ('t') - case MONS_MINOTAUR: - return TILEP_MONS_MINOTAUR; + // turtles ('t') + case MONS_SNAPPING_TURTLE: + case MONS_ALLIGATOR_SNAPPING_TURTLE: // TODO + return TILEP_MONS_TURTLE; // ugly things ('u') case MONS_UGLY_THING: @@ -548,6 +549,8 @@ int tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_SPHINX; case MONS_HARPY: return TILEP_MONS_HARPY; + case MONS_MINOTAUR: + return TILEP_MONS_MINOTAUR; // ice beast ('I') case MONS_ICE_BEAST: @@ -1811,9 +1814,10 @@ static int _tileidx_corpse(const item_def &item) case MONS_REDBACK: return TILE_CORPSE_REDBACK; - // minotaur ('t') - case MONS_MINOTAUR: - return TILE_CORPSE_MINOTAUR; + // turtles ('t') + case MONS_SNAPPING_TURTLE: + case MONS_ALLIGATOR_SNAPPING_TURTLE: // TODO + return TILE_CORPSE_TURTLE; // ugly things ('u') case MONS_UGLY_THING: @@ -1936,6 +1940,8 @@ static int _tileidx_corpse(const item_def &item) return TILE_CORPSE_GRIFFON; case MONS_HARPY: return TILE_CORPSE_HARPY; + case MONS_MINOTAUR: + return TILE_CORPSE_MINOTAUR; // jellies ('J') case MONS_GIANT_AMOEBA: -- cgit v1.2.3-54-g00ecf