From ffca5d53cafbb483fc98e3c9700b7a5226d126fb Mon Sep 17 00:00:00 2001 From: dis- Date: Wed, 27 Mar 2013 11:47:06 +0000 Subject: [PATCH] C window to-h bonus now considers race/class/personality bonus --- src/files.c | 12 ++++++++---- src/flavor.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/files.c b/src/files.c index 14c734dfe..35963834f 100644 --- a/src/files.c +++ b/src/files.c @@ -1602,8 +1602,8 @@ static struct {29, 10, 21, "£È£Ð"}, {29, 11, 21, "£Í£Ð"}, {29, 20, 21, "¥×¥ì¥¤»þ´Ö"}, - {53, 10, -1, "ÂǷ⹶·â :"}, - {53, 11, -1, "¼Í·â¹¶·â :"}, + {53, 10, -1, "ÂÇ·âÌ¿Ãæ :"}, + {53, 11, -1, "¼Í·âÌ¿Ãæ :"}, {53, 12, -1, "ËâË¡Ëɸæ :"}, {53, 13, -1, "±£Ì©¹ÔÆ° :"}, {53, 15, -1, "ÃγР:"}, @@ -1719,7 +1719,9 @@ static void display_player_melee_bonus(int hand, int hand_entry) /* Hack -- add in weapon info if known */ if (object_is_known(o_ptr)) show_tohit += o_ptr->to_h; if (object_is_known(o_ptr)) show_todam += o_ptr->to_d; - + + show_tohit += p_ptr->skill_thn / BTH_PLUS_ADJ; + /* Melee attacks */ sprintf(buf, "(%+d,%+d)", show_tohit, show_todam); @@ -1791,7 +1793,9 @@ static void display_player_middle(void) show_tohit += p_ptr->weapon_exp[0][o_ptr->sval] / 400; else show_tohit += (p_ptr->weapon_exp[0][o_ptr->sval] - (WEAPON_EXP_MASTER / 2)) / 200; - + + show_tohit += p_ptr->skill_thb / BTH_PLUS_ADJ; + /* Range attacks */ display_player_one_line(ENTRY_SHOOT_HIT_DAM, format("(%+d,%+d)", show_tohit, show_todam), TERM_L_BLUE); diff --git a/src/flavor.c b/src/flavor.c index df9d24504..8c695e25a 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -2485,7 +2485,7 @@ void object_desc(char *buf, object_type *o_ptr, u32b mode) { int percent = calc_crit_ratio_shot(o_ptr->weight, known ? o_ptr->to_h : 0, - object_is_known(bow_ptr) ? bow_ptr->to_h : 0, avgdam); + object_is_known(bow_ptr) ? bow_ptr->to_h : 0, avgdam); t = object_desc_chr(t, '/'); t = object_desc_num(t, percent / 100); -- 2.11.0