summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-03 14:59:42 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-03 14:59:42 +0000
commite41cf44e27b292e4814eff6060f5fd05a041c471 (patch)
tree7535b9f256fd3652b7e9ac67e24a0806187020a7 /crawl-ref
parent1ae786a89983b2c5511028e1ef894f5b7504eb04 (diff)
downloadcrawl-ref-e41cf44e27b292e4814eff6060f5fd05a041c471.tar.gz
crawl-ref-e41cf44e27b292e4814eff6060f5fd05a041c471.zip
Since thrown ammo of ice and flame finally work, enable javelins of
flame and ice, since they finally work as well. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6368 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/makeitem.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index adb2db53e4..48c1ff9b70 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1644,7 +1644,7 @@ static item_status_flag_type _determine_missile_race(const item_def& item,
break;
case MAKE_ITEM_RANDOM_RACE:
- // Elves don't make bolts, sling bullets, or throwing nets
+ // Elves don't make bolts, sling bullets, or throwing nets.
if ((item.sub_type == MI_ARROW
|| item.sub_type == MI_DART
|| item.sub_type == MI_JAVELIN)
@@ -1653,7 +1653,7 @@ static item_status_flag_type _determine_missile_race(const item_def& item,
rc = ISFLAG_ELVEN;
}
- // Orcs don't make sling bullets or throwing nets
+ // Orcs don't make sling bullets or throwing nets.
if ((item.sub_type == MI_ARROW
|| item.sub_type == MI_BOLT
|| item.sub_type == MI_DART
@@ -1664,14 +1664,14 @@ static item_status_flag_type _determine_missile_race(const item_def& item,
}
// Dwarves don't make arrows, sling bullets, javelins, or
- // throwing nets
+ // throwing nets.
if ((item.sub_type == MI_DART || item.sub_type == MI_BOLT)
&& one_chance_in(6))
{
rc = ISFLAG_DWARVEN;
}
- // Dwarves don't make needles
+ // Dwarves don't make needles.
if (item.sub_type == MI_NEEDLE)
{
if (one_chance_in(10))
@@ -1720,11 +1720,8 @@ static special_missile_type _determine_missile_brand(const item_def& item,
if (get_equip_race(item) == ISFLAG_ORCISH && one_chance_in(3))
rc = SPMSL_POISONED;
- // Un-poison sling bullets; un-flame and un-ice javelins; unbrand
- // throwing nets.
+ // Un-poison sling bullets, and unbrand throwing nets.
if (item.sub_type == MI_SLING_BULLET && rc == SPMSL_POISONED
- || item.sub_type == MI_JAVELIN
- && (rc == SPMSL_FLAME || rc == SPMSL_ICE)
|| item.sub_type == MI_THROWING_NET)
{
rc = SPMSL_NORMAL;