diff options
| author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2009-12-19 22:05:38 +0100 |
|---|---|---|
| committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2009-12-19 22:05:38 +0100 |
| commit | 858e7e3ec55d4bebcd5fb5c210ce2d938410444f (patch) | |
| tree | 4a3722ae0d63574e37e53b7763342a6c02f2ee12 | |
| parent | 461330f33698ce5859b145cb10b3ab506d8bc65f (diff) | |
| download | crawl-ref-858e7e3ec55d4bebcd5fb5c210ce2d938410444f.tar.gz crawl-ref-858e7e3ec55d4bebcd5fb5c210ce2d938410444f.zip | |
Add reaping brand tile by rsaarelm, thanks!
| -rw-r--r-- | crawl-ref/source/rltiles/UNUSED/other/reaping-2.png | bin | 0 -> 340 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/UNUSED/other/reaping-3.png | bin | 0 -> 354 bytes | |||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-item.txt | 6 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/item/weapon/brands/i-reaping.png | bin | 0 -> 500 bytes | |||
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 7 |
5 files changed, 12 insertions, 1 deletions
diff --git a/crawl-ref/source/rltiles/UNUSED/other/reaping-2.png b/crawl-ref/source/rltiles/UNUSED/other/reaping-2.png Binary files differnew file mode 100644 index 0000000000..e5974b13b7 --- /dev/null +++ b/crawl-ref/source/rltiles/UNUSED/other/reaping-2.png diff --git a/crawl-ref/source/rltiles/UNUSED/other/reaping-3.png b/crawl-ref/source/rltiles/UNUSED/other/reaping-3.png Binary files differnew file mode 100644 index 0000000000..5cf630aac5 --- /dev/null +++ b/crawl-ref/source/rltiles/UNUSED/other/reaping-3.png diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index 12de4422f8..8d775bcb29 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -137,6 +137,8 @@ lajatang2 %sdir item/weapon/brands %shrink 0 %rim 0 +# The order of weapon brands must be identical to the one defined +# in itemprop-enum.h. i-flaming BRAND_FLAMING i-freezing BRAND_FREEZING i-holy_wrath BRAND_HOLY_WRATH @@ -156,6 +158,10 @@ i-distortion BRAND_DISTORTION i-reaching BRAND_REACHING i-returning BRAND_RETURNING i-chaos BRAND_CHAOS +# confuse +# penetration +i-reaping BRAND_REAPING +# missile-only brands i-venom BRAND_POISONED i-curare BRAND_CURARE %rim 1 diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-reaping.png b/crawl-ref/source/rltiles/item/weapon/brands/i-reaping.png Binary files differnew file mode 100644 index 0000000000..28e5fc42df --- /dev/null +++ b/crawl-ref/source/rltiles/item/weapon/brands/i-reaping.png diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 1a1099ba6d..e3c1e978fd 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -1378,7 +1378,10 @@ int tile_known_weapon_brand(const item_def item) if (item.base_type == OBJ_WEAPONS) { - if (get_weapon_brand(item) != SPWPN_NORMAL) + const int brand = get_weapon_brand(item); + if (brand == SPWPN_REAPING) + return TILE_BRAND_REAPING; + if (brand != SPWPN_NORMAL) return (TILE_BRAND_FLAMING + get_weapon_brand(item) - 1); } else if (item.base_type == OBJ_MISSILES) @@ -1397,6 +1400,8 @@ int tile_known_weapon_brand(const item_def item) return TILE_BRAND_RETURNING; case SPMSL_CHAOS: return TILE_BRAND_CHAOS; + case SPMSL_REAPING: + return TILE_BRAND_REAPING; default: break; } |
