From 7815696da9512482d66ea97a885936a98c6495c6 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Sun, 10 Jan 2010 19:32:12 +0100 Subject: Reorder demons by glyph in dc-mon.txt. I was originally planning to add a preliminary tile for sixfirhy (red devil recoloured cyan) but then got confused about the pitchfork description. I took that to mean it's generated with a trident, but it isn't mentioned in mon-gear at all... So, should it get a weapon or not? --- crawl-ref/source/rltiles/dc-mon.txt | 5 +++-- crawl-ref/source/tilepick.cc | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt index 3570121966..16983a8b83 100644 --- a/crawl-ref/source/rltiles/dc-mon.txt +++ b/crawl-ref/source/rltiles/dc-mon.txt @@ -193,6 +193,7 @@ pit_fiend MONS_PIT_FIEND shadow_fiend MONS_SHADOW_FIEND # type '2' demons +beast MONS_BEAST ice_devil MONS_ICE_DEVIL lorocyproca MONS_LOROCYPROCA reaper MONS_REAPER @@ -204,7 +205,6 @@ blue_devil MONS_BLUE_DEVIL chaos_spawn MONS_CHAOS_SPAWN demonic_crawler MONS_DEMONIC_CRAWLER hellion MONS_HELLION -hellwing MONS_HELLWING iron_devil MONS_IRON_DEVIL neqoxec MONS_NEQOXEC orange_demon MONS_ORANGE_DEMON @@ -213,11 +213,12 @@ tormentor MONS_TORMENTOR ynoxinul MONS_YNOXINUL # type '4' demons -beast MONS_BEAST hairy_devil MONS_HAIRY_DEVIL red_devil MONS_RED_DEVIL rotting_devil MONS_ROTTING_DEVIL smoke_demon MONS_SMOKE_DEMON +#sixfirhy MONS_SIXFIRHY +hellwing MONS_HELLWING # type '5' demons imp MONS_IMP diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 913c7855b5..d56139759a 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -817,10 +817,12 @@ int tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_HAIRY_DEVIL; case MONS_ROTTING_DEVIL: return TILEP_MONS_ROTTING_DEVIL; - case MONS_BEAST: - return TILEP_MONS_BEAST; case MONS_SMOKE_DEMON: return TILEP_MONS_SMOKE_DEMON; +// case MONS_SIXFIRHY: // TODO +// return TILEP_MONS_SIXFIRHY; + case MONS_HELLWING: + return TILEP_MONS_HELLWING; // '3' demons case MONS_HELLION: @@ -835,8 +837,6 @@ int tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_NEQOXEC; case MONS_ORANGE_DEMON: return TILEP_MONS_ORANGE_DEMON; - case MONS_HELLWING: - return TILEP_MONS_HELLWING; case MONS_YNOXINUL: return TILEP_MONS_YNOXINUL; case MONS_DEMONIC_CRAWLER: @@ -847,6 +847,8 @@ int tileidx_monster_base(const monsters *mon, bool detected) return TILEP_MONS_CHAOS_SPAWN; // '2' demon + case MONS_BEAST: + return TILEP_MONS_BEAST; case MONS_SUN_DEMON: return TILEP_MONS_SUN_DEMON; case MONS_REAPER: -- cgit v1.2.3-54-g00ecf