summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-06 19:15:43 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-06 19:15:43 +0100
commit9adf111e4d30b97021ba656a9c2cafaec3376bdd (patch)
treec8c07ee129dc7af87379f4e5e1e71048cd5f29b5
parent0cbe9f7261e4171aa5c93c64513ea07e41a091c9 (diff)
downloadcrawl-ref-9adf111e4d30b97021ba656a9c2cafaec3376bdd.tar.gz
crawl-ref-9adf111e4d30b97021ba656a9c2cafaec3376bdd.zip
Reuse potion icons for new needle brands: slow, sickness, paralysis, rage, ...
-rw-r--r--crawl-ref/source/rltiles/dc-item.txt9
-rw-r--r--crawl-ref/source/rltiles/item/weapon/brands/i-berserk-rage.pngbin0 -> 233 bytes
-rw-r--r--crawl-ref/source/rltiles/item/weapon/brands/i-confusion.pngbin0 -> 253 bytes
-rw-r--r--crawl-ref/source/rltiles/item/weapon/brands/i-paralysis.pngbin0 -> 205 bytes
-rw-r--r--crawl-ref/source/rltiles/item/weapon/brands/i-sickness.pngbin0 -> 419 bytes
-rw-r--r--crawl-ref/source/rltiles/item/weapon/brands/i-slowing.pngbin0 -> 267 bytes
-rw-r--r--crawl-ref/source/tilesdl.cc12
7 files changed, 19 insertions, 2 deletions
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index af4d8b3c83..e839cbc267 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -156,12 +156,17 @@ i-distortion BRAND_DISTORTION
i-reaching BRAND_REACHING
i-returning BRAND_RETURNING
i-chaos BRAND_CHAOS
-# confuse
+i-confusion BRAND_CONFUSION
# penetration
i-reaping BRAND_REAPING
-# missile-only brands
+# missile-only brands, order doesn't matter
i-venom BRAND_POISONED
i-curare BRAND_CURARE
+i-electrocution BRAND_ELECTRIC
+i-sickness BRAND_SICKNESS
+i-slowing BRAND_SLOWING
+i-paralysis BRAND_PARALYSIS
+i-berserk-rage BRAND_RAGE
%rim 1
%shrink 1
%sdir item/weapon
diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-berserk-rage.png b/crawl-ref/source/rltiles/item/weapon/brands/i-berserk-rage.png
new file mode 100644
index 0000000000..0210677189
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/brands/i-berserk-rage.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-confusion.png b/crawl-ref/source/rltiles/item/weapon/brands/i-confusion.png
new file mode 100644
index 0000000000..6af97702b2
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/brands/i-confusion.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-paralysis.png b/crawl-ref/source/rltiles/item/weapon/brands/i-paralysis.png
new file mode 100644
index 0000000000..094f298601
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/brands/i-paralysis.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-sickness.png b/crawl-ref/source/rltiles/item/weapon/brands/i-sickness.png
new file mode 100644
index 0000000000..10a08f1c71
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/brands/i-sickness.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-slowing.png b/crawl-ref/source/rltiles/item/weapon/brands/i-slowing.png
new file mode 100644
index 0000000000..b24109f854
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/brands/i-slowing.png
Binary files differ
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 75ac0b8d3a..002a19e86e 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -1415,6 +1415,18 @@ int tile_known_weapon_brand(const item_def item)
return TILE_BRAND_CHAOS;
case SPMSL_REAPING:
return TILE_BRAND_REAPING;
+ case SPMSL_ELECTRIC:
+ return TILE_BRAND_ELECTRIC;
+ case SPMSL_CONFUSION:
+ return TILE_BRAND_CONFUSION;
+ case SPMSL_PARALYSIS:
+ return TILE_BRAND_PARALYSIS;
+ case SPMSL_SLOW:
+ return TILE_BRAND_SLOWING;
+ case SPMSL_SICKNESS:
+ return TILE_BRAND_SICKNESS;
+ case SPMSL_RAGE:
+ return TILE_BRAND_RAGE;
default:
break;
}