summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/describe.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-04 17:24:52 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-04 17:24:52 +0000
commitcdab703a671fabd21a015d23a5dc8a3ed5e10b36 (patch)
tree8fb64601c35b90df902bddf7f3bb63db807a393e /crawl-ref/source/describe.cc
parentba7c629689d1042cf8cb4d94de535025154bc0ea (diff)
downloadcrawl-ref-cdab703a671fabd21a015d23a5dc8a3ed5e10b36.tar.gz
crawl-ref-cdab703a671fabd21a015d23a5dc8a3ed5e10b36.zip
Allow racial javelins. Javelins can now be elven and orcish, since
dwarves don't make polearms, and are made so 25% of the time, the same as for spears. Since they have no associated launcher, the usual bonuses for throwing racial gear apply to them, in spite of their being missiles thrown by hand. Also, disable branded javelins for now, as branding for thrown missiles in general isn't implemented. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2997 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/describe.cc')
-rw-r--r--crawl-ref/source/describe.cc23
1 files changed, 22 insertions, 1 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index ea37a0c283..ce0448e2cb 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1442,8 +1442,10 @@ static std::string describe_ammo( const item_def &item )
break;
}
- switch ( get_equip_race(item) )
+ if ( has_launcher(item) )
{
+ switch ( get_equip_race(item) )
+ {
case ISFLAG_DWARVEN:
description +=
"$It is more effective in conjunction with dwarven launchers.";
@@ -1456,6 +1458,25 @@ static std::string describe_ammo( const item_def &item )
description +=
"$It is more effective in conjunction with orcish launchers.";
break;
+ }
+ }
+ else
+ {
+ switch ( get_equip_race(item) )
+ {
+ case ISFLAG_DWARVEN:
+ description +=
+ "$It is most deadly when thrown by dwarves.";
+ break;
+ case ISFLAG_ELVEN:
+ description +=
+ "$It is most deadly when thrown by elves.";
+ break;
+ case ISFLAG_ORCISH:
+ description +=
+ "$It is most deadly when thrown by orcs.";
+ break;
+ }
}
if (item.special != 0 && item_type_known(item))