Apply class/race/personality melee-bonus for critical-norm-rate

diff --git a/src/bldg.c b/src/bldg.c
index f596769..0faf98d 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3179,7 +3179,7 @@ s16b calc_expect_crit(int weight, int plus, int dam, s16b meichuu, bool dokubari
        
        if(dokubari) return dam;
        
-       i = weight + (meichuu * 3 + plus * 5) + (p_ptr->lev * 3);
+       i = (weight + (meichuu * 3 + plus * 5) + p_ptr->skill_thn);
        if (i < 0) i = 0;
        
        k = weight;

diff --git a/src/cmd1.c b/src/cmd1.c
index d0ba19e..28e4ad4 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -152,14 +152,14 @@ s16b critical_shot(int weight, int plus_ammo, int plus_bow, int dam)
 /*
  * Critical hits (by player)
  *
- * Factor in weapon weight, total plusses, player level.
+ * Factor in weapon weight, total plusses, player melee bonus
  */
 s16b critical_norm(int weight, int plus, int dam, s16b meichuu, int mode)
 {
        int i, k;
-
+       
        /* Extract "blow" power */
-       i = (weight + (meichuu * 3 + plus * 5) + (p_ptr->lev * 3));
+       i = (weight + (meichuu * 3 + plus * 5) + p_ptr->skill_thn);
 
        /* Chance */
        if ((randint1((p_ptr->pclass == CLASS_NINJA) ? 4444 : 5000) <= i) || (mode == HISSATSU_MAJIN) || (mode == HISSATSU_3DAN))