r74@ODIN: dshaligram | 2006-08-20 10:52:19 +051800

 Retuned missile damage numbers for bows, which became too strong.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@26 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 11 insertions, 10 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index d043cfc22c..f67fe7cfd7 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1367,7 +1367,7 @@ static void throw_it(struct bolt &pbolt, int throw_2)
         // ranged combat. Removed the old model which is... silly.
         
         shoot_skill = you.skills[launcher_skill];
-        effSkill = (shoot_skill * 2 + skill_bump(SK_RANGED_COMBAT)) / 3;
+        effSkill = (shoot_skill * 2 + rc_skill) / 3;
 
         // FIXME: Use actual body size
         if (!two_handed && hands_reqd(launcher, SIZE_MEDIUM) == HANDS_HALF)
@@ -1401,12 +1401,11 @@ static void throw_it(struct bolt &pbolt, int throw_2)
 
         // [dshaligram] This can get large...
         exDamBonus = lnchDamBonus + ammoDamBonus;
-        exHitBonus = lnchHitBonus;
+        exDamBonus = exDamBonus > 0? random2avg(exDamBonus + 1, 2)
+                                   : exDamBonus;
+        exHitBonus = lnchHitBonus > 0? random2avg(lnchHitBonus + 1, 2)
+                                     : lnchHitBonus;
 
-        // Raw ranged combat skill also helps with damage.
-        if (lnchType != WPN_BLOWGUN)
-            exDamBonus += rc_skill / 4;
-        
         // removed 2 random2(2)s from each of the learning curves, but
         // left slings because they're hard enough to develop without
         // a good source of shot in the dungeon.
@@ -1440,6 +1439,7 @@ static void throw_it(struct bolt &pbolt, int throw_2)
             // blowguns take a _very_ steady hand;  a lot of the bonus
             // comes from dexterity.  (Dex bonus here as well as below)
         case SK_DARTS:
+            baseHit -= 2;
             exercise(SK_DARTS, (coinflip()? 2 : 1));
             exHitBonus += (effSkill * 3) / 2 + you.dex / 2;
 
@@ -1455,6 +1455,7 @@ static void throw_it(struct bolt &pbolt, int throw_2)
 
         case SK_BOWS:
         {
+            baseHit -= 3;
             exercise(SK_BOWS, (coinflip()? 2 : 1));
             exHitBonus += (effSkill * 2);
 
@@ -1470,7 +1471,7 @@ static void throw_it(struct bolt &pbolt, int throw_2)
             exDamBonus += strbonus;
 
             // add in skill for bows.. help you to find those vulnerable spots.
-            exDamBonus += effSkill * 5 / 4;
+            exDamBonus += effSkill;
 
             // now kill the launcher damage bonus
             if (lnchDamBonus > 0)
@@ -1481,7 +1482,7 @@ static void throw_it(struct bolt &pbolt, int throw_2)
 
         case SK_CROSSBOWS:
             exercise(SK_CROSSBOWS, (coinflip()? 2 : 1));
-            baseHit += 2;
+            baseHit++;
             exHitBonus += (3 * effSkill) / 2 + 6;
             exDamBonus += effSkill * 2 / 3 + 4;
             if (lnchType == WPN_HAND_CROSSBOW)
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 7f661a6617..44a7a19310 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -319,7 +319,7 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
     { WPN_CROSSBOW,          "crossbow",            5,  4, 15, 150,  8,
         SK_CROSSBOWS,    HANDS_TWO,    SIZE_MEDIUM, MI_BOLT, false,
         DAMV_NON_MELEE },
-    { WPN_BOW,               "bow",                 4,  2, 11,  90,  2,
+    { WPN_BOW,               "bow",                 4,  1, 11,  90,  2,
         SK_BOWS,         HANDS_TWO,    SIZE_MEDIUM, MI_ARROW, false,
         DAMV_NON_MELEE },
     { WPN_LONGBOW,           "longbow",             5,  0, 12, 120,  3,
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 09d4c4d105..3a4a4e7a3d 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -2008,7 +2008,7 @@ void openingScreen(void)
 ********************************************** */
 
     textcolor( YELLOW );
-    cprintf("Hello, welcome to Dungeon Crawl " VERSION "!");
+    cprintf("Hello, welcome to Dungeon Crawl Stone Soup " VERSION "!");
     textcolor( BROWN );
     cprintf(EOL "(c) Copyright 1997-2002 Linley Henzell");
     cprintf(EOL "Please consult crawl.txt for instructions and legal details."