diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-03 14:41:49 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-03 14:41:49 +0000 |
| commit | 1ae786a89983b2c5511028e1ef894f5b7504eb04 (patch) | |
| tree | ba5ca815c90e6a173bc9f4c3570d93b27a43442d /crawl-ref/source/makeitem.cc | |
| parent | cbb4198487aa2b7a3e59d5ad42d29bed2058ebbd (diff) | |
| download | crawl-ref-1ae786a89983b2c5511028e1ef894f5b7504eb04.tar.gz crawl-ref-1ae786a89983b2c5511028e1ef894f5b7504eb04.zip | |
Fix 2005590: Branded darts unbranded when thrown.
Thrown darts of ice or flame will correctly be displayed as puffs of
frost/flame, will do the appropriate damage both to player and monsters
and will be identified when thrown by a monster.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6367 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makeitem.cc')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 6ae00c98fe..adb2db53e4 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1693,12 +1693,6 @@ static special_missile_type _determine_missile_brand(const item_def& item, const bool force_good = (item_level == MAKE_GOOD_ITEM); special_missile_type rc = SPMSL_NORMAL; - // note that needles can only be poisoned - // - // Actually, it'd be really nice if there where - // some paralysis or slowing poison needles, just - // so that blowguns have some added utility over - // the other launchers/throwing weapons. -- bwr // All needles are either poison or curare. if (item.sub_type == MI_NEEDLE) @@ -1722,17 +1716,16 @@ static special_missile_type _determine_missile_brand(const item_def& item, if (item.sub_type == MI_JAVELIN && one_chance_in(25)) rc = SPMSL_RETURNING; - // orcish ammo gets poisoned a lot more often -- in the original - // code it was poisoned every time!? + // Orcish ammo gets poisoned a lot more often. 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. - 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) + 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; } @@ -2170,7 +2163,7 @@ static void _generate_armour_item(item_def& item, bool allow_uniques, { if ( item.plus > 2 ) item.plus = 2; - } + } } |