diff options
| author | ontoclasm <yokomeshi@gmail.com> | 2014-08-06 16:56:00 +0100 |
|---|---|---|
| committer | ontoclasm <yokomeshi@gmail.com> | 2014-08-06 16:56:43 +0100 |
| commit | e530672c842379ae380cb480aa72e4a13eca0ade (patch) | |
| tree | 65a3941e013bea6df70d4ea0cbe45d251a08fdbc | |
| parent | 80d8e96c5bf3d6ca496d19528c7f1d8a1cad9518 (diff) | |
| download | crawl-ref-e530672c842379ae380cb480aa72e4a13eca0ade.tar.gz crawl-ref-e530672c842379ae380cb480aa72e4a13eca0ade.zip | |
Inert versions of evoker tiles
| -rw-r--r-- | crawl-ref/source/rltiles/dc-item.txt | 10 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/item/misc/misc_fan_inert.png | bin | 0 -> 363 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/item/misc/misc_lamp_inert.png | bin | 0 -> 299 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/item/misc/misc_phial_inert.png | bin | 0 -> 270 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/item/misc/misc_stone_inert.png | bin | 0 -> 326 bytes | |||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 12 |
6 files changed, 15 insertions, 7 deletions
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index 423c8efa45..4fafb6422b 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -966,11 +966,15 @@ misc_orb2 misc_bottle MISC_BOTTLED_EFREET %rim 0 misc_crystal MISC_CRYSTAL_BALL_OF_ENERGY UNSEEN_MISC -%rim 1 -misc_fan MISC_AIR_ELEMENTAL_FAN +misc_fan MISC_FAN_OF_GALES +misc_fan_inert MISC_FAN_OF_GALES_INERT misc_lamp MISC_LAMP_OF_FIRE -misc_stone MISC_STONE_OF_EARTH_ELEMENTALS +misc_lamp_inert MISC_LAMP_OF_FIRE_INERT +misc_stone MISC_STONE_OF_TREMORS +misc_stone_inert MISC_STONE_OF_TREMORS_INERT misc_phial MISC_PHIAL_OF_FLOODS +misc_phial_inert MISC_PHIAL_OF_FLOODS_INERT +%rim 1 misc_lantern MISC_LANTERN_OF_SHADOWS misc_horn MISC_HORN_OF_GERYON misc_box MISC_BOX_OF_BEASTS diff --git a/crawl-ref/source/rltiles/item/misc/misc_fan_inert.png b/crawl-ref/source/rltiles/item/misc/misc_fan_inert.png Binary files differnew file mode 100644 index 0000000000..63def26500 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/misc_fan_inert.png diff --git a/crawl-ref/source/rltiles/item/misc/misc_lamp_inert.png b/crawl-ref/source/rltiles/item/misc/misc_lamp_inert.png Binary files differnew file mode 100644 index 0000000000..75c997fbcb --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/misc_lamp_inert.png diff --git a/crawl-ref/source/rltiles/item/misc/misc_phial_inert.png b/crawl-ref/source/rltiles/item/misc/misc_phial_inert.png Binary files differnew file mode 100644 index 0000000000..c26bd1adff --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/misc_phial_inert.png diff --git a/crawl-ref/source/rltiles/item/misc/misc_stone_inert.png b/crawl-ref/source/rltiles/item/misc/misc_stone_inert.png Binary files differnew file mode 100644 index 0000000000..c81b57a764 --- /dev/null +++ b/crawl-ref/source/rltiles/item/misc/misc_stone_inert.png diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 4ee63ba04f..e871897759 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -3992,16 +3992,20 @@ static tileidx_t _tileidx_misc(const item_def &item) #endif case MISC_FAN_OF_GALES: - return TILE_MISC_AIR_ELEMENTAL_FAN; + return evoker_is_charged(item) ? TILE_MISC_FAN_OF_GALES + : TILE_MISC_FAN_OF_GALES_INERT; case MISC_LAMP_OF_FIRE: - return TILE_MISC_LAMP_OF_FIRE; + return evoker_is_charged(item) ? TILE_MISC_LAMP_OF_FIRE + : TILE_MISC_LAMP_OF_FIRE_INERT; case MISC_STONE_OF_TREMORS: - return TILE_MISC_STONE_OF_EARTH_ELEMENTALS; + return evoker_is_charged(item) ? TILE_MISC_STONE_OF_TREMORS + : TILE_MISC_STONE_OF_TREMORS_INERT; case MISC_PHIAL_OF_FLOODS: - return TILE_MISC_PHIAL_OF_FLOODS; + return evoker_is_charged(item) ? TILE_MISC_PHIAL_OF_FLOODS + : TILE_MISC_PHIAL_OF_FLOODS_INERT; case MISC_LANTERN_OF_SHADOWS: return TILE_MISC_LANTERN_OF_SHADOWS; |
