From 718202ee6b6445890db808f4420073e2cce506c2 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Tue, 3 Jul 2007 17:59:49 +0000 Subject: Manual update (David). Added javelins and sling bullets. Only Urug gets javelins at the moment. No monster gets sling bullets, but they can be randomly generated. Added deep elf blademasters and master archers to provide Silence-users some entertainment on Elf:7. I've adjusted the non-rogue-layout Elf:7s to use blademasters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1732 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/items.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/items.cc') diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 85c5e9b3c1..1cc99a4967 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -2943,7 +2943,8 @@ bool item_def::launched_by(const item_def &launcher) const { if (base_type != OBJ_MISSILES) return (false); - return (sub_type == fires_ammo_type(launcher)); + const missile_type mt = fires_ammo_type(launcher); + return (sub_type == mt || (mt == MI_STONE && mt == MI_SLING_BULLET)); } int item_def::index() const -- cgit v1.2.3-54-g00ecf