diff options
| author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-06 20:01:13 +0100 |
|---|---|---|
| committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-06 20:01:13 +0100 |
| commit | 6df1f8df4d0b9dcd691685db86354a17da861a61 (patch) | |
| tree | 240fead71fa55b7d901209226bd5d1e1649d1297 /crawl-ref | |
| parent | e3e05b162240e9d39e0360541d807f092ce0688b (diff) | |
| download | crawl-ref-6df1f8df4d0b9dcd691685db86354a17da861a61.tar.gz crawl-ref-6df1f8df4d0b9dcd691685db86354a17da861a61.zip | |
Distinguish icons of neutral and good neutral monsters.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/rltiles/dc-misc.txt | 1 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-misc/good_neutral.png | bin | 0 -> 196 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-misc/neutral.png | bin | 146 -> 191 bytes | |||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 11 | ||||
| -rw-r--r-- | crawl-ref/source/tiles.h | 17 |
6 files changed, 20 insertions, 11 deletions
diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index 10bc4fc714..92329d2dd8 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -69,6 +69,7 @@ cursor_green CURSOR3 tutorial_cursor TUTORIAL_CURSOR %rim 1 heart HEART +good_neutral GOOD_NEUTRAL neutral NEUTRAL animated_weapon ANIMATED_WEAPON poison POISON diff --git a/crawl-ref/source/rltiles/dc-misc/good_neutral.png b/crawl-ref/source/rltiles/dc-misc/good_neutral.png Binary files differnew file mode 100644 index 0000000000..394569aa9a --- /dev/null +++ b/crawl-ref/source/rltiles/dc-misc/good_neutral.png diff --git a/crawl-ref/source/rltiles/dc-misc/neutral.png b/crawl-ref/source/rltiles/dc-misc/neutral.png Binary files differindex 63c5f4cd2a..db2da3173b 100644 --- a/crawl-ref/source/rltiles/dc-misc/neutral.png +++ b/crawl-ref/source/rltiles/dc-misc/neutral.png diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 6d276af1ed..0f7ed79bbd 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1139,6 +1139,8 @@ int tileidx_monster(const monsters *mons, bool detected) if (mons->friendly()) ch |= TILE_FLAG_PET; + else if (mons->good_neutral()) + ch |= TILE_FLAG_GD_NEUTRAL; else if (mons->neutral()) ch |= TILE_FLAG_NEUTRAL; else if (mons_looks_stabbable(mons)) diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index dbac2f6d64..87d9e20508 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -918,17 +918,22 @@ void DungeonRegion::pack_foreground(unsigned int bg, unsigned int fg, int x, int m_buf_main.add(TILE_HEART, x, y); status_shift += 10; } - else if ((fg & TILE_FLAG_MAY_STAB) == TILE_FLAG_NEUTRAL) + else if (fg & TILE_FLAG_GD_NEUTRAL) + { + m_buf_main.add(TILE_GOOD_NEUTRAL, x, y); + status_shift += 8; + } + else if (fg & TILE_FLAG_NEUTRAL) { m_buf_main.add(TILE_NEUTRAL, x, y); status_shift += 8; } - else if ((fg & TILE_FLAG_MAY_STAB) == TILE_FLAG_STAB) + else if (fg & TILE_FLAG_STAB) { m_buf_main.add(TILE_STAB_BRAND, x, y); status_shift += 8; } - else if ((fg & TILE_FLAG_MAY_STAB) == TILE_FLAG_MAY_STAB) + else if (fg & TILE_FLAG_MAY_STAB) { m_buf_main.add(TILE_MAY_STAB_BRAND, x, y); status_shift += 5; diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h index 2f1028b72d..ba41232e43 100644 --- a/crawl-ref/source/tiles.h +++ b/crawl-ref/source/tiles.h @@ -133,14 +133,15 @@ enum tile_flags TILE_FLAG_S_UNDER = 0x00000800, TILE_FLAG_FLYING = 0x00001000, TILE_FLAG_PET = 0x00002000, - TILE_FLAG_NEUTRAL = 0x00004000, - TILE_FLAG_STAB = 0x00008000, - TILE_FLAG_MAY_STAB = 0x0000C000, - TILE_FLAG_NET = 0x00010000, - TILE_FLAG_POISON = 0x00020000, - TILE_FLAG_FLAME = 0x00040000, - TILE_FLAG_ANIM_WEP = 0x00080000, - TILE_FLAG_BERSERK = 0x00100000, + TILE_FLAG_GD_NEUTRAL = 0x00004000, + TILE_FLAG_NEUTRAL = 0x00008000, + TILE_FLAG_STAB = 0x00010000, + TILE_FLAG_MAY_STAB = 0x00020000, + TILE_FLAG_NET = 0x00040000, + TILE_FLAG_POISON = 0x00080000, + TILE_FLAG_ANIM_WEP = 0x00100000, + TILE_FLAG_FLAME = 0x00200000, + TILE_FLAG_BERSERK = 0x00400000, // MDAM has 5 possibilities, so uses 3 bits. TILE_FLAG_MDAM_MASK = 0x03800000, |
