summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-29 06:40:53 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-29 06:40:53 +0000
commit0c1d87809a7ac410ff864762a43e56f4201ad2f5 (patch)
tree76b07b6ea1d23f6e1143e5f41a0c8c1fd618845e
parent020f06fc11d41c985fef9076e0886622d9d980ad (diff)
downloadcrawl-ref-0c1d87809a7ac410ff864762a43e56f4201ad2f5.tar.gz
crawl-ref-0c1d87809a7ac410ff864762a43e56f4201ad2f5.zip
Trunk->0.3 merge (2648-2649): Missile weight and to-hit adjustments.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2650 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/beam.cc4
-rw-r--r--crawl-ref/source/item_use.cc2
-rw-r--r--crawl-ref/source/itemprop.cc4
-rw-r--r--crawl-ref/source/newgame.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 1f47dad544..b892821c05 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2441,11 +2441,11 @@ void beam_drop_object( bolt &beam, item_def *item, int x, int y )
case MI_DART: chance = 3; break;
case MI_ARROW: chance = 4; break;
case MI_BOLT: chance = 4; break;
- case MI_JAVELIN: chance = 8; break;
+ case MI_JAVELIN: chance = 10; break;
case MI_LARGE_ROCK:
default:
- chance = 20;
+ chance = 25;
break;
}
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 2013de262f..5a81140f0d 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2059,7 +2059,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
break;
case MI_JAVELIN:
// Javelins use throwing skill.
- baseHit = -1;
+ baseHit = 1;
baseDam = property( item, PWPN_DAMAGE );
exHitBonus += skill_bump(SK_THROWING);
exDamBonus += you.skills[SK_THROWING] * 3 / 5;
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 0f8f52be49..12bd224998 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -350,9 +350,9 @@ static missile_def Missile_prop[NUM_MISSILES] =
{ MI_DART, "dart", 5, 3, true },
{ MI_ARROW, "arrow", 7, 5, false },
{ MI_BOLT, "bolt", 9, 5, false },
- { MI_LARGE_ROCK, "large rock", 20, 800, true },
+ { MI_LARGE_ROCK, "large rock", 20, 600, true },
{ MI_SLING_BULLET, "sling bullet", 6, 4, false },
- { MI_JAVELIN, "javelin", 10, 90, true },
+ { MI_JAVELIN, "javelin", 10, 80, true },
{ MI_THROWING_NET, "throwing net", 0, 30, true },
};
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 23072e2db1..75830d510f 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -3883,7 +3883,7 @@ bool give_items_skills()
// And they get to throw rocks.
you.inv[3].sub_type = MI_LARGE_ROCK;
- you.inv[3].quantity = 3;
+ you.inv[3].quantity = 4;
break;
case SP_HALFLING: