summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-16 01:10:43 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2010-01-16 01:10:43 +0100
commit91c7e659794944626fd763ea3123d52ee9d2b836 (patch)
tree8f8fe232df5b464589144a9a92bf96a95e7e8aa1 /crawl-ref
parent1be109f3b53033e0a77596a463cf78a1abac04e7 (diff)
downloadcrawl-ref-91c7e659794944626fd763ea3123d52ee9d2b836.tar.gz
crawl-ref-91c7e659794944626fd763ea3123d52ee9d2b836.zip
Add tiles for bush and sleeping brand, both courtesy of purge. Thanks!
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/rltiles/dc-item.txt1
-rw-r--r--crawl-ref/source/rltiles/dc-mon.txt3
-rw-r--r--crawl-ref/source/rltiles/dc-mon/fungi_plants/bush.pngbin0 -> 4036 bytes
-rw-r--r--crawl-ref/source/rltiles/item/weapon/brands/i-sleep.pngbin0 -> 2944 bytes
-rw-r--r--crawl-ref/source/tilepick.cc2
-rw-r--r--crawl-ref/source/tilesdl.cc2
6 files changed, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 090d971e2b..d1bd563777 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -168,6 +168,7 @@ i-sickness BRAND_SICKNESS
i-slowing BRAND_SLOWING
i-paralysis BRAND_PARALYSIS
i-berserk-rage BRAND_RAGE
+i-sleep BRAND_SLEEP
%rim 1
%shrink 1
%sdir item/weapon/ranged
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 0dfc3611a7..d5fabd33b2 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -517,6 +517,9 @@ ogre_mage MONS_OGRE_MAGE
%sdir dc-mon/fungi_plants
plant MONS_PLANT
plant_crypt MONS_WITHERED_PLANT
+%rim 1
+bush MONS_BUSH
+%rim 0
oklob_plant MONS_OKLOB_PLANT
## Trolls ('T')
diff --git a/crawl-ref/source/rltiles/dc-mon/fungi_plants/bush.png b/crawl-ref/source/rltiles/dc-mon/fungi_plants/bush.png
new file mode 100644
index 0000000000..23fd42b025
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/fungi_plants/bush.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/item/weapon/brands/i-sleep.png b/crawl-ref/source/rltiles/item/weapon/brands/i-sleep.png
new file mode 100644
index 0000000000..7bbdb96568
--- /dev/null
+++ b/crawl-ref/source/rltiles/item/weapon/brands/i-sleep.png
Binary files differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index d0ea280cf6..872f18b876 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -649,6 +649,8 @@ int tileidx_monster_base(const monsters *mon, bool detected)
// plants ('P')
case MONS_PLANT:
return TILEP_MONS_PLANT;
+ case MONS_BUSH:
+ return TILEP_MONS_BUSH;
case MONS_OKLOB_PLANT:
return TILEP_MONS_OKLOB_PLANT;
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index e4a5338344..ff6af904ab 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -1431,6 +1431,8 @@ int tile_known_weapon_brand(const item_def item)
return TILE_BRAND_SICKNESS;
case SPMSL_RAGE:
return TILE_BRAND_RAGE;
+ case SPMSL_SLEEP:
+ return TILE_BRAND_SLEEP;
default:
break;
}