summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-14 13:47:38 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-14 13:47:38 +0000
commitecb9196b57c81b2a1baf87a37afa21f778565124 (patch)
tree853365a3a365bab591bf39107336e0dd563fcb39
parent89c26752465f79845d6b8514a155dfbf4b01d083 (diff)
downloadcrawl-ref-ecb9196b57c81b2a1baf87a37afa21f778565124.tar.gz
crawl-ref-ecb9196b57c81b2a1baf87a37afa21f778565124.zip
r102@xenon: dshaligram | 2006-09-14 19:19:02 +051800
Fletchery no longer depends on Throwing/Ranged Combat. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@40 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/beam.cc13
-rw-r--r--crawl-ref/source/initfile.cc2
-rw-r--r--crawl-ref/source/item_use.cc1
3 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index e223347e3d..44d1fbc0d9 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2509,14 +2509,15 @@ static void beam_drop_object( struct bolt &beam, item_def *item, int x, int y )
{
int chance;
- // Using Throwing skill as the fletching/ammo preserving skill. -- bwr
+ // [dshaligram] Removed influence of Throwing on ammo preservation.
+ // The effect is nigh impossible to perceive.
switch (item->sub_type)
{
- case MI_NEEDLE: chance = 6 + you.skills[SK_RANGED_COMBAT] / 6; break;
- case MI_STONE: chance = 5 + you.skills[SK_RANGED_COMBAT] / 4; break;
- case MI_DART: chance = 3 + you.skills[SK_RANGED_COMBAT] / 3; break;
- case MI_ARROW: chance = 3 + you.skills[SK_RANGED_COMBAT] / 2; break;
- case MI_BOLT: chance = 4 + you.skills[SK_RANGED_COMBAT] / 4; break;
+ case MI_NEEDLE: chance = 7; break;
+ case MI_STONE: chance = 6; break;
+ case MI_DART: chance = 4; break;
+ case MI_ARROW: chance = 4; break;
+ case MI_BOLT: chance = 5; break;
case MI_LARGE_ROCK:
default:
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 02d7be3ad1..f4e4a7331b 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -429,7 +429,7 @@ void reset_options(bool clear_name)
Options.fire_order[0] = FIRE_LAUNCHER; // fire first from bow...
Options.fire_order[1] = FIRE_DART; // then only consider darts
- // clear the reast of the list
+ // clear the rest of the list
for (int i = 2; i < NUM_FIRE_TYPES; i++)
Options.fire_order[i] = FIRE_NONE;
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 1be7114d8d..d62d714f66 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1820,7 +1820,6 @@ bool throw_it(struct bolt &pbolt, int throw_2, monsters *dummy_target)
else
{
fire_beam( pbolt, &item );
-
dec_inv_item_quantity( throw_2, 1 );
}