Simplify the critical-shot-calcuration

diff --git a/src/bldg.c b/src/bldg.c
index d22fadf..f596769 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3132,11 +3132,11 @@ s16b calc_crit_ratio_shot(int weight, int plus_ammo, int plus_bow,  int dam)
        if ((p_ptr->pclass == CLASS_SNIPER) && (p_ptr->tval_ammo == TV_BOLT)) i *= 2;
        
        /* Good bow makes more critical */
-       i += MAX(0, plus_bow - 15) * 4 * (p_ptr->concent ? p_ptr->concent + 5 : 5);
+       i += plus_bow * 8 * (p_ptr->concent ? p_ptr->concent + 5 : 5);
        
        if (i < 0) i = 0;
        
-       return i * 5 / 3;
+       return i;
 }
 
 s16b calc_expect_crit_shot(int weight, int plus_ammo, int plus_bow,  int dam)

diff --git a/src/cmd1.c b/src/cmd1.c
index 6b883bb..d0ba19e 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -105,10 +105,10 @@ s16b critical_shot(int weight, int plus_ammo, int plus_bow, int dam)
        if ((p_ptr->pclass == CLASS_SNIPER) && (p_ptr->tval_ammo == TV_BOLT)) i *= 2;
        
        /* Good bow makes more critical */
-       i += MAX(0, plus_bow - 15) * 4 * (p_ptr->concent ? p_ptr->concent + 5 : 5);
+       i += plus_bow * 8 * (p_ptr->concent ? p_ptr->concent + 5 : 5);
        
        /* Critical hit */
-       if (randint1(6000) <= i)
+       if (randint1(10000) <= i)
        {
                k = weight * randint1(500);